Przeglądaj źródła

Merge branch 'develop_PDFReaderProNew' of git.kdan.cc:Mac_PDF/PDF_Office into develop_PDFReaderProNew

liujiajie 1 rok temu
rodzic
commit
3868945247
100 zmienionych plików z 213 dodań i 314 usunięć
  1. 1 1
      PDF Office/PDF Master DMG/AppDelegate.swift
  2. 8 8
      PDF Office/PDF Master DMG/Base.lproj/Main.storyboard
  3. 1 1
      PDF Office/PDF Master DMG/ViewController.swift
  4. 4 4
      PDF Office/PDF Master DMGTests/PDF_ Master_DMGTests.swift
  5. 3 3
      PDF Office/PDF Master DMGUITests/PDF_ Master_DMGUITests.swift
  6. 3 3
      PDF Office/PDF Master DMGUITests/PDF_ Master_DMGUITestsLaunchTests.swift
  7. 1 1
      PDF Office/PDF Master Pro/AppDelegate.swift
  8. 8 8
      PDF Office/PDF Master Pro/Base.lproj/Main.storyboard
  9. 14 0
      PDF Office/PDF Master Pro/PDF-Reader-Pro-Edition.entitlements
  10. 1 1
      PDF Office/PDF Master Pro/ViewController.swift
  11. 4 4
      PDF Office/PDF Master ProTests/PDF_ Master_ProTests.swift
  12. 3 3
      PDF Office/PDF Master ProUITests/PDF_ Master_ProUITests.swift
  13. 3 3
      PDF Office/PDF Master ProUITests/PDF_ Master_ProUITestsLaunchTests.swift
  14. 0 134
      PDF Office/PDF Master.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  15. 52 10
      PDF Office/PDF Master/AppDelegate.swift
  16. 5 6
      PDF Office/PDF Master/Base.lproj/Main.storyboard
  17. 1 1
      PDF Office/PDF Master/Class/Analytics/KMAnalytics.swift
  18. BIN
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/PDF Tools/Form/FunctionCompare/KMImageNameCompareBG.imageset/Head (1).pdf
  19. BIN
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/PDF Tools/Form/FunctionCompare/KMImageNameCompareBG.imageset/Head.pdf
  20. 0 22
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/PDF Tools/FunctionCompare/KMImageNameCompareBG.imageset/Contents.json
  21. BIN
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/PDF Tools/FunctionCompare/KMImageNameCompareBG.imageset/Head (1).pdf
  22. BIN
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/PDF Tools/FunctionCompare/KMImageNameCompareBG.imageset/Head.pdf
  23. 1 1
      PDF Office/PDF Master/Class/Appearance/KMAppearance.swift
  24. 1 1
      PDF Office/PDF Master/Class/Appearance/KMView.swift
  25. 1 1
      PDF Office/PDF Master/Class/AutoSave/Tools/AutoSaveManager.swift
  26. 1 1
      PDF Office/PDF Master/Class/Batch/Catogary/NSArray+Extension.swift
  27. 1 1
      PDF Office/PDF Master/Class/Batch/Catogary/NSButton+CustomAppearance.swift
  28. 1 1
      PDF Office/PDF Master/Class/Batch/Catogary/NSWindow+PopOver.swift
  29. 1 1
      PDF Office/PDF Master/Class/Batch/Data/KMBackgroundObject.swift
  30. 1 1
      PDF Office/PDF Master/Class/Batch/Data/KMBatchBaseParameter.swift
  31. 1 1
      PDF Office/PDF Master/Class/Batch/Data/KMBatchConvertParameter.swift
  32. 1 1
      PDF Office/PDF Master/Class/Batch/Data/KMBatchOperateFile.swift
  33. 1 1
      PDF Office/PDF Master/Class/Batch/Data/KMBatchOperateManager.swift
  34. 1 1
      PDF Office/PDF Master/Class/Batch/Data/KMImageModel.swift
  35. 1 1
      PDF Office/PDF Master/Class/Batch/Data/KMPDFWatermarkData.swift
  36. 1 1
      PDF Office/PDF Master/Class/Batch/Operation/KMBatchConvertOperation.swift
  37. 1 1
      PDF Office/PDF Master/Class/Batch/Operation/KMCompressOperation.swift
  38. 1 1
      PDF Office/PDF Master/Class/Batch/Tools/KMAddBackgroundOperationQueue.swift
  39. 1 1
      PDF Office/PDF Master/Class/Batch/Tools/KMAddBatesOperationQueue.swift
  40. 1 1
      PDF Office/PDF Master/Class/Batch/Tools/KMAddHeaderFooterOperationQueue.swift
  41. 1 1
      PDF Office/PDF Master/Class/Batch/Tools/KMAddWatermarkOprationQueue.swift
  42. 1 1
      PDF Office/PDF Master/Class/Batch/Tools/KMBatchHeader.swift
  43. 1 1
      PDF Office/PDF Master/Class/Batch/Tools/KMBatchOperation.swift
  44. 1 1
      PDF Office/PDF Master/Class/Batch/Tools/KMBatchRemoveHeaderFooterOperation.swift
  45. 1 1
      PDF Office/PDF Master/Class/Batch/Tools/KMCompressOperationQueue.swift
  46. 1 1
      PDF Office/PDF Master/Class/Batch/Tools/KMImageToPDFMethod.swift
  47. 1 1
      PDF Office/PDF Master/Class/Batch/Tools/KMOperationQueue.swift
  48. 1 1
      PDF Office/PDF Master/Class/Batch/Tools/KMRemoveBackgroundOperationQueue.swift
  49. 1 1
      PDF Office/PDF Master/Class/Batch/Tools/KMRemoveBatesOperationQueue.swift
  50. 1 1
      PDF Office/PDF Master/Class/Batch/Tools/KMRemoveHeaderFooterQueue.swift
  51. 1 1
      PDF Office/PDF Master/Class/Batch/View/KMBatchTableCellView.swift
  52. 1 1
      PDF Office/PDF Master/Class/Batch/View/KMBatchWindow.swift
  53. 1 1
      PDF Office/PDF Master/Class/Batch/View/KMBatchoperateConvertCollectionViewItem.swift
  54. 1 1
      PDF Office/PDF Master/Class/Batch/View/KMConvertCollectionViewHeader.swift
  55. 1 1
      PDF Office/PDF Master/Class/Batch/View/KMCustomViewButton.swift
  56. 1 1
      PDF Office/PDF Master/Class/Batch/View/KMLongerButton.swift
  57. 1 1
      PDF Office/PDF Master/Class/Batch/View/KMSlider.swift
  58. 1 1
      PDF Office/PDF Master/Class/Batch/View/KMTableHeaderCell.swift
  59. 1 1
      PDF Office/PDF Master/Class/Batch/View/KMTextFieldCell.swift
  60. 1 1
      PDF Office/PDF Master/Class/Batch/WindowController/Base/KMBatchOperateBaseViewController.swift
  61. 1 1
      PDF Office/PDF Master/Class/Batch/WindowController/KMAlertWindowController.swift
  62. 1 1
      PDF Office/PDF Master/Class/Batch/WindowController/KMBatchOperateBaseWindowController.swift
  63. 1 1
      PDF Office/PDF Master/Class/Batch/WindowController/KMBatchOperateLeftViewController.swift
  64. 1 1
      PDF Office/PDF Master/Class/Batch/WindowController/KMBatchOperateRightViewController.swift
  65. 1 1
      PDF Office/PDF Master/Class/Batch/WindowController/KMBatchOperateSplitViewController.swift
  66. 1 1
      PDF Office/PDF Master/Class/Batch/WindowController/KMBatchOperateWindowController.swift
  67. 1 1
      PDF Office/PDF Master/Class/Batch/WindowController/KMTextHintWindowController.swift
  68. 1 1
      PDF Office/PDF Master/Class/Batch/WindowController/PasswordWindowController.swift
  69. 1 1
      PDF Office/PDF Master/Class/Batch/WindowController/VC/KMBatchOperateCompressViewController.swift
  70. 1 1
      PDF Office/PDF Master/Class/Batch/WindowController/VC/KMBatchOperateConvertViewController.swift
  71. 1 1
      PDF Office/PDF Master/Class/Batch/WindowController/VC/KMBatchOperateImageToPDFViewController.swift
  72. 1 1
      PDF Office/PDF Master/Class/Batch/WindowController/VC/KMBatchOperateRemoveHeaderFooterViewController.swift
  73. 1 1
      PDF Office/PDF Master/Class/Batch/WindowController/VC/KMPlanViewController.swift
  74. 1 1
      PDF Office/PDF Master/Class/Batch/WindowController/VC/KMToolbarItemPopViewController.swift
  75. 1 1
      PDF Office/PDF Master/Class/ChromiumTabs/KMBrowser.swift
  76. 24 2
      PDF Office/PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift
  77. 1 1
      PDF Office/PDF Master/Class/ChromiumTabs/KMFileSearchView.swift
  78. 1 1
      PDF Office/PDF Master/Class/ChromiumTabs/KMSegmentedBox.swift
  79. 1 1
      PDF Office/PDF Master/Class/ChromiumTabs/KMTabAppearance.swift
  80. 1 1
      PDF Office/PDF Master/Class/ChromiumTabs/KMTabStripView.swift
  81. 1 1
      PDF Office/PDF Master/Class/ChromiumTabs/KMToolbarRightView.swift
  82. 1 1
      PDF Office/PDF Master/Class/ChromiumTabs/KMUploadFilePanel.swift
  83. 2 24
      PDF Office/PDF Master/Class/ChromiumTabs/src/Browser Window/CTBrowserWindowController.m
  84. 1 1
      PDF Office/PDF Master/Class/ChromiumTabs/src/Browser Window/CTTabWindowController.m
  85. 1 1
      PDF Office/PDF Master/Class/ChromiumTabs/src/Tab Strip/CTTabStripModel.m
  86. 1 1
      PDF Office/PDF Master/Class/ChromiumTabs/src/Tab Strip/CTTabStripView.m
  87. 1 1
      PDF Office/PDF Master/Class/ChromiumTabs/src/Tab/CTTabController.m
  88. 1 1
      PDF Office/PDF Master/Class/Common/Base/KMBaseViewController.swift
  89. 1 1
      PDF Office/PDF Master/Class/Common/Base/KMBaseWindowController.swift
  90. 1 1
      PDF Office/PDF Master/Class/Common/Base/KMHoverView.swift
  91. 1 1
      PDF Office/PDF Master/Class/Common/Category/CPDFKit/CPDFView+KMExtension.swift
  92. 1 1
      PDF Office/PDF Master/Class/Common/Category/NSBitmapImageRep_KMExtension.swift
  93. 1 1
      PDF Office/PDF Master/Class/Common/Category/NSCollectionViewItem+KMExtension.swift
  94. 1 1
      PDF Office/PDF Master/Class/Common/Category/NSDocumentController+KMExtension.swift
  95. 1 1
      PDF Office/PDF Master/Class/Common/Category/NSFont+KMExtension.swift
  96. 1 1
      PDF Office/PDF Master/Class/Common/Category/NSImage+KMExtension.swift
  97. 1 1
      PDF Office/PDF Master/Class/Common/Category/NSObject+KMExtension.swift
  98. 1 1
      PDF Office/PDF Master/Class/Common/Category/NSPanel+KMExtension.swift
  99. 1 1
      PDF Office/PDF Master/Class/Common/Category/NSPopover+KMExtension.swift
  100. 0 0
      PDF Office/PDF Master/Class/Common/Category/NSResponder+KMExtension.swift

