【MainMenu】文件菜单调整item顺序和补充一些菜单

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

@@ -356,5 +356,85 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "017D8E63-C59C-474C-8D86-56EABCF89CEF"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "513"
+            endingLineNumber = "513"
+            landmarkName = "openBlankPage(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "C7D5FAD7-6212-42AC-9A70-C8237FF4EB89"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "558"
+            endingLineNumber = "558"
+            landmarkName = "screenShot_FullScreenDelay(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "A7EA912F-FD84-4D3F-B327-D44A1EC37889"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "546"
+            endingLineNumber = "546"
+            landmarkName = "importFromWebPage(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "C26F29DC-2234-4254-AF30-35AE492835DD"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "543"
+            endingLineNumber = "543"
+            landmarkName = "newDocumetFromImage(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "A82F3388-A61A-4717-B375-568DAD4759AC"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "540"
+            endingLineNumber = "540"
+            landmarkName = "newDocumentFromClipboard(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -95,33 +95,70 @@
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <menu key="submenu" title="File" id="bib-Uj-vzu">
                                     <items>
-                                        <menuItem title="Open…" keyEquivalent="o" id="Was-JA-tGl">
-                                            <connections>
-                                                <action selector="openDocument:" target="Ady-hI-5gd" id="gYs-by-9rD"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem isSeparatorItem="YES" id="J17-Ba-Sii"/>
                                         <menuItem title="New" id="S7l-RN-GCc">
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <menu key="submenu" id="Ezv-e9-zNi">
                                                 <items>
+                                                    <menuItem title="New Blank Page" keyEquivalent="n" id="438-K6-hfS">
+                                                        <connections>
+                                                            <action selector="openBlankPage:" target="Ady-hI-5gd" id="vud-KX-cf4"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="New From Clipboard" id="GV6-db-UG1">
+                                                        <connections>
+                                                            <action selector="newDocumentFromClipboard:" target="Ady-hI-5gd" id="36b-g6-zeT"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="New From Images" id="Fyj-2Z-b8N">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="newDocumentFromImage:" target="Ady-hI-5gd" id="C7r-ha-RKC"/>
+                                                        </connections>
+                                                    </menuItem>
                                                     <menuItem title="New From File" id="dmH-To-Yta">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
                                                         <connections>
                                                             <action selector="importFromFile:" target="Ady-hI-5gd" id="gMi-3N-Hu5"/>
                                                         </connections>
                                                     </menuItem>
-                                                    <menuItem title="New Blank Page" keyEquivalent="n" id="438-K6-hfS">
+                                                    <menuItem title="New From Web Page" id="qhS-qY-9x4">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
                                                         <connections>
-                                                            <action selector="openBlankPage:" target="Ady-hI-5gd" id="vud-KX-cf4"/>
+                                                            <action selector="importFromWebPage:" target="Ady-hI-5gd" id="Q7D-dX-TfO"/>
                                                         </connections>
                                                     </menuItem>
-                                                    <menuItem title="Import From Scanner" id="BpJ-Iu-6fh">
+                                                    <menuItem title="Import From Scanner" hidden="YES" id="BpJ-Iu-6fh">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
                                                         <connections>
                                                             <action selector="importFromScanner:" target="Ady-hI-5gd" id="aAR-w9-N3e"/>
                                                         </connections>
                                                     </menuItem>
+                                                    <menuItem isSeparatorItem="YES" id="Ern-Bu-6ca"/>
+                                                    <menuItem title="Take Screenshot" id="mfm-y5-93C">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <menu key="submenu" title="Take Screenshot" id="Hhd-va-oCX">
+                                                            <items>
+                                                                <menuItem title="From Selection…" id="qXi-Vx-NNZ">
+                                                                    <modifierMask key="keyEquivalentModifierMask"/>
+                                                                    <connections>
+                                                                        <action selector="screenShot_SelectArea:" target="Ady-hI-5gd" id="I7c-PO-gV2"/>
+                                                                    </connections>
+                                                                </menuItem>
+                                                                <menuItem title="From Window…" id="XUM-IQ-nEo">
+                                                                    <modifierMask key="keyEquivalentModifierMask"/>
+                                                                    <connections>
+                                                                        <action selector="screenShot_Window:" target="Ady-hI-5gd" id="mIa-dv-sZ4"/>
+                                                                    </connections>
+                                                                </menuItem>
+                                                                <menuItem title="From Entire Screen" id="da8-Lp-LKs">
+                                                                    <modifierMask key="keyEquivalentModifierMask"/>
+                                                                    <connections>
+                                                                        <action selector="screenShot_FullScreen:" target="Ady-hI-5gd" id="Dr6-my-01i"/>
+                                                                    </connections>
+                                                                </menuItem>
+                                                            </items>
+                                                        </menu>
+                                                    </menuItem>
                                                 </items>
                                             </menu>
                                         </menuItem>
@@ -130,6 +167,12 @@
                                                 <action selector="menuItemAction_newTab:" target="Ady-hI-5gd" id="4pW-tA-Ff5"/>
                                             </connections>
                                         </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="mwc-zC-aSx"/>
+                                        <menuItem title="Open…" keyEquivalent="o" id="Was-JA-tGl">
+                                            <connections>
+                                                <action selector="openDocument:" target="Ady-hI-5gd" id="gYs-by-9rD"/>
+                                            </connections>
+                                        </menuItem>
                                         <menuItem title="Merge PDF Files" id="tXI-mr-wws">
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <connections>
@@ -137,6 +180,11 @@
                                             </connections>
                                         </menuItem>
                                         <menuItem isSeparatorItem="YES" id="m54-Is-iLE"/>
