【OCToSwift】注释属性面板UI调整

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMAnnotationPropertiesViewController.m

@@ -147,7 +147,7 @@
         }
     } else if ([annotation isKindOfClass:[CPDFSignatureWidgetAnnotation class]] ||
                [annotation isKindOfClass:[CPDFSignatureAnnotation class]]) {
-        self.titleLabel.stringValue = NSLocalizedString(@"Signature", nil);
+//        self.titleLabel.stringValue = NSLocalizedString(@"Signature", nil);
     } else if ([annotation isKindOfClass:[CSelfSignAnnotation class]]) {
         CSelfSignAnnotation *newAnnotation = (CSelfSignAnnotation *)annotation;
         if (newAnnotation.annotationType == CAnnotationTypeSignFalse) {
@@ -166,7 +166,7 @@
             self.titleLabel.stringValue = NSLocalizedString(@"Date", nil);
         }
     } else {
-        self.titleLabel.stringValue = [annotation type].typeName;
+//        self.titleLabel.stringValue = [annotation type].typeName;
     }
     
     CPDFAnnotationModel *annotationModel = [[CPDFAnnotationModel alloc] initWithPDFAnnotations:_annotations];

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMAnnotationPropertiesViewController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22154" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22154"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -27,7 +27,7 @@
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="rxw-ZM-edB">
                     <rect key="frame" x="0.0" y="529" width="284" height="40"/>
                     <subviews>
-                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Mws-8l-JHx">
+                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Mws-8l-JHx">
                             <rect key="frame" x="14" y="13" width="256" height="15"/>
                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" id="mBB-CB-9jR">
                                 <font key="font" metaFont="systemBold" size="12"/>
@@ -46,7 +46,7 @@
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="B80-hQ-s7Z">
                     <rect key="frame" x="52" y="174" width="180" height="182"/>
                     <subviews>
-                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="UXe-E2-gz1">
+                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="UXe-E2-gz1">
                             <rect key="frame" x="-2" y="0.0" width="184" height="34"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="180" id="kUd-2I-6Is"/>

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22146" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22154" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22146"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22154"/>
         <capability name="System colors introduced in macOS 10.13" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -75,7 +75,7 @@
                                 </constraints>
                             </box>
                             <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TmC-Oc-Dxd">
-                                <rect key="frame" x="14" y="616" width="31" 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"/>

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/KMLinkAnnotationPropertyEmptyController.swift

@@ -34,6 +34,8 @@ class KMLinkAnnotationPropertyEmptyController: KMRightSideEmptyVC {
         self.titleLabel.frame = NSMakeRect(titleLabelX, NSHeight(self.view.bounds)-titleLabelH-titleLabelY, NSWidth(self.view.bounds)-titleLabelX, titleLabelH)
         self.titleLabel.autoresizingMask = [.width, .minYMargin]
         self.titleLabel.stringValue = NSLocalizedString("Link", comment: "")
+        self.titleLabel.font = NSFont.SFProTextSemiboldFont(14)
+        self.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         
         self.emptyImageView.image = NSImage(named: "KMImageNamePropertyLinkEmpty")
     }

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureWindowController.xib

@@ -526,7 +526,7 @@ Gw
                     <rect key="frame" x="0.0" y="48" width="468" height="182"/>
                 </customView>
                 <button focusRingType="none" translatesAutoresizingMaskIntoConstraints="NO" id="pqR-eZ-KlX">
-                    <rect key="frame" x="95" y="9" width="89" height="14"/>
+                    <rect key="frame" x="95" y="16" width="89" height="0.0"/>
                     <buttonCell key="cell" type="bevel" bezelStyle="regularSquare" imagePosition="left" focusRingType="none" inset="2" id="KL4-X1-mLd">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/StampList/KMAnnotationStampViewController.m

@@ -243,7 +243,9 @@
     self.stampStypeTwoButton.layer.backgroundColor = [NSColor clearColor].CGColor;
     self.stampStypeThreeButton.layer.backgroundColor = [NSColor clearColor].CGColor;
     
-    self.stampTitleLabel.font = [NSFont systemFontOfSize:14];
+    self.stampTitleLabel.font = [NSFont SFProTextSemiboldFont:14];
+    self.stampTitleLabel.textColor = [NSColor km_initWithHex:@"#252629" alpha:1];
+    
     [self.stampStypeoneButton setTitle:NSLocalizedString(@"Standard", nil)];
     [self.stampStypeTwoButton setTitle:NSLocalizedString(@"Dynamic", nil)];
     [self.stampStypeThreeButton setTitle:NSLocalizedString(@"Customize", nil)];

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/StampList/KMAnnotationStampViewController.xib

