【文字图片编辑】文字排序接入token

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditPDFTextPropertyViewController.swift

@@ -55,15 +55,37 @@ class KMEditPDFTextPropertyViewController: NSViewController {
     @IBOutlet weak var fontColorButton: NSButton!
     @IBOutlet weak var fontCustomColorButton: NSButton!
     
-    @IBOutlet weak var alignTitleLabel: NSTextField!
-    @IBOutlet weak var areasLeftButton: NSButton!
-    @IBOutlet weak var areasVerticalCenterButton: NSButton!
-    @IBOutlet weak var areasHorzontalButton: NSButton!
-    @IBOutlet weak var areasVerticalButton: NSButton!
-    @IBOutlet weak var areasBotoomButton: NSButton!
-    @IBOutlet weak var areasHorizontalCenterButton: NSButton!
-    @IBOutlet weak var areasTopButton: NSButton!
-    @IBOutlet weak var areasRightButton: NSButton!
+//    @IBOutlet weak var alignTitleLabel: NSTextField!
+//    @IBOutlet weak var areasLeftButton: NSButton!
+//    @IBOutlet weak var areasVerticalCenterButton: NSButton!
+//    @IBOutlet weak var areasHorzontalButton: NSButton!
+//    @IBOutlet weak var areasVerticalButton: NSButton!
+//    @IBOutlet weak var areasBotoomButton: NSButton!
+//    @IBOutlet weak var areasHorizontalCenterButton: NSButton!
+//    @IBOutlet weak var areasTopButton: NSButton!
+//    @IBOutlet weak var areasRightButton: NSButton!
+    
+    
+    @IBOutlet weak var alignmentLabel: NSTextField!
+    @IBOutlet weak var leftAreasBox: NSBox!
+    @IBOutlet weak var verticalCenterAreasBox: NSBox!
+    @IBOutlet weak var rightButtonAreasBox: NSBox!
+    @IBOutlet weak var horzontalAreasBox: NSBox!
+    @IBOutlet weak var topAreasBox: NSBox!
+    @IBOutlet weak var horizontalCenterAreasBox: NSBox!
+    @IBOutlet weak var botoomAreasBox: NSBox!
+    @IBOutlet weak var verticalAreasBox: NSBox!
+    @IBOutlet weak var alignmentLine1: NSView!
+    @IBOutlet weak var alignmentLine2: NSView!
+    
+    var leftAreasVC: KMDesignPropertySelector?
+    var verticalCenterAreasVC: KMDesignPropertySelector?
+    var rightButtonAreasVC: KMDesignPropertySelector?
+    var horzontalAreasVC: KMDesignPropertySelector?
+    var topAreasVC: KMDesignPropertySelector?
+    var horizontalCenterAreasVC: KMDesignPropertySelector?
+    var botoomAreasVC: KMDesignPropertySelector?
+    var verticalAreasVC: KMDesignPropertySelector?
     
     var textPresuppositionVC: KMDesignSelect?
     var textPresuppositionResetVC: KMDesignPropertySelector?
@@ -118,8 +140,11 @@ class KMEditPDFTextPropertyViewController: NSViewController {
         self.fontTitleLabel.font = NSFont.SFProTextSemibold(12.0)
         self.fontTitleLabel.textColor = NSColor(hex: "#616469")
         
-        self.alignTitleLabel.font = NSFont.SFProTextSemibold(12.0)
-        self.alignTitleLabel.textColor = NSColor(hex: "#616469")
+        self.alignmentLabel.font = NSFont.SFProTextSemibold(12.0)
+        self.alignmentLabel.textColor = NSColor(hex: "#616469")
+        
+        self.alignmentLine1.backgroundColor(NSColor(hex: "#000000", alpha: 0.1))
+        self.alignmentLine2.backgroundColor(NSColor(hex: "#000000", alpha: 0.1))
         
         self.headerBox.backgroundColor(NSColor(hex: "#FFFFFF"))
         self.headerBox.border(NSColor(hex: "#DFE1E5"), 0, 4)
@@ -199,6 +224,108 @@ class KMEditPDFTextPropertyViewController: NSViewController {
         textPresuppositionResetVC?.action = #selector(resetTextPresuppositionButtonAction)
         textPresuppositionResetVC?.image = NSImage(named: "KMImagePropertPanelTextDefaultMore")!
         
+//        let norIcons : [String] = ["KMImageNameEditPDFImage20","KMImageNameEditPDFImage21","KMImageNameEditPDFImage45","KMImageNameEditPDFImage46",
+//        "KMImageNameEditPDFImage47","KMImageNameEditPDFImage48","KMImageNameEditPDFImage49","KMImageNameEditPDFImage50"]
+//        let selectIcons : [String] = ["KMImageNameEditPDFImage20_1","KMImageNameEditPDFImage21_1","KMImageNameEditPDFImage45_1","KMImageNameEditPDFImage46_1",
+//                           "KMImageNameEditPDFImage47_1","KMImageNameEditPDFImage48_1","KMImageNameEditPDFImage49_1","KMImageNameEditPDFImage50_1"]
+//
+        //areasAlignment
+        leftAreasVC = KMDesignPropertySelector.init(withType: .Icon_Btn)
+        leftAreasBox.contentView = leftAreasVC?.view
+        leftAreasBox.fillColor = NSColor.clear
+        leftAreasVC?.target = self
+        leftAreasVC?.button.tag = 0
+        leftAreasVC?.action = #selector(areasAlignStyleAction)
+        leftAreasVC?._image_disabled = NSImage(named: "KMImageNameEditPDFImage45")!
+        leftAreasVC?._image_sel = NSImage(named: "KMImageNameEditPDFImage45_1")!
+        leftAreasVC?._image_hov = NSImage(named: "KMImageNameEditPDFImage45_1")!
+        leftAreasVC?.image = NSImage(named: "KMImageNameEditPDFImage45_1")!
+        leftAreasVC?.updateUI()
+        
+        verticalCenterAreasVC = KMDesignPropertySelector.init(withType: .Icon_Btn)
+        verticalCenterAreasBox.contentView = verticalCenterAreasVC?.view
+        verticalCenterAreasBox.fillColor = NSColor.clear
+        verticalCenterAreasVC?.target = self
+        verticalCenterAreasVC?.button.tag = 1
+        verticalCenterAreasVC?.action = #selector(areasAlignStyleAction)
+        verticalCenterAreasVC?._image_disabled = NSImage(named: "KMImageNameEditPDFImage46")!
+        verticalCenterAreasVC?._image_sel = NSImage(named: "KMImageNameEditPDFImage46_1")!
+        verticalCenterAreasVC?._image_hov = NSImage(named: "KMImageNameEditPDFImage46_1")!
+        verticalCenterAreasVC?.image = NSImage(named: "KMImageNameEditPDFImage46_1")!
+        verticalCenterAreasVC?.updateUI()
+        
+        rightButtonAreasVC = KMDesignPropertySelector.init(withType: .Icon_Btn)
+        rightButtonAreasBox.contentView = rightButtonAreasVC?.view
+        rightButtonAreasBox.fillColor = NSColor.clear
+        rightButtonAreasVC?.target = self
+        rightButtonAreasVC?.button.tag = 2
+        rightButtonAreasVC?.action = #selector(areasAlignStyleAction)
+        rightButtonAreasVC?.image = NSImage(named: "KMImageNameEditPDFImage47_1")!
+        rightButtonAreasVC?._image_disabled = NSImage(named: "KMImageNameEditPDFImage47")!
+        rightButtonAreasVC?._image_sel = NSImage(named: "KMImageNameEditPDFImage47_1")!
+        rightButtonAreasVC?._image_hov = NSImage(named: "KMImageNameEditPDFImage47_1")!
+        rightButtonAreasVC?.updateUI()
+        
+        horzontalAreasVC = KMDesignPropertySelector.init(withType: .Icon_Btn)
+        horzontalAreasBox.contentView = horzontalAreasVC?.view
+        horzontalAreasBox.fillColor = NSColor.clear
+        horzontalAreasVC?.target = self
+        horzontalAreasVC?.button.tag = 7
+        horzontalAreasVC?.action = #selector(areasAlignStyleAction)
+        horzontalAreasVC?.image = NSImage(named: "KMImageNameEditPDFImage21_1")!
+        horzontalAreasVC?._image_disabled = NSImage(named: "KMImageNameEditPDFImage21")!
+        horzontalAreasVC?._image_sel = NSImage(named: "KMImageNameEditPDFImage21_1")!
+        horzontalAreasVC?._image_hov = NSImage(named: "KMImageNameEditPDFImage21_1")!
+        horzontalAreasVC?.updateUI()
+        
+        topAreasVC = KMDesignPropertySelector.init(withType: .Icon_Btn)
+        topAreasBox.contentView = topAreasVC?.view
+        topAreasBox.fillColor = NSColor.clear
+        topAreasVC?.button.tag = 3
+        topAreasVC?.target = self
+        topAreasVC?.action = #selector(areasAlignStyleAction)
+        topAreasVC?.image = NSImage(named: "KMImageNameEditPDFImage48_1")!
+        topAreasVC?._image_disabled = NSImage(named: "KMImageNameEditPDFImage48")!
+        topAreasVC?._image_sel = NSImage(named: "KMImageNameEditPDFImage48_1")!
+        topAreasVC?._image_hov = NSImage(named: "KMImageNameEditPDFImage48_1")!
+        topAreasVC?.updateUI()
+        
+        horizontalCenterAreasVC = KMDesignPropertySelector.init(withType: .Icon_Btn)
+        horizontalCenterAreasBox.contentView = horizontalCenterAreasVC?.view
+        horizontalCenterAreasBox.fillColor = NSColor.clear
+        horizontalCenterAreasVC?.button.tag = 4
+        horizontalCenterAreasVC?.target = self
+        horizontalCenterAreasVC?.action = #selector(areasAlignStyleAction)
+        horizontalCenterAreasVC?.image = NSImage(named: "KMImageNameEditPDFImage49_1")!
+        horizontalCenterAreasVC?._image_disabled = NSImage(named: "KMImageNameEditPDFImage49")!
+        horizontalCenterAreasVC?._image_sel = NSImage(named: "KMImageNameEditPDFImage49_1")!
+        horizontalCenterAreasVC?._image_hov = NSImage(named: "KMImageNameEditPDFImage49_1")!
+        horizontalCenterAreasVC?.updateUI()
+        
+        botoomAreasVC = KMDesignPropertySelector.init(withType: .Icon_Btn)
+        botoomAreasBox.contentView = botoomAreasVC?.view
+        botoomAreasBox.fillColor = NSColor.clear
+        botoomAreasVC?.button.tag = 5
+        botoomAreasVC?.target = self
+        botoomAreasVC?.action = #selector(areasAlignStyleAction)
+        botoomAreasVC?.image = NSImage(named: "KMImageNameEditPDFImage50_1")!
+        botoomAreasVC?._image_disabled = NSImage(named: "KMImageNameEditPDFImage50")!
+        botoomAreasVC?._image_sel = NSImage(named: "KMImageNameEditPDFImage50_1")!
+        botoomAreasVC?._image_hov = NSImage(named: "KMImageNameEditPDFImage50_1")!
+        botoomAreasVC?.updateUI()
+        
+        verticalAreasVC = KMDesignPropertySelector.init(withType: .Icon_Btn)
+        verticalAreasBox.contentView = verticalAreasVC?.view
+        verticalAreasBox.fillColor = NSColor.clear
+        verticalAreasVC?.button.tag = 6
+        verticalAreasVC?.target = self
+        verticalAreasVC?.action = #selector(areasAlignStyleAction)
+        verticalAreasVC?.image = NSImage(named: "KMImageNameEditPDFImage20_1")!
+        verticalAreasVC?._image_disabled = NSImage(named: "KMImageNameEditPDFImage20")!
+        verticalAreasVC?._image_sel = NSImage(named: "KMImageNameEditPDFImage20_1")!
+        verticalAreasVC?._image_hov = NSImage(named: "KMImageNameEditPDFImage20_1")!
+        verticalAreasVC?.updateUI()
+        
         self.colorBox.borderColor = NSColor(hex: "#DFE1E5")
     }
     
@@ -223,7 +350,7 @@ class KMEditPDFTextPropertyViewController: NSViewController {
         
         self.fonts = CPDFAnnotationModel.supportFonts() as! [NSDictionary]
         
-        self.updateFormAearsAlignIcon()
+        self.updateFormAearsAlignmentState()
     }
     
     func updateUI() {
@@ -237,7 +364,7 @@ class KMEditPDFTextPropertyViewController: NSViewController {
     func reloadData() {
         if self.listView.editingAreas() != nil &&
             self.listView.editingAreas().count > 0 {
-            self.updateFormAearsAlignIcon()
+            self.updateFormAearsAlignmentState()
             textsAreas = []
 
             let areas = self.listView.editingAreas()
@@ -335,7 +462,7 @@ extension KMEditPDFTextPropertyViewController {
     }
     
     
-    @IBAction func areasAlignStyleAction(_ sender: NSButton) {
+    @objc func areasAlignStyleAction(_ sender: NSButton) {
         self.updateFormAearsAlignMangent(stype: CPDFActiveAreasAlignType.init(rawValue: sender.tag) ?? .Left)
     }
     
@@ -569,37 +696,36 @@ extension KMEditPDFTextPropertyViewController {
     
 }
 
-//MARK: - Private
+//MARK: - FormAears
 extension KMEditPDFTextPropertyViewController {
-    //MARK: FormAears
-    func updateFormAearsAlignIcon() {
-        let norIcons : [String] = ["KMImageNameEditPDFImage20","KMImageNameEditPDFImage21","KMImageNameEditPDFImage45","KMImageNameEditPDFImage46",
-        "KMImageNameEditPDFImage47","KMImageNameEditPDFImage48","KMImageNameEditPDFImage49","KMImageNameEditPDFImage50"]
-        let selectIcons : [String] = ["KMImageNameEditPDFImage20_1","KMImageNameEditPDFImage21_1","KMImageNameEditPDFImage45_1","KMImageNameEditPDFImage46_1",
-                           "KMImageNameEditPDFImage47_1","KMImageNameEditPDFImage48_1","KMImageNameEditPDFImage49_1","KMImageNameEditPDFImage50_1"]
-        let areasButtons : [NSButton] = [self.areasVerticalButton,self.areasHorzontalButton,self.areasLeftButton,self.areasVerticalCenterButton,
-                                         self.areasRightButton,self.areasTopButton,self.areasHorizontalCenterButton,self.areasBotoomButton]
+    func updateFormAearsAlignmentState() {
+        let areasArray = [leftAreasVC, verticalCenterAreasVC, rightButtonAreasVC, horzontalAreasVC, topAreasVC, horizontalCenterAreasVC, botoomAreasVC, verticalAreasVC]
         if self.listView.editingAreas()?.count ?? 0 < 2 {
-            for i in 0 ... areasButtons.count-1 {
-                areasButtons[i].image = NSImage(named: norIcons[i])
+            for view in areasArray {
+                view?.image = (view?._image_disabled)!
+                view?._enabled = false
             }
         } else if self.listView.editingAreas()?.count ?? 0 == 2 {
-            for i in 0 ... areasButtons.count-1 {
-                if i == 0 || i == 1 {
-                    areasButtons[i].image = NSImage(named: norIcons[i])
+            for view in areasArray {
+                if view == verticalAreasVC || view == horzontalAreasVC {
+                    view?.image = (view?._image_disabled)!
+                    view?._enabled = false
                 } else {
-                    areasButtons[i].image = NSImage(named: selectIcons[i])
+                    view?.image = (view?._image_sel)!
+                    view?._enabled = true
                 }
             }
         } else if self.listView.editingAreas()?.count ?? 0 > 2 {
-            for i in 0 ... areasButtons.count-1 {
-                areasButtons[i].image = NSImage(named: selectIcons[i])
+            for view in areasArray {
+                view?.image = (view?._image_sel)!
+                view?._enabled = true
             }
         }
     }
     
-    func updateFormAearsAlignMangent(stype:CPDFActiveAreasAlignType) {
-        if self.listView.editingAreas().count < 2 {
+    func updateFormAearsAlignMangent(stype: CPDFActiveAreasAlignType) {
+        print("updateFormAearsAlignMangent")
+        if self.listView.editingAreas() == nil || self.listView.editingAreas().count < 2 {
            return
         }
         var zeroRect = NSRect.null
@@ -780,8 +906,10 @@ extension KMEditPDFTextPropertyViewController {
             self.changeAreasAlign(areas: areasCopyArray, newBounds: newBounds)
         }
     }
-    
+}
 
+//MARK: - Private
+extension KMEditPDFTextPropertyViewController {
     func updateFontNameAndStyle(name: String, style: String, needChangeListView: Bool = true) {
         if fontName != name || fontStyle != style {
             let styleArray = self.fetchFontStyleWithFontName(fontName: name)

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditPDFTextPropertyViewController.xib

@@ -8,15 +8,10 @@
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="KMEditPDFTextPropertyViewController" customModule="PDF_Master" customModuleProvider="target">
             <connections>
-                <outlet property="alignTitleLabel" destination="11L-jZ-yOq" id="Or2-zK-cOV"/>
-                <outlet property="areasBotoomButton" destination="Ws2-xO-B0m" id="ItY-Ha-OUh"/>
-                <outlet property="areasHorizontalCenterButton" destination="isu-vm-R7m" id="kds-xJ-M7s"/>
-                <outlet property="areasHorzontalButton" destination="xc2-gE-xeo" id="xKG-NK-nzz"/>
-                <outlet property="areasLeftButton" destination="acp-D4-gVa" id="eNC-LK-JVA"/>
-                <outlet property="areasRightButton" destination="t4W-uZ-nPR" id="HzX-1n-1YJ"/>
-                <outlet property="areasTopButton" destination="y5m-ee-R1a" id="OlK-ne-tPl"/>
-                <outlet property="areasVerticalButton" destination="hBI-Pz-UIo" id="gqf-pa-cei"/>
-                <outlet property="areasVerticalCenterButton" destination="Qz5-84-11x" id="v4u-lb-qqM"/>
+                <outlet property="alignmentLabel" destination="6VB-fk-JWF" id="SV7-B6-an5"/>
+                <outlet property="alignmentLine1" destination="6k0-iq-Vr0" id="eI8-ZT-hSG"/>
+                <outlet property="alignmentLine2" destination="y0g-VH-w2H" id="l4C-Ok-rdN"/>
+                <outlet property="botoomAreasBox" destination="SPI-Mw-sd7" id="9ad-IM-4xt"/>
                 <outlet property="centerAlignmentBox" destination="rXF-2b-cRj" id="fi9-sF-XfO"/>
                 <outlet property="colorBox" destination="Dcy-0U-AoP" id="ADd-OX-dJd"/>
                 <outlet property="contentView" destination="dAY-3A-lfL" id="mu3-cD-1Tc"/>
@@ -29,33 +24,40 @@
                 <outlet property="fontStyleBox" destination="AHN-i5-WYB" id="4Kd-4C-shy"/>
                 <outlet property="fontTitleLabel" destination="2gN-hL-7Ez" id="tyg-5J-p4e"/>
                 <outlet property="headerBox" destination="UXh-hG-Hue" id="jlW-sY-853"/>
+                <outlet property="horizontalCenterAreasBox" destination="6Dm-bi-kCX" id="KsR-xJ-cZH"/>
+                <outlet property="horzontalAreasBox" destination="y56-ET-DSj" id="ztl-b4-tAS"/>
                 <outlet property="imageContentView" destination="ZNj-I9-Lej" id="iZl-EK-5FC"/>
                 <outlet property="imageViewHeightConstraint" destination="QxJ-yS-QZJ" id="w65-Uu-Eu8"/>
                 <outlet property="leftAlignmentBox" destination="ywS-TH-Tgz" id="hpW-Eo-Zyr"/>
+                <outlet property="leftAreasBox" destination="vgL-9q-udC" id="Dph-O3-Izr"/>
                 <outlet property="preImageView" destination="Nlt-O1-sL5" id="hXP-Vn-Ue1"/>
                 <outlet property="propertyTitle" destination="TmC-Oc-Dxd" id="Zcp-fv-Y6Y"/>
                 <outlet property="resetTextPresuppositionBox" destination="cZ0-Lb-7rt" id="NTl-SG-HeT"/>
                 <outlet property="rightAlignmentBox" destination="LB3-jb-9Hl" id="fLg-Cb-V6u"/>
+                <outlet property="rightButtonAreasBox" destination="OLl-X4-svg" id="rWT-PF-fQj"/>
                 <outlet property="textPresuppositionBox" destination="Pd8-gf-nbc" id="sMR-ru-581"/>
                 <outlet property="textPresuppositionTopContstraint" destination="eXm-YW-Pwj" id="pUO-ce-FC5"/>
+                <outlet property="topAreasBox" destination="Aqu-4E-hjV" id="1Xl-oI-Lyt"/>
+                <outlet property="verticalAreasBox" destination="RRh-ON-yME" id="wQn-hN-Eyu"/>
+                <outlet property="verticalCenterAreasBox" destination="QLr-MM-s1R" id="hmo-DW-0v4"/>
                 <outlet property="view" destination="4mG-P9-QH2" id="rSY-kX-3d6"/>
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <scrollView borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" id="4mG-P9-QH2">
-            <rect key="frame" x="0.0" y="0.0" width="260" height="559"/>
+            <rect key="frame" x="0.0" y="0.0" width="260" height="648"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <clipView key="contentView" drawsBackground="NO" id="dAY-3A-lfL">
-                <rect key="frame" x="0.0" y="0.0" width="260" height="559"/>
+                <rect key="frame" x="0.0" y="0.0" width="260" height="648"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
                     <view id="TEL-xs-Bvc">
-                        <rect key="frame" x="0.0" y="0.0" width="260" height="559"/>
+                        <rect key="frame" x="0.0" y="0.0" width="260" height="648"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <box titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="UXh-hG-Hue">
-                                <rect key="frame" x="13" y="419" width="234" height="94"/>
+                                <rect key="frame" x="13" y="508" width="234" height="94"/>
                                 <view key="contentView" id="ZNj-I9-Lej">
                                     <rect key="frame" x="4" y="5" width="226" height="86"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -77,179 +79,15 @@
                                 </constraints>
                             </box>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TmC-Oc-Dxd">
-                                <rect key="frame" x="14" y="527" width="30" height="16"/>
+                                <rect key="frame" x="14" y="616" width="30" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Text" id="tZm-OE-Wdr">
                                     <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>
-                            <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="USr-DR-WQu">
-                                <rect key="frame" x="16" y="84" width="228" height="114"/>
-                                <view key="contentView" id="CVW-FT-x9J">
-                                    <rect key="frame" x="0.0" y="0.0" width="228" height="114"/>
-                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                    <subviews>
-                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="11L-jZ-yOq">
-                                            <rect key="frame" x="-2" y="98" width="35" height="16"/>
-                                            <textFieldCell key="cell" lineBreakMode="clipping" title="Align" id="VJM-JL-gTx">
-                                                <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>
-                                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="acp-D4-gVa">
-                                            <rect key="frame" x="0.0" y="58" width="32" height="32"/>
-                                            <constraints>
-                                                <constraint firstAttribute="width" constant="32" id="mMs-rj-rKQ"/>
-                                                <constraint firstAttribute="height" constant="32" id="u0u-dZ-DNY"/>
-                                            </constraints>
-                                            <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="KMImageNameEditPDFImage45" imagePosition="overlaps" alignment="center" inset="2" id="9HS-eX-iZs">
-                                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
-                                            </buttonCell>
-                                            <connections>
-                                                <action selector="areasAlignStyleAction:" target="-2" id="MwJ-kM-GVQ"/>
-                                            </connections>
-                                        </button>
-                                        <button verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="Qz5-84-11x">
-                                            <rect key="frame" x="42" y="58" width="32" height="32"/>
-                                            <constraints>
-                                                <constraint firstAttribute="width" constant="32" id="KnD-WS-8DZ"/>
-                                                <constraint firstAttribute="height" constant="32" id="OBn-jF-CfL"/>
-                                            </constraints>
-                                            <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="KMImageNameEditPDFImage46" imagePosition="only" alignment="center" inset="2" id="dl8-bs-B5d">
-                                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
-                                            </buttonCell>
-                                            <connections>
-                                                <action selector="areasAlignStyleAction:" target="-2" id="wjm-cV-7dV"/>
-                                            </connections>
-                                        </button>
-                                        <button verticalHuggingPriority="750" tag="2" translatesAutoresizingMaskIntoConstraints="NO" id="t4W-uZ-nPR">
-                                            <rect key="frame" x="84" y="58" width="32" height="32"/>
-                                            <constraints>
-                                                <constraint firstAttribute="width" constant="32" id="EY4-HU-YIz"/>
-                                                <constraint firstAttribute="height" constant="32" id="xr8-ce-hRY"/>
-                                            </constraints>
-                                            <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="KMImageNameEditPDFImage47" imagePosition="only" alignment="center" inset="2" id="wT3-3U-S0T">
-                                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
-                                            </buttonCell>
-                                            <connections>
-                                                <action selector="areasAlignStyleAction:" target="-2" id="hsO-uL-53v"/>
-                                            </connections>
-                                        </button>
-                                        <button verticalHuggingPriority="750" tag="3" translatesAutoresizingMaskIntoConstraints="NO" id="y5m-ee-R1a">
-                                            <rect key="frame" x="0.0" y="16" width="32" height="32"/>
-                                            <constraints>
-                                                <constraint firstAttribute="width" constant="32" id="9aC-ec-8bw"/>
-                                                <constraint firstAttribute="height" constant="32" id="jo1-zg-fdt"/>
-                                            </constraints>
-                                            <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="KMImageNameEditPDFImage48" imagePosition="only" alignment="center" inset="2" id="JDw-Rq-Lmc">
-                                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
-                                            </buttonCell>
-                                            <connections>
-                                                <action selector="areasAlignStyleAction:" target="-2" id="arH-Sm-VyA"/>
-                                            </connections>
-                                        </button>
-                                        <button verticalHuggingPriority="750" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="isu-vm-R7m">
-                                            <rect key="frame" x="42" y="16" width="32" height="32"/>
-                                            <constraints>
-                                                <constraint firstAttribute="height" constant="32" id="BKg-v6-j0q"/>
-                                                <constraint firstAttribute="width" constant="32" id="ssW-dB-RgM"/>
-                                            </constraints>
-                                            <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="KMImageNameEditPDFImage49" imagePosition="only" alignment="center" inset="2" id="RX1-bs-USM">
-                                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
-                                            </buttonCell>
-                                            <connections>
-                                                <action selector="areasAlignStyleAction:" target="-2" id="QF8-kz-Dtz"/>
-                                            </connections>
-                                        </button>
-                                        <button verticalHuggingPriority="750" tag="5" translatesAutoresizingMaskIntoConstraints="NO" id="Ws2-xO-B0m">
-                                            <rect key="frame" x="84" y="16" width="32" height="32"/>
-                                            <constraints>
-                                                <constraint firstAttribute="height" constant="32" id="RnH-NS-fif"/>
-                                                <constraint firstAttribute="width" constant="32" id="VC3-1z-Qwh"/>
-                                            </constraints>
-                                            <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="KMImageNameEditPDFImage50" imagePosition="only" alignment="center" inset="2" id="rR9-Dn-xtP">
-                                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
-                                            </buttonCell>
-                                            <connections>
-                                                <action selector="areasAlignStyleAction:" target="-2" id="R6m-Kc-5CT"/>
-                                            </connections>
-                                        </button>
-                                        <button verticalHuggingPriority="750" tag="7" translatesAutoresizingMaskIntoConstraints="NO" id="xc2-gE-xeo">
-                                            <rect key="frame" x="133" y="58" width="32" height="32"/>
-                                            <constraints>
-                                                <constraint firstAttribute="height" constant="32" id="Vhm-9y-REe"/>
-                                                <constraint firstAttribute="width" constant="32" id="VlK-EH-4UW"/>
-                                            </constraints>
-                                            <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="KMImageNameEditPDFImage21" imagePosition="overlaps" alignment="center" inset="2" id="prb-hg-TIl">
-                                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
-                                            </buttonCell>
-                                            <connections>
-                                                <action selector="areasAlignStyleAction:" target="-2" id="74F-tU-YqN"/>
-                                            </connections>
-                                        </button>
-                                        <box horizontalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="6is-Sa-beb">
-                                            <rect key="frame" x="122" y="64" width="5" height="20"/>
-                                        </box>
-                                        <box horizontalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="Sac-zh-NG7">
-                                            <rect key="frame" x="124" y="22" width="5" height="20"/>
-                                        </box>
-                                        <button verticalHuggingPriority="750" tag="6" translatesAutoresizingMaskIntoConstraints="NO" id="hBI-Pz-UIo">
-                                            <rect key="frame" x="137" y="16" width="32" height="32"/>
-                                            <constraints>
-                                                <constraint firstAttribute="width" constant="32" id="tEW-7k-U0S"/>
-                                                <constraint firstAttribute="height" constant="32" id="y6V-4l-ziU"/>
-                                            </constraints>
-                                            <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="KMImageNameEditPDFImage20" imagePosition="overlaps" alignment="center" inset="2" id="YhM-3y-qsJ">
-                                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
-                                            </buttonCell>
-                                            <connections>
-                                                <action selector="areasAlignStyleAction:" target="-2" id="6SP-d2-iBR"/>
-                                            </connections>
-                                        </button>
-                                    </subviews>
-                                    <constraints>
-                                        <constraint firstItem="xc2-gE-xeo" firstAttribute="leading" secondItem="6is-Sa-beb" secondAttribute="trailing" constant="8" id="3Um-Xv-g7A"/>
-                                        <constraint firstItem="Ws2-xO-B0m" firstAttribute="leading" secondItem="isu-vm-R7m" secondAttribute="trailing" constant="10" id="5Fp-cl-8Ki"/>
-                                        <constraint firstItem="xc2-gE-xeo" firstAttribute="centerY" secondItem="t4W-uZ-nPR" secondAttribute="centerY" id="7BZ-RJ-kK2"/>
-                                        <constraint firstItem="Qz5-84-11x" firstAttribute="top" secondItem="11L-jZ-yOq" secondAttribute="bottom" constant="8" id="93n-TF-Svf"/>
-                                        <constraint firstItem="Sac-zh-NG7" firstAttribute="leading" secondItem="Ws2-xO-B0m" secondAttribute="trailing" constant="10" id="9kN-BE-6mL"/>
-                                        <constraint firstItem="t4W-uZ-nPR" firstAttribute="leading" secondItem="Qz5-84-11x" secondAttribute="trailing" constant="10" id="BzQ-hV-XRF"/>
-                                        <constraint firstItem="acp-D4-gVa" firstAttribute="top" secondItem="11L-jZ-yOq" secondAttribute="bottom" constant="8" id="Fnp-MC-v97"/>
-                                        <constraint firstItem="Ws2-xO-B0m" firstAttribute="centerY" secondItem="isu-vm-R7m" secondAttribute="centerY" id="Oh7-iK-DPW"/>
-                                        <constraint firstItem="isu-vm-R7m" firstAttribute="centerY" secondItem="y5m-ee-R1a" secondAttribute="centerY" id="OrE-Q4-5tt"/>
-                                        <constraint firstItem="6is-Sa-beb" firstAttribute="height" secondItem="Qz5-84-11x" secondAttribute="height" multiplier="0.6" id="Rfw-ve-1u9"/>
-                                        <constraint firstItem="acp-D4-gVa" firstAttribute="leading" secondItem="CVW-FT-x9J" secondAttribute="leading" id="TKH-1g-Wml"/>
-                                        <constraint firstItem="isu-vm-R7m" firstAttribute="leading" secondItem="y5m-ee-R1a" secondAttribute="trailing" constant="10" id="Wfo-1D-vxG"/>
-                                        <constraint firstItem="t4W-uZ-nPR" firstAttribute="firstBaseline" secondItem="Qz5-84-11x" secondAttribute="firstBaseline" id="btT-DK-2F6"/>
-                                        <constraint firstItem="Sac-zh-NG7" firstAttribute="height" secondItem="6is-Sa-beb" secondAttribute="height" id="eTg-gA-ppH"/>
-                                        <constraint firstItem="11L-jZ-yOq" firstAttribute="top" secondItem="CVW-FT-x9J" secondAttribute="top" id="fMx-5L-wzg"/>
-                                        <constraint firstItem="11L-jZ-yOq" firstAttribute="leading" secondItem="CVW-FT-x9J" secondAttribute="leading" id="fPr-gZ-doD"/>
-                                        <constraint firstItem="y5m-ee-R1a" firstAttribute="top" secondItem="acp-D4-gVa" secondAttribute="bottom" constant="10" id="jNe-g3-zBo"/>
-                                        <constraint firstItem="6is-Sa-beb" firstAttribute="leading" secondItem="t4W-uZ-nPR" secondAttribute="trailing" constant="8" id="n4v-TM-Hf2"/>
-                                        <constraint firstItem="hBI-Pz-UIo" firstAttribute="centerY" secondItem="Ws2-xO-B0m" secondAttribute="centerY" id="onc-Vk-dF1"/>
-                                        <constraint firstItem="6is-Sa-beb" firstAttribute="centerY" secondItem="Qz5-84-11x" secondAttribute="centerY" id="pET-Mc-xtf"/>
-                                        <constraint firstItem="Sac-zh-NG7" firstAttribute="centerY" secondItem="Ws2-xO-B0m" secondAttribute="centerY" id="tJ5-4m-eUo"/>
-                                        <constraint firstItem="Qz5-84-11x" firstAttribute="leading" secondItem="acp-D4-gVa" secondAttribute="trailing" constant="10" id="wYR-5B-gjg"/>
-                                        <constraint firstItem="y5m-ee-R1a" firstAttribute="leading" secondItem="acp-D4-gVa" secondAttribute="leading" id="xNW-mm-e5c"/>
-                                        <constraint firstItem="hBI-Pz-UIo" firstAttribute="leading" secondItem="Sac-zh-NG7" secondAttribute="trailing" constant="10" id="zvt-1e-La0"/>
-                                    </constraints>
-                                </view>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="114" id="nwb-rr-aoL"/>
-                                </constraints>
-                            </box>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="LHG-XG-Y6G">
-                                <rect key="frame" x="16" y="214" width="228" height="153"/>
+                                <rect key="frame" x="16" y="303" width="228" height="153"/>
                                 <subviews>
                                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2gN-hL-7Ez">
                                         <rect key="frame" x="-2" y="125" width="30" height="20"/>
@@ -414,7 +252,7 @@
                                 </constraints>
                             </customView>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="c0i-e8-xpM">
-                                <rect key="frame" x="16" y="375" width="228" height="32"/>
+                                <rect key="frame" x="16" y="464" width="228" height="32"/>
                                 <subviews>
                                     <box boxType="custom" borderWidth="0.0" cornerRadius="4" translatesAutoresizingMaskIntoConstraints="NO" id="Pd8-gf-nbc">
                                         <rect key="frame" x="0.0" y="0.0" width="190" height="32"/>
@@ -447,21 +285,182 @@
                                     <constraint firstAttribute="bottom" secondItem="cZ0-Lb-7rt" secondAttribute="bottom" id="zHr-Q3-Fwg"/>
                                 </constraints>
                             </customView>
+                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="Oi3-L1-ffT">
+                                <rect key="frame" x="16" y="187" width="228" height="100"/>
+                                <subviews>
+                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6VB-fk-JWF">
+                                        <rect key="frame" x="-2" y="84" width="35" height="16"/>
+                                        <textFieldCell key="cell" lineBreakMode="clipping" title="Align" id="h5f-rI-zlE">
+                                            <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="7LJ-33-jhf">
+                                        <rect key="frame" x="0.0" y="0.0" width="228" height="76"/>
+                                        <subviews>
+                                            <box boxType="custom" borderWidth="0.0" cornerRadius="4" translatesAutoresizingMaskIntoConstraints="NO" id="vgL-9q-udC">
+                                                <rect key="frame" x="0.0" y="44" width="32" height="32"/>
+                                                <view key="contentView" id="PEn-tq-KFP">
+                                                    <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
+                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                </view>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="32" id="5io-my-vKD"/>
+                                                    <constraint firstAttribute="width" constant="32" id="Wxa-cs-SMi"/>
+                                                </constraints>
+                                                <color key="fillColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            </box>
+                                            <box boxType="custom" borderWidth="0.0" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="QLr-MM-s1R">
+                                                <rect key="frame" x="40" y="44" width="32" height="32"/>
+                                                <view key="contentView" id="zYe-lu-Pim">
+                                                    <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
+                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                </view>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="32" id="9Jv-TT-1zH"/>
+                                                    <constraint firstAttribute="width" constant="32" id="Bx3-6Z-aRv"/>
+                                                </constraints>
+                                                <color key="fillColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            </box>
+                                            <box boxType="custom" borderWidth="0.0" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="OLl-X4-svg">
+                                                <rect key="frame" x="80" y="44" width="32" height="32"/>
+                                                <view key="contentView" id="vNT-m8-5L1">
+                                                    <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
+                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                </view>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="32" id="V0f-us-eHT"/>
+                                                    <constraint firstAttribute="width" constant="32" id="y7P-cL-w32"/>
+                                                </constraints>
+                                                <color key="fillColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            </box>
+                                            <box boxType="custom" borderWidth="0.0" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="y56-ET-DSj">
+                                                <rect key="frame" x="129" y="44" width="32" height="32"/>
+                                                <view key="contentView" id="tYg-Ht-IIU">
+                                                    <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
+                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                </view>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="32" id="7Ju-gS-Qoi"/>
+                                                    <constraint firstAttribute="height" constant="32" id="AdJ-yB-mbg"/>
+                                                </constraints>
+                                                <color key="fillColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            </box>
+                                            <box boxType="custom" borderWidth="0.0" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="Aqu-4E-hjV">
+                                                <rect key="frame" x="0.0" y="4" width="32" height="32"/>
+                                                <view key="contentView" id="15k-Ul-fqm">
+                                                    <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
+                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                </view>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="32" id="2w6-LT-Sl7"/>
+                                                    <constraint firstAttribute="height" constant="32" id="RAc-lT-TnZ"/>
+                                                </constraints>
+                                                <color key="fillColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            </box>
+                                            <box boxType="custom" borderWidth="0.0" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="6Dm-bi-kCX">
+                                                <rect key="frame" x="40" y="4" width="32" height="32"/>
+                                                <view key="contentView" id="0ab-0q-Mkd">
+                                                    <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
+                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                </view>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="32" id="IFT-ro-YYQ"/>
+                                                    <constraint firstAttribute="width" constant="32" id="uT7-LM-kGW"/>
+                                                </constraints>
+                                                <color key="fillColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            </box>
+                                            <box boxType="custom" borderWidth="0.0" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="SPI-Mw-sd7">
+                                                <rect key="frame" x="80" y="4" width="32" height="32"/>
+                                                <view key="contentView" id="8vp-Vt-364">
+                                                    <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
+                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                </view>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="32" id="RGL-ua-kLF"/>
+                                                    <constraint firstAttribute="width" constant="32" id="sDF-ZU-NVr"/>
+                                                </constraints>
+                                                <color key="fillColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            </box>
+                                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="6k0-iq-Vr0">
+                                                <rect key="frame" x="120" y="52" width="1" height="16"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="1" id="YbI-JK-WG2"/>
+                                                    <constraint firstAttribute="height" constant="16" id="dQ6-rh-c0j"/>
+                                                </constraints>
+                                            </customView>
+                                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="y0g-VH-w2H">
+                                                <rect key="frame" x="120" y="12" width="1" height="16"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="16" id="D0N-Gf-Gtf"/>
+                                                    <constraint firstAttribute="width" constant="1" id="W0o-0q-dT7"/>
+                                                </constraints>
+                                            </customView>
+                                            <box boxType="custom" borderWidth="0.0" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="RRh-ON-yME">
+                                                <rect key="frame" x="129" y="4" width="32" height="32"/>
+                                                <view key="contentView" id="i8U-dO-pSd">
+                                                    <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
+                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                </view>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="32" id="8a2-Wo-w1V"/>
+                                                    <constraint firstAttribute="width" constant="32" id="Lao-HP-aWq"/>
+                                                </constraints>
+                                                <color key="fillColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            </box>
+                                        </subviews>
+                                        <constraints>
+                                            <constraint firstItem="QLr-MM-s1R" firstAttribute="top" secondItem="7LJ-33-jhf" secondAttribute="top" id="6G0-4F-d2l"/>
+                                            <constraint firstItem="6Dm-bi-kCX" firstAttribute="leading" secondItem="Aqu-4E-hjV" secondAttribute="trailing" constant="8" id="A4H-2Y-0A1"/>
+                                            <constraint firstItem="SPI-Mw-sd7" firstAttribute="top" secondItem="OLl-X4-svg" secondAttribute="bottom" constant="8" id="B65-n6-864"/>
+                                            <constraint firstItem="OLl-X4-svg" firstAttribute="top" secondItem="PEn-tq-KFP" secondAttribute="top" id="BDr-Qr-IeM"/>
+                                            <constraint firstItem="OLl-X4-svg" firstAttribute="leading" secondItem="QLr-MM-s1R" secondAttribute="trailing" constant="8" id="GxG-tJ-zhd"/>
+                                            <constraint firstItem="Aqu-4E-hjV" firstAttribute="leading" secondItem="7LJ-33-jhf" secondAttribute="leading" id="KW3-78-uQA"/>
+                                            <constraint firstItem="QLr-MM-s1R" firstAttribute="leading" secondItem="vgL-9q-udC" secondAttribute="trailing" constant="8" id="M5v-HM-gt9"/>
+                                            <constraint firstItem="RRh-ON-yME" firstAttribute="top" secondItem="y56-ET-DSj" secondAttribute="bottom" constant="8" id="McK-dL-30k"/>
+                                            <constraint firstItem="6k0-iq-Vr0" firstAttribute="top" secondItem="7LJ-33-jhf" secondAttribute="top" constant="8" id="Pnd-pZ-TTO"/>
+                                            <constraint firstItem="y56-ET-DSj" firstAttribute="leading" secondItem="6k0-iq-Vr0" secondAttribute="trailing" constant="8" id="Q2d-HR-JyK"/>
+                                            <constraint firstItem="6Dm-bi-kCX" firstAttribute="top" secondItem="QLr-MM-s1R" secondAttribute="bottom" constant="8" id="dGA-c0-A0r"/>
+                                            <constraint firstItem="Aqu-4E-hjV" firstAttribute="top" secondItem="vgL-9q-udC" secondAttribute="bottom" constant="8" id="dkl-H2-yun"/>
+                                            <constraint firstItem="6k0-iq-Vr0" firstAttribute="leading" secondItem="OLl-X4-svg" secondAttribute="trailing" constant="8" id="hhc-ZV-qCn"/>
+                                            <constraint firstItem="SPI-Mw-sd7" firstAttribute="leading" secondItem="6Dm-bi-kCX" secondAttribute="trailing" constant="8" id="hqm-RZ-LWS"/>
+                                            <constraint firstItem="y0g-VH-w2H" firstAttribute="leading" secondItem="SPI-Mw-sd7" secondAttribute="trailing" constant="8" id="iDp-vw-cPZ"/>
+                                            <constraint firstItem="vgL-9q-udC" firstAttribute="leading" secondItem="7LJ-33-jhf" secondAttribute="leading" id="k5h-yh-lw6"/>
+                                            <constraint firstItem="OLl-X4-svg" firstAttribute="top" secondItem="7LJ-33-jhf" secondAttribute="top" id="p7m-7n-BWh"/>
+                                            <constraint firstItem="vgL-9q-udC" firstAttribute="top" secondItem="7LJ-33-jhf" secondAttribute="top" id="q6D-OS-f1a"/>
+                                            <constraint firstItem="y56-ET-DSj" firstAttribute="top" secondItem="PEn-tq-KFP" secondAttribute="top" id="tkT-je-3qQ"/>
+                                            <constraint firstItem="y56-ET-DSj" firstAttribute="top" secondItem="7LJ-33-jhf" secondAttribute="top" id="uQV-UC-FO7"/>
+                                            <constraint firstItem="y0g-VH-w2H" firstAttribute="top" secondItem="Aqu-4E-hjV" secondAttribute="top" constant="8" id="xa3-iS-gMg"/>
+                                            <constraint firstItem="RRh-ON-yME" firstAttribute="leading" secondItem="y0g-VH-w2H" secondAttribute="trailing" constant="8" id="y7v-8z-cfC"/>
+                                        </constraints>
+                                    </customView>
+                                </subviews>
+                                <constraints>
+                                    <constraint firstAttribute="bottom" secondItem="7LJ-33-jhf" secondAttribute="bottom" id="N9d-y0-5wL"/>
+                                    <constraint firstAttribute="trailing" secondItem="7LJ-33-jhf" secondAttribute="trailing" id="OVb-bF-Vov"/>
+                                    <constraint firstItem="7LJ-33-jhf" firstAttribute="top" secondItem="6VB-fk-JWF" secondAttribute="bottom" constant="8" id="QE1-nX-o9r"/>
+                                    <constraint firstItem="7LJ-33-jhf" firstAttribute="leading" secondItem="Oi3-L1-ffT" secondAttribute="leading" id="QUv-Uv-K4g"/>
+                                    <constraint firstItem="6VB-fk-JWF" firstAttribute="top" secondItem="Oi3-L1-ffT" secondAttribute="top" id="fPr-VQ-mrw"/>
+                                    <constraint firstItem="6VB-fk-JWF" firstAttribute="leading" secondItem="Oi3-L1-ffT" secondAttribute="leading" id="gHC-ML-tdu"/>
+                                    <constraint firstAttribute="height" constant="100" id="lQ0-Zl-AJK"/>
+                                </constraints>
+                            </customView>
                         </subviews>
                         <constraints>
-                            <constraint firstAttribute="trailing" secondItem="USr-DR-WQu" secondAttribute="trailing" constant="16" id="313-MI-ZQs"/>
                             <constraint firstItem="LHG-XG-Y6G" firstAttribute="leading" secondItem="TEL-xs-Bvc" secondAttribute="leading" constant="16" id="6DG-Ms-cVM"/>
+                            <constraint firstItem="Oi3-L1-ffT" firstAttribute="leading" secondItem="TEL-xs-Bvc" secondAttribute="leading" constant="16" id="IDO-eX-Y0W"/>
                             <constraint firstItem="TmC-Oc-Dxd" firstAttribute="leading" secondItem="TEL-xs-Bvc" secondAttribute="leading" constant="16" id="RZG-rJ-gds"/>
-                            <constraint firstItem="USr-DR-WQu" firstAttribute="top" secondItem="LHG-XG-Y6G" secondAttribute="bottom" constant="16" id="Ri9-5o-Jj4"/>
+                            <constraint firstItem="Oi3-L1-ffT" firstAttribute="top" secondItem="LHG-XG-Y6G" secondAttribute="bottom" constant="16" id="UEJ-wK-qqM"/>
                             <constraint firstItem="UXh-hG-Hue" firstAttribute="leading" secondItem="TEL-xs-Bvc" secondAttribute="leading" constant="16" id="Xdp-bW-lJu"/>
                             <constraint firstItem="c0i-e8-xpM" firstAttribute="top" secondItem="TEL-xs-Bvc" secondAttribute="top" constant="152" id="eXm-YW-Pwj"/>
-                            <constraint firstItem="USr-DR-WQu" firstAttribute="leading" secondItem="TEL-xs-Bvc" secondAttribute="leading" constant="16" id="gTQ-Cc-yJy"/>
                             <constraint firstItem="LHG-XG-Y6G" firstAttribute="top" secondItem="c0i-e8-xpM" secondAttribute="bottom" constant="8" id="hQa-vT-vVO"/>
                             <constraint firstItem="TmC-Oc-Dxd" firstAttribute="top" secondItem="TEL-xs-Bvc" secondAttribute="top" constant="16" id="nda-0u-kpv"/>
                             <constraint firstItem="c0i-e8-xpM" firstAttribute="leading" secondItem="TEL-xs-Bvc" secondAttribute="leading" constant="16" id="sjk-z6-UJm"/>
                             <constraint firstAttribute="trailing" secondItem="LHG-XG-Y6G" secondAttribute="trailing" constant="16" id="t3f-CG-aZf"/>
                             <constraint firstItem="UXh-hG-Hue" firstAttribute="top" secondItem="TmC-Oc-Dxd" secondAttribute="bottom" constant="16" id="uPx-kq-ARe"/>
                             <constraint firstAttribute="trailing" secondItem="UXh-hG-Hue" secondAttribute="trailing" constant="16" id="uc3-Jb-bxH"/>
+                            <constraint firstAttribute="trailing" secondItem="Oi3-L1-ffT" secondAttribute="trailing" constant="16" id="ySL-hh-cJo"/>
                             <constraint firstAttribute="trailing" secondItem="c0i-e8-xpM" secondAttribute="trailing" constant="16" id="zl6-HQ-q2g"/>
                         </constraints>
                     </view>
@@ -476,19 +475,11 @@
                 <rect key="frame" x="-100" y="-100" width="15" height="559"/>
                 <autoresizingMask key="autoresizingMask"/>
             </scroller>
-            <point key="canvasLocation" x="-133" y="-21.5"/>
+            <point key="canvasLocation" x="-133" y="23"/>
         </scrollView>
     </objects>
     <resources>
         <image name="KMImageNameBtnFontsetNor" width="16" height="16"/>
-        <image name="KMImageNameEditPDFImage20" width="16" height="16"/>
-        <image name="KMImageNameEditPDFImage21" width="16" height="16"/>
-        <image name="KMImageNameEditPDFImage45" width="16" height="16"/>
-        <image name="KMImageNameEditPDFImage46" width="16" height="16"/>
-        <image name="KMImageNameEditPDFImage47" width="16" height="16"/>
-        <image name="KMImageNameEditPDFImage48" width="16" height="16"/>
-        <image name="KMImageNameEditPDFImage49" width="16" height="16"/>
-        <image name="KMImageNameEditPDFImage50" width="16" height="16"/>
         <image name="buttonCell:TIB-ws-deg:image" width="38" height="38">
             <mutableData key="keyedArchiveRepresentation">
 YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05T

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

@@ -1934,6 +1934,7 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
     }
     
     func mainToolDidClicked(_ toolController: KMToolbarController, _ type: KMToolbarViewType, _ item: KMToolBoxItem , _ pages: [Int]) {
+        print("mainToolDidClicked")
         if(type != .Page) {
             if (hasEnterPageEdit()) {
                 self.exitPageEdit()
@@ -1983,6 +1984,7 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
     }
     
     func clickChildTool(type: KMToolbarType, index: Int) {
+        print("clickChildTool")
         Task { @MainActor in
             if (type == .compress) { /// 压缩
                 if await (KMLightMemberManager.manager.canUseAdvanced() == false) {