【综合】秘文UI处理

PDF Office/PDF Master/Class/KMLightMember/Manager/KMRequestServerManager.swift

@@ -482,20 +482,20 @@ extension KMRequestServerManager {
     
     func getDeviceRetensionCoupon(complete: @escaping KMRequestServerDateComplete) {
 
-        let urlString = AIInfoConfig().aiActionURL + "api/devices/getRetensionCoupon"
-        let params: [String:Any] = ["unique_sn": self.uuid(),
-                                    "platform": "DMG"]
-
-        KMRequestServer.requestServer.request(urlString: urlString, method: .post, params: params) { requestSerializer in
-            requestSerializer.setValue("Apifox/1.0.0 (https://www.apifox.cn)", forHTTPHeaderField: "User-Agent")
-        } completion: { [unowned self] (task, responseObject, error) in
-            let result = self.dealData(responseObject: responseObject as? NSDictionary, error: error)
-            if result.code == 200 && result.error != nil && result.message != "unknown error" {
-                complete(true, responseObject as? NSDictionary)
-            } else {
-                complete(false, responseObject as? NSDictionary)
-            }
-        }
+//        let urlString = AIInfoConfig().aiActionURL + "api/devices/getRetensionCoupon"
+//        let params: [String:Any] = ["unique_sn": self.uuid(),
+//                                    "platform": "DMG"]
+//
+//        KMRequestServer.requestServer.request(urlString: urlString, method: .post, params: params) { requestSerializer in
+//            requestSerializer.setValue("Apifox/1.0.0 (https://www.apifox.cn)", forHTTPHeaderField: "User-Agent")
+//        } completion: { [unowned self] (task, responseObject, error) in
+//            let result = self.dealData(responseObject: responseObject as? NSDictionary, error: error)
+//            if result.code == 200 && result.error != nil && result.message != "unknown error" {
+//                complete(true, responseObject as? NSDictionary)
+//            } else {
+//                complete(false, responseObject as? NSDictionary)
+//            }
+//        }
     }
     
     

PDF Office/PDF Master/Class/PDFTools/Convert/NewController/KMConvertWindowController.xib

@@ -12,7 +12,6 @@
                 <outlet property="allContentMenu" destination="CPK-uS-4AE" id="Iwv-Vn-2ol"/>
                 <outlet property="allContentMenu2" destination="vBM-XN-pKT" id="93t-Zm-dpB"/>
                 <outlet property="allContentMenu3" destination="yYm-Qc-Owk" id="DcX-Tq-7QJ"/>
-                <outlet property="allPageButton" destination="i6b-xc-EnV" id="kcK-qQ-pQl"/>
                 <outlet property="autoCreateFolderBtn" destination="cZt-Q3-8Lg" id="f8O-hS-1az"/>
                 <outlet property="autoCreateGuideBtn" destination="Gap-26-ZYO" id="0p5-Jw-Zbf"/>
                 <outlet property="batchButton" destination="Qt9-t5-iOv" id="4Uk-ND-9cb"/>
@@ -307,90 +306,6 @@ Gw
                             <action selector="buttonClicked_Batch:" target="-2" id="gpQ-nf-WHJ"/>
                         </connections>
                     </button>
-                    <box title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="jUW-ZO-oLT">
-                        <rect key="frame" x="367" y="46" width="316" height="167"/>
-                        <view key="contentView" id="2NG-Rm-aku">
-                            <rect key="frame" x="4" y="5" width="308" height="145"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                            <subviews>
-                                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="i6b-xc-EnV">
-                                    <rect key="frame" x="8" y="118" width="82" height="18"/>
-                                    <buttonCell key="cell" type="radio" title="All Pages" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="vsr-pu-U39">
-                                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                        <font key="font" metaFont="system"/>
-                                    </buttonCell>
-                                    <connections>
-                                        <action selector="buttonClicked_PageSelect:" target="-2" id="7D5-mI-Ail"/>
-                                    </connections>
-                                </button>
-                                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="76W-z8-ktB">
-                                    <rect key="frame" x="8" y="66" width="124" height="18"/>
-                                    <buttonCell key="cell" type="radio" title="Odd pages Only" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="ZBn-Hs-C93">
-                                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                        <font key="font" metaFont="system"/>
-                                    </buttonCell>
-                                    <connections>
-                                        <action selector="buttonClicked_PageSelect:" target="-2" id="at3-xx-NUb"/>
-                                    </connections>
-                                </button>
-                                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dLF-54-2Ez">
-                                    <rect key="frame" x="8" y="40" width="127" height="18"/>
-                                    <buttonCell key="cell" type="radio" title="Even pages Only" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="UDv-B4-JqN">
-                                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                        <font key="font" metaFont="system"/>
-                                    </buttonCell>
-                                    <connections>
-                                        <action selector="buttonClicked_PageSelect:" target="-2" id="SFr-MD-mib"/>
-                                    </connections>
-                                </button>
-                                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DKh-aX-YO7">
-                                    <rect key="frame" x="8" y="12" width="18" height="18"/>
-                                    <buttonCell key="cell" type="radio" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="xws-fE-xzu">
-                                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                        <font key="font" metaFont="system"/>
-                                    </buttonCell>
-                                    <connections>
-                                        <action selector="buttonClicked_PageSelect:" target="-2" id="GvJ-gr-WLP"/>
-                                    </connections>
-                                </button>
-                                <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="y8I-4d-Yvk">
-                                    <rect key="frame" x="24" y="10" width="154" height="21"/>
-                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="bpr-eQ-jls">
-                                        <font key="font" metaFont="system"/>
-                                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                    </textFieldCell>
-                                </textField>
-                                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dAn-qd-Go2">
-                                    <rect key="frame" x="8" y="92" width="106" height="18"/>
-                                    <buttonCell key="cell" type="radio" title="Current Page" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="5ou-c4-ePO">
-                                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                        <font key="font" metaFont="system"/>
-                                    </buttonCell>
-                                    <connections>
-                                        <action selector="buttonClicked_PageSelect:" target="-2" id="R2l-cy-kM7"/>
-                                    </connections>
-                                </button>
-                            </subviews>
-                            <constraints>
-                                <constraint firstItem="i6b-xc-EnV" firstAttribute="top" secondItem="2NG-Rm-aku" secondAttribute="top" constant="10" id="8r9-SP-YZI"/>
-                                <constraint firstItem="y8I-4d-Yvk" firstAttribute="top" secondItem="dLF-54-2Ez" secondAttribute="bottom" constant="10" id="CZr-DO-OSs"/>
-                                <constraint firstItem="y8I-4d-Yvk" firstAttribute="centerY" secondItem="DKh-aX-YO7" secondAttribute="centerY" id="Jxu-DV-bDB"/>
-                                <constraint firstItem="dLF-54-2Ez" firstAttribute="top" secondItem="76W-z8-ktB" secondAttribute="bottom" constant="10" id="K6b-dt-Qx5"/>
-                                <constraint firstItem="76W-z8-ktB" firstAttribute="leading" secondItem="i6b-xc-EnV" secondAttribute="leading" id="KBt-Km-MFL"/>
-                                <constraint firstItem="y8I-4d-Yvk" firstAttribute="leading" secondItem="DKh-aX-YO7" secondAttribute="trailing" id="Ls7-ry-Bpw"/>
-                                <constraint firstAttribute="bottom" secondItem="y8I-4d-Yvk" secondAttribute="bottom" constant="10" id="Mqx-vv-Q1G"/>
-                                <constraint firstItem="y8I-4d-Yvk" firstAttribute="width" secondItem="2NG-Rm-aku" secondAttribute="width" multiplier="0.5" id="WXo-G6-usg"/>
-                                <constraint firstItem="i6b-xc-EnV" firstAttribute="leading" secondItem="2NG-Rm-aku" secondAttribute="leading" constant="10" id="atA-as-1Dh"/>
-                                <constraint firstItem="dLF-54-2Ez" firstAttribute="leading" secondItem="i6b-xc-EnV" secondAttribute="leading" id="dfO-pb-SBp"/>
-                                <constraint firstItem="76W-z8-ktB" firstAttribute="top" secondItem="dAn-qd-Go2" secondAttribute="bottom" constant="10" id="eNh-Me-lm8"/>
-                                <constraint firstItem="dAn-qd-Go2" firstAttribute="top" secondItem="i6b-xc-EnV" secondAttribute="bottom" constant="10" id="gU7-jj-j9V"/>
-                                <constraint firstItem="dAn-qd-Go2" firstAttribute="leading" secondItem="i6b-xc-EnV" secondAttribute="leading" id="tGb-Eu-eaw"/>
-                                <constraint firstItem="DKh-aX-YO7" firstAttribute="leading" secondItem="i6b-xc-EnV" secondAttribute="leading" id="uef-dQ-TUX"/>
-                            </constraints>
-                        </view>
-                        <font key="titleFont" metaFont="system"/>
-                    </box>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cZt-Q3-8Lg">
                         <rect key="frame" x="368" y="21" width="286" height="18"/>
                         <buttonCell key="cell" type="check" title="Auto-create the folder with the same name" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="yN6-CZ-ZwY">
@@ -795,9 +710,6 @@ Gw
                     <constraint firstItem="9e4-ci-JPQ" firstAttribute="leading" secondItem="se5-gp-TjO" secondAttribute="leading" id="28f-42-Fmz"/>
                     <constraint firstAttribute="trailing" secondItem="RKf-EU-J3Q" secondAttribute="trailing" constant="50" id="5LO-k9-88a"/>
                     <constraint firstItem="UPM-vO-BAb" firstAttribute="leading" secondItem="9e4-ci-JPQ" secondAttribute="trailing" constant="16" id="BJP-lY-vqA"/>
-                    <constraint firstItem="jUW-ZO-oLT" firstAttribute="top" secondItem="3if-Xs-8Lv" secondAttribute="bottom" constant="125" id="BVR-t4-M1Y"/>
-                    <constraint firstItem="jUW-ZO-oLT" firstAttribute="trailing" secondItem="aGQ-OF-WXB" secondAttribute="trailing" id="DZm-em-mgb"/>
-                    <constraint firstItem="Gap-26-ZYO" firstAttribute="leading" secondItem="cZt-Q3-8Lg" secondAttribute="trailing" constant="5" id="FTu-o6-zwV"/>
                     <constraint firstItem="R2E-0y-EaA" firstAttribute="top" secondItem="3if-Xs-8Lv" secondAttribute="bottom" constant="25" id="Ge2-Ei-w2S"/>
                     <constraint firstAttribute="trailing" secondItem="Bpl-Ox-GVU" secondAttribute="trailing" constant="50" id="H46-uf-gXQ"/>
                     <constraint firstItem="hQ6-L6-IW2" firstAttribute="leading" secondItem="9e4-ci-JPQ" secondAttribute="trailing" constant="16" id="HHE-ga-88s"/>
@@ -816,7 +728,6 @@ Gw
                     <constraint firstItem="aGQ-OF-WXB" firstAttribute="top" secondItem="3if-Xs-8Lv" secondAttribute="bottom" constant="25" id="XBe-5E-DOQ"/>
                     <constraint firstItem="9e4-ci-JPQ" firstAttribute="top" secondItem="se5-gp-TjO" secondAttribute="top" id="Xkp-aI-WHZ"/>
                     <constraint firstItem="R2E-0y-EaA" firstAttribute="trailing" secondItem="aGQ-OF-WXB" secondAttribute="trailing" id="b9n-uX-rA6"/>
-                    <constraint firstItem="Gap-26-ZYO" firstAttribute="centerY" secondItem="cZt-Q3-8Lg" secondAttribute="centerY" id="bcr-OO-TX5"/>
                     <constraint firstItem="Bpl-Ox-GVU" firstAttribute="leading" secondItem="9e4-ci-JPQ" secondAttribute="trailing" constant="5" id="c3Z-Em-Uw3"/>
                     <constraint firstItem="RKf-EU-J3Q" firstAttribute="trailing" secondItem="R2E-0y-EaA" secondAttribute="trailing" id="hnY-b4-w8H"/>
                     <constraint firstItem="Bpl-Ox-GVU" firstAttribute="top" secondItem="3if-Xs-8Lv" secondAttribute="bottom" constant="128" id="mnw-u6-WjY"/>

PDF Office/PDF Master/Class/PDFTools/Redact/Controller/KMPDFRedactViewController.swift

@@ -95,16 +95,16 @@ class KMPDFRedactViewController: NSViewController {
             }
         }
         
