【2025】【Markup】删除多余文件，测量模式补充

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/AnnotationProperty/KMAnnotationPropertiesViewController.h

@@ -1,52 +0,0 @@
-//
-//  KMAnnotationPropertiesViewController.h
-//  SignFlow
-//
-//  Created by wanjun on 2021/6/15.
-//
-
-#import <Cocoa/Cocoa.h>
-#import "CPDFListView.h"
-
-typedef NS_ENUM(NSInteger, KMOpenPropertiesType) {
-    KMOpenPropertiesType_None = 0,
-    KMOpenPropertiesType_Stamp,
-    KMOpenPropertiesType_Link,
-    KMOpenPropertiesType_ListBox,
-    KMOpenPropertiesType_ComboBox,
-    KMOpenPropertiesType_Button,
-    KMOpenPropertiesType_FormSignatureClick
-};
-
-@class KMMainViewController;
-
-typedef void(^PageDisplayReaderMode)(BOOL isReaderMode);
-typedef void(^AnnotationTypeDidChange)(CPDFAnnotation *anno);
-
-@interface KMAnnotationPropertiesViewController : NSViewController
-
-@property (nonatomic, retain) NSArray *annotations;
-
-@property (nonatomic, assign) CAnnotationType annotationMode;
-
-@property (nonatomic, strong) CPDFListView *pdfView;
-
-@property (nonatomic, assign) BOOL isEmptyAnnotation;
-
-@property (nonatomic, assign) BOOL isContinuousAddStamp;
-
-@property (nonatomic, assign) KMOpenPropertiesType openPropertiesType;
-
-@property (nonatomic, copy) PageDisplayReaderMode pageDisplayReaderMode;
-@property (nonatomic, copy) AnnotationTypeDidChange annoTypeDidChange;
-
-@property (nonatomic, assign) IBOutlet KMMainViewController *mainController;
-
-@property (nonatomic, assign) BOOL isClickFormSignature;
-
-@property (nonatomic, assign) CAnnotationType measureMode;
-
-+ (CGFloat)heightWithAnnotation:(CPDFAnnotation *)annotation;
-+ (CGFloat)heightWithAnnotationMode:(CAnnotationType)annotationMode;
-
-@end

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/AnnotationProperty/KMAnnotationPropertiesViewController.xib

