【2025】【综合】菜单栏快捷键补充

PDF Office/PDF Master/AppDelegate+MenuAction.swift

@@ -232,6 +232,8 @@ extension AppDelegate {
         }
         let selectors = [NSSelectorFromString("menuItemAction_NewFromFile:"),
                          NSSelectorFromString("menuItemAction_Open:"),
+                         NSSelectorFromString("menuItemAction_NewTab:"),
+                         NSSelectorFromString("menuItemAction_NewWindow:"),
                          NSSelectorFromString("menuItemAction_NewFromWeb:"),
                          NSSelectorFromString("menuItemAction_NewFromClipboard:"),
                          NSSelectorFromString("menuItemAction_NewFromScanner:"),
@@ -285,6 +287,10 @@ extension AppDelegate {
             return true
         } else if action == NSSelectorFromString("menuItemAction_Open:") {
             return true
+        } else if action == NSSelectorFromString("menuItemAction_NewTab:") {
+            return true
+        } else if action == NSSelectorFromString("menuItemAction_NewWindow:") {
+            return true
         }
         
         if let mainVC = self.mainViewController() {
@@ -334,6 +340,22 @@ extension AppDelegate {
         }
     }
     
+    @IBAction func menuItemAction_NewTab(_ sender: NSMenuItem) -> Void {
+        if let _windowC = NSApp.mainWindow?.windowController as? KMBrowserWindowController {
+            _windowC.openDocumentWindow()
+        }
+    }
+    
+    @IBAction func menuItemAction_NewWindow(_ sender: NSMenuItem) -> Void {
+        if let _windowC = NSApp.mainWindow?.windowController as? KMBrowserWindowController {
+            let browser: KMBrowser = KMBrowser.init()
+            browser.windowController = KMBrowserWindowController.init(browser: browser)
+            browser.addHomeTabContents()
+            browser.windowController.window?.center()
+            browser.windowController.showWindow(self)
+        }
+    }
+     
     @IBAction func menuItemAction_NewFromFile(_ sender: NSMenuItem) -> Void {
         if let _windowC = NSApp.mainWindow?.windowController as? KMBrowserWindowController {
             _windowC.newFromFile()
@@ -736,6 +758,8 @@ extension AppDelegate {
                     menuItem.state = .on
                 } else if menuItem.tag == 3 && mainVC.viewManager.pdfSideBarType == .annotation {
                     menuItem.state = .on
+                } else if menuItem.tag == 4 && mainVC.viewManager.pdfSideBarType == .search {
+                    menuItem.state = .on
                 }
             } else if action == NSSelectorFromString("menuItemAction_Themes:") {
                 menuItem.state = .off 
@@ -845,6 +869,12 @@ extension AppDelegate {
                 } else {
                     mainVC.viewManager.pdfSideBarType = .annotation
                 }
+            } else if sender.tag == 4 {
+                if mainVC.viewManager.pdfSideBarType == .search {
+                    mainVC.viewManager.pdfSideBarType = .none
+                } else {
+                    mainVC.viewManager.pdfSideBarType = .search
+                }
             }
             if mainVC.viewManager.pdfSideBarType == .none {
                 mainVC.toggleCloseLeftSide()

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

@@ -163,9 +163,21 @@
                                             </menu>
                                         </menuItem>
                                         <menuItem isSeparatorItem="YES" id="mwc-zC-aSx"/>
-                                        <menuItem title="Open…" keyEquivalent="o" id="Was-JA-tGl">
+                                        <menuItem title="New Tab" keyEquivalent="t" id="Was-JA-tGl">
                                             <connections>
-                                                <action selector="menuItemAction_Open:" target="Voe-Tx-rLC" id="jie-Z3-LV7"/>
+                                                <action selector="menuItemAction_NewTab:" target="Voe-Tx-rLC" id="PaJ-sV-UQg"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="New Window" keyEquivalent="t" id="4uV-rw-egJ">
+                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="menuItemAction_NewWindow:" target="Voe-Tx-rLC" id="yw1-8h-ej4"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="Ncz-3w-KFo"/>
+                                        <menuItem title="Open…" keyEquivalent="o" id="d0B-s2-mwc">
+                                            <connections>
+                                                <action selector="menuItemAction_Open:" target="Voe-Tx-rLC" id="Wab-TQ-9Vu"/>
                                             </connections>
                                         </menuItem>
                                         <menuItem title="Merge PDF Files" id="tXI-mr-wws">
@@ -721,12 +733,19 @@ CA
                                                 </items>
                                             </menu>
                                         </menuItem>
-                                        <menuItem title="Thumbnails" keyEquivalent="1" id="pfC-b1-Lf2">
+                                        <menuItem isSeparatorItem="YES" id="dug-RR-gwW"/>
+                                        <menuItem title="Search" tag="4" keyEquivalent="f" id="pfC-b1-Lf2">
                                             <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
                                             <connections>
                                                 <action selector="menuItemAction_BOTAMode:" target="Voe-Tx-rLC" id="dPA-VN-4DE"/>
                                             </connections>
                                         </menuItem>
+                                        <menuItem title="Thumbnails" keyEquivalent="1" id="vVt-rb-xpd">
+                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="menuItemAction_BOTAMode:" target="Voe-Tx-rLC" id="ZKO-O2-Jqw"/>
+                                            </connections>
+                                        </menuItem>
                                         <menuItem title="Outline" tag="1" keyEquivalent="2" id="T4N-oM-heb">
                                             <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
                                             <connections>

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

@@ -223,13 +223,6 @@ import Cocoa
     
     func commandDispatch(_ sender: Any) -> Void {
         var needShowChooseWindow = false
-//#if VERSION_FREE
-//#if VERSION_DMG
-        if (!IAPProductsManager.default().isAvailableAllFunction()) {
-            needShowChooseWindow = true
-        }
-//#endif
-
         if needShowChooseWindow {
             let preferenceNoteShow = UserDefaults.standard.bool(forKey: KMTabbingHintShowFlag)
             if preferenceNoteShow {