【2025】【综合】快捷键完善

PDF Office/PDF Master/AppDelegate+MenuAction.swift

@@ -420,14 +420,22 @@ extension AppDelegate {
     }
     
     @IBAction func menuItemAction_closeWindow(_ sender: Any) {
-        NSApp.mainWindow?.close()
-        
+        if let windowVC = self.currentBrowserWindowController() {
+            if windowVC.browser != nil {
+                windowVC.browser.closeAllTabs()
+            }
+        }
     }
     
     @IBAction func menuItemAction_closeAllWindows(_ sender: Any) {
         for window in NSApp.windows {
-            window.close()
+            if let windowVC = window.windowController as? KMBrowserWindowController {
+                if windowVC.browser != nil {
+                    windowVC.browser.closeAllTabs()
+                }
+            }
         }
+
     }
     
     @IBAction func menuItemClick_saveAsFlattenedPDF(_ sender: Any) {

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

@@ -180,6 +180,17 @@
                                                 <action selector="menuItemAction_closeDocument:" target="Voe-Tx-rLC" id="Mwq-O0-OFF"/>
                                             </connections>
                                         </menuItem>
+                                        <menuItem title="Close Window" keyEquivalent="W" id="3GO-3y-mjR">
+                                            <connections>
+                                                <action selector="menuItemAction_closeWindow:" target="Voe-Tx-rLC" id="bau-kM-fPy"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Close All Windows" keyEquivalent="W" id="1Ql-Ed-GM4">
+                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="menuItemAction_closeAllWindows:" target="Voe-Tx-rLC" id="ATF-Fw-w5J"/>
+                                            </connections>
+                                        </menuItem>
                                         <menuItem isSeparatorItem="YES" id="GNk-He-mAO"/>
                                         <menuItem title="Save" keyEquivalent="s" id="pxx-59-PXV">
                                             <connections>

PDF Office/PDF Master/Class/ChromiumTabs/src/Tab/CTTabController.m

@@ -248,7 +248,7 @@ static NSString* const kBrowserThemeDidChangeNotification =
     subItem = [menu addItemWithTitle:NSLocalizedString(@"Close Current Tab",nil) action:@selector(closeTab:) keyEquivalent:@"w"];
     [subItem setTarget:self];
     subItem = [menu addItemWithTitle:NSLocalizedString(@"Close All Tabs",nil) action:@selector(closeAllTabs:) keyEquivalent:@"w"];
-    subItem.keyEquivalentModifierMask = NSEventModifierFlagCommand | NSEventModifierFlagOption;
+    subItem.keyEquivalentModifierMask = NSEventModifierFlagCommand | NSEventModifierFlagShift;
     [subItem setTarget:self];
     subItem = [menu addItemWithTitle:NSLocalizedString(@"Move Tab to New Window",nil) action:@selector(openNewWindow:) keyEquivalent:@""];
     [subItem setTarget:self];