@@ -1,227 +0,0 @@
-<?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="KMAnnotationPropertiesViewController">
-            <connections>
-                <outlet property="buttonView" destination="IWa-HT-xIg" id="4jc-DO-kae"/>
-                <outlet property="buttonbuttonLayoutConstraint" destination="1t8-bZ-MPp" id="KRg-1h-Xpx"/>
-                <outlet property="emptyImageView" destination="IyU-eu-2bu" id="fgt-Po-b4I"/>
-                <outlet property="emptyView" destination="B80-hQ-s7Z" id="a5K-dQ-LAr"/>
-                <outlet property="formAppearanceButton" destination="0u6-d1-HjM" id="mOO-7l-XRX"/>
-                <outlet property="formGeneralButton" destination="O14-Bw-MTD" id="jSh-Iz-9UO"/>
-                <outlet property="formOptionsButton" destination="nRW-rs-cpa" id="vs2-5Z-ljc"/>
-                <outlet property="gradientView" destination="rxw-ZM-edB" id="ySD-nb-CCK"/>
-                <outlet property="propertiesBox" destination="Gxz-qV-Ap6" id="ruG-O2-6fy"/>
-                <outlet property="subTitleLabel" destination="UXe-E2-gz1" id="EdP-N3-zNa"/>
-                <outlet property="tipsLabel" destination="k70-6d-ZqI" id="CNf-JI-5db"/>
-                <outlet property="tipsView" destination="yjW-RK-W05" id="XeZ-CF-HXP"/>
-                <outlet property="titleLabel" destination="Mws-8l-JHx" id="lAx-aZ-g3F"/>
-                <outlet property="titleViewHeightConstraint" destination="xEx-Vj-lAB" id="V8A-7G-HUV"/>
-                <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="284" height="569"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <subviews>
-                <customView translatesAutoresizingMaskIntoConstraints="NO" id="rxw-ZM-edB">
-                    <rect key="frame" x="0.0" y="529" width="284" height="40"/>
-                    <subviews>
-                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Mws-8l-JHx">
-                            <rect key="frame" x="14" y="13" width="256" height="15"/>
-                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" id="mBB-CB-9jR">
-                                <font key="font" metaFont="systemBold" size="12"/>
-                                <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
-                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                            </textFieldCell>
-                        </textField>
-                    </subviews>
-                    <constraints>
-                        <constraint firstItem="Mws-8l-JHx" firstAttribute="centerY" secondItem="rxw-ZM-edB" secondAttribute="centerY" id="dhi-e3-edr"/>
-                        <constraint firstItem="Mws-8l-JHx" firstAttribute="leading" secondItem="rxw-ZM-edB" secondAttribute="leading" constant="16" id="hGu-ai-NbU"/>
-                        <constraint firstAttribute="trailing" secondItem="Mws-8l-JHx" secondAttribute="trailing" constant="16" id="u4f-TF-Kun"/>
-                        <constraint firstAttribute="height" constant="40" id="xEx-Vj-lAB"/>
-                    </constraints>
-                </customView>
-                <customView translatesAutoresizingMaskIntoConstraints="NO" id="B80-hQ-s7Z">
-                    <rect key="frame" x="52" y="174" width="180" height="182"/>
-                    <subviews>
-                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="UXe-E2-gz1">
-                            <rect key="frame" x="-2" y="0.0" width="184" height="34"/>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="180" id="kUd-2I-6Is"/>
-                            </constraints>
-                            <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Show/Hide Annotation Properties Panel" id="3zw-7G-wfz">
-                                <font key="font" metaFont="system" size="14"/>
-                                <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
-                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                            </textFieldCell>
-                        </textField>
-                        <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="IyU-eu-2bu">
-                            <rect key="frame" x="20" y="42" width="140" height="140"/>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="140" id="JRy-fR-0gz"/>
-                                <constraint firstAttribute="height" constant="140" id="OFn-gW-ffj"/>
-                            </constraints>
-                            <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="5VG-o8-CXo"/>
-                        </imageView>
-                    </subviews>
-                    <constraints>
-                        <constraint firstItem="UXe-E2-gz1" firstAttribute="top" secondItem="IyU-eu-2bu" secondAttribute="bottom" constant="8" id="5O5-oa-IEd"/>
-                        <constraint firstItem="UXe-E2-gz1" firstAttribute="leading" secondItem="B80-hQ-s7Z" secondAttribute="leading" id="Id8-xr-7Ox"/>
-                        <constraint firstAttribute="trailing" secondItem="UXe-E2-gz1" secondAttribute="trailing" id="ZgM-Yt-N4Z"/>
-                        <constraint firstItem="UXe-E2-gz1" firstAttribute="centerX" secondItem="B80-hQ-s7Z" secondAttribute="centerX" id="nX3-5L-Znk"/>
-                        <constraint firstItem="IyU-eu-2bu" firstAttribute="centerX" secondItem="B80-hQ-s7Z" secondAttribute="centerX" id="ppm-gt-agB"/>
-                        <constraint firstAttribute="bottom" secondItem="UXe-E2-gz1" secondAttribute="bottom" id="qS8-g6-jSs"/>
-                        <constraint firstItem="IyU-eu-2bu" firstAttribute="top" secondItem="B80-hQ-s7Z" secondAttribute="top" id="vC2-VG-g19"/>
-                    </constraints>
-                </customView>
-                <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="Gxz-qV-Ap6">
-                    <rect key="frame" x="0.0" y="0.0" width="284" height="529"/>
-                    <view key="contentView" id="Uab-Rr-u5i">
-                        <rect key="frame" x="0.0" y="0.0" width="284" height="529"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                    </view>
-                </box>
-                <customView translatesAutoresizingMaskIntoConstraints="NO" id="IWa-HT-xIg">
-                    <rect key="frame" x="0.0" y="497" width="284" height="32"/>
-                    <subviews>
-                        <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="7py-aO-M57">
-                            <rect key="frame" x="0.0" y="-2" width="284" height="5"/>
-                        </box>
-                        <button tag="100" springLoaded="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="O14-Bw-MTD">
-                            <rect key="frame" x="0.0" y="0.0" width="95" height="32"/>
-                            <buttonCell key="cell" type="bevel" title="General" bezelStyle="regularSquare" image="KMImageNameFormGeneral" alignment="center" imageScaling="proportionallyDown" inset="2" id="GOJ-rf-MvX">
-                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                <font key="font" metaFont="system"/>
-                            </buttonCell>
-                            <connections>
-                                <action selector="fromContentButtonAction:" target="-2" id="xhq-OL-GJl"/>
-                            </connections>
-                        </button>
-                        <button tag="101" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0u6-d1-HjM">
-                            <rect key="frame" x="95" y="0.0" width="94" height="32"/>
-                            <buttonCell key="cell" type="bevel" title="Appearance" bezelStyle="regularSquare" image="KMImageNameFormAppearanceSelected" alignment="center" imageScaling="proportionallyDown" inset="2" id="mjt-Z8-knI">
-                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                <font key="font" metaFont="system"/>
-                            </buttonCell>
-                            <connections>
-                                <action selector="fromContentButtonAction:" target="-2" id="cba-hS-9XH"/>
-                            </connections>
-                        </button>
-                        <button tag="102" springLoaded="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nRW-rs-cpa">
-                            <rect key="frame" x="190" y="0.0" width="95" height="32"/>
-                            <buttonCell key="cell" type="bevel" title="Preferences" bezelStyle="regularSquare" image="KMImageNameFormOptions" alignment="center" lineBreakMode="truncatingMiddle" imageScaling="proportionallyDown" inset="2" id="f75-aB-BO2">
-                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                <font key="font" metaFont="system"/>
-                            </buttonCell>
-                            <connections>
-                                <action selector="fromContentButtonAction:" target="-2" id="fxk-dn-jka"/>
-                            </connections>
-                        </button>
-                        <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="csV-19-IRC">
-                            <rect key="frame" x="95" y="4" width="1" height="24"/>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="1" id="09n-Ea-LWD"/>
-                            </constraints>
-                            <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="3hu-xe-1OR"/>
-                        </imageView>
-                        <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="X2r-AT-5fy">
-                            <rect key="frame" x="189" y="4" width="1" height="24"/>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="1" id="zaJ-qb-Xa9"/>
-                            </constraints>
-                            <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="yF2-ph-GW8"/>
-                        </imageView>
-                    </subviews>
-                    <constraints>
-                        <constraint firstItem="nRW-rs-cpa" firstAttribute="height" secondItem="O14-Bw-MTD" secondAttribute="height" id="01M-FS-5bM"/>
-                        <constraint firstItem="nRW-rs-cpa" firstAttribute="width" secondItem="O14-Bw-MTD" secondAttribute="width" id="1b3-YX-BlU"/>
-                        <constraint firstAttribute="trailing" secondItem="7py-aO-M57" secondAttribute="trailing" id="3w7-7f-qbg"/>
-                        <constraint firstItem="0u6-d1-HjM" firstAttribute="leading" secondItem="O14-Bw-MTD" secondAttribute="trailing" id="HqY-0F-teJ"/>
-                        <constraint firstAttribute="bottom" secondItem="O14-Bw-MTD" secondAttribute="bottom" id="Hsq-76-cpc"/>
-                        <constraint firstItem="O14-Bw-MTD" firstAttribute="top" secondItem="IWa-HT-xIg" secondAttribute="top" id="KB5-1b-esU"/>
-                        <constraint firstAttribute="bottom" secondItem="csV-19-IRC" secondAttribute="bottom" constant="4" id="KfR-ps-6ch"/>
-                        <constraint firstItem="0u6-d1-HjM" firstAttribute="height" secondItem="O14-Bw-MTD" secondAttribute="height" id="Of9-bh-VQZ"/>
-                        <constraint firstItem="0u6-d1-HjM" firstAttribute="width" secondItem="O14-Bw-MTD" secondAttribute="width" id="RuC-Ia-Pkv"/>
-                        <constraint firstItem="X2r-AT-5fy" firstAttribute="leading" secondItem="0u6-d1-HjM" secondAttribute="trailing" id="XPn-3P-P5U"/>
-                        <constraint firstItem="0u6-d1-HjM" firstAttribute="top" secondItem="IWa-HT-xIg" secondAttribute="top" id="XqO-Yw-52D"/>
-                        <constraint firstItem="O14-Bw-MTD" firstAttribute="leading" secondItem="IWa-HT-xIg" secondAttribute="leading" id="Z49-y5-QWk"/>
-                        <constraint firstAttribute="bottom" secondItem="O14-Bw-MTD" secondAttribute="bottom" id="ZBx-hR-KQT"/>
-                        <constraint firstItem="nRW-rs-cpa" firstAttribute="leading" secondItem="0u6-d1-HjM" secondAttribute="trailing" constant="0.5" id="bgf-CP-CVV"/>
-                        <constraint firstItem="O14-Bw-MTD" firstAttribute="width" secondItem="IWa-HT-xIg" secondAttribute="width" multiplier="1:3" id="dHU-Bx-wfa"/>
-                        <constraint firstItem="csV-19-IRC" firstAttribute="top" secondItem="IWa-HT-xIg" secondAttribute="top" constant="4" id="feG-Lu-Wbp"/>
-                        <constraint firstItem="7py-aO-M57" firstAttribute="leading" secondItem="IWa-HT-xIg" secondAttribute="leading" id="gJS-W9-GNQ"/>
-                        <constraint firstItem="X2r-AT-5fy" firstAttribute="top" secondItem="IWa-HT-xIg" secondAttribute="top" constant="4" id="gTh-MP-SCi"/>
-                        <constraint firstAttribute="bottom" secondItem="X2r-AT-5fy" secondAttribute="bottom" constant="4" id="h5v-wt-aep"/>
-                        <constraint firstAttribute="height" constant="32" id="h6k-uV-w5k"/>
-                        <constraint firstItem="O14-Bw-MTD" firstAttribute="top" secondItem="IWa-HT-xIg" secondAttribute="top" id="tPW-DG-Oab"/>
-                        <constraint firstItem="nRW-rs-cpa" firstAttribute="top" secondItem="IWa-HT-xIg" secondAttribute="top" id="uIt-xg-uZt"/>
-                        <constraint firstAttribute="bottom" secondItem="7py-aO-M57" secondAttribute="bottom" id="vxf-dr-xbd"/>
-                        <constraint firstItem="csV-19-IRC" firstAttribute="leading" secondItem="O14-Bw-MTD" secondAttribute="trailing" id="xq0-g6-XhR"/>
-                    </constraints>
-                </customView>
-                <customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="yjW-RK-W05">
-                    <rect key="frame" x="16" y="20" width="252" height="32"/>
-                    <subviews>
-                        <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="k70-6d-ZqI">
-                            <rect key="frame" x="6" y="8" width="240" height="16"/>
-                            <textFieldCell key="cell" selectable="YES" title="Multiline Label" id="sen-yk-FVB">
-                                <font key="font" usesAppearanceFont="YES"/>
-                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                            </textFieldCell>
-                        </textField>
-                        <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="aDN-h0-vn8">
-                            <rect key="frame" x="8" y="6" width="16" height="16"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="16" id="42G-8O-QNf"/>
-                                <constraint firstAttribute="width" constant="16" id="wMF-4Z-dbh"/>
-                            </constraints>
-                            <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="KMImageNameElsei" id="dcr-PQ-qKW"/>
-                        </imageView>
-                    </subviews>
-                    <constraints>
-                        <constraint firstAttribute="trailing" secondItem="k70-6d-ZqI" secondAttribute="trailing" constant="8" id="drU-eN-DKO"/>
-                        <constraint firstItem="k70-6d-ZqI" firstAttribute="leading" secondItem="yjW-RK-W05" secondAttribute="leading" constant="8" id="gfg-lH-4pt"/>
-                        <constraint firstItem="k70-6d-ZqI" firstAttribute="top" secondItem="yjW-RK-W05" secondAttribute="top" constant="8" id="mNd-d5-ttC"/>
-                        <constraint firstAttribute="bottom" secondItem="k70-6d-ZqI" secondAttribute="bottom" constant="8" id="pEH-7H-o8q"/>
-                        <constraint firstItem="aDN-h0-vn8" firstAttribute="top" secondItem="k70-6d-ZqI" secondAttribute="top" constant="2" id="rT2-ek-X7T"/>
-                        <constraint firstItem="aDN-h0-vn8" firstAttribute="leading" secondItem="yjW-RK-W05" secondAttribute="leading" constant="8" id="ueh-CM-v0R"/>
-                    </constraints>
-                </customView>
-            </subviews>
-            <constraints>
-                <constraint firstItem="IWa-HT-xIg" firstAttribute="top" secondItem="rxw-ZM-edB" secondAttribute="bottom" id="0Ib-10-CuH"/>
-                <constraint firstItem="rxw-ZM-edB" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" id="0id-ag-6a1"/>
-                <constraint firstItem="Gxz-qV-Ap6" firstAttribute="top" secondItem="rxw-ZM-edB" secondAttribute="bottom" id="1t8-bZ-MPp"/>
-                <constraint firstItem="Gxz-qV-Ap6" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="Gsl-AQ-r4u"/>
-                <constraint firstItem="IWa-HT-xIg" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="Igz-TM-SKj"/>
-                <constraint firstAttribute="trailing" secondItem="rxw-ZM-edB" secondAttribute="trailing" id="KND-L6-dZ2"/>
-                <constraint firstAttribute="bottom" secondItem="Gxz-qV-Ap6" secondAttribute="bottom" id="KTQ-vg-rJj"/>
-                <constraint firstItem="B80-hQ-s7Z" firstAttribute="centerX" secondItem="Gxz-qV-Ap6" secondAttribute="centerX" id="WME-Ow-cdY"/>
-                <constraint firstAttribute="bottom" secondItem="yjW-RK-W05" secondAttribute="bottom" constant="20" id="ahC-gx-Cnc"/>
-                <constraint firstAttribute="trailing" secondItem="IWa-HT-xIg" secondAttribute="trailing" id="bFr-Jm-GEF"/>
-                <constraint firstItem="B80-hQ-s7Z" firstAttribute="centerY" secondItem="Gxz-qV-Ap6" secondAttribute="centerY" id="gob-d6-4iG"/>
-                <constraint firstAttribute="trailing" secondItem="yjW-RK-W05" secondAttribute="trailing" constant="16" id="iu6-4v-nfg"/>
-                <constraint firstItem="rxw-ZM-edB" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="kxZ-XW-zXg"/>
-                <constraint firstAttribute="trailing" secondItem="Gxz-qV-Ap6" secondAttribute="trailing" id="uKl-em-Ovn"/>
-                <constraint firstItem="yjW-RK-W05" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="16" id="yBn-dk-AiJ"/>
-            </constraints>
-            <point key="canvasLocation" x="-246" y="264.5"/>
-        </customView>
-    </objects>
-    <resources>
-        <image name="KMImageNameElsei" width="15" height="14"/>
-        <image name="KMImageNameFormAppearanceSelected" width="20" height="20"/>
-        <image name="KMImageNameFormGeneral" width="20" height="20"/>
-        <image name="KMImageNameFormOptions" width="20" height="20"/>
-    </resources>
-</document>

