Browse Source

【兼容】移除webView

lizhe 1 year ago
parent
commit
3f51cd252a

+ 0 - 10
PDF Office/PDF Master.xcodeproj/project.pbxproj

@@ -469,9 +469,6 @@
 		9F0201992A1F352100C9B673 /* KMAITranslationConfirmWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9F0201952A1F352100C9B673 /* KMAITranslationConfirmWindowController.xib */; };
 		9F02019A2A1F352100C9B673 /* KMAITranslationConfirmWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9F0201952A1F352100C9B673 /* KMAITranslationConfirmWindowController.xib */; };
 		9F02019B2A1F352100C9B673 /* KMAITranslationConfirmWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9F0201952A1F352100C9B673 /* KMAITranslationConfirmWindowController.xib */; };
-		9F080B0F298A55A300FC27DA /* KMConvertURLToPDF.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F080B0D298A55A300FC27DA /* KMConvertURLToPDF.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		9F080B10298A55A300FC27DA /* KMConvertURLToPDF.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F080B0D298A55A300FC27DA /* KMConvertURLToPDF.m */; };
-		9F080B11298A55A300FC27DA /* KMConvertURLToPDF.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F080B0D298A55A300FC27DA /* KMConvertURLToPDF.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		9F080B14298CFDB300FC27DA /* KMTextImageButtonVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F080B12298CFDB300FC27DA /* KMTextImageButtonVC.swift */; };
 		9F080B15298CFDB300FC27DA /* KMTextImageButtonVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F080B12298CFDB300FC27DA /* KMTextImageButtonVC.swift */; };
 		9F080B16298CFDB300FC27DA /* KMTextImageButtonVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F080B12298CFDB300FC27DA /* KMTextImageButtonVC.swift */; };
@@ -3769,8 +3766,6 @@
 		9F02018D2A1DDAA500C9B673 /* KMAITranslationWindowController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMAITranslationWindowController.xib; sourceTree = "<group>"; };
 		9F0201942A1F352100C9B673 /* KMAITranslationConfirmWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMAITranslationConfirmWindowController.swift; sourceTree = "<group>"; };
 		9F0201952A1F352100C9B673 /* KMAITranslationConfirmWindowController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMAITranslationConfirmWindowController.xib; sourceTree = "<group>"; };
-		9F080B0D298A55A300FC27DA /* KMConvertURLToPDF.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMConvertURLToPDF.m; sourceTree = "<group>"; };
-		9F080B0E298A55A300FC27DA /* KMConvertURLToPDF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMConvertURLToPDF.h; sourceTree = "<group>"; };
 		9F080B12298CFDB300FC27DA /* KMTextImageButtonVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMTextImageButtonVC.swift; sourceTree = "<group>"; };
 		9F080B13298CFDB300FC27DA /* KMTextImageButtonVC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMTextImageButtonVC.xib; sourceTree = "<group>"; };
 		9F080B22298FCB0D00FC27DA /* KMDesignToken+Action.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "KMDesignToken+Action.swift"; sourceTree = "<group>"; };
@@ -5576,8 +5571,6 @@
 			children = (
 				BBB9B2E8299A5D6C004F3235 /* Services */,
 				BB3AD6F629935483004FC1AE /* Reachability */,
-				9F080B0E298A55A300FC27DA /* KMConvertURLToPDF.h */,
-				9F080B0D298A55A300FC27DA /* KMConvertURLToPDF.m */,
 				9F0201782A1B5C0300C9B673 /* KMAIServerConfig.swift */,
 			);
 			path = NSObject;
@@ -10877,7 +10870,6 @@
 				BB3AD6F929935483004FC1AE /* Reachability.m in Sources */,
 				BB51073F29A61B4100978662 /* SKProgressController.m in Sources */,
 				BBEC00BF295C306400A26C98 /* KMBatesPropertyController.swift in Sources */,
-				9F080B0F298A55A300FC27DA /* KMConvertURLToPDF.m in Sources */,
 				89E4E6EC2963D1B7002DBA6F /* KMColorPickerViewController.m in Sources */,
 				BB49ED19293F4D4E00C82CA2 /* KMConvertCSVSettingView.swift in Sources */,
 				AD9527BA295291F20039D2BC /* KMPrintPage.swift in Sources */,
@@ -11688,7 +11680,6 @@
 				BB3AD6FA29935483004FC1AE /* Reachability.m in Sources */,
 				BB51074029A61B4100978662 /* SKProgressController.m in Sources */,
 				BBEC00C0295C306400A26C98 /* KMBatesPropertyController.swift in Sources */,
-				9F080B10298A55A300FC27DA /* KMConvertURLToPDF.m in Sources */,
 				BB0A55222A30968900B6E84B /* KMDesignBaseView.swift in Sources */,
 				89E4E6ED2963D1B7002DBA6F /* KMColorPickerViewController.m in Sources */,
 				ADCB98EA2924778C00B51A03 /* KMBatchProcessingStateTableCell.swift in Sources */,