+ 1 - 1
PDF Office/PDF Master DMG/AppDelegate.swift

@@ -1,6 +1,6 @@
 //
 //  AppDelegate.swift
-//  PDF Master DMG
+//  PDF Reader Pro DMG
 //
 //  Created by Niehaoyu on 2022/9/23.
 //

+ 8 - 8
PDF Office/PDF Master DMG/Base.lproj/Main.storyboard

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -11,11 +11,11 @@
                 <application id="hnw-xV-0zn" sceneMemberID="viewController">
                     <menu key="mainMenu" title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
                         <items>
-                            <menuItem title="PDF Master DMG" id="1Xt-HY-uBw">
+                            <menuItem title="PDF Reader Pro DMG" id="1Xt-HY-uBw">
                                 <modifierMask key="keyEquivalentModifierMask"/>
-                                <menu key="submenu" title="PDF Master DMG" systemMenu="apple" id="uQy-DD-JDr">
+                                <menu key="submenu" title="PDF Reader Pro DMG" systemMenu="apple" id="uQy-DD-JDr">
                                     <items>
-                                        <menuItem title="About PDF Master DMG" id="5kV-Vb-QxS">
+                                        <menuItem title="About PDF Reader Pro DMG" id="5kV-Vb-QxS">
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <connections>
                                                 <action selector="orderFrontStandardAboutPanel:" target="Ady-hI-5gd" id="Exp-CZ-Vem"/>
