Merge branch 'develop_PDFReaderProNew' of git.kdan.cc:Mac_PDF/PDF_Office into develop_PDFReaderProNew

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarController.swift

@@ -47,6 +47,7 @@ extension CAnnotationType {
     
     @objc optional func toolbarViewController(_ viewController:KMToolbarViewController, itemDidClick toolbarItem: KMToolbarItemView)
     @objc optional func toolbarViewController(_ viewController:KMToolbarViewController, searchAction searchString: String, forward: Bool)
+    @objc optional func toolbarViewController(_ viewController:KMToolbarViewController, searchAllAction searchString: String, forward: Bool)
     @objc optional func toolbarViewController(_ viewController:KMToolbarViewController, menuItemDidClick toolbarItem: KMToolbarItemView, index: Int, info: Any?)
 }
 
@@ -528,7 +529,7 @@ extension KMToolbarController {
         }
         
         self.findSearchView.showAllAction = { [unowned self] view, searchString, forward in
-            self.toolbarViewController(self.mainToolBarView!, searchAction: searchString, forward: forward)
+            self.toolbarViewController(self.mainToolBarView!, searchAllAction: searchString, forward: forward)
             print("showAllAction: \(searchString)")
         }
     }
@@ -790,6 +791,10 @@ extension KMToolbarController: KMToolbarViewControllerDelegate {
         self.delegate?.toolbarViewController?(viewController, searchAction: searchString, forward: forward)
     }
     
+    func toolbarViewController(_ viewController: KMToolbarViewController, searchAllAction searchString: String, forward: Bool) {
+        self.delegate?.toolbarViewController?(viewController, searchAllAction: searchString, forward: forward)
+    }
+    
     func toolbarViewController(_ viewController: KMToolbarViewController, menuItemDidClick toolbarItem: KMToolbarItemView, index: Int, info: Any?) {
         self.delegate?.toolbarViewController?(viewController, menuItemDidClick: toolbarItem, index: index, info: info)
     }

PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift

@@ -4288,7 +4288,7 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
     
     func toolbarViewController(_ viewController: KMToolbarViewController, searchAction searchString: String, forward: Bool) {
         if self.searchResults.count == 0 {
-            self.leftSideViewController.showSearchMode(searchString)
+            self.search(searchString: searchString, isCase: true)
         }
         
         var row = max(searchIndex - 1, 0)
@@ -4306,6 +4306,27 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
             }
         }
     }
+    
+    func toolbarViewController(_ viewController: KMToolbarViewController, searchAllAction searchString: String, forward: Bool) {
+//        if self.searchResults.count == 0 {
+            self.leftSideViewController.showSearchMode(searchString)
+//        }
+        
+//        var row = max(searchIndex - 1, 0)
+//        if forward {
+//            row = searchIndex + 1
+//        }
+//        if row >= 0 && row < self.searchResults.count && self.searchResults.count != 0 {
+//            let model = self.searchResults[row]
+//            if model.selection != nil {
+//                self.listView.go(to: model.selection, animated: true)
+//                self.listView.setHighlightedSelection(model.selection, animated: true)
+//                self.listView.setNeedsDisplayAnnotationViewForVisiblePages()
+//                
+//                searchIndex = row
+//            }
+//        }
+    }
 }
 
 // MARK: -