Forráskód Böngészése

【编辑工具】- 压缩入口串接

lizhe 1 hete
szülő
commit
16036bb04d

+ 1 - 4
PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/KMBatchOperateNewCompressViewController.swift

@@ -10,11 +10,8 @@ import Cocoa
 class KMBatchOperateNewCompressViewController: KMBatchOperateBaseViewController {
 
     @IBOutlet weak var titleLabel: NSTextField!
-    @IBOutlet weak var standardButton: NSButton!
-    @IBOutlet weak var mobileButton: NSButton!
-    @IBOutlet weak var customButton: NSButton!
     @IBOutlet weak var compressButton: NSButton!
-    @IBOutlet weak var tipButton: KMButton!
+    @IBOutlet weak var compressView: KMBatchOperateCompressView!
     
     
     override func viewDidLoad() {

+ 2 - 66
PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/KMBatchOperateNewCompressViewController.xib

@@ -9,10 +9,7 @@
         <customObject id="-2" userLabel="File's Owner" customClass="KMBatchOperateNewCompressViewController" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="compressButton" destination="baL-o2-whg" id="fHX-gs-gXW"/>
-                <outlet property="customButton" destination="DS5-Mm-qmi" id="hjo-kN-lkm"/>
-                <outlet property="mobileButton" destination="fJ9-XF-fef" id="HLE-W5-2la"/>
-                <outlet property="standardButton" destination="daN-9s-UY7" id="c63-R7-LXV"/>
-                <outlet property="tipButton" destination="zd2-OG-nM7" id="3OJ-sC-9YQ"/>
+                <outlet property="compressView" destination="nlU-Iu-DXD" id="mbC-tf-yaD"/>
                 <outlet property="titleLabel" destination="y0T-QN-EWu" id="Rbt-QN-OZz"/>
                 <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
             </connections>
@@ -31,69 +28,8 @@
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <customView translatesAutoresizingMaskIntoConstraints="NO" id="nlU-Iu-DXD">
+                <customView translatesAutoresizingMaskIntoConstraints="NO" id="nlU-Iu-DXD" customClass="KMBatchOperateCompressView" customModule="PDF_Reader_Pro" customModuleProvider="target">
                     <rect key="frame" x="16" y="48" width="496" height="255"/>
-                    <subviews>
-                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="daN-9s-UY7">
-                            <rect key="frame" x="-2" y="230.5" width="163" height="18"/>
-                            <buttonCell key="cell" type="radio" title="Standard(Recommend)" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="9iA-j5-LZ7">
-                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                <font key="font" metaFont="cellTitle"/>
-                            </buttonCell>
-                            <connections>
-                                <action selector="standardButtonAction:" target="-2" id="EWD-yL-Id0"/>
-                            </connections>
-                        </button>
-                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="fJ9-XF-fef">
-                            <rect key="frame" x="-2" y="199.5" width="64" height="18"/>
-                            <buttonCell key="cell" type="radio" title="Mobile" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="hs7-fb-Ulu">
-                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                <font key="font" metaFont="cellTitle"/>
-                            </buttonCell>
-                            <connections>
-                                <action selector="mobileButtonAction:" target="-2" id="L45-7D-DK8"/>
-                            </connections>
-                        </button>
-                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DS5-Mm-qmi">
-                            <rect key="frame" x="-2" y="168.5" width="70" height="18"/>
-                            <buttonCell key="cell" type="radio" title="Custom" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="BYi-H9-vne">
-                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                <font key="font" metaFont="cellTitle"/>
-                            </buttonCell>
-                            <connections>
-                                <action selector="customButtonAction:" target="-2" id="nRE-kj-aGE"/>
-                            </connections>
-                        </button>
-                        <button translatesAutoresizingMaskIntoConstraints="NO" id="i0J-KO-zi6">
-                            <rect key="frame" x="72" y="170" width="46" height="16"/>
-                            <buttonCell key="cell" type="square" title="setting" bezelStyle="shadowlessSquare" alignment="center" imageScaling="proportionallyDown" inset="2" id="UzY-QV-8GD">
-                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                <font key="font" metaFont="system"/>
-                            </buttonCell>
-                            <connections>
-                                <action selector="settingButtonAction:" target="-2" id="Lru-Kk-KfK"/>
-                            </connections>
-                        </button>
-                        <button translatesAutoresizingMaskIntoConstraints="NO" id="zd2-OG-nM7" customClass="KMButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                            <rect key="frame" x="66" y="201" width="31" height="16"/>
-                            <buttonCell key="cell" type="square" title="提示" bezelStyle="shadowlessSquare" alignment="center" imageScaling="proportionallyDown" inset="2" id="XGF-G0-h79">
-                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                <font key="font" metaFont="system"/>
-                            </buttonCell>
-                        </button>
-                    </subviews>
-                    <constraints>
-                        <constraint firstItem="i0J-KO-zi6" firstAttribute="centerY" secondItem="DS5-Mm-qmi" secondAttribute="centerY" id="7TP-Qc-ERb"/>
-                        <constraint firstItem="DS5-Mm-qmi" firstAttribute="leading" secondItem="nlU-Iu-DXD" secondAttribute="leading" id="CC3-92-CSB"/>
-                        <constraint firstItem="i0J-KO-zi6" firstAttribute="leading" secondItem="DS5-Mm-qmi" secondAttribute="trailing" constant="4" id="FE7-sh-xH3"/>
-                        <constraint firstItem="fJ9-XF-fef" firstAttribute="top" secondItem="daN-9s-UY7" secondAttribute="bottom" constant="16" id="Mef-vy-6M1"/>
-                        <constraint firstItem="fJ9-XF-fef" firstAttribute="leading" secondItem="nlU-Iu-DXD" secondAttribute="leading" id="VLh-2s-6UE"/>
-                        <constraint firstItem="daN-9s-UY7" firstAttribute="leading" secondItem="nlU-Iu-DXD" secondAttribute="leading" id="aPJ-WF-f0F"/>
-                        <constraint firstItem="daN-9s-UY7" firstAttribute="top" secondItem="nlU-Iu-DXD" secondAttribute="top" constant="8" id="bzd-tH-dLy"/>
-                        <constraint firstItem="zd2-OG-nM7" firstAttribute="centerY" secondItem="fJ9-XF-fef" secondAttribute="centerY" id="gw3-il-gBx"/>
-                        <constraint firstItem="zd2-OG-nM7" firstAttribute="leading" secondItem="fJ9-XF-fef" secondAttribute="trailing" constant="4" id="nop-jd-cfo"/>
-                        <constraint firstItem="DS5-Mm-qmi" firstAttribute="top" secondItem="fJ9-XF-fef" secondAttribute="bottom" constant="16" id="yH4-OS-TvU"/>
-                    </constraints>
                 </customView>
                 <button translatesAutoresizingMaskIntoConstraints="NO" id="baL-o2-whg">
                     <rect key="frame" x="16" y="16" width="496" height="32"/>

+ 24 - 0
PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/View/KMBatchOperateCompressView.swift

@@ -0,0 +1,24 @@
+//
+//  KMBatchOperateCompressView.swift
+//  PDF Reader Pro
+//
+//  Created by lizhe on 2024/11/18.
+//
+
+import Cocoa
+
+class KMBatchOperateCompressView: KMBaseXibView {
+
+    @IBOutlet weak var standardButton: NSButton!
+    @IBOutlet weak var mobileButton: NSButton!
+    @IBOutlet weak var customButton: NSButton!
+
+    @IBOutlet weak var tipButton: KMButton!
+    
+    override func draw(_ dirtyRect: NSRect) {
+        super.draw(dirtyRect)
+
+        // Drawing code here.
+    }
+    
+}

+ 78 - 0
PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/View/KMBatchOperateCompressView.xib

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <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>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="KMBatchOperateCompressView" customModule="PDF_Reader_Pro" customModuleProvider="target"/>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customView id="c22-O7-iKe">
+            <rect key="frame" x="0.0" y="0.0" width="480" height="272"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+            <subviews>
+                <customView translatesAutoresizingMaskIntoConstraints="NO" id="YC0-pH-jJZ">
+                    <rect key="frame" x="0.0" y="0.0" width="480" height="272"/>
+                    <subviews>
+                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6SE-sT-zpS">
+                            <rect key="frame" x="-2" y="247.5" width="163" height="18"/>
+                            <buttonCell key="cell" type="radio" title="Standard(Recommend)" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="c85-uP-M6f">
+                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                <font key="font" metaFont="cellTitle"/>
+                            </buttonCell>
+                        </button>
+                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ygY-fe-yeM">
+                            <rect key="frame" x="-2" y="216.5" width="64" height="18"/>
+                            <buttonCell key="cell" type="radio" title="Mobile" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="rZe-Wh-8pN">
+                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                <font key="font" metaFont="cellTitle"/>
+                            </buttonCell>
+                        </button>
+                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6x0-ch-VkE">
+                            <rect key="frame" x="-2" y="185.5" width="70" height="18"/>
+                            <buttonCell key="cell" type="radio" title="Custom" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="HoC-bV-4pZ">
+                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                <font key="font" metaFont="cellTitle"/>
+                            </buttonCell>
+                        </button>
+                        <button translatesAutoresizingMaskIntoConstraints="NO" id="1Bh-FK-sZg">
+                            <rect key="frame" x="72" y="187" width="46" height="16"/>
+                            <buttonCell key="cell" type="square" title="setting" bezelStyle="shadowlessSquare" alignment="center" imageScaling="proportionallyDown" inset="2" id="fTG-GB-OlD">
+                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                <font key="font" metaFont="system"/>
+                            </buttonCell>
+                        </button>
+                        <button translatesAutoresizingMaskIntoConstraints="NO" id="dJy-8r-7hO" customClass="KMButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
+                            <rect key="frame" x="66" y="218" width="31" height="16"/>
+                            <buttonCell key="cell" type="square" title="提示" bezelStyle="shadowlessSquare" alignment="center" imageScaling="proportionallyDown" inset="2" id="ktQ-hV-aX6">
+                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                <font key="font" metaFont="system"/>
+                            </buttonCell>
+                        </button>
+                    </subviews>
+                    <constraints>
+                        <constraint firstItem="6x0-ch-VkE" firstAttribute="top" secondItem="ygY-fe-yeM" secondAttribute="bottom" constant="16" id="5pG-LK-cVH"/>
+                        <constraint firstItem="6SE-sT-zpS" firstAttribute="top" secondItem="YC0-pH-jJZ" secondAttribute="top" constant="8" id="EIv-bO-8Pe"/>
+                        <constraint firstItem="6x0-ch-VkE" firstAttribute="leading" secondItem="YC0-pH-jJZ" secondAttribute="leading" id="GbZ-1X-nr7"/>
+                        <constraint firstItem="6SE-sT-zpS" firstAttribute="leading" secondItem="YC0-pH-jJZ" secondAttribute="leading" id="GtX-vb-q3w"/>
+                        <constraint firstItem="1Bh-FK-sZg" firstAttribute="leading" secondItem="6x0-ch-VkE" secondAttribute="trailing" constant="4" id="Iay-Ca-kfN"/>
+                        <constraint firstItem="ygY-fe-yeM" firstAttribute="leading" secondItem="YC0-pH-jJZ" secondAttribute="leading" id="KXu-XY-q48"/>
+                        <constraint firstItem="dJy-8r-7hO" firstAttribute="leading" secondItem="ygY-fe-yeM" secondAttribute="trailing" constant="4" id="PBi-iW-ZJy"/>
+                        <constraint firstItem="ygY-fe-yeM" firstAttribute="top" secondItem="6SE-sT-zpS" secondAttribute="bottom" constant="16" id="fL4-6U-Y47"/>
+                        <constraint firstItem="1Bh-FK-sZg" firstAttribute="centerY" secondItem="6x0-ch-VkE" secondAttribute="centerY" id="k1T-aN-URG"/>
+                        <constraint firstItem="dJy-8r-7hO" firstAttribute="centerY" secondItem="ygY-fe-yeM" secondAttribute="centerY" id="zEL-YT-7F3"/>
+                    </constraints>
+                </customView>
+            </subviews>
+            <constraints>
+                <constraint firstItem="YC0-pH-jJZ" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" id="9vn-wy-gQH"/>
+                <constraint firstAttribute="trailing" secondItem="YC0-pH-jJZ" secondAttribute="trailing" id="CDT-7q-Vba"/>
+                <constraint firstItem="YC0-pH-jJZ" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" id="Jmc-C5-Q0O"/>
+                <constraint firstAttribute="bottom" secondItem="YC0-pH-jJZ" secondAttribute="bottom" id="zQy-i9-Gfo"/>
+            </constraints>
+            <point key="canvasLocation" x="139" y="146"/>
+        </customView>
+    </objects>
+</document>

+ 4 - 4
PDF Office/PDF Master/Class/PDFTools/Compress/Controller/KMCompressWIndowControllerNew.xib

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMCompressWIndowControllerNew" customModule="PDF_Master" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMCompressWIndowControllerNew" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="compressView" destination="Xp8-iA-nRn" id="D8b-U4-B52"/>
                 <outlet property="window" destination="F0z-JX-Cv5" id="gIp-Ho-8D9"/>
@@ -23,7 +23,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="616" height="474"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="Xp8-iA-nRn" customClass="KMCompressView" customModule="PDF_Master" customModuleProvider="target">
+                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="Xp8-iA-nRn" customClass="KMCompressView" customModule="PDF_Reader_Pro" customModuleProvider="target">
                         <rect key="frame" x="0.0" y="0.0" width="616" height="474"/>
                     </customView>
                 </subviews>

+ 2 - 2
PDF Office/PDF Master/Class/PDFTools/Compress/Controller/KMCompressWindowController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>

+ 46 - 46
PDF Office/PDF Master/Class/PDFTools/Compress/View/KMCompressView.swift

@@ -21,12 +21,12 @@ class KMCompressView: KMBaseXibView {
     @IBOutlet weak var progressSizeLabel: NSTextField!
     @IBOutlet weak var progress: NSProgressIndicator!
     
-    @IBOutlet weak var selectLabel: NSTextField!
-    @IBOutlet weak var qulityMatrix: NSMatrix!
-    
-    @IBOutlet weak var lowLabel: NSTextField!
-    @IBOutlet weak var hightLabel: NSTextField!
-    @IBOutlet weak var qualitySlider: KMSlider!
+//    @IBOutlet weak var selectLabel: NSTextField!
+//    @IBOutlet weak var qulityMatrix: NSMatrix!
+//    
+//    @IBOutlet weak var lowLabel: NSTextField!
+//    @IBOutlet weak var hightLabel: NSTextField!
+//    @IBOutlet weak var qualitySlider: KMSlider!
     
     @IBOutlet weak var cancelButton: NSButton!
     @IBOutlet weak var compressButton: NSButton!
@@ -55,10 +55,10 @@ class KMCompressView: KMBaseXibView {
     }
 
     override func setup() {
-        qulityMatrix.selectCell(atRow: 2, column: 0)
+//        qulityMatrix.selectCell(atRow: 2, column: 0)
         
-        lowLabel.textColor = KMAppearance.Layout.h0Color()
-        hightLabel.textColor = KMAppearance.Layout.h0Color()
+//        lowLabel.textColor = KMAppearance.Layout.h0Color()
+//        hightLabel.textColor = KMAppearance.Layout.h0Color()
         
         previewBox.fillColor = NSColor.black.withAlphaComponent(0.04)
         previewBox.cornerRadius = 4.0
@@ -69,20 +69,20 @@ class KMCompressView: KMBaseXibView {
     }
     
     override func updateLanguage() {
-        selectLabel.stringValue = NSLocalizedString("Optimization Options", comment: "")
-        lowLabel.stringValue = NSLocalizedString("Low Quality", comment: "")
-        hightLabel.stringValue = NSLocalizedString("High Quality", comment: "")
+//        selectLabel.stringValue = NSLocalizedString("Optimization Options", comment: "")
+//        lowLabel.stringValue = NSLocalizedString("Low Quality", comment: "")
+//        hightLabel.stringValue = NSLocalizedString("High Quality", comment: "")
         cancelButton.title = NSLocalizedString("Cancel", comment: "")
         compressButton.title = NSLocalizedString("Compress", comment: "")
         batchButton.title = NSLocalizedString("Batch", comment: "")
         
-        for cell in qulityMatrix.cells {
-            var title = cell.title
-            if title == "Other" {
-                title = "Customize"
-            }
-            cell.title = NSLocalizedString(title, comment: "")
-        }
+//        for cell in qulityMatrix.cells {
+//            var title = cell.title
+//            if title == "Other" {
+//                title = "Customize"
+//            }
+//            cell.title = NSLocalizedString(title, comment: "")
+//        }
     }
     
     override func reloadData() {
@@ -110,21 +110,21 @@ class KMCompressView: KMBaseXibView {
     }
     
     func updateQulityMatrixState() {
-        if qulityMatrix.selectedRow == 4 {
-            hightLabel.isEnabled = true
-            lowLabel.isEnabled = true
-            qualitySlider.isEnabled = true
-            lowLabel.alphaValue = 1
-            hightLabel.alphaValue = 1
-            qualitySlider.tipEnabled = true
-        } else {
-            hightLabel.isEnabled = false
-            lowLabel.isEnabled = false
-            qualitySlider.isEnabled = false
-            lowLabel.alphaValue = 0.4
-            hightLabel.alphaValue = 0.4
-            qualitySlider.tipEnabled = false
-        }
+//        if qulityMatrix.selectedRow == 4 {
+//            hightLabel.isEnabled = true
+//            lowLabel.isEnabled = true
+//            qualitySlider.isEnabled = true
+//            lowLabel.alphaValue = 1
+//            hightLabel.alphaValue = 1
+//            qualitySlider.tipEnabled = true
+//        } else {
+//            hightLabel.isEnabled = false
+//            lowLabel.isEnabled = false
+//            qualitySlider.isEnabled = false
+//            lowLabel.alphaValue = 0.4
+//            hightLabel.alphaValue = 0.4
+//            qualitySlider.tipEnabled = false
+//        }
     }
     
     func fileSizeString(_ fSize: Float) -> String {
@@ -153,18 +153,18 @@ extension KMCompressView {
         guard let callBack = compressAction else { return }
         
         var compressVale = 60
-        if (qulityMatrix.selectedRow == 0) {
-            compressVale = 120
-        } else if (qulityMatrix.selectedRow == 1) {
-            compressVale = 90
-        } else if (qulityMatrix.selectedRow == 2) {
-            compressVale = 60
-        } else if (qulityMatrix.selectedRow == 3) {
-            compressVale = 30
-        } else {
-            compressVale = qualitySlider.integerValue
-        }
-        
+//        if (qulityMatrix.selectedRow == 0) {
+//            compressVale = 120
+//        } else if (qulityMatrix.selectedRow == 1) {
+//            compressVale = 90
+//        } else if (qulityMatrix.selectedRow == 2) {
+//            compressVale = 60
+//        } else if (qulityMatrix.selectedRow == 3) {
+//            compressVale = 30
+//        } else {
+//            compressVale = qualitySlider.integerValue
+//        }
+//        
         callBack(self, compressVale)
     }
     

+ 12 - 88
PDF Office/PDF Master/Class/PDFTools/Compress/View/KMCompressView.xib

@@ -1,26 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMCompressView" customModule="PDF_Master" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMCompressView" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="batchButton" destination="oK4-qZ-nsZ" id="qs0-gu-74l"/>
                 <outlet property="cancelButton" destination="M8m-46-Uhb" id="K0C-2I-WOj"/>
                 <outlet property="compressButton" destination="IHF-en-Dqi" id="PwN-g7-RFb"/>
                 <outlet property="fileImageView" destination="got-mA-Esq" id="Zls-7k-XND"/>
                 <outlet property="finalSizeLabel" destination="AVp-B0-LcQ" id="syN-mv-nSW"/>
-                <outlet property="hightLabel" destination="QQd-Ip-P83" id="dPU-qd-naS"/>
-                <outlet property="lowLabel" destination="vym-ui-oBO" id="Dqb-89-6Ky"/>
                 <outlet property="previewBox" destination="JoQ-Bg-A7A" id="IFH-92-kmH"/>
                 <outlet property="progress" destination="rI6-3z-z33" id="EnV-KA-efW"/>
                 <outlet property="progressSizeLabel" destination="qSB-Az-aee" id="nUn-C4-CiF"/>
-                <outlet property="qualitySlider" destination="eL4-zP-lte" id="wPt-6Y-4YT"/>
-                <outlet property="qulityMatrix" destination="pD4-qc-WIt" id="CAg-ZN-HuB"/>
-                <outlet property="selectLabel" destination="7pF-2n-frE" id="C6e-zX-bqL"/>
                 <outlet property="sizeLabel" destination="JF7-f4-ihM" id="03Y-DG-toK"/>
                 <outlet property="titleLabel" destination="feZ-ij-cjM" id="4xr-Ws-a8c"/>
             </connections>
@@ -60,51 +55,6 @@ DQ
                                 <action selector="compressButtonAction:" target="-2" id="5LC-ea-MLd"/>
                             </connections>
                         </button>
-                        <matrix verticalHuggingPriority="750" allowsEmptySelection="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pD4-qc-WIt">
-                            <rect key="frame" x="61" y="90" width="357" height="123"/>
-                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                            <size key="cellSize" width="357" height="23"/>
-                            <size key="intercellSpacing" width="4" height="2"/>
-                            <buttonCell key="prototype" type="bevel" title="Radio" imagePosition="left" alignment="left" inset="2" id="ZoF-so-Qrp">
-                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                <font key="font" metaFont="system"/>
-                            </buttonCell>
-                            <cells>
-                                <column>
-                                    <buttonCell type="radio" title="Large File Size(High Quality)" bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on" tag="1" inset="2" id="a8s-8G-jq2">
-                                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                        <font key="font" metaFont="system"/>
-                                    </buttonCell>
-                                    <buttonCell type="radio" title="Medium File Size(Medium Quality)" imagePosition="left" alignment="left" inset="2" id="Tdw-Os-Nhn">
-                                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                        <font key="font" metaFont="system"/>
-                                    </buttonCell>
-                                    <buttonCell type="radio" title="Small File Size(Recommended Quality)" imagePosition="left" alignment="left" inset="2" id="c7y-5G-qtA">
-                                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                        <font key="font" metaFont="system"/>
-                                    </buttonCell>
-                                    <buttonCell type="radio" title="Minimum File Size(Low Quality)" imagePosition="left" alignment="left" inset="2" id="LRe-1E-d0e">
-                                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                        <font key="font" metaFont="system"/>
-                                    </buttonCell>
-                                    <buttonCell type="radio" title="Other" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="IHz-jB-tSr">
-                                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                        <font key="font" metaFont="system"/>
-                                    </buttonCell>
-                                </column>
-                            </cells>
-                            <connections>
-                                <action selector="qulityMatrixAction:" target="-2" id="tA2-1h-dxN"/>
-                            </connections>
-                        </matrix>
-                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7pF-2n-frE">
-                            <rect key="frame" x="59" y="223" width="154" height="16"/>
-                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Select Compress Format" id="unA-fp-iyW">
-                                <font key="font" metaFont="system"/>
-                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                            </textFieldCell>
-                        </textField>
                         <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="oK4-qZ-nsZ">
                             <rect key="frame" x="8" y="11" width="69" height="32"/>
                             <buttonCell key="cell" type="push" title="Batch" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="d4I-h4-20k">
@@ -115,7 +65,7 @@ DQ
                                 <action selector="batchButtonAction:" target="-2" id="WsW-uG-03w"/>
                             </connections>
                         </button>
-                        <box autoresizesSubviews="NO" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="JoQ-Bg-A7A" customClass="KMBox" customModule="PDF_Master" customModuleProvider="target">
+                        <box autoresizesSubviews="NO" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="JoQ-Bg-A7A" customClass="KMBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
                             <rect key="frame" x="37" y="260" width="457" height="146"/>
                             <view key="contentView" id="qgD-bf-gnS">
                                 <rect key="frame" x="4" y="5" width="449" height="138"/>
@@ -189,50 +139,24 @@ DQ
                                 <constraint firstAttribute="height" constant="140" id="HWO-1j-I4e"/>
                             </constraints>
                         </box>
-                        <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="eL4-zP-lte" customClass="KMSlider" customModule="PDF_Master" customModuleProvider="target">
-                            <rect key="frame" x="127" y="56" width="204" height="28"/>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="200" id="PSU-qN-bMS"/>
-                            </constraints>
-                            <sliderCell key="cell" state="on" alignment="left" minValue="1" maxValue="120" doubleValue="60" tickMarkPosition="above" sliderType="linear" id="mi1-5s-sLY"/>
-                        </slider>
-                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vym-ui-oBO">
-                            <rect key="frame" x="84" y="64" width="37" height="16"/>
-                            <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="i3j-GV-aUO">
-                                <font key="font" metaFont="system"/>
-                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                            </textFieldCell>
-                        </textField>
-                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QQd-Ip-P83">
-                            <rect key="frame" x="337" y="64" width="37" height="16"/>
-                            <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="XHK-Rr-DPO">
-                                <font key="font" metaFont="system"/>
-                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                            </textFieldCell>
-                        </textField>
+                        <customView translatesAutoresizingMaskIntoConstraints="NO" id="u2u-i9-7s5" customClass="KMBatchOperateCompressView" customModule="PDF_Reader_Pro" customModuleProvider="target">
+                            <rect key="frame" x="40" y="58" width="451" height="166"/>
+                        </customView>
                     </subviews>
                     <constraints>
                         <constraint firstAttribute="trailing" secondItem="JoQ-Bg-A7A" secondAttribute="trailing" constant="40" id="0BD-V6-QH5"/>
-                        <constraint firstItem="vym-ui-oBO" firstAttribute="leading" secondItem="7D3-FA-RtT" secondAttribute="leading" constant="86" id="0dc-Pw-Dha"/>
-                        <constraint firstItem="7pF-2n-frE" firstAttribute="top" secondItem="JoQ-Bg-A7A" secondAttribute="bottom" constant="25" id="Aab-bv-j0P"/>
                         <constraint firstItem="M8m-46-Uhb" firstAttribute="centerY" secondItem="oK4-qZ-nsZ" secondAttribute="centerY" id="BNo-z7-3aF"/>
                         <constraint firstItem="oK4-qZ-nsZ" firstAttribute="leading" secondItem="7D3-FA-RtT" secondAttribute="leading" constant="15" id="Cpb-jC-cBb"/>
-                        <constraint firstItem="pD4-qc-WIt" firstAttribute="leading" secondItem="7pF-2n-frE" secondAttribute="leading" id="Dkp-ae-eMC"/>
-                        <constraint firstItem="QQd-Ip-P83" firstAttribute="centerY" secondItem="eL4-zP-lte" secondAttribute="centerY" id="GVR-gW-8qX"/>
                         <constraint firstItem="IHF-en-Dqi" firstAttribute="centerY" secondItem="oK4-qZ-nsZ" secondAttribute="centerY" id="Hd6-wV-p14"/>
-                        <constraint firstItem="QQd-Ip-P83" firstAttribute="leading" secondItem="eL4-zP-lte" secondAttribute="trailing" constant="10" id="Liz-u2-Dsv"/>
+                        <constraint firstAttribute="trailing" secondItem="u2u-i9-7s5" secondAttribute="trailing" constant="40" id="LIj-xc-gg7"/>
                         <constraint firstAttribute="trailing" secondItem="IHF-en-Dqi" secondAttribute="trailing" constant="33" id="PnY-ds-mE9"/>
-                        <constraint firstItem="eL4-zP-lte" firstAttribute="leading" secondItem="vym-ui-oBO" secondAttribute="trailing" constant="10" id="Q5a-kG-TbE"/>
                         <constraint firstAttribute="bottom" secondItem="oK4-qZ-nsZ" secondAttribute="bottom" constant="18" id="S50-eb-Jw5"/>
                         <constraint firstItem="JoQ-Bg-A7A" firstAttribute="leading" secondItem="7D3-FA-RtT" secondAttribute="leading" constant="40" id="SIf-DG-vtq"/>
-                        <constraint firstItem="eL4-zP-lte" firstAttribute="centerY" secondItem="vym-ui-oBO" secondAttribute="centerY" id="c1J-bd-Hr2"/>
+                        <constraint firstItem="u2u-i9-7s5" firstAttribute="leading" secondItem="7D3-FA-RtT" secondAttribute="leading" constant="40" id="TEj-JF-zdb"/>
                         <constraint firstItem="JoQ-Bg-A7A" firstAttribute="top" secondItem="7D3-FA-RtT" secondAttribute="top" constant="20" id="cN3-Xc-cuz"/>
-                        <constraint firstItem="7pF-2n-frE" firstAttribute="leading" secondItem="qgD-bf-gnS" secondAttribute="leading" constant="20" id="hrr-AP-NWs"/>
-                        <constraint firstItem="vym-ui-oBO" firstAttribute="top" secondItem="pD4-qc-WIt" secondAttribute="bottom" constant="10" id="iMw-Ts-ws1"/>
-                        <constraint firstItem="pD4-qc-WIt" firstAttribute="top" secondItem="7pF-2n-frE" secondAttribute="bottom" constant="10" id="nj6-Bo-0W9"/>
+                        <constraint firstAttribute="bottom" secondItem="u2u-i9-7s5" secondAttribute="bottom" constant="58" id="p9O-L0-KPK"/>
                         <constraint firstItem="IHF-en-Dqi" firstAttribute="leading" secondItem="M8m-46-Uhb" secondAttribute="trailing" constant="15" id="qhx-jh-Biu"/>
+                        <constraint firstItem="u2u-i9-7s5" firstAttribute="top" secondItem="JoQ-Bg-A7A" secondAttribute="bottom" constant="40" id="zdX-xV-MKC"/>
                     </constraints>
                 </view>
             </subviews>
@@ -242,7 +166,7 @@ DQ
                 <constraint firstAttribute="trailing" secondItem="7D3-FA-RtT" secondAttribute="trailing" id="QvG-p4-qhW"/>
                 <constraint firstAttribute="bottom" secondItem="7D3-FA-RtT" secondAttribute="bottom" id="rPf-Hv-ogo"/>
             </constraints>
-            <point key="canvasLocation" x="45" y="146"/>
+            <point key="canvasLocation" x="44.5" y="146"/>
         </customView>
     </objects>
 </document>

+ 0 - 1
PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarViewController.swift

@@ -2584,7 +2584,6 @@ extension KMToolbarViewController {
             let subMenu = NSMenu()
             subMenu.addItem(title: NSLocalizedString("压缩当前文件", comment: ""), action: #selector(_compressAction), target: self, tag: 1)
             subMenu.addItem(title: NSLocalizedString("压缩多个文件", comment: ""), action: #selector(_compressAction), target: self, tag: 2)
-            subMenu.addItem(title: NSLocalizedString("压缩高级优化", comment: ""), action: #selector(_compressAction), target: self, tag: 3)
             menuItem.submenu = subMenu
             item?.menuFormRepresentation = menuItem
             menuItem.representedObject = identifier

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

@@ -2819,11 +2819,17 @@ extension KMMainViewController {
         if index == 1 {
             self.showCompressWindow()
         } else if index == 2 {
-            
-        } else if index == 3 {
-            
+            self.showBatchOperateCompressWindow(paths: [self.listView.document.documentURL])
         }
     }
+    
+    //批量压缩
+    func showBatchOperateCompressWindow(paths: Array<URL>) {
+        let batchWindowController = KMBatchOperateWindowController.sharedWindowController
+        let batchOperateFile = KMBatchOperateFile(filePath: paths.first!.path, type: .Compress)
+        batchWindowController.switchToOperateType(KMBatchOperationType.Compress, files: [batchOperateFile])
+        batchWindowController.window?.makeKeyAndOrderFront("")
+    }
         
     internal func showCompressWindow(url: URL? = nil) {
 //        if let wc = self.compressWIndowControllerNew, let _ = wc.window?.isSheet {
@@ -2851,11 +2857,7 @@ extension KMMainViewController {
 
             self.toolbarController.cancelSelected(KMToolbarToolCompressItemIdentifier)
 
-            let batchWindowController = KMBatchOperateWindowController.sharedWindowController
-//            batchWindowController.window?.makeKeyAndOrderFront("")
-            let batchOperateFile = KMBatchOperateFile(filePath: filePaths.first!.path, type: .Compress)
-            batchWindowController.switchToOperateType(KMBatchOperationType.Compress, files: [batchOperateFile])
-            batchWindowController.window?.makeKeyAndOrderFront("")
+            self.showBatchOperateCompressWindow(paths: filePaths)
         }
 
         self.compressWIndowControllerNew?.resultCallback = { [unowned self] result, openDocument, fileURL, error in

+ 24 - 0
PDF Office/PDF Reader Pro.xcodeproj/project.pbxproj

@@ -2296,6 +2296,12 @@
 		ADC59BBB2CEAE1FE002F819D /* KMCompressDiscardPanelTableCellView.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADC59BBA2CEAE1FE002F819D /* KMCompressDiscardPanelTableCellView.xib */; };
 		ADC59BBC2CEAE1FE002F819D /* KMCompressDiscardPanelTableCellView.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADC59BBA2CEAE1FE002F819D /* KMCompressDiscardPanelTableCellView.xib */; };
 		ADC59BBD2CEAE1FE002F819D /* KMCompressDiscardPanelTableCellView.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADC59BBA2CEAE1FE002F819D /* KMCompressDiscardPanelTableCellView.xib */; };
+		ADC59BC02CEB0908002F819D /* KMBatchOperateCompressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADC59BBF2CEB0908002F819D /* KMBatchOperateCompressView.swift */; };
+		ADC59BC12CEB0908002F819D /* KMBatchOperateCompressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADC59BBF2CEB0908002F819D /* KMBatchOperateCompressView.swift */; };
+		ADC59BC22CEB0908002F819D /* KMBatchOperateCompressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADC59BBF2CEB0908002F819D /* KMBatchOperateCompressView.swift */; };
+		ADC59BC42CEB0916002F819D /* KMBatchOperateCompressView.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADC59BC32CEB0916002F819D /* KMBatchOperateCompressView.xib */; };
+		ADC59BC52CEB0916002F819D /* KMBatchOperateCompressView.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADC59BC32CEB0916002F819D /* KMBatchOperateCompressView.xib */; };
+		ADC59BC62CEB0916002F819D /* KMBatchOperateCompressView.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADC59BC32CEB0916002F819D /* KMBatchOperateCompressView.xib */; };
 		ADC63E372A49813E00854E02 /* KMSubscribeSuccessWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADC63E352A49813E00854E02 /* KMSubscribeSuccessWindowController.swift */; };
 		ADC63E382A49813E00854E02 /* KMSubscribeSuccessWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADC63E352A49813E00854E02 /* KMSubscribeSuccessWindowController.swift */; };
 		ADC63E392A49813E00854E02 /* KMSubscribeSuccessWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADC63E352A49813E00854E02 /* KMSubscribeSuccessWindowController.swift */; };
@@ -6566,6 +6572,8 @@
 		ADC59BB22CEAE184002F819D /* KMCompressFontsPanelTableCellView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMCompressFontsPanelTableCellView.xib; sourceTree = "<group>"; };
 		ADC59BB62CEAE1F4002F819D /* KMCompressDiscardPanelTableCellView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMCompressDiscardPanelTableCellView.swift; sourceTree = "<group>"; };
 		ADC59BBA2CEAE1FE002F819D /* KMCompressDiscardPanelTableCellView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMCompressDiscardPanelTableCellView.xib; sourceTree = "<group>"; };
+		ADC59BBF2CEB0908002F819D /* KMBatchOperateCompressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMBatchOperateCompressView.swift; sourceTree = "<group>"; };
+		ADC59BC32CEB0916002F819D /* KMBatchOperateCompressView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMBatchOperateCompressView.xib; sourceTree = "<group>"; };
 		ADC63E352A49813E00854E02 /* KMSubscribeSuccessWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMSubscribeSuccessWindowController.swift; sourceTree = "<group>"; };
 		ADC63E362A49813E00854E02 /* KMSubscribeSuccessWindowController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMSubscribeSuccessWindowController.xib; sourceTree = "<group>"; };
 		ADC63E3E2A49816900854E02 /* KMSubscribeSuccessView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMSubscribeSuccessView.swift; sourceTree = "<group>"; };
@@ -9754,6 +9762,7 @@
 		AD3718B62CE6F7CD007095A8 /* Compress */ = {
 			isa = PBXGroup;
 			children = (
+				ADC59BBE2CEB08EF002F819D /* View */,
 				ADC59B942CE74D4F002F819D /* SettingView */,
 				AD3718B72CE6F818007095A8 /* KMBatchOperateCompressSettingViewController.swift */,
 				AD3718B82CE6F818007095A8 /* KMBatchOperateCompressSettingViewController.xib */,
@@ -10777,6 +10786,15 @@
 			path = View;
 			sourceTree = "<group>";
 		};
+		ADC59BBE2CEB08EF002F819D /* View */ = {
+			isa = PBXGroup;
+			children = (
+				ADC59BBF2CEB0908002F819D /* KMBatchOperateCompressView.swift */,
+				ADC59BC32CEB0916002F819D /* KMBatchOperateCompressView.xib */,
+			);
+			path = View;
+			sourceTree = "<group>";
+		};
 		ADC63E332A49805000854E02 /* WaterMark */ = {
 			isa = PBXGroup;
 			children = (
@@ -15372,6 +15390,7 @@
 				BB1EC8012967B26700EC0BC3 /* KMPDFEditViewController.xib in Resources */,
 				AD1D48132AFB1912007AC1F0 /* KMCompressView.xib in Resources */,
 				BBEC00DC295C39FD00A26C98 /* KMBatesPropertyInfoController.xib in Resources */,
+				ADC59BC42CEB0916002F819D /* KMBatchOperateCompressView.xib in Resources */,
 				AD8810B529A846B100178CA1 /* KMVerficationCodeWindowController.xib in Resources */,
 				9FDCD8112B6C904900E22166 /* KMFormListMenuPopWindowController.xib in Resources */,
 				9FAAA32D290BD01D0046FFCE /* KMHomeHistoryFileViewController.xib in Resources */,
@@ -15949,6 +15968,7 @@
 				BB9695B729BDB03E00FD68D3 /* InfoWindow.xib in Resources */,
 				BB88108F2B4F7C4100AFA63E /* KMVerificationExpiredViewController.xib in Resources */,
 				9FE0BBF42B0F2FB000CD1CAC /* KMAnnotationLineWindowController.xib in Resources */,
+				ADC59BC52CEB0916002F819D /* KMBatchOperateCompressView.xib in Resources */,
 				ADD1B6D029431D7100C3FFF7 /* KMPrintPreviewView.xib in Resources */,
 				BB8810982B4F7CD100AFA63E /* KMVerificationTrialViewController.xib in Resources */,
 				BBC821E42B0D9F72004B7E8E /* KMStampCreaterWindowController.xib in Resources */,
@@ -16568,6 +16588,7 @@
 				AD1CA4052A06040B0070541F /* KMAnnotationScreenCollectionView.xib in Resources */,
 				BB9007052B8DDCE400623B78 /* SyncPreferences.xib in Resources */,
 				BB7F7BFC29AA469F00A3E4E7 /* KMSigntureViewItem.xib in Resources */,
+				ADC59BC62CEB0916002F819D /* KMBatchOperateCompressView.xib in Resources */,
 				AD3AAD4F2B0B7B9300DE5FE7 /* KMCompareTextView.xib in Resources */,
 				BB65A0522AF8B64B003A27A0 /* DisplayPreferences.xib in Resources */,
 				9F0CB4A429683E2600007028 /* KMPropertiesPanelSizeSubVC.xib in Resources */,
@@ -17799,6 +17820,7 @@
 				AD1CA4192A061CE10070541F /* KMAnnotationScreenTypeViewItem.swift in Sources */,
 				9F0390062B426F3300302D1D /* KMPageDisplayPropertiesViewController.swift in Sources */,
 				BBB9B328299A5D6D004F3235 /* GTMAppAuthFetcherAuthorization+Keychain.m in Sources */,
+				ADC59BC02CEB0908002F819D /* KMBatchOperateCompressView.swift in Sources */,
 				9F1FE4F029406E4700E952CA /* BackgroundGradientView.m in Sources */,
 				BB2EDF70296ECE17003BCF58 /* KMPageEditThumbnailView.swift in Sources */,
 				BB183DDD2B4EBE1B00F99C7E /* KMTrialSuccessController.swift in Sources */,
@@ -18953,6 +18975,7 @@
 				BBF98C352C0EE46200436CC7 /* KMToolbarCustomItemView.swift in Sources */,
 				AD7D5C932B8F20FE006562CD /* synctex_parser_utils.m in Sources */,
 				BB4EEF4D2976544F003A3537 /* KMRedactAligementView.swift in Sources */,
+				ADC59BC12CEB0908002F819D /* KMBatchOperateCompressView.swift in Sources */,
 				BBF811F22B0763930074874F /* PDFConvertObject.swift in Sources */,
 				9F1FE4FA29406E4700E952CA /* CTTabStripView.m in Sources */,
 				AD055E722B8732E00035F824 /* SKDictionaryFormatter.m in Sources */,
@@ -19702,6 +19725,7 @@
 				9FF371D72C69B8CA005F9CC5 /* CAreaMeasureInfoWindowController.swift in Sources */,
 				ADDEEA602AD39DC500EF675D /* KMSignatureManager.swift in Sources */,
 				BBBE208D2B21649100509C4E /* KMPDFEditWindowController.swift in Sources */,
+				ADC59BC22CEB0908002F819D /* KMBatchOperateCompressView.swift in Sources */,
 				BBA8B7B1293600D70097D183 /* KMPasswordInputWindow.swift in Sources */,
 				BB14701F299DC0D100784A6A /* OIDIDToken.m in Sources */,
 				65D88ED42C85826A00DD06E0 /* KMRSAUtils.swift in Sources */,

+ 54 - 297
PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/lizhe.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -9729,7 +9729,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "52"
             endingLineNumber = "52"
-            landmarkName = "_advancedDidChange()"
+            landmarkName = "km_add_office_multi(fileUrls:completionBlock:)"
             landmarkType = "7">
             <Locations>
                <Location
@@ -17697,28 +17697,13 @@
             filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "3098"
-            endingLineNumber = "3098"
+            startingLineNumber = "3100"
+            endingLineNumber = "3100"
             landmarkName = "extractImageAction(num:)"
             landmarkType = "7">
             <Locations>
                <Location
-                  uuid = "E6B1CDBF-AE0C-4A94-ACB5-2A41B09EAD97 - 7a1d650b4f3ec09a"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "closure #1 (__C.NSModalResponse) -&gt; () in PDF_Reader_Pro.KMMainViewController.extractImageAction(num: Swift.Int) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  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 = "3097"
-                  endingLineNumber = "3097"
-                  offsetFromSymbolStart = "360">
-               </Location>
-               <Location
-                  uuid = "E6B1CDBF-AE0C-4A94-ACB5-2A41B09EAD97 - 6dd82cf55f61a33a"
+                  uuid = "E6B1CDBF-AE0C-4A94-ACB5-2A41B09EAD97 - 6dd82cf55f61bce0"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -17728,12 +17713,12 @@
                   urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "3098"
-                  endingLineNumber = "3098"
-                  offsetFromSymbolStart = "3520">
+                  startingLineNumber = "3104"
+                  endingLineNumber = "3104"
+                  offsetFromSymbolStart = "2600">
                </Location>
                <Location
-                  uuid = "E6B1CDBF-AE0C-4A94-ACB5-2A41B09EAD97 - 6dd82cf55f61a33a"
+                  uuid = "E6B1CDBF-AE0C-4A94-ACB5-2A41B09EAD97 - 6dd82cf55f61a364"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -17743,9 +17728,9 @@
                   urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "3098"
-                  endingLineNumber = "3098"
-                  offsetFromSymbolStart = "1568">
+                  startingLineNumber = "3100"
+                  endingLineNumber = "3100"
+                  offsetFromSymbolStart = "3520">
                </Location>
             </Locations>
          </BreakpointContent>
@@ -18674,144 +18659,6 @@
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "DD37CF40-E2A6-46BD-A63F-B4DBD4BB0293"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/Batch/WindowController/KMBatchOperateLeftViewController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "519"
-            endingLineNumber = "519"
-            landmarkName = "tableView(_:viewFor:row:)"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "DD37CF40-E2A6-46BD-A63F-B4DBD4BB0293 - ec82cf9d0789be99"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reaer_Pro.KMBatchOperateLeftViewController.tableView(_: __C.NSTableView, viewFor: Swift.Optional&lt;__C.NSTableColumn&gt;, row: Swift.Int) -&gt; Swift.Optional&lt;__C.NSView&gt;"
-                  moduleName = "PDF Reaer Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/Batch/WindowController/KMBatchOperateLeftViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "519"
-                  endingLineNumber = "519"
-                  offsetFromSymbolStart = "2964">
-               </Location>
-               <Location
-                  uuid = "DD37CF40-E2A6-46BD-A63F-B4DBD4BB0293 - d2a25193884cf5d6"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMBatchOperateLeftViewController.tableView(_: __C.NSTableView, viewFor: Swift.Optional&lt;__C.NSTableColumn&gt;, row: Swift.Int) -&gt; Swift.Optional&lt;__C.NSView&gt;"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/Batch/WindowController/KMBatchOperateLeftViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "519"
-                  endingLineNumber = "519"
-                  offsetFromSymbolStart = "2964">
-               </Location>
-               <Location
-                  uuid = "DD37CF40-E2A6-46BD-A63F-B4DBD4BB0293 - 79094f03907ebe5f"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "closure #1 (PDF_Reader_Pro.KMBatchOperateFile) -&gt; () in PDF_Reader_Pro.KMBatchOperateLeftViewController.tableView(_: __C.NSTableView, viewFor: Swift.Optional&lt;__C.NSTableColumn&gt;, row: Swift.Int) -&gt; Swift.Optional&lt;__C.NSView&gt;"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/Batch/WindowController/KMBatchOperateLeftViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "519"
-                  endingLineNumber = "519"
-                  offsetFromSymbolStart = "116">
-               </Location>
-               <Location
-                  uuid = "DD37CF40-E2A6-46BD-A63F-B4DBD4BB0293 - d2a25193884cf5d6"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMBatchOperateLeftViewController.tableView(_: __C.NSTableView, viewFor: Swift.Optional&lt;__C.NSTableColumn&gt;, row: Swift.Int) -&gt; Swift.Optional&lt;__C.NSView&gt;"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/Batch/WindowController/KMBatchOperateLeftViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "519"
-                  endingLineNumber = "519"
-                  offsetFromSymbolStart = "4084">
-               </Location>
-               <Location
-                  uuid = "DD37CF40-E2A6-46BD-A63F-B4DBD4BB0293 - 79094f03907ebe5f"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "closure #1 (PDF_Reader_Pro.KMBatchOperateFile) -&gt; () in PDF_Reader_Pro.KMBatchOperateLeftViewController.tableView(_: __C.NSTableView, viewFor: Swift.Optional&lt;__C.NSTableColumn&gt;, row: Swift.Int) -&gt; Swift.Optional&lt;__C.NSView&gt;"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/Batch/WindowController/KMBatchOperateLeftViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "519"
-                  endingLineNumber = "519"
-                  offsetFromSymbolStart = "644">
-               </Location>
-               <Location
-                  uuid = "DD37CF40-E2A6-46BD-A63F-B4DBD4BB0293 - d2a25193884cf5f5"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMBatchOperateLeftViewController.tableView(_: __C.NSTableView, viewFor: Swift.Optional&lt;__C.NSTableColumn&gt;, row: Swift.Int) -&gt; Swift.Optional&lt;__C.NSView&gt;"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/Batch/WindowController/KMBatchOperateLeftViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "520"
-                  endingLineNumber = "520"
-                  offsetFromSymbolStart = "1604">
-               </Location>
-               <Location
-                  uuid = "DD37CF40-E2A6-46BD-A63F-B4DBD4BB0293 - 79094f03907ebe7c"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "closure #1 (PDF_Reader_Pro.KMBatchOperateFile) -&gt; () in PDF_Reader_Pro.KMBatchOperateLeftViewController.tableView(_: __C.NSTableView, viewFor: Swift.Optional&lt;__C.NSTableColumn&gt;, row: Swift.Int) -&gt; Swift.Optional&lt;__C.NSView&gt;"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/Batch/WindowController/KMBatchOperateLeftViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "520"
-                  endingLineNumber = "520"
-                  offsetFromSymbolStart = "24">
-               </Location>
-               <Location
-                  uuid = "DD37CF40-E2A6-46BD-A63F-B4DBD4BB0293 - d2a25193884cf5d6"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMBatchOperateLeftViewController.tableView(_: __C.NSTableView, viewFor: Swift.Optional&lt;__C.NSTableColumn&gt;, row: Swift.Int) -&gt; Swift.Optional&lt;__C.NSView&gt;"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/Batch/WindowController/KMBatchOperateLeftViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "519"
-                  endingLineNumber = "519"
-                  offsetFromSymbolStart = "4720">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -22384,7 +22231,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "738"
             endingLineNumber = "738"
-            landmarkName = "reloadCustomEmptyState(_:)"
+            landmarkName = "setDynamicStampDateString(withDateStyle:)"
             landmarkType = "7">
             <Locations>
                <Location
@@ -23021,7 +22868,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1102"
             endingLineNumber = "1102"
-            landmarkName = "openImageToPdfWindow(urls:)"
+            landmarkName = "quickConvertPdf(urls:type:)"
             landmarkType = "7">
             <Locations>
                <Location
@@ -24853,7 +24700,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "260"
             endingLineNumber = "260"
-            landmarkName = "reloadTable()"
+            landmarkName = "deleteAll()"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -24869,7 +24716,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "545"
             endingLineNumber = "545"
-            landmarkName = "delete(obj:)"
+            landmarkName = "modify(obj:)"
             landmarkType = "7">
             <Locations>
                <Location
@@ -24979,8 +24826,8 @@
             filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "4247"
-            endingLineNumber = "4247"
+            startingLineNumber = "4249"
+            endingLineNumber = "4249"
             landmarkName = "clickChildTool(type:index:)"
             landmarkType = "7">
             <Locations>
@@ -25057,8 +24904,8 @@
             filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "4320"
-            endingLineNumber = "4320"
+            startingLineNumber = "4322"
+            endingLineNumber = "4322"
             landmarkName = "clickChildTool(type:index:)"
             landmarkType = "7">
             <Locations>
@@ -25532,8 +25379,8 @@
             filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "4306"
-            endingLineNumber = "4306"
+            startingLineNumber = "4308"
+            endingLineNumber = "4308"
             landmarkName = "clickChildTool(type:index:)"
             landmarkType = "7">
             <Locations>
@@ -26273,7 +26120,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "226"
             endingLineNumber = "226"
-            landmarkName = "tableView(_:acceptDrop:row:dropOperation:)"
+            landmarkName = "tableView(_:validateDrop:proposedRow:proposedDropOperation:)"
             landmarkType = "7">
             <Locations>
                <Location
@@ -27588,8 +27435,8 @@
             filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "3367"
-            endingLineNumber = "3367"
+            startingLineNumber = "3369"
+            endingLineNumber = "3369"
             landmarkName = "KMMainViewController"
             landmarkType = "21">
             <Locations>
@@ -28114,8 +27961,8 @@
             filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "3419"
-            endingLineNumber = "3419"
+            startingLineNumber = "3421"
+            endingLineNumber = "3421"
             landmarkName = "displaySinglePageScreen(isSinglePage:doublePageScreen:)"
             landmarkType = "7">
             <Locations>
@@ -28162,8 +28009,8 @@
             filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "3306"
-            endingLineNumber = "3306"
+            startingLineNumber = "3308"
+            endingLineNumber = "3308"
             landmarkName = "tableAnnotation(_:)"
             landmarkType = "7">
             <Locations>
@@ -28969,8 +28816,8 @@
             filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "3174"
-            endingLineNumber = "3174"
+            startingLineNumber = "3176"
+            endingLineNumber = "3176"
             landmarkName = "beginProgressSheet(withMessage:maxValue:)"
             landmarkType = "7">
             <Locations>
@@ -30439,7 +30286,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1163"
             endingLineNumber = "1163"
-            landmarkName = "tagString()"
+            landmarkName = "isDamageImage(image:path:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -30789,7 +30636,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "863"
             endingLineNumber = "863"
-            landmarkName = "updateAnnotation()"
+            landmarkName = "addImageStamp(withSecurityPDFFilePath:password:removeBGColor:)"
             landmarkType = "7">
             <Locations>
                <Location
@@ -30942,8 +30789,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "878"
             endingLineNumber = "878"
-            landmarkName = "KMAnnotationStampViewController"
-            landmarkType = "3">
+            landmarkName = "addImageStamp(withFilePath:removeBGColor:)"
+            landmarkType = "7">
             <Locations>
                <Location
                   uuid = "69723765-F587-493E-A811-96709037C2D4 - f803ea4932cc7e34"
@@ -31048,73 +30895,28 @@
             filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "4579"
-            endingLineNumber = "4579"
+            startingLineNumber = "4581"
+            endingLineNumber = "4581"
             landmarkName = "clickChildTool(type:index:)"
             landmarkType = "7">
             <Locations>
                <Location
-                  uuid = "C5243CC7-A1A2-4358-86A9-63A8110B427B - 671f9f5a9fe178cd"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "(1) suspend resume partial function for closure #1 @Sendable () async -&gt; () in PDF_Reader_Pro.KMMainViewController.clickChildTool(type: PDF_Reader_Pro.KMToolbarType, index: Swift.Int) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  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 = "4578"
-                  endingLineNumber = "4578"
-                  offsetFromSymbolStart = "49892">
-               </Location>
-               <Location
-                  uuid = "C5243CC7-A1A2-4358-86A9-63A8110B427B - 671f9f5a9fe17822"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "(1) suspend resume partial function for closure #1 @Sendable () async -&gt; () in PDF_Reader_Pro.KMMainViewController.clickChildTool(type: PDF_Reader_Pro.KMToolbarType, index: Swift.Int) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  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 = "4579"
-                  endingLineNumber = "4579"
-                  offsetFromSymbolStart = "50028">
-               </Location>
-               <Location
-                  uuid = "C5243CC7-A1A2-4358-86A9-63A8110B427B - 671f9f5a9fe17822"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "(1) suspend resume partial function for closure #1 @Sendable () async -&gt; () in PDF_Reader_Pro.KMMainViewController.clickChildTool(type: PDF_Reader_Pro.KMToolbarType, index: Swift.Int) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  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 = "4579"
-                  endingLineNumber = "4579"
-                  offsetFromSymbolStart = "50108">
-               </Location>
-               <Location
-                  uuid = "C5243CC7-A1A2-4358-86A9-63A8110B427B - 671f9f5a9fe17822"
+                  uuid = "C5243CC7-A1A2-4358-86A9-63A8110B427B - f0b502ab8f530c65"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
-                  symbolName = "(1) suspend resume partial function for closure #1 @Sendable () async -&gt; () in PDF_Reader_Pro.KMMainViewController.clickChildTool(type: PDF_Reader_Pro.KMToolbarType, index: Swift.Int) -&gt; ()"
+                  symbolName = "closure #1 (Swift.Int) -&gt; () in closure #26 (__C.NSModalResponse) -&gt; () in closure #1 @Sendable () async -&gt; () in PDF_Reader_Pro.KMMainViewController.clickChildTool(type: PDF_Reader_Pro.KMToolbarType, index: Swift.Int) -&gt; ()"
                   moduleName = "PDF Reader Pro"
                   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 = "4579"
-                  endingLineNumber = "4579"
-                  offsetFromSymbolStart = "49096">
+                  startingLineNumber = "4582"
+                  endingLineNumber = "4582"
+                  offsetFromSymbolStart = "776">
                </Location>
                <Location
-                  uuid = "C5243CC7-A1A2-4358-86A9-63A8110B427B - 671f9f5a9fe17822"
+                  uuid = "C5243CC7-A1A2-4358-86A9-63A8110B427B - 671f9f5a9fe17860"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -31124,25 +30926,10 @@
                   urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "4579"
-                  endingLineNumber = "4579"
+                  startingLineNumber = "4581"
+                  endingLineNumber = "4581"
                   offsetFromSymbolStart = "49104">
                </Location>
-               <Location
-                  uuid = "C5243CC7-A1A2-4358-86A9-63A8110B427B - 671f9f5a9fe17822"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "(1) suspend resume partial function for closure #1 @Sendable () async -&gt; () in PDF_Reader_Pro.KMMainViewController.clickChildTool(type: PDF_Reader_Pro.KMToolbarType, index: Swift.Int) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  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 = "4579"
-                  endingLineNumber = "4579"
-                  offsetFromSymbolStart = "18192">
-               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -32821,13 +32608,13 @@
             filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "4602"
-            endingLineNumber = "4602"
+            startingLineNumber = "4604"
+            endingLineNumber = "4604"
             landmarkName = "clickChildTool(type:index:)"
             landmarkType = "7">
             <Locations>
                <Location
-                  uuid = "6C075581-DD64-44D1-BBAB-B7E9168DDC87 - 671f9f5a9fe16735"
+                  uuid = "6C075581-DD64-44D1-BBAB-B7E9168DDC87 - 671f9f5a9fe16748"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -32837,12 +32624,12 @@
                   urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "4602"
-                  endingLineNumber = "4602"
-                  offsetFromSymbolStart = "52864">
+                  startingLineNumber = "4605"
+                  endingLineNumber = "4605"
+                  offsetFromSymbolStart = "51592">
                </Location>
                <Location
-                  uuid = "6C075581-DD64-44D1-BBAB-B7E9168DDC87 - 671f9f5a9fe16735"
+                  uuid = "6C075581-DD64-44D1-BBAB-B7E9168DDC87 - 671f9f5a9fe1676b"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -32852,40 +32639,10 @@
                   urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "4602"
-                  endingLineNumber = "4602"
-                  offsetFromSymbolStart = "52764">
-               </Location>
-               <Location
-                  uuid = "6C075581-DD64-44D1-BBAB-B7E9168DDC87 - 671f9f5a9fe16735"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "(1) suspend resume partial function for closure #1 @Sendable () async -&gt; () in PDF_Reader_Pro.KMMainViewController.clickChildTool(type: PDF_Reader_Pro.KMToolbarType, index: Swift.Int) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  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 = "4602"
-                  endingLineNumber = "4602"
+                  startingLineNumber = "4604"
+                  endingLineNumber = "4604"
                   offsetFromSymbolStart = "52772">
                </Location>
-               <Location
-                  uuid = "6C075581-DD64-44D1-BBAB-B7E9168DDC87 - 671f9f5a9fe16735"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "(1) suspend resume partial function for closure #1 @Sendable () async -&gt; () in PDF_Reader_Pro.KMMainViewController.clickChildTool(type: PDF_Reader_Pro.KMToolbarType, index: Swift.Int) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  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 = "4602"
-                  endingLineNumber = "4602"
-                  offsetFromSymbolStart = "10128">
-               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -33234,7 +32991,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "247"
             endingLineNumber = "247"
-            landmarkName = "_handleWindowWillCloseNotification(_:)"
+            landmarkName = "_handlePDFDocumentInfoDidChangeNotification(_:)"
             landmarkType = "7">
             <Locations>
                <Location