Просмотр исходного кода

【综合】系统菜单栏,View菜单显示左边栏菜单入口补充

tangchao 1 год назад
Родитель
Сommit
e43c69c9b6

+ 6 - 22
PDF Office/PDF Master.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -318,8 +318,8 @@
             filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+MenuAction.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1171"
-            endingLineNumber = "1171"
+            startingLineNumber = "1179"
+            endingLineNumber = "1179"
             landmarkName = "rotateAllRight(_:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -334,8 +334,8 @@
             filePath = "PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2352"
-            endingLineNumber = "2352"
+            startingLineNumber = "2357"
+            endingLineNumber = "2357"
             landmarkName = "autoSelectContent(_:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -350,8 +350,8 @@
             filePath = "PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2081"
-            endingLineNumber = "2081"
+            startingLineNumber = "2086"
+            endingLineNumber = "2086"
             landmarkName = "editWatermark(_:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -420,21 +420,5 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "FD0C024E-A52D-4AAC-87DD-04BF465444B3"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+MenuAction.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "440"
-            endingLineNumber = "440"
-            landmarkName = "toggleReadingBar(_:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 9 - 4
PDF Office/PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift

@@ -617,10 +617,6 @@ extension KMBrowserWindowController {
         KMPrint("editNote ...")
     }
     
-    @IBAction func toggleLeftSidePane(_ sender: Any?) {
-        KMPrint("toggleLeftSidePane ...")
-    }
-    
     @IBAction func changeLeftSidePaneState(_ sender: Any?) {
         KMPrint("changeLeftSidePaneState ...")
     }
@@ -1369,6 +1365,15 @@ extension KMBrowserWindowController: KMSystemViewMenuProtocol {
             document.mainViewController?.toggleReadingBar(sender)
         }
     }
+    
+    @IBAction func toggleLeftSidePane(_ sender: Any?) {
+        if (self.canResponseDocumentAction() == false) {
+            return
+        }
+        if let document = self.browser.activeTabContents() as? KMMainDocument, document.isHome == false {
+            document.mainViewController?.toggleLeftSidePane(sender)
+        }
+    }
 }
 
 // MARK: - KMSystemEditMenuProtocol

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

@@ -439,6 +439,14 @@ extension KMMainViewController {
     @IBAction func toggleReadingBar(_ sender: Any?) {
         KMPrint("toggleReadingBar")
     }
+    
+    @IBAction func toggleLeftSidePane(_ sender: Any?) {
+        if self.leftPanelOpen {
+            self.closeLeftPane()
+        } else {
+            self.openLeftPane()
+        }
+    }
 }
 
 // MARK: Annotation Menu
@@ -1335,6 +1343,16 @@ extension KMMainViewController: NSMenuItemValidation, NSMenuDelegate {
                 return toolMode == .selectToolMode
             }
         }
+        if KMSystemMenu.isViewSelector(sel: action) {
+            if action == KMSystemMenu.View.toggleLeftSidePaneSelector {
+                if self.leftPanelOpen {
+                    menuItem.title = NSLocalizedString("Hide Panel", comment: "Menu item title")
+                } else {
+                    menuItem.title = NSLocalizedString("Show Panel", comment: "Menu item title")
+                }
+                return true
+            }
+        }
         
         return true
     }

+ 6 - 1
PDF Office/PDF Master/Class/SystemMenu/KMSystemViewMenu.swift

@@ -61,6 +61,8 @@ protocol KMSystemViewMenuProtocol {
     
     func toggleReadingBar(_ sender: Any?)
     
+    func toggleLeftSidePane(_ sender: Any?)
+    
 }
 extension KMSystemViewMenuProtocol {
     func menuItemAction_autoScrol(_ sender: Any) {}
@@ -124,6 +126,8 @@ extension KMSystemMenu.View {
     
     public static let toggleReadingBarSelector   = NSSelectorFromString("toggleReadingBar:")
     
+    public static let toggleLeftSidePaneSelector   = NSSelectorFromString("toggleLeftSidePane:")
+    
     public static func actions() -> [Selector] {
         return [self.adjustWidthSelector, self.adjustPageSelector, self.sizeSelector, self.zoomOutSelector, self.zoomInSelector,
                 // page show
@@ -140,6 +144,7 @@ extension KMSystemMenu.View {
                 self.searchSelector, self.topicSelector, self.hiddenPageIndicatorSelector,
                 self.togglePresentationSelector, self.chooseTransitionSelector,
                 self.toggleAutoFlowSelector, self.chooseAutoFlowSettingSelector,
-                self.toggleReadingBarSelector]
+                self.toggleReadingBarSelector,
+                self.toggleLeftSidePaneSelector]
     }
 }