+                                        <menuItem title="Close" keyEquivalent="w" id="f7Y-HY-lb9">
+                                            <connections>
+                                                <action selector="performClose:" target="Ady-hI-5gd" id="nbR-E4-gHv"/>
+                                            </connections>
+                                        </menuItem>
                                         <menuItem title="Save" keyEquivalent="s" id="pxx-59-PXV">
                                             <connections>
                                                 <action selector="saveDocument:" target="Ady-hI-5gd" id="dSX-5h-vIH"/>
@@ -159,6 +207,55 @@
                                                 <action selector="menuItemClick_Compress:" target="Ady-hI-5gd" id="A8b-eJ-tTH"/>
                                             </connections>
                                         </menuItem>
+                                        <menuItem title="Export Annotations…" id="y0O-cH-jCU">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Export Annotations…" id="T4A-e0-hCA">
+                                                <items>
+                                                    <menuItem title="PDF" keyEquivalent="s" id="1Ki-1r-JIH">
+                                                        <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
+                                                        <connections>
+                                                            <action selector="saveDocumentTo:" target="Ady-hI-5gd" id="cVL-5y-EL2"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="PDF Bundle" tag="1" id="ViS-JV-Mee">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="saveDocumentTo:" target="Ady-hI-5gd" id="uTG-CY-ce0"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="PDF Reader Pro Edition Notes" tag="2" id="9KX-px-SBe">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="saveDocumentTo:" target="Ady-hI-5gd" id="geD-lD-nZa"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Notes as Text" tag="3" id="HOX-yg-TwW">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="saveDocumentTo:" target="Ady-hI-5gd" id="muE-mf-q2z"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Notes as RTF" tag="4" id="gUL-u2-WcK">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="saveDocumentTo:" target="Ady-hI-5gd" id="j6o-aF-PZq"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Notes as RTFD" tag="5" id="VLy-at-QYd">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="saveDocumentTo:" target="Ady-hI-5gd" id="tPd-FD-e5F"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Notes as FDF" tag="6" id="wh3-SI-WLu">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="saveDocumentTo:" target="Ady-hI-5gd" id="rxL-Dk-FER"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </menuItem>
                                         <menuItem title="Convert To" id="gk1-vZ-Tq6">
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <menu key="submenu" title="Convert To" id="bmt-zX-A6l">

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

@@ -532,11 +532,39 @@ extension KMBrowserWindowController {
     @IBAction func menuItemAction_newTab(_ sender: Any) {
         self.openDocumentWindow()
     }
+    
+    /// New
+
+    @IBAction func newDocumentFromClipboard(_ sender: Any?) {
+        KMPrint("newDocumentFromClipboard")
+    }
+    @IBAction func newDocumetFromImage(_ sender: Any?) {
+        KMPrint("importFromWebPage")
+    }
+    @IBAction func importFromWebPage(_ sender: Any?) {
+        KMPrint("importFromWebPage")
+    }
+    
+    ///  screenShot
+    
+    @IBAction func screenShot_SelectArea(_ sender: Any?) {
+        KMPrint("screenShot_SelectArea")
+    }
+    @IBAction func screenShot_Window(_ sender: Any?) {
+        KMPrint("screenShot_Window")
+    }
+    @IBAction func screenShot_FullScreenDelay(_ sender: Any?) {
+        KMPrint("screenShot_FullScreenDelay")
+    }
+    @IBAction func screenShot_FullScreen(_ sender: Any?) {
+        KMPrint("screenShot_FullScreen")
+    }
 }
 
 // MARK: - KMSystemFileMenuProtocol
 
 extension KMBrowserWindowController: KMSystemFileMenuProtocol {
+    
     func menuItemClick_saveAsFlattenedPDF(_ sender: Any) {
         if (self.canResponseDocumentAction() == false) {
             return

PDF Office/PDF Master/KMSystemMenu.swift

@@ -8,6 +8,16 @@
 import Cocoa
 
 protocol KMSystemFileMenuProtocol {
+    /// New
+    func menuItemAction_newDocumentFromClipboard(_ sender: Any?)
+    func menuItemAction_newDocumetFromImage(_ sender: Any?)
+    func menuItemAction_importFromWebPage(_ sender: Any?)
+    ///  screenShot
+    func menuItemAction_screenShotSelectArea(_ sender: Any?)
+    func menuItemAction_screenShotWindow(_ sender: Any?)
+    func menuItemAction_screenShotFullScreenDelay(_ sender: Any?)
+    func menuItemAction_screenShotFullScreen(_ sender: Any?)
+    
     func menuItemClick_saveAsFlattenedPDF(_ sender: Any)
     func menuItemClick_mergePDF(_ sender: Any)
     func menuItemClick_Compress(_ sender: Any)
@@ -37,6 +47,13 @@ protocol KMSystemFileMenuProtocol {
 
 extension KMSystemFileMenuProtocol {
     func menuItemClick_Convert(_ sender: Any) {}
+    func menuItemAction_newDocumentFromClipboard(_ sender: Any?) {}
+    func menuItemAction_newDocumetFromImage(_ sender: Any?) {}
+    func menuItemAction_importFromWebPage(_ sender: Any?) {}
+    func menuItemAction_screenShotSelectArea(_ sender: Any?) {}
+    func menuItemAction_screenShotWindow(_ sender: Any?) {}
+    func menuItemAction_screenShotFullScreenDelay(_ sender: Any?) {}
+    func menuItemAction_screenShotFullScreen(_ sender: Any?) {}
 }
 
 @objc protocol KMSystemEditMenuProtocol {