@@ -12967,7 +12958,6 @@
 				BBA5429E29F13A140041BAD0 /* KMMemorandumPattern.swift in Sources */,
 				896DD4572985FB3200ADE514 /* KMPageDisplayThemeCollectionViewItem.swift in Sources */,
 				BB9695AF29BDA41700FD68D3 /* SKWindowController.m in Sources */,
-				9F080B11298A55A300FC27DA /* KMConvertURLToPDF.m in Sources */,
 				F359916B29261F0E000D25DE /* CPDFListView+Tool.m in Sources */,
 				89752DEC293875FC003FF08E /* KMMainToolbarController.swift in Sources */,
 				AD0E8ABB2A31BDDD00DBFD3C /* KMProduct.swift in Sources */,

+ 258 - 2
PDF Office/PDF Master.xcodeproj/xcuserdata/lizhe.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -3658,6 +3658,21 @@
                   endingLineNumber = "898"
                   offsetFromSymbolStart = "5028">
                </Location>
+               <Location
+                  uuid = "B0B97B1D-C16A-40AC-830E-4908FD434813 - 8cda1206cff3dff3"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Master.KMThumbnailViewController.validateMenuItem(__C.NSMenuItem) -&gt; Swift.Bool"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/LeftSide/Thumbnail/KMThumbnailViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "900"
+                  endingLineNumber = "900"
+                  offsetFromSymbolStart = "2684">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -3856,6 +3871,21 @@
                   endingLineNumber = "876"
                   offsetFromSymbolStart = "648">
                </Location>
+               <Location
+                  uuid = "DC5C13CC-601A-4F45-B3D6-BE8EF4B3C841 - 8cda1206cff3d2db"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Master.KMThumbnailViewController.validateMenuItem(__C.NSMenuItem) -&gt; Swift.Bool"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/LeftSide/Thumbnail/KMThumbnailViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "876"
+                  endingLineNumber = "876"
+                  offsetFromSymbolStart = "576">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -4114,6 +4144,51 @@
                   endingLineNumber = "854"
                   offsetFromSymbolStart = "1236">
                </Location>
+               <Location
+                  uuid = "A9ECAAB1-38BB-4918-83CA-5C22F5C9553C - 7f6f1f9f5f9e599d"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Master.KMThumbnailViewController.thumbnailView(thumbanView: PDF_Master.KMThumbnailView, didDragAddFiles: Swift.Array&lt;Foundation.URL&gt;, indexpath: Foundation.IndexPath) -&gt; ()"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/LeftSide/Thumbnail/KMThumbnailViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "854"
+                  endingLineNumber = "854"
+                  offsetFromSymbolStart = "276">
+               </Location>
+               <Location
+                  uuid = "A9ECAAB1-38BB-4918-83CA-5C22F5C9553C - 98ee0b0363677de2"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #1 (Swift.Int, Any...) -&gt; () in PDF_Master.KMThumbnailViewController.thumbnailView(thumbanView: PDF_Master.KMThumbnailView, didDragAddFiles: Swift.Array&lt;Foundation.URL&gt;, indexpath: Foundation.IndexPath) -&gt; ()"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/LeftSide/Thumbnail/KMThumbnailViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "854"
+                  endingLineNumber = "854"
+                  offsetFromSymbolStart = "1760">
+               </Location>
+               <Location
+                  uuid = "A9ECAAB1-38BB-4918-83CA-5C22F5C9553C - d19d735222d975"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #2 (Swift.Array&lt;__C.CPDFDocument&gt;) -&gt; () in PDF_Master.KMThumbnailViewController.thumbnailView(thumbanView: PDF_Master.KMThumbnailView, didDragAddFiles: Swift.Array&lt;Foundation.URL&gt;, indexpath: Foundation.IndexPath) -&gt; ()"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/LeftSide/Thumbnail/KMThumbnailViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "854"
+                  endingLineNumber = "854"
+                  offsetFromSymbolStart = "480">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -5032,6 +5107,21 @@
                   endingLineNumber = "584"
                   offsetFromSymbolStart = "192">
                </Location>
+               <Location
+                  uuid = "E22CD419-B76B-42D7-B07F-D287D150D2FB - 5931138e4c04ba1e"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Master.KMSearchViewController.controlTextDidEndEditing(Foundation.Notification) -&gt; ()"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/LeftSide/Search/KMSearchViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "583"
+                  endingLineNumber = "583"
+                  offsetFromSymbolStart = "804">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -6565,6 +6655,21 @@
                   endingLineNumber = "1947"
                   offsetFromSymbolStart = "796">
                </Location>
+               <Location
+                  uuid = "020BF3CA-E99C-4B40-91D6-260F8E825E98 - 1298c8c9696830b3"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Master.KMMainViewController.displaySinglePageScreen(isSinglePage: Swift.Bool, doublePageScreen: Swift.Bool) -&gt; ()"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "1947"
+                  endingLineNumber = "1947"
+                  offsetFromSymbolStart = "680">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -6823,6 +6928,21 @@
                   endingLineNumber = "1993"
                   offsetFromSymbolStart = "400">
                </Location>