@@ -162,7 +162,7 @@
                     <rect key="frame" x="0.0" y="367" width="208" height="40"/>
                     <subviews>
                         <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Svb-0E-Z6j">
-                            <rect key="frame" x="8" y="12" width="45" height="17"/>
+                            <rect key="frame" x="14" y="12" width="45" height="17"/>
                             <textFieldCell key="cell" lineBreakMode="clipping" title="stamp" id="HNF-ga-GQb">
                                 <font key="font" metaFont="system" size="14"/>
                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -183,7 +183,7 @@
                     <constraints>
                         <constraint firstAttribute="height" constant="40" id="6Mo-Q3-gfZ"/>
                         <constraint firstAttribute="trailing" secondItem="52c-SM-Dav" secondAttribute="trailing" constant="10" id="Mcg-h1-RBW"/>
-                        <constraint firstItem="Svb-0E-Z6j" firstAttribute="leading" secondItem="HpP-MC-7Ak" secondAttribute="leading" constant="10" id="TcY-Rl-wOp"/>
+                        <constraint firstItem="Svb-0E-Z6j" firstAttribute="leading" secondItem="HpP-MC-7Ak" secondAttribute="leading" constant="16" id="TcY-Rl-wOp"/>
                         <constraint firstItem="Svb-0E-Z6j" firstAttribute="centerY" secondItem="HpP-MC-7Ak" secondAttribute="centerY" id="hlN-iz-wpI"/>
                         <constraint firstItem="52c-SM-Dav" firstAttribute="centerY" secondItem="Svb-0E-Z6j" secondAttribute="centerY" id="wyl-RA-dyf"/>
                     </constraints>

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/StampList/KMCustomizeStampViewController.xib

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22154" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22154"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -35,7 +36,7 @@
             <rect key="frame" x="0.0" y="0.0" width="378" height="343"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7mu-SC-Ah8">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7mu-SC-Ah8">
                     <rect key="frame" x="13" y="312" width="74" height="16"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" title="New Stamp" id="RMQ-Ju-Sp2">
                         <font key="font" usesAppearanceFont="YES"/>
@@ -49,11 +50,11 @@
                 <box title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="GKG-UM-Zfb">
                     <rect key="frame" x="27" y="237" width="324" height="46"/>
                     <view key="contentView" id="UNf-az-8zB">
-                        <rect key="frame" x="3" y="3" width="318" height="40"/>
+                        <rect key="frame" x="4" y="5" width="316" height="38"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mmA-gH-boM">
-                                <rect key="frame" x="0.0" y="3" width="159" height="37"/>
+                                <rect key="frame" x="0.0" y="3" width="158" height="35"/>
                                 <buttonCell key="cell" type="bevel" title="Text Stamp" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="Sha-gH-eRW">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -63,13 +64,13 @@
                                 </connections>
                             </button>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="h7i-TG-AHz">
-                                <rect key="frame" x="0.0" y="0.0" width="159" height="3"/>
+                                <rect key="frame" x="0.0" y="0.0" width="158" height="3"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="3" id="2fy-27-I8D"/>
                                 </constraints>
                             </customView>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ABE-yw-dWd">
-                                <rect key="frame" x="159" y="3" width="159" height="37"/>
+                                <rect key="frame" x="158" y="3" width="158" height="35"/>
                                 <buttonCell key="cell" type="bevel" title="Image Stamp" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="CXf-6q-PhP">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -98,9 +99,9 @@
                     </constraints>
                 </box>
                 <box borderType="none" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="lBO-ea-4YE">
-                    <rect key="frame" x="7" y="54" width="364" height="179"/>
+                    <rect key="frame" x="10" y="58" width="358" height="173"/>
                     <view key="contentView" id="N7Y-Q2-RaB">
-                        <rect key="frame" x="0.0" y="0.0" width="364" height="179"/>
+                        <rect key="frame" x="0.0" y="0.0" width="358" height="173"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     </view>
                     <constraints>
@@ -164,19 +165,19 @@ Gw
                 <box title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="Le4-nu-TzQ">
                     <rect key="frame" x="7" y="71" width="344" height="94"/>
                     <view key="contentView" id="4ZG-Hs-G9z">
-                        <rect key="frame" x="3" y="3" width="338" height="88"/>
+                        <rect key="frame" x="4" y="5" width="336" height="86"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="YdI-Zl-i7q">
-                                <rect key="frame" x="0.0" y="37" width="338" height="16"/>
+                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="YdI-Zl-i7q">
+                                <rect key="frame" x="0.0" y="37" width="336" height="16"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" alignment="center" title="Stamp Text" drawsBackground="YES" id="e8l-Wv-ls8">
                                     <font key="font" usesAppearanceFont="YES"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 </textFieldCell>
                             </textField>
