【会员系统】删除账号补充titile

PDF Office/PDF Master/MemberCenter/WindowsController/DMG/KMOpenDMGPopupBootWC.swift

@@ -41,7 +41,7 @@ class KMOpenDMGPopupBootWC: NSWindowController {
     
     private func languageLocalized() -> Void {
         titleLabel.stringValue = NSLocalizedString("Free to Get 7-Day VIP Now", tableName: "MemberCenterLocalizable", comment: "")
-        subTitleLabel.stringValue = NSLocalizedString("Use all functions without restrictions", tableName: "MemberCenterLocalizable", comment: "")
+        subTitleLabel.stringValue = String(format: " · %@", NSLocalizedString("Use all functions without restrictions", tableName: "MemberCenterLocalizable", comment: ""))
         freeLabel.stringValue = NSLocalizedString("Get 7-Day VIP Free", tableName: "MemberCenterLocalizable", comment: "")
     }
     

PDF Office/PDF Master/MemberCenter/WindowsController/KMCloseAccountWC.swift

@@ -48,6 +48,8 @@ class KMCloseAccountWC: NSWindowController {
     // MARK: Private Method
     
     private func languageLocalized() -> Void {
+        self.window?.title = NSLocalizedString("Remove Account", tableName: "MemberCenterLocalizable", comment: "")
+        
         titleLabel.stringValue = NSLocalizedString("Delete your account and related authorizations", tableName: "MemberCenterLocalizable", comment: "")
         subTitleLabel.stringValue = NSLocalizedString("Removing your account will permanently delete all account data, including the membership benefits of PDF Reader Pro across all platforms you purchased under this account. Are you sure you want to continue?", tableName: "MemberCenterLocalizable", comment: "")
         productLabel.stringValue = NSLocalizedString("Your products and services:", tableName: "MemberCenterLocalizable", comment: "")

PDF Office/PDF Master/MemberCenter/WindowsController/KMCloseAccountWC.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -27,13 +27,13 @@
         <window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <rect key="contentRect" x="196" y="240" width="480" height="270"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1512" height="944"/>
             <view key="contentView" id="se5-gp-TjO">
-                <rect key="frame" x="0.0" y="0.0" width="358" height="274"/>
+                <rect key="frame" x="0.0" y="0.0" width="358" height="278"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="Fbr-Hw-ehd">
-                        <rect key="frame" x="20" y="218" width="318" height="16"/>
+                        <rect key="frame" x="20" y="222" width="318" height="16"/>
                         <subviews>
                             <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="73e-3g-pCl">
                                 <rect key="frame" x="-2" y="0.0" width="322" height="16"/>
@@ -53,7 +53,7 @@
                         </constraints>
                     </customView>
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="ZF3-xx-TNq">
-                        <rect key="frame" x="20" y="194" width="318" height="16"/>
+                        <rect key="frame" x="20" y="198" width="318" height="16"/>
                         <subviews>
                             <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="HMV-FW-hWM">
                                 <rect key="frame" x="-2" y="0.0" width="322" height="16"/>
@@ -72,7 +72,7 @@
                         </constraints>
                     </customView>
                     <box boxType="custom" cornerRadius="7" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="eYu-vK-aia">
-                        <rect key="frame" x="20" y="71" width="318" height="98"/>
+                        <rect key="frame" x="20" y="75" width="318" height="98"/>
                         <view key="contentView" id="vCp-aU-1BS">
                             <rect key="frame" x="1" y="1" width="316" height="96"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -165,10 +165,10 @@
                         </constraints>
                     </box>
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="Rl4-XF-COQ">
-                        <rect key="frame" x="20" y="20" width="318" height="20"/>
+                        <rect key="frame" x="20" y="20" width="318" height="24"/>
                         <subviews>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="GzR-dW-2t8">
-                                <rect key="frame" x="250" y="-7" width="75" height="32"/>
+                                <rect key="frame" x="252" y="-5" width="75" height="32"/>
                                 <buttonCell key="cell" type="push" title="Button" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Tib-KJ-2hc">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -181,7 +181,7 @@ DQ
                                 </connections>
                             </button>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="UDM-4Y-zsX">
-                                <rect key="frame" x="181" y="-7" width="75" height="32"/>
+                                <rect key="frame" x="183" y="-5" width="75" height="32"/>
                                 <buttonCell key="cell" type="push" title="Button" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Y0u-le-N1M">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -192,9 +192,9 @@ DQ
                             </button>
                         </subviews>
                         <constraints>
-                            <constraint firstAttribute="trailing" secondItem="GzR-dW-2t8" secondAttribute="trailing" id="5pL-0f-s1P"/>
-                            <constraint firstAttribute="bottom" secondItem="GzR-dW-2t8" secondAttribute="bottom" id="Ye2-ze-z5u"/>
-                            <constraint firstItem="GzR-dW-2t8" firstAttribute="top" secondItem="Rl4-XF-COQ" secondAttribute="top" id="fNS-mu-Uc6"/>
+                            <constraint firstAttribute="trailing" secondItem="GzR-dW-2t8" secondAttribute="trailing" constant="-2" id="5pL-0f-s1P"/>
+                            <constraint firstAttribute="bottom" secondItem="GzR-dW-2t8" secondAttribute="bottom" constant="2" id="Ye2-ze-z5u"/>
+                            <constraint firstItem="GzR-dW-2t8" firstAttribute="top" secondItem="Rl4-XF-COQ" secondAttribute="top" constant="2" id="fNS-mu-Uc6"/>
                             <constraint firstItem="GzR-dW-2t8" firstAttribute="leading" secondItem="UDM-4Y-zsX" secondAttribute="trailing" constant="8" id="lLa-GI-HMi"/>
                             <constraint firstItem="GzR-dW-2t8" firstAttribute="centerY" secondItem="UDM-4Y-zsX" secondAttribute="centerY" id="nT1-Yy-Ay9"/>
                         </constraints>

PDF Office/PDF Master/MemberCenter/WindowsController/KMCloseApplyWC.swift

@@ -42,6 +42,8 @@ class KMCloseApplyWC: NSWindowController {
     // MARK: Private Method
     
     private func languageLocalized() -> Void {
+        self.window?.title = NSLocalizedString("Remove Account", tableName: "MemberCenterLocalizable", comment: "")
+
         titleLabel.stringValue = NSLocalizedString("Account cancellation application has been submitted", tableName: "MemberCenterLocalizable", comment: "")
         subTitleLabel.stringValue = String(format: NSLocalizedString("Your account will be automatically deleted in %@ days. Welcome to use PDF Reader Pro again!\nYou can log in with this account and choose to Undo Remove Account within %ld days, and continue to use. The benefits and product services you enjoy will be retained.", tableName: "MemberCenterLocalizable", comment: ""), logOffTime, logOffTime)
         

PDF Office/PDF Master/MemberCenter/WindowsController/KMCloseVerificationWC.swift

@@ -43,6 +43,8 @@ class KMCloseVerificationWC: NSWindowController {
         
         signUpModel.countDown(type: .logout)
         
+        nextButton.isEnabled = false
+        
         NotificationCenter.default.addObserver(self, selector: #selector(changeEffectiveAppearance), name: NSNotification.Name(rawValue: "kEffectiveAppearance"), object: nil)
     }
     
@@ -54,6 +56,8 @@ class KMCloseVerificationWC: NSWindowController {
     // MARK: Private Method
     
     private func languageLocalized() -> Void {
+        self.window?.title = NSLocalizedString("Remove Account", tableName: "MemberCenterLocalizable", comment: "")
+
         titleLabel.stringValue = NSLocalizedString("Verify your identity", tableName: "MemberCenterLocalizable", comment: "")
         subTitleLabel1.stringValue = NSLocalizedString("We have sent you a code via email to", tableName: "MemberCenterLocalizable", comment: "")
         subTitleLabel2.stringValue = KMMemberInfo.shared.userEmail
@@ -187,6 +191,11 @@ extension KMCloseVerificationWC: NSTextFieldDelegate {
             
             signUpModel.passwordErrorMessage = ""
             verifficationBox.borderColor = NSColor(named: "DADBDE") ?? NSColor.gray
+            if(textField?.stringValue.isEmpty == true) {
+                nextButton.isEnabled = false
+            } else {
+                nextButton.isEnabled = true
+            }
 
         }
     }

PDF Office/PDF Master/MemberCenter/WindowsController/KMCloseVerificationWC.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -26,7 +26,7 @@
         <window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <rect key="contentRect" x="196" y="240" width="358" height="312"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1512" height="944"/>
             <value key="minSize" type="size" width="358" height="312"/>
             <value key="maxSize" type="size" width="358" height="312"/>
             <view key="contentView" id="se5-gp-TjO">
@@ -84,7 +84,7 @@
                         </constraints>
                     </customView>
                     <box boxType="custom" cornerRadius="1" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="aYV-Ce-cAG">
-                        <rect key="frame" x="20" y="139" width="318" height="28"/>
+                        <rect key="frame" x="20" y="143" width="318" height="28"/>
                         <view key="contentView" id="DyA-hH-FXd">
                             <rect key="frame" x="1" y="1" width="316" height="26"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -164,7 +164,7 @@
                         </constraints>
                     </box>
                     <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="FL7-uf-8vv">
-                        <rect key="frame" x="18" y="123" width="322" height="16"/>
+                        <rect key="frame" x="18" y="127" width="322" height="16"/>
                         <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="da7-lc-exz">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -172,10 +172,10 @@
                         </textFieldCell>
                     </textField>
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="R3q-4A-0hq">
-                        <rect key="frame" x="20" y="20" width="318" height="20"/>
+                        <rect key="frame" x="20" y="20" width="320" height="24"/>
                         <subviews>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XkS-qP-8ve">
-                                <rect key="frame" x="250" y="-7" width="75" height="32"/>
+                                <rect key="frame" x="250" y="-5" width="75" height="32"/>
                                 <buttonCell key="cell" type="push" title="Button" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="fzZ-6c-bKO">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -189,9 +189,9 @@ DQ
                             </button>
                         </subviews>
                         <constraints>
-                            <constraint firstAttribute="trailing" secondItem="XkS-qP-8ve" secondAttribute="trailing" id="W2T-yT-8ah"/>
-                            <constraint firstAttribute="bottom" secondItem="XkS-qP-8ve" secondAttribute="bottom" id="dt6-2a-OT6"/>
-                            <constraint firstItem="XkS-qP-8ve" firstAttribute="top" secondItem="R3q-4A-0hq" secondAttribute="top" id="yW4-by-tLS"/>
+                            <constraint firstAttribute="trailing" secondItem="XkS-qP-8ve" secondAttribute="trailing" constant="2" id="W2T-yT-8ah"/>
+                            <constraint firstAttribute="bottom" secondItem="XkS-qP-8ve" secondAttribute="bottom" constant="2" id="dt6-2a-OT6"/>
+                            <constraint firstItem="XkS-qP-8ve" firstAttribute="top" secondItem="R3q-4A-0hq" secondAttribute="top" constant="2" id="yW4-by-tLS"/>
                         </constraints>
                     </customView>
                 </subviews>
@@ -204,7 +204,7 @@ DQ
                     <constraint firstItem="FL7-uf-8vv" firstAttribute="top" secondItem="aYV-Ce-cAG" secondAttribute="bottom" id="M6a-PY-wdT"/>
                     <constraint firstItem="aYV-Ce-cAG" firstAttribute="leading" secondItem="se5-gp-TjO" secondAttribute="leading" constant="20" id="Mxk-oz-5n0"/>
                     <constraint firstItem="FL7-uf-8vv" firstAttribute="trailing" secondItem="aYV-Ce-cAG" secondAttribute="trailing" id="N2I-KT-lH1"/>
-                    <constraint firstAttribute="trailing" secondItem="R3q-4A-0hq" secondAttribute="trailing" constant="20" id="OdS-Ha-8lD"/>
+                    <constraint firstAttribute="trailing" secondItem="R3q-4A-0hq" secondAttribute="trailing" constant="18" id="OdS-Ha-8lD"/>
                     <constraint firstItem="R3q-4A-0hq" firstAttribute="top" secondItem="aYV-Ce-cAG" secondAttribute="bottom" constant="99" id="TVi-6V-lBf"/>
                     <constraint firstItem="FL7-uf-8vv" firstAttribute="leading" secondItem="aYV-Ce-cAG" secondAttribute="leading" id="YAU-9L-qSe"/>
                     <constraint firstItem="tfz-7G-bHk" firstAttribute="trailing" secondItem="vEh-sY-9GF" secondAttribute="trailing" id="cBI-iV-Ann"/>

PDF Office/PDF Master/MemberCenter/WindowsController/KMMemberPromptWC.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -20,7 +20,7 @@
         <window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <rect key="contentRect" x="196" y="240" width="332" height="153"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1512" height="944"/>
             <value key="minSize" type="size" width="332" height="153"/>
             <value key="maxSize" type="size" width="332" height="153"/>
             <view key="contentView" id="se5-gp-TjO">