+               <Location
+                  uuid = "36FD2F66-71C8-4346-9D37-D715DD34EA44 - 34a67503baba242f"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Master.KMMainViewController.updateNextAndPreViousButtonState() -&gt; ()"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "1993"
+                  endingLineNumber = "1993"
+                  offsetFromSymbolStart = "1132">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -6991,6 +7111,21 @@
                   endingLineNumber = "1510"
                   offsetFromSymbolStart = "7768">
                </Location>
+               <Location
+                  uuid = "D2E713CE-328E-4EC1-91DC-F6D927095512 - 240bef81fdee5198"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Master.KMMainViewController.shareDocument(sender: PDF_Master.KMToolbarViewController, limit: Swift.Bool) -&gt; ()"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "1510"
+                  endingLineNumber = "1510"
+                  offsetFromSymbolStart = "6108">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -10993,6 +11128,21 @@
                   endingLineNumber = "1012"
                   offsetFromSymbolStart = "1824">
                </Location>
+               <Location
+                  uuid = "72B10A1E-CF14-4130-BD56-17089543320E - df2854e0bbda11ed"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Master.KMThumbnailViewController.deletePageItemWithIndexs(indexs: Foundation.IndexSet) -&gt; ()"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/LeftSide/Thumbnail/KMThumbnailViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "1012"
+                  endingLineNumber = "1012"
+                  offsetFromSymbolStart = "2368">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -11131,6 +11281,21 @@
                   endingLineNumber = "766"
                   offsetFromSymbolStart = "980">
                </Location>
+               <Location
+                  uuid = "ABC8F3C6-5AE9-4195-8380-2E660CE32045 - f6bfa55b7de9b78b"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Master.KMThumbnailViewController.thumbnailView(thumbanView: PDF_Master.KMThumbnailView, didSelectItemAt: Foundation.IndexPath, object: Swift.Optional&lt;Swift.AnyObject&gt;) -&gt; ()"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/LeftSide/Thumbnail/KMThumbnailViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "766"
+                  endingLineNumber = "766"
+                  offsetFromSymbolStart = "3176">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -11209,7 +11374,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "166"
             endingLineNumber = "166"
-            landmarkName = "applicationShouldHandleReopen(_:hasVisibleWindows:)"
+            landmarkName = "launchApp(bundleIdentifier:)"
             landmarkType = "7">
             <Locations>
                <Location
@@ -11242,6 +11407,21 @@
                   endingLineNumber = "166"
                   offsetFromSymbolStart = "320">
                </Location>
+               <Location
+                  uuid = "7D80DC57-6FA9-4805-9071-FF2846CA5FAE - eb5a7a52357f8465"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Master.AppDelegate.launchApp(bundleIdentifier: Swift.String) -&gt; ()"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/AppDelegate.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "166"
+                  endingLineNumber = "166"
+                  offsetFromSymbolStart = "1248">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -11336,6 +11516,21 @@
                   endingLineNumber = "937"
                   offsetFromSymbolStart = "724">
                </Location>
+               <Location
+                  uuid = "D90BE850-75C0-4F2E-9249-D1327B0B0904 - 20f24cb24b37d337"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Master.KMPDFEditViewController.sharePageItemAction(menu: __C.NSMenuItem) -&gt; ()"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFTools/PageEdit/Controller/KMPDFEditViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "937"
+                  endingLineNumber = "937"
+                  offsetFromSymbolStart = "2964">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -11726,6 +11921,51 @@
                   endingLineNumber = "188"
                   offsetFromSymbolStart = "240">
                </Location>
+               <Location
+                  uuid = "C3FE4DEA-4C18-4438-BA79-D6409A40A221 - 2e6749033a336c82"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "(1) suspend resume partial function for closure #5 @Sendable () async -&gt; () in PDF_Master.KMConvertBaseWindowController.initSubViews() -&gt; ()"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFTools/Convert/Controller/KMConvertBaseWindowController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "188"
+                  endingLineNumber = "188"
+                  offsetFromSymbolStart = "52">
+               </Location>
+               <Location
+                  uuid = "C3FE4DEA-4C18-4438-BA79-D6409A40A221 - c3862932faddd293"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "(2) await resume partial function for closure #5 @Sendable () async -&gt; () in PDF_Master.KMConvertBaseWindowController.initSubViews() -&gt; ()"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFTools/Convert/Controller/KMConvertBaseWindowController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "188"
+                  endingLineNumber = "188"
+                  offsetFromSymbolStart = "60">
+               </Location>
+               <Location
+                  uuid = "C3FE4DEA-4C18-4438-BA79-D6409A40A221 - e66878c4f7d98884"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "(3) suspend resume partial function for closure #5 @Sendable () async -&gt; () in PDF_Master.KMConvertBaseWindowController.initSubViews() -&gt; ()"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFTools/Convert/Controller/KMConvertBaseWindowController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "188"
+                  endingLineNumber = "188"
+                  offsetFromSymbolStart = "68">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -11805,7 +12045,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "432"
             endingLineNumber = "432"
-            landmarkName = "paymentQueueRestoreCompletedTransactionsFinished(_:)"
+            landmarkName = "sendReceiptToAppleServer(receiptData:transaction:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -12000,5 +12240,21 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "170AA6EE-25AA-4D4D-A494-82221F1ED90E"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/Home/WindowController/KMURLToPDFWindowController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "280"
+            endingLineNumber = "280"
+            landmarkName = "startAction(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 0 - 27
PDF Office/PDF Master/Class/Home/NSObject/KMConvertURLToPDF.h

@@ -1,27 +0,0 @@
-//
-//  KMConvertURLToPDF.h
-//  PDF Reader
-//
-//  Created by 丁林圭 on 2019/3/11.
-//  Copyright © 2019年 Kdan Mobile. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface KMConvertURLToPDF : NSObject
-
-@property (nonatomic,retain) NSString * fileName;
-
-+ (KMConvertURLToPDF *)shareInstance;
-
-- (void)convertUrlToPDF:(NSArray <NSURL *>*)urls
-                  toPath:(NSString *)toPath
-                  pageSize:(CGSize)pageSize
-                  gap:(CGFloat)gap
-                progress:(void (^)(CGFloat value))progress
-       completionHandler:(void (^) (NSArray *successArray,NSArray *failArray))handler;
-@end
-
-NS_ASSUME_NONNULL_END

+ 0 - 233
PDF Office/PDF Master/Class/Home/NSObject/KMConvertURLToPDF.m

