【综合】系统菜单栏，View菜单 自动滚动相关菜单入口补充

PDF Office/PDF Master.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -174,8 +174,8 @@
             filePath = "PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "537"
-            endingLineNumber = "537"
+            startingLineNumber = "540"
+            endingLineNumber = "540"
             landmarkName = "openBlankPage(_:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -206,8 +206,8 @@
             filePath = "PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "534"
-            endingLineNumber = "534"
+            startingLineNumber = "537"
+            endingLineNumber = "537"
             landmarkName = "openBlankPage(_:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -318,8 +318,8 @@
             filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+MenuAction.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1160"
-            endingLineNumber = "1160"
+            startingLineNumber = "1167"
+            endingLineNumber = "1167"
             landmarkName = "rotateAllRight(_:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -334,8 +334,8 @@
             filePath = "PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2334"
-            endingLineNumber = "2334"
+            startingLineNumber = "2347"
+            endingLineNumber = "2347"
             landmarkName = "autoSelectContent(_:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -350,8 +350,8 @@
             filePath = "PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2063"
-            endingLineNumber = "2063"
+            startingLineNumber = "2076"
+            endingLineNumber = "2076"
             landmarkName = "editWatermark(_:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -420,21 +420,5 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "F25E0E30-3CCC-44C5-B821-C0F38579254A"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+MenuAction.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "416"
-            endingLineNumber = "416"
-            landmarkName = "togglePresentation(_:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

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

@@ -483,6 +483,9 @@ extension KMBrowserWindowController: NSMenuDelegate, NSMenuItemValidation {
         if (KMSystemMenu.isAnnotationSelector(sel: action)) {
             return document.isHome ? false : document.mainViewController!.validateMenuItem(menuItem)
         }
+        if (KMSystemMenu.isPDFSelector(sel: action)) {
+            return document.isHome ? false : document.mainViewController!.validateMenuItem(menuItem)
+        }
         if (KMSystemMenu.isGotoSelector(sel: action)) {
             return document.isHome ? false : document.mainViewController!.validateMenuItem(menuItem)
         }
@@ -614,13 +617,6 @@ extension KMBrowserWindowController {
         KMPrint("editNote ...")
     }
     
-    @IBAction func toggleAutoFlow(_ sender: Any?) {
-        KMPrint("toggleAutoFlow ...")
-    }
-    @IBAction func chooseAutoFlowSetting(_ sender: Any?) {
-        KMPrint("chooseAutoFlowSetting ...")
-    }
-    
     @IBAction func toggleReadingBar(_ sender: Any?) {
         KMPrint("toggleReadingBar ...")
     }
@@ -1351,6 +1347,23 @@ extension KMBrowserWindowController: KMSystemViewMenuProtocol {
             document.mainViewController?.chooseTransition(sender)
         }
     }
+    
+    @IBAction func toggleAutoFlow(_ sender: Any?) {
+        if (self.canResponseDocumentAction() == false) {
+            return
+        }
+        if let document = self.browser.activeTabContents() as? KMMainDocument, document.isHome == false {
+            document.mainViewController?.toggleAutoFlow(sender)
+        }
+    }
+    @IBAction func chooseAutoFlowSetting(_ sender: Any?) {
+        if (self.canResponseDocumentAction() == false) {
+            return
+        }
+        if let document = self.browser.activeTabContents() as? KMMainDocument, document.isHome == false {
+            document.mainViewController?.chooseAutoFlowSetting(sender)
+        }
+    }
 }
 
 // MARK: - KMSystemEditMenuProtocol

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

@@ -428,6 +428,13 @@ extension KMMainViewController {
 //                SKDESTROY(presentationSheetController);
 //            }];
     }
+    
+    @IBAction func toggleAutoFlow(_ sender: Any?) {
+        KMPrint("toggleAutoFlow")
+    }
+    @IBAction func chooseAutoFlowSetting(_ sender: Any?) {
+        KMPrint("chooseAutoFlowSetting")
+    }
 }
 
 // MARK: Annotation Menu

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

@@ -56,6 +56,9 @@ protocol KMSystemViewMenuProtocol {
     func togglePresentation(_ sender: Any?)
     func chooseTransition(_ sender: Any?)
     
+    func toggleAutoFlow(_ sender: Any?)
+    func chooseAutoFlowSetting(_ sender: Any?)
+    
 }
 extension KMSystemViewMenuProtocol {
     func menuItemAction_autoScrol(_ sender: Any) {}
@@ -114,6 +117,9 @@ extension KMSystemMenu.View {
     public static let togglePresentationSelector   = NSSelectorFromString("togglePresentation:")
     public static let chooseTransitionSelector   = NSSelectorFromString("chooseTransition:")
     
+    public static let toggleAutoFlowSelector   = NSSelectorFromString("toggleAutoFlow:")
+    public static let chooseAutoFlowSettingSelector   = NSSelectorFromString("chooseAutoFlowSetting:")
+    
     public static func actions() -> [Selector] {
         return [self.adjustWidthSelector, self.adjustPageSelector, self.sizeSelector, self.zoomOutSelector, self.zoomInSelector,
                 // page show
@@ -128,6 +134,7 @@ extension KMSystemMenu.View {
                 self.hiddenLeftSideSelector, self.hiddenRightSideSelector,
                 self.thumaiSelector, self.outlineSelector, self.bookmarkSelector, self.annotationSelector,
                 self.searchSelector, self.topicSelector, self.hiddenPageIndicatorSelector,
-                self.togglePresentationSelector, self.chooseTransitionSelector]
+                self.togglePresentationSelector, self.chooseTransitionSelector,
+                self.toggleAutoFlowSelector, self.chooseAutoFlowSettingSelector]
     }
 }