【会员】用户界面改变邮箱UI调整

PDF Office/PDF Master.xcodeproj/project.pbxproj

@@ -1485,6 +1485,12 @@
 		ADAC0E4D2AD0F6A900FD4F52 /* KMEmailBindLoginWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADAC0E492AD0F6A900FD4F52 /* KMEmailBindLoginWindowController.xib */; };
 		ADAC0E4E2AD0F6A900FD4F52 /* KMEmailBindLoginWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADAC0E492AD0F6A900FD4F52 /* KMEmailBindLoginWindowController.xib */; };
 		ADAC0E4F2AD0F6A900FD4F52 /* KMEmailBindLoginWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADAC0E492AD0F6A900FD4F52 /* KMEmailBindLoginWindowController.xib */; };
+		ADAC0E522AD1512E00FD4F52 /* KMAccountInfoChangeEmailTipController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADAC0E502AD1512E00FD4F52 /* KMAccountInfoChangeEmailTipController.swift */; };
+		ADAC0E532AD1512E00FD4F52 /* KMAccountInfoChangeEmailTipController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADAC0E502AD1512E00FD4F52 /* KMAccountInfoChangeEmailTipController.swift */; };
+		ADAC0E542AD1512E00FD4F52 /* KMAccountInfoChangeEmailTipController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADAC0E502AD1512E00FD4F52 /* KMAccountInfoChangeEmailTipController.swift */; };
+		ADAC0E552AD1512E00FD4F52 /* KMAccountInfoChangeEmailTipController.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADAC0E512AD1512E00FD4F52 /* KMAccountInfoChangeEmailTipController.xib */; };
+		ADAC0E562AD1512E00FD4F52 /* KMAccountInfoChangeEmailTipController.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADAC0E512AD1512E00FD4F52 /* KMAccountInfoChangeEmailTipController.xib */; };
+		ADAC0E572AD1512E00FD4F52 /* KMAccountInfoChangeEmailTipController.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADAC0E512AD1512E00FD4F52 /* KMAccountInfoChangeEmailTipController.xib */; };
 		ADB1FE28297006DF00ED072D /* KMBatchWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADB1FE26297006DF00ED072D /* KMBatchWindowController.swift */; };
 		ADB1FE29297006DF00ED072D /* KMBatchWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADB1FE26297006DF00ED072D /* KMBatchWindowController.swift */; };
 		ADB1FE2A297006DF00ED072D /* KMBatchWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADB1FE26297006DF00ED072D /* KMBatchWindowController.swift */; };
@@ -4227,6 +4233,8 @@
 		ADAC0E432AC56B1300FD4F52 /* KMEmailBindLoginAlertView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMEmailBindLoginAlertView.xib; sourceTree = "<group>"; };
 		ADAC0E482AD0F6A900FD4F52 /* KMEmailBindLoginWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMEmailBindLoginWindowController.swift; sourceTree = "<group>"; };
 		ADAC0E492AD0F6A900FD4F52 /* KMEmailBindLoginWindowController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMEmailBindLoginWindowController.xib; sourceTree = "<group>"; };
+		ADAC0E502AD1512E00FD4F52 /* KMAccountInfoChangeEmailTipController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMAccountInfoChangeEmailTipController.swift; sourceTree = "<group>"; };
+		ADAC0E512AD1512E00FD4F52 /* KMAccountInfoChangeEmailTipController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMAccountInfoChangeEmailTipController.xib; sourceTree = "<group>"; };
 		ADB1FE26297006DF00ED072D /* KMBatchWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMBatchWindowController.swift; sourceTree = "<group>"; };
 		ADB1FE27297006DF00ED072D /* KMBatchWindowController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMBatchWindowController.xib; sourceTree = "<group>"; };
 		ADB1FE30297008E800ED072D /* KMBatchCollectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMBatchCollectionView.swift; sourceTree = "<group>"; };
@@ -7821,6 +7829,8 @@
 			children = (
 				ADF9ED2E29A8507400C4A943 /* KMAccountInfoView.swift */,
 				ADF9ED3229A850D200C4A943 /* KMAccountInfoView.xib */,
+				ADAC0E502AD1512E00FD4F52 /* KMAccountInfoChangeEmailTipController.swift */,
+				ADAC0E512AD1512E00FD4F52 /* KMAccountInfoChangeEmailTipController.xib */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -10185,6 +10195,7 @@
 				BB003031298D315E002DD1A0 /* KMPreferenceMarkupController.xib in Resources */,
 				BB1AEF3529F937A50048D179 /* PDF Master User Guide.pdf in Resources */,
 				BB7507EC29861C37002DBDB1 /* PasswordWindowController.xib in Resources */,
+				ADAC0E552AD1512E00FD4F52 /* KMAccountInfoChangeEmailTipController.xib in Resources */,
 				9F0CB49A29683E1000007028 /* KMPropertiesPanelTextSubVC.xib in Resources */,
 				ADB1FEB2297543CF00ED072D /* KMBatchSettingView.xib in Resources */,
 				89DB5DAA291B8DE70029624F /* KMOutlineEditViewController.xib in Resources */,
@@ -10472,6 +10483,7 @@
 				9F0CB49329683DEE00007028 /* KMPropertiesPanelLineSubVC.xib in Resources */,
 				BB8F454B295A9CDC0037EA22 /* KMHeaderFooterListController.xib in Resources */,
 				89E93EDC2999DA6D00F10F66 /* KMNoteFilterCollevtionViewItem.xib in Resources */,
+				ADAC0E562AD1512E00FD4F52 /* KMAccountInfoChangeEmailTipController.xib in Resources */,
 				BB69C95D299116FD0001A9B1 /* five_line_score.pdf in Resources */,
 				ADAC0E452AC56B1300FD4F52 /* KMEmailBindLoginAlertView.xib in Resources */,
 				8942F7FC2926089200389627 /* KMSignatureViewController.xib in Resources */,
@@ -10860,6 +10872,7 @@
 				9F221EDC29A9EC0900978A59 /* KMFillSignTextPanel.xib in Resources */,
 				ADC075F02987A47E006C752F /* KMBatchConverPDFCSVView.xib in Resources */,
 				BB69C95E299116FD0001A9B1 /* five_line_score.pdf in Resources */,
+				ADAC0E572AD1512E00FD4F52 /* KMAccountInfoChangeEmailTipController.xib in Resources */,
 				BB89725B294C559F0045787C /* KMWatermarkPropertyCreateController.xib in Resources */,
 				ADB1FE7C29752F1100ED072D /* KMBatchCompressView.xib in Resources */,
 				ADBC2D3C299F0A5A006280C8 /* KMPrintHelpViewController.xib in Resources */,
@@ -11464,6 +11477,7 @@
 				89E4E76E29657953002DBA6F /* KMStampManager.m in Sources */,
 				9F221ECF29A85D3700978A59 /* KMDesignBase.swift in Sources */,
 				ADB2D6F9294882AE0029D2B3 /* KMTextFieldStepperView.swift in Sources */,