-        self.whiteOutBox.wantsLayer = true
+//        self.whiteOutBox.wantsLayer = true
 //        self.whiteOutBox.fillColor = KMAppearance.Layout.w30Color()
-        self.whiteOutBox.layer?.cornerRadius = 6
-        self.whiteOutLabel.textColor = KMAppearance.Layout.w0Color()
-        self.whiteOutLabel.stringValue = NSLocalizedString("White Out PDF", comment: "")
+//        self.whiteOutBox.layer?.cornerRadius = 6
+//        self.whiteOutLabel.textColor = KMAppearance.Layout.w0Color()
+//        self.whiteOutLabel.stringValue = NSLocalizedString("White Out PDF", comment: "")
         
         self.redactTextButton.target = self
         self.redactTextButton.action = #selector(redactButtonAction)
-        self.whiteOutButton.target = self
-        self.whiteOutButton.action = #selector(whiteOutButtonAction)
+//        self.whiteOutButton.target = self
+//        self.whiteOutButton.action = #selector(whiteOutButtonAction)
         
         // Do view setup here.
         self.redactTipLabel.stringValue = KMLocalizedString("You are under redact mode", nil)
@@ -332,6 +332,7 @@ class KMPDFRedactViewController: NSViewController {
         
         self.isWhiteOut_ = false
         self.redactPdfView.isWhiteOut = false
+        self.redactPdfView.operationType = .redact
         self.updateButtonsState()
     }
     