PDF Office/PDF Master/KMClass/KMPDFViewController/Toolbar/KMPDFSecToolbarController.swift

@@ -150,6 +150,8 @@ class KMPDFSecToolbarController: NSViewController {
             return KMPDFToolbar_arrow_Identifier
         } else if subToolMode == .Line {
             return KMPDFToolbar_line_Identifier
+        } else if subToolMode == .Measure {
+            return KMPDFToolbar_measure_Identifier
         } else if subToolMode == .Stamp {
             return KMPDFToolbar_stamp_Identifier
         } else if subToolMode == .Sign {
@@ -426,7 +428,6 @@ class KMPDFSecToolbarController: NSViewController {
         for view in subviews {
             if view is ComponentButton {
                 let item = (view as! ComponentButton)
-                let subToolMode = viewManager.subToolMode
                 let resultID = self.returnIDWithSubToolMode(viewManager.subToolMode)
                 
                 if item.properties.identifier != resultID {

PDF Office/PDF Reader Pro.xcodeproj/project.pbxproj

@@ -5473,12 +5473,6 @@
 		F3B2DFC82CF4B2FB0078F439 /* DigtalSignatureImage.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F3B2DFC72CF4B2FB0078F439 /* DigtalSignatureImage.xcassets */; };
 		F3B2DFC92CF4B2FB0078F439 /* DigtalSignatureImage.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F3B2DFC72CF4B2FB0078F439 /* DigtalSignatureImage.xcassets */; };
 		F3B2DFCA2CF4B2FB0078F439 /* DigtalSignatureImage.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F3B2DFC72CF4B2FB0078F439 /* DigtalSignatureImage.xcassets */; };
-		F3B2DFD92CF5C1FD0078F439 /* KMAnnotationPropertiesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F3B2DFD52CF5C1FD0078F439 /* KMAnnotationPropertiesViewController.m */; };
-		F3B2DFDA2CF5C1FD0078F439 /* KMAnnotationPropertiesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F3B2DFD52CF5C1FD0078F439 /* KMAnnotationPropertiesViewController.m */; };
-		F3B2DFDB2CF5C1FD0078F439 /* KMAnnotationPropertiesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F3B2DFD52CF5C1FD0078F439 /* KMAnnotationPropertiesViewController.m */; };
-		F3B2DFDC2CF5C1FD0078F439 /* KMAnnotationPropertiesViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F3B2DFD82CF5C1FD0078F439 /* KMAnnotationPropertiesViewController.xib */; };
-		F3B2DFDD2CF5C1FD0078F439 /* KMAnnotationPropertiesViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F3B2DFD82CF5C1FD0078F439 /* KMAnnotationPropertiesViewController.xib */; };
-		F3B2DFDE2CF5C1FD0078F439 /* KMAnnotationPropertiesViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F3B2DFD82CF5C1FD0078F439 /* KMAnnotationPropertiesViewController.xib */; };
 		F3B7DF9D2948565000333201 /* CPDFListHoverAnnotationViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F3B7DF992948565000333201 /* CPDFListHoverAnnotationViewController.xib */; };
 		F3B7DF9E2948565000333201 /* CPDFListHoverAnnotationViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F3B7DF992948565000333201 /* CPDFListHoverAnnotationViewController.xib */; };
 		F3B7DF9F2948565000333201 /* CPDFListHoverAnnotationViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F3B7DF992948565000333201 /* CPDFListHoverAnnotationViewController.xib */; };
