【综合】系统菜单栏，删除安全性设置、转档图片补充入口

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

@@ -740,10 +740,8 @@ extension KMBrowserWindowController {
     }
     
     @IBAction func searchPDF(_ sender: Any?) {
-        KMPrint("searchPDF")
         if let document = self.browser.activeTabContents() as? KMMainDocument {
             if (document.isHome) {
-//                document.homeViewController?.menuItemClick_mergePDF(sender)
             } else {
                 document.mainViewController?.leftSideViewController.showSearchMode("")
             }
@@ -1011,7 +1009,6 @@ extension KMBrowserWindowController: KMSystemFileMenuProtocol {
         }
         if let document = self.browser.activeTabContents() as? KMMainDocument {
             if (document.isHome) {
-//                document.homeViewController?.menuItemClick_mergePDF(sender)
             } else {
                 document.mainViewController?.menuItemClick_saveAsFlattenedPDF(sender)
             }

PDF Office/PDF Master/Class/Document/KMMainDocument.swift

@@ -671,17 +671,15 @@ typealias KMMainDocumentCloudUploadHanddler = (@escaping(Bool, String)->()) -> (
         KMPrint("convertNotes")
     }
     @IBAction func batchRemovePassWord(_ sender: Any?) {
-        self.mainViewController?.removeOwnerPassword()
+        self.mainViewController?.clickChildTool(type: .secure, index: 2)
     }
     @IBAction func batchRemovPrivatySecurity(_ sender: Any?) {
-        KMPrint("batchRemovPrivatySecurity")
+        self.mainViewController?.removeOwnerPassword()
     }
     @IBAction func printPDFDocument(_ sender: Any?) {
-        KMPrint("printPDFDocument")
         KMPrintWindowController.showNewPrintWindowControll(inputDocument: self.mainViewController?.document, inputPageRange: KMPrintPageRange())
     }
     @IBAction func performFindPanelAction(_ sender: Any?) {
-        KMPrint("performFindPanelAction")
         self.mainViewController?.toolbarController.showFindBar()
     }
     
@@ -925,7 +923,7 @@ extension KMMainDocument {
             return mainVC.isPDFDocumentEdited || mainVC.needSave
         } else if (menuItem.action == #selector(saveAs(_ :))) {
             return !self.isHome
-        } else if menuItem.action == #selector(batchRemovePassWord) {
+        } else if menuItem.action == #selector(batchRemovPrivatySecurity) {
             if self.isHome {
                 return false
             }

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

@@ -2712,6 +2712,7 @@ extension KMMainViewController {
             convertT = .CSV
         } else if (type == .conversion_image) {
             windowController = KMConvertImageWindowController()
+            convertT = .JPEG
         }
         windowController?.subscribeWaterMarkType = type.toSubscribeWaterMarkType()
         

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 = "1796"
-            endingLineNumber = "1796"
+            startingLineNumber = "1793"
+            endingLineNumber = "1793"
             landmarkName = "menuItemAction_annotation(_:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -269,8 +269,8 @@
             filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "3909"
-            endingLineNumber = "3909"
+            startingLineNumber = "3910"
+            endingLineNumber = "3910"
             landmarkName = "clickChildTool(type:index:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -285,8 +285,8 @@
             filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "3917"
-            endingLineNumber = "3917"
+            startingLineNumber = "3918"
+            endingLineNumber = "3918"
             landmarkName = "clickChildTool(type:index:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -531,5 +531,69 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "806EC721-D734-41B3-B52E-51C55F56423E"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1022"
+            endingLineNumber = "1022"
+            landmarkName = "menuItemClick_mergePDF(_:)"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "806EC721-D734-41B3-B52E-51C55F56423E - f4319de402f90a88"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMBrowserWindowController.menuItemClick_mergePDF(Any) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "1022"
+                  endingLineNumber = "1022"
+                  offsetFromSymbolStart = "419">
+               </Location>
+               <Location
+                  uuid = "806EC721-D734-41B3-B52E-51C55F56423E - f4319de402f90a88"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMBrowserWindowController.menuItemClick_mergePDF(Any) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "1022"
+                  endingLineNumber = "1022"
+                  offsetFromSymbolStart = "840">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "3F71F570-E666-47E8-840A-D3E8DF174C80"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "2752"
+            endingLineNumber = "2752"
+            landmarkName = "showAllConvertWindow(convertT:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>