Quellcode durchsuchen

【编辑工具】- 压缩 UI搭建

lizhe vor 1 Woche
Ursprung
Commit
f060439076

+ 3 - 3
PDF Office/PDF Master/Class/Batch/WindowController/Base/KMBatchOperateBaseViewController.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="KMBatchOperateBaseViewController" customModule="PDF_Master" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMBatchOperateBaseViewController" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
             </connections>

+ 7 - 4
PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/KMBatchOperateCompressSettingViewController.xib

@@ -1,10 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11134" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<?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>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11134"/>
+        <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="KMBatchOperateCompressSettingViewController" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMBatchOperateCompressSettingViewController" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
             </connections>
@@ -14,6 +16,7 @@
         <customView id="Hz6-mo-xeY">
             <rect key="frame" x="0.0" y="0.0" width="480" height="272"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+            <point key="canvasLocation" x="34" y="-8"/>
         </customView>
     </objects>
 </document>

+ 61 - 0
PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/KMBatchOperateNewCompressViewController.swift

@@ -0,0 +1,61 @@
+//
+//  KMBatchOperateNewCompressViewController.swift
+//  PDF Reader Pro
+//
+//  Created by lizhe on 2024/11/15.
+//
+
+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!
+    
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        // Do view setup here.
+    }
+}
+
+//UI
+extension KMBatchOperateNewCompressViewController {
+    func updateUI() {
+        
+    }
+}
+
+//MARK: Data
+extension KMBatchOperateNewCompressViewController {
+    func reloadData() {
+        
+    }
+}
+
+//MARK: Action
+extension KMBatchOperateNewCompressViewController {
+    @IBAction func standardButtonAction(_ sender: NSButton) {
+        
+    }
+    
+    @IBAction func mobileButtonAction(_ sender: Any) {
+        
+    }
+    
+    @IBAction func customButtonAction(_ sender: Any) {
+        
+    }
+    
+    @IBAction func settingButtonAction(_ sender: Any) {
+        
+    }
+    
+    @IBAction func compressButtonAction(_ sender: Any) {
+        
+    }
+}

+ 126 - 0
PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/KMBatchOperateNewCompressViewController.xib

@@ -0,0 +1,126 @@
+<?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="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="titleLabel" destination="y0T-QN-EWu" id="Rbt-QN-OZz"/>
+                <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customView id="Hz6-mo-xeY">
+            <rect key="frame" x="0.0" y="0.0" width="528" height="343"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+            <subviews>
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="y0T-QN-EWu">
+                    <rect key="frame" x="14" y="311" width="45" height="16"/>
+                    <textFieldCell key="cell" lineBreakMode="clipping" title="Modes" id="mpx-gV-Hhf">
+                        <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="nlU-Iu-DXD">
+                    <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"/>
+                    <buttonCell key="cell" type="square" title="Compress" bezelStyle="shadowlessSquare" alignment="center" imageScaling="proportionallyDown" inset="2" id="bDz-ig-q3z">
+                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                        <font key="font" metaFont="system"/>
+                    </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="32" id="XYv-z2-ll9"/>
+                    </constraints>
+                    <connections>
+                        <action selector="compressButtonAction:" target="-2" id="f8F-1j-duY"/>
+                    </connections>
+                </button>
+            </subviews>
+            <constraints>
+                <constraint firstItem="y0T-QN-EWu" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="16" id="8wn-dj-NMN"/>
+                <constraint firstAttribute="bottom" secondItem="nlU-Iu-DXD" secondAttribute="bottom" constant="48" id="9fy-f3-6D5"/>
+                <constraint firstAttribute="trailing" secondItem="baL-o2-whg" secondAttribute="trailing" constant="16" id="NrT-Zg-Qxn"/>
+                <constraint firstItem="y0T-QN-EWu" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="16" id="P1B-uw-Pwo"/>
+                <constraint firstAttribute="bottom" secondItem="baL-o2-whg" secondAttribute="bottom" constant="16" id="aih-wH-xrl"/>
+                <constraint firstItem="nlU-Iu-DXD" firstAttribute="top" secondItem="y0T-QN-EWu" secondAttribute="bottom" constant="8" id="g2W-3l-VJN"/>
+                <constraint firstItem="baL-o2-whg" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="16" id="sBN-vn-lxm"/>
+                <constraint firstItem="nlU-Iu-DXD" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="16" id="sFh-Fm-fyS"/>
+                <constraint firstAttribute="trailing" secondItem="nlU-Iu-DXD" secondAttribute="trailing" constant="16" id="x5p-Ld-uf2"/>
+            </constraints>
+            <point key="canvasLocation" x="163" y="181.5"/>
+        </customView>
+    </objects>
+</document>

