【2025】【PDFView】代码整理

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

@@ -990,13 +990,13 @@ extension KMMainViewController {
                     annotation = self.listView.addAnnotation(with: .line, selection: nil, page: currentPage, bounds: bounds)
                 case 7:
                     self.listView.annotationType = CAnnotationType.link
-                    self.openRightPane()
+                    toggleOpenRightSide()
                 case 8:
                     self.listView.annotationType = CAnnotationType.stamp
-                    self.openRightPane()
+                    toggleOpenRightSide()
                 case 9:
                     self.listView.annotationType = CAnnotationType.signSignature
-                    self.openRightPane()
+                    toggleOpenRightSide()
                 default:
                     break
                 }
@@ -1052,13 +1052,13 @@ extension KMMainViewController {
                     annotation = self.listView.addAnnotation(with: .line, selection: nil, page: currentPage, bounds: bounds)
                 case 7:
                     self.listView.annotationType = CAnnotationType.link
-                    self.openRightPane()
+                    toggleOpenRightSide()
                 case 8:
                     self.listView.annotationType = CAnnotationType.stamp
-                    self.openRightPane()
+                    toggleOpenRightSide()
                 case 9:
                     self.listView.annotationType = CAnnotationType.signSignature
-                    self.openRightPane()
+                    toggleOpenRightSide()
                 case 10:
                     self.addImgAnnotationToView(center: pagePoint)
                 default:
@@ -2348,7 +2348,7 @@ extension KMMainViewController {
             return
         }
         listView.addAnnotationWithTable()
-        openRightPane()
+        toggleOpenRightSide()
     }
     
     func isDamageImage(_ image: NSImage, imagePath path: String) -> Bool {
@@ -2566,7 +2566,7 @@ extension KMMainViewController : KMToolbarViewControllerDelegate {
         alert.messageText = NSLocalizedString("Processing times may be longer for larger documents. Thank you for your patience.", comment: "")
         alert.addButton(withTitle: NSLocalizedString("Continue", comment: ""))
         alert.addButton(withTitle: NSLocalizedString("Cancel", comment: ""))
-        alert.beginSheetModal(for: view.window!) { [unowned self] result in
+        alert.beginSheetModal(for: view.window!) { [weak self] result in
             if (result == .alertFirstButtonReturn) {
                 
             } else if result == .alertSecondButtonReturn {
@@ -2649,8 +2649,7 @@ extension KMMainViewController : KMToolbarViewControllerDelegate {
         }else if type == .Form {
             self.showFormAlertView()
         }else if type == .Select {
-
-            self.closeRightPane()
+            toggleCloseRightSide()
         }
     }
     
@@ -2793,7 +2792,7 @@ extension KMMainViewController : KMToolbarViewControllerDelegate {
                 }
                 if (index == 1) { /// 取消
                     ///
-                    self.closeRightPane()
+                    toggleCloseRightSide()
                     return
                 } else if index == 3 {
                     let fpath = self.document?.documentURL?.path ?? ""
@@ -2859,7 +2858,7 @@ extension KMMainViewController : KMToolbarViewControllerDelegate {
                 } else if (index == 2) { /// 应用
                      
                 } else if index == 5 {
-                     self.openRightPane()
+                     self.toggleOpenRightSide()
                 }
             } else if (type == .redact) { /// 标记密文
                 if !IAPProductsManager.default().isAvailableAllFunction(){
@@ -3176,7 +3175,7 @@ extension KMMainViewController : KMToolbarViewControllerDelegate {
                     let fpath = self.document?.documentURL?.path ?? ""
                     self.showBatchWindow(type: .RemoveWatermark, filepaths: [fpath])
                 } else if index == 5 {
-                     self.openRightPane()
+                    toggleOpenRightSide()
                     return
                 }
             } else if type == .background {
@@ -3227,7 +3226,7 @@ extension KMMainViewController : KMToolbarViewControllerDelegate {
                     let fpath = self.document?.documentURL?.path ?? ""
                     self.showBatchWindow(type: .RemoveBackground, filepaths: [fpath])
                 } else if index == 5 {
-                     self.openRightPane()
+                    toggleOpenRightSide()
                     return
                 }
             } else if type == .measure {
@@ -3347,7 +3346,7 @@ extension KMMainViewController : KMToolbarViewControllerDelegate {
                     
                 }
                 
-                 self.openRightPane()
+                toggleOpenRightSide()
             }
         }
     }
@@ -3379,9 +3378,9 @@ extension KMMainViewController : KMToolbarViewControllerDelegate {
                     if toolbarItem.isSelected {
                         FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_PageDisplay", withProperties: ["SubTbr_Btn": "Btn_SubTbr_PageDisplay_ViewSetting"])
  
-                        self.openRightPane()
+                        toggleOpenRightSide()
                     }else{
-                         closeRightPane()
+                        toggleCloseRightSide()
                     }
                     if toolbarItem.isSelected {
                         FMTrackEventManager.defaultManager.trackEvent(event: "Tbr", withProperties: ["Tbr_Btn": "Btn_Tbr_PageDisplay"])
@@ -3453,10 +3452,9 @@ extension KMMainViewController : KMToolbarViewControllerDelegate {
                     toolbarItem.isSelected = !toolbarItem.isSelected
                      self.listView.annotationType = .unkown
                     if toolbarItem.isSelected {
- 
-                         self.openRightPane()
+                        toggleOpenRightSide()
                     }else{
-                         closeRightPane()
+                        toggleCloseRightSide()
                     }
                 } else if toolbarItem.itemIdentifier == KMToolbarSnapshotIdentifier {
                     FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_PageDisplay", withProperties: ["SubTbr_Btn": "Btn_SubTbr_PageDisplay_Snapshot"])

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

@@ -258,7 +258,7 @@ extension KMMainViewController: KMToolbarControllerDelegate {
                 }
             }
             self.listView.annotationType = .unkown
-            self.closeRightPane()
+            toggleCloseRightSide()
         } else {
             let type = CAnnotationType(rawValue: item.tag) ?? CAnnotationType.unkown
             self.trackEvent(annotationType: type)
@@ -295,24 +295,24 @@ extension KMMainViewController: KMToolbarControllerDelegate {
             let toolMode = self.listView.toolMode ?? .none
            
             if !viewManager.isPDFReadMode {
-                self.openRightPane()
+                toggleOpenRightSide()
             }
         } else if self.listView.toolMode == .editPDFToolMode {
             if editSelectd {
                 self.listView.setShouAddEdit([])
                 self.listView.change([.text, .image])
                 self.listView.annotationType = .editTextImage
-                self.closeRightPane()
+                toggleCloseRightSide()
             } else if self.listView.annotationType == .addText {
                 if !viewManager.isPDFReadMode {
-                    self.openRightPane()
+                    toggleOpenRightSide()
                 }
                 FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_EditPDF", withProperties: ["SubTbr_Btn" : "Btn_SubTbr_EditPDF_AddText"])
                 self.listView.setShouAddEdit(.text)
                 self.listView.change(.text)
             } else if self.listView.annotationType == .addImage {
                 if !viewManager.isPDFReadMode {
-                    self.openRightPane()
+                    toggleOpenRightSide()
                 }
                 FMTrackEventManager.defaultManager.trackEvent(event: "SubTbr_EditPDF", withProperties: ["SubTbr_Btn" : "Btn_SubTbr_EditPDF_AddImage"])
  
@@ -321,8 +321,7 @@ extension KMMainViewController: KMToolbarControllerDelegate {
 
             }
         } else {
-
-            self.closeRightPane()
+            toggleCloseRightSide()
         }
     }
     

PDF Office/PDF Master/KMClass/KMNPDFPageEdit/KMNPDFInsert/KMNPDFInsertBlankWindowController.swift

@@ -642,6 +642,7 @@ class KMNPDFInsertBlankWindowController: KMNBaseWindowController {
     
 }
 
+//MARK: - ComponentInputNumberDelegate
 extension KMNPDFInsertBlankWindowController: ComponentInputNumberDelegate {
     func componentInputNumberDidValueChanged(inputNumber: ComponentInputNumber?) {
         if(inputNumber == pageNumInput) {
@@ -650,6 +651,7 @@ extension KMNPDFInsertBlankWindowController: ComponentInputNumberDelegate {
     }
 }
 
+//MARK: - ComponentSelectDelegate
 extension KMNPDFInsertBlankWindowController: ComponentSelectDelegate {
     func componentSelectDidSelect(view: ComponentSelect?, menuItemProperty: ComponentMenuitemProperty?) {
         if(view == unitSelect) {
@@ -671,6 +673,7 @@ extension KMNPDFInsertBlankWindowController: ComponentSelectDelegate {
     
 }
 
+//MARK: - ComponentInputDelegate
 extension KMNPDFInsertBlankWindowController: ComponentInputDelegate {
    
     //文字变化

PDF Office/PDF Master/KMClass/KMNPDFPageEdit/KMNPDFSplit/KMNSplitPDFWindowController.swift

@@ -672,6 +672,7 @@ extension KMNSplitPDFWindowController: ComponentSelectDelegate {
     }
 }
 
+//MARK: - ComponentInputDelegate
 extension KMNSplitPDFWindowController: ComponentInputDelegate {
     func componentInputDidEndEditing(inputView: ComponentInput) {
         

PDF Office/PDF Master/KMClass/KMPDFViewController/KMMainViewController.swift

@@ -285,6 +285,7 @@ import KMComponentLibrary
         
     }
     
+    //MARK: - private
     func setupUI() {
         
         initPDFView()
@@ -298,42 +299,7 @@ import KMComponentLibrary
     
     private func documentLoadComplete() {
         
-        initBotaView()
-    }
-    
-    func leftSidePaneIsOpen() -> Bool {
-        if(botaViewController != nil) {
-            return infoContendSplitView.isSubviewCollapsed(botaViewController!.view)
-            
-        }
-        return false
-    }
-    
-    private func toggleOpenLeftSide(pdfSideBarType: KMPDFSidebarType) {
-        if(leftSidePaneIsOpen() == false) {
-            infoContendSplitView.setPosition(264, ofDividerAt: 0)
-        }
-        if pdfSideBarType == .search {
-            KMPrint(" search")
-        } else if pdfSideBarType == .thumbnail {
-            botaViewController?.leftsideType = pdfSideBarType
-            KMPrint(" thumbnail")
-        } else if pdfSideBarType == .outline {
-            botaViewController?.outlineViewC.handdler.pdfView = listView
-            botaViewController?.leftsideType = pdfSideBarType
-        } else if pdfSideBarType == .bookmark {
-            botaViewController?.bookmarkViewC.handdler.pdfView = listView
-            botaViewController?.leftsideType = pdfSideBarType
-        } else if pdfSideBarType == .annotation {
-            KMPrint(" annotation")
-        }
-        
-    }
-    
-    private func toggleCloseLeftSide() {
-        if(leftSidePaneIsOpen() == true) {
-            infoContendSplitView.setPosition(-20, ofDividerAt: 0)
-        }
+        initLeftSideController()
     }
     
     //MARK: - PDFView
@@ -487,15 +453,13 @@ import KMComponentLibrary
         updatePDFViewAnnotationMode()
         
         if viewManager.showRightSide == true {
-            openRightPane()
-            
+            toggleOpenRightSide()
         } else {
-            closeRightPane()
-            
+            toggleCloseRightSide()
         }
     }
     
-    //MARK: - 侧边栏
+    //MARK: - 侧边工具栏
     func initSideBar() {
         sidebarBox.borderWidth = 0
         
@@ -513,9 +477,8 @@ import KMComponentLibrary
         sideBarController?.reloadData()
     }
     
-    //MARK: - 侧边栏
-    
-    func initBotaView() {
+    //MARK: - 左边侧边栏
+    func initLeftSideController() {
         if botaViewController == nil {
             botaViewController = KMNLeftSideViewController(listView.document)
         }
@@ -527,6 +490,36 @@ import KMComponentLibrary
         }
     }
     
+    private func leftSidePaneIsOpen() -> Bool {
+        return infoContendSplitView.isSubviewCollapsed(infoSplitLeftView)
+    }
+    
+    private func toggleOpenLeftSide(pdfSideBarType: KMPDFSidebarType) {
+        if(leftSidePaneIsOpen() == false) {
+            infoContendSplitView.setPosition(264, ofDividerAt: 0)
+        }
+        if pdfSideBarType == .search {
+            KMPrint(" search")
+        } else if pdfSideBarType == .thumbnail {
+            botaViewController?.leftsideType = pdfSideBarType
+            KMPrint(" thumbnail")
+        } else if pdfSideBarType == .outline {
+            botaViewController?.outlineViewC.handdler.pdfView = listView
+            botaViewController?.leftsideType = pdfSideBarType
+        } else if pdfSideBarType == .bookmark {
+            botaViewController?.bookmarkViewC.handdler.pdfView = listView
+            botaViewController?.leftsideType = pdfSideBarType
+        } else if pdfSideBarType == .annotation {
+            KMPrint(" annotation")
+        }
+    }
+    
+    private func toggleCloseLeftSide() {
+        if(leftSidePaneIsOpen() == true) {
+            infoContendSplitView.setPosition(-20, ofDividerAt: 0)
+        }
+    }
+    
     //MARK: - 右侧属性栏
     func initRightSideController() {
         if rightSideController == nil {
@@ -541,7 +534,7 @@ import KMComponentLibrary
         rightSideController = nil
     }
     
-    @objc func openRightPane() -> Void {
+    @objc func toggleOpenRightSide() -> Void {
         initRightSideController()
         
         rightSideController?.view.frame = CGRectMake(CGRectGetWidth(bottomContendBox.frame)-264, 0, 264, CGRectGetHeight(bottomContendBox.frame))
@@ -553,7 +546,7 @@ import KMComponentLibrary
         
     }
     
-    @objc func closeRightPane() -> Void {
+    @objc func toggleCloseRightSide() -> Void {
         removeRightSideController()
         
         infoSplitViewRightConst.constant = 0
@@ -587,7 +580,6 @@ import KMComponentLibrary
         }
     }
     
-    
     //MARK: - 页面编辑
     func enterPageEditMode() {
         pageEditViewController = KMNPageEditViewController(self.document)
@@ -2772,7 +2764,7 @@ extension KMMainViewController: CPDFViewDelegate,CPDFListViewDelegate {
                 if isSameAnnotation == false {
                     
                 } else {
-                    self.openRightPane()
+                    self.toggleOpenRightSide()
                 }
                 
                 self.rightSideController?.reloadDataWithPDFView(pdfView: pdfListView)
@@ -2780,13 +2772,12 @@ extension KMMainViewController: CPDFViewDelegate,CPDFListViewDelegate {
                 let fristAnnotation  = annotations.first
                 let className =  NSStringFromClass(fristAnnotation!.classForCoder)
                 if self.viewManager.isPDFReadMode {
-                    
-                    self.closeRightPane()
+                    toggleCloseRightSide()
                 } else {
                     if className != "CPDFStampAnnotation" &&
                         className != "CPDFSignatureAnnotation" &&
                         className != "CPDFListStampAnnotation" {
-                        self.openRightPane()
+                        self.toggleOpenRightSide()
                     }
                     self.rightSideController?.reloadDataWithPDFView(pdfView: pdfListView)
                     
@@ -2822,12 +2813,12 @@ extension KMMainViewController: CPDFViewDelegate,CPDFListViewDelegate {
             }
         } else if (annotations.count == 0){
             if  pdfListView.annotationType == .unkown {
-                self.closeRightPane()
+                toggleCloseRightSide()
             } else {
                 if self.viewManager.isPDFReadMode {
-                    self.closeRightPane()
+                    toggleCloseRightSide()
                 } else {
-                    self.openRightPane()
+                    toggleOpenRightSide()
                 }
             }
         }
@@ -2835,7 +2826,7 @@ extension KMMainViewController: CPDFViewDelegate,CPDFListViewDelegate {
     
     func pdfListViewChangedAnnotationType(_ pdfListView: CPDFListView!, for annotationType: CAnnotationType) {
         if(annotationType == .unkown) {
-            self.closeRightPane()
+            toggleCloseRightSide()
         }
         let aType = annotationType
         if aType.isMarkup() || aType == .anchored || aType == .freeText || aType.isSquare() || aType == .link {
@@ -3605,7 +3596,7 @@ extension KMMainViewController {
             self.addAutoSaveEvent()
         }
         
-        self.closeRightPane()
+        self.toggleCloseRightSide()
         
         self.addKeyEventMonitor()
         
@@ -4900,7 +4891,7 @@ extension KMMainViewController {
                                     self?.listView.change([.text, .image])
                                 }
                                 self?.listView.annotationType = .editTextImage
-                                self?.closeRightPane()
+                                self?.toggleCloseRightSide()
                             } else if(self?.listView.annotationType == .addImage || self!.listView.annotationType == .addText) {
                                 if self?.listView.annotationType == .addImage ||
                                     self?.listView.annotationType == .addText {
@@ -4908,7 +4899,7 @@ extension KMMainViewController {
                                 self?.listView.setShouAddEdit([])
                                 self?.listView.change([.text, .image])
                                 self?.listView.annotationType = .editTextImage
-                                self?.closeRightPane()
+                                self?.toggleCloseRightSide()
                             }
                             
                         } else {