-                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dKj-JI-wt8">
-                                <rect key="frame" x="0.0" y="24" width="338" height="13"/>
+                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dKj-JI-wt8">
+                                <rect key="frame" x="0.0" y="24" width="336" height="13"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" alignment="center" title="Stamp Text" drawsBackground="YES" id="AXj-OW-hjJ">
                                     <font key="font" metaFont="system" size="10"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -198,164 +199,164 @@ Gw
                         <constraint firstAttribute="height" constant="88" id="sk1-wk-VHC"/>
                     </constraints>
                 </box>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Jao-ve-9UP">
-                    <rect key="frame" x="8" y="44" width="40" height="16"/>
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Jao-ve-9UP">
+                    <rect key="frame" x="9" y="44" width="40" height="16"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" title="Stype" id="fiz-2U-bZt">
                         <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" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="jYD-a2-U4T">
-                    <rect key="frame" x="54" y="43" width="18" height="18"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="18" id="Hol-Qp-nn7"/>
-                        <constraint firstAttribute="height" constant="18" id="Pri-Le-exp"/>
-                    </constraints>
+                <button tag="1" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jYD-a2-U4T">
+                    <rect key="frame" x="55" y="43" width="18" height="18"/>
                     <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="KMImageNamePropertybarTextStamp1" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="a6O-pl-wiV">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="18" id="Hol-Qp-nn7"/>
+                        <constraint firstAttribute="height" constant="18" id="Pri-Le-exp"/>
+                    </constraints>
                     <connections>
                         <action selector="selectStyleButton_Click:" target="-2" id="psA-EZ-xcz"/>
                     </connections>
                 </button>
-                <button verticalHuggingPriority="750" tag="2" translatesAutoresizingMaskIntoConstraints="NO" id="tck-dO-dSW">
-                    <rect key="frame" x="80" y="43" width="18" height="18"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="18" id="kB0-5R-IUr"/>
-                        <constraint firstAttribute="width" constant="18" id="wI4-GT-Kpj"/>
-                    </constraints>
+                <button tag="2" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="tck-dO-dSW">
+                    <rect key="frame" x="81" y="43" width="18" height="18"/>
                     <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="KMImageNamePropertybarTextStamp2" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="6Lw-AF-Fxd">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="18" id="kB0-5R-IUr"/>
+                        <constraint firstAttribute="width" constant="18" id="wI4-GT-Kpj"/>
+                    </constraints>
                     <connections>
                         <action selector="selectStyleButton_Click:" target="-2" id="LfP-XX-yrS"/>
                     </connections>
                 </button>
-                <button verticalHuggingPriority="750" tag="3" translatesAutoresizingMaskIntoConstraints="NO" id="6ZC-ge-vPv">
-                    <rect key="frame" x="106" y="43" width="18" height="18"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="18" id="D2A-cB-Wc6"/>
-                        <constraint firstAttribute="width" constant="18" id="e8O-WS-n9w"/>
-                    </constraints>
+                <button tag="3" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6ZC-ge-vPv">
+                    <rect key="frame" x="107" y="43" width="18" height="18"/>
                     <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="KMImageNamePropertybarTextStamp3" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="fK5-JI-jcT">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="18" id="D2A-cB-Wc6"/>
+                        <constraint firstAttribute="width" constant="18" id="e8O-WS-n9w"/>
+                    </constraints>
                     <connections>
                         <action selector="selectStyleButton_Click:" target="-2" id="joo-Fp-Ivh"/>
                     </connections>
                 </button>
-                <button verticalHuggingPriority="750" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="KYW-Dy-lC0">
-                    <rect key="frame" x="132" y="43" width="18" height="18"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="18" id="CW0-gE-7qt"/>
-                        <constraint firstAttribute="width" constant="18" id="iEb-kr-yZI"/>
-                    </constraints>
+                <button tag="4" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="KYW-Dy-lC0">
+                    <rect key="frame" x="133" y="43" width="18" height="18"/>
                     <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="KMImageNamePropertybarTextStamp4" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="zs1-iq-ifc">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="18" id="CW0-gE-7qt"/>
+                        <constraint firstAttribute="width" constant="18" id="iEb-kr-yZI"/>
+                    </constraints>
                     <connections>
                         <action selector="selectStyleButton_Click:" target="-2" id="KMO-Vw-ePY"/>
                     </connections>
                 </button>