@@ -340,6 +341,7 @@ class KMPDFRedactViewController: NSViewController {
         
         self.isWhiteOut_ = true
         self.redactPdfView.isWhiteOut = true
+        self.redactPdfView.operationType = .redactWhite
         self.updateButtonsState()
     }
     
@@ -347,12 +349,13 @@ class KMPDFRedactViewController: NSViewController {
     
     private func updateButtonsState() {
         if self.isWhiteOut_ {
-            self.whiteOutBox.fillColor = KMAppearance.Layout.w30Color()
+//            self.whiteOutBox.fillColor = KMAppearance.Layout.w30Color()
             self.redactTextBox.fillColor = .clear
         } else {
             self.redactTextBox.fillColor = KMAppearance.Layout.w30Color()
-            self.whiteOutBox.fillColor = .clear
+//            self.whiteOutBox.fillColor = .clear
         }
+        self.reloadUI()
     }
     
 }

PDF Office/PDF Master/Class/PDFTools/Redact/Controller/KMPDFRedactViewController.xib

@@ -6,7 +6,7 @@
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMPDFRedactViewController" customModule="PDFTech_Editor" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMPDFRedactViewController" customModule="LynxPDF_Editor" customModuleProvider="target">
             <connections>
                 <outlet property="applyBox" destination="p57-Ip-T2T" id="yYz-yx-0RG"/>
                 <outlet property="applyButton" destination="jgL-Z5-PR3" id="fHy-NQ-YtV"/>