+				ADAC0E522AD1512E00FD4F52 /* KMAccountInfoChangeEmailTipController.swift in Sources */,
 				9F72D2082994BDAF00DCACF1 /* KMNotificationVC.swift in Sources */,
 				BB4DD04B299B296500E80DF6 /* KMCloudPathControl.swift in Sources */,
 				AD867F9029D9554F00F00440 /* KMBOTAOutlineItem.swift in Sources */,
@@ -12012,6 +12026,7 @@
 				89752DB92936F9B9003FF08E /* NSButton+TitleColor.m in Sources */,
 				BB4EEF3D29764578003A3537 /* KMRedactPropertyContentView.swift in Sources */,
 				BB147024299DC0D100784A6A /* OIDResponseTypes.m in Sources */,
+				ADAC0E532AD1512E00FD4F52 /* KMAccountInfoChangeEmailTipController.swift in Sources */,
 				BB162E93294FFE020088E9D1 /* KMWatermarkModel.swift in Sources */,
 				F3A9DC7F294309D80074E5D2 /* CPDFListEditAnnotationViewController.m in Sources */,
 				AD9527CB295297B70039D2BC /* KMPrintModel.swift in Sources */,
@@ -12719,6 +12734,7 @@
 				ADBC375F29CC61E100D93208 /* KMReadModelView.swift in Sources */,
 				AD867F8829D94F5100F00440 /* KMBOTAOutlineView.swift in Sources */,
 				BB146FEF299DC0D100784A6A /* GTLRBatchResult.m in Sources */,
+				ADAC0E542AD1512E00FD4F52 /* KMAccountInfoChangeEmailTipController.swift in Sources */,
 				89E93ECA2999CEB200F10F66 /* KMNoteOutlineFilterViewController.m in Sources */,
 				9F8539C02943085A00DF644E /* KMBrowser.swift in Sources */,
 				BB4DD04D299B296500E80DF6 /* KMCloudPathControl.swift in Sources */,

PDF Office/PDF Master.xcodeproj/xcshareddata/xcschemes/PDF Master.xcscheme

@@ -31,7 +31,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

PDF Office/PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift

@@ -373,20 +373,20 @@ extension KMBrowserWindowController: KMToolbarRightViewDelegate {
     }
     
     func userInfoButtonAction(_ sender: NSButton) {
-        KMEmailBindAlertController.show(window: self.window!, type: .login)
-        return
+//        KMEmailBindAlertController.show(window: self.window!, type: .login)
+//        return
         
-//        if KMLightMemberManager.manager.isLogin() {
-//            Task { @MainActor in
-//                if await KMLightMemberManager.manager.canUseAdvanced(needNetworking: true) {
-//                    KMAccountInfoWindowController.show(window: self.window!)
-//                } else {
-//                    KMLoginWindowController.show(window: self.window!)
-//                }
-//            }
-//        } else {
-//            KMLoginWindowController.show(window: self.window!)
-//        }
+        if KMLightMemberManager.manager.isLogin() {
+            Task { @MainActor in
+                if await KMLightMemberManager.manager.canUseAdvanced(needNetworking: true) {
+                    KMAccountInfoWindowController.show(window: self.window!)
+                } else {
+                    KMLoginWindowController.show(window: self.window!)
+                }
+            }
+        } else {
+            KMLoginWindowController.show(window: self.window!)
+        }
     }
     
     func homeRefreshButtonAction(_ sender: NSButton?) {

PDF Office/PDF Master/Class/KMLightMember/Controller/AccountInfo/KMAccountInfoWindowController.swift

@@ -161,32 +161,41 @@ class KMAccountInfoWindowController: NSWindowController {
             let _ = KMComparativeTableViewController.show(window: NSApp.mainWindow ?? NSWindow(), .accountInfo)
 #endif
         }
+        
+        self.accountInfoView.changeEmailAction = { view in
+            accountInfoMainWindow?.endSheet(view.window!)
+            view.window?.close()
+            accountInfoController = nil
+            accountInfoMainWindow = nil
+            
+            KMEmailBindWindowController.show(window: NSWindow.currentWindow())
+        }
     }
     
     func reloadData() {
         let state = KMDMGPurchaseManager.manager.state
         if state == .unknow {
-            self.accountViewHeightConstraint.constant = 274
+            self.accountViewHeightConstraint.constant = 208
 #if VERSION_DMG
             if KMLightMemberManager.manager.existOrderInfo() {
-                self.accountViewHeightConstraint.constant = 274 + 44
+                self.accountViewHeightConstraint.constant = 208 + 44
             }
 #endif
         } else if state == .subscription ||
                     state == .trial {
-            self.accountViewHeightConstraint.constant = 411 - 60
+            self.accountViewHeightConstraint.constant = 345 - 60
 #if VERSION_DMG
             if KMLightMemberManager.manager.info.subscriptionInfoList[0].payType == 1 {
-                self.accountViewHeightConstraint.constant = 483 - 52 - 20
+                self.accountViewHeightConstraint.constant = 417 - 52 - 20
             } else {
-                self.accountViewHeightConstraint.constant = 483
+                self.accountViewHeightConstraint.constant = 417
             }
 #endif
         } else if state == .subscriptionExpired ||
                     state == .trialExpired {
-            self.accountViewHeightConstraint.constant = 483 - 52
+            self.accountViewHeightConstraint.constant = 417 - 52
 #if VERSION_DMG
-            self.accountViewHeightConstraint.constant = 483
+            self.accountViewHeightConstraint.constant = 417
 #endif
         }
         self.accountInfoView.purchaseState = state

PDF Office/PDF Master/Class/KMLightMember/Controller/AccountInfo/KMAccountInfoWindowController.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="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -18,16 +18,16 @@
         <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="F0z-JX-Cv5">
             <windowStyleMask key="styleMask" titled="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="196" y="240" width="440" height="483"/>
+            <rect key="contentRect" x="196" y="240" width="440" height="417"/>
             <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
             <view key="contentView" id="se5-gp-TjO">
-                <rect key="frame" x="0.0" y="0.0" width="440" height="483"/>
+                <rect key="frame" x="0.0" y="0.0" width="440" height="417"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="lEJ-0F-5yu" customClass="KMAccountInfoView" customModule="PDF_Master" customModuleProvider="target">
-                        <rect key="frame" x="0.0" y="0.0" width="440" height="483"/>
+                        <rect key="frame" x="0.0" y="0.0" width="440" height="417"/>
                         <constraints>
-                            <constraint firstAttribute="height" constant="483" id="AGy-5K-Lb1"/>
+                            <constraint firstAttribute="height" constant="417" id="AGy-5K-Lb1"/>
                         </constraints>
                     </customView>
                 </subviews>

PDF Office/PDF Master/Class/KMLightMember/Controller/AccountInfo/View/KMAccountInfoChangeEmailTipController.swift

@@ -0,0 +1,30 @@
+//
+//  KMAccountInfoChangeEmailTipController.swift
+//  PDF Master
+//
+//  Created by lizhe on 2023/10/7.
+//
+
+import Cocoa
+
+class KMAccountInfoChangeEmailTipController: NSViewController {
+    @IBOutlet weak var titleLabel: NSTextField!
+    var stringValue: String = ""
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        // Do view setup here.
+        self.view.backgroundColor(NSColor(red: 54/255, green: 56/255, blue: 59/255, alpha: 1))
+        
+        self.titleLabel.font = NSFont.SFProTextRegularFont(12);
+        self.titleLabel.textColor = NSColor.white;
+        
+//        self.titleLabel.stringValue = self.tipString;
+        
+        let string = self.stringValue//NSLocalizedString(self.tipString, comment: "")
+        let titleParagraphStyle = NSMutableParagraphStyle()
+        titleParagraphStyle.lineHeightMultiple = 1.32
+        titleParagraphStyle.alignment = .left
+        self.titleLabel.attributedStringValue = NSMutableAttributedString(string: string, attributes: [NSAttributedString.Key.paragraphStyle: titleParagraphStyle, .foregroundColor : NSColor.white, NSAttributedString.Key.font: NSFont.SFProTextRegularFont(12.0)])
+    }
+}

PDF Office/PDF Master/Class/KMLightMember/Controller/AccountInfo/View/KMAccountInfoChangeEmailTipController.xib

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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="22154"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="KMAccountInfoChangeEmailTipController" customModule="PDF_Master" customModuleProvider="target">
+            <connections>
+                <outlet property="titleLabel" destination="CGI-Bn-tio" id="Wdg-Se-iqK"/>
+                <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customView id="Hz6-mo-xeY">
+            <rect key="frame" x="0.0" y="0.0" width="352" height="32"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+            <subviews>
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="CGI-Bn-tio">
+                    <rect key="frame" x="14" y="8" width="324" height="16"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="320" id="h6L-Uy-c1a"/>
+                    </constraints>
+                    <textFieldCell key="cell" alignment="left" id="TTC-7U-Ua1">
+                        <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>
+            </subviews>
+            <constraints>
+                <constraint firstItem="CGI-Bn-tio" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="16" id="NxK-f3-xwH"/>
+                <constraint firstItem="CGI-Bn-tio" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="8" id="bMf-wy-Grg"/>
+                <constraint firstAttribute="trailing" secondItem="CGI-Bn-tio" secondAttribute="trailing" constant="16" id="iKJ-85-HDR"/>
+                <constraint firstAttribute="bottom" secondItem="CGI-Bn-tio" secondAttribute="bottom" constant="8" id="wAh-A7-waR"/>
+            </constraints>
+            <point key="canvasLocation" x="-1" y="66"/>
+        </customView>
+    </objects>
+</document>

PDF Office/PDF Master/Class/KMLightMember/Controller/AccountInfo/View/KMAccountInfoView.swift

@@ -12,6 +12,7 @@ typealias KMAccountInfoViewCancellationAction = (_ view: KMAccountInfoView) -> V
 typealias KMAccountInfoViewLogOutAction = (_ view: KMAccountInfoView) -> Void
 typealias KMAccountInfoViewPurchaseInfoAction = (_ view: KMAccountInfoView) -> Void
 typealias KMAccountInfoViewSubcriptionAction = (_ view: KMAccountInfoView) -> Void