@@ -1,233 +0,0 @@
-//
-//  KMConvertURLToPDF.m
-//  PDF Reader
-//
-//  Created by 丁林圭 on 2019/3/11.
-//  Copyright © 2019年 Kdan Mobile. All rights reserved.
-//
-
-#import "KMConvertURLToPDF.h"
-#import <WebKit/WebKit.h>
-#import <Quartz/Quartz.h>
-
-@interface KMConvertURLToPDF () <WebFrameLoadDelegate,WebResourceLoadDelegate>
-
-@property (nonatomic,retain) NSString *savePath;
-@property (nonatomic,assign) NSInteger pageIndex;
-@property (nonatomic,retain) NSMutableArray * urls;
-@property (nonatomic,retain) NSMutableArray * failArray;
-@property (nonatomic,retain) NSMutableArray * successArray;
-@property (nonatomic,assign) CGSize pageSize;
-@property (nonatomic,assign) CGFloat gap;
-
-@property (nonatomic,retain) WebView *webView;
-
-@property (nonatomic,copy) void (^progress)(CGFloat value);
-@property (nonatomic,copy) void (^handler)(NSArray *successArray,NSArray *failArray);
-
-@end
-
-@implementation KMConvertURLToPDF
-
-
--(void)dealloc {
-    [_savePath release];
-    [_urls release];
-    _webView.resourceLoadDelegate = nil;
-    _webView.frameLoadDelegate = nil;
-    [_webView release];
-    [_progress release];
-    [_handler release];
-    [_urls release];
-    [_failArray release];
-    [_successArray release];
-    [_fileName release];
-    
-    [super dealloc];
-}
-
-+ (KMConvertURLToPDF *)shareInstance
-{
-    static KMConvertURLToPDF *sharedConvertUrlToPDF = nil;
-    static dispatch_once_t predicate;
-    dispatch_once(&predicate, ^{
-        sharedConvertUrlToPDF = [[KMConvertURLToPDF alloc] init];
-    });
-    return sharedConvertUrlToPDF;
-}
-
-
-- (void)convertUrlToPDF:(NSArray <NSURL *>*)urls
-                 toPath:(NSString *)toPath
-               pageSize:(CGSize)pageSize
-                    gap:(CGFloat)gap
-               progress:(void (^)(CGFloat value))progress
-      completionHandler:(void (^) (NSArray *successArray,NSArray *failArray))handler
-{
-    self.urls = [NSMutableArray arrayWithArray:urls];
-    self.failArray = [NSMutableArray array];
-    self.successArray = [NSMutableArray array];
-    self.savePath = toPath;
-    self.progress = progress;
-    self.pageSize = pageSize;
-    self.gap = gap;
-    self.handler = handler;
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        self.pageIndex = 0;
-        dispatch_async(dispatch_get_main_queue(), ^{
-            [self convertFileAtPageIndex:self.pageIndex];
-        });
-    });
-}
-
-- (void)convertFileAtPageIndex:(NSInteger)pageIndex
-{
-    if (pageIndex >= self.urls.count) {
-        
-        if (self.handler) {
-            self.handler (self.successArray,self.failArray);
-            self.handler = nil;
-        }
-        return;
-    }
-    
-    NSURL *url = self.urls[pageIndex];
-    
-    if ([url.pathExtension.lowercaseString isEqualToString:@"pdf"]) {
-        NSData *urlData = [NSData dataWithContentsOfURL:url];
-        NSString *name = [NSString stringWithFormat:@"webpage%ld",self.pageIndex];
-        NSString *savePath = [self.savePath  stringByAppendingPathComponent:[NSString stringWithFormat:@"%@.pdf",self.fileName?:name]];
-        
-        if ([urlData writeToFile:savePath atomically:YES]) {
-            [self.successArray addObject:savePath];
-            if (self.pageIndex + 1 >= self.urls.count) {
-                if (self.handler) {
-                    self.handler (self.successArray,self.failArray);
-                    self.handler= nil;
-                }
-            } else {
-                [self convertFileAtPageIndex:++self.pageIndex];
-                
-            }
-        } else {
-            [self.failArray addObject:self.urls[self.pageIndex]];
-            if (self.handler) {
-                self.handler (self.successArray,self.failArray);
-                self.handler= nil;
-            }
-        }
-    } else {
-       
-        if (!self.webView) {
-            _webView = [[WebView alloc] initWithFrame:NSMakeRect(0, 0, 400, 400)];
-            WebPreferences *webPrefs = [[[WebPreferences alloc] init] autorelease];
-            [webPrefs setShouldPrintBackgrounds:YES];
-            [self.webView setPreferences:webPrefs];
-            [self.webView setFrameLoadDelegate:self];
-            [self.webView setResourceLoadDelegate:self];
-        }
-        [[self.webView mainFrame] loadRequest:[NSURLRequest requestWithURL:url]];
-    }
-
-    if (pageIndex != 0 && self.progress) {
-        self.progress((float)self.pageIndex/self.urls.count);
-    }
-}
-
-- (void)convertWebViewFrame:(WebFrame *)frame
-{
-    NSString *name = [NSString stringWithFormat:@"webpage%ld",self.pageIndex];
-    NSString *savePath = [self.savePath  stringByAppendingPathComponent:[NSString stringWithFormat:@"%@.pdf",self.fileName?:name]];
-    CGFloat margin = self.gap;
-    NSSize paperSize = self.pageSize;
-    WebFrameView *frameView = [frame frameView];
-    NSPrintInfo *sharedInfo = [NSPrintInfo sharedPrintInfo];
-    NSMutableDictionary *printInfoDict = [NSMutableDictionary dictionaryWithDictionary:[sharedInfo dictionary]];
-    [printInfoDict setObject:NSPrintSaveJob forKey:NSPrintJobDisposition];
-    [printInfoDict setObject:[NSURL fileURLWithPath:savePath] forKey:NSPrintJobSavingURL];
-    
-    NSPrintInfo *printInfo = [[[NSPrintInfo alloc] initWithDictionary:printInfoDict] autorelease];
-    [printInfo setHorizontalPagination:NSAutoPagination];
-    [printInfo setVerticalPagination:NSAutoPagination];
-    [printInfo setVerticallyCentered:NO];
-    if (!CGSizeEqualToSize(paperSize, CGSizeZero)) {
-        [printInfo setBottomMargin:margin];
-        [printInfo setTopMargin:margin];
-        [printInfo setLeftMargin:margin];
-        [printInfo setRightMargin:margin];
-        [printInfo setPaperSize:paperSize];
-    }
-    [printInfo setOrientation:NSPaperOrientationPortrait];
-    
-    NSPrintOperation *printOp = [frameView printOperationWithPrintInfo:printInfo];
-    [printOp setShowsPrintPanel:NO];
-    [printOp setShowsProgressPanel:NO];
-    
-    if ([printOp runOperation]) {
-        [self.successArray addObject:savePath];
-        
-        if (self.pageIndex + 1 >= self.urls.count) {
-            if (self.handler) {
-                self.handler (self.successArray,self.failArray);
-                self.handler= nil;
-            }
-        } else {
-            [self convertFileAtPageIndex:++self.pageIndex];
-        }
-    } else {
-        [self.failArray addObject:self.urls[self.pageIndex]];
-        if (self.handler) {
-            self.handler (self.successArray,self.failArray);
-            self.handler= nil;
-        }
-    }
-}
-
-#pragma mark - WebView Delegate Methods
-
-- (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame {
-    if (frame == [sender mainFrame]) {
-        NSString *htmlTitle = @"document.title";
-        
-        if (!self.fileName || [self.fileName isEqualToString:@""]) {
-            self.fileName = [sender stringByEvaluatingJavaScriptFromString:htmlTitle];
-            
-            if ([self.fileName length] < 1) {
-                self.fileName = sender.mainFrameTitle;
-            }
-            
-            if ([self.fileName length] < 1) {
-                self.fileName = @"Untitled";
-            }
-        }
-        
-        [self performSelector:@selector(convertWebViewFrame:) withObject:frame afterDelay:0.3];
-    }
-}
-
-- (void)webView:(WebView *)sender didFailLoadWithError:(NSError *)error forFrame:(WebFrame *)frame
-{
-    if([error code] == NSURLErrorCancelled)  {
-      return;
-    }
-
-    [self.failArray addObject:self.urls[self.pageIndex]];
-    if (self.handler) {
-        self.handler (self.successArray,self.failArray);
-        self.handler= nil;
-    }
-}
-
-- (void)webView:(WebView *)sender didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame
-{
-    if([error code] == NSURLErrorCancelled)  {
-      return;
-    }
-    [self.failArray addObject:self.urls[self.pageIndex]];
-    if (self.handler) {
-        self.handler (self.successArray,self.failArray);
-        self.handler= nil;
-    }
-}
-
-@end

+ 28 - 28
PDF Office/PDF Master/Class/Home/ViewController/KMHomeViewController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22146" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22146"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -76,10 +76,6 @@
             <subviews>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1v2-87-qa4">
                     <rect key="frame" x="537" y="410" width="0.0" height="0.0"/>
-                    <constraints>
-                        <constraint firstAttribute="height" id="S10-65-2uD"/>
-                        <constraint firstAttribute="width" id="nNr-po-NTu"/>
-                    </constraints>
                     <buttonCell key="cell" type="square" title="Button" bezelStyle="shadowlessSquare" alignment="center" imageScaling="proportionallyDown" inset="2" id="Qq0-z1-7iI">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
@@ -87,6 +83,10 @@
 Gw
 </string>
                     </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="height" id="S10-65-2uD"/>
+                        <constraint firstAttribute="width" id="nNr-po-NTu"/>
+                    </constraints>
                     <connections>
                         <action selector="escButtonAction:" target="-2" id="U8k-vz-XWX"/>
                     </connections>
@@ -161,8 +161,8 @@ Gw
                                             <rect key="frame" x="0.0" y="0.0" width="238" height="36"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
-                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7ZV-nI-jCF">
-                                                    <rect key="frame" x="10" y="9" width="149" height="19"/>
+                                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7ZV-nI-jCF">
+                                                    <rect key="frame" x="10" y="9" width="150" height="19"/>
                                                     <textFieldCell key="cell" lineBreakMode="clipping" title="Favorite Documents" id="QBs-vh-T79">
                                                         <font key="font" metaFont="system" size="16"/>
                                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -209,22 +209,22 @@ Gw
                                                 <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zv8-o9-nPx">
                                                     <rect key="frame" x="0.0" y="0.0" width="270" height="652"/>
                                                     <clipView key="contentView" drawsBackground="NO" id="0m5-Ti-Llk">
-                                                        <rect key="frame" x="0.0" y="0.0" width="270" height="652"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="255" height="652"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
                                                             <view translatesAutoresizingMaskIntoConstraints="NO" id="TNl-3V-JVe">
-                                                                <rect key="frame" x="0.0" y="-9" width="270" height="661"/>
+                                                                <rect key="frame" x="0.0" y="-9" width="255" height="661"/>
                                                                 <subviews>
                                                                     <box boxType="custom" borderWidth="0.0" cornerRadius="8" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="iRu-hZ-Eba" customClass="KMBox" customModule="PDF_Master" customModuleProvider="target">
-                                                                        <rect key="frame" x="16" y="549" width="253" height="112"/>
+                                                                        <rect key="frame" x="16" y="549" width="238" height="112"/>
                                                                         <view key="contentView" id="Szn-qw-Fab">
-                                                                            <rect key="frame" x="0.0" y="0.0" width="253" height="112"/>
+                                                                            <rect key="frame" x="0.0" y="0.0" width="238" height="112"/>
                                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                             <subviews>
                                                                                 <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="3fs-f7-jLw">
-                                                                                    <rect key="frame" x="0.0" y="80" width="253" height="32"/>
+                                                                                    <rect key="frame" x="0.0" y="80" width="238" height="32"/>
                                                                                     <view key="contentView" id="Pht-vQ-L6e">
-                                                                                        <rect key="frame" x="0.0" y="0.0" width="253" height="32"/>
+                                                                                        <rect key="frame" x="0.0" y="0.0" width="238" height="32"/>
                                                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                                     </view>
                                                                                     <constraints>
@@ -233,9 +233,9 @@ Gw
                                                                                     <color key="fillColor" name="systemRedColor" catalog="System" colorSpace="catalog"/>
                                                                                 </box>
                                                                                 <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="MnV-Ga-AMN">
-                                                                                    <rect key="frame" x="0.0" y="60" width="253" height="20"/>
+                                                                                    <rect key="frame" x="0.0" y="60" width="238" height="20"/>
                                                                                     <view key="contentView" id="kBq-4H-y0e">
-                                                                                        <rect key="frame" x="0.0" y="0.0" width="253" height="20"/>
+                                                                                        <rect key="frame" x="0.0" y="0.0" width="238" height="20"/>
                                                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                                     </view>
                                                                                     <constraints>
@@ -243,9 +243,9 @@ Gw
                                                                                     </constraints>
                                                                                 </box>
                                                                                 <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="c99-Fc-Xms">
-                                                                                    <rect key="frame" x="0.0" y="20" width="253" height="32"/>
+                                                                                    <rect key="frame" x="0.0" y="20" width="238" height="32"/>
                                                                                     <view key="contentView" id="66O-AN-y7M">
-                                                                                        <rect key="frame" x="0.0" y="0.0" width="253" height="32"/>
+                                                                                        <rect key="frame" x="0.0" y="0.0" width="238" height="32"/>
                                                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                                     </view>
                                                                                     <constraints>
@@ -254,9 +254,9 @@ Gw
                                                                                     <color key="fillColor" name="systemRedColor" catalog="System" colorSpace="catalog"/>
                                                                                 </box>
                                                                                 <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="dvb-4g-gRa">
-                                                                                    <rect key="frame" x="0.0" y="0.0" width="253" height="20"/>
+                                                                                    <rect key="frame" x="0.0" y="0.0" width="238" height="20"/>
                                                                                     <view key="contentView" id="Sv3-Bf-g3Z">
-                                                                                        <rect key="frame" x="0.0" y="0.0" width="253" height="20"/>
+                                                                                        <rect key="frame" x="0.0" y="0.0" width="238" height="20"/>
                                                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                                     </view>
                                                                                     <constraints>
@@ -283,9 +283,9 @@ Gw
                                                                         <color key="fillColor" red="0.92156862745098034" green="0.92156862745098034" blue="0.92156862745098034" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                     </box>
                                                                     <box boxType="custom" borderWidth="0.0" cornerRadius="8" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="MFa-T5-0wb" customClass="KMBox" customModule="PDF_Master" customModuleProvider="target">
-                                                                        <rect key="frame" x="32" y="30" width="221" height="242"/>
+                                                                        <rect key="frame" x="32" y="30" width="206" height="242"/>
                                                                         <view key="contentView" id="zIt-55-NjD">
-                                                                            <rect key="frame" x="0.0" y="0.0" width="221" height="242"/>
+                                                                            <rect key="frame" x="0.0" y="0.0" width="206" height="242"/>
                                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                         </view>
                                                                         <constraints>
@@ -316,7 +316,7 @@ Gw
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                     <scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="eMA-3D-xnv" customClass="KMToolSetScroller" customModule="PDF_Master" customModuleProvider="target">
-                                                        <rect key="frame" x="254" y="0.0" width="16" height="652"/>
+                                                        <rect key="frame" x="255" y="0.0" width="15" height="652"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                 </scrollView>
@@ -348,7 +348,7 @@ Gw
                                                             </constraints>
                                                             <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="edc-z8-gCQ"/>
                                                         </imageView>
-                                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZAT-Co-tte">
+                                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZAT-Co-tte">
                                                             <rect key="frame" x="54" y="24" width="186" height="16"/>
                                                             <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="XuC-gZ-0YQ">
                                                                 <font key="font" metaFont="system"/>
@@ -383,7 +383,7 @@ Gw
                                                             </constraints>
                                                             <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="cON-bS-15a"/>
                                                         </imageView>
-                                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="p5N-bY-CVu">
+                                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="p5N-bY-CVu">
                                                             <rect key="frame" x="54" y="24" width="186" height="16"/>
                                                             <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="RZo-Aj-B8y">
                                                                 <font key="font" metaFont="system"/>
@@ -418,7 +418,7 @@ Gw
                                                             </constraints>
                                                             <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="oLu-02-hg4"/>
                                                         </imageView>
-                                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Fhh-MS-1UA">
+                                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Fhh-MS-1UA">
                                                             <rect key="frame" x="54" y="24" width="186" height="16"/>
                                                             <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="hZb-7Q-757">
                                                                 <font key="font" metaFont="system"/>
@@ -453,7 +453,7 @@ Gw
                                                             </constraints>
                                                             <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="RX4-be-ygC"/>
                                                         </imageView>
-                                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aGT-3k-XaH">
+                                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aGT-3k-XaH">
                                                             <rect key="frame" x="54" y="24" width="186" height="16"/>
                                                             <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="A36-Eb-2cb">
                                                                 <font key="font" metaFont="system"/>
@@ -620,7 +620,7 @@ Gw
                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="lTX-FO-7Ze">
                             <rect key="frame" x="489" y="374" width="65" height="40"/>
                             <subviews>
-                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Hn2-R8-Bfv">
+                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Hn2-R8-Bfv">
                                     <rect key="frame" x="14" y="12" width="37" height="16"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="gkz-Hj-UOJ">
                                         <font key="font" metaFont="system"/>

+ 23 - 23
PDF Office/PDF Master/Class/Home/WindowController/KMURLToPDFWindowController.swift

@@ -307,29 +307,29 @@ class KMURLToPDFWindowController: NSWindowController {
             }
             gap = Float(formatFloat(Float(string.stringToCGFloat()) * unitScanle))!
             
-            if url != nil {
-                let convert = KMConvertURLToPDF.shareInstance()
-                convert.fileName = fileName
-                convert.convertUrl(toPDF: [url], toPath: kUrlToPDFFolderPath(), pageSize: pageSize, gap: CGFloat(gap)) { value in
-                    
-                } completionHandler: { successArray, failArray in
-                    if failArray.count < 1 {
-                        let filePath: String = successArray.first as! String
-                        if FileManager.default.fileExists(atPath: filePath) {
-                            self.filePath = filePath
-                            NSApp.mainWindow!.endSheet(self.window!)
-                            self.window?.orderOut(self)
-                        }
-                    } else {
-                        let alert = NSAlert()
-                        alert.alertStyle = .critical
-                        alert.informativeText = NSLocalizedString("Conversion Failed", comment: "")
-                        alert.messageText = NSLocalizedString("", comment: "")
-                        alert.addButton(withTitle: NSLocalizedString("OK", comment: ""))
-                        alert.runModal()
-                    }
-                }
-            }
+//            if url != nil {
+//                let convert = KMConvertURLToPDF.shareInstance()
+//                convert.fileName = fileName
+//                convert.convertUrl(toPDF: [url], toPath: kUrlToPDFFolderPath(), pageSize: pageSize, gap: CGFloat(gap)) { value in
+//                    
+//                } completionHandler: { successArray, failArray in
+//                    if failArray.count < 1 {
+//                        let filePath: String = successArray.first as! String
+//                        if FileManager.default.fileExists(atPath: filePath) {
+//                            self.filePath = filePath
+//                            NSApp.mainWindow!.endSheet(self.window!)
+//                            self.window?.orderOut(self)
+//                        }
+//                    } else {
+//                        let alert = NSAlert()
+//                        alert.alertStyle = .critical
+//                        alert.informativeText = NSLocalizedString("Conversion Failed", comment: "")
+//                        alert.messageText = NSLocalizedString("", comment: "")
+//                        alert.addButton(withTitle: NSLocalizedString("OK", comment: ""))
+//                        alert.runModal()
+//                    }
+//                }
+//            }
         }
     }
     

