【会员系统】补充刷新登录界面侧边视图

PDF Office/PDF Master/Class/PDFTools/Convert/NewController/KMConvertWindowController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -61,14 +61,14 @@
             <value key="minSize" type="size" width="700" height="524"/>
             <value key="maxSize" type="size" width="700" height="524"/>
             <view key="contentView" wantsLayer="YES" id="se5-gp-TjO">
-                <rect key="frame" x="0.0" y="0.0" width="718" height="461"/>
+                <rect key="frame" x="0.0" y="0.0" width="730" height="461"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="9e4-ci-JPQ">
-                        <rect key="frame" x="0.0" y="50" width="359" height="411"/>
+                        <rect key="frame" x="0.0" y="50" width="365" height="411"/>
                         <subviews>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="X0Q-MI-4li">
-                                <rect key="frame" x="89" y="8" width="26" height="26"/>
+                                <rect key="frame" x="92" y="8" width="26" height="26"/>
                                 <buttonCell key="cell" type="round" bezelStyle="circular" image="NSGoLeftTemplate" imagePosition="overlaps" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="YGV-tr-NS4">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -78,7 +78,7 @@
                                 </connections>
                             </button>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="GvR-dU-AwU">
-                                <rect key="frame" x="245" y="8" width="26" height="26"/>
+                                <rect key="frame" x="248" y="8" width="26" height="26"/>
                                 <buttonCell key="cell" type="round" bezelStyle="circular" image="NSGoRightTemplate" imagePosition="only" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="QOu-1C-uhN">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -88,9 +88,9 @@
                                 </connections>
                             </button>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="ioL-gH-agJ">
-                                <rect key="frame" x="152" y="10" width="56" height="22"/>
+                                <rect key="frame" x="155" y="10" width="56" height="22"/>
                                 <subviews>
-                                    <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="SOc-Qh-Bb7">
+                                    <textField focusRingType="none" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="SOc-Qh-Bb7">
                                         <rect key="frame" x="0.0" y="0.0" width="40" height="22"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="22" id="3Jq-m9-DeQ"/>
@@ -105,7 +105,7 @@
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
                                     </textField>
-                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="z3E-2c-R0k">
+                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="z3E-2c-R0k">
                                         <rect key="frame" x="38" y="3" width="20" height="16"/>
                                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="/ 0" id="DYY-wZ-Qj3">
                                             <font key="font" metaFont="system"/>
@@ -124,7 +124,7 @@
                                 </constraints>
                             </customView>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="CBx-MQ-cXc">
-                                <rect key="frame" x="61" y="58" width="237" height="325"/>
+                                <rect key="frame" x="64" y="58" width="237" height="325"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="237" id="OK9-1V-VQX"/>
                                     <constraint firstAttribute="height" constant="325" id="kqf-Fz-QAp"/>
@@ -144,12 +144,12 @@
                         </constraints>
                     </customView>
                     <box borderType="none" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="3if-Xs-8Lv">
-                        <rect key="frame" x="361" y="340" width="320" height="106"/>
+                        <rect key="frame" x="370" y="338" width="320" height="106"/>
                         <view key="contentView" id="LK9-KO-5na">
                             <rect key="frame" x="0.0" y="0.0" width="320" height="106"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
-                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="A06-uc-UOW">
+                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="A06-uc-UOW">
                                     <rect key="frame" x="8" y="90" width="47" height="16"/>
                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Format" id="I6C-fa-6mM">
                                         <font key="font" metaFont="system"/>
@@ -159,9 +159,6 @@
                                 </textField>
                                 <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="t4K-iL-FMn">
                                     <rect key="frame" x="7" y="56" width="307" height="25"/>
-                                    <constraints>
-                                        <constraint firstAttribute="width" constant="300" id="IW3-cd-aif"/>
-                                    </constraints>
                                     <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="KBs-bN-RpD" id="ebx-HJ-6OI">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                         <font key="font" metaFont="menu"/>
@@ -173,15 +170,15 @@
                                             </items>
                                         </menu>
                                     </popUpButtonCell>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="300" id="IW3-cd-aif"/>
+                                    </constraints>
                                     <connections>
                                         <action selector="buttonClicked_FormatSelect:" target="-2" id="lCG-tq-rib"/>
                                     </connections>
                                 </popUpButton>
                                 <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="uzi-Qq-1mA">
                                     <rect key="frame" x="7" y="31" width="307" height="25"/>
-                                    <constraints>
-                                        <constraint firstAttribute="width" constant="300" id="oBX-Vi-zz7"/>
-                                    </constraints>
                                     <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="0hG-DD-Tut" id="cKX-RA-nQ3">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                         <font key="font" metaFont="menu"/>
@@ -193,6 +190,9 @@
                                             </items>
                                         </menu>
                                     </popUpButtonCell>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="300" id="oBX-Vi-zz7"/>
+                                    </constraints>
                                     <connections>
                                         <action selector="buttonClicked_DpiSelect:" target="-2" id="NLj-oZ-ugE"/>
                                     </connections>
@@ -205,16 +205,16 @@
                                         <subviews>
                                             <button translatesAutoresizingMaskIntoConstraints="NO" id="Krh-ke-zCQ">
                                                 <rect key="frame" x="0.0" y="17" width="20" height="14"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="height" constant="14" id="1xt-pb-BQw"/>
-                                                    <constraint firstAttribute="width" constant="20" id="uhJ-3t-Ju2"/>
-                                                </constraints>
                                                 <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="KMImageNameElsei" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="dFD-t2-jnf">
                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                     <font key="font" metaFont="system"/>
                                                 </buttonCell>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="14" id="1xt-pb-BQw"/>
+                                                    <constraint firstAttribute="width" constant="20" id="uhJ-3t-Ju2"/>
+                                                </constraints>
                                             </button>
-                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ckr-Wn-5Tf">
+                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ckr-Wn-5Tf">
                                                 <rect key="frame" x="23" y="0.0" width="279" height="34"/>
                                                 <textFieldCell key="cell" title="Export PDF to Word and other Microsoft Office formats" id="sBS-zf-jgA">
                                                     <font key="font" metaFont="system"/>
@@ -239,13 +239,13 @@
                                 </box>
                                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0Oz-gz-y6o">
                                     <rect key="frame" x="10" y="0.0" width="300" height="34"/>
-                                    <constraints>
-                                        <constraint firstAttribute="width" constant="300" id="ELD-e9-9yi"/>
-                                    </constraints>
                                     <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="left" imageScaling="proportionallyDown" inset="2" id="pOx-Rw-MAb">
                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                         <font key="font" usesAppearanceFont="YES"/>
                                     </buttonCell>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="300" id="ELD-e9-9yi"/>
+                                    </constraints>
                                     <connections>
                                         <action selector="buttonClicked_MoreConvert:" target="-2" id="PeR-FV-SSc"/>
                                     </connections>
@@ -269,7 +269,7 @@
                         </view>
                     </box>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="EbI-Wk-CCv">
-                        <rect key="frame" x="623" y="7" width="82" height="32"/>
+                        <rect key="frame" x="635" y="7" width="82" height="32"/>
                         <buttonCell key="cell" type="push" title="Convert" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="clK-sD-xOl">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -282,7 +282,7 @@ DQ
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="GDI-DM-qg0">
-                        <rect key="frame" x="552" y="7" width="76" height="32"/>
+                        <rect key="frame" x="564" y="7" width="76" height="32"/>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="q06-7Z-li8">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -315,13 +315,13 @@ Gw
                         </connections>
                     </button>
                     <box hidden="YES" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="aGQ-OF-WXB">
-                        <rect key="frame" x="361" y="253" width="310" height="68"/>
+                        <rect key="frame" x="367" y="231" width="316" height="84"/>
                         <view key="contentView" id="uh9-fs-9X0">
-                            <rect key="frame" x="3" y="3" width="304" height="62"/>
+                            <rect key="frame" x="4" y="5" width="308" height="76"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="47o-yu-wxa">
-                                    <rect key="frame" x="8" y="35" width="286" height="18"/>
+                                    <rect key="frame" x="8" y="49" width="290" height="18"/>
                                     <buttonCell key="cell" type="radio" title="Convert each page to a separate worksheet" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="hVc-jP-hSM">
                                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                         <font key="font" metaFont="system"/>
@@ -331,7 +331,7 @@ Gw
                                     </connections>
                                 </button>
                                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DRT-Gg-QW1">
-                                    <rect key="frame" x="8" y="9" width="286" height="18"/>
+                                    <rect key="frame" x="8" y="9" width="290" height="32"/>
                                     <buttonCell key="cell" type="radio" title="Convert all pages to a single worksheet(.xlsx)" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="MKV-oI-hZ0">
                                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                         <font key="font" metaFont="system"/>
@@ -354,17 +354,13 @@ Gw
                         <font key="titleFont" metaFont="system"/>
                     </box>
                     <box title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="R2E-0y-EaA">
-                        <rect key="frame" x="361" y="227" width="310" height="94"/>
+                        <rect key="frame" x="367" y="219" width="316" height="96"/>
                         <view key="contentView" id="kdq-H7-lg3">
-                            <rect key="frame" x="3" y="3" width="304" height="88"/>
+                            <rect key="frame" x="4" y="5" width="308" height="88"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="CPK-uS-4AE">
                                     <rect key="frame" x="105" y="56" width="152" height="25"/>
-                                    <constraints>
-                                        <constraint firstAttribute="width" constant="145" id="5hD-rD-DZ8"/>
-                                        <constraint firstAttribute="height" constant="20" id="8wZ-JW-rou"/>
-                                    </constraints>
                                     <popUpButtonCell key="cell" type="push" title="For Each Page" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="vBM-XN-pKT" id="HZz-2Y-eKt">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                         <font key="font" metaFont="menu"/>
@@ -375,6 +371,10 @@ Gw
                                             </items>
                                         </menu>
                                     </popUpButtonCell>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="145" id="5hD-rD-DZ8"/>
+                                        <constraint firstAttribute="height" constant="20" id="8wZ-JW-rou"/>
+                                    </constraints>
                                     <connections>
                                         <action selector="buttonClicked_allContentMenu:" target="-2" id="wyQ-bt-seM"/>
                                     </connections>
@@ -401,10 +401,6 @@ Gw
                                 </button>
                                 <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sq1-RM-hUc">
                                     <rect key="frame" x="96" y="30" width="152" height="25"/>
-                                    <constraints>
-                                        <constraint firstAttribute="width" constant="145" id="0cK-il-Qad"/>
-                                        <constraint firstAttribute="height" constant="20" id="79Y-YK-1pF"/>
-                                    </constraints>
                                     <popUpButtonCell key="cell" type="push" title="For Each Table" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="kP9-YO-QvE" id="JnU-hE-bwh">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                         <font key="font" metaFont="menu"/>
@@ -416,6 +412,10 @@ Gw
                                             </items>
                                         </menu>
                                     </popUpButtonCell>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="145" id="0cK-il-Qad"/>
+                                        <constraint firstAttribute="height" constant="20" id="79Y-YK-1pF"/>
+                                    </constraints>
                                     <connections>
                                         <action selector="buttonClicked_tableMenu:" target="-2" id="n4N-sh-aIg"/>
                                     </connections>
@@ -450,7 +450,7 @@ Gw
                         <font key="titleFont" metaFont="system"/>
                     </box>
                     <button hidden="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="UPM-vO-BAb">
-                        <rect key="frame" x="373" y="225" width="65" height="18"/>
+                        <rect key="frame" x="379" y="219" width="65" height="18"/>
                         <buttonCell key="cell" type="check" title="Check" bezelStyle="regularSquare" imagePosition="left" inset="2" id="2xT-Sc-V3O">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                             <font key="font" metaFont="system"/>
@@ -459,8 +459,8 @@ Gw
                             <action selector="buttonClicked_extractTable:" target="-2" id="0No-NT-2vF"/>
                         </connections>
                     </button>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hQ6-L6-IW2">
-                        <rect key="frame" x="373" y="320" width="37" height="16"/>
+                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hQ6-L6-IW2">
+                        <rect key="frame" x="379" y="314" width="37" height="16"/>
                         <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="8X0-Hn-fJf">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -468,13 +468,13 @@ Gw
                         </textFieldCell>
                     </textField>
                     <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="RKf-EU-J3Q">
-                        <rect key="frame" x="364" y="78" width="304" height="26"/>
+                        <rect key="frame" x="370" y="72" width="310" height="26"/>
                         <view key="contentView" id="VEv-bs-dGD">
-                            <rect key="frame" x="0.0" y="0.0" width="304" height="26"/>
+                            <rect key="frame" x="0.0" y="0.0" width="310" height="26"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
-                                <comboBox verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="C7X-dj-upX">
-                                    <rect key="frame" x="78" y="0.0" width="229" height="25"/>
+                                <comboBox focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="C7X-dj-upX">
+                                    <rect key="frame" x="77" y="1" width="236" height="23"/>
                                     <comboBoxCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" completes="NO" numberOfVisibleItems="5" id="fAw-sA-HYt">
                                         <font key="font" metaFont="system"/>
                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -484,7 +484,7 @@ Gw
                                         <action selector="comboxClicked_PageRange:" target="-2" id="OGm-9q-dQX"/>
                                     </connections>
                                 </comboBox>
-                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WyY-GN-uWB">
+                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WyY-GN-uWB">
                                     <rect key="frame" x="3" y="5" width="77" height="16"/>
                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Page Range" id="Jzz-uI-b7L">
                                         <font key="font" metaFont="system"/>
@@ -504,13 +504,13 @@ Gw
                         </view>
                     </box>
                     <box title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="Bpl-Ox-GVU">
-                        <rect key="frame" x="361" y="109" width="310" height="107"/>
+                        <rect key="frame" x="367" y="101" width="316" height="109"/>
                         <view key="contentView" id="hjw-de-suY">
-                            <rect key="frame" x="3" y="3" width="304" height="87"/>
+                            <rect key="frame" x="4" y="5" width="308" height="87"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7HT-Vw-exZ">
-                                    <rect key="frame" x="8" y="60" width="286" height="18"/>
+                                    <rect key="frame" x="8" y="60" width="290" height="18"/>
                                     <buttonCell key="cell" type="check" title="Recognize text if needed" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="jEU-BR-ipB">
                                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                         <font key="font" metaFont="system"/>
@@ -519,8 +519,8 @@ Gw
                                         <action selector="comboxClicked_SupoortOCR:" target="-2" id="lpV-4f-DKW"/>
                                     </connections>
                                 </button>
-                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="q5x-u2-fel">
-                                    <rect key="frame" x="8" y="35" width="288" height="16"/>
+                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="q5x-u2-fel">
+                                    <rect key="frame" x="8" y="35" width="292" height="16"/>
                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Document Language:" id="FGe-fQ-1t7">
                                         <font key="font" metaFont="system"/>
                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -529,9 +529,6 @@ Gw
                                 </textField>
                                 <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lx7-mQ-roc">
                                     <rect key="frame" x="7" y="6" width="257" height="25"/>
-                                    <constraints>
-                                        <constraint firstAttribute="width" constant="250" id="wV8-iV-cmR"/>
-                                    </constraints>
                                     <popUpButtonCell key="cell" type="push" title="Chinese" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="18N-pp-JIQ" id="6dK-AP-h63">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                         <font key="font" metaFont="menu"/>
@@ -663,6 +660,9 @@ Gw
                                             </items>
                                         </menu>
                                     </popUpButtonCell>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="250" id="wV8-iV-cmR"/>
+                                    </constraints>
                                     <connections>
                                         <action selector="comboxClicked_OcrLanguage:" target="-2" id="eCf-WM-PUN"/>
                                     </connections>
@@ -725,7 +725,7 @@ Gw
     </objects>
     <resources>
         <image name="KMImageNameElsei" width="15" height="14"/>
-        <image name="NSGoLeftTemplate" width="10" height="14"/>
-        <image name="NSGoRightTemplate" width="10" height="14"/>
+        <image name="NSGoLeftTemplate" width="12" height="17"/>
+        <image name="NSGoRightTemplate" width="12" height="17"/>
     </resources>
 </document>

PDF Office/PDF Master/Class/Purchase/KMConvertComparePayViewController.m

@@ -132,6 +132,7 @@
     } else {
         price = [IAPProductsManager defaultManager].PDFToOfficeProduct.price;
     }
+    
     self.priceLabel.stringValue = price ? : @"";
  
     self.priceDesLabel.stringValue = NSLocalizedString(@"one-time purchase", nil);

PDF Office/PDF Master/Class/Purchase/KMConvertComparePayViewController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>

PDF Office/PDF Master/Class/Purchase/KMConvertCompareViewController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>

PDF Office/PDF Master/MemberCenter/View/KMEnterNewPasswordView.swift

@@ -26,7 +26,8 @@ class KMEnterNewPasswordView: KMBaseXibView {
     convenience init(model: KMSignUpViewModel, superView: NSView) {
         self.init(frame: superView.bounds)
         viewModel = model
-        
+        viewModel.screenType = .enterNewPassword
+
         bindViewModel()
         languageLocalized()
         initializeUI()

PDF Office/PDF Master/MemberCenter/View/KMEnterVerificationCodeView.swift

@@ -32,6 +32,7 @@ class KMEnterVerificationCodeView: KMBaseXibView {
     convenience init(model: KMSignUpViewModel, superView: NSView) {
         self.init(frame: superView.bounds)
         viewModel = model
+        viewModel.screenType = .enterVerificationCode
 
         loadUI()
     }

PDF Office/PDF Master/MemberCenter/View/KMForgotPasswordView.swift

@@ -24,6 +24,7 @@ class KMForgotPasswordView: KMBaseXibView {
     convenience init(model: KMSignUpViewModel, superView: NSView) {
         self.init(frame: superView.bounds)
         viewModel = model
+        viewModel.screenType = .forgotPassword
 
         bindViewModel()
         languageLocalized()

PDF Office/PDF Master/MemberCenter/View/KMSignUpView.swift

@@ -45,6 +45,7 @@ class KMSignUpView: KMBaseXibView {
     convenience init(model: KMSignUpViewModel, superView: NSView) {
         self.init(frame: superView.bounds)
         viewModel = model
+        viewModel.screenType = .signUp
         
         bindViewModel()
         languageLocalized()

PDF Office/PDF Master/MemberCenter/ViewModel/KMSignUpViewModel.swift

@@ -18,6 +18,13 @@ import Combine
     case compare    // 比较表
 }
 
+@objc enum KMLoginScreenType : Int {
+    case signUp = 0   //
+    case forgotPassword    //
+    case enterVerificationCode    //
+    case enterNewPassword    //
+}
+
 typealias ForgotPasswordComplete = (_ success: Bool,_ msg: String) -> Void
 
 @objcMembers
@@ -62,6 +69,10 @@ class KMSignUpViewModel: ObservableObject {
      序列码按钮 文案
      */
     @Published var sendContent: String = NSLocalizedString("Send", tableName: "MemberCenterLocalizable", comment: "")
+    /**
+     当前视图类型
+     */
+    @Published var screenType: KMLoginScreenType = .signUp
 
     @Published private var timer: AnyCancellable?
     private var remainingSeconds: Int = 60

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

@@ -6,6 +6,7 @@
 //
 
 import Cocoa
+import Combine
 
 typealias LoginResultComplete = (_ success: Bool) -> Void
 
@@ -23,6 +24,9 @@ class KMLoginWindowsController: NSWindowController {
     
     var loginResult: LoginResultComplete!
     
+    private var viewModel = KMSignUpViewModel()
+    private var cancellables = Set<AnyCancellable>()
+
     static let shared: KMLoginWindowsController = {
         let windowC = KMLoginWindowsController(windowNibName: "KMLoginWindowsController")
         return windowC
@@ -52,7 +56,8 @@ class KMLoginWindowsController: NSWindowController {
         } else {
             leftImageView.image = NSImage(named: "WelcomePDFReaderPro1")
             
-            signUpView = KMSignUpView()
+            guard let parentView = self.window?.contentView else { return }
+            signUpView = KMSignUpView(model: viewModel, superView: parentView)
             if(signUpView != nil) {
                 signUpView?.frame = rightBox.frame
                 rightBox.contentView = signUpView!
@@ -89,6 +94,13 @@ class KMLoginWindowsController: NSWindowController {
         }
     }
     
+    // 刷新左侧视图
+    private func refreshSplitView() -> Void {
+        if viewModel.screenType == .signUp {
+            
+        }
+    }
+    
     // MARK: public Action
     
     @objc func loginSuccessNotification() -> Void {
@@ -107,4 +119,15 @@ class KMLoginWindowsController: NSWindowController {
         loginResult = complete
     }
     
+    // MARK: Bind Method
+    
+    func bindViewModel() -> Void {
+        viewModel.$screenType
+            .receive(on: RunLoop.main)
+            .sink { [weak self] newValue in
+                self?.refreshSplitView()
+            }
+            .store(in: &cancellables)
+        
+    }
 }