+typealias KMAccountInfoViewChangeEmailAction = (_ view: KMAccountInfoView) -> Void
 
 class KMAccountInfoView: KMBaseXibView {
     @IBOutlet weak var titleLabel: NSTextField!
@@ -20,7 +21,6 @@ class KMAccountInfoView: KMBaseXibView {
     @IBOutlet weak var infoContentView: NSView!
     @IBOutlet weak var moreButton: NSButton!
     @IBOutlet weak var imageViewButton: NSButton!
-    @IBOutlet weak var accountDescribeLabel: NSTextField!
     @IBOutlet weak var accountLabel: NSTextField!
     @IBOutlet weak var closeBox: KMBox!
     @IBOutlet weak var statusTitleLabel: NSTextField!
@@ -34,17 +34,22 @@ class KMAccountInfoView: KMBaseXibView {
     @IBOutlet weak var statusContentView: NSView!
     @IBOutlet weak var purchaseInfoContentView: NSView!
     @IBOutlet weak var subscribeButtonContentView: NSView!
+    @IBOutlet weak var changeEemailButton: NSButton!
+    @IBOutlet weak var changeEmailHelpButton: NSButton!
     
     
     @IBOutlet weak var subscriptionInfoContentViewHeightConstraint: NSLayoutConstraint!
     @IBOutlet weak var subscriptionInfoContentViewTopConstraint: NSLayoutConstraint!
     @IBOutlet weak var lineViewTopConttraint: NSLayoutConstraint!
     
+    var popover: NSPopover?
+    
     var closeAction: KMAccountInfoViewCloseAction?
     var cancellationAction: KMAccountInfoViewCancellationAction?
     var logOutAction: KMAccountInfoViewLogOutAction?
     var purchaseInfoAction: KMAccountInfoViewPurchaseInfoAction?
     var subcriptionAction: KMAccountInfoViewSubcriptionAction?
+    var changeEmailAction: KMAccountInfoViewChangeEmailAction?
 
     var userInfo: KMLightMemberUserInfo? {
         didSet {
@@ -85,8 +90,8 @@ class KMAccountInfoView: KMBaseXibView {
         self.accountLabel.textColor = NSColor.km_init(hex: "#252629")
         self.accountLabel.font = NSFont.SFProTextRegularFont(14.0)
         
-        self.accountDescribeLabel.textColor = NSColor.km_init(hex: "#616469")
-        self.accountDescribeLabel.font = NSFont.SFProTextSemiboldFont(12.0)
+        self.changeEemailButton.font = NSFont.SFProTextRegularFont(12.0)
+        self.changeEemailButton.contentTintColor = NSColor.km_init(hex: "#1770F4")
         
         self.imageViewButton.backgroundColor(NSColor.km_init(hex: "#1770F4"))
         self.imageViewButton.font = NSFont.SFProTextSemiboldFont(28.0)
@@ -211,7 +216,6 @@ class KMAccountInfoView: KMBaseXibView {
         
         self.tagLabel.stringValue = NSLocalizedString("Auto-renewal", comment: "")
         self.statusTitleLabel.stringValue = NSLocalizedString("Status", comment: "")
-        self.accountDescribeLabel.stringValue = NSLocalizedString("Email Address", comment: "")
         self.titleLabel.stringValue = NSLocalizedString("Account Information", comment: "")
         
 //        self.logOutButton.stringValue = NSLocalizedString("Log Out", comment: "")
@@ -253,6 +257,12 @@ extension KMAccountInfoView {
     }
 }
 
+extension KMAccountInfoView {
+    override func mouseDown(with event: NSEvent) {
+        self.dismissPopview()
+    }
+}
+
 protocol KMAccountInfoViewAction {}
 extension KMAccountInfoView: KMAccountInfoViewAction {
     @IBAction func closeButtonAction(_ sender: Any) {
@@ -303,8 +313,63 @@ extension KMAccountInfoView: KMAccountInfoViewAction {
         callBack(self)
     }
     
+    @IBAction func changeEmailButtonAction(_ sender: Any) {
+        guard let callBack = changeEmailAction else { return }
+        
+        callBack(self)
+    }
+    
+    @IBAction func changeEmailHelpButtonAction(_ sender: NSButton) {
+        if self.popover == nil {
+            let pop = NSPopover()
+            self.popover = pop
+            let controller = KMAccountInfoChangeEmailTipController()
+            pop.contentViewController = controller
+            controller.stringValue = """
+    * Bind the current device's subscription benefits to the logged in member account.
+    * Once a member is attached, you can use advanced features on other devices by logging in to your member account.
+    """
+            pop.setValue(true, forKey: "shouldHideAnchor")
+            pop.show(relativeTo: NSMakeRect(0, -8, NSWidth(sender.bounds), NSHeight(sender.bounds)), of: sender, preferredEdge: .maxY)
+        } else {
+            self.dismissPopview()
+        }
+    }
+    
+    func dismissPopview() {
+        if self.popover != nil {
+            self.popover?.close()
+            self.popover = nil
+        }
+    }
 }
 
+//extension KMAccountInfoView {
+//    func dismissHelpTip() {
+//        
+//    }
+//    - (void)showHelpTip:(NSButton *)sender {
+//        if (self.popover) {
+//            [self dismissHelpTip];
+//            return;
+//        }
+//        
+//        NSPopover *pop = [[NSPopover alloc] init];
+//        self.popover = pop;
+//        KMSignatureHelpViewController *controller = [[KMSignatureHelpViewController alloc] init];
+//        pop.contentViewController = controller;
+//        controller.tipString = NSLocalizedString(@"Remove white background from images", nil);
+//        [pop setValue:@YES forKey:@"shouldHideAnchor"];
+//        
+//        [pop showRelativeToRect:NSMakeRect(0, -8, NSWidth(sender.bounds), NSHeight(sender.bounds)) ofView:sender preferredEdge:NSRectEdgeMaxY];
+//    }
+//
+//    - (void)dismissHelpTip {
+//        [self.popover close];
+//        self.popover = nil;
+//    }
+//}
+
 extension KMAccountInfoView: NSPopoverDelegate {
     func popoverWillClose(_ notification: Notification) {
         self.updateMoreButtonState(select: false)

PDF Office/PDF Master/Class/KMLightMember/Controller/AccountInfo/View/KMAccountInfoView.xib

@@ -1,15 +1,16 @@
 <?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="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="KMAccountInfoView" customModule="PDF_Master" customModuleProvider="target">
             <connections>
-                <outlet property="accountDescribeLabel" destination="xZx-LL-ESd" id="OdG-eF-d4T"/>
                 <outlet property="accountLabel" destination="RBL-0P-CFH" id="y2h-N0-OGa"/>
+                <outlet property="changeEemailButton" destination="IZO-0J-RHO" id="xja-Vj-gCy"/>
+                <outlet property="changeEmailHelpButton" destination="mMf-xV-ACr" id="e6x-vP-KVT"/>
                 <outlet property="closeBox" destination="fOd-XX-43K" id="zmz-yX-PWU"/>
                 <outlet property="closeButton" destination="Amy-OB-Mza" id="9R5-gn-vVI"/>
                 <outlet property="imageViewButton" destination="8gX-ju-NH5" id="zaq-tO-ADt"/>
@@ -64,7 +65,7 @@
                     </connections>
                 </button>
                 <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="wzN-5h-FkM">
-                    <rect key="frame" x="129" y="415" width="183" height="28"/>
+                    <rect key="frame" x="129" y="415" width="182" height="28"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="28" id="hwe-Db-IjI"/>
                     </constraints>
@@ -75,7 +76,7 @@
                     </textFieldCell>
                 </textField>
                 <customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ftd-cD-kBx">
-                    <rect key="frame" x="24" y="100" width="392" height="22"/>
+                    <rect key="frame" x="24" y="166" width="392" height="22"/>
                     <subviews>
                         <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5PX-6O-xK8">
                             <rect key="frame" x="0.0" y="0.0" width="112" height="22"/>
@@ -120,13 +121,13 @@
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="WMg-Cr-JJr">
-                    <rect key="frame" x="24" y="130" width="392" height="1"/>
+                    <rect key="frame" x="24" y="196" width="392" height="1"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="1" id="0iA-OZ-Odp"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="9AV-k7-nob">
-                    <rect key="frame" x="24" y="147" width="392" height="74"/>
+                    <rect key="frame" x="24" y="213" width="392" height="74"/>
                     <subviews>
                         <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QSv-Q9-wi2">
                             <rect key="frame" x="-2" y="58" width="43" height="16"/>
@@ -148,7 +149,7 @@
                                     </textFieldCell>
                                 </textField>
                                 <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hNa-H6-poH">
-                                    <rect key="frame" x="315" y="9" width="79" height="32"/>
+                                    <rect key="frame" x="317" y="9" width="77" height="32"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" id="bqx-Sm-ykO">
                                         <font key="font" usesAppearanceFont="YES"/>
                                         <string key="title">2023/01/25
@@ -158,10 +159,10 @@ Trial expires</string>
                                     </textFieldCell>
                                 </textField>
                                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="ABe-Ge-8Kf">
-                                    <rect key="frame" x="106" y="15" width="107" height="20"/>
+                                    <rect key="frame" x="106" y="15" width="106" height="20"/>
                                     <subviews>
                                         <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dUy-Xz-Fsv">
-                                            <rect key="frame" x="3" y="2" width="101" height="16"/>
+                                            <rect key="frame" x="3" y="2" width="100" height="16"/>
                                             <textFieldCell key="cell" lineBreakMode="clipping" title="  Auto-renewal  " id="NKq-uS-TUg">
                                                 <font key="font" metaFont="system"/>
                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -198,10 +199,10 @@ Trial expires</string>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="FM4-aP-xFU">
-                    <rect key="frame" x="24" y="241" width="392" height="158"/>
+                    <rect key="frame" x="24" y="307" width="392" height="92"/>
                     <subviews>
                         <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="t75-lC-90r">
-                            <rect key="frame" x="360" y="126" width="24" height="24"/>
+                            <rect key="frame" x="360" y="60" width="24" height="24"/>
                             <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="icon_btn_more" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="9Nf-kJ-lvd">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                 <font key="font" metaFont="system"/>
@@ -215,7 +216,7 @@ Trial expires</string>
                             </connections>
                         </button>
                         <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8gX-ju-NH5">
-                            <rect key="frame" x="172" y="86" width="48" height="48"/>
+                            <rect key="frame" x="16" y="20" width="48" height="48"/>
                             <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" alignment="center" imageScaling="proportionallyDown" inset="2" id="wRw-DB-pSM">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                 <font key="font" metaFont="system"/>
@@ -225,33 +226,51 @@ Trial expires</string>
                                 <constraint firstAttribute="width" constant="48" id="Ssr-id-8TX"/>
                             </constraints>
                         </button>
-                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xZx-LL-ESd">
-                            <rect key="frame" x="148" y="53" width="96" height="17"/>
-                            <textFieldCell key="cell" lineBreakMode="clipping" title="Email Address" id="XBY-1W-x0h">
-                                <font key="font" metaFont="system" size="14"/>
-                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                            </textFieldCell>
-                        </textField>
                         <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="RBL-0P-CFH">
-                            <rect key="frame" x="105" y="20" width="182" height="17"/>
+                            <rect key="frame" x="78" y="51" width="181" height="17"/>
                             <textFieldCell key="cell" lineBreakMode="clipping" title="pdfoffice@kdanmobile.com" id="jfQ-Wh-ayi">
                                 <font key="font" metaFont="system" size="14"/>
                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                             </textFieldCell>
                         </textField>
+                        <button translatesAutoresizingMaskIntoConstraints="NO" id="IZO-0J-RHO">
+                            <rect key="frame" x="80" y="20" width="87" height="16"/>
+                            <buttonCell key="cell" type="square" title="Change Email" bezelStyle="shadowlessSquare" alignment="center" imageScaling="proportionallyDown" inset="2" id="805-vm-k1x">
+                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                <font key="font" metaFont="system"/>
+                            </buttonCell>
+                            <connections>
+                                <action selector="changeEmailButtonAction:" target="-2" id="9dQ-fn-7Af"/>
+                            </connections>
+                        </button>
+                        <button translatesAutoresizingMaskIntoConstraints="NO" id="mMf-xV-ACr">
+                            <rect key="frame" x="171" y="20" width="16" height="16"/>
+                            <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="icon_info" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="VLx-iX-scO">
+                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                <font key="font" metaFont="system"/>
+                            </buttonCell>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="16" id="mG6-Ye-Gyi"/>
+                                <constraint firstAttribute="width" constant="16" id="ooP-aW-2FN"/>
+                            </constraints>
+                            <connections>
+                                <action selector="changeEmailHelpButtonAction:" target="-2" id="Rcd-NR-SQT"/>
+                            </connections>
+                        </button>
                     </subviews>
                     <constraints>
-                        <constraint firstAttribute="height" constant="158" id="0lq-B5-Tez"/>
-                        <constraint firstItem="xZx-LL-ESd" firstAttribute="top" secondItem="8gX-ju-NH5" secondAttribute="bottom" constant="16" id="ERt-u6-VYw"/>
-                        <constraint firstItem="RBL-0P-CFH" firstAttribute="centerX" secondItem="FM4-aP-xFU" secondAttribute="centerX" id="RZg-yb-gjj"/>
+                        <constraint firstAttribute="height" constant="92" id="0lq-B5-Tez"/>
+                        <constraint firstItem="mMf-xV-ACr" firstAttribute="leading" secondItem="IZO-0J-RHO" secondAttribute="trailing" constant="4" id="7gd-Za-6qW"/>
+                        <constraint firstItem="RBL-0P-CFH" firstAttribute="top" secondItem="8gX-ju-NH5" secondAttribute="top" id="7pB-ak-U1C"/>
+                        <constraint firstItem="RBL-0P-CFH" firstAttribute="leading" secondItem="8gX-ju-NH5" secondAttribute="trailing" constant="16" id="Iu5-qZ-1fb"/>
                         <constraint firstItem="8gX-ju-NH5" firstAttribute="top" secondItem="FM4-aP-xFU" secondAttribute="top" constant="24" id="VSC-8e-MWQ"/>
-                        <constraint firstAttribute="bottom" secondItem="RBL-0P-CFH" secondAttribute="bottom" constant="20" id="ajF-YF-BFf"/>
-                        <constraint firstItem="8gX-ju-NH5" firstAttribute="centerX" secondItem="FM4-aP-xFU" secondAttribute="centerX" id="g0Q-JS-crg"/>
-                        <constraint firstItem="xZx-LL-ESd" firstAttribute="centerX" secondItem="FM4-aP-xFU" secondAttribute="centerX" id="gqp-ht-R0Y"/>
+                        <constraint firstItem="IZO-0J-RHO" firstAttribute="bottom" secondItem="8gX-ju-NH5" secondAttribute="bottom" id="d2i-84-fpw"/>
+                        <constraint firstItem="8gX-ju-NH5" firstAttribute="leading" secondItem="FM4-aP-xFU" secondAttribute="leading" constant="16" id="dNd-Zm-zhM"/>
                         <constraint firstItem="t75-lC-90r" firstAttribute="top" secondItem="FM4-aP-xFU" secondAttribute="top" constant="8" id="nbD-nU-ucy"/>
                         <constraint firstAttribute="trailing" secondItem="t75-lC-90r" secondAttribute="trailing" constant="8" id="oRO-91-kmx"/>
+                        <constraint firstItem="mMf-xV-ACr" firstAttribute="centerY" secondItem="IZO-0J-RHO" secondAttribute="centerY" id="pfK-Md-2E4"/>
+                        <constraint firstItem="IZO-0J-RHO" firstAttribute="leading" secondItem="8gX-ju-NH5" secondAttribute="trailing" constant="16" id="uRg-dZ-UXh"/>
                     </constraints>
                 </customView>
             </subviews>
@@ -285,5 +304,6 @@ Trial expires</string>
     <resources>
         <image name="control_btn_icon_close" width="12" height="12"/>
         <image name="icon_btn_more" width="16" height="16"/>
+        <image name="icon_info" width="16" height="16"/>
     </resources>
 </document>

PDF Office/PDF Master/Class/KMLightMember/Source/KMLightMember.xcassets/icon_info.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "info.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PDF Office/PDF Master/Class/KMLightMember/Source/KMLightMember.xcassets/icon_info.imageset/info.pdf

@@ -0,0 +1,131 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+q
+1.000000 0.000000 -0.000000 1.000000 1.000000 1.000000 cm
+1.000000 1.000000 1.000000 scn
+14.000000 7.000000 m
+14.000000 3.134007 10.865993 0.000000 7.000000 0.000000 c
+3.134007 0.000000 0.000000 3.134007 0.000000 7.000000 c
+0.000000 10.865993 3.134007 14.000000 7.000000 14.000000 c
+10.865993 14.000000 14.000000 10.865993 14.000000 7.000000 c
+h
+f
+n
+Q
+15.000000 8.000000 m
+15.000000 4.134007 11.865993 1.000000 8.000000 1.000000 c
+4.134007 1.000000 1.000000 4.134007 1.000000 8.000000 c
+1.000000 11.865993 4.134007 15.000000 8.000000 15.000000 c
+11.865993 15.000000 15.000000 11.865993 15.000000 8.000000 c
+h
+W*
+n
+q
+1.000000 0.000000 -0.000000 1.000000 1.000000 1.000000 cm
+0.807843 0.815686 0.831373 scn
+13.000000 7.000000 m
+13.000000 3.686292 10.313708 1.000000 7.000000 1.000000 c
+7.000000 -1.000000 l
+11.418278 -1.000000 15.000000 2.581722 15.000000 7.000000 c
+13.000000 7.000000 l
+h
+7.000000 1.000000 m
+3.686291 1.000000 1.000000 3.686292 1.000000 7.000000 c
+-1.000000 7.000000 l
+-1.000000 2.581722 2.581722 -1.000000 7.000000 -1.000000 c
+7.000000 1.000000 l
+h
+1.000000 7.000000 m
+1.000000 10.313708 3.686291 13.000000 7.000000 13.000000 c
+7.000000 15.000000 l
+2.581722 15.000000 -1.000000 11.418278 -1.000000 7.000000 c
+1.000000 7.000000 l
+h
+7.000000 13.000000 m
+10.313708 13.000000 13.000000 10.313708 13.000000 7.000000 c
+15.000000 7.000000 l
+15.000000 11.418278 11.418278 15.000000 7.000000 15.000000 c
+7.000000 13.000000 l
+h
+f
+n
+Q
+Q
+q
+1.000000 0.000000 -0.000000 -1.000000 7.101562 12.000000 cm
+0.580392 0.596078 0.611765 scn
+0.370000 2.670077 m
+1.400000 2.670077 l
+1.660000 6.090078 l
+1.710000 7.580078 l
+0.060000 7.580078 l
+0.110000 6.090078 l
+0.370000 2.670077 l
+h
+0.890000 0.000077 m
+1.390000 0.000077 1.770000 0.370078 1.770000 0.890078 c
+1.770000 1.410078 1.390000 1.770078 0.890000 1.770078 c
+0.380000 1.770078 0.000000 1.410078 0.000000 0.890078 c
+0.000000 0.370078 0.370000 0.000077 0.890000 0.000077 c
+h
+f
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  1962
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 16.000000 16.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000002052 00000 n
+0000002075 00000 n
+0000002248 00000 n
+0000002322 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+2381
+%%EOF

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureHelpViewController.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>
@@ -17,9 +18,9 @@
             <rect key="frame" x="0.0" y="0.0" width="280" height="32"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="ske-oW-ZNH">
+                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="ske-oW-ZNH">
                     <rect key="frame" x="14" y="8" width="252" height="16"/>
-                    <textFieldCell key="cell" selectable="YES" alignment="center" title="Multiline Label" id="lBS-WA-vWs">
+                    <textFieldCell key="cell" selectable="YES" alignment="left" title="Multiline Label" id="lBS-WA-vWs">
                         <font key="font" usesAppearanceFont="YES"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -33,7 +34,7 @@
                 <constraint firstAttribute="bottom" secondItem="ske-oW-ZNH" secondAttribute="bottom" constant="8" id="eJH-sM-fmZ"/>
                 <constraint firstItem="ske-oW-ZNH" firstAttribute="centerY" secondItem="Hz6-mo-xeY" secondAttribute="centerY" id="ihX-Ho-Hjq"/>
             </constraints>
-            <point key="canvasLocation" x="0.0" y="154"/>
+            <point key="canvasLocation" x="67" y="175"/>
         </customView>
     </objects>
 </document>

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureWindowController.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">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22154" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22154"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -60,21 +60,17 @@
                 <subviews>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="j7L-83-3Ut">
                         <rect key="frame" x="372" y="16" width="80" height="32"/>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="80" id="47F-dt-Cbf"/>
-                            <constraint firstAttribute="height" constant="32" id="fom-33-oXa"/>
-                        </constraints>
                         <buttonCell key="cell" type="bevel" title="Cancel" bezelStyle="regularSquare" alignment="center" imageScaling="proportionallyDown" inset="2" id="YKQ-wq-7Ov">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
                         </buttonCell>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="80" id="47F-dt-Cbf"/>
+                            <constraint firstAttribute="height" constant="32" id="fom-33-oXa"/>
+                        </constraints>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="s0y-mf-WpS">
                         <rect key="frame" x="276" y="16" width="80" height="32"/>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="80" id="jKE-Mm-oCG"/>
-                            <constraint firstAttribute="height" constant="32" id="kRd-WV-Agv"/>
-                        </constraints>
                         <buttonCell key="cell" type="bevel" title="Cancel" bezelStyle="regularSquare" alignment="center" imageScaling="proportionallyDown" inset="2" id="76r-wf-8NT">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -82,8 +78,12 @@
 Gw
 </string>
                         </buttonCell>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="80" id="jKE-Mm-oCG"/>
+                            <constraint firstAttribute="height" constant="32" id="kRd-WV-Agv"/>
+                        </constraints>
                     </button>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8sI-6n-jcW">
+                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8sI-6n-jcW">
                         <rect key="frame" x="65" y="24" width="229" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Press &quot;esc&quot; to disable the Trackpad." id="m48-yd-Nf0">
@@ -92,7 +92,7 @@ Gw
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="uH2-qz-onx">
+                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="uH2-qz-onx">
                         <rect key="frame" x="14" y="363" width="106" height="16"/>
                         <textFieldCell key="cell" lineBreakMode="clipping" title="Create Signature" id="R8r-g6-5mF">
                             <font key="font" metaFont="system"/>
@@ -112,13 +112,13 @@ Gw
                     </box>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9qj-7Y-28D">
                         <rect key="frame" x="389" y="114" width="58" height="31"/>
-                        <constraints>
-                            <constraint firstAttribute="height" constant="24" id="8fV-sG-5BN"/>
-                        </constraints>
                         <buttonCell key="cell" type="bevel" title="Clear" bezelStyle="regularSquare" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Slu-mR-UaT">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
                         </buttonCell>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="24" id="8fV-sG-5BN"/>
+                        </constraints>
                     </button>
                     <view translatesAutoresizingMaskIntoConstraints="NO" id="7Kh-jc-ozX">
                         <rect key="frame" x="120" y="310" width="228" height="32"/>
@@ -129,42 +129,42 @@ Gw
                             </customView>
                             <button focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zxH-nH-20E">
                                 <rect key="frame" x="1" y="2" width="75" height="28"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="75" id="5fw-DM-t7M"/>
-                                    <constraint firstAttribute="height" constant="28" id="umN-Pq-xfD"/>
-                                </constraints>
                                 <buttonCell key="cell" type="bevel" title="Input" bezelStyle="regularSquare" alignment="center" focusRingType="none" inset="2" id="Q2e-EO-0NA">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="75" id="5fw-DM-t7M"/>
+                                    <constraint firstAttribute="height" constant="28" id="umN-Pq-xfD"/>
+                                </constraints>
                                 <connections>
                                     <action selector="inputButton_Click:" target="-2" id="Gox-Me-CDz"/>
                                 </connections>
                             </button>
                             <button focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7eG-Kv-VRY">
                                 <rect key="frame" x="77" y="2" width="75" height="28"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="75" id="kqF-YP-QFs"/>
-                                    <constraint firstAttribute="height" constant="28" id="wRH-X6-tX7"/>
-                                </constraints>
                                 <buttonCell key="cell" type="bevel" title="Drawing" bezelStyle="regularSquare" alignment="center" focusRingType="none" inset="2" id="Toj-Fb-0kU">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="75" id="kqF-YP-QFs"/>
+                                    <constraint firstAttribute="height" constant="28" id="wRH-X6-tX7"/>
+                                </constraints>
                                 <connections>
                                     <action selector="drawingButton_Click:" target="-2" id="XAv-BC-S1t"/>
                                 </connections>
                             </button>
                             <button focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zDE-1j-UZ0">
                                 <rect key="frame" x="152" y="2" width="75" height="28"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="28" id="UKO-LR-iZP"/>
-                                    <constraint firstAttribute="width" constant="75" id="tIO-gY-50J"/>
-                                </constraints>
                                 <buttonCell key="cell" type="bevel" title="Picture" bezelStyle="regularSquare" alignment="center" focusRingType="none" inset="2" id="eE7-su-W3Q">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="28" id="UKO-LR-iZP"/>
+                                    <constraint firstAttribute="width" constant="75" id="tIO-gY-50J"/>
+                                </constraints>
                                 <connections>
                                     <action selector="pictureButton_Click:" target="-2" id="uTH-7v-KwF"/>
                                 </connections>
@@ -403,9 +403,6 @@ Gw
                 </customView>
                 <popUpButton translatesAutoresizingMaskIntoConstraints="NO" id="OX0-YE-NCd">
                     <rect key="frame" x="-3" y="2" width="227" height="25"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="220" id="JP4-y0-kDU"/>
-                    </constraints>
                     <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="border" inset="2" pullsDown="YES" selectedItem="KZ5-Yj-30d" id="cMv-GJ-DlD">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="menu"/>
@@ -415,6 +412,9 @@ Gw
                             </items>
                         </menu>
                     </popUpButtonCell>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="220" id="JP4-y0-kDU"/>
+                    </constraints>
                     <connections>
                         <action selector="boxItemClicked_Font:" target="-2" id="p6t-kB-gXh"/>
                     </connections>
@@ -426,63 +426,63 @@ Gw
                             <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                         </customView>
-                        <button verticalHuggingPriority="750" tag="2" translatesAutoresizingMaskIntoConstraints="NO" id="odS-Dt-SYU">
+                        <button tag="2" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="odS-Dt-SYU">
                             <rect key="frame" x="6" y="6" width="20" height="20"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="20" id="ckO-mf-AQM"/>
-                                <constraint firstAttribute="width" constant="20" id="imT-GP-jUB"/>
-                            </constraints>
                             <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" inset="2" id="tYi-Qx-Cfp">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                 <font key="font" metaFont="system"/>
                             </buttonCell>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="20" id="ckO-mf-AQM"/>
+                                <constraint firstAttribute="width" constant="20" id="imT-GP-jUB"/>
+                            </constraints>
                             <connections>
                                 <action selector="colorTextButtonAction:" target="-2" id="HFo-SF-dh6"/>
                             </connections>
                         </button>
-                        <button verticalHuggingPriority="750" tag="3" translatesAutoresizingMaskIntoConstraints="NO" id="e39-bx-gfp">
+                        <button tag="3" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="e39-bx-gfp">
                             <rect key="frame" x="49" y="6" width="20" height="20"/>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="20" id="DJq-rz-FKF"/>
-                                <constraint firstAttribute="height" constant="20" id="Hou-uk-7Rf"/>
-                            </constraints>
                             <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" inset="2" id="X18-CH-zzp">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                 <font key="font" metaFont="system"/>
                             </buttonCell>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="20" id="DJq-rz-FKF"/>
+                                <constraint firstAttribute="height" constant="20" id="Hou-uk-7Rf"/>
+                            </constraints>
                             <connections>
                                 <action selector="colorTextButtonAction:" target="-2" id="C7P-qp-8Ge"/>
                             </connections>
                         </button>
-                        <button verticalHuggingPriority="750" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="e4f-rT-CLt">
+                        <button tag="4" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="e4f-rT-CLt">
                             <rect key="frame" x="92" y="6" width="20" height="20"/>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="20" id="hJ9-1Z-Gbu"/>
-                                <constraint firstAttribute="height" constant="20" id="sLz-wc-skg"/>
-                            </constraints>
                             <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" inset="2" id="E0z-ik-jIs">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                 <font key="font" metaFont="system"/>
                             </buttonCell>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="20" id="hJ9-1Z-Gbu"/>
+                                <constraint firstAttribute="height" constant="20" id="sLz-wc-skg"/>
+                            </constraints>
                             <connections>
                                 <action selector="colorTextButtonAction:" target="-2" id="ATk-Ve-irw"/>
                             </connections>
                         </button>
-                        <button verticalHuggingPriority="750" tag="5" translatesAutoresizingMaskIntoConstraints="NO" id="kZy-e9-ulI">
+                        <button tag="5" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="kZy-e9-ulI">
                             <rect key="frame" x="135" y="6" width="20" height="20"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="20" id="UCe-DC-za6"/>
-                                <constraint firstAttribute="width" constant="20" id="yhL-Rg-HED"/>
-                            </constraints>
                             <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" inset="2" id="uBd-Ud-rsU">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                 <font key="font" metaFont="system"/>
                             </buttonCell>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="20" id="UCe-DC-za6"/>
+                                <constraint firstAttribute="width" constant="20" id="yhL-Rg-HED"/>
+                            </constraints>
                             <connections>
                                 <action selector="colorTextButtonAction:" target="-2" id="sFI-Ga-w7g"/>
                             </connections>
                         </button>
-                        <button focusRingType="none" fixedFrame="YES" tag="6" translatesAutoresizingMaskIntoConstraints="NO" id="5Nn-1V-0B2" customClass="KMSignatureColorButton">
+                        <button focusRingType="none" tag="6" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5Nn-1V-0B2" customClass="KMSignatureColorButton">
                             <rect key="frame" x="204" y="8" width="24" height="24"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                             <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" imagePosition="only" alignment="center" focusRingType="none" imageScaling="proportionallyUpOrDown" inset="2" id="08c-rm-nye">
@@ -526,13 +526,13 @@ Gw
                 </customView>
                 <button focusRingType="none" translatesAutoresizingMaskIntoConstraints="NO" id="pqR-eZ-KlX">
                     <rect key="frame" x="93" y="7" width="91" height="18"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="89" id="qaA-aA-DPC"/>
-                    </constraints>
                     <buttonCell key="cell" type="check" title="Trackpad" bezelStyle="regularSquare" imagePosition="left" focusRingType="none" inset="2" id="KL4-X1-mLd">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="89" id="qaA-aA-DPC"/>
+                    </constraints>
                     <connections>
                         <action selector="trackpadButton_Click:" target="-2" id="UwP-WA-Gp6"/>
                     </connections>
@@ -544,63 +544,63 @@ Gw
                             <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                         </customView>
-                        <button verticalHuggingPriority="750" tag="2" translatesAutoresizingMaskIntoConstraints="NO" id="9Ne-g2-ewU">
+                        <button tag="2" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9Ne-g2-ewU">
                             <rect key="frame" x="6" y="6" width="20" height="20"/>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="20" id="Cqt-Xf-ufI"/>
-                                <constraint firstAttribute="height" constant="20" id="hfS-Dd-Oa4"/>
-                            </constraints>
                             <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" inset="2" id="v04-1X-7fD">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                 <font key="font" metaFont="system"/>
                             </buttonCell>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="20" id="Cqt-Xf-ufI"/>
+                                <constraint firstAttribute="height" constant="20" id="hfS-Dd-Oa4"/>
+                            </constraints>
                             <connections>
                                 <action selector="drawColorBtnClicked:" target="-2" id="ENg-K1-EWZ"/>
                             </connections>
                         </button>
-                        <button verticalHuggingPriority="750" tag="3" translatesAutoresizingMaskIntoConstraints="NO" id="3xQ-rA-xHD">
+                        <button tag="3" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3xQ-rA-xHD">
                             <rect key="frame" x="49" y="6" width="20" height="20"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="20" id="ygL-2c-5ad"/>
-                                <constraint firstAttribute="width" constant="20" id="zcU-qW-zPP"/>
-                            </constraints>
                             <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" inset="2" id="CEp-vA-9uH">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                 <font key="font" metaFont="system"/>
                             </buttonCell>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="20" id="ygL-2c-5ad"/>
+                                <constraint firstAttribute="width" constant="20" id="zcU-qW-zPP"/>
+                            </constraints>
                             <connections>
                                 <action selector="drawColorBtnClicked:" target="-2" id="oIc-A2-ohP"/>
                             </connections>
                         </button>
-                        <button verticalHuggingPriority="750" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="pWi-Op-4LW">
+                        <button tag="4" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="pWi-Op-4LW">
                             <rect key="frame" x="92" y="6" width="20" height="20"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="20" id="AQf-FY-og3"/>
-                                <constraint firstAttribute="width" constant="20" id="eLe-HZ-41R"/>
-                            </constraints>
                             <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" inset="2" id="pDN-dh-XhL">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                 <font key="font" metaFont="system"/>
                             </buttonCell>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="20" id="AQf-FY-og3"/>
+                                <constraint firstAttribute="width" constant="20" id="eLe-HZ-41R"/>
+                            </constraints>
                             <connections>
                                 <action selector="drawColorBtnClicked:" target="-2" id="FAV-DC-dMP"/>
                             </connections>
                         </button>
-                        <button verticalHuggingPriority="750" tag="5" translatesAutoresizingMaskIntoConstraints="NO" id="oMw-fF-4f3">
+                        <button tag="5" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="oMw-fF-4f3">
                             <rect key="frame" x="135" y="6" width="20" height="20"/>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="20" id="4IQ-W3-pIB"/>
-                                <constraint firstAttribute="height" constant="20" id="doC-ed-H4J"/>
-                            </constraints>
                             <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" inset="2" id="tkz-zD-rbd">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                 <font key="font" metaFont="system"/>
                             </buttonCell>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="20" id="4IQ-W3-pIB"/>
+                                <constraint firstAttribute="height" constant="20" id="doC-ed-H4J"/>
+                            </constraints>
                             <connections>
                                 <action selector="drawColorBtnClicked:" target="-2" id="ls7-fC-Dxu"/>
                             </connections>
                         </button>
-                        <button focusRingType="none" fixedFrame="YES" tag="6" translatesAutoresizingMaskIntoConstraints="NO" id="4aa-mx-SPE" customClass="KMSignatureColorButton">
+                        <button focusRingType="none" tag="6" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4aa-mx-SPE" customClass="KMSignatureColorButton">
                             <rect key="frame" x="204" y="8" width="24" height="24"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                             <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" imagePosition="only" alignment="center" focusRingType="none" imageScaling="proportionallyUpOrDown" inset="2" id="mn6-Rv-AIW">
@@ -624,9 +624,6 @@ Gw
                 </customView>
                 <popUpButton translatesAutoresizingMaskIntoConstraints="NO" id="Q8B-d8-1oI">
                     <rect key="frame" x="-3" y="2" width="86" height="25"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="79" id="7n6-WJ-Ktc"/>
-                    </constraints>
                     <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="border" inset="2" pullsDown="YES" selectedItem="kw7-v2-CTa" id="DJQ-d5-tKu">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="menu"/>
@@ -636,6 +633,9 @@ Gw
                             </items>
                         </menu>
                     </popUpButtonCell>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="79" id="7n6-WJ-Ktc"/>
+                    </constraints>
                     <connections>
                         <action selector="drawSizeBtnClicked:" target="-2" id="h4S-CH-L29"/>
                     </connections>
@@ -643,7 +643,7 @@ Gw
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="jzf-Rm-GNU">
                     <rect key="frame" x="0.0" y="208" width="468" height="22"/>
                     <subviews>
-                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="YDu-QC-l1V">
+                        <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="YDu-QC-l1V">
                             <rect key="frame" x="6" y="3" width="456" height="16"/>
                             <textFieldCell key="cell" selectable="YES" title="Multiline Label" id="pna-0D-8pK">
                                 <font key="font" usesAppearanceFont="YES"/>
@@ -715,7 +715,7 @@ DQ
                                 <constraint firstAttribute="height" constant="128" id="zPI-2s-bGk"/>
                             </constraints>
                         </customView>
-                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="OZz-hG-Yf2">
+                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="OZz-hG-Yf2">
                             <rect key="frame" x="179" y="16" width="111" height="17"/>
                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Select image file" id="prv-uQ-kZ4">
                                 <font key="font" metaFont="system" size="14"/>
@@ -740,27 +740,27 @@ DQ
                 </customView>
                 <button focusRingType="none" translatesAutoresizingMaskIntoConstraints="NO" id="0Ld-zN-h2r">
                     <rect key="frame" x="166" y="9" width="134" height="24"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="22" id="YfU-mu-Ywh"/>
-                    </constraints>
                     <buttonCell key="cell" type="check" title="Clear background" bezelStyle="regularSquare" imagePosition="left" focusRingType="none" inset="2" id="zLk-by-TV2">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="22" id="YfU-mu-Ywh"/>
+                    </constraints>
                     <connections>
                         <action selector="pictureClearBackBtnAction:" target="-2" id="gJ7-g7-CgB"/>
                     </connections>
                 </button>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zHh-uI-saB" customClass="KMCoverButton">
                     <rect key="frame" x="300" y="13" width="16" height="16"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="16" id="m0o-Qo-sWP"/>
-                        <constraint firstAttribute="height" constant="16" id="q8t-dW-imG"/>
-                    </constraints>
                     <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="03E-Gy-9TG">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="16" id="m0o-Qo-sWP"/>
+                        <constraint firstAttribute="height" constant="16" id="q8t-dW-imG"/>
+                    </constraints>
                 </button>
             </subviews>
             <constraints>