【2025】【Markup】测量模块预处理

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Measure/KMMeasureController.swift

@@ -18,10 +18,11 @@ class KMMeasureController: NSViewController {
     @IBOutlet var fontColorGroup: ComponentCColorGroup!
     @IBOutlet var borderColorGroup: ComponentCColorGroup!
     @IBOutlet var fillColorGroup: ComponentCColorGroup!
+    @IBOutlet var fillColorImage: NSImageView!
     @IBOutlet var opacitySlider: ComponentSlider!
     @IBOutlet var opacitySelect: ComponentSelect!
     @IBOutlet var colorBGViewHeightConst: NSLayoutConstraint!
-    @IBOutlet var opacityViewHeightConst: NSLayoutConstraint!
+    @IBOutlet var opacityViewTopConst: NSLayoutConstraint!
     
     //Line
     @IBOutlet var lineBGView: NSView!
@@ -33,6 +34,10 @@ class KMMeasureController: NSViewController {
     @IBOutlet var lineDashSlider: ComponentSlider!
     @IBOutlet var lineDashSelect: ComponentSelect!
     @IBOutlet var lineBGViewHeightConst: NSLayoutConstraint!
+    @IBOutlet var arrowTypeView: NSView!
+    @IBOutlet var arrowTypeTopConst: NSLayoutConstraint!
+    @IBOutlet var arrow_leftTypeSelect: ComponentSelect!
+    @IBOutlet var arrow_RightTypeSelect: ComponentSelect!
     
     //Font
     @IBOutlet var fontBGView: NSView!
@@ -168,6 +173,51 @@ class KMMeasureController: NSViewController {
         }
         lineDashSelect.delegate = self
          
+        //ArrowType
+        arrow_leftTypeSelect.properties = ComponentSelectProperties(size: .s,
+                                                              state: .normal,
+                                                              creatable: false)
+        if true {
+            let stringItems = ["None", "Arrow Open", "Arrow Close", "Square", "Oval", "Diamond", "Butt", "Slash", "R Open Arrow", "R Close Arrow"]
+            let imageNames = ["arrowType_line", "arrowType_left_Arrow_open", "arrowType_left_Arrow_close",
+                              "arrowType_left_Square", "arrowType_left_Oval", "arrowType_left_Diamond",
+                              "arrowType_left_Butt", "arrowType_left_Slash", "arrowType_left_Open_arrow",
+                              "arrowType_left_Close_arrow"]
+            
+            var opacityItems: [ComponentMenuitemProperty] = []
+            for i in 0...stringItems.count-1 {
+                let string = stringItems[i]
+                let imageName = imageNames[i]
+                
+                let item = ComponentMenuitemProperty(type: .normal, lefticon: NSImage(named: imageName), text: string, identifier: string)
+                opacityItems.append(item)
+            }
+            arrow_leftTypeSelect.updateMenuItemsArr(opacityItems)
+        }
+        arrow_leftTypeSelect.delegate = self
+        
+        arrow_RightTypeSelect.properties = ComponentSelectProperties(size: .s,
+                                                              state: .normal,
+                                                              creatable: false)
+        if true {
+            let stringItems = ["None", "Arrow Open", "Arrow Close", "Square", "Oval", "Diamond", "Butt", "Slash", "R Open Arrow", "R Close Arrow"]
+            let imageNames = ["arrowType_line", "arrowType_right_Arrow_open", "arrowType_right_Arrow_close",
+                              "arrowType_right_Square", "arrowType_right_Oval", "arrowType_right_Diamond",
+                              "arrowType_right_Butt", "arrowType_right_Slash", "arrowType_right_Open_arrow",
+                              "arrowType_right_Close_arrow"]
+            
+            var opacityItems: [ComponentMenuitemProperty] = []
+            for i in 0...stringItems.count-1 {
+                let string = stringItems[i]
+                let imageName = imageNames[i]
+                
+                let item = ComponentMenuitemProperty(type: .normal, lefticon: NSImage(named: imageName), text: string, identifier: string)
+                opacityItems.append(item)
+            }
+            arrow_RightTypeSelect.updateMenuItemsArr(opacityItems)
+        }
+        arrow_RightTypeSelect.delegate = self
+        
         //Font
         fontNameSelect.properties = ComponentSelectProperties(size: .s,
                                                               state: .normal,
@@ -226,7 +276,6 @@ class KMMeasureController: NSViewController {
         multiLine_Property.active = false
         polygon_Property.active = false
         rectangle_Property.active = false
-         
         if annotationType == .measureLine {
             line_Property.active = true
         } else if annotationType == .measurePolyLine {
@@ -238,6 +287,28 @@ class KMMeasureController: NSViewController {
         }
         typeSegmented.reloadData()
         
+        colorBGViewHeightConst.constant = 192
+        fillColorGroup.isHidden = false
+        fillColorImage.isHidden = false
+        opacityViewTopConst.constant = 48
+        displayBGView.isHidden = false
+         
+        arrowTypeView.isHidden = false
+        
+        if annotationType == .measureLine ||
+            annotationType == .measurePolyLine {
+            colorBGViewHeightConst.constant = 152
+            fillColorGroup.isHidden = true
+            fillColorImage.isHidden = true
+            opacityViewTopConst.constant = 8
+            displayBGView.isHidden = true
+            
+        } else if annotationType == .measurePolyGon ||
+                    annotationType == .measureSquare {
+            arrowTypeView.isHidden = true
+            
+        }
+        
         if true {
             let colors: [NSColor] = KMAnnotationPropertiesColorManager.manager.measureColors
             if colors.count > 4 {
@@ -309,7 +380,6 @@ class KMMeasureController: NSViewController {
         var displayLength: Bool = false
         var displayArea: Bool = false
         
-  //
 //        if annotations.count == 0 {
 //            //Font
 //            fontNameString = CPDFFreeTextAnnotation.defaultFontName()

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Measure/KMMeasureController.xib

@@ -8,6 +8,10 @@
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="KMMeasureController" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
+                <outlet property="arrowTypeTopConst" destination="DeF-Gc-ZNg" id="ex8-iW-qm7"/>
+                <outlet property="arrowTypeView" destination="HW3-hM-sR9" id="KuM-xl-Tz3"/>
+                <outlet property="arrow_RightTypeSelect" destination="jhA-tV-dF0" id="y0f-Db-FjT"/>
+                <outlet property="arrow_leftTypeSelect" destination="pMt-Pm-PWx" id="ofo-nU-x8g"/>
                 <outlet property="borderColorGroup" destination="a9a-PJ-4Td" id="yAg-Ji-Dtn"/>
                 <outlet property="colorBGView" destination="moc-e3-iov" id="KN8-sN-wVh"/>
                 <outlet property="colorBGViewHeightConst" destination="fBn-mF-b8z" id="gZ6-G0-ln6"/>
@@ -17,24 +21,25 @@
                 <outlet property="displayLabel" destination="vLX-kL-nRO" id="obe-Ph-U2p"/>
                 <outlet property="displayLengthCheckBox" destination="UE2-ac-3eG" id="OAg-bF-k6Z"/>
                 <outlet property="fillColorGroup" destination="2XE-Pj-P5j" id="4en-1W-yyY"/>
+                <outlet property="fillColorImage" destination="fk6-wE-F6y" id="O3C-Ic-syM"/>
                 <outlet property="fontBGView" destination="rTn-a2-zjc" id="kVl-U6-VrU"/>
                 <outlet property="fontColorGroup" destination="cHm-ML-9XK" id="o8P-N4-HxT"/>
                 <outlet property="fontLabel" destination="lnJ-Ly-qzh" id="PGq-IP-pla"/>
                 <outlet property="fontNameSelect" destination="k1s-Vp-Z2Q" id="vfw-VQ-yqw"/>
                 <outlet property="fontSizeSelect" destination="2Pt-Pj-O42" id="5xs-w1-Aby"/>
                 <outlet property="fontStyleSelect" destination="3wR-it-IKE" id="4zM-G3-qV3"/>
-                <outlet property="lineBGView" destination="K7K-a3-aZr" id="YyA-WW-2wE"/>
-                <outlet property="lineBGViewHeightConst" destination="vKE-1F-QYu" id="Ha2-1O-fjU"/>
-                <outlet property="lineDashSelect" destination="nUG-xn-B8f" id="Q6w-BD-yNc"/>
-                <outlet property="lineDashSlider" destination="8Av-lC-XF8" id="gY7-6I-Hnm"/>
-                <outlet property="lineLabel" destination="omp-d0-Qii" id="QUh-IL-1Aq"/>
-                <outlet property="lineTypeSelector" destination="w2z-Zw-tvd" id="4MR-OM-roS"/>
-                <outlet property="lineWidthSelect" destination="OXF-Qg-yXx" id="TRS-Fm-mxp"/>
-                <outlet property="lineWidthSlider" destination="TXy-FQ-evB" id="1bE-sq-9IM"/>
-                <outlet property="linedashInfoView" destination="gBk-8s-FgR" id="gvN-6B-dzj"/>
+                <outlet property="lineBGView" destination="Otd-Pu-5LY" id="Mp0-B1-Q2b"/>
+                <outlet property="lineBGViewHeightConst" destination="0SQ-UK-jpM" id="xRd-v7-8Hx"/>
+                <outlet property="lineDashSelect" destination="gYc-MU-gjA" id="NaF-hs-zMW"/>
+                <outlet property="lineDashSlider" destination="6Un-Dz-yw1" id="01F-7w-vNL"/>
+                <outlet property="lineLabel" destination="Mn9-hO-jLt" id="bCl-sB-G6c"/>
+                <outlet property="lineTypeSelector" destination="vJK-Cm-0TK" id="lew-7q-0LM"/>
+                <outlet property="lineWidthSelect" destination="SBw-hq-ffi" id="cDJ-Pp-Aqg"/>
+                <outlet property="lineWidthSlider" destination="ztZ-Xm-Pfs" id="nSM-nu-Up8"/>
+                <outlet property="linedashInfoView" destination="jHT-Cl-2gu" id="agT-xt-kH7"/>
                 <outlet property="opacitySelect" destination="FQ5-7Z-Y91" id="aVG-UW-ARa"/>
                 <outlet property="opacitySlider" destination="SBZ-oI-zM3" id="6vf-P0-31Y"/>
-                <outlet property="opacityViewHeightConst" destination="9Xm-TI-Zo4" id="fiC-1N-rU6"/>
+                <outlet property="opacityViewTopConst" destination="9Xm-TI-Zo4" id="NBy-Yd-BTy"/>
                 <outlet property="typeSegmented" destination="fq5-aJ-Npn" id="sFH-St-2oQ"/>
                 <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
             </connections>
@@ -194,125 +199,154 @@
                                         <constraint firstItem="fk6-wE-F6y" firstAttribute="leading" secondItem="moc-e3-iov" secondAttribute="leading" id="xKL-Ga-iVh"/>
                                     </constraints>
                                 </customView>
-                                <customView translatesAutoresizingMaskIntoConstraints="NO" id="K7K-a3-aZr">
-                                    <rect key="frame" x="79" y="360" width="232" height="112"/>
+                                <customView translatesAutoresizingMaskIntoConstraints="NO" id="Otd-Pu-5LY">
+                                    <rect key="frame" x="79" y="320" width="232" height="152"/>
                                     <subviews>
-                                        <customView translatesAutoresizingMaskIntoConstraints="NO" id="OmD-jJ-rOH">
-                                            <rect key="frame" x="0.0" y="72" width="232" height="40"/>
+                                        <customView translatesAutoresizingMaskIntoConstraints="NO" id="WdP-aS-618">
+                                            <rect key="frame" x="0.0" y="112" width="232" height="40"/>
                                             <subviews>
-                                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="omp-d0-Qii">
+                                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Mn9-hO-jLt">
                                                     <rect key="frame" x="-2" y="12" width="30" height="16"/>
-                                                    <textFieldCell key="cell" lineBreakMode="clipping" title="Line" id="OXr-RS-0sz">
+                                                    <textFieldCell key="cell" lineBreakMode="clipping" title="Line" id="lKw-zi-euJ">
                                                         <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>
-                                                <customView translatesAutoresizingMaskIntoConstraints="NO" id="w2z-Zw-tvd" customClass="ComponentCSelectorGroup" customModule="KMComponentLibrary">
+                                                <customView translatesAutoresizingMaskIntoConstraints="NO" id="vJK-Cm-0TK" customClass="ComponentCSelectorGroup" customModule="KMComponentLibrary">
                                                     <rect key="frame" x="184" y="8" width="48" height="24"/>
                                                     <constraints>
-                                                        <constraint firstAttribute="width" constant="48" id="Vhk-vJ-GXf"/>
-                                                        <constraint firstAttribute="height" constant="24" id="plX-1U-CTt"/>
+                                                        <constraint firstAttribute="width" constant="48" id="0aX-cw-TF2"/>
+                                                        <constraint firstAttribute="height" constant="24" id="wmM-ig-gjj"/>
                                                     </constraints>
                                                 </customView>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstItem="w2z-Zw-tvd" firstAttribute="centerY" secondItem="OmD-jJ-rOH" secondAttribute="centerY" id="93k-S5-Qa6"/>
-                                                <constraint firstItem="omp-d0-Qii" firstAttribute="centerY" secondItem="OmD-jJ-rOH" secondAttribute="centerY" id="Ahe-BK-4VV"/>
-                                                <constraint firstAttribute="height" constant="40" id="PSf-iv-c2S"/>
-                                                <constraint firstItem="omp-d0-Qii" firstAttribute="leading" secondItem="OmD-jJ-rOH" secondAttribute="leading" id="b4d-At-CAE"/>
-                                                <constraint firstAttribute="trailing" secondItem="w2z-Zw-tvd" secondAttribute="trailing" id="xC9-Kv-Vze"/>
+                                                <constraint firstAttribute="height" constant="40" id="4fZ-7a-gQd"/>
+                                                <constraint firstAttribute="trailing" secondItem="vJK-Cm-0TK" secondAttribute="trailing" id="NIz-PU-cIo"/>
+                                                <constraint firstItem="Mn9-hO-jLt" firstAttribute="leading" secondItem="WdP-aS-618" secondAttribute="leading" id="QfU-FB-BKX"/>
+                                                <constraint firstItem="vJK-Cm-0TK" firstAttribute="centerY" secondItem="WdP-aS-618" secondAttribute="centerY" id="dcn-N9-444"/>
+                                                <constraint firstItem="Mn9-hO-jLt" firstAttribute="centerY" secondItem="WdP-aS-618" secondAttribute="centerY" id="hwb-UL-nrP"/>
                                             </constraints>
                                         </customView>
-                                        <customView translatesAutoresizingMaskIntoConstraints="NO" id="gMR-TK-DDc">
-                                            <rect key="frame" x="0.0" y="40" width="232" height="32"/>
+                                        <customView translatesAutoresizingMaskIntoConstraints="NO" id="v5s-SI-yqc">
+                                            <rect key="frame" x="0.0" y="80" width="232" height="32"/>
                                             <subviews>
-                                                <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="a5F-TX-AIo">
+                                                <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="pRw-l8-6uO">
                                                     <rect key="frame" x="0.0" y="6" width="20" height="20"/>
                                                     <constraints>
-                                                        <constraint firstAttribute="width" constant="20" id="UdI-yw-B45"/>
-                                                        <constraint firstAttribute="height" constant="20" id="c18-7a-tey"/>
+                                                        <constraint firstAttribute="height" constant="20" id="GHa-sx-GVt"/>
+                                                        <constraint firstAttribute="width" constant="20" id="gA1-Xo-WWY"/>
                                                     </constraints>
-                                                    <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="lineWidth_icon" id="AdQ-tr-UCb"/>
+                                                    <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="lineWidth_icon" id="ghb-5u-eZD"/>
                                                 </imageView>
-                                                <customView translatesAutoresizingMaskIntoConstraints="NO" id="TXy-FQ-evB" customClass="ComponentSlider" customModule="KMComponentLibrary">
-                                                    <rect key="frame" x="28" y="8" width="114" height="16"/>
+                                                <customView translatesAutoresizingMaskIntoConstraints="NO" id="ztZ-Xm-Pfs" customClass="ComponentSlider" customModule="KMComponentLibrary">
+                                                    <rect key="frame" x="24" y="8" width="118" height="16"/>
                                                     <constraints>
-                                                        <constraint firstAttribute="height" constant="16" id="Ll9-2t-K0W"/>
+                                                        <constraint firstAttribute="height" constant="16" id="8ra-Ip-qsx"/>
                                                     </constraints>
                                                 </customView>
-                                                <customView translatesAutoresizingMaskIntoConstraints="NO" id="OXF-Qg-yXx" customClass="ComponentSelect" customModule="KMComponentLibrary">
+                                                <customView translatesAutoresizingMaskIntoConstraints="NO" id="SBw-hq-ffi" customClass="ComponentSelect" customModule="KMComponentLibrary">
                                                     <rect key="frame" x="152" y="0.0" width="80" height="32"/>
                                                     <constraints>
-                                                        <constraint firstAttribute="height" constant="32" id="0ZM-vt-JxH"/>
-                                                        <constraint firstAttribute="width" constant="80" id="jR7-kN-Meu"/>
+                                                        <constraint firstAttribute="width" constant="80" id="L19-rr-5E8"/>
+                                                        <constraint firstAttribute="height" constant="32" id="ooU-7g-cVo"/>
                                                     </constraints>
                                                 </customView>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstItem="OXF-Qg-yXx" firstAttribute="top" secondItem="gMR-TK-DDc" secondAttribute="top" id="03y-q7-hlA"/>
-                                                <constraint firstItem="a5F-TX-AIo" firstAttribute="leading" secondItem="gMR-TK-DDc" secondAttribute="leading" id="PdT-Wy-2mM"/>
-                                                <constraint firstItem="OXF-Qg-yXx" firstAttribute="leading" secondItem="TXy-FQ-evB" secondAttribute="trailing" constant="10" id="SUB-TF-DDx"/>
-                                                <constraint firstItem="a5F-TX-AIo" firstAttribute="centerY" secondItem="gMR-TK-DDc" secondAttribute="centerY" id="UEc-kk-eA1"/>
-                                                <constraint firstAttribute="height" constant="32" id="dl6-HT-qnv"/>
-                                                <constraint firstItem="TXy-FQ-evB" firstAttribute="leading" secondItem="gMR-TK-DDc" secondAttribute="leading" constant="28" id="iI0-nD-hKN"/>
-                                                <constraint firstAttribute="trailing" secondItem="OXF-Qg-yXx" secondAttribute="trailing" id="jxc-yP-q1w"/>
-                                                <constraint firstItem="TXy-FQ-evB" firstAttribute="centerY" secondItem="gMR-TK-DDc" secondAttribute="centerY" id="oug-jC-sBC"/>
+                                                <constraint firstItem="ztZ-Xm-Pfs" firstAttribute="centerY" secondItem="v5s-SI-yqc" secondAttribute="centerY" id="0mu-N3-RJB"/>
+                                                <constraint firstItem="ztZ-Xm-Pfs" firstAttribute="leading" secondItem="v5s-SI-yqc" secondAttribute="leading" constant="24" id="2AD-Qh-Mau"/>
+                                                <constraint firstAttribute="trailing" secondItem="SBw-hq-ffi" secondAttribute="trailing" id="9Mx-xK-9w7"/>
+                                                <constraint firstItem="pRw-l8-6uO" firstAttribute="centerY" secondItem="v5s-SI-yqc" secondAttribute="centerY" id="Ila-EU-Iue"/>
+                                                <constraint firstItem="SBw-hq-ffi" firstAttribute="leading" secondItem="ztZ-Xm-Pfs" secondAttribute="trailing" constant="10" id="b7N-Jg-anG"/>
+                                                <constraint firstItem="pRw-l8-6uO" firstAttribute="leading" secondItem="v5s-SI-yqc" secondAttribute="leading" id="dtt-TF-Sw0"/>
+                                                <constraint firstAttribute="height" constant="32" id="ko5-ve-SMU"/>
+                                                <constraint firstItem="SBw-hq-ffi" firstAttribute="top" secondItem="v5s-SI-yqc" secondAttribute="top" id="tpP-bv-v64"/>
                                             </constraints>
                                         </customView>
-                                        <customView translatesAutoresizingMaskIntoConstraints="NO" id="gBk-8s-FgR">
-                                            <rect key="frame" x="0.0" y="0.0" width="232" height="32"/>
+                                        <customView translatesAutoresizingMaskIntoConstraints="NO" id="jHT-Cl-2gu">
+                                            <rect key="frame" x="0.0" y="40" width="232" height="32"/>
                                             <subviews>
-                                                <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Frc-1y-n0R">
+                                                <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="bA4-9I-5hq">
                                                     <rect key="frame" x="0.0" y="6" width="20" height="20"/>
                                                     <constraints>
-                                                        <constraint firstAttribute="height" constant="20" id="Thl-76-K1F"/>
-                                                        <constraint firstAttribute="width" constant="20" id="VA5-jj-d8d"/>
+                                                        <constraint firstAttribute="height" constant="20" id="JgM-jr-QFj"/>
+                                                        <constraint firstAttribute="width" constant="20" id="UK8-EX-NwC"/>
                                                     </constraints>
-                                                    <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="lineStyle_dash" id="pWD-Rg-GYf"/>
+                                                    <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="lineStyle_dash" id="4xJ-Wc-gAc"/>
                                                 </imageView>
-                                                <customView translatesAutoresizingMaskIntoConstraints="NO" id="8Av-lC-XF8" customClass="ComponentSlider" customModule="KMComponentLibrary">
+                                                <customView translatesAutoresizingMaskIntoConstraints="NO" id="6Un-Dz-yw1" customClass="ComponentSlider" customModule="KMComponentLibrary">
                                                     <rect key="frame" x="28" y="8" width="114" height="16"/>
                                                     <constraints>
-                                                        <constraint firstAttribute="height" constant="16" id="ulB-ts-tTS"/>
+                                                        <constraint firstAttribute="height" constant="16" id="jr6-Ks-hSB"/>
                                                     </constraints>
                                                 </customView>
-                                                <customView translatesAutoresizingMaskIntoConstraints="NO" id="nUG-xn-B8f" customClass="ComponentSelect" customModule="KMComponentLibrary">
+                                                <customView translatesAutoresizingMaskIntoConstraints="NO" id="gYc-MU-gjA" customClass="ComponentSelect" customModule="KMComponentLibrary">
                                                     <rect key="frame" x="152" y="0.0" width="80" height="32"/>
                                                     <constraints>
-                                                        <constraint firstAttribute="width" constant="80" id="7FM-RP-JnM"/>
-                                                        <constraint firstAttribute="height" constant="32" id="eov-nC-oqQ"/>
+                                                        <constraint firstAttribute="width" constant="80" id="2SB-O8-FXv"/>
+                                                        <constraint firstAttribute="height" constant="32" id="nb7-pW-eXp"/>
+                                                    </constraints>
+                                                </customView>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstAttribute="height" constant="32" id="6w0-SR-4Ir"/>
+                                                <constraint firstItem="gYc-MU-gjA" firstAttribute="top" secondItem="jHT-Cl-2gu" secondAttribute="top" id="PLO-6m-bRj"/>
+                                                <constraint firstAttribute="trailing" secondItem="gYc-MU-gjA" secondAttribute="trailing" id="SZ0-Ad-IHN"/>
+                                                <constraint firstItem="bA4-9I-5hq" firstAttribute="centerY" secondItem="jHT-Cl-2gu" secondAttribute="centerY" id="Zxh-du-Qx3"/>
+                                                <constraint firstItem="bA4-9I-5hq" firstAttribute="leading" secondItem="jHT-Cl-2gu" secondAttribute="leading" id="cB6-9N-x5P"/>
+                                                <constraint firstItem="6Un-Dz-yw1" firstAttribute="centerY" secondItem="jHT-Cl-2gu" secondAttribute="centerY" id="fd6-gO-ewz"/>
+                                                <constraint firstItem="gYc-MU-gjA" firstAttribute="leading" secondItem="6Un-Dz-yw1" secondAttribute="trailing" constant="10" id="gLm-43-iUy"/>
+                                                <constraint firstItem="6Un-Dz-yw1" firstAttribute="leading" secondItem="jHT-Cl-2gu" secondAttribute="leading" constant="28" id="mTQ-fp-gMi"/>
+                                            </constraints>
+                                        </customView>
+                                        <customView translatesAutoresizingMaskIntoConstraints="NO" id="HW3-hM-sR9">
+                                            <rect key="frame" x="0.0" y="0.0" width="232" height="32"/>
+                                            <subviews>
+                                                <customView translatesAutoresizingMaskIntoConstraints="NO" id="pMt-Pm-PWx" customClass="ComponentSelect" customModule="KMComponentLibrary">
+                                                    <rect key="frame" x="0.0" y="0.0" width="112" height="32"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="112" id="PSE-mo-fXK"/>
+                                                        <constraint firstAttribute="height" constant="32" id="ZRa-w3-iaz"/>
+                                                    </constraints>
+                                                </customView>
+                                                <customView translatesAutoresizingMaskIntoConstraints="NO" id="jhA-tV-dF0" customClass="ComponentSelect" customModule="KMComponentLibrary">
+                                                    <rect key="frame" x="120" y="0.0" width="112" height="32"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="height" constant="32" id="Ldf-qj-pLu"/>
+                                                        <constraint firstAttribute="width" constant="112" id="eKO-Yb-t81"/>
                                                     </constraints>
                                                 </customView>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstItem="8Av-lC-XF8" firstAttribute="centerY" secondItem="gBk-8s-FgR" secondAttribute="centerY" id="9nx-pn-SF1"/>
-                                                <constraint firstAttribute="trailing" secondItem="nUG-xn-B8f" secondAttribute="trailing" id="FrB-Xx-EMz"/>
-                                                <constraint firstItem="Frc-1y-n0R" firstAttribute="leading" secondItem="gBk-8s-FgR" secondAttribute="leading" id="GYS-sm-hM6"/>
-                                                <constraint firstItem="8Av-lC-XF8" firstAttribute="leading" secondItem="gBk-8s-FgR" secondAttribute="leading" constant="28" id="OzE-4b-lKi"/>
-                                                <constraint firstAttribute="height" constant="32" id="P7G-wc-X57"/>
-                                                <constraint firstItem="nUG-xn-B8f" firstAttribute="leading" secondItem="8Av-lC-XF8" secondAttribute="trailing" constant="10" id="aY2-HS-rkO"/>
-                                                <constraint firstItem="Frc-1y-n0R" firstAttribute="centerY" secondItem="gBk-8s-FgR" secondAttribute="centerY" id="lHe-HZ-Fyv"/>
-                                                <constraint firstItem="nUG-xn-B8f" firstAttribute="top" secondItem="gBk-8s-FgR" secondAttribute="top" id="xvQ-96-EP7"/>
+                                                <constraint firstItem="pMt-Pm-PWx" firstAttribute="leading" secondItem="HW3-hM-sR9" secondAttribute="leading" id="BAT-YB-cVl"/>
+                                                <constraint firstItem="jhA-tV-dF0" firstAttribute="top" secondItem="HW3-hM-sR9" secondAttribute="top" id="H4v-lZ-UCa"/>
+                                                <constraint firstItem="pMt-Pm-PWx" firstAttribute="top" secondItem="HW3-hM-sR9" secondAttribute="top" id="NIb-Sn-guU"/>
+                                                <constraint firstItem="jhA-tV-dF0" firstAttribute="leading" secondItem="pMt-Pm-PWx" secondAttribute="trailing" constant="8" id="pYK-Zr-sb5"/>
+                                                <constraint firstAttribute="height" constant="32" id="sot-T8-xt1"/>
                                             </constraints>
                                         </customView>
                                     </subviews>
                                     <constraints>
-                                        <constraint firstAttribute="width" constant="232" id="54U-Yd-MlQ"/>
-                                        <constraint firstAttribute="trailing" secondItem="gMR-TK-DDc" secondAttribute="trailing" id="CIp-Sd-Tfm"/>
-                                        <constraint firstItem="gMR-TK-DDc" firstAttribute="top" secondItem="OmD-jJ-rOH" secondAttribute="bottom" id="LbS-UE-Coj"/>
-                                        <constraint firstItem="OmD-jJ-rOH" firstAttribute="top" secondItem="K7K-a3-aZr" secondAttribute="top" id="MKo-3Y-rpD"/>
-                                        <constraint firstItem="gBk-8s-FgR" firstAttribute="top" secondItem="gMR-TK-DDc" secondAttribute="bottom" constant="8" id="P9M-uT-3T8"/>
-                                        <constraint firstItem="gMR-TK-DDc" firstAttribute="leading" secondItem="K7K-a3-aZr" secondAttribute="leading" id="Xla-Pc-LDt"/>
-                                        <constraint firstItem="gBk-8s-FgR" firstAttribute="leading" secondItem="K7K-a3-aZr" secondAttribute="leading" id="Y3P-ft-Jf6"/>
-                                        <constraint firstItem="OmD-jJ-rOH" firstAttribute="leading" secondItem="K7K-a3-aZr" secondAttribute="leading" id="eFW-gk-5pB"/>
-                                        <constraint firstAttribute="trailing" secondItem="OmD-jJ-rOH" secondAttribute="trailing" id="mae-ug-o2q"/>
-                                        <constraint firstAttribute="height" constant="112" id="vKE-1F-QYu"/>
-                                        <constraint firstAttribute="trailing" secondItem="gBk-8s-FgR" secondAttribute="trailing" id="vaF-Hh-CdZ"/>
+                                        <constraint firstItem="jHT-Cl-2gu" firstAttribute="leading" secondItem="Otd-Pu-5LY" secondAttribute="leading" id="0Ec-c1-dcX"/>
+                                        <constraint firstAttribute="height" constant="152" id="0SQ-UK-jpM"/>
+                                        <constraint firstAttribute="trailing" secondItem="v5s-SI-yqc" secondAttribute="trailing" id="BLd-Ur-3c7"/>
+                                        <constraint firstAttribute="trailing" secondItem="jHT-Cl-2gu" secondAttribute="trailing" id="CEz-94-6Ek"/>
+                                        <constraint firstItem="HW3-hM-sR9" firstAttribute="top" secondItem="v5s-SI-yqc" secondAttribute="bottom" constant="48" id="DeF-Gc-ZNg"/>
+                                        <constraint firstItem="WdP-aS-618" firstAttribute="leading" secondItem="Otd-Pu-5LY" secondAttribute="leading" id="GoW-pO-TEG"/>
+                                        <constraint firstItem="WdP-aS-618" firstAttribute="top" secondItem="Otd-Pu-5LY" secondAttribute="top" id="Twh-5k-rwu"/>
+                                        <constraint firstAttribute="trailing" secondItem="HW3-hM-sR9" secondAttribute="trailing" id="Z1O-eW-hk9"/>
+                                        <constraint firstItem="jHT-Cl-2gu" firstAttribute="top" secondItem="v5s-SI-yqc" secondAttribute="bottom" constant="8" id="ZXD-Jc-dvl"/>
+                                        <constraint firstItem="v5s-SI-yqc" firstAttribute="top" secondItem="WdP-aS-618" secondAttribute="bottom" id="aQ3-iz-Np9"/>
+                                        <constraint firstAttribute="width" constant="232" id="cFS-dw-VPF"/>
+                                        <constraint firstItem="v5s-SI-yqc" firstAttribute="leading" secondItem="Otd-Pu-5LY" secondAttribute="leading" id="dma-aB-OH1"/>
+                                        <constraint firstAttribute="trailing" secondItem="WdP-aS-618" secondAttribute="trailing" id="e2A-Ig-ECb"/>
+                                        <constraint firstItem="HW3-hM-sR9" firstAttribute="leading" secondItem="Otd-Pu-5LY" secondAttribute="leading" id="xc6-BT-h6h"/>
                                     </constraints>
                                 </customView>
                                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="rTn-a2-zjc">
-                                    <rect key="frame" x="79" y="232" width="232" height="112"/>
+                                    <rect key="frame" x="79" y="192" width="232" height="112"/>
                                     <subviews>
                                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="r9Q-Xv-ubm">
                                             <rect key="frame" x="0.0" y="72" width="232" height="40"/>
@@ -380,7 +414,7 @@
                                     </constraints>
                                 </customView>
                                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="YIb-gX-lur">
-                                    <rect key="frame" x="79" y="112" width="232" height="104"/>
+                                    <rect key="frame" x="79" y="72" width="232" height="104"/>
                                     <subviews>
                                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="gfB-W8-CjB">
                                             <rect key="frame" x="0.0" y="64" width="232" height="40"/>
@@ -429,13 +463,13 @@
                                 </customView>
                             </subviews>
                             <constraints>
-                                <constraint firstItem="rTn-a2-zjc" firstAttribute="top" secondItem="K7K-a3-aZr" secondAttribute="bottom" constant="16" id="4lG-pP-zDV"/>
+                                <constraint firstItem="Otd-Pu-5LY" firstAttribute="top" secondItem="moc-e3-iov" secondAttribute="bottom" constant="16" id="CYY-VQ-HFt"/>
                                 <constraint firstItem="moc-e3-iov" firstAttribute="top" secondItem="jwj-lF-liJ" secondAttribute="top" id="GWG-xY-R7e"/>
-                                <constraint firstItem="K7K-a3-aZr" firstAttribute="centerX" secondItem="jwj-lF-liJ" secondAttribute="centerX" id="Gks-u1-qut"/>
                                 <constraint firstItem="moc-e3-iov" firstAttribute="centerX" secondItem="jwj-lF-liJ" secondAttribute="centerX" id="Kiv-m9-e0H"/>
+                                <constraint firstItem="Otd-Pu-5LY" firstAttribute="centerX" secondItem="jwj-lF-liJ" secondAttribute="centerX" id="MvX-LT-Vmx"/>
                                 <constraint firstItem="rTn-a2-zjc" firstAttribute="centerX" secondItem="jwj-lF-liJ" secondAttribute="centerX" id="Vo3-lC-zCV"/>
                                 <constraint firstItem="YIb-gX-lur" firstAttribute="top" secondItem="rTn-a2-zjc" secondAttribute="bottom" constant="16" id="gNd-yW-MTv"/>
-                                <constraint firstItem="K7K-a3-aZr" firstAttribute="top" secondItem="moc-e3-iov" secondAttribute="bottom" constant="16" id="im1-cC-GlH"/>
+                                <constraint firstItem="rTn-a2-zjc" firstAttribute="top" secondItem="Otd-Pu-5LY" secondAttribute="bottom" constant="16" id="qd5-bY-FQ5"/>
                                 <constraint firstItem="YIb-gX-lur" firstAttribute="centerX" secondItem="jwj-lF-liJ" secondAttribute="centerX" id="y6i-bZ-PMz"/>
                             </constraints>
                         </customView>

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

@@ -17987,13 +17987,11 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "PDF Reader Pro DMG.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
-				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer";
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 202410250;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = "";
-				"DEVELOPMENT_TEAM[sdk=macosx*]" = 4GGQPGRTSV;
+				DEVELOPMENT_TEAM = F552E2RJ98;
 				ENABLE_HARDENED_RUNTIME = YES;
 				EXCLUDED_ARCHS = "";
 				FRAMEWORK_SEARCH_PATHS = (
@@ -18166,7 +18164,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.brother.pdfreaderprofree.mac;
 				PRODUCT_NAME = "PDF Reader Pro";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = pdfreaderpro_development_provisioning;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG VERSION_FREE VERSION_DMG";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "PDF Master/PDF_Reader_Pro DMG-Bridging-Header.h";
@@ -18184,13 +18181,11 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "PDF Reader Pro DMG.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
-				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer";
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 202410250;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = "";
-				"DEVELOPMENT_TEAM[sdk=macosx*]" = 4GGQPGRTSV;
+				DEVELOPMENT_TEAM = F552E2RJ98;
 				ENABLE_HARDENED_RUNTIME = YES;
 				EXCLUDED_ARCHS = "";
 				FRAMEWORK_SEARCH_PATHS = (
@@ -18361,7 +18356,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.brother.pdfreaderprofree.mac;
 				PRODUCT_NAME = "PDF Reader Pro";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = pdfreaderpro_development_provisioning;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "VERSION_FREE VERSION_DMG";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "PDF Master/PDF_Reader_Pro DMG-Bridging-Header.h";