【综合】原导出注释菜单项调整

PDF Office/PDF Master/Base.lproj/Main.storyboard

@@ -232,7 +232,13 @@
                                                 <action selector="menuItemClick_Compress:" target="Ady-hI-5gd" id="A8b-eJ-tTH"/>
                                             </connections>
                                         </menuItem>
-                                        <menuItem title="Export Annotations…" id="y0O-cH-jCU">
+                                        <menuItem title="Export Annotations" id="EYn-Cd-24d">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="menuItemClick_ExportNote:" target="Ady-hI-5gd" id="L0c-Qo-Yxg"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Export Annotations…" hidden="YES" id="y0O-cH-jCU">
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <menu key="submenu" title="Export Annotations…" id="T4A-e0-hCA">
                                                 <items>

PDF Office/PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift

@@ -1125,7 +1125,6 @@ extension KMBrowserWindowController {
 // MARK: - KMSystemFileMenuProtocol
 
 extension KMBrowserWindowController: KMSystemFileMenuProtocol {
-    
     func menuItemClick_saveAsFlattenedPDF(_ sender: Any) {
         if (self.canResponseDocumentAction() == false) {
             return
@@ -1164,6 +1163,18 @@ extension KMBrowserWindowController: KMSystemFileMenuProtocol {
         }
     }
     
+    func menuItemClick_ExportNote(_ sender: Any) {
+        if (self.canResponseDocumentAction() == false) {
+            return
+        }
+        if let document = self.browser?.activeTabContents() as? KMMainDocument {
+            if (document.isHome) {
+            } else {
+                document.mainViewController?.menuItemClick_ExportNote(sender)
+            }
+        }
+    }
+    
     func menuItemAction_ConvertToWord(_ sender: Any) {
         if (self.canResponseDocumentAction() == false) {
             return

PDF Office/PDF Master/Class/Home/ViewController/KMHomeViewController+Action.swift

@@ -42,7 +42,6 @@ extension KMHomeViewController: NSMenuItemValidation {
              return false
         }
         
-        
         if menuItem.action == #selector(menuItemClick_SettingPassword) ||
             menuItem.action == #selector(menuItemClick_Compress) {
             guard let _windowC = NSApp.mainWindow?.windowController as? KMBrowserWindowController else {
@@ -52,6 +51,15 @@ extension KMHomeViewController: NSMenuItemValidation {
             let isHome = _windowC.browser?.activeTabContents()?.isHome ?? false
             return !isHome
        }
+        
+        guard let action = menuItem.action else {
+            return false
+        }
+        if KMSystemMenu.isFileSelector(sel: action) {
+            if action == KMSystemMenu.File.exportNoteSelector {
+                return false
+            }
+        }
         return true
     }
 }

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/KMLeftSideViewController+Note.swift

@@ -185,7 +185,7 @@ extension KMLeftSideViewController {
         var rowIndexes = self.noteOutlineView.selectedRowIndexes
         let row = self.noteOutlineView.clickedRow
         if row == -1 {
-            _ = self._addExportPDFMenu(menu)
+//            _ = self._addExportPDFMenu(menu)
             _ = self._addDeleteAllAnnoItem(menu)
             return
         }
@@ -232,9 +232,9 @@ extension KMLeftSideViewController {
         }
         
         if menu.numberOfItems > 0 {
-            _ = self._addExportPDFMenu(menu)
+//            _ = self._addExportPDFMenu(menu)
             
-            menu.addItem(.separator())
+//            menu.addItem(.separator())
             if self.outlineView(self.noteOutlineView, canDeleteItems: items as? [Any] ?? []) {
                 item = menu.addItem(title: KMLocalizedString("Delete", "Menu item title"), action: #selector(deleteNotes), target: self)
                 item?.representedObject = items
@@ -312,8 +312,8 @@ extension KMLeftSideViewController {
         showItem?.submenu = subMenu
         menu.addItem(.separator())
 
-        _ = self._addExportPDFMenu(menu)
-        menu.addItem(.separator())
+//        _ = self._addExportPDFMenu(menu)
+//        menu.addItem(.separator())
         _ = self._addDeleteAllAnnoItem(menu)
         _ = self._addDeleteAllReplyAnnoItem(menu)
         
@@ -445,7 +445,7 @@ extension KMLeftSideViewController {
         }
     }
     
-    @objc func exportNotes(_ sender: NSMenuItem) {
+    @objc func exportNotes(_ sender: NSMenuItem?) {
         guard let cnt = self.listView?.notes.count, cnt > 0 else {
             NSSound.beep()
             return

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

@@ -89,6 +89,10 @@ extension KMMainViewController {
 }
 
 extension KMMainViewController: KMSystemFileMenuProtocol {
+    @IBAction func menuItemClick_ExportNote(_ sender: Any) {
+        self.leftSideViewController.exportNotes(sender as? NSMenuItem)
+    }
+    
     @IBAction func menuItemClick_saveAsFlattenedPDF(_ sender: Any) {
         Task { @MainActor in
             if IAPProductsManager.default().isAvailableAllFunction() == false {

PDF Office/PDF Master/Class/SystemMenu/KMSystemFileMenu.swift

@@ -21,6 +21,7 @@ protocol KMSystemFileMenuProtocol {
     func menuItemClick_saveAsFlattenedPDF(_ sender: Any)
     func menuItemClick_mergePDF(_ sender: Any)
     func menuItemClick_Compress(_ sender: Any)
+    func menuItemClick_ExportNote(_ sender: Any)
     
     func menuItemClick_Convert(_ sender: Any)
     func menuItemAction_ConvertToWord(_ sender: Any)
@@ -78,6 +79,7 @@ extension KMSystemMenu.File {
     public static let saveAsFlattenedPDFSelector              = NSSelectorFromString("menuItemClick_saveAsFlattenedPDF:")
     public static let mergePDFSelector              = NSSelectorFromString("menuItemClick_mergePDF:")
     public static let compressSelector              = NSSelectorFromString("menuItemClick_Compress:")
+    public static let exportNoteSelector              = NSSelectorFromString("menuItemClick_ExportNote:")
     
     public static let convertSelector               = NSSelectorFromString("menuItemClick_Convert:")
     public static let convertToWordSelector         = NSSelectorFromString("menuItemAction_ConvertToWord:")
@@ -111,7 +113,7 @@ extension KMSystemMenu.File {
     public static let screenShotFullScreenSelector   = NSSelectorFromString("screenShot_FullScreen:")
     
     public static func actions() -> [Selector] {
-        return [self.saveAsFlattenedPDFSelector, self.mergePDFSelector, self.compressSelector,
+        return [self.saveAsFlattenedPDFSelector, self.mergePDFSelector, self.compressSelector, self.exportNoteSelector,
                 // convert
                 self.convertSelector, self.convertToWordSelector, self.convertToExcelSelector, self.convertToPPTSelector,
                 self.convertToRTFSelector, self.convertToHTMLSelector, self.convertToTextSelector, self.convertToCSVSelector,