@@ -36,7 +36,7 @@
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="2S1-Gb-ePE">
                     <rect key="frame" x="0.0" y="321" width="1000" height="40"/>
                     <subviews>
-                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="YU9-ht-l5r">
+                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="YU9-ht-l5r">
                             <rect key="frame" x="14" y="12" width="60" height="17"/>
                             <textFieldCell key="cell" lineBreakMode="clipping" title="Edit PDF" id="xwB-CI-KY9">
                                 <font key="font" metaFont="system" size="14"/>
@@ -58,7 +58,7 @@
                                         </constraints>
                                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="KMImageNameButtonRedactText" id="xzd-Qi-qA7"/>
                                     </imageView>
-                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="q7O-sY-YmJ">
+                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="q7O-sY-YmJ">
                                         <rect key="frame" x="36" y="4" width="37" height="16"/>
                                         <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="w9b-QR-5mE">
                                             <font key="font" metaFont="system"/>
@@ -66,7 +66,7 @@
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
                                     </textField>
-                                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4Gq-9K-EkC" customClass="KMCustomButton" customModule="PDFTech_Editor" customModuleProvider="target">
+                                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4Gq-9K-EkC" customClass="KMCustomButton" customModule="LynxPDF_Editor" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="0.0" width="81" height="24"/>
                                         <buttonCell key="cell" type="bevel" bezelStyle="regularSquare" alignment="center" state="on" imageScaling="proportionallyDown" inset="2" id="zd9-Dk-84Z">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -94,7 +94,7 @@
                             </constraints>
                         </box>
                         <box boxType="custom" borderType="none" cornerRadius="4" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="aoK-i3-jUv">
-                            <rect key="frame" x="482" y="8" width="81" height="24"/>
+                            <rect key="frame" x="413" y="8" width="81" height="24"/>
                             <view key="contentView" id="cu2-VR-LMh">
                                 <rect key="frame" x="0.0" y="0.0" width="81" height="24"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -115,7 +115,7 @@
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
                                     </textField>