+ 19 - 27
PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/KMBatchOperateCompressViewController.swift

@@ -24,8 +24,6 @@ class KMBatchOperateCompressViewController: KMBatchOperateBaseViewController{
     @IBOutlet var lowLabel: NSTextField!
     @IBOutlet var highLabel: NSTextField!
     
-    @IBOutlet weak var settingButton: NSButton!
-    
     var currentType: NSNumber = 60
     var savePath: String?
     var haveFiles: Bool = false
@@ -76,9 +74,9 @@ class KMBatchOperateCompressViewController: KMBatchOperateBaseViewController{
     func localizedLanguage() {
         self.titleLabel.stringValue = NSLocalizedString("Optimization Options", comment: "")
         self.actionButton.title = NSLocalizedString("Compress", comment: "")
-        self.dpi300Label.stringValue = NSLocalizedString("移动设备", comment: "")
-        self.dpi150Label.stringValue = NSLocalizedString("标准(智能推荐)", comment: "")
-        self.dpi72Label.stringValue = NSLocalizedString("自定义值", comment: "")
+        self.dpi300Label.stringValue = NSLocalizedString("Large File Size(High Quality)", comment: "")
+        self.dpi150Label.stringValue = NSLocalizedString("Medium File Size(Medium Quality)", comment: "")
+        self.dpi72Label.stringValue = NSLocalizedString("Small File Size(Recommended Quality)", comment: "")
         self.dpi50Label.stringValue = NSLocalizedString("Minimum File Size(Low Quality)", comment: "")
         self.otherChoiceButton.title = NSLocalizedString("Other", comment: "")
         self.lowLabel.stringValue = NSLocalizedString("Low Quality", comment: "")
@@ -94,22 +92,22 @@ class KMBatchOperateCompressViewController: KMBatchOperateBaseViewController{
         self.dpi50Button.setTitleColor(KMAppearance.Layout.h0Color())
         self.otherChoiceButton.setTitleColor(KMAppearance.Layout.h0Color())
         
-//        self.currentType = 60
-//        self.dpi72Button.state = .on
-//        self.dpi50Button.state = .off
-//        self.dpi300Button.state = .off
-//        self.dpi150Button.state = .off
-//        self.otherChoiceButton.state = .off
-//        
-//        self.highLabel.isEnabled = false
-//        self.lowLabel.isEnabled = false
-//        self.comprssSlider.isEnabled = false
-//        self.comprssSlider.tipEnabled = false
-//        
-//        self.lowLabel.textColor = KMAppearance.Layout.h0Color()
-//        self.highLabel.textColor = KMAppearance.Layout.h0Color()
-//        self.lowLabel.alphaValue = 0.4
-//        self.highLabel.alphaValue = 0.4
+        self.currentType = 60
+        self.dpi72Button.state = .on
+        self.dpi50Button.state = .off
+        self.dpi300Button.state = .off
+        self.dpi150Button.state = .off
+        self.otherChoiceButton.state = .off
+        
+        self.highLabel.isEnabled = false
+        self.lowLabel.isEnabled = false
+        self.comprssSlider.isEnabled = false
+        self.comprssSlider.tipEnabled = false
+        
+        self.lowLabel.textColor = KMAppearance.Layout.h0Color()
+        self.highLabel.textColor = KMAppearance.Layout.h0Color()
+        self.lowLabel.alphaValue = 0.4
+        self.highLabel.alphaValue = 0.4
         
         self.actionButton.wantsLayer = true
         if self.files!.count > 0 {
@@ -124,8 +122,6 @@ class KMBatchOperateCompressViewController: KMBatchOperateBaseViewController{
         self.actionButton.layer!.cornerRadius = 1.0
         
         NotificationCenter.default.addObserver(self, selector: #selector(batchFilesCountNotification(notification:)), name: NSNotification.Name("KMBatchFilesCountNotification"), object: nil)
-        
-        self.buttonClicked_ChooseDPI(self.dpi150Button)
     }
     func updateViewColor() {
         if KMAppearance.isDarkMode() {
@@ -206,10 +202,6 @@ class KMBatchOperateCompressViewController: KMBatchOperateBaseViewController{
         }
     }
     
-    @IBAction func settingButtonAction(_ sender: Any) {
-        
-    }
-    
     override func beginQueueOperation() {
         // hiddenWindowCloseButtonIfNeeded()
         self.successFilePathURLArray?.removeAll()

+ 6 - 19
PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/KMBatchOperateCompressViewController.xib

@@ -21,7 +21,6 @@
                 <outlet property="highLabel" destination="uQM-Hg-SLo" id="3wI-j6-K9j"/>
                 <outlet property="lowLabel" destination="tY3-My-5Ov" id="pgE-oh-hQk"/>
                 <outlet property="otherChoiceButton" destination="AR5-qb-z8e" id="z9K-kn-mFS"/>
-                <outlet property="settingButton" destination="V9L-vL-dps" id="JiJ-xQ-hOk"/>
                 <outlet property="titleLabel" destination="BGJ-le-5vT" id="6Xn-od-bMf"/>
                 <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
             </connections>
@@ -62,7 +61,7 @@
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField hidden="YES" focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="G4p-Mj-Wqk">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="G4p-Mj-Wqk">
                     <rect key="frame" x="34" y="164" width="37" height="16"/>
                     <textFieldCell key="cell" title="Label" id="9BY-68-WZA">
                         <font key="font" metaFont="system"/>
@@ -100,7 +99,7 @@
                         <action selector="buttonClicked_ChooseDPI:" target="-2" id="WjF-bm-AdH"/>
                     </connections>
                 </button>
-                <button hidden="YES" tag="3" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="F9r-Rt-hvI">
+                <button tag="3" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="F9r-Rt-hvI">
                     <rect key="frame" x="14" y="163" width="57" height="18"/>
                     <buttonCell key="cell" type="radio" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="m2Y-Fl-32m">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -110,7 +109,7 @@
                         <action selector="buttonClicked_ChooseDPI:" target="-2" id="Dcz-WW-AHw"/>
                     </connections>
                 </button>
-                <button hidden="YES" tag="4" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="AR5-qb-z8e">
+                <button tag="4" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="AR5-qb-z8e">
                     <rect key="frame" x="14" y="136.5" width="58" height="18"/>
                     <buttonCell key="cell" type="radio" title="Radio" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="0v5-ap-CkP">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -141,7 +140,7 @@
                         <action selector="buttonClicked_Action:" target="-2" id="cVx-s7-YUc"/>
                     </connections>
                 </button>
-                <slider hidden="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZM8-au-Zjj" customClass="KMSlider" customModule="PDF_Reader_Pro" customModuleProvider="target">
+                <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZM8-au-Zjj" customClass="KMSlider" customModule="PDF_Reader_Pro" customModuleProvider="target">
                     <rect key="frame" x="36" y="100" width="204" height="28"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="200" id="stZ-Di-EVJ"/>
@@ -151,7 +150,7 @@
                         <action selector="comprssVauleAction:" target="-2" id="R9C-l8-4aD"/>
                     </connections>
                 </slider>
-                <textField hidden="YES" focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="tY3-My-5Ov">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="tY3-My-5Ov">
                     <rect key="frame" x="36" y="85" width="37" height="16"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="1C5-jz-2Kv">
                         <font key="font" metaFont="system"/>
@@ -159,7 +158,7 @@
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField hidden="YES" focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="uQM-Hg-SLo">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="uQM-Hg-SLo">
                     <rect key="frame" x="203" y="85" width="37" height="16"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="dmh-q4-Y71">
                         <font key="font" metaFont="system"/>
@@ -167,16 +166,6 @@
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <button translatesAutoresizingMaskIntoConstraints="NO" id="V9L-vL-dps">
-                    <rect key="frame" x="77" y="191" width="46" height="16"/>
-                    <buttonCell key="cell" type="square" title="setting" bezelStyle="shadowlessSquare" alignment="center" imageScaling="proportionallyDown" inset="2" id="zm8-yP-K0w">
-                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
-                    <connections>
-                        <action selector="settingButtonAction:" target="-2" id="85L-xO-R0c"/>
-                    </connections>
-                </button>
             </subviews>
             <constraints>
                 <constraint firstItem="9XA-Ss-REU" firstAttribute="centerY" secondItem="OzU-e9-6bT" secondAttribute="centerY" id="1p1-fT-TzM"/>
@@ -192,7 +181,6 @@
                 <constraint firstItem="0oc-wO-giJ" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="16" id="L6H-oZ-GtD"/>
                 <constraint firstItem="BGJ-le-5vT" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="10" id="M94-v9-QZI"/>
                 <constraint firstItem="U4U-em-sMp" firstAttribute="leading" secondItem="BGJ-le-5vT" secondAttribute="leading" id="OoI-JN-bQs"/>
-                <constraint firstItem="V9L-vL-dps" firstAttribute="leading" secondItem="s3M-WR-b0B" secondAttribute="trailing" constant="8" id="QX7-El-49R"/>
                 <constraint firstAttribute="bottom" secondItem="0oc-wO-giJ" secondAttribute="bottom" constant="20" id="R9j-gx-MC7"/>
                 <constraint firstItem="AR5-qb-z8e" firstAttribute="leading" secondItem="BGJ-le-5vT" secondAttribute="leading" id="Sd9-Lg-XOh"/>
                 <constraint firstItem="NJ8-R3-NNq" firstAttribute="leading" secondItem="9XA-Ss-REU" secondAttribute="leading" id="Sig-4j-H53"/>
@@ -203,7 +191,6 @@
                 <constraint firstItem="G4p-Mj-Wqk" firstAttribute="leading" secondItem="9XA-Ss-REU" secondAttribute="leading" id="Xgi-jK-m06"/>
                 <constraint firstItem="s3M-WR-b0B" firstAttribute="trailing" secondItem="Nsj-my-flw" secondAttribute="trailing" id="Yb1-x4-cTH"/>
                 <constraint firstItem="BGJ-le-5vT" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="16" id="ZUz-p7-LAt"/>
-                <constraint firstItem="V9L-vL-dps" firstAttribute="centerY" secondItem="Nsj-my-flw" secondAttribute="centerY" id="aTe-YU-LxG"/>
                 <constraint firstItem="OzU-e9-6bT" firstAttribute="leading" secondItem="BGJ-le-5vT" secondAttribute="leading" id="aZ6-vc-UIW"/>
                 <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="G4p-Mj-Wqk" secondAttribute="trailing" constant="16" id="akS-Dg-5W2"/>
                 <constraint firstItem="NJ8-R3-NNq" firstAttribute="trailing" secondItem="U4U-em-sMp" secondAttribute="trailing" id="bGC-oZ-6Su"/>

+ 1 - 1
PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController.swift

@@ -465,7 +465,7 @@ import Cocoa
         
         //检测OCR包是否需要更新
 #if VERSION_DMG
-        KMResourceDownloadManager.manager.checkDocumentAIVersion()
+//        KMResourceDownloadManager.manager.checkDocumentAIVersion()
 #endif
         
 //         Open snapshots?

+ 18 - 2
PDF Office/PDF Reader Pro.xcodeproj/project.pbxproj

@@ -2260,6 +2260,12 @@
 		ADC31FAD2A0E0C3900ED44A2 /* KMEditPropertyAlignmentView.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADC31FAB2A0E0C3900ED44A2 /* KMEditPropertyAlignmentView.xib */; };
 		ADC31FAE2A0E0C3900ED44A2 /* KMEditPropertyAlignmentView.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADC31FAB2A0E0C3900ED44A2 /* KMEditPropertyAlignmentView.xib */; };
 		ADC59B822CE7200B002F819D /* DocumentAI.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 65C9CB002CA16B36009794E5 /* DocumentAI.bundle */; };
+		ADC59B8D2CE73726002F819D /* KMBatchOperateNewCompressViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADC59B8B2CE73726002F819D /* KMBatchOperateNewCompressViewController.swift */; };
+		ADC59B8E2CE73726002F819D /* KMBatchOperateNewCompressViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADC59B8B2CE73726002F819D /* KMBatchOperateNewCompressViewController.swift */; };
+		ADC59B8F2CE73726002F819D /* KMBatchOperateNewCompressViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADC59B8B2CE73726002F819D /* KMBatchOperateNewCompressViewController.swift */; };
+		ADC59B902CE73726002F819D /* KMBatchOperateNewCompressViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADC59B8C2CE73726002F819D /* KMBatchOperateNewCompressViewController.xib */; };
+		ADC59B912CE73726002F819D /* KMBatchOperateNewCompressViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADC59B8C2CE73726002F819D /* KMBatchOperateNewCompressViewController.xib */; };
+		ADC59B922CE73726002F819D /* KMBatchOperateNewCompressViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADC59B8C2CE73726002F819D /* KMBatchOperateNewCompressViewController.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 */; };
@@ -6518,6 +6524,8 @@
 		ADC076122987F06A006C752F /* PDF-Reader-Pro-DMG-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "PDF-Reader-Pro-DMG-Info.plist"; sourceTree = SOURCE_ROOT; };
 		ADC31FA52A0E0C1A00ED44A2 /* KMEditPropertyAlignmentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMEditPropertyAlignmentView.swift; sourceTree = "<group>"; };
 		ADC31FAB2A0E0C3900ED44A2 /* KMEditPropertyAlignmentView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMEditPropertyAlignmentView.xib; sourceTree = "<group>"; };
+		ADC59B8B2CE73726002F819D /* KMBatchOperateNewCompressViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMBatchOperateNewCompressViewController.swift; sourceTree = "<group>"; };
+		ADC59B8C2CE73726002F819D /* KMBatchOperateNewCompressViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMBatchOperateNewCompressViewController.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>"; };
@@ -9706,10 +9714,10 @@
 		AD3718B62CE6F7CD007095A8 /* Compress */ = {
 			isa = PBXGroup;
 			children = (
-				BBE9D0962AF0CECB002E83CE /* KMBatchOperateCompressViewController.swift */,
-				BBE9D09A2AF0CEEA002E83CE /* KMBatchOperateCompressViewController.xib */,
 				AD3718B72CE6F818007095A8 /* KMBatchOperateCompressSettingViewController.swift */,
 				AD3718B82CE6F818007095A8 /* KMBatchOperateCompressSettingViewController.xib */,
+				ADC59B8B2CE73726002F819D /* KMBatchOperateNewCompressViewController.swift */,
+				ADC59B8C2CE73726002F819D /* KMBatchOperateNewCompressViewController.xib */,
 			);
 			path = Compress;
 			sourceTree = "<group>";
@@ -14082,6 +14090,8 @@
 			isa = PBXGroup;
 			children = (
 				AD3718B62CE6F7CD007095A8 /* Compress */,
+				BBE9D0962AF0CECB002E83CE /* KMBatchOperateCompressViewController.swift */,
+				BBE9D09A2AF0CEEA002E83CE /* KMBatchOperateCompressViewController.xib */,
 				BB65A0812AF8FEA1003A27A0 /* KMBatchOperateRemoveHeaderFooterViewController.xib */,
 				BB65A07F2AF8FE7A003A27A0 /* KMBatchOperateRemoveHeaderFooterViewController.swift */,
 				BB6347AD2AF1F0A400F5438E /* KMBatchOperateConvertViewController.swift */,
@@ -14968,6 +14978,7 @@
 				9F1F82E62934D5240092C4B4 /* KMHomeExtractActionViewController.xib in Resources */,
 				AD3AAD5F2B0DA3D400DE5FE7 /* KMCompareTextViewItem.xib in Resources */,
 				AD85D1BD2AF0D2DD000F4D28 /* KMHomeQuickToolsCollectionView.xib in Resources */,
+				ADC59B902CE73726002F819D /* KMBatchOperateNewCompressViewController.xib in Resources */,
 				ADAFD9F72AE68A8500F084BC /* KMCreatPDFView.xib in Resources */,
 				BB031B8A2C47BB090099F7AD /* KMUserFbDespItemView.xib in Resources */,
 				89E4E77C2967B370002DBA6F /* KMDynamicStampViewController.xib in Resources */,
@@ -15539,6 +15550,7 @@
 				BB9599C82B3164B40062D346 /* KMRedactPropertiesWindowController.xib in Resources */,
 				AD055E912B88304E0035F824 /* BookmarksWindow.xib in Resources */,
 				AD1CA3FB2A05FCB60070541F /* KMAnnotationScreenViewController.xib in Resources */,
+				ADC59B912CE73726002F819D /* KMBatchOperateNewCompressViewController.xib in Resources */,
 				BB1969DC2B2842D700922736 /* SnapshotWindow.xib in Resources */,
 				AD3AAD8C2B10349600DE5FE7 /* KMHeaderFooterWindowController.xib in Resources */,
 				ADD1B6C02942DD3D00C3FFF7 /* KMPrintChooseView.xib in Resources */,
@@ -16171,6 +16183,7 @@
 				BB0FE0422B734DD1001E0F88 /* AITypeChooseView.xib in Resources */,
 				89E4E7312963FBA2002DBA6F /* KMPropertiesViewPopController.xib in Resources */,
 				BB3AAB9529878CE000992A5A /* KMWatermarkAdjectivePropertyMainController.xib in Resources */,
+				ADC59B922CE73726002F819D /* KMBatchOperateNewCompressViewController.xib in Resources */,
 				ADDF839A2B391A5D00A81A4E /* PDFCertExportAccessoryView.xib in Resources */,
 				BB072D5B2C057BD600779B45 /* KMToolbarConfigWindowController.xib in Resources */,
 				ADD1B6B02941E97F00C3FFF7 /* KMPrintWindowController.xib in Resources */,
@@ -17009,6 +17022,7 @@
 				BB1BFF5D2AE9F1FF003EB179 /* KMBatchOperateBaseWindowController.swift in Sources */,
 				F36AD77729642FE80015AD53 /* CPDFListView+UndoManager.m in Sources */,
 				ADDEEA492AD38BDB00EF675D /* KMSignatureHelpViewController.swift in Sources */,
+				ADC59B8D2CE73726002F819D /* KMBatchOperateNewCompressViewController.swift in Sources */,
 				BB146FBA299DC0D100784A6A /* GTLRBase64.m in Sources */,
 				BB1B0ACB2B4FC6E900889528 /* KMFunctionGuideWindowController.swift in Sources */,
 				BB981E522AD4F638001988CA /* KMCoverButton.swift in Sources */,
@@ -18298,6 +18312,7 @@
 				BB981E562AD4F638001988CA /* KMPageIndicator.swift in Sources */,
 				AD055E4B2B72346E0035F824 /* KMBookmarkSheetView.swift in Sources */,
 				BB3A669B2B07520800575343 /* KMCustomOutlineView.swift in Sources */,
+				ADC59B8E2CE73726002F819D /* KMBatchOperateNewCompressViewController.swift in Sources */,
 				BB04FD0D2B206F3600D80F7B /* KMPlanViewController.swift in Sources */,
 				AD1FE8422BD7C98300AA4A9B /* KMPosterPrintManager.m in Sources */,
 				9FB2210F2B1AE35E00A5B208 /* NSBitmapImageRep_KMExtension.swift in Sources */,
@@ -19343,6 +19358,7 @@
 				ADBC2D0E299CAA65006280C8 /* KMBaseXibView.swift in Sources */,
 				BB86C1EF28F544F4005AD968 /* CPDFListView+Event.m in Sources */,
 				AD867FA329DEB4B000F00440 /* KMBOTAAnnotationTool.swift in Sources */,
+				ADC59B8F2CE73726002F819D /* KMBatchOperateNewCompressViewController.swift in Sources */,
 				9F1F82F429373D6E0092C4B4 /* String+KMExtensions.swift in Sources */,
 				BB1BFF5F2AE9F1FF003EB179 /* KMBatchOperateBaseWindowController.swift in Sources */,
 				9FDD0FB429534FEA000C4DAD /* KMGlobal.swift in Sources */,

Datei-Diff unterdrückt, da er zu groß ist
+ 568 - 2228
PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/lizhe.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist