Merge branch 'develop_dev' of git.kdan.cc:Mac_PDF/PDF_Office into develop_dev

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

@@ -27,12 +27,17 @@ enum CPDFActiveAreasAlignType : Int {
 
 class KMEditPDFTextPropertyViewController: NSViewController {
 
+    @IBOutlet weak var contentView: NSClipView!
     @IBOutlet weak var headerBox: NSBox!
+    @IBOutlet weak var imageContentView: NSView!
+    @IBOutlet weak var imageViewHeightConstraint: NSLayoutConstraint!
+    
     @IBOutlet weak var propertyTitle: NSTextField!
     @IBOutlet weak var preImageView: NSImageView!
     
     @IBOutlet weak var textPresuppositionBox: NSBox!
     @IBOutlet weak var resetTextPresuppositionBox: NSBox!
+    @IBOutlet weak var textPresuppositionTopContstraint: NSLayoutConstraint!
     
     @IBOutlet weak var fontContentView: NSView!
     @IBOutlet weak var fontTitleLabel: NSTextField!
@@ -46,6 +51,7 @@ class KMEditPDFTextPropertyViewController: NSViewController {
     @IBOutlet weak var centerAlignmentBox: NSBox!
     @IBOutlet weak var rightAlignmentBox: NSBox!
     
+    @IBOutlet weak var colorBox: NSBox!
     @IBOutlet weak var fontColorButton: NSButton!
     @IBOutlet weak var fontCustomColorButton: NSButton!
     
@@ -104,7 +110,22 @@ class KMEditPDFTextPropertyViewController: NSViewController {
     }
     
     func setup() {
+        self.contentView.backgroundColor(NSColor(hex: "#F7F8FA"))
+        
+        self.propertyTitle.font = NSFont.SFProTextSemibold(14.0)
+        self.propertyTitle.textColor = NSColor(hex: "#252629")
+        
+        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.headerBox.backgroundColor(NSColor(hex: "#FFFFFF"))
+        self.headerBox.border(NSColor(hex: "#DFE1E5"), 0, 4)
+        
+        self.imageContentView.backgroundColor(NSColor(hex: "#FFFFFF"))
+        self.imageContentView.border(NSColor(hex: "#DFE1E5"), 0, 0)
         //
         self.fontColorButton.border(NSColor.clear, 0, 10)
         //alignment
@@ -115,6 +136,7 @@ class KMEditPDFTextPropertyViewController: NSViewController {
         leftAlignmentVC?.action = #selector(leftAlignmentAction)
         leftAlignmentVC?.image = NSImage(named: "KMImageNameEditPDFAlignLeft")!
         leftAlignmentVC?.image_sel = NSImage(named: "KMImageNameEditPDFAlignLeftSelect")!
+        leftAlignmentVC?.updateUI()
         
         centerAlignmentVC = KMDesignPropertySelector.init(withType: .Icon_Btn)
         centerAlignmentBox.contentView = centerAlignmentVC?.view
@@ -141,45 +163,32 @@ class KMEditPDFTextPropertyViewController: NSViewController {
         
         fontNameVC = KMDesignSelect.init(withType: .PopButton)
         fontNameBox.contentView = fontNameVC?.view
+        fontNameBox.fillColor = NSColor.clear
         fontNameVC?.addItems(withObjectValues: fontNameArray)
         fontNameVC?.selectItem(at: 0)
         fontNameVC?.delete = self
         
-//        var font: NSFont
-//        if fontStyle == "Regular" {
-//            font = NSFont(name: fontName, size: CGFloat(fontSize))!
-//        } else {
-//            font = NSFont(name: "\(fontName)-\(fontStyle)", size: CGFloat(fontSize))!
-//        }
-//
-//        var styleArray: [String] = []
-//        for style in font.styles() {
-//            if style is String {
-//                let styleString = style as? String
-//                styleArray.append(styleString!)
-//            }
-//        }
-//
         let styleArray = self.fetchFontStyleWithFontName(fontName: fontName)
-        
         fontStyleVC = KMDesignSelect.init(withType: .PopButton)
         fontStyleBox.contentView = fontStyleVC?.view
+        fontStyleBox.fillColor = NSColor.clear
         fontStyleVC?.addItems(withObjectValues: styleArray)
         fontStyleVC?.selectItem(at: 0)
         fontStyleVC?.delete = self
         
         fontSizeVC = KMDesignSelect.init(withType: .PopButton)
         fontSizeBox.contentView = fontSizeVC?.view
+        fontSizeBox.fillColor = NSColor.clear
         fontSizeVC?.removeAllItems()
         fontSizeVC?.addItems(withObjectValues: self.supportFontSize())
         fontSizeVC?.selectItem(at: 0)
         fontSizeVC?.delete = self
         
         //textPresupposition
-        let textPresuppositionArray = ["Customize", "H1 Headline", "H2 Title", "H3 Subtitle", "B1 Text", "B2 Small Text", "B3 Describtion"]
         textPresuppositionVC = KMDesignSelect.init(withType: .PopButton)
         textPresuppositionBox.contentView = textPresuppositionVC?.view
-        textPresuppositionVC?.addItems(withObjectValues: textPresuppositionArray)
+        textPresuppositionBox.fillColor = NSColor.clear
+        textPresuppositionVC?.addItems(withObjectValues: self.fetchTextPresuppositionArray())
         textPresuppositionVC?.selectItem(at: 0)
         textPresuppositionVC?.delete = self
         
@@ -189,6 +198,8 @@ class KMEditPDFTextPropertyViewController: NSViewController {
         textPresuppositionResetVC?.target = self
         textPresuppositionResetVC?.action = #selector(resetTextPresuppositionButtonAction)
         textPresuppositionResetVC?.image = NSImage(named: "KMImagePropertPanelTextDefaultMore")!
+        
+        self.colorBox.borderColor = NSColor(hex: "#DFE1E5")
     }
     
     func initData() {
@@ -237,10 +248,12 @@ class KMEditPDFTextPropertyViewController: NSViewController {
             }
             if textsAreas.count == 1 {
                 self.headerBox.isHidden = false
-                self.fontTitleLabel.isHidden = false
+                self.imageViewHeightConstraint.constant = 88
+                self.textPresuppositionTopContstraint.constant = 152
             } else if textsAreas.count > 1 {
                 self.headerBox.isHidden = true
-                self.fontTitleLabel.isHidden = true
+                self.imageViewHeightConstraint.constant = 0
+                self.textPresuppositionTopContstraint.constant = 50
             }
             
             self.refreshSelectAreaProperty()
@@ -253,13 +266,18 @@ class KMEditPDFTextPropertyViewController: NSViewController {
             if areas is CPDFEditTextArea  {
                 let sizeString = "\(abs(self.listView.editingSelectionFontSize()))"
                 let fontName: String = self.listView.editingSelectionFontName() ?? "Helvetica"
-
+                let alignment = self.listView.editingSelectionAlignment()
+                var color = self.listView.editingSelectionFontColor() ?? NSColor.black
+                
                 self.updateTextPresupposition(fontName: fontName, size: CGFloat(Float(sizeString)!), needChangeListView: false)
                 
-                self.currentColor = self.listView.editingSelectionFontColor() ?? NSColor.black
-                NSColorPanel.shared.color = self.currentColor
-                self.fontColorButton.image = self.swatchWithColor(color: self.currentColor, size: NSSize(width: 20, height: 20))
-                self.alignment = self.listView.editingSelectionAlignment()
+                self.currentColor = color
+                NSColorPanel.shared.color = color
+                self.fontColorButton.image = self.swatchWithColor(color: color, size: NSSize(width: 20, height: 20))
+                
+                self.alignment = alignment
+                self.selectAlignment(alignment: alignment)
+                
                 self.updatePreviewImage()
             }
         }
@@ -322,17 +340,39 @@ extension KMEditPDFTextPropertyViewController {
     }
     
     @objc func leftAlignmentAction() {
+        self.leftAlignmentVC?.state = .Sel
+        self.rightAlignmentVC?.state = .Norm
+        self.centerAlignmentVC?.state = .Norm
         self.updateAlignment(alignment: .left)
     }
     
     @objc func centerAlignmentAction() {
+        self.leftAlignmentVC?.state = .Norm
+        self.rightAlignmentVC?.state = .Norm
+        self.centerAlignmentVC?.state = .Sel
         self.updateAlignment(alignment: .center)
     }
     
     @objc func rightAlignmentAction() {
+        self.leftAlignmentVC?.state = .Norm
+        self.rightAlignmentVC?.state = .Sel
+        self.centerAlignmentVC?.state = .Norm
         self.updateAlignment(alignment: .right)
     }
     
+    func selectAlignment(alignment: NSTextAlignment) {
+        switch alignment {
+        case .left:
+            self.leftAlignmentAction()
+        case .right:
+            self.rightAlignmentAction()
+        case .center:
+            self.centerAlignmentAction()
+        default:
+            self.leftAlignmentAction()
+        }
+    }
+    
     func updateAlignment(alignment: NSTextAlignment) {
         if self.alignment != alignment {
             if self.listView.editingAreas()?.count ?? 0 > 0 {
@@ -376,7 +416,7 @@ extension KMEditPDFTextPropertyViewController {
 extension KMEditPDFTextPropertyViewController: KMSelectPopButtonDelegate {
     func km_comboBoxSelectionDidChange(_ obj: KMDesignSelect) {
         if obj == textPresuppositionVC {
-            let model: NSDictionary = self.fetchFreeTextPropert()//CPDFAnnotationModel.defaultFreeTextPropert().object(at: obj.indexOfSelectedItem) as! NSDictionary
+            let model: NSDictionary = self.fetchFreeTextPropert(index: obj.indexOfSelectedItem)//CPDFAnnotationModel.defaultFreeTextPropert().object(at: obj.indexOfSelectedItem) as! NSDictionary
             let fontName: String = model["fontName"] as! String
             let size: CGFloat = CGFloat(Float(model["fontSize"] as! String)!)
             self.updateTextPresupposition(fontName: fontName, size: size)
@@ -386,12 +426,149 @@ extension KMEditPDFTextPropertyViewController: KMSelectPopButtonDelegate {
         } else if obj == fontSizeVC {
             let size = CGFloat(Float((obj.stringValue.replacingOccurrences(of: "pt", with: "")))!)
             self.updateFontSize(size: size)
+            self.updatePreviewImage()
         } else if obj == fontStyleVC {
             self.updateFontNameAndStyle(name: fontName, style: obj.stringValue)
         }
     }
 }
 
+//MARK: - TextPresupposition
+extension KMEditPDFTextPropertyViewController {
+    //MARK: 基本属性调整
+    func updateTextPresupposition(fontName: String, size: CGFloat, needChangeListView: Bool = true) {
+        let fontNameArray = fontName.components(separatedBy: "-")
+        var name = ""
+        var style = ""
+        if fontNameArray.count > 0 {
+            name = fontNameArray.first!
+        } else {
+            name = "Helvetica"
+        }
+        if fontNameArray.count == 2 {
+            style = fontNameArray.last!
+        } else {
+            style = "Regular"
+        }
+        self.updateFontNameAndStyle(name: name, style: style, needChangeListView: needChangeListView)
+        self.updateFontSize(size: size, needChangeListView: needChangeListView)
+        self.updatePreviewImage()
+    }
+    
+    func resetTextPresuppositionData() {
+        let model: NSDictionary = self.fetchDefaultFreeTextPropert()[textPresuppositionVC!.indexOfSelectedItem]
+        let fontName: String = model["fontName"] as! String
+        let size: CGFloat = CGFloat(Float(model["fontSize"] as! String)!)
+        self.updateTextPresupposition(fontName: fontName, size: size)
+        
+        //重置数据 需要把现有值设置到缓存内
+        self.reDefineTextPresuppositionData(redefine: false)
+    }
+    
+    func reDefineTextPresuppositionData(redefine: Bool = true) {
+        let fontName = self.fontName
+        let fontStyle = self.fontStyle
+        let fontSize = self.fontSize
+        let index = self.textPresuppositionVC?.indexOfSelectedItem
+        
+        var fontDic: [String: Any] = [:]
+        if fontStyle == "Regular" || fontStyle == "Roman" {
+            fontDic = ["fontName": fontName, "fontSize": fontSize.description, "redefine": redefine]
+        } else {
+            fontDic = ["fontName": "\(fontName)-\(fontStyle)", "fontSize": fontSize.description, "redefine": redefine]
+        }
+        
+        let userDefaults = UserDefaults.standard
+        switch index {
+        case 1:
+            userDefaults.set(fontDic, forKey: "CPDFFreeTextDefaultFontObjects_H1")
+        case 2:
+            userDefaults.set(fontDic, forKey: "CPDFFreeTextDefaultFontObjects_H2")
+        case 3:
+            userDefaults.set(fontDic, forKey: "CPDFFreeTextDefaultFontObjects_H3")
+        case 4:
+            userDefaults.set(fontDic, forKey: "CPDFFreeTextDefaultFontObjects_B1")
+        case 5:
+            userDefaults.set(fontDic, forKey: "CPDFFreeTextDefaultFontObjects_B2")
+        case 6:
+            userDefaults.set(fontDic, forKey: "CPDFFreeTextDefaultFontObjects_B3")
+        default:
+            break
+        }
+        userDefaults.synchronize()
+        
+        textPresuppositionVC?.addItems(withObjectValues: self.fetchTextPresuppositionArray())
+        textPresuppositionVC?.selectItem(at: textPresuppositionVC!.indexOfSelectedItem)
+    }
+    
+    func fetchFreeTextPropert(index: Int) -> NSDictionary {
+        var resultModel: NSDictionary = [:]
+        let userDefaults = UserDefaults.standard
+        switch index {
+        case 1:
+            resultModel = (userDefaults.object(forKey: "CPDFFreeTextDefaultFontObjects_H1") ?? [String: Any]()) as! NSDictionary
+        case 2:
+            resultModel = (userDefaults.object(forKey: "CPDFFreeTextDefaultFontObjects_H2") ?? [String: Any]()) as! NSDictionary
+        case 3:
+            resultModel = (userDefaults.object(forKey: "CPDFFreeTextDefaultFontObjects_H3") ?? [String: Any]()) as! NSDictionary
+        case 4:
+            resultModel = (userDefaults.object(forKey: "CPDFFreeTextDefaultFontObjects_B1") ?? [String: Any]()) as! NSDictionary
+        case 5:
+            resultModel = (userDefaults.object(forKey: "CPDFFreeTextDefaultFontObjects_B2") ?? [String: Any]()) as! NSDictionary
+        case 6:
+            resultModel = (userDefaults.object(forKey: "CPDFFreeTextDefaultFontObjects_B3") ?? [String: Any]()) as! NSDictionary
+        default:
+            resultModel = ["fontName": "Helvetica", "fontSize": "12", "redefine": false]
+            break
+        }
+        if resultModel.count == 0 {
+            resultModel = self.fetchDefaultFreeTextPropert()[index]
+        }
+        return resultModel
+    }
+    
+    func fetchDefaultFreeTextPropertArray() -> [NSDictionary] {
+        var resultArray: [NSDictionary] = []
+        resultArray.append(self.fetchFreeTextPropert(index: 0))
+        resultArray.append(self.fetchFreeTextPropert(index: 1))
+        resultArray.append(self.fetchFreeTextPropert(index: 2))
+        resultArray.append(self.fetchFreeTextPropert(index: 3))
+        resultArray.append(self.fetchFreeTextPropert(index: 4))
+        resultArray.append(self.fetchFreeTextPropert(index: 5))
+        resultArray.append(self.fetchFreeTextPropert(index: 6))
+        return resultArray
+    }
+    
+    func fetchTextPresuppositionArray() -> [String] {
+        var textPresuppositionArray: [String] = ["Customize", "H1 Headline", "H2 Title", "H3 Subtitle", "B1 Text", "B2 Small Text", "B3 Describtion"]
+        let defaultFreeTextPropertArray = self.fetchDefaultFreeTextPropertArray()
+        for index in 0...defaultFreeTextPropertArray.count - 1 {
+            let dic = defaultFreeTextPropertArray[index]
+            let string = textPresuppositionArray[index]
+            let redefine: Bool = dic["redefine"] as! Bool
+            if redefine {
+                textPresuppositionArray[index] = "*" + string
+            } else {
+                textPresuppositionArray[index] = string.replacingOccurrences(of: "*", with: "")
+            }
+        }
+        return textPresuppositionArray
+    }
+    
+    
+    
+    func fetchDefaultFreeTextPropert() -> [NSDictionary] {
+        return [["fontName": "Helvetica", "fontSize": "12", "redefine": false],
+                ["fontName": "Helvetica-Bold", "fontSize": "36", "redefine": false],
+                ["fontName": "Helvetica-Bold", "fontSize": "24", "redefine": false],
+                ["fontName": "Helvetica-Bold", "fontSize": "18", "redefine": false],
+                ["fontName": "Helvetica", "fontSize": "14", "redefine": false],
+                ["fontName": "Helvetica", "fontSize": "12", "redefine": false],
+                ["fontName": "Helvetica", "fontSize": "11", "redefine": false]]
+    }
+    
+}
+
 //MARK: - Private
 extension KMEditPDFTextPropertyViewController {
     //MARK: FormAears
@@ -604,135 +781,7 @@ extension KMEditPDFTextPropertyViewController {
         }
     }
     
-    //MARK: 基本属性调整
-    func updateTextPresupposition(fontName: String, size: CGFloat, needChangeListView: Bool = true) {
-        let fontNameArray = fontName.components(separatedBy: "-")
-        var name = ""
-        var style = ""
-        if fontNameArray.count > 0 {
-            name = fontNameArray.first!
-        } else {
-            name = "Helvetica"
-        }
-        if fontNameArray.count == 2 {
-            style = fontNameArray.last!
-        } else {
-            style = "Regular"
-        }
-        self.updateFontNameAndStyle(name: name, style: style, needChangeListView: needChangeListView)
-        self.updateFontSize(size: size, needChangeListView: needChangeListView)
-        self.updatePreviewImage()
-    }
-    
-    func resetTextPresuppositionData() {
-        let model: NSDictionary = self.fetchDefaultFreeTextPropert()[textPresuppositionVC!.indexOfSelectedItem]
-        let fontName: String = model["fontName"] as! String
-        let size: CGFloat = CGFloat(Float(model["fontSize"] as! String)!)
-        self.updateTextPresupposition(fontName: fontName, size: size)
-        
-        //重置数据 需要把现有值设置到缓存内
-        self.reDefineTextPresuppositionData()
-    }
-    
-    func reDefineTextPresuppositionData() {
-        let fontName = self.fontName
-        let fontStyle = self.fontStyle
-        let fontSize = self.fontSize
-        let index = self.textPresuppositionVC?.indexOfSelectedItem
-        
-        var fontDic: [String: String] = [:]
-        if fontStyle == "Regular" || fontStyle == "Roman" {
-            fontDic = ["fontName": fontName, "fontSize": fontSize.description]
-        } else {
-            fontDic = ["fontName": "\(fontName)-\(fontStyle)", "fontSize": fontSize.description]
-        }
-        
-        let userDefaults = UserDefaults.standard
-        switch index {
-        case 1:
-            userDefaults.set(fontDic, forKey: "CPDFFreeTextDefaultFontObjects_H1")
-        case 2:
-            userDefaults.set(fontDic, forKey: "CPDFFreeTextDefaultFontObjects_H2")
-        case 3:
-            userDefaults.set(fontDic, forKey: "CPDFFreeTextDefaultFontObjects_H3")
-        case 4:
-            userDefaults.set(fontDic, forKey: "CPDFFreeTextDefaultFontObjects_B1")
-        case 5:
-            userDefaults.set(fontDic, forKey: "CPDFFreeTextDefaultFontObjects_B2")
-        case 6:
-            userDefaults.set(fontDic, forKey: "CPDFFreeTextDefaultFontObjects_B3")
-        default:
-            break
-        }
-        userDefaults.synchronize()
-    }
-    
-    func fetchFreeTextPropert() -> NSDictionary {
-        let index = self.textPresuppositionVC?.indexOfSelectedItem ?? 0
-        let model: NSDictionary = self.fetchDefaultFreeTextPropert()[index]
-        var resultModel: NSDictionary = [:]
-        let userDefaults = UserDefaults.standard
-        switch index {
-        case 1:
-            resultModel = (userDefaults.object(forKey: "CPDFFreeTextDefaultFontObjects_H1") ?? [String: Any]()) as! NSDictionary
-        case 2:
-            resultModel = (userDefaults.object(forKey: "CPDFFreeTextDefaultFontObjects_H2") ?? [String: Any]()) as! NSDictionary
-        case 3:
-            resultModel = (userDefaults.object(forKey: "CPDFFreeTextDefaultFontObjects_H3") ?? [String: Any]()) as! NSDictionary
-        case 4:
-            resultModel = (userDefaults.object(forKey: "CPDFFreeTextDefaultFontObjects_B1") ?? [String: Any]()) as! NSDictionary
-        case 5:
-            resultModel = (userDefaults.object(forKey: "CPDFFreeTextDefaultFontObjects_B2") ?? [String: Any]()) as! NSDictionary
-        case 6:
-            resultModel = (userDefaults.object(forKey: "CPDFFreeTextDefaultFontObjects_B3") ?? [String: Any]()) as! NSDictionary
-        default:
-            break
-        }
-        if resultModel.count == 0 {
-            resultModel = model
-        }
-        return resultModel
-    }
-    
-    func fetchDefaultFreeTextPropert() -> [NSDictionary] {
-        return [["fontName": "Helvetica", "fontSize": "12"],
-                ["fontName": "Helvetica-Bold", "fontSize": "36"],
-                ["fontName": "Helvetica-Bold", "fontSize": "24"],
-                ["fontName": "Helvetica-Bold", "fontSize": "18"],
-                ["fontName": "Helvetica", "fontSize": "14"],
-                ["fontName": "Helvetica", "fontSize": "12"],
-                ["fontName": "Helvetica", "fontSize": "11"]]
-    }
-    
-//    - (void)updateCurrentDefaultFont:(NSMenuItem *)item {
-//        if (item.tag == 0) {
-//            NSDictionary *newdic = @{@"fontName":self.annotationModel.fontName,@"fontSize":[NSString stringWithFormat:@"%.f",self.annotationModel.fontSize]};
-//            switch (self.defaultPopUpButton.indexOfSelectedItem) {
-//                case 1:
-//                    [[NSUserDefaults standardUserDefaults] setObject:newdic forKey:@"CPDFFreeTextDefaultFontObjects_H1"];
-//                    break;
-//                case 2:
-//                    [[NSUserDefaults standardUserDefaults] setObject:newdic forKey:@"CPDFFreeTextDefaultFontObjects_H2"];
-//                    break;
-//                case 3:
-//                    [[NSUserDefaults standardUserDefaults] setObject:newdic forKey:@"CPDFFreeTextDefaultFontObjects_H3"];
-//                    break;
-//                case 4:
-//                    [[NSUserDefaults standardUserDefaults] setObject:newdic forKey:@"CPDFFreeTextDefaultFontObjects_B1"];
-//                    break;
-//                case 5:
-//                    [[NSUserDefaults standardUserDefaults] setObject:newdic forKey:@"CPDFFreeTextDefaultFontObjects_B2"];
-//                    break;
-//                case 6:
-//                    [[NSUserDefaults standardUserDefaults] setObject:newdic forKey:@"CPDFFreeTextDefaultFontObjects_B3"];
-//                    break;
-//                default:
-//                    break;
-//            }
-//            [self updateFontView];
-//        }
-//    }
-    
+
     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

@@ -18,6 +18,8 @@
                 <outlet property="areasVerticalButton" destination="hBI-Pz-UIo" id="gqf-pa-cei"/>
                 <outlet property="areasVerticalCenterButton" destination="Qz5-84-11x" id="v4u-lb-qqM"/>
                 <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"/>
                 <outlet property="fontColorButton" destination="KRu-kj-Nkf" id="Jpy-RT-33W"/>
                 <outlet property="fontContentView" destination="LHG-XG-Y6G" id="Jjo-I3-Qjb"/>
                 <outlet property="fontCustomColorButton" destination="Rrw-k0-Lul" id="GpU-DA-0uw"/>
@@ -27,36 +29,39 @@
                 <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="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="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="textPresuppositionBox" destination="Pd8-gf-nbc" id="sMR-ru-581"/>
+                <outlet property="textPresuppositionTopContstraint" destination="eXm-YW-Pwj" id="pUO-ce-FC5"/>
                 <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="323" height="559"/>
+            <rect key="frame" x="0.0" y="0.0" width="260" height="559"/>
             <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="323" height="559"/>
+                <rect key="frame" x="0.0" y="0.0" width="260" height="559"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
                     <view id="TEL-xs-Bvc">
-                        <rect key="frame" x="0.0" y="0.0" width="308" height="544"/>
+                        <rect key="frame" x="0.0" y="0.0" width="260" height="559"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <box title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="UXh-hG-Hue">
-                                <rect key="frame" x="13" y="394" width="282" height="120"/>
+                            <box titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="UXh-hG-Hue">
+                                <rect key="frame" x="13" y="419" width="234" height="94"/>
                                 <view key="contentView" id="ZNj-I9-Lej">
-                                    <rect key="frame" x="4" y="5" width="274" height="112"/>
+                                    <rect key="frame" x="4" y="5" width="226" height="86"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Nlt-O1-sL5">
-                                            <rect key="frame" x="0.0" y="0.0" width="274" height="112"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="226" height="86"/>
                                             <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="HxI-Jj-N8n"/>
                                         </imageView>
                                     </subviews>
@@ -68,11 +73,11 @@
                                     </constraints>
                                 </view>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="114" id="QxJ-yS-QZJ"/>
+                                    <constraint firstAttribute="height" constant="88" id="QxJ-yS-QZJ"/>
                                 </constraints>
                             </box>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TmC-Oc-Dxd">
-                                <rect key="frame" x="8" y="522" width="30" height="16"/>
+                                <rect key="frame" x="14" y="527" 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"/>
@@ -80,9 +85,9 @@
                                 </textFieldCell>
                             </textField>
                             <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="USr-DR-WQu">
-                                <rect key="frame" x="16" y="57" width="276" height="114"/>
+                                <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="276" height="114"/>
+                                    <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">
@@ -94,10 +99,10 @@
                                             </textFieldCell>
                                         </textField>
                                         <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="acp-D4-gVa">
-                                            <rect key="frame" x="0.0" y="68" width="25" height="25"/>
+                                            <rect key="frame" x="0.0" y="58" width="32" height="32"/>
                                             <constraints>
-                                                <constraint firstAttribute="width" constant="25" id="mMs-rj-rKQ"/>
-                                                <constraint firstAttribute="height" constant="25" id="u0u-dZ-DNY"/>
+                                                <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"/>
@@ -108,10 +113,10 @@
                                             </connections>
                                         </button>
                                         <button verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="Qz5-84-11x">
-                                            <rect key="frame" x="35" y="68" width="25" height="25"/>
+                                            <rect key="frame" x="42" y="58" width="32" height="32"/>
                                             <constraints>
-                                                <constraint firstAttribute="width" constant="25" id="KnD-WS-8DZ"/>
-                                                <constraint firstAttribute="height" constant="25" id="OBn-jF-CfL"/>
+                                                <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"/>
@@ -122,10 +127,10 @@
                                             </connections>
                                         </button>
                                         <button verticalHuggingPriority="750" tag="2" translatesAutoresizingMaskIntoConstraints="NO" id="t4W-uZ-nPR">
-                                            <rect key="frame" x="70" y="68" width="25" height="25"/>
+                                            <rect key="frame" x="84" y="58" width="32" height="32"/>
                                             <constraints>
-                                                <constraint firstAttribute="width" constant="25" id="EY4-HU-YIz"/>
-                                                <constraint firstAttribute="height" constant="25" id="xr8-ce-hRY"/>
+                                                <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"/>
@@ -136,10 +141,10 @@
                                             </connections>
                                         </button>
                                         <button verticalHuggingPriority="750" tag="3" translatesAutoresizingMaskIntoConstraints="NO" id="y5m-ee-R1a">
-                                            <rect key="frame" x="0.0" y="33" width="25" height="25"/>
+                                            <rect key="frame" x="0.0" y="16" width="32" height="32"/>
                                             <constraints>
-                                                <constraint firstAttribute="width" constant="25" id="9aC-ec-8bw"/>
-                                                <constraint firstAttribute="height" constant="25" id="jo1-zg-fdt"/>
+                                                <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"/>
@@ -150,10 +155,10 @@
                                             </connections>
                                         </button>
                                         <button verticalHuggingPriority="750" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="isu-vm-R7m">
-                                            <rect key="frame" x="35" y="33" width="25" height="25"/>
+                                            <rect key="frame" x="42" y="16" width="32" height="32"/>
                                             <constraints>
-                                                <constraint firstAttribute="height" constant="25" id="BKg-v6-j0q"/>
-                                                <constraint firstAttribute="width" constant="25" id="ssW-dB-RgM"/>
+                                                <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"/>
@@ -164,10 +169,10 @@
                                             </connections>
                                         </button>
                                         <button verticalHuggingPriority="750" tag="5" translatesAutoresizingMaskIntoConstraints="NO" id="Ws2-xO-B0m">
-                                            <rect key="frame" x="70" y="33" width="25" height="25"/>
+                                            <rect key="frame" x="84" y="16" width="32" height="32"/>
                                             <constraints>
-                                                <constraint firstAttribute="height" constant="25" id="RnH-NS-fif"/>
-                                                <constraint firstAttribute="width" constant="25" id="VC3-1z-Qwh"/>
+                                                <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"/>
@@ -178,10 +183,10 @@
                                             </connections>
                                         </button>
                                         <button verticalHuggingPriority="750" tag="7" translatesAutoresizingMaskIntoConstraints="NO" id="xc2-gE-xeo">
-                                            <rect key="frame" x="116" y="68" width="25" height="25"/>
+                                            <rect key="frame" x="133" y="58" width="32" height="32"/>
                                             <constraints>
-                                                <constraint firstAttribute="height" constant="25" id="Vhm-9y-REe"/>
-                                                <constraint firstAttribute="width" constant="25" id="VlK-EH-4UW"/>
+                                                <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"/>
@@ -192,16 +197,16 @@
                                             </connections>
                                         </button>
                                         <box horizontalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="6is-Sa-beb">
-                                            <rect key="frame" x="103" y="73" width="5" height="15"/>
+                                            <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="103" y="38" width="5" height="15"/>
+                                            <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="116" y="33" width="25" height="25"/>
+                                            <rect key="frame" x="137" y="16" width="32" height="32"/>
                                             <constraints>
-                                                <constraint firstAttribute="width" constant="25" id="tEW-7k-U0S"/>
-                                                <constraint firstAttribute="height" constant="25" id="y6V-4l-ziU"/>
+                                                <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"/>
@@ -213,13 +218,13 @@
                                         </button>
                                     </subviews>
                                     <constraints>
-                                        <constraint firstItem="xc2-gE-xeo" firstAttribute="leading" secondItem="6is-Sa-beb" secondAttribute="trailing" constant="10" id="3Um-Xv-g7A"/>
+                                        <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="5" id="93n-TF-Svf"/>
+                                        <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="5" id="Fnp-MC-v97"/>
+                                        <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"/>
@@ -230,7 +235,7 @@
                                         <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="10" id="n4v-TM-Hf2"/>
+                                        <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"/>
@@ -244,10 +249,10 @@
                                 </constraints>
                             </box>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="LHG-XG-Y6G">
-                                <rect key="frame" x="16" y="187" width="276" height="147"/>
+                                <rect key="frame" x="16" y="214" width="228" height="153"/>
                                 <subviews>
                                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2gN-hL-7Ez">
-                                        <rect key="frame" x="-2" y="117" width="30" height="20"/>
+                                        <rect key="frame" x="-2" y="125" width="30" height="20"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="20" id="Xp1-BT-pjJ"/>
                                         </constraints>
@@ -258,7 +263,7 @@
                                         </textFieldCell>
                                     </textField>
                                     <button hidden="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ae7-Z5-hap">
-                                        <rect key="frame" x="260" y="119" width="16" height="16"/>
+                                        <rect key="frame" x="212" y="127" width="16" height="16"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="16" id="DiF-Xr-bR1"/>
                                             <constraint firstAttribute="height" constant="16" id="buS-De-0SL"/>
@@ -268,14 +273,14 @@
                                             <font key="font" metaFont="system"/>
                                         </buttonCell>
                                     </button>
-                                    <box boxType="custom" cornerRadius="4" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="Dcy-0U-AoP">
-                                        <rect key="frame" x="209" y="5" width="67" height="32"/>
+                                    <box boxType="custom" cornerRadius="4" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="Dcy-0U-AoP">
+                                        <rect key="frame" x="170" y="5" width="58" height="32"/>
                                         <view key="contentView" id="IzU-Nm-4ib">
-                                            <rect key="frame" x="1" y="1" width="65" height="30"/>
+                                            <rect key="frame" x="1" y="1" width="56" height="30"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
                                                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Rrw-k0-Lul">
-                                                    <rect key="frame" x="37" y="5" width="20" height="20"/>
+                                                    <rect key="frame" x="32" y="5" width="20" height="20"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="20" id="PbZ-2N-epC"/>
                                                         <constraint firstAttribute="height" constant="20" id="RRU-pT-bQL"/>
@@ -289,7 +294,7 @@
                                                     </connections>
                                                 </button>
                                                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="KRu-kj-Nkf">
-                                                    <rect key="frame" x="8" y="5" width="20" height="20"/>
+                                                    <rect key="frame" x="4" y="5" width="20" height="20"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="20" id="8zk-Dk-Xu3"/>
                                                         <constraint firstAttribute="width" constant="20" id="Xoc-NP-7or"/>
@@ -301,9 +306,9 @@
                                                 </button>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstItem="KRu-kj-Nkf" firstAttribute="leading" secondItem="IzU-Nm-4ib" secondAttribute="leading" constant="8" id="OLR-ed-iLN"/>
-                                                <constraint firstAttribute="trailing" secondItem="Rrw-k0-Lul" secondAttribute="trailing" constant="8" id="TzE-0o-W3B"/>
-                                                <constraint firstItem="Rrw-k0-Lul" firstAttribute="leading" secondItem="KRu-kj-Nkf" secondAttribute="trailing" constant="9" id="kov-FV-xBv"/>
+                                                <constraint firstItem="KRu-kj-Nkf" firstAttribute="leading" secondItem="IzU-Nm-4ib" secondAttribute="leading" constant="4" id="OLR-ed-iLN"/>
+                                                <constraint firstAttribute="trailing" secondItem="Rrw-k0-Lul" secondAttribute="trailing" constant="4" id="TzE-0o-W3B"/>
+                                                <constraint firstItem="Rrw-k0-Lul" firstAttribute="leading" secondItem="KRu-kj-Nkf" secondAttribute="trailing" constant="8" id="kov-FV-xBv"/>
                                                 <constraint firstItem="KRu-kj-Nkf" firstAttribute="centerY" secondItem="IzU-Nm-4ib" secondAttribute="centerY" id="lYq-0e-KwV"/>
                                             </constraints>
                                         </view>
@@ -352,9 +357,9 @@
                                         <color key="fillColor" name="findHighlightColor" catalog="System" colorSpace="catalog"/>
                                     </box>
                                     <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="UTw-eO-Jvo">
-                                        <rect key="frame" x="0.0" y="85" width="276" height="32"/>
+                                        <rect key="frame" x="0.0" y="85" width="228" height="32"/>
                                         <view key="contentView" id="ghS-RZ-q45">
-                                            <rect key="frame" x="0.0" y="0.0" width="276" height="32"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="228" height="32"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         </view>
                                         <constraints>
@@ -363,9 +368,9 @@
                                         <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" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="AHN-i5-WYB">
-                                        <rect key="frame" x="0.0" y="45" width="134" height="32"/>
+                                        <rect key="frame" x="0.0" y="45" width="110" height="32"/>
                                         <view key="contentView" id="wSa-eH-l8V">
-                                            <rect key="frame" x="0.0" y="0.0" width="134" height="32"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="110" height="32"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         </view>
                                         <constraints>
@@ -374,9 +379,9 @@
                                         <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" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="1Xr-1z-9Ud">
-                                        <rect key="frame" x="142" y="45" width="134" height="32"/>
+                                        <rect key="frame" x="118" y="45" width="110" height="32"/>
                                         <view key="contentView" id="4lc-HE-vlQ">
-                                            <rect key="frame" x="0.0" y="0.0" width="134" height="32"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="110" height="32"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         </view>
                                         <color key="fillColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -387,7 +392,7 @@
                                     <constraint firstItem="AHN-i5-WYB" firstAttribute="top" secondItem="UTw-eO-Jvo" secondAttribute="bottom" constant="8" id="4zE-jI-weA"/>
                                     <constraint firstItem="Dcy-0U-AoP" firstAttribute="centerY" secondItem="LB3-jb-9Hl" secondAttribute="centerY" id="5GY-CK-ao6"/>
                                     <constraint firstItem="2gN-hL-7Ez" firstAttribute="leading" secondItem="LHG-XG-Y6G" secondAttribute="leading" id="9RC-zj-BJv"/>
-                                    <constraint firstItem="2gN-hL-7Ez" firstAttribute="top" secondItem="LHG-XG-Y6G" secondAttribute="top" constant="10" id="9fv-Yt-Hkh"/>
+                                    <constraint firstItem="2gN-hL-7Ez" firstAttribute="top" secondItem="LHG-XG-Y6G" secondAttribute="top" constant="8" id="9fv-Yt-Hkh"/>
                                     <constraint firstItem="Ae7-Z5-hap" firstAttribute="centerY" secondItem="2gN-hL-7Ez" secondAttribute="centerY" id="BTJ-rI-dsN"/>
                                     <constraint firstAttribute="bottom" secondItem="LB3-jb-9Hl" secondAttribute="bottom" constant="5" id="Cn1-DH-y8f"/>
                                     <constraint firstItem="1Xr-1z-9Ud" firstAttribute="width" secondItem="AHN-i5-WYB" secondAttribute="width" id="FpD-Fa-wDR"/>
@@ -395,7 +400,7 @@
                                     <constraint firstItem="AHN-i5-WYB" firstAttribute="leading" secondItem="LHG-XG-Y6G" secondAttribute="leading" id="M8q-xI-5bC"/>
                                     <constraint firstItem="1Xr-1z-9Ud" firstAttribute="leading" secondItem="AHN-i5-WYB" secondAttribute="trailing" constant="8" id="OBC-J5-9oi"/>
                                     <constraint firstItem="1Xr-1z-9Ud" firstAttribute="height" secondItem="AHN-i5-WYB" secondAttribute="height" id="OZC-aX-22t"/>
-                                    <constraint firstItem="UTw-eO-Jvo" firstAttribute="top" secondItem="2gN-hL-7Ez" secondAttribute="bottom" id="OrX-Mj-Dhe"/>
+                                    <constraint firstItem="UTw-eO-Jvo" firstAttribute="top" secondItem="2gN-hL-7Ez" secondAttribute="bottom" constant="8" id="OrX-Mj-Dhe"/>
                                     <constraint firstAttribute="bottom" secondItem="rXF-2b-cRj" secondAttribute="bottom" constant="5" id="Rnu-BU-Rdd"/>
                                     <constraint firstAttribute="trailing" secondItem="1Xr-1z-9Ud" secondAttribute="trailing" id="a35-DP-G2B"/>
                                     <constraint firstItem="ywS-TH-Tgz" firstAttribute="leading" secondItem="LHG-XG-Y6G" secondAttribute="leading" id="avY-GJ-uxu"/>
@@ -409,18 +414,18 @@
                                 </constraints>
                             </customView>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="c0i-e8-xpM">
-                                <rect key="frame" x="16" y="350" width="276" height="32"/>
+                                <rect key="frame" x="16" y="375" 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="238" height="32"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="190" height="32"/>
                                         <view key="contentView" id="KBk-zu-GgC">
-                                            <rect key="frame" x="0.0" y="0.0" width="238" height="32"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="190" height="32"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         </view>
                                         <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" translatesAutoresizingMaskIntoConstraints="NO" id="cZ0-Lb-7rt">
-                                        <rect key="frame" x="246" y="0.0" width="30" height="32"/>
+                                        <rect key="frame" x="198" y="0.0" width="30" height="32"/>
                                         <view key="contentView" id="gIe-af-Xds">
                                             <rect key="frame" x="0.0" y="0.0" width="30" height="32"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -444,18 +449,18 @@
                             </customView>
                         </subviews>
                         <constraints>
-                            <constraint firstItem="c0i-e8-xpM" firstAttribute="top" secondItem="UXh-hG-Hue" secondAttribute="bottom" constant="16" id="1fW-ER-HuM"/>
                             <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="TmC-Oc-Dxd" firstAttribute="leading" secondItem="TEL-xs-Bvc" secondAttribute="leading" constant="10" id="RZG-rJ-gds"/>
+                            <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="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="16" id="hQa-vT-vVO"/>
-                            <constraint firstItem="TmC-Oc-Dxd" firstAttribute="top" secondItem="TEL-xs-Bvc" secondAttribute="top" constant="6" id="nda-0u-kpv"/>
+                            <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="10" id="uPx-kq-ARe"/>
+                            <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="c0i-e8-xpM" secondAttribute="trailing" constant="16" id="zl6-HQ-q2g"/>
                         </constraints>
@@ -471,7 +476,7 @@
                 <rect key="frame" x="-100" y="-100" width="15" height="559"/>
                 <autoresizingMask key="autoresizingMask"/>
             </scroller>
-            <point key="canvasLocation" x="-132.5" y="-21.5"/>
+            <point key="canvasLocation" x="-133" y="-21.5"/>
         </scrollView>
     </objects>
     <resources>