-                                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ryk-qe-WA4" customClass="KMCustomButton" customModule="PDFTech_Editor" customModuleProvider="target">
+                                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ryk-qe-WA4" customClass="KMCustomButton" customModule="LynxPDF_Editor" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="0.0" width="81" height="24"/>
                                         <buttonCell key="cell" type="bevel" bezelStyle="regularSquare" alignment="center" state="on" imageScaling="proportionallyDown" inset="2" id="HKN-QE-F2Y">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -143,7 +143,7 @@
                             </constraints>
                         </box>
                         <box boxType="custom" borderType="none" cornerRadius="4" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="iwX-y1-ea2">
-                            <rect key="frame" x="575" y="8" width="81" height="24"/>
+                            <rect key="frame" x="506" y="8" width="81" height="24"/>
                             <view key="contentView" id="ZZF-jp-flc">
                                 <rect key="frame" x="0.0" y="0.0" width="81" height="24"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -164,7 +164,7 @@
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
                                     </textField>
-                                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="G4u-HY-WcV" customClass="KMCustomButton" customModule="PDFTech_Editor" customModuleProvider="target">
+                                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="G4u-HY-WcV" customClass="KMCustomButton" customModule="LynxPDF_Editor" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="0.0" width="81" height="24"/>
                                         <buttonCell key="cell" type="bevel" bezelStyle="regularSquare" alignment="center" state="on" imageScaling="proportionallyDown" inset="2" id="pAw-R5-ae6">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -191,7 +191,7 @@
                                 <constraint firstAttribute="height" constant="24" id="eCk-ic-tUa"/>
                             </constraints>
                         </box>
-                        <box boxType="custom" borderWidth="0.0" cornerRadius="1" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="p57-Ip-T2T" customClass="KMBox" customModule="PDFTech_Editor" customModuleProvider="target">
+                        <box boxType="custom" borderWidth="0.0" cornerRadius="1" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="p57-Ip-T2T" customClass="KMBox" customModule="LynxPDF_Editor" customModuleProvider="target">
                             <rect key="frame" x="906" y="8" width="79" height="24"/>
                             <view key="contentView" id="SkL-h8-Tpz">
                                 <rect key="frame" x="0.0" y="0.0" width="79" height="24"/>
@@ -216,7 +216,7 @@
                             </view>
                             <color key="fillColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         </box>
-                        <box boxType="custom" borderWidth="0.0" cornerRadius="1" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="dDh-hJ-cIA" customClass="KMBox" customModule="PDFTech_Editor" customModuleProvider="target">
+                        <box boxType="custom" borderWidth="0.0" cornerRadius="1" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="dDh-hJ-cIA" customClass="KMBox" customModule="LynxPDF_Editor" customModuleProvider="target">
                             <rect key="frame" x="827" y="8" width="67" height="24"/>
                             <view key="contentView" id="qpy-I2-8jU">
                                 <rect key="frame" x="0.0" y="0.0" width="67" height="24"/>
@@ -243,7 +243,6 @@
                         </box>
                     </subviews>
                     <constraints>
-                        <constraint firstItem="aoK-i3-jUv" firstAttribute="leading" secondItem="ilD-02-AHW" secondAttribute="trailing" constant="12" id="4JF-F3-8bM"/>
                         <constraint firstItem="YU9-ht-l5r" firstAttribute="centerY" secondItem="2S1-Gb-ePE" secondAttribute="centerY" id="Fvh-Id-qhM"/>
                         <constraint firstItem="aoK-i3-jUv" firstAttribute="centerY" secondItem="2S1-Gb-ePE" secondAttribute="centerY" id="I0v-ft-szS"/>
                         <constraint firstItem="4bw-Lu-Iet" firstAttribute="centerY" secondItem="2S1-Gb-ePE" secondAttribute="centerY" id="NiA-pX-XiT"/>
@@ -252,7 +251,8 @@
                         <constraint firstItem="p57-Ip-T2T" firstAttribute="top" secondItem="2S1-Gb-ePE" secondAttribute="top" constant="8" id="WR2-Qc-g35"/>
                         <constraint firstAttribute="height" constant="40" id="WUy-y7-LrA"/>
                         <constraint firstItem="YU9-ht-l5r" firstAttribute="leading" secondItem="2S1-Gb-ePE" secondAttribute="leading" constant="16" id="aT9-aj-pzQ"/>
