【综合】系统菜单栏，View菜单主题菜单入口补充

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

@@ -318,9 +318,9 @@
             filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+MenuAction.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1193"
-            endingLineNumber = "1193"
-            landmarkName = "rotateAllLeft(_:)"
+            startingLineNumber = "1212"
+            endingLineNumber = "1212"
+            landmarkName = "rotateAllRight(_:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -334,8 +334,8 @@
             filePath = "PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2367"
-            endingLineNumber = "2367"
+            startingLineNumber = "2372"
+            endingLineNumber = "2372"
             landmarkName = "autoSelectContent(_:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -350,8 +350,8 @@
             filePath = "PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2096"
-            endingLineNumber = "2096"
+            startingLineNumber = "2101"
+            endingLineNumber = "2101"
             landmarkName = "editWatermark(_:)"
             landmarkType = "7">
          </BreakpointContent>

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

@@ -1239,25 +1239,25 @@ CA
                                                             <action selector="themesColor:" target="Ady-hI-5gd" id="HLl-GU-gSk"/>
                                                         </connections>
                                                     </menuItem>
-                                                    <menuItem title="Themes1" tag="4" id="DWn-PU-6hc">
+                                                    <menuItem title="Themes1" tag="4" hidden="YES" id="DWn-PU-6hc">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
                                                         <connections>
                                                             <action selector="themesColor:" target="Ady-hI-5gd" id="8T5-Lt-1gP"/>
                                                         </connections>
                                                     </menuItem>
-                                                    <menuItem title="Themes2" tag="5" id="YvI-0f-WA5">
+                                                    <menuItem title="Themes2" tag="5" hidden="YES" id="YvI-0f-WA5">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
                                                         <connections>
                                                             <action selector="themesColor:" target="Ady-hI-5gd" id="hII-p1-9lS"/>
                                                         </connections>
                                                     </menuItem>
-                                                    <menuItem title="Themes3" tag="6" id="i1z-vh-727">
+                                                    <menuItem title="Themes3" tag="6" hidden="YES" id="i1z-vh-727">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
                                                         <connections>
                                                             <action selector="themesColor:" target="Ady-hI-5gd" id="a5H-OG-3BX"/>
                                                         </connections>
                                                     </menuItem>
-                                                    <menuItem title="Themes4" tag="7" id="o8C-LV-ujc">
+                                                    <menuItem title="Themes4" tag="7" hidden="YES" id="o8C-LV-ujc">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
                                                         <connections>
                                                             <action selector="themesColor:" target="Ady-hI-5gd" id="TKn-6z-q43"/>

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

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

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

@@ -461,6 +461,25 @@ extension KMMainViewController {
     @IBAction func splitViewAction(_ sender: Any?) {
         KMPrint("splitViewAction")
     }
+    
+    @IBAction func themesColor(_ sender: Any?) {
+        guard let item = sender as? NSMenuItem else {
+            __NSBeep()
+            return
+        }
+        let mode = item.tag
+        if mode == 0 {
+            self.listView.displayMode = .normal
+        } else if mode == 1 {
+            self.listView.displayMode = .soft
+        } else if mode == 2 {
+            self.listView.displayMode = .night
+        } else if mode == 3 {
+            self.listView.displayMode = .green
+        }
+        
+        self.listView.setNeedsDisplayForVisiblePages()
+    }
 }
 
 // MARK: Annotation Menu
@@ -1370,6 +1389,18 @@ extension KMMainViewController: NSMenuItemValidation, NSMenuDelegate {
                     menuItem.state = self.leftSideViewController.type.methodType == .snapshot ? .on : .off
                 }
                 return true
+            } else if action == KMSystemMenu.View.themesColorSelector {
+                let mode = menuItem.tag
+                if mode == 0 {
+                    menuItem.state = self.listView.displayMode == .normal ? .on : .off
+                } else if mode == 1 {
+                    menuItem.state = self.listView.displayMode == .soft ? .on : .off
+                } else if mode == 2 {
+                    menuItem.state = self.listView.displayMode == .night ? .on : .off
+                } else if mode == 3 {
+                    menuItem.state = self.listView.displayMode == .green ? .on : .off
+                }
+                return true
             }
         }
         

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

@@ -65,6 +65,7 @@ protocol KMSystemViewMenuProtocol {
     func changeLeftSidePaneState(_ sender: Any?)
     
     func splitViewAction(_ sender: Any?)
+    func themesColor(_ sender: Any?)
     
 }
 extension KMSystemViewMenuProtocol {
@@ -134,6 +135,7 @@ extension KMSystemMenu.View {
     public static let changeLeftSidePaneStateSelector   = NSSelectorFromString("changeLeftSidePaneState:")
     
     public static let splitViewActionSelector   = NSSelectorFromString("splitViewAction:")
+    public static let themesColorSelector   = NSSelectorFromString("themesColor:")
     
     public static func actions() -> [Selector] {
         return [self.adjustWidthSelector, self.adjustPageSelector, self.sizeSelector, self.zoomOutSelector, self.zoomInSelector,
@@ -154,6 +156,7 @@ extension KMSystemMenu.View {
                 self.toggleReadingBarSelector,
                 self.toggleLeftSidePaneSelector,
                 self.changeLeftSidePaneStateSelector,
-                self.splitViewActionSelector]
+                self.splitViewActionSelector,
+                self.themesColorSelector]
     }
 }