+ 8 - 7
PDF Office/PDF Master/Class/Home/WindowController/KMURLToPDFWindowController.xib

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22146" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22146"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -42,7 +43,7 @@
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="u8l-AB-pxk">
                                 <rect key="frame" x="0.0" y="333" width="916" height="24"/>
                                 <subviews>
-                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="pJU-XO-8iX">
+                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="pJU-XO-8iX">
                                         <rect key="frame" x="-2" y="4" width="37" height="16"/>
                                         <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="hRe-34-aDe">
                                             <font key="font" usesAppearanceFont="YES"/>
@@ -109,7 +110,7 @@
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="1ob-vx-s0R">
                                 <rect key="frame" x="0.0" y="144" width="916" height="20"/>
                                 <subviews>
-                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="pQd-aG-W5t">
+                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="pQd-aG-W5t">
                                         <rect key="frame" x="-2" y="2" width="37" height="16"/>
                                         <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="Ic1-jB-Dow">
                                             <font key="font" usesAppearanceFont="YES"/>
@@ -162,7 +163,7 @@
                                             <constraint firstAttribute="width" constant="315" id="aTI-iG-wY9"/>
                                         </constraints>
                                     </box>
-                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="A7s-pc-oH6">
+                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="A7s-pc-oH6">
                                         <rect key="frame" x="-2" y="8" width="37" height="16"/>
                                         <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="sOJ-pa-2O7">
                                             <font key="font" usesAppearanceFont="YES"/>
@@ -183,7 +184,7 @@
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="Hqe-7Y-xOc">
                                 <rect key="frame" x="0.0" y="64" width="916" height="32"/>
                                 <subviews>
-                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6XK-Pz-ujn">
+                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6XK-Pz-ujn">
                                         <rect key="frame" x="-2" y="8" width="37" height="16"/>
                                         <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="kaR-yG-KYb">
                                             <font key="font" usesAppearanceFont="YES"/>
@@ -191,7 +192,7 @@
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
                                     </textField>
-                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6LX-3p-Wa9">
+                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6LX-3p-Wa9">
                                         <rect key="frame" x="688" y="8" width="37" height="16"/>
                                         <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="EWG-2f-7HR">
                                             <font key="font" metaFont="system"/>

+ 0 - 1
PDF Office/PDF Master/PDF_Master DMG-Bridging-Header.h

@@ -44,7 +44,6 @@
 #import "KMSplitView.h"
 #import "KMAnnotationPropertiesColorManager.h"
 
-#import "KMConvertURLToPDF.h"
 #import "KMSplitView.h"
 #import "KMCloudServer.h"
 #import <ObjectiveDropboxOfficial/ObjectiveDropboxOfficial.h>

+ 0 - 1
PDF Office/PDF Master/PDF_Master Pro-Bridging-Header.h

@@ -33,7 +33,6 @@
 #import "KMNoteOutlineFilterViewController.h"
 #import "KMAnnotationPropertiesColorManager.h"
 
-#import "KMConvertURLToPDF.h"
 #import "KMCloudServer.h"
 #import <ObjectiveDropboxOfficial/ObjectiveDropboxOfficial.h>
 #import "KMCloudOperation.h"

+ 0 - 1
PDF Office/PDF Master/PDF_Master-Bridging-Header.h

@@ -45,7 +45,6 @@
 #import "KMSplitView.h"
 #import "KMAnnotationPropertiesColorManager.h"
 
-#import "KMConvertURLToPDF.h"
 #import "KMSplitView.h"
 #import "KMCloudServer.h"
 #import <ObjectiveDropboxOfficial/ObjectiveDropboxOfficial.h>