-
+                        <constraint firstItem="iwX-y1-ea2" firstAttribute="centerX" secondItem="2S1-Gb-ePE" secondAttribute="centerX" constant="46" id="bXp-VB-JyA"/>
+                        <constraint firstItem="aoK-i3-jUv" firstAttribute="leading" secondItem="4bw-Lu-Iet" secondAttribute="trailing" constant="12" id="cmn-X5-E28"/>
                         <constraint firstItem="p57-Ip-T2T" firstAttribute="leading" secondItem="dDh-hJ-cIA" secondAttribute="trailing" constant="12" id="iIc-KL-0gR"/>
                         <constraint firstAttribute="bottom" secondItem="dDh-hJ-cIA" secondAttribute="bottom" constant="8" id="m6o-zI-Wdu"/>
                         <constraint firstAttribute="bottom" secondItem="p57-Ip-T2T" secondAttribute="bottom" constant="8" id="mtN-jR-bCV"/>
@@ -260,7 +260,7 @@
                         <constraint firstItem="iwX-y1-ea2" firstAttribute="centerY" secondItem="2S1-Gb-ePE" secondAttribute="centerY" id="sWN-bH-6QS"/>
                     </constraints>
                 </customView>
-                <customView translatesAutoresizingMaskIntoConstraints="NO" id="Ljd-Vm-9rM" customClass="KMRedactPDFView" customModule="PDFTech_Editor" customModuleProvider="target">
+                <customView translatesAutoresizingMaskIntoConstraints="NO" id="Ljd-Vm-9rM" customClass="KMRedactPDFView" customModule="LynxPDF_Editor" customModuleProvider="target">
                     <rect key="frame" x="0.0" y="0.0" width="1000" height="321"/>
                 </customView>
             </subviews>
@@ -279,6 +279,5 @@
     <resources>
         <image name="KMImageNameButtonRedactProperties" width="20" height="20"/>
         <image name="KMImageNameButtonRedactText" width="20" height="20"/>
-        <image name="KMImageNameButtonRedactWhite" width="20" height="20"/>
     </resources>
 </document>

PDF Office/PDF Master/Class/PDFTools/Redact/View/KMRedactPDFView.swift

@@ -342,7 +342,7 @@ class KMPDFWhiteOutRedactAnnotation: CPDFRedactAnnotation {
                     annotation?.setUserName(userName)
                     
 //<<<<<<< HEAD
-                    annotation?.borderWidth = 10
+                    annotation?.borderWidth = 1
                     if self.operationType == .redact {
                         annotation?.setBorderColor(KMPDFAnnotationRedactConfig.shared.redactOutlineColor)
                         annotation?.setInteriorColor(KMPDFAnnotationRedactConfig.shared.redactFillColor)
@@ -360,7 +360,7 @@ class KMPDFWhiteOutRedactAnnotation: CPDFRedactAnnotation {
                             annotation?.setOverlayText(KMPDFAnnotationRedactConfig.shared.overlayTextString)
                         }
                     } else if self.operationType == .redactWhite {
-                        annotation?.setBorderColor(NSColor.white)
+                        annotation?.setBorderColor(NSColor.red)
                         annotation?.setInteriorColor(NSColor.white)
                         annotation?.setFontColor(NSColor.white)
                     }
@@ -464,7 +464,7 @@ class KMPDFWhiteOutRedactAnnotation: CPDFRedactAnnotation {
 
 //                if ([annotation isKindOfClass:[CPDFRedactAnnotation class]]) {
 //<<<<<<< HEAD
-                annotation?.borderWidth = 10
+                annotation?.borderWidth = 1
                 if self.operationType == .redact {
                     annotation?.setBorderColor(KMPDFAnnotationRedactConfig.shared.redactOutlineColor)
                     annotation?.setInteriorColor(KMPDFAnnotationRedactConfig.shared.redactFillColor)
@@ -482,7 +482,7 @@ class KMPDFWhiteOutRedactAnnotation: CPDFRedactAnnotation {
                         annotation?.setOverlayText(KMPDFAnnotationRedactConfig.shared.overlayTextString)
                     }
                 } else if self.operationType == .redactWhite {
-                    annotation?.setBorderColor(NSColor.white)
+                    annotation?.setBorderColor(NSColor.red)
                     annotation?.setInteriorColor(NSColor.white)
                     annotation?.setFontColor(NSColor.white)
 //=======