@@ -29,7 +29,7 @@
                                             <menu key="submenu" title="Services" systemMenu="services" id="hz9-B4-Xy5"/>
                                         </menuItem>
                                         <menuItem isSeparatorItem="YES" id="4je-JR-u6R"/>
-                                        <menuItem title="Hide PDF Master DMG" keyEquivalent="h" id="Olw-nP-bQN">
+                                        <menuItem title="Hide PDF Reader Pro DMG" keyEquivalent="h" id="Olw-nP-bQN">
                                             <connections>
                                                 <action selector="hide:" target="Ady-hI-5gd" id="PnN-Uc-m68"/>
                                             </connections>
@@ -47,7 +47,7 @@
                                             </connections>
                                         </menuItem>
                                         <menuItem isSeparatorItem="YES" id="kCx-OE-vgT"/>
-                                        <menuItem title="Quit PDF Master DMG" keyEquivalent="q" id="4sb-4s-VLi">
+                                        <menuItem title="Quit PDF Reader Pro DMG" keyEquivalent="q" id="4sb-4s-VLi">
                                             <connections>
                                                 <action selector="terminate:" target="Ady-hI-5gd" id="Te7-pn-YzF"/>
                                             </connections>
@@ -660,7 +660,7 @@
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <menu key="submenu" title="Help" systemMenu="help" id="F2S-fz-NVQ">
                                     <items>
-                                        <menuItem title="PDF Master DMG Help" keyEquivalent="?" id="FKE-Sm-Kum">
+                                        <menuItem title="PDF Reader Pro DMG Help" keyEquivalent="?" id="FKE-Sm-Kum">
                                             <connections>
                                                 <action selector="showHelp:" target="Ady-hI-5gd" id="y7X-2Q-9no"/>
                                             </connections>

+ 1 - 1
PDF Office/PDF Master DMG/ViewController.swift

@@ -1,6 +1,6 @@
 //
 //  ViewController.swift
-//  PDF Master DMG
+//  PDF Reader Pro DMG
 //
 //  Created by Niehaoyu on 2022/9/23.
 //

+ 4 - 4
PDF Office/PDF Master DMGTests/PDF_ Master_DMGTests.swift

@@ -1,14 +1,14 @@
 //
-//  PDF_Master_DMGTests.swift
-//  PDF Master DMGTests
+//  PDF_Reader_Pro_DMGTests.swift
+//  PDF Reader Pro DMGTests
 //
 //  Created by Niehaoyu on 2022/9/23.
 //
 
 import XCTest
-@testable import PDF_Master_DMG
+@testable import PDF_Reader_Pro_DMG
 
