【综合】系统菜单栏，截屏相关菜单在首页无法操作问题修复

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

@@ -626,6 +626,12 @@ extension KMBrowserWindowController: NSMenuDelegate, NSMenuItemValidation {
         }
 
         if (KMSystemMenu.isFileSelector(sel: action)) {
+            if action == KMSystemMenu.File.screenShotSelectAreaSelector ||
+                action == KMSystemMenu.File.screenShotWindowSelector ||
+                action == KMSystemMenu.File.screenShotFullScreenSelector ||
+                action == KMSystemMenu.File.screenShotFullScreenDelaySelector {
+                return true
+            }
             if (document.isHome) {
                 if (menuItem.action == KMSystemMenu.File.closeTagPageSelector ||
                     menuItem.action == KMSystemMenu.File.propertySelector ||

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

@@ -48,6 +48,10 @@ protocol KMSystemFileMenuProtocol {
     func newDocumentFromImage(_ sender: Any?)
     func importFromWebPage(_ sender: Any?)
     
+    func screenShot_SelectArea(_ sender: Any?)
+    func screenShot_Window(_ sender: Any?)
+    func screenShot_FullScreenDelay(_ sender: Any?)
+    func screenShot_FullScreen(_ sender: Any?)
 }
 
 extension KMSystemFileMenuProtocol {
@@ -63,6 +67,11 @@ extension KMSystemFileMenuProtocol {
     func newDocumentFromClipboard(_ sender: Any?) {}
     func newDocumentFromImage(_ sender: Any?) {}
     func importFromWebPage(_ sender: Any?) {}
+    
+    func screenShot_SelectArea(_ sender: Any?) {}
+    func screenShot_Window(_ sender: Any?) {}
+    func screenShot_FullScreenDelay(_ sender: Any?) {}
+    func screenShot_FullScreen(_ sender: Any?) {}
 }
 
 extension KMSystemMenu.File {
@@ -96,6 +105,11 @@ extension KMSystemMenu.File {
     public static let newDocumentFromImageSelector                 = NSSelectorFromString("newDocumentFromImage:")
     public static let importFromWebPageSelector                 = NSSelectorFromString("importFromWebPage:")
     
+    public static let screenShotSelectAreaSelector   = NSSelectorFromString("screenShot_SelectArea:")
+    public static let screenShotWindowSelector   = NSSelectorFromString("screenShot_Window:")
+    public static let screenShotFullScreenDelaySelector   = NSSelectorFromString("screenShot_FullScreenDelay:")
+    public static let screenShotFullScreenSelector   = NSSelectorFromString("screenShot_FullScreen:")
+    
     public static func actions() -> [Selector] {
         return [self.saveAsFlattenedPDFSelector, self.mergePDFSelector, self.compressSelector,
                 // convert
@@ -108,6 +122,7 @@ extension KMSystemMenu.File {
                 self.closeWindowSelector, self.closeAllWindowsSelector, self.closeTagPageSelector,
                 self.showInFinderSelector, self.propertySelector,
                 self.printSelector,
-                self.newDocumentFromClipboardSelector, self.newDocumentFromImageSelector, self.importFromWebPageSelector]
+                self.newDocumentFromClipboardSelector, self.newDocumentFromImageSelector, self.importFromWebPageSelector,
+                self.screenShotSelectAreaSelector, self.screenShotWindowSelector, self.screenShotFullScreenDelaySelector, self.screenShotFullScreenSelector]
     }
 }

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

@@ -69,11 +69,6 @@ protocol KMSystemViewMenuProtocol {
     
     func toggleStatusBar(_ sender: Any?)
     func toggleToolbarShow(_ sender: Any?)
-    
-    func screenShot_SelectArea(_ sender: Any?)
-    func screenShot_Window(_ sender: Any?)
-    func screenShot_FullScreenDelay(_ sender: Any?)
-    func screenShot_FullScreen(_ sender: Any?)
 }
 extension KMSystemViewMenuProtocol {
     func menuItemAction_autoScrol(_ sender: Any) {}
@@ -85,11 +80,6 @@ extension KMSystemViewMenuProtocol {
     
     func menuItemAction_enterFullScreen(_ sender: Any) {}
     func menuItemAction_topic(_ sender: Any) {}
-    
-    func screenShot_SelectArea(_ sender: Any?) {}
-    func screenShot_Window(_ sender: Any?) {}
-    func screenShot_FullScreenDelay(_ sender: Any?) {}
-    func screenShot_FullScreen(_ sender: Any?) {}
 }
 
 extension KMSystemMenu.View {
@@ -152,12 +142,6 @@ extension KMSystemMenu.View {
     public static let toggleStatusBarSelector   = NSSelectorFromString("toggleStatusBar:")
     public static let toggleToolbarShowSelector   = NSSelectorFromString("toggleToolbarShow:")
     
-    public static let screenShotSelectAreaSelector   = NSSelectorFromString("screenShot_SelectArea:")
-    public static let screenShotWindowSelector   = NSSelectorFromString("screenShot_Window:")
-    public static let screenShotFullScreenDelaySelector   = NSSelectorFromString("screenShot_FullScreenDelay:")
-    public static let screenShotFullScreenSelector   = NSSelectorFromString("screenShot_FullScreen:")
-    
-    
     public static func actions() -> [Selector] {
         return [self.adjustWidthSelector, self.adjustPageSelector, self.sizeSelector, self.zoomOutSelector, self.zoomInSelector,
                 // page show
@@ -179,7 +163,6 @@ extension KMSystemMenu.View {
                 self.changeLeftSidePaneStateSelector,
                 self.splitViewActionSelector,
                 self.themesColorSelector,
-                self.toggleStatusBarSelector, self.toggleToolbarShowSelector,
-                self.screenShotSelectAreaSelector, self.screenShotWindowSelector, self.screenShotFullScreenDelaySelector, self.screenShotFullScreenSelector]
+                self.toggleStatusBarSelector, self.toggleToolbarShowSelector]
     }
 }

PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -46,8 +46,8 @@
             filePath = "PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1790"
-            endingLineNumber = "1790"
+            startingLineNumber = "1796"
+            endingLineNumber = "1796"
             landmarkName = "menuItemAction_annotation(_:)"
             landmarkType = "7">
          </BreakpointContent>