-                <button verticalHuggingPriority="750" tag="5" translatesAutoresizingMaskIntoConstraints="NO" id="pMv-wo-uq1">
-                    <rect key="frame" x="158" y="43" width="18" height="18"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="18" id="gjw-3g-7HE"/>
-                        <constraint firstAttribute="height" constant="18" id="yPS-VV-6iA"/>
-                    </constraints>
+                <button tag="5" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="pMv-wo-uq1">
+                    <rect key="frame" x="159" y="43" width="18" height="18"/>
                     <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="KMImageNamePropertybarTextStamp5" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="dcQ-ZV-HWp">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="18" id="gjw-3g-7HE"/>
+                        <constraint firstAttribute="height" constant="18" id="yPS-VV-6iA"/>
+                    </constraints>
                     <connections>
                         <action selector="selectStyleButton_Click:" target="-2" id="9JK-d2-ycT"/>
                     </connections>
                 </button>
-                <button verticalHuggingPriority="750" tag="6" translatesAutoresizingMaskIntoConstraints="NO" id="ZE8-gp-HVS">
-                    <rect key="frame" x="184" y="43" width="18" height="18"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="18" id="0Qs-xh-5ae"/>
-                        <constraint firstAttribute="width" constant="18" id="f7L-ko-tbI"/>
-                    </constraints>
+                <button tag="6" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZE8-gp-HVS">
+                    <rect key="frame" x="185" y="43" width="18" height="18"/>
                     <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="KMImageNamePropertybarTextStamp6" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="ezQ-yb-OFF">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="18" id="0Qs-xh-5ae"/>
+                        <constraint firstAttribute="width" constant="18" id="f7L-ko-tbI"/>
+                    </constraints>
                     <connections>
                         <action selector="selectStyleButton_Click:" target="-2" id="Teg-nP-MkU"/>
                     </connections>
                 </button>
-                <button verticalHuggingPriority="750" tag="7" translatesAutoresizingMaskIntoConstraints="NO" id="jEA-O9-yI1">
-                    <rect key="frame" x="210" y="43" width="18" height="18"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="18" id="dYi-sN-ygR"/>
-                        <constraint firstAttribute="width" constant="18" id="m5C-iX-brh"/>
-                    </constraints>
+                <button tag="7" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jEA-O9-yI1">
+                    <rect key="frame" x="211" y="43" width="18" height="18"/>
                     <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="KMImageNamePropertybarTextStamp7" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="fkp-2H-wkY">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="18" id="dYi-sN-ygR"/>
+                        <constraint firstAttribute="width" constant="18" id="m5C-iX-brh"/>
+                    </constraints>
                     <connections>
                         <action selector="selectStyleButton_Click:" target="-2" id="DFG-AH-BdA"/>
                     </connections>
                 </button>
-                <button verticalHuggingPriority="750" tag="8" translatesAutoresizingMaskIntoConstraints="NO" id="aKM-vb-hTB">
-                    <rect key="frame" x="236" y="43" width="18" height="18"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="18" id="HUT-AK-E1h"/>
-                        <constraint firstAttribute="width" constant="18" id="nld-Q6-xrS"/>
-                    </constraints>
+                <button tag="8" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aKM-vb-hTB">
+                    <rect key="frame" x="237" y="43" width="18" height="18"/>
                     <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="KMImageNamePropertybarTextStamp8" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="5w7-nZ-F4L">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="18" id="HUT-AK-E1h"/>
+                        <constraint firstAttribute="width" constant="18" id="nld-Q6-xrS"/>
+                    </constraints>
                     <connections>
                         <action selector="selectStyleButton_Click:" target="-2" id="CPh-Jk-6T7"/>
                     </connections>
                 </button>
-                <button verticalHuggingPriority="750" tag="9" translatesAutoresizingMaskIntoConstraints="NO" id="CKW-of-DHj">
-                    <rect key="frame" x="262" y="43" width="18" height="18"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="18" id="AVo-OH-rsc"/>
-                        <constraint firstAttribute="height" constant="18" id="tPN-c2-smp"/>
-                    </constraints>
+                <button tag="9" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="CKW-of-DHj">
+                    <rect key="frame" x="263" y="43" width="18" height="18"/>
                     <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="KMImageNamePropertybarTextStamp9" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="Xp8-It-uzA">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="18" id="AVo-OH-rsc"/>
+                        <constraint firstAttribute="height" constant="18" id="tPN-c2-smp"/>
+                    </constraints>
                     <connections>
                         <action selector="selectStyleButton_Click:" target="-2" id="ehj-ol-QhI"/>
                     </connections>
                 </button>