-final class PDF_Master_DMGTests: XCTestCase {
+final class PDF_Reader_Pro_DMGTests: XCTestCase {
 
     override func setUpWithError() throws {
         // Put setup code here. This method is called before the invocation of each test method in the class.

+ 3 - 3
PDF Office/PDF Master DMGUITests/PDF_ Master_DMGUITests.swift

@@ -1,13 +1,13 @@
 //
-//  PDF_Master_DMGUITests.swift
-//  PDF Master DMGUITests
+//  PDF_Reader_Pro_DMGUITests.swift
+//  PDF Reader Pro DMGUITests
 //
 //  Created by Niehaoyu on 2022/9/23.
 //
 
 import XCTest
 
-final class PDF_Master_DMGUITests: XCTestCase {
+final class PDF_Reader_Pro_DMGUITests: XCTestCase {
 
     override func setUpWithError() throws {
         // Put setup code here. This method is called before the invocation of each test method in the class.

+ 3 - 3
PDF Office/PDF Master DMGUITests/PDF_ Master_DMGUITestsLaunchTests.swift

@@ -1,13 +1,13 @@
 //
-//  PDF_Master_DMGUITestsLaunchTests.swift
-//  PDF Master DMGUITests
+//  PDF_Reader_Pro_DMGUITestsLaunchTests.swift
+//  PDF Reader Pro DMGUITests
 //
 //  Created by Niehaoyu on 2022/9/23.
 //
 
 import XCTest
 
-final class PDF_Master_DMGUITestsLaunchTests: XCTestCase {
+final class PDF_Reader_Pro_DMGUITestsLaunchTests: XCTestCase {
 
     override class var runsForEachTargetApplicationUIConfiguration: Bool {
         true

+ 1 - 1
PDF Office/PDF Master Pro/AppDelegate.swift

@@ -1,6 +1,6 @@
 //
 //  AppDelegate.swift
-//  PDF Master Pro
+//  PDF Reader Pro Pro
 //
 //  Created by Niehaoyu on 2022/9/23.
 //

+ 8 - 8
PDF Office/PDF Master Pro/Base.lproj/Main.storyboard

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -11,11 +11,11 @@
                 <application id="hnw-xV-0zn" sceneMemberID="viewController">
                     <menu key="mainMenu" title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
                         <items>
-                            <menuItem title="PDF Master Pro" id="1Xt-HY-uBw">
+                            <menuItem title="PDF Reader Pro Pro" id="1Xt-HY-uBw">
                                 <modifierMask key="keyEquivalentModifierMask"/>
-                                <menu key="submenu" title="PDF Master Pro" systemMenu="apple" id="uQy-DD-JDr">
+                                <menu key="submenu" title="PDF Reader Pro Pro" systemMenu="apple" id="uQy-DD-JDr">
                                     <items>
-                                        <menuItem title="About PDF Master Pro" id="5kV-Vb-QxS">
+                                        <menuItem title="About PDF Reader Pro Pro" id="5kV-Vb-QxS">
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <connections>
                                                 <action selector="orderFrontStandardAboutPanel:" target="Ady-hI-5gd" id="Exp-CZ-Vem"/>
@@ -29,7 +29,7 @@
                                             <menu key="submenu" title="Services" systemMenu="services" id="hz9-B4-Xy5"/>
                                         </menuItem>
                                         <menuItem isSeparatorItem="YES" id="4je-JR-u6R"/>
-                                        <menuItem title="Hide PDF Master Pro" keyEquivalent="h" id="Olw-nP-bQN">
+                                        <menuItem title="Hide PDF Reader Pro Pro" keyEquivalent="h" id="Olw-nP-bQN">
                                             <connections>
                                                 <action selector="hide:" target="Ady-hI-5gd" id="PnN-Uc-m68"/>
                                             </connections>
@@ -47,7 +47,7 @@
                                             </connections>
                                         </menuItem>
                                         <menuItem isSeparatorItem="YES" id="kCx-OE-vgT"/>
-                                        <menuItem title="Quit PDF Master Pro" keyEquivalent="q" id="4sb-4s-VLi">
+                                        <menuItem title="Quit PDF Reader Pro Pro" keyEquivalent="q" id="4sb-4s-VLi">
                                             <connections>
                                                 <action selector="terminate:" target="Ady-hI-5gd" id="Te7-pn-YzF"/>
                                             </connections>
@@ -660,7 +660,7 @@
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <menu key="submenu" title="Help" systemMenu="help" id="F2S-fz-NVQ">
                                     <items>
-                                        <menuItem title="PDF Master Pro Help" keyEquivalent="?" id="FKE-Sm-Kum">
+                                        <menuItem title="PDF Reader Pro Pro Help" keyEquivalent="?" id="FKE-Sm-Kum">
                                             <connections>
                                                 <action selector="showHelp:" target="Ady-hI-5gd" id="y7X-2Q-9no"/>
                                             </connections>

+ 14 - 0
PDF Office/PDF Master Pro/PDF-Reader-Pro-Edition.entitlements

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.app-sandbox</key>
+	<true/>
+	<key>com.apple.security.files.user-selected.read-write</key>
+	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
+	<key>com.apple.security.print</key>
+	<true/>
+</dict>
+</plist>

+ 1 - 1
PDF Office/PDF Master Pro/ViewController.swift

@@ -1,6 +1,6 @@
 //
 //  ViewController.swift
-//  PDF Master Pro
+//  PDF Reader Pro Pro
 //
 //  Created by Niehaoyu on 2022/9/23.
 //

+ 4 - 4
PDF Office/PDF Master ProTests/PDF_ Master_ProTests.swift

@@ -1,14 +1,14 @@
 //
-//  PDF_Master_ProTests.swift
-//  PDF Master ProTests
+//  PDF_Reader_Pro_ProTests.swift
+//  PDF Reader Pro ProTests
 //
 //  Created by Niehaoyu on 2022/9/23.
 //
 
 import XCTest
-@testable import PDF_Master_Pro
+@testable import PDF_Reader_Pro_Pro
 
-final class PDF_Master_ProTests: XCTestCase {
+final class PDF_Reader_Pro_ProTests: XCTestCase {
 
     override func setUpWithError() throws {
         // Put setup code here. This method is called before the invocation of each test method in the class.

+ 3 - 3
PDF Office/PDF Master ProUITests/PDF_ Master_ProUITests.swift

@@ -1,13 +1,13 @@
 //
-//  PDF_Master_ProUITests.swift
-//  PDF Master ProUITests
+//  PDF_Reader_Pro_ProUITests.swift
+//  PDF Reader Pro ProUITests
 //
 //  Created by Niehaoyu on 2022/9/23.
 //
 
 import XCTest
 
-final class PDF_Master_ProUITests: XCTestCase {
+final class PDF_Reader_Pro_ProUITests: XCTestCase {
 
     override func setUpWithError() throws {
         // Put setup code here. This method is called before the invocation of each test method in the class.

+ 3 - 3
PDF Office/PDF Master ProUITests/PDF_ Master_ProUITestsLaunchTests.swift

@@ -1,13 +1,13 @@
 //
-//  PDF_Master_ProUITestsLaunchTests.swift
-//  PDF Master ProUITests
+//  PDF_Reader_Pro_ProUITestsLaunchTests.swift
+//  PDF Reader Pro ProUITests
 //
 //  Created by Niehaoyu on 2022/9/23.
 //
 
 import XCTest
 
-final class PDF_Master_ProUITestsLaunchTests: XCTestCase {
+final class PDF_Reader_Pro_ProUITestsLaunchTests: XCTestCase {
 
     override class var runsForEachTargetApplicationUIConfiguration: Bool {
         true

+ 0 - 134
PDF Office/PDF Master.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Bucket
-   uuid = "BF64BADD-A23F-49AC-863F-CAF093A6E4D7"
-   type = "1"
-   version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "B76B13E1-8734-4B17-9930-B97EF4578D2C"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/Purchase/DMG/Verification/VerificationManager/VerificationManager.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "392"
-            endingLineNumber = "392"
-            landmarkName = "-verificationWithComplention:"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "B76B13E1-8734-4B17-9930-B97EF4578D2C - bb2cb5473035fa59"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__51-[VerificationManager verificationWithComplention:]_block_invoke"
-                  moduleName = "PDF Master DMG"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/Purchase/DMG/Verification/VerificationManager/VerificationManager.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "396"
-                  endingLineNumber = "396"
-                  offsetFromSymbolStart = "1044">
-               </Location>
-               <Location
-                  uuid = "B76B13E1-8734-4B17-9930-B97EF4578D2C - d8d603426f1e4599"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__51-[VerificationManager verificationWithComplention:]_block_invoke_3"
-                  moduleName = "PDF Master DMG"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/Purchase/DMG/Verification/VerificationManager/VerificationManager.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "392"
-                  endingLineNumber = "392"
-                  offsetFromSymbolStart = "92">
-               </Location>
-               <Location
-                  uuid = "B76B13E1-8734-4B17-9930-B97EF4578D2C - cd68228e7bcaf385"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__51-[VerificationManager verificationWithComplention:]_block_invoke_3"
-                  moduleName = "PDF Master"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/Purchase/DMG/Verification/VerificationManager/VerificationManager.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "392"
-                  endingLineNumber = "392"
-                  offsetFromSymbolStart = "120">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "5423EA5F-EE41-4612-B7F2-9CB978699CA3"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/Purchase/DMG/Verification/VerificationManager/VerificationManager.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "369"
-            endingLineNumber = "369"
-            landmarkName = "-verificationWithComplention:"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "5423EA5F-EE41-4612-B7F2-9CB978699CA3 - bb2cb5473035ffd4"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__51-[VerificationManager verificationWithComplention:]_block_invoke"
-                  moduleName = "PDF Master DMG"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/Purchase/DMG/Verification/VerificationManager/VerificationManager.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "369"
-                  endingLineNumber = "369"
-                  offsetFromSymbolStart = "280">
-               </Location>
-               <Location
-                  uuid = "5423EA5F-EE41-4612-B7F2-9CB978699CA3 - bb2cb5473035ffd4"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__51-[VerificationManager verificationWithComplention:]_block_invoke"
-                  moduleName = "PDF Master DMG"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/Purchase/DMG/Verification/VerificationManager/VerificationManager.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "369"
-                  endingLineNumber = "369"
-                  offsetFromSymbolStart = "816">
-               </Location>
-               <Location
-                  uuid = "5423EA5F-EE41-4612-B7F2-9CB978699CA3 - ae92948b24e149c8"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__51-[VerificationManager verificationWithComplention:]_block_invoke"
-                  moduleName = "PDF Master"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/Purchase/DMG/Verification/VerificationManager/VerificationManager.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "369"
-                  endingLineNumber = "369"
-                  offsetFromSymbolStart = "1244">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
-</Bucket>

Plik diff jest za duży
+ 52 - 10
PDF Office/PDF Master/AppDelegate.swift


+ 5 - 6
PDF Office/PDF Master/Base.lproj/Main.storyboard

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -12,11 +11,11 @@
                 <application id="hnw-xV-0zn" sceneMemberID="viewController">
                     <menu key="mainMenu" title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
                         <items>
-                            <menuItem title="PDF Master" id="1Xt-HY-uBw">
+                            <menuItem title="PDF Reader Pro" id="1Xt-HY-uBw">
                                 <modifierMask key="keyEquivalentModifierMask"/>
-                                <menu key="submenu" title="PDF Master" systemMenu="apple" id="uQy-DD-JDr">
+                                <menu key="submenu" title="PDF Reader Pro" systemMenu="apple" id="uQy-DD-JDr">
                                     <items>
-                                        <menuItem title="About PDF Master" id="5kV-Vb-QxS">
+                                        <menuItem title="About PDF Reader Pro" id="5kV-Vb-QxS">
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <connections>
                                                 <action selector="orderFrontStandardAboutPanel:" target="Ady-hI-5gd" id="Exp-CZ-Vem"/>
@@ -84,7 +83,7 @@
                                             <menu key="submenu" title="Services" systemMenu="services" id="hz9-B4-Xy5"/>
                                         </menuItem>
                                         <menuItem isSeparatorItem="YES" id="4je-JR-u6R"/>
-                                        <menuItem title="Hide PDF Master" keyEquivalent="h" id="Olw-nP-bQN">
+                                        <menuItem title="Hide PDF Reader Pro" keyEquivalent="h" id="Olw-nP-bQN">
                                             <connections>
                                                 <action selector="hide:" target="Ady-hI-5gd" id="PnN-Uc-m68"/>
                                             </connections>
@@ -102,7 +101,7 @@
                                             </connections>
                                         </menuItem>
                                         <menuItem isSeparatorItem="YES" id="kCx-OE-vgT"/>
-                                        <menuItem title="Quit PDF Master" keyEquivalent="q" id="4sb-4s-VLi">
+                                        <menuItem title="Quit PDF Reader Pro" keyEquivalent="q" id="4sb-4s-VLi">
                                             <connections>
                                                 <action selector="terminate:" target="Ady-hI-5gd" id="Te7-pn-YzF"/>
                                             </connections>

+ 1 - 1
PDF Office/PDF Master/Class/Analytics/KMAnalytics.swift

@@ -1,6 +1,6 @@
 //
 //  KMAnalytics.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by tangchao on 2023/7/12.
 //

BIN
PDF Office/PDF Master/Class/Appearance/Image.xcassets/PDF Tools/Form/FunctionCompare/KMImageNameCompareBG.imageset/Head (1).pdf


BIN
PDF Office/PDF Master/Class/Appearance/Image.xcassets/PDF Tools/Form/FunctionCompare/KMImageNameCompareBG.imageset/Head.pdf


+ 0 - 22
PDF Office/PDF Master/Class/Appearance/Image.xcassets/PDF Tools/FunctionCompare/KMImageNameCompareBG.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "Head (1).pdf",
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "Head.pdf",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

BIN
PDF Office/PDF Master/Class/Appearance/Image.xcassets/PDF Tools/FunctionCompare/KMImageNameCompareBG.imageset/Head (1).pdf


BIN
PDF Office/PDF Master/Class/Appearance/Image.xcassets/PDF Tools/FunctionCompare/KMImageNameCompareBG.imageset/Head.pdf


+ 1 - 1
PDF Office/PDF Master/Class/Appearance/KMAppearance.swift

@@ -1,6 +1,6 @@
 //
 //  KMAppearance.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by tangchao on 2023/4/17.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Appearance/KMView.swift

@@ -1,6 +1,6 @@
 //
 //  KMView.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by tangchao on 2023/10/20.
 //

+ 1 - 1
PDF Office/PDF Master/Class/AutoSave/Tools/AutoSaveManager.swift

@@ -1,6 +1,6 @@
 //
 //  AutoSaveManager.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by tangchao on 2023/11/8.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/Catogary/NSArray+Extension.swift

@@ -1,6 +1,6 @@
 //
 //  NSArray+Extension.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by kdanmobile on 2023/10/27.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/Catogary/NSButton+CustomAppearance.swift

@@ -1,6 +1,6 @@
 //
 //  NSButton+CustomAppearance.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by kdanmobile on 2023/10/26.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/Catogary/NSWindow+PopOver.swift

@@ -1,6 +1,6 @@
 //
 //  NSWindow+PopOver.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by kdanmobile on 2023/10/26.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/Data/KMBackgroundObject.swift

@@ -1,6 +1,6 @@
 //
 //  KMBackgroundObject.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by tangchao on 2023/11/3.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/Data/KMBatchBaseParameter.swift

@@ -1,6 +1,6 @@
 //
 //  KMBatchBaseParameter.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by kdanmobile on 2023/10/25.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/Data/KMBatchConvertParameter.swift

@@ -1,6 +1,6 @@
 //
 //  KMBatchConvertParameter.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by kdanmobile on 2023/10/25.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/Data/KMBatchOperateFile.swift

@@ -1,6 +1,6 @@
 //
 //  KMBatchOperateFile.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by kdanmobile on 2023/10/25.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/Data/KMBatchOperateManager.swift

@@ -1,6 +1,6 @@
 //
 //  KMBatchOperateManager.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by kdanmobile on 2023/11/2.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/Data/KMImageModel.swift

@@ -1,6 +1,6 @@
 //
 //  KMImageModel.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by liujiajie on 2023/12/5.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/Data/KMPDFWatermarkData.swift

@@ -1,6 +1,6 @@
 //
 //  KMPDFWatermarkData.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by tangchao on 2023/11/2.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/Operation/KMBatchConvertOperation.swift

@@ -1,6 +1,6 @@
 //
 //  KMBatchConvertOperation.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by liujiajie on 2023/11/28.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/Operation/KMCompressOperation.swift

@@ -1,6 +1,6 @@
 //
 //  File.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by liujiajie on 2023/11/30.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/Tools/KMAddBackgroundOperationQueue.swift

@@ -1,6 +1,6 @@
 //
 //  KMAddBackgroundOperationQueue.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by liujiajie on 2023/12/1.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/Tools/KMAddBatesOperationQueue.swift

@@ -1,6 +1,6 @@
 //
 //  KMAddBatesOperationQueue.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by liujiajie on 2023/12/1.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/Tools/KMAddHeaderFooterOperationQueue.swift

@@ -1,6 +1,6 @@
 //
 //  KMAddHeaderFooterOperationQueue.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by liujiajie on 2023/12/1.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/Tools/KMAddWatermarkOprationQueue.swift

@@ -1,6 +1,6 @@
 //
 //  KMAddWatermarkOprationQueue.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by liujiajie on 2023/12/1.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/Tools/KMBatchHeader.swift

@@ -1,6 +1,6 @@
 //
 //  KMBatchHeader.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by kdanmobile on 2023/10/25.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/Tools/KMBatchOperation.swift

@@ -1,6 +1,6 @@
 //
 //  KMBatchOperation.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by kdanmobile on 2023/10/31.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/Tools/KMBatchRemoveHeaderFooterOperation.swift

@@ -1,6 +1,6 @@
 //
 //  KMBatchRemoveHeaderFooterOperation.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by liujiajie on 2023/12/1.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/Tools/KMCompressOperationQueue.swift

@@ -1,6 +1,6 @@
 //
 //  KMCompressOperationQueue.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by liujiajie on 2023/12/1.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/Tools/KMImageToPDFMethod.swift

@@ -1,6 +1,6 @@
 //
 //  KMImageToPDFMethod.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by kdanmobile on 2023/10/26.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/Tools/KMOperationQueue.swift

@@ -1,6 +1,6 @@
 //
 //  KMOperationQueue.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by kdanmobile on 2023/10/30.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/Tools/KMRemoveBackgroundOperationQueue.swift

@@ -1,6 +1,6 @@
 //
 //  KMRemoveBackgroundOperationQueue.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by liujiajie on 2023/12/1.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/Tools/KMRemoveBatesOperationQueue.swift

@@ -1,6 +1,6 @@
 //
 //  KMRemoveBatesOperationQueue.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by liujiajie on 2023/12/1.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/Tools/KMRemoveHeaderFooterQueue.swift

@@ -1,6 +1,6 @@
 //
 //  KMRemoveHeaderFooterQueue.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by liujiajie on 2023/12/1.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/View/KMBatchTableCellView.swift

@@ -1,6 +1,6 @@
 //
 //  KMBatchTableCellView.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by kdanmobile on 2023/10/27.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/View/KMBatchWindow.swift

@@ -1,6 +1,6 @@
 //
 //  KMBatchWindow.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by kdanmobile on 2023/10/24.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/View/KMBatchoperateConvertCollectionViewItem.swift

@@ -1,6 +1,6 @@
 //
 //  KMBatchoperateConvertCollectionViewItem.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by kdanmobile on 2023/11/1.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/View/KMConvertCollectionViewHeader.swift

@@ -1,6 +1,6 @@
 //
 //  KMConvertCollectionViewHeader.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by kdanmobile on 2023/11/1.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/View/KMCustomViewButton.swift

@@ -1,6 +1,6 @@
 //
 //  KMCustomViewButton.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by tangchao on 2023/11/2.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/View/KMLongerButton.swift

@@ -1,6 +1,6 @@
 //
 //  KMLongerButton.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by kdanmobile on 2023/10/26.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/View/KMSlider.swift

@@ -1,6 +1,6 @@
 //
 //  KMSlider.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by kdanmobile on 2023/10/31.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/View/KMTableHeaderCell.swift

@@ -1,6 +1,6 @@
 //
 //  KMTableHeaderCell.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by kdanmobile on 2023/10/26.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/View/KMTextFieldCell.swift

@@ -1,6 +1,6 @@
 //
 //  KMTextFieldCell.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by liujiajie on 2024/1/11.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/WindowController/Base/KMBatchOperateBaseViewController.swift

@@ -1,6 +1,6 @@
 //
 //  KMBatchOperateBaseViewController.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by kdanmobile on 2023/10/30.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/WindowController/KMAlertWindowController.swift

@@ -1,6 +1,6 @@
 //
 //  KMAlertWindowController.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by kdanmobile on 2023/10/27.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/WindowController/KMBatchOperateBaseWindowController.swift

@@ -1,6 +1,6 @@
 //
 //  KMBatchOperateBaseWindowController.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by kdanmobile on 2023/10/26.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/WindowController/KMBatchOperateLeftViewController.swift

@@ -1,6 +1,6 @@
 //
 //  KMBatchOperateLeftViewController.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by kdanmobile on 2023/10/26.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/WindowController/KMBatchOperateRightViewController.swift

@@ -1,6 +1,6 @@
 //
 //  KMBatchOperateRightViewController.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by kdanmobile on 2023/10/26.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/WindowController/KMBatchOperateSplitViewController.swift

@@ -1,6 +1,6 @@
 //
 //  KMBatchOperateSplitViewController.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by kdanmobile on 2023/10/26.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/WindowController/KMBatchOperateWindowController.swift

@@ -1,6 +1,6 @@
 //
 //  KMBatchOperateWindowController.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by kdanmobile on 2023/10/24.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/WindowController/KMTextHintWindowController.swift

@@ -1,6 +1,6 @@
 //
 //  KMTextHintWindowController.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by kdanmobile on 2023/11/2.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/WindowController/PasswordWindowController.swift

@@ -1,6 +1,6 @@
 //
 //  PasswordWindowController.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by kdanmobile on 2023/11/2.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/WindowController/VC/KMBatchOperateCompressViewController.swift

@@ -1,6 +1,6 @@
 //
 //  KMBatchOperateCompressViewController.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by kdanmobile on 2023/10/31.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/WindowController/VC/KMBatchOperateConvertViewController.swift

@@ -1,6 +1,6 @@
 //
 //  KMBatchOperateConvertViewController.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by kdanmobile on 2023/11/1.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/WindowController/VC/KMBatchOperateImageToPDFViewController.swift

@@ -1,6 +1,6 @@
 //
 //  KMBatchOperateImageToPDFViewController.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by liujiajie on 2023/12/5.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/WindowController/VC/KMBatchOperateRemoveHeaderFooterViewController.swift

@@ -1,6 +1,6 @@
 //
 //  KMBatchOperateRemoveHeaderFooterViewController.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by tangchao on 2023/11/6.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/WindowController/VC/KMPlanViewController.swift

@@ -1,6 +1,6 @@
 //
 //  KMPlanViewController.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by liujiajie on 2023/12/6.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Batch/WindowController/VC/KMToolbarItemPopViewController.swift

@@ -1,6 +1,6 @@
 //
 //  KMToolbarItemPopViewController.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by liujiajie on 2023/11/10.
 //

+ 1 - 1
PDF Office/PDF Master/Class/ChromiumTabs/KMBrowser.swift

@@ -1,6 +1,6 @@
 //
 //  KMBrowser.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by wanjun on 2022/12/9.
 //

+ 24 - 2
PDF Office/PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift

@@ -1,6 +1,6 @@
 //
 //  KMBrowserWindowController.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by wanjun on 2022/12/9.
 //
@@ -16,6 +16,9 @@ import Cocoa
     var currentTimer: Timer?
     private(set) var isMultiTabMode: Bool = false
     
+    var rightMessageVC: KMVerificationMessageViewController!
+    var rightToolbarItemView: NSView!
+    
     private var homeVC: KMHomeViewController?
 
     override func windowDidLoad() {
@@ -222,7 +225,26 @@ import Cocoa
     
     override var rightStripView: NSView! {
         get {
-            return rightTabStripView_
+            if self.rightToolbarItemView == nil {
+                self.rightToolbarItemView = NSView.init(frame: CGRectMake(0, 0, 184, 40))
+                self.rightToolbarItemView.wantsLayer = true
+                
+                if self.rightMessageVC == nil {
+                    self.rightMessageVC = KMVerificationMessageViewController.init()
+                }
+                self.rightMessageVC.frameUpdateHandle = { [weak self] rect in
+                    var superRect = self?.rightToolbarItemView?.frame;
+                    superRect?.size.width = (self?.rightMessageVC.view.frame.size.width)! + 8
+                    self?.rightToolbarItemView.frame = superRect!;
+                }
+                var rect = self.rightMessageVC.view.frame;
+                rect.origin.x = CGRectGetWidth(self.rightToolbarItemView.frame) - rect.size.width - 8
+                rect.origin.y = (CGRectGetHeight(self.rightToolbarItemView.frame) - rect.size.height)/2
+                self.rightMessageVC.view.frame = rect
+                self.rightMessageVC.view.autoresizingMask = [.minYMargin, .maxXMargin, .maxYMargin]
+                self.rightToolbarItemView.addSubview(self.rightMessageVC.view)
+            }
+            return self.rightToolbarItemView
         }
     }
     

+ 1 - 1
PDF Office/PDF Master/Class/ChromiumTabs/KMFileSearchView.swift

@@ -1,6 +1,6 @@
 //
 //  KMFileSearchView.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by wanjun on 2022/12/7.
 //

+ 1 - 1
PDF Office/PDF Master/Class/ChromiumTabs/KMSegmentedBox.swift

@@ -1,6 +1,6 @@
 //
 //  KMSegmentedBox.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by wanjun on 2022/12/9.
 //

+ 1 - 1
PDF Office/PDF Master/Class/ChromiumTabs/KMTabAppearance.swift

@@ -1,6 +1,6 @@
 //
 //  KMTabAppearance.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by wanjun on 2022/12/9.
 //

+ 1 - 1
PDF Office/PDF Master/Class/ChromiumTabs/KMTabStripView.swift

@@ -1,6 +1,6 @@
 //
 //  KMTabStripView.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by wanjun on 2022/12/12.
 //

+ 1 - 1
PDF Office/PDF Master/Class/ChromiumTabs/KMToolbarRightView.swift

@@ -1,6 +1,6 @@
 //
 //  KMToolbarRightView.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by wanjun on 2022/12/9.
 //

+ 1 - 1
PDF Office/PDF Master/Class/ChromiumTabs/KMUploadFilePanel.swift

@@ -1,6 +1,6 @@
 //
 //  KMUploadFilePanel.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by wanjun on 2022/12/7.
 //

+ 2 - 24
PDF Office/PDF Master/Class/ChromiumTabs/src/Browser Window/CTBrowserWindowController.m

@@ -14,7 +14,7 @@
 #import "FastResizeView.h"
 #import "CTTabController.h"
 
-#import <PDF_Master-Swift.h>
+#import <PDF_Reader_Pro-Swift.h>
 
 #import "common.h"
 
@@ -869,34 +869,16 @@ static CTBrowserWindowController* _currentMain = nil; // weak
     
     CTTabContents* document = [self.browser activeTabContents];
 
-    KMToolbarRightView *rightStripView = nil;
-    if (document.isHome) {
-        rightStripView = self.homeRightStripView;
-    } else {
-        rightStripView = self.rightStripView;
-    }
+    NSView *rightStripView = self.rightStripView;
 
     CGFloat rightWidth = NSWidth([rightStripView frame]);
     
-    if (![[KMLightMemberManager manager] isLogin] ||
-        ([KMLightMemberManager manager].purchaseState !=  KMPurchaseManagerStateSubscription&&
-         [KMLightMemberManager manager].purchaseState != KMPurchaseManagerStateTrial)) {
-//        rightWidth = NSWidth([rightStripView frame]);
-//        rightWidth = 56.0 + rightStripView.fetchAdvancedViewSize.width;
-//        rightWidth += rightStripView.fetchAdvancedViewSize.width;
-        // TODO: 待优化。目前是写默认数值,上面注释的方式,在拖拽标签到新窗口时有问题。
-        rightWidth = 56.0 + 89;
-        [rightStripView fetchAdvancedViewSize_update_rightSegmentControlConstraint];
-    } else {
-        rightWidth = 56.0;
-    }
     CGFloat tabStripHeight = NSHeight([tabStripView frame]);
     CGFloat tabStripWidth = width - rightWidth;
 
     maxY -= tabStripHeight;
     if (fullscreen) {
         [tabStripView setFrame:NSMakeRect(0, maxY, tabStripWidth, tabStripHeight)];
-
     } else {
         CGFloat offset = [[tabStripController_ class] defaultIndentForControls];
         tabStripWidth  -= offset;
@@ -905,11 +887,7 @@ static CTBrowserWindowController* _currentMain = nil; // weak
     
     [tabStripController_ setIndentForControls:0];
 
-//    [rightStripView setFrame:NSMakeRect(NSMaxX(tabStripView.frame), maxY, rightWidth, tabStripHeight)];
-    self.homeRightStripView.frame = NSMakeRect(NSMaxX(tabStripView.frame), maxY, rightWidth, tabStripHeight);
     self.rightStripView.frame = NSMakeRect(NSMaxX(tabStripView.frame), maxY, rightWidth, tabStripHeight);
-    [(KMToolbarRightView *)self.rightStripView updateView];
-    [(KMToolbarRightView *)self.homeRightStripView updateView];
 
     // Set indentation.
     [tabStripController_ layoutTabsWithoutAnimation];

+ 1 - 1
PDF Office/PDF Master/Class/ChromiumTabs/src/Browser Window/CTTabWindowController.m

@@ -6,7 +6,7 @@
 #import "CTTabStripView.h"
 #import "common.h"
 
-#import <PDF_Master-Swift.h>
+#import <PDF_Reader_Pro-Swift.h>
 
 @interface CTTabWindowController(PRIVATE)
 - (void)setUseOverlay:(BOOL)useOverlay;

+ 1 - 1
PDF Office/PDF Master/Class/ChromiumTabs/src/Tab Strip/CTTabStripModel.m

@@ -13,7 +13,7 @@
 
 #import "CTTabContents.h"
 
-#import <PDF_Master-Swift.h>
+#import <PDF_Reader_Pro-Swift.h>
 
 #import "common.h"
 

+ 1 - 1
PDF Office/PDF Master/Class/ChromiumTabs/src/Tab Strip/CTTabStripView.m

@@ -6,7 +6,7 @@
 #import "CTTabStripController.h"
 #import "URLDropTarget.h"
 
-#import <PDF_Master-Swift.h>
+#import <PDF_Reader_Pro-Swift.h>
 
 // ripped out from libbase mac_util.mm:
 static BOOL ShouldWindowsMiniaturizeOnDoubleClick() {

+ 1 - 1
PDF Office/PDF Master/Class/ChromiumTabs/src/Tab/CTTabController.m

@@ -8,7 +8,7 @@
 #import "CTUtil.h"
 #import "HoverCloseButton.h"
 
-#import <PDF_Master-Swift.h>
+#import <PDF_Reader_Pro-Swift.h>
 
 static NSString* const kBrowserThemeDidChangeNotification =
 @"BrowserThemeDidChangeNotification";

+ 1 - 1
PDF Office/PDF Master/Class/Common/Base/KMBaseViewController.swift

@@ -1,6 +1,6 @@
 //
 //  KMBaseViewController.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by tangchao on 2023/5/5.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Common/Base/KMBaseWindowController.swift

@@ -1,6 +1,6 @@
 //
 //  KMBaseWindowController.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by tangchao on 2023/5/11.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Common/Base/KMHoverView.swift

@@ -1,6 +1,6 @@
 //
 //  KMHoverView.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by tangchao on 2023/6/7.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Common/Category/CPDFKit/CPDFView+KMExtension.swift

@@ -1,6 +1,6 @@
 //
 //  CPDFView+KMExtension.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by tangchao on 2023/12/21.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Common/Category/NSBitmapImageRep_KMExtension.swift

@@ -1,6 +1,6 @@
 //
 //  NSBitmapImageRep_KMExtension.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by wanjun on 2023/12/2.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Common/Category/NSCollectionViewItem+KMExtension.swift

@@ -1,6 +1,6 @@
 //
 //  NSCollectionViewItem+KMExtension.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by tangchao on 2023/5/4.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Common/Category/NSDocumentController+KMExtension.swift

@@ -1,6 +1,6 @@
 //
 //  NSDocumentController+KMExtension.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by tangchao on 2023/6/16.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Common/Category/NSFont+KMExtension.swift

@@ -1,6 +1,6 @@
 //
 //  NSFont+KMExtension.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by tangchao on 2023/9/27.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Common/Category/NSImage+KMExtension.swift

@@ -1,6 +1,6 @@
 //
 //  NSImage+KMExtension.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by tangchao on 2023/11/13.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Common/Category/NSObject+KMExtension.swift

@@ -1,6 +1,6 @@
 //
 //  NSObject+KMExtension.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by tangchao on 2023/9/26.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Common/Category/NSPanel+KMExtension.swift

@@ -1,6 +1,6 @@
 //
 //  NSPanel+KMExtension.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by tangchao on 2023/4/24.
 //

+ 1 - 1
PDF Office/PDF Master/Class/Common/Category/NSPopover+KMExtension.swift

@@ -1,6 +1,6 @@
 //
 //  NSPopover+KMExtension.swift
-//  PDF Master
+//  PDF Reader Pro
 //
 //  Created by tangchao on 2023/10/9.
 //

+ 0 - 0
PDF Office/PDF Master/Class/Common/Category/NSResponder+KMExtension.swift


Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików