【会员】绑定登录界面调整

PDF Office/PDF Master.xcodeproj/project.pbxproj

@@ -1479,6 +1479,12 @@
 		ADAC0E442AC56B1300FD4F52 /* KMEmailBindLoginAlertView.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADAC0E432AC56B1300FD4F52 /* KMEmailBindLoginAlertView.xib */; };
 		ADAC0E452AC56B1300FD4F52 /* KMEmailBindLoginAlertView.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADAC0E432AC56B1300FD4F52 /* KMEmailBindLoginAlertView.xib */; };
 		ADAC0E462AC56B1300FD4F52 /* KMEmailBindLoginAlertView.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADAC0E432AC56B1300FD4F52 /* KMEmailBindLoginAlertView.xib */; };
+		ADAC0E4A2AD0F6A900FD4F52 /* KMEmailBindLoginWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADAC0E482AD0F6A900FD4F52 /* KMEmailBindLoginWindowController.swift */; };
+		ADAC0E4B2AD0F6A900FD4F52 /* KMEmailBindLoginWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADAC0E482AD0F6A900FD4F52 /* KMEmailBindLoginWindowController.swift */; };
+		ADAC0E4C2AD0F6A900FD4F52 /* KMEmailBindLoginWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADAC0E482AD0F6A900FD4F52 /* KMEmailBindLoginWindowController.swift */; };
+		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 */; };
 		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 */; };
@@ -4219,6 +4225,8 @@
 		ADAC0E392AC5587000FD4F52 /* KMEmailBindSuccessView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMEmailBindSuccessView.xib; sourceTree = "<group>"; };
 		ADAC0E3F2AC56B0100FD4F52 /* KMEmailBindLoginAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMEmailBindLoginAlertView.swift; sourceTree = "<group>"; };
 		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>"; };
 		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>"; };
@@ -6662,6 +6670,7 @@
 		ADAC0DCA2AC1500D00FD4F52 /* EmailBind */ = {
 			isa = PBXGroup;
 			children = (
+				ADAC0E472AD0F67400FD4F52 /* EmailBindLogin */,
 				ADAC0E2B2AC556AF00FD4F52 /* EmailBindSuccess */,
 				ADAC0E142AC51D7900FD4F52 /* EmailBindAlert */,
 				ADAC0DD32AC151C800FD4F52 /* View */,
@@ -6720,6 +6729,15 @@
 			path = View;
 			sourceTree = "<group>";
 		};
+		ADAC0E472AD0F67400FD4F52 /* EmailBindLogin */ = {
+			isa = PBXGroup;
+			children = (
+				ADAC0E482AD0F6A900FD4F52 /* KMEmailBindLoginWindowController.swift */,
+				ADAC0E492AD0F6A900FD4F52 /* KMEmailBindLoginWindowController.xib */,
+			);
+			path = EmailBindLogin;
+			sourceTree = "<group>";
+		};
 		ADB1FE21297005DF00ED072D /* Batch */ = {
 			isa = PBXGroup;
 			children = (
@@ -10144,6 +10162,7 @@
 				ADF1569729A62D31001D1018 /* KMLoginLeftImageView.xib in Resources */,
 				BB5DF1F42959C9F00025CDA1 /* KMHeaderFooterPropertyMainController.xib in Resources */,
 				ADD1B6DB2946BE1700C3FFF7 /* KMPrintChoosePageSizeView.xib in Resources */,
+				ADAC0E4D2AD0F6A900FD4F52 /* KMEmailBindLoginWindowController.xib in Resources */,
 				9F0CB4AA296CF19600007028 /* KMPropertiesPanelListMenuSubVC.xib in Resources */,
 				ADE8BC3329F9261900570F89 /* KMSearchCellView.xib in Resources */,
 				BBC348362955A118008D2CD1 /* KMCreateBackgroundController.xib in Resources */,
@@ -10476,6 +10495,7 @@
 				9F1F82CE292F6CF90092C4B4 /* KMPDFInsertPageWindow.xib in Resources */,
 				9F0201822A1BAC1600C9B673 /* KMAIRewritingVC.xib in Resources */,
 				89E4E7422964160F002DBA6F /* KMAnnotationLinkViewController.xib in Resources */,
+				ADAC0E4E2AD0F6A900FD4F52 /* KMEmailBindLoginWindowController.xib in Resources */,
 				89752DEE293875FC003FF08E /* KMMainToolbarController.xib in Resources */,
 				BB49ED0A293F461500C82CA2 /* KMConvertCSVWindowController.xib in Resources */,
 				BBEC00B3295C2AF300A26C98 /* KMBatesPreviewController.xib in Resources */,
@@ -10817,6 +10837,7 @@
 				BBC348582958465C008D2CD1 /* KMBackgroundFilePropertyInfoController.xib in Resources */,
 				9FDD0FA42952FF4D000C4DAD /* $themes.json in Resources */,
 				BB99ACC7292DE22E0048AFD9 /* KMMergeViewController.xib in Resources */,
+				ADAC0E4F2AD0F6A900FD4F52 /* KMEmailBindLoginWindowController.xib in Resources */,
 				AD867F8D29D950B400F00440 /* KMBOTAOutlineView.xib in Resources */,
 				9F1F82CF292F6CF90092C4B4 /* KMPDFInsertPageWindow.xib in Resources */,
 				9F0201772A1B488C00C9B673 /* KMAITranslationVC.xib in Resources */,
@@ -11464,6 +11485,7 @@
 				BB49ED15293F489500C82CA2 /* KMConvertImageSettingView.swift in Sources */,
 				ADBC375D29CC61E100D93208 /* KMReadModelView.swift in Sources */,
 				BB2EDF79296ECE17003BCF58 /* KMPageEditThumbnailItem.swift in Sources */,
+				ADAC0E4A2AD0F6A900FD4F52 /* KMEmailBindLoginWindowController.swift in Sources */,
 				89E4E6FB2963D341002DBA6F /* KMPopUpButton.m in Sources */,
 				899700E828F3E4D3009AF911 /* MainWindowController.swift in Sources */,
 				F3732302292DF9410013862C /* CPDFLinkAnnotation+PDFListView.m in Sources */,
@@ -12187,6 +12209,7 @@
 				89E4E7142963D7FF002DBA6F /* NSFont_SKExtensions.m in Sources */,
 				8931684A296E436B0073EA59 /* KMSignatureManager.m in Sources */,
 				BB147006299DC0D100784A6A /* OIDFieldMapping.m in Sources */,
+				ADAC0E4B2AD0F6A900FD4F52 /* KMEmailBindLoginWindowController.swift in Sources */,
 				BB003016298CA446002DD1A0 /* KMPreferenceGeneralController.swift in Sources */,
 				BBB9B32F299A5D6D004F3235 /* GTMAppAuthFetcherAuthorization.m in Sources */,
 				BB3EAEAE293E3D6000D92407 /* KMConvertBaseWindowController.swift in Sources */,
@@ -13100,6 +13123,7 @@
 				BB897222294AF9080045787C /* KMWatermarkAdjectiveTopBarView.swift in Sources */,
 				8931683F296E436B0073EA59 /* KMPDFSignatureTextView.m in Sources */,
 				9F8DDF362924DA6B006CDC73 /* KMPDFToolsCollectionView.swift in Sources */,
+				ADAC0E4C2AD0F6A900FD4F52 /* KMEmailBindLoginWindowController.swift in Sources */,
 				ADF9ED3129A8507400C4A943 /* KMAccountInfoView.swift in Sources */,
 				ADB2D6FB294882AE0029D2B3 /* KMTextFieldStepperView.swift in Sources */,
 				AD9527F0295578BD0039D2BC /* KMBaseTextFieldPresenter.swift in Sources */,

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

@@ -373,7 +373,7 @@ extension KMBrowserWindowController: KMToolbarRightViewDelegate {
     }
     
     func userInfoButtonAction(_ sender: NSButton) {
-        KMEmailBindAlertController.show(window: self.window!)
+        KMEmailBindAlertController.show(window: self.window!, type: .login)
         return
         
 //        if KMLightMemberManager.manager.isLogin() {

PDF Office/PDF Master/Class/Home/ViewController/KMFastToolCollectionViewItem.swift

@@ -34,6 +34,7 @@ public enum DataNavigationViewButtonActionType : Int {
     case FileCompare    // 文件对比
     case ComparativeTable    // 比较表
     case equity    // 权益弹窗
+    case bind    // 绑定弹窗
 }
 
 
@@ -169,6 +170,8 @@ class KMFastToolMode: NSObject {
             break
         case .equity:
             break
+        case .bind:
+            break
         }
         return mode
     }

PDF Office/PDF Master/Class/Home/ViewController/KMHomeViewController+Action.swift

@@ -159,6 +159,8 @@ extension KMHomeViewController {
             break
         case .equity:
             break
+        case .bind:
+            break
         }
     }
     

PDF Office/PDF Master/Class/KMLightMember/Controller/EmailBind/EmailBindAlert/KMEmailBindAlertController.swift

@@ -108,7 +108,9 @@ class KMEmailBindAlertController: NSWindowController {
             emailBindAlertMainWindow = nil
             emailBindAlertController = nil
             
-            KMEmailBindSuccessWindowController.show(window: NSWindow.currentWindow())
+            KMLoginWindowController.show(window: NSWindow.currentWindow(), .bind, .login)
+//            KMEmailBindLoginWindowController.show(window: NSWindow.currentWindow())
+//            KMEmailBindSuccessWindowController.show(window: NSWindow.currentWindow())
         }
     }
 }

PDF Office/PDF Master/Class/KMLightMember/Controller/EmailBind/EmailBindLogin/KMEmailBindLoginWindowController.swift

@@ -0,0 +1,34 @@
+//
+//  KMEmailBindLoginWindowController.swift
+//  PDF Master
+//
+//  Created by lizhe on 2023/10/7.
+//
+
+import Cocoa
+
+
+var emailBindLoginController: KMEmailBindLoginWindowController?
+var emailBindLoginMainWindow: NSWindow?
+class KMEmailBindLoginWindowController: NSWindowController {
+
+    override func windowDidLoad() {
+        super.windowDidLoad()
+        self.setup()
+        // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
+    }
+    
+    //MARK: 打开文件
+    static func show(window: NSWindow) -> KMEmailBindLoginWindowController {
+        let controller: KMEmailBindLoginWindowController = KMEmailBindLoginWindowController.init(windowNibName: "KMEmailBindLoginWindowController")
+        window.beginSheet(controller.window!)
+        controller.window?.center()
+        emailBindLoginController = controller
+        emailBindLoginMainWindow = window
+        return controller
+    }
+    
+    func setup() {
+        
+    }
+}

PDF Office/PDF Master/Class/KMLightMember/Controller/EmailBind/EmailBindLogin/KMEmailBindLoginWindowController.xib

@@ -0,0 +1,44 @@
+<?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="KMEmailBindLoginWindowController" customModule="PDF_Master" customModuleProvider="target">
+            <connections>
+                <outlet property="window" destination="F0z-JX-Cv5" id="gIp-Ho-8D9"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+            <rect key="contentRect" x="196" y="240" width="404" height="420"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
+            <value key="minSize" type="size" width="404" height="420"/>
+            <value key="maxSize" type="size" width="404" height="420"/>
+            <view key="contentView" id="se5-gp-TjO">
+                <rect key="frame" x="0.0" y="0.0" width="404" height="420"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="fpP-Lb-Emc" customClass="KMLoginView" customModule="PDF_Master" customModuleProvider="target">
+                        <rect key="frame" x="0.0" y="0.0" width="404" height="420"/>
+                    </customView>
+                </subviews>
+                <constraints>
+                    <constraint firstAttribute="bottom" secondItem="fpP-Lb-Emc" secondAttribute="bottom" id="FjK-lI-GGC"/>
+                    <constraint firstItem="fpP-Lb-Emc" firstAttribute="top" secondItem="se5-gp-TjO" secondAttribute="top" id="GAL-RQ-5Va"/>
+                    <constraint firstAttribute="trailing" secondItem="fpP-Lb-Emc" secondAttribute="trailing" id="ODF-ts-Z37"/>
+                    <constraint firstItem="fpP-Lb-Emc" firstAttribute="leading" secondItem="se5-gp-TjO" secondAttribute="leading" id="VLh-Rz-849"/>
+                </constraints>
+            </view>
+            <connections>
+                <outlet property="delegate" destination="-2" id="0bl-1N-AYu"/>
+            </connections>
+            <point key="canvasLocation" x="-17" y="144"/>
+        </window>
+    </objects>
+</document>

PDF Office/PDF Master/Class/KMLightMember/Controller/Login&Register/KMLoginWindowController.swift

@@ -14,6 +14,9 @@ typealias KMLoginWindowControllerLoginAction = (_ controller: KMLoginWindowContr
 typealias KMLoginWindowControllerRegisterAction = (_ controller: KMLoginWindowController, _ isSuccess: Bool) -> Void
 
 class KMLoginWindowController: NSWindowController {
+    @IBOutlet weak var closeView: NSView!
+    @IBOutlet weak var closeBox: KMBox!
+    @IBOutlet weak var closeButton: NSButton!
     @IBOutlet weak var noNetworkView: KMLightNoNetworkView!
     @IBOutlet weak var loginView: KMLoginView!
     @IBOutlet weak var leftView: KMLoginLeftImageView!
@@ -22,11 +25,10 @@ class KMLoginWindowController: NSWindowController {
     
     @IBOutlet weak var loginInputPasswordView: KMLoginInputPasswordView!
     @IBOutlet weak var registerSuccessView: KMRegisterSuccessView!
-    
     @IBOutlet weak var resetPasswordView: KMResetPasswordView!
-    
     @IBOutlet weak var rightContentView: NSView!
     
+    @IBOutlet weak var leftViewWidthConstraint: NSLayoutConstraint!
     var loginAction: KMLoginWindowControllerLoginAction?
     var registerAction: KMLoginWindowControllerRegisterAction?
     
@@ -49,6 +51,14 @@ class KMLoginWindowController: NSWindowController {
 
         // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
         self.setup()
+        
+        if inputType == .bind {
+            self.leftView.isHidden = true
+            self.closeView.isHidden = false
+            self.leftViewWidthConstraint.constant = 0
+            let newFrame = NSRect(x: 0, y: 0, width: 420, height: 372)
+            self.window?.setFrame(newFrame, display: true)
+        }
     }
     
     //MARK: 打开文件
@@ -79,6 +89,15 @@ class KMLoginWindowController: NSWindowController {
     
     func setup() {
         self.window?.contentView?.backgroundColor(NSColor.km_init(hex: "#FFFFFF"))
+        
+        self.closeBox.moveCallback = { [weak self] (mouseEntered, mouseBox) in
+            if mouseEntered {
+                self?.closeButton?.image = NSImage(named: "control_btn_icon_close_hov")
+            } else {
+                self?.closeButton?.image = NSImage(named: "control_btn_icon_close")
+            }
+        }
+        
         KMRequestServer.requestServer.reachabilityStatusChange { [weak self] status in
             if status == .notReachable {
                 KMPrint("无网络")
@@ -386,6 +405,11 @@ class KMLoginWindowController: NSWindowController {
         
         return nil
     }
+    
+    @IBAction func closeButtonAction(_ sender: Any) {
+        self.closeWindow()
+    }
+    
 }
 
 

PDF Office/PDF Master/Class/KMLightMember/Controller/Login&Register/KMLoginWindowController.xib

@@ -8,7 +8,11 @@
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="KMLoginWindowController" customModule="PDF_Master" customModuleProvider="target">
             <connections>
+                <outlet property="closeBox" destination="ihf-xV-7og" id="t4h-Pj-JvW"/>
+                <outlet property="closeButton" destination="Gsm-1I-KMM" id="qzJ-kT-SVL"/>
+                <outlet property="closeView" destination="cb3-Kz-iMd" id="uzH-uQ-82J"/>
                 <outlet property="leftView" destination="QLc-m8-vVs" id="giL-d7-2ml"/>
+                <outlet property="leftViewWidthConstraint" destination="cS8-vT-Pxf" id="H31-mF-JW1"/>
                 <outlet property="loginInputPasswordView" destination="mj9-5T-uMF" id="JQC-FQ-FlJ"/>
                 <outlet property="loginView" destination="X8l-4v-zsK" id="93E-eu-ceB"/>
                 <outlet property="noNetworkView" destination="U3b-CL-heW" id="1pP-dd-hn6"/>
@@ -89,8 +93,46 @@
                     <customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="U3b-CL-heW" customClass="KMLightNoNetworkView" customModule="PDF_Master" customModuleProvider="target">
                         <rect key="frame" x="260" y="0.0" width="404" height="420"/>
                     </customView>
+                    <customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cb3-Kz-iMd">
+                        <rect key="frame" x="0.0" y="392" width="664" height="28"/>
+                        <subviews>
+                            <box boxType="custom" borderWidth="0.0" cornerRadius="4" translatesAutoresizingMaskIntoConstraints="NO" id="ihf-xV-7og" customClass="KMBox" customModule="PDF_Master" customModuleProvider="target">
+                                <rect key="frame" x="8" y="8" width="12" height="12"/>
+                                <view key="contentView" id="RpC-nZ-2Tx">
+                                    <rect key="frame" x="0.0" y="0.0" width="12" height="12"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                </view>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="12" id="6A7-Vj-C2H"/>
+                                    <constraint firstAttribute="width" constant="12" id="96M-le-1oy"/>
+                                </constraints>
+                            </box>
+                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Gsm-1I-KMM">
+                                <rect key="frame" x="8" y="8" width="12" height="12"/>
+                                <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="control_btn_icon_close" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="Qpw-7c-J61">
+                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                    <font key="font" metaFont="system"/>
+                                </buttonCell>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="12" id="37j-jJ-HGy"/>
+                                    <constraint firstAttribute="width" constant="12" id="dhe-tj-8LF"/>
+                                </constraints>
+                                <connections>
+                                    <action selector="closeButtonAction:" target="-2" id="UN9-XG-cnb"/>
+                                </connections>
+                            </button>
+                        </subviews>
+                        <constraints>
+                            <constraint firstItem="Gsm-1I-KMM" firstAttribute="leading" secondItem="cb3-Kz-iMd" secondAttribute="leading" constant="8" id="Eex-ZI-KHa"/>
+                            <constraint firstItem="ihf-xV-7og" firstAttribute="leading" secondItem="cb3-Kz-iMd" secondAttribute="leading" constant="8" id="GoR-oR-Jf9"/>
+                            <constraint firstAttribute="height" constant="28" id="SMq-iO-vpi"/>
+                            <constraint firstItem="Gsm-1I-KMM" firstAttribute="centerY" secondItem="cb3-Kz-iMd" secondAttribute="centerY" id="b5n-am-PyO"/>
+                            <constraint firstItem="ihf-xV-7og" firstAttribute="centerY" secondItem="cb3-Kz-iMd" secondAttribute="centerY" id="t6o-bB-ns8"/>
+                        </constraints>
+                    </customView>
                 </subviews>
                 <constraints>
+                    <constraint firstAttribute="trailing" secondItem="cb3-Kz-iMd" secondAttribute="trailing" id="AcK-Wt-zLo"/>
                     <constraint firstAttribute="trailing" secondItem="U3b-CL-heW" secondAttribute="trailing" id="GIf-rb-z5Y"/>
                     <constraint firstAttribute="bottom" secondItem="QLc-m8-vVs" secondAttribute="bottom" id="J9K-Gf-Rj2"/>
                     <constraint firstAttribute="bottom" secondItem="nmT-zT-r6u" secondAttribute="bottom" id="Uxm-nC-FIV"/>
@@ -101,6 +143,8 @@
                     <constraint firstAttribute="bottom" secondItem="U3b-CL-heW" secondAttribute="bottom" id="kzs-D4-7EX"/>
                     <constraint firstAttribute="trailing" secondItem="nmT-zT-r6u" secondAttribute="trailing" id="oAq-ne-yC7"/>
                     <constraint firstItem="U3b-CL-heW" firstAttribute="top" secondItem="se5-gp-TjO" secondAttribute="top" id="ose-pe-h4g"/>
+                    <constraint firstItem="cb3-Kz-iMd" firstAttribute="top" secondItem="se5-gp-TjO" secondAttribute="top" id="pb0-DW-VRn"/>
+                    <constraint firstItem="cb3-Kz-iMd" firstAttribute="leading" secondItem="se5-gp-TjO" secondAttribute="leading" id="q0V-Qn-Edw"/>
                     <constraint firstItem="QLc-m8-vVs" firstAttribute="leading" secondItem="se5-gp-TjO" secondAttribute="leading" id="yMx-Vz-uyR"/>
                 </constraints>
             </view>
@@ -110,4 +154,7 @@
             <point key="canvasLocation" x="51" y="-86"/>
         </window>
     </objects>
+    <resources>
+        <image name="control_btn_icon_close" width="12" height="12"/>
+    </resources>
 </document>

PDF Office/PDF Master/Class/KMLightMember/Controller/Login&Register/View/KMLoginView.xib

@@ -22,14 +22,14 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView id="c22-O7-iKe">
-            <rect key="frame" x="0.0" y="0.0" width="404" height="461"/>
+            <rect key="frame" x="0.0" y="0.0" width="420" height="461"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="tLe-UW-r6i">
-                    <rect key="frame" x="0.0" y="0.0" width="404" height="461"/>
+                    <rect key="frame" x="0.0" y="0.0" width="420" height="461"/>
                     <subviews>
                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="NfV-rH-QAy">
-                            <rect key="frame" x="48" y="213" width="308" height="200"/>
+                            <rect key="frame" x="48" y="213" width="324" height="200"/>
                             <subviews>
                                 <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="oIw-PI-v0k">
                                     <rect key="frame" x="-2" y="176" width="53" height="24"/>
@@ -43,10 +43,10 @@
                                     </connections>
                                 </textField>
                                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="oZ4-WS-K2q">
-                                    <rect key="frame" x="0.0" y="84" width="308" height="60"/>
+                                    <rect key="frame" x="0.0" y="84" width="324" height="60"/>
                                     <subviews>
                                         <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="MN2-pV-Yar">
-                                            <rect key="frame" x="-2" y="44" width="125" height="16"/>
+                                            <rect key="frame" x="-2" y="44" width="124" height="16"/>
                                             <textFieldCell key="cell" lineBreakMode="clipping" title="Enter email account" id="Q1t-he-m3U">
                                                 <font key="font" metaFont="system"/>
                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -54,10 +54,10 @@
                                             </textFieldCell>
                                         </textField>
                                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="Qkr-ZD-SqP">
-                                            <rect key="frame" x="0.0" y="4" width="308" height="32"/>
+                                            <rect key="frame" x="0.0" y="4" width="324" height="32"/>
                                             <subviews>
                                                 <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ux1-lu-0lN" customClass="FocusAwareTextField" customModule="PDF_Master" customModuleProvider="target">
-                                                    <rect key="frame" x="8" y="5" width="292" height="22"/>
+                                                    <rect key="frame" x="8" y="5" width="308" height="22"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="22" id="Uru-Xo-pog"/>
                                                     </constraints>
@@ -112,10 +112,10 @@
                             </constraints>
                         </customView>
                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="UB6-Hp-ebR">
-                            <rect key="frame" x="0.0" y="116" width="404" height="68"/>
+                            <rect key="frame" x="0.0" y="116" width="420" height="68"/>
                             <subviews>
                                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="qvE-sE-RrB">
-                                    <rect key="frame" x="48" y="36" width="308" height="32"/>
+                                    <rect key="frame" x="48" y="36" width="324" height="32"/>
                                     <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" alignment="center" enabled="NO" imageScaling="proportionallyDown" inset="2" id="0Zf-nU-w6r">
                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                         <font key="font" metaFont="system"/>
@@ -128,17 +128,17 @@ DQ
                                     </constraints>
                                 </button>
                                 <scrollView borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4Jh-0w-5Hf">
-                                    <rect key="frame" x="48" y="4" width="308" height="24"/>
+                                    <rect key="frame" x="48" y="4" width="324" height="24"/>
                                     <clipView key="contentView" drawsBackground="NO" id="bPn-g7-5ox">
-                                        <rect key="frame" x="0.0" y="0.0" width="308" height="24"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="324" height="24"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
                                             <textView wantsLayer="YES" editable="NO" drawsBackground="NO" importsGraphics="NO" richText="NO" verticallyResizable="YES" spellingCorrection="YES" smartInsertDelete="YES" id="iEl-CK-gIF">
-                                                <rect key="frame" x="0.0" y="0.0" width="308" height="24"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="324" height="24"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <color key="textColor" red="1" green="0.99843658089999998" blue="0.99619259260000004" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <color key="backgroundColor" red="1" green="0.99843658089999998" blue="0.99619259260000004" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
-                                                <size key="minSize" width="308" height="24"/>
+                                                <size key="minSize" width="324" height="24"/>
                                                 <size key="maxSize" width="404" height="10000000"/>
                                                 <color key="insertionPointColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                             </textView>
@@ -170,7 +170,7 @@ DQ
                             </constraints>
                         </customView>
                         <button hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="iq4-uJ-ucU">
-                            <rect key="frame" x="172" y="40" width="60" height="60"/>
+                            <rect key="frame" x="180" y="40" width="60" height="60"/>
                             <buttonCell key="cell" type="square" title="Apple" bezelStyle="shadowlessSquare" alignment="center" imageScaling="proportionallyDown" inset="2" id="Wm5-iW-N6G">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                 <font key="font" metaFont="system"/>
@@ -184,7 +184,7 @@ DQ
                             </connections>
                         </button>
                         <button hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Bfb-EZ-gfe">
-                            <rect key="frame" x="248" y="40" width="60" height="60"/>
+                            <rect key="frame" x="256" y="40" width="60" height="60"/>
                             <buttonCell key="cell" type="square" title="Google" bezelStyle="shadowlessSquare" alignment="center" imageScaling="proportionallyDown" inset="2" id="xZ5-Ax-aVO">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                 <font key="font" metaFont="system"/>