-                <button verticalHuggingPriority="750" tag="10" translatesAutoresizingMaskIntoConstraints="NO" id="HAt-8V-MUY">
-                    <rect key="frame" x="288" y="43" width="18" height="18"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="18" id="0hI-oI-fpk"/>
-                        <constraint firstAttribute="height" constant="18" id="FHx-HL-Iiw"/>
-                    </constraints>
+                <button tag="10" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="HAt-8V-MUY">
+                    <rect key="frame" x="289" y="43" width="18" height="18"/>
                     <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="KMImageNamePropertybarTextStamp10" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="Kb5-Om-0L7">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="18" id="0hI-oI-fpk"/>
+                        <constraint firstAttribute="height" constant="18" id="FHx-HL-Iiw"/>
+                    </constraints>
                     <connections>
                         <action selector="selectStyleButton_Click:" target="-2" id="8BW-2y-1JE"/>
                     </connections>
                 </button>
-                <button verticalHuggingPriority="750" tag="11" translatesAutoresizingMaskIntoConstraints="NO" id="MeJ-op-Krm">
-                    <rect key="frame" x="314" y="43" width="18" height="18"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="18" id="Q7Z-2Q-iZJ"/>
-                        <constraint firstAttribute="width" constant="18" id="dpO-hq-BoF"/>
-                    </constraints>
+                <button tag="11" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="MeJ-op-Krm">
+                    <rect key="frame" x="315" y="43" width="18" height="18"/>
                     <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="KMImageNamePropertybarTextStamp11" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="r8i-P4-NIE">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="18" id="Q7Z-2Q-iZJ"/>
+                        <constraint firstAttribute="width" constant="18" id="dpO-hq-BoF"/>
+                    </constraints>
                     <connections>
                         <action selector="selectStyleButton_Click:" target="-2" id="Upe-GD-2D0"/>
                     </connections>
@@ -365,28 +366,28 @@ Gw
                     <subviews>
                         <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="HL7-wb-c4f">
                             <rect key="frame" x="-2" y="-1" width="65" height="18"/>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="63" id="TPn-Tm-soW"/>
-                                <constraint firstAttribute="height" constant="16" id="fDV-3H-nGu"/>
-                            </constraints>
                             <buttonCell key="cell" type="check" title="Check" bezelStyle="regularSquare" imagePosition="left" inset="2" id="a30-41-iLy">
                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                 <font key="font" metaFont="system"/>
                             </buttonCell>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="63" id="TPn-Tm-soW"/>
+                                <constraint firstAttribute="height" constant="16" id="fDV-3H-nGu"/>
+                            </constraints>
                             <connections>
                                 <action selector="dateCheck_Click:" target="-2" id="cfu-dJ-mEO"/>
                             </connections>
                         </button>
                         <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="d71-o2-Nvh">
                             <rect key="frame" x="81" y="-1" width="65" height="18"/>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="63" id="okr-9i-Hyc"/>
-                                <constraint firstAttribute="height" constant="16" id="qLd-Zt-VKi"/>
-                            </constraints>
                             <buttonCell key="cell" type="check" title="Check" bezelStyle="regularSquare" imagePosition="left" inset="2" id="GLo-R9-Dxn">
                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                 <font key="font" metaFont="system"/>
                             </buttonCell>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="63" id="okr-9i-Hyc"/>
+                                <constraint firstAttribute="height" constant="16" id="qLd-Zt-VKi"/>
+                            </constraints>
                             <connections>
                                 <action selector="timeCheck_Click:" target="-2" id="kNo-zB-U3I"/>
                             </connections>
@@ -458,13 +459,13 @@ Gw
                     </connections>
                 </button>
                 <box borderType="none" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="Azq-FB-w2y">
-                    <rect key="frame" x="91" y="28" width="177" height="116"/>
+                    <rect key="frame" x="94" y="32" width="171" height="110"/>
                     <view key="contentView" id="zvE-ep-MW7">
-                        <rect key="frame" x="0.0" y="0.0" width="177" height="116"/>
+                        <rect key="frame" x="0.0" y="0.0" width="171" height="110"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Bww-Hi-1RW">
-                                <rect key="frame" x="78" y="53" width="20" height="20"/>
+                                <rect key="frame" x="75" y="50" width="20" height="20"/>
                                 <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="KMImageNameMainToolbarUp" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="bkX-sC-n4N">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -473,8 +474,8 @@ Gw
                                     <action selector="selectImageButton_Click:" target="-2" id="FgF-1R-KId"/>
                                 </connections>
                             </button>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZS6-14-hOj">
-                                <rect key="frame" x="70" y="32" width="37" height="16"/>
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZS6-14-hOj">
+                                <rect key="frame" x="67" y="29" width="37" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="Qmd-br-6tD">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>