@@ -7879,9 +7873,6 @@
 		F3A65ED42CDF1C1E00F00102 /* KMNCustomCollectionViewLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KMNCustomCollectionViewLayout.swift; sourceTree = "<group>"; };
 		F3A9DC7D294309D80074E5D2 /* CPDFListEditAnnotationViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CPDFListEditAnnotationViewController.xib; sourceTree = "<group>"; };
 		F3B2DFC72CF4B2FB0078F439 /* DigtalSignatureImage.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = DigtalSignatureImage.xcassets; sourceTree = "<group>"; };
-		F3B2DFD52CF5C1FD0078F439 /* KMAnnotationPropertiesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMAnnotationPropertiesViewController.m; sourceTree = "<group>"; };
-		F3B2DFD72CF5C1FD0078F439 /* KMAnnotationPropertiesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMAnnotationPropertiesViewController.h; sourceTree = "<group>"; };
-		F3B2DFD82CF5C1FD0078F439 /* KMAnnotationPropertiesViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KMAnnotationPropertiesViewController.xib; sourceTree = "<group>"; };
 		F3B7DF992948565000333201 /* CPDFListHoverAnnotationViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CPDFListHoverAnnotationViewController.xib; sourceTree = "<group>"; };
 		F3B7DFA32949C8E300333201 /* CPDFListView.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = CPDFListView.xcassets; sourceTree = "<group>"; };
 		F3C7984D2CD0F629008A18E2 /* CPDFDocument+PageEditManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CPDFDocument+PageEditManager.swift"; sourceTree = "<group>"; };
@@ -8710,9 +8701,6 @@
 		89E4E6D72963C6AA002DBA6F /* AnnotationProperty */ = {
 			isa = PBXGroup;
 			children = (
-				F3B2DFD72CF5C1FD0078F439 /* KMAnnotationPropertiesViewController.h */,
-				F3B2DFD52CF5C1FD0078F439 /* KMAnnotationPropertiesViewController.m */,
-				F3B2DFD82CF5C1FD0078F439 /* KMAnnotationPropertiesViewController.xib */,
 				BB52372329C3136800663BD7 /* Base */,
 				89E4E6F82963D341002DBA6F /* View */,
 				89E4E6F22963D1E9002DBA6F /* NSObject */,
@@ -15187,7 +15175,6 @@
 				BB9599C72B3164B40062D346 /* KMRedactPropertiesWindowController.xib in Resources */,
 				BB2F78B32D01FD6600F6B636 /* KMPDFSignatureImageView.xib in Resources */,
 				F3B2DFC82CF4B2FB0078F439 /* DigtalSignatureImage.xcassets in Resources */,
-				BBFE6E822930EBD400142C01 /* KMCompressWindowController.xib in Resources */,
 				BB4DFD5D2CFDA9E600026C8B /* KMStampListController.xib in Resources */,
 				BB6B49B32D02D05C003ECD26 /* KMPDFSignatureInputView.xib in Resources */,
 				BB5F8A1C29BB15AD00365ADB /* KMEmailSubWindowController.xib in Resources */,
@@ -15492,7 +15479,6 @@
 				BB69C95F299116FD0001A9B1 /* plaid.pdf in Resources */,
 				89D2D2FE294C806000BFF5FE /* KMPDFThumbnailItem.xib in Resources */,
 				BBD14F5A2CDA02640077D52E /* KMEditToolbarView.xib in Resources */,
-				F3B2DFDC2CF5C1FD0078F439 /* KMAnnotationPropertiesViewController.xib in Resources */,
 				BB52F5782CC236B6007418DB /* KMLinkWebView.xib in Resources */,
 				BB6B49B72D02D3F6003ECD26 /* KMTextSignatureView.xib in Resources */,
 				657851712CFEE38E0023D640 /* KMSearchReplaceWindowController.xib in Resources */,
@@ -16103,7 +16089,6 @@
 				BB88108F2B4F7C4100AFA63E /* KMVerificationExpiredViewController.xib in Resources */,
 				9FE0BBF42B0F2FB000CD1CAC /* KMAnnotationLineWindowController.xib in Resources */,
 				ADD1B6D029431D7100C3FFF7 /* KMPrintPreviewView.xib in Resources */,
-				F3B2DFDD2CF5C1FD0078F439 /* KMAnnotationPropertiesViewController.xib in Resources */,
 				BB8810982B4F7CD100AFA63E /* KMVerificationTrialViewController.xib in Resources */,
 				BBC821E42B0D9F72004B7E8E /* KMStampCreaterWindowController.xib in Resources */,
 				BB73F28C2C63147E00131EE7 /* KMUnbindAlertViewController.xib in Resources */,
@@ -16694,7 +16679,6 @@
 				BB5A9D632CB6521400F64C1F /* KMPDFToolbarController.xib in Resources */,
 				BB1B0AE82B4FC6E900889528 /* KMOpenFileGuideProperty.xib in Resources */,
 				BB2EDF51296E63E5003BCF58 /* KMPageEditInsertCustomPageWindowController.xib in Resources */,
-				F3B2DFDE2CF5C1FD0078F439 /* KMAnnotationPropertiesViewController.xib in Resources */,
 				BBB376A32B10A7FD009539CC /* a_2b.png in Resources */,
 				BB1B0AEB2B4FC6E900889528 /* KMFunctionGuideMultiController.xib in Resources */,
 				9F88109A2B56877C00F69815 /* KMAnnotationChoiceWidgetOptionsViewController.xib in Resources */,
@@ -18102,7 +18086,6 @@
 				BBE0BDF329A22EF300440583 /* KMMainViewController+MenuAction.swift in Sources */,
 				BBF170582AE296B90013CE02 /* KMView.swift in Sources */,
 				BB4EEF382976451E003A3537 /* KMRedactContentBaseView.swift in Sources */,
-				F3B2DFD92CF5C1FD0078F439 /* KMAnnotationPropertiesViewController.m in Sources */,
 				653647ED2CDCA85400CDB13E /* KMImageToPDFMethod.swift in Sources */,
 				6515591F2CCA6E3100C0F0D9 /* KMConvertExcelWindowController.swift in Sources */,
 				BB24D4A72977BE6700041659 /* KMRedactConfirmWindowController.swift in Sources */,
@@ -18805,7 +18788,6 @@
 				BB4DFD5B2CFDA9E600026C8B /* KMStampListController.swift in Sources */,
 				ADFCEB722B4FC1410001EBAF /* KMAdsManager.swift in Sources */,
 				BBEDC22C2B98407000970C54 /* CPDFAction+KMExtension.swift in Sources */,
-				F3B2DFDA2CF5C1FD0078F439 /* KMAnnotationPropertiesViewController.m in Sources */,
 				BB135C2B29B6CD9A00FD5965 /* KMTools.swift in Sources */,
 				9F1FE4A629406E4700E952CA /* CTToolbarView.m in Sources */,
 				F3D5D2B42CCE31AC00D4F1D5 /* KMNThumbnailCollectionView.swift in Sources */,
@@ -19459,7 +19441,6 @@
 				BB2F18482A0C7E250003F65E /* KMConvertBaseView.swift in Sources */,
 				AD867FC729DFFBC400F00440 /* KMAnnotationOutlineRowView.swift in Sources */,
 				9FA607E028FD4C9F00B46586 /* KMHomePopViewController.swift in Sources */,
-				F3B2DFDB2CF5C1FD0078F439 /* KMAnnotationPropertiesViewController.m in Sources */,
 				BB83639C2C199C20002CE43A /* KMBotaModel.swift in Sources */,
 				BB5726F22B20707D0089D283 /* CPDFMarkupAnnotation+PDFListView.swift in Sources */,
 				BBD14F612CDA16080077D52E /* KMWatermarkSaveWindow.swift in Sources */,

PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -3057,6 +3057,21 @@
                   endingLineNumber = "2597"
                   offsetFromSymbolStart = "980">
                </Location>
+               <Location
+                  uuid = "18021D19-EAF7-4279-A121-953E8941B3AE - f0c4cadf783e0622"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMMainViewController.kmCropControllerDidCropSeparate(PDF_Reader_Pro.KMCropController, PDF_Reader_Pro.KMPageRangeSelectView) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/KMMainViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "2597"
+                  endingLineNumber = "2597"
+                  offsetFromSymbolStart = "1508">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -3152,6 +3167,21 @@
                   endingLineNumber = "4049"
                   offsetFromSymbolStart = "316">
                </Location>
+               <Location
+                  uuid = "92759DD6-8CD9-4B54-BF74-D83EF6A6D5A5 - 2bef25cf46ece31c"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMMainViewController.viewWillLayoutFunction() -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/KMMainViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "4049"
+                  endingLineNumber = "4049"
+                  offsetFromSymbolStart = "1516">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -3230,6 +3260,36 @@
                   endingLineNumber = "4340"
                   offsetFromSymbolStart = "124">
                </Location>
+               <Location
+                  uuid = "C11A5EAB-3C0F-444C-8EDC-40823949B391 - 97602a50cee33f9d"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMMainViewController.exitRedact() -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/KMMainViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "4340"
+                  endingLineNumber = "4340"
+                  offsetFromSymbolStart = "1468">
+               </Location>
+               <Location
+                  uuid = "C11A5EAB-3C0F-444C-8EDC-40823949B391 - 97602a50cee33f9d"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMMainViewController.exitRedact() -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/KMMainViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "4340"
+                  endingLineNumber = "4340"
+                  offsetFromSymbolStart = "1532">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -3293,6 +3353,36 @@
                   endingLineNumber = "4381"
                   offsetFromSymbolStart = "1100">
                </Location>
+               <Location
+                  uuid = "4E0E8246-D746-4D5F-A4A2-89C78AEA0880 - bd41aafe3fa44b6b"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #1 (PDF_Reader_Pro.AINewConfigWindowController) -&gt; () in PDF_Reader_Pro.KMMainViewController.showAITypeChooseView(aiConfigType: PDF_Reader_Pro.AIConfigType) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/KMMainViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "4381"
+                  endingLineNumber = "4381"
+                  offsetFromSymbolStart = "860">
+               </Location>
+               <Location
+                  uuid = "4E0E8246-D746-4D5F-A4A2-89C78AEA0880 - bd41aafe3fa44b6b"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #1 (PDF_Reader_Pro.AINewConfigWindowController) -&gt; () in PDF_Reader_Pro.KMMainViewController.showAITypeChooseView(aiConfigType: PDF_Reader_Pro.AIConfigType) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/KMMainViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "4381"
+                  endingLineNumber = "4381"
+                  offsetFromSymbolStart = "1060">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -3664,54 +3754,6 @@
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "8BCFE1C8-BA4A-4446-9E17-3C82C8D1A50B"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFLineAnnotation+PDFListView.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "27"
-            endingLineNumber = "27"
-            landmarkName = "init(PDFListViewMeasureWith:)"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "8BCFE1C8-BA4A-4446-9E17-3C82C8D1A50B - b43e543ccc90b3d"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__C.CPDFLineAnnotation.init(PDFListViewNoteWith: __C.CPDFDocument, annotationType: __C.CAnnotationType) -&gt; __C.CPDFLineAnnotation"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFLineAnnotation+PDFListView.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "27"
-                  endingLineNumber = "27"
-                  offsetFromSymbolStart = "1344">
-               </Location>
-               <Location
-                  uuid = "8BCFE1C8-BA4A-4446-9E17-3C82C8D1A50B - f044b9754eeef6e4"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__C.CPDFLineAnnotation.init(PDFListViewMeasureWith: __C.CPDFDocument) -&gt; __C.CPDFLineAnnotation"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFLineAnnotation+PDFListView.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "27"
-                  endingLineNumber = "27"
-                  offsetFromSymbolStart = "100">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent