Browse Source

Merge branch 'develop_PDFReaderProNew' of git.kdan.cc:Mac_PDF/PDF_Office into develop_PDFReaderProNew

tangchao 3 months ago
parent
commit
bb5db25899

+ 1 - 1
PDF Office/PDF Master/Class/AIInfo/KMAIRequestServerManager.swift

@@ -953,7 +953,7 @@ class KMAIRequestServer {
                     }
                 } else {
                     if (completion != nil) {
-                        completion!(nil, nil, error as? NSError);
+                        completion!(nil, result, error as? NSError);
                     }
                 }
             } else {

+ 50 - 49
PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseEmbeddedWindowController.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="23504" 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="23504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -88,7 +88,7 @@
         <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"/>
             <rect key="contentRect" x="196" y="240" width="970" height="612"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="875"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1512" height="944"/>
             <value key="minSize" type="size" width="970" height="612"/>
             <value key="maxSize" type="size" width="970" height="612"/>
             <view key="contentView" id="se5-gp-TjO">
@@ -110,7 +110,7 @@
                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="hQ9-hE-7SE">
                                                 <rect key="frame" x="382" y="60" width="206" height="20"/>
                                                 <subviews>
-                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="D4J-Se-9AB">
+                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="D4J-Se-9AB">
                                                         <rect key="frame" x="-2" y="2" width="210" height="16"/>
                                                         <textFieldCell key="cell" title="Are you a student or a professor? " id="ag6-6K-D9d">
                                                             <font key="font" usesAppearanceFont="YES"/>
@@ -132,14 +132,14 @@
                                                 <subviews>
                                                     <button translatesAutoresizingMaskIntoConstraints="NO" id="yf6-a4-ZeM">
                                                         <rect key="frame" x="0.0" y="0.0" width="72" height="44"/>
-                                                        <constraints>
-                                                            <constraint firstAttribute="width" constant="72" id="5Vq-Vt-iaE"/>
-                                                            <constraint firstAttribute="height" constant="44" id="nG4-oe-Eyb"/>
-                                                        </constraints>
                                                         <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" image="EmbeddedPayment00" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="0uc-fz-0IJ">
                                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                             <font key="font" metaFont="system"/>
                                                         </buttonCell>
+                                                        <constraints>
+                                                            <constraint firstAttribute="width" constant="72" id="5Vq-Vt-iaE"/>
+                                                            <constraint firstAttribute="height" constant="44" id="nG4-oe-Eyb"/>
+                                                        </constraints>
                                                     </button>
                                                     <button translatesAutoresizingMaskIntoConstraints="NO" id="qfZ-QU-TIg">
                                                         <rect key="frame" x="72" y="0.0" width="72" height="44"/>
@@ -202,7 +202,7 @@
                                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="Dnb-jj-AQO">
                                                         <rect key="frame" x="0.0" y="472" width="335" height="20"/>
                                                         <subviews>
-                                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Plj-ou-oBV">
+                                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Plj-ou-oBV">
                                                                 <rect key="frame" x="-2" y="2" width="37" height="16"/>
                                                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="hQo-6M-c5W">
                                                                     <font key="font" usesAppearanceFont="YES"/>
@@ -220,7 +220,7 @@
                                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="ih0-ST-chg">
                                                         <rect key="frame" x="0.0" y="412" width="335" height="52"/>
                                                         <subviews>
-                                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="e5R-5a-vfZ">
+                                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="e5R-5a-vfZ">
                                                                 <rect key="frame" x="-2" y="36" width="339" height="16"/>
                                                                 <textFieldCell key="cell" title="Label" id="3l6-A2-xQx">
                                                                     <font key="font" usesAppearanceFont="YES"/>
@@ -234,7 +234,7 @@
                                                                     <rect key="frame" x="1" y="1" width="333" height="26"/>
                                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                     <subviews>
-                                                                        <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sU8-qq-wLc">
+                                                                        <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sU8-qq-wLc">
                                                                             <rect key="frame" x="6" y="5" width="321" height="16"/>
                                                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" placeholderString="Email to receive license code" id="7u6-O8-4hT">
                                                                                 <font key="font" usesAppearanceFont="YES"/>
@@ -267,7 +267,7 @@
                                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="O9F-uH-62i">
                                                         <rect key="frame" x="0.0" y="352" width="335" height="20"/>
                                                         <subviews>
-                                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="32Y-Vg-5EG">
+                                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="32Y-Vg-5EG">
                                                                 <rect key="frame" x="-2" y="2" width="107" height="16"/>
                                                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Payment Method" id="t4i-Kh-bbv">
                                                                     <font key="font" usesAppearanceFont="YES"/>
@@ -373,7 +373,7 @@
                                                             <constraint firstAttribute="height" constant="40" id="R1F-08-HUX"/>
                                                         </constraints>
                                                     </box>
-                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Bf9-95-LZa">
+                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Bf9-95-LZa">
                                                         <rect key="frame" x="-2" y="242" width="339" height="16"/>
                                                         <textFieldCell key="cell" alignment="left" title="Label" id="xst-Rc-74s">
                                                             <font key="font" usesAppearanceFont="YES"/>
@@ -384,7 +384,7 @@
                                                     <customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="W7H-2A-riS">
                                                         <rect key="frame" x="0.0" y="392" width="335" height="16"/>
                                                         <subviews>
-                                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="GJE-gl-04P">
+                                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="GJE-gl-04P">
                                                                 <rect key="frame" x="-2" y="0.0" width="339" height="16"/>
                                                                 <textFieldCell key="cell" title="Please enter your email for license receiving." id="5DH-ru-aM0">
                                                                     <font key="font" usesAppearanceFont="YES"/>
@@ -432,7 +432,7 @@
                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="tRc-PM-BHR">
                                                 <rect key="frame" x="24" y="16" width="538" height="492"/>
                                                 <subviews>
-                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lJA-9J-Qba">
+                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lJA-9J-Qba">
                                                         <rect key="frame" x="-2" y="476" width="542" height="16"/>
                                                         <textFieldCell key="cell" lineBreakMode="clipping" title="Your Order" id="Ozs-wZ-Jdr">
                                                             <font key="font" usesAppearanceFont="YES"/>
@@ -449,7 +449,7 @@
                                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="nrp-eO-h7F">
                                                                 <rect key="frame" x="0.0" y="0.0" width="283" height="48"/>
                                                                 <subviews>
-                                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cMG-Kh-1ON">
+                                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cMG-Kh-1ON">
                                                                         <rect key="frame" x="-2" y="32" width="287" height="16"/>
                                                                         <textFieldCell key="cell" lineBreakMode="clipping" title="PDF Reader Pro for Mac" id="QBk-Qf-dhQ">
                                                                             <font key="font" usesAppearanceFont="YES"/>
@@ -457,7 +457,7 @@
                                                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                         </textFieldCell>
                                                                     </textField>
-                                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cJd-qR-iKJ">
+                                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cJd-qR-iKJ">
                                                                         <rect key="frame" x="-2" y="16" width="287" height="16"/>
                                                                         <textFieldCell key="cell" title="Premium and PDF to Office Converter" id="eqO-Iv-kEM">
                                                                             <font key="font" usesAppearanceFont="YES"/>
@@ -465,7 +465,7 @@
                                                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                         </textFieldCell>
                                                                     </textField>
-                                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2wj-Wg-q7u">
+                                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2wj-Wg-q7u">
                                                                         <rect key="frame" x="-2" y="0.0" width="287" height="16"/>
                                                                         <textFieldCell key="cell" lineBreakMode="clipping" title="One License for One Mac. One Time Purchase." id="WE0-rH-JkS">
                                                                             <font key="font" usesAppearanceFont="YES"/>
@@ -490,7 +490,7 @@
                                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="RLY-aN-DYZ">
                                                                 <rect key="frame" x="340" y="0.0" width="198" height="48"/>
                                                                 <subviews>
-                                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JdB-wu-qih">
+                                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JdB-wu-qih">
                                                                         <rect key="frame" x="-2" y="32" width="202" height="16"/>
                                                                         <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="USD 59.99 " id="m0k-Bv-h3C">
                                                                             <font key="font" usesAppearanceFont="YES"/>
@@ -498,7 +498,7 @@
                                                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                         </textFieldCell>
                                                                     </textField>
-                                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4Ko-7d-Zp9">
+                                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4Ko-7d-Zp9">
                                                                         <rect key="frame" x="161" y="16" width="39" height="16"/>
                                                                         <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="79.99" id="YkX-gm-xyN">
                                                                             <font key="font" usesAppearanceFont="YES"/>
@@ -533,7 +533,7 @@
                                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="Imv-vq-rsc">
                                                                 <rect key="frame" x="0.0" y="72" width="538" height="20"/>
                                                                 <subviews>
-                                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ve4-zf-dcX">
+                                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ve4-zf-dcX">
                                                                         <rect key="frame" x="470" y="2" width="70" height="16"/>
                                                                         <textFieldCell key="cell" lineBreakMode="clipping" title="USD 79.99" id="PfN-Xw-Qsg">
                                                                             <font key="font" usesAppearanceFont="YES"/>
@@ -541,7 +541,7 @@
                                                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                         </textFieldCell>
                                                                     </textField>
-                                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="qhy-ap-sxt">
+                                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="qhy-ap-sxt">
                                                                         <rect key="frame" x="-2" y="2" width="61" height="16"/>
                                                                         <textFieldCell key="cell" lineBreakMode="clipping" title="List Price" id="NjG-V1-pcr">
                                                                             <font key="font" metaFont="system"/>
@@ -561,7 +561,7 @@
                                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="KXb-Fc-Ihu">
                                                                 <rect key="frame" x="0.0" y="44" width="538" height="20"/>
                                                                 <subviews>
-                                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zuM-1n-klX">
+                                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zuM-1n-klX">
                                                                         <rect key="frame" x="-2" y="2" width="58" height="16"/>
                                                                         <textFieldCell key="cell" lineBreakMode="clipping" title="Discount" id="fA9-YE-9nT">
                                                                             <font key="font" usesAppearanceFont="YES"/>
@@ -569,7 +569,7 @@
                                                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                         </textFieldCell>
                                                                     </textField>
-                                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="n83-tW-ibP">
+                                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="n83-tW-ibP">
                                                                         <rect key="frame" x="470" y="2" width="70" height="16"/>
                                                                         <textFieldCell key="cell" lineBreakMode="clipping" title="USD 20.00" id="iaA-9a-RmM">
                                                                             <font key="font" metaFont="system"/>
@@ -589,7 +589,7 @@
                                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="ZY4-l7-Ejn">
                                                                 <rect key="frame" x="0.0" y="0.0" width="538" height="28"/>
                                                                 <subviews>
-                                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="W9v-hZ-TbY">
+                                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="W9v-hZ-TbY">
                                                                         <rect key="frame" x="470" y="6" width="70" height="16"/>
                                                                         <textFieldCell key="cell" lineBreakMode="clipping" title="USD 59.99" id="zmn-H2-590">
                                                                             <font key="font" usesAppearanceFont="YES"/>
@@ -597,7 +597,7 @@
                                                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                         </textFieldCell>
                                                                     </textField>
-                                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9Ta-Z5-dCX">
+                                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9Ta-Z5-dCX">
                                                                         <rect key="frame" x="-2" y="6" width="55" height="16"/>
                                                                         <textFieldCell key="cell" lineBreakMode="clipping" title="Pay sum" id="ed2-fx-e4R">
                                                                             <font key="font" metaFont="system"/>
@@ -633,7 +633,7 @@
                                                                             <rect key="frame" x="1" y="1" width="318" height="26"/>
                                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                             <subviews>
-                                                                                <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lA7-Px-ulG">
+                                                                                <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lA7-Px-ulG">
                                                                                     <rect key="frame" x="6" y="5" width="314" height="16"/>
                                                                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" id="bOU-uz-Gia">
                                                                                         <font key="font" usesAppearanceFont="YES"/>
@@ -643,14 +643,14 @@
                                                                                 </textField>
                                                                                 <button translatesAutoresizingMaskIntoConstraints="NO" id="3y5-gc-zaR">
                                                                                     <rect key="frame" x="294" y="3" width="20" height="20"/>
-                                                                                    <constraints>
-                                                                                        <constraint firstAttribute="height" constant="20" id="sf2-M6-hOb"/>
-                                                                                        <constraint firstAttribute="width" constant="20" id="tzF-K4-ZxX"/>
-                                                                                    </constraints>
                                                                                     <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" image="ad_cancel_button00" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="VVQ-Bm-i0Z">
                                                                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                                         <font key="font" metaFont="system"/>
                                                                                     </buttonCell>
+                                                                                    <constraints>
+                                                                                        <constraint firstAttribute="height" constant="20" id="sf2-M6-hOb"/>
+                                                                                        <constraint firstAttribute="width" constant="20" id="tzF-K4-ZxX"/>
+                                                                                    </constraints>
                                                                                     <connections>
                                                                                         <action selector="couponClearButton:" target="-2" id="uRG-Gj-lvm"/>
                                                                                     </connections>
@@ -709,7 +709,7 @@
                                                                     <constraint firstItem="KlW-6M-F8A" firstAttribute="top" secondItem="o5K-ag-Vbf" secondAttribute="top" id="syK-Nu-TdQ"/>
                                                                 </constraints>
                                                             </customView>
-                                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yok-Ur-JfA">
+                                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yok-Ur-JfA">
                                                                 <rect key="frame" x="-2" y="100" width="542" height="16"/>
                                                                 <textFieldCell key="cell" title="Label" id="hyR-5a-ztf">
                                                                     <font key="font" usesAppearanceFont="YES"/>
@@ -763,14 +763,14 @@
                                                             </box>
                                                             <button translatesAutoresizingMaskIntoConstraints="NO" id="7t3-ch-kiy">
                                                                 <rect key="frame" x="0.0" y="8" width="32" height="16"/>
-                                                                <constraints>
-                                                                    <constraint firstAttribute="width" constant="32" id="6hB-r9-Pm4"/>
-                                                                    <constraint firstAttribute="height" constant="16" id="QtM-Wi-Flx"/>
-                                                                </constraints>
                                                                 <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" image="EmbeddedPayment03" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="4ah-qQ-9ju">
                                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                     <font key="font" metaFont="system"/>
                                                                 </buttonCell>
+                                                                <constraints>
+                                                                    <constraint firstAttribute="width" constant="32" id="6hB-r9-Pm4"/>
+                                                                    <constraint firstAttribute="height" constant="16" id="QtM-Wi-Flx"/>
+                                                                </constraints>
                                                                 <connections>
                                                                     <action selector="amountButtonAction:" target="-2" id="eWz-9K-64x"/>
                                                                 </connections>
@@ -783,19 +783,19 @@
                                                             </box>
                                                             <button tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="5ta-gx-G7H">
                                                                 <rect key="frame" x="91" y="8" width="32" height="16"/>
-                                                                <constraints>
-                                                                    <constraint firstAttribute="height" constant="16" id="LX5-lM-aLJ"/>
-                                                                    <constraint firstAttribute="width" constant="32" id="hwA-cT-gmt"/>
-                                                                </constraints>
                                                                 <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" image="EmbeddedPayment04" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="qIU-OL-6zl">
                                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                     <font key="font" metaFont="system"/>
                                                                 </buttonCell>
+                                                                <constraints>
+                                                                    <constraint firstAttribute="height" constant="16" id="LX5-lM-aLJ"/>
+                                                                    <constraint firstAttribute="width" constant="32" id="hwA-cT-gmt"/>
+                                                                </constraints>
                                                                 <connections>
                                                                     <action selector="amountButtonAction:" target="-2" id="ATs-Y1-Dcf"/>
                                                                 </connections>
                                                             </button>
-                                                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cCy-Cw-W9i">
+                                                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cCy-Cw-W9i">
                                                                 <rect key="frame" x="30" y="8" width="63" height="16"/>
                                                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" alignment="center" title="1" id="dy8-KA-MYf">
                                                                     <font key="font" metaFont="system"/>
@@ -834,9 +834,9 @@
                                                             <constraint firstItem="xIt-JB-DLi" firstAttribute="leading" secondItem="7t3-ch-kiy" secondAttribute="trailing" id="vOJ-kF-F09"/>
                                                         </constraints>
                                                     </customView>
-                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="m7F-pU-vLK">
-                                                        <rect key="frame" x="503" y="303" width="37" height="16"/>
-                                                        <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="o1x-jJ-2mD">
+                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="m7F-pU-vLK">
+                                                        <rect key="frame" x="-2" y="303" width="542" height="16"/>
+                                                        <textFieldCell key="cell" alignment="right" title="Label" id="o1x-jJ-2mD">
                                                             <font key="font" metaFont="system"/>
                                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -860,6 +860,7 @@
                                                     <constraint firstItem="2Hk-KG-FSr" firstAttribute="leading" secondItem="tRc-PM-BHR" secondAttribute="leading" id="ed5-oq-KZW"/>
                                                     <constraint firstItem="M6b-Qf-5FA" firstAttribute="top" secondItem="aGq-d0-5pa" secondAttribute="bottom" constant="24" id="gh6-Sh-5tG"/>
                                                     <constraint firstItem="aGq-d0-5pa" firstAttribute="leading" secondItem="tRc-PM-BHR" secondAttribute="leading" id="hw1-nX-OlU"/>
+                                                    <constraint firstItem="m7F-pU-vLK" firstAttribute="leading" secondItem="tRc-PM-BHR" secondAttribute="leading" id="oWj-3e-0V8"/>
                                                 </constraints>
                                             </customView>
                                         </subviews>
@@ -945,7 +946,7 @@
                             </constraints>
                             <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="EmbeddedPayment14" id="Q6h-Sg-TIg"/>
                         </imageView>
-                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="pcl-Qd-CLL">
+                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="pcl-Qd-CLL">
                             <rect key="frame" x="87" y="12" width="58" height="16"/>
                             <textFieldCell key="cell" lineBreakMode="clipping" title="Buy Now" id="PIg-4F-yje">
                                 <font key="font" metaFont="system"/>
@@ -998,7 +999,7 @@
                                 <rect key="frame" x="1" y="1" width="221" height="26"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <subviews>
-                                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4au-dI-0Fs">
+                                    <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4au-dI-0Fs">
                                         <rect key="frame" x="6" y="5" width="209" height="16"/>
                                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" placeholderString="Value" id="h6L-Q2-6Em">
                                             <font key="font" usesAppearanceFont="YES"/>
@@ -1215,7 +1216,7 @@
             <rect key="frame" x="0.0" y="0.0" width="445" height="264"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8Om-Bo-EFk">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8Om-Bo-EFk">
                     <rect key="frame" x="137" y="232" width="172" height="16"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" title="Scan QR Code with WeChat" id="dCY-vA-Gcp">
                         <font key="font" usesAppearanceFont="YES"/>
@@ -1253,7 +1254,7 @@
                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="Qf0-lb-5o7">
                             <rect key="frame" x="0.0" y="0.0" width="180" height="48"/>
                             <subviews>
-                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="asE-LH-mvG">
+                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="asE-LH-mvG">
                                     <rect key="frame" x="-2" y="32" width="184" height="16"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="Purchased" id="tOJ-Jb-ivS">
                                         <font key="font" usesAppearanceFont="YES"/>
@@ -1261,7 +1262,7 @@
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
-                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hj7-ST-7me">
+                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hj7-ST-7me">
                                     <rect key="frame" x="-2" y="0.0" width="184" height="16"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="Successfully" id="h2L-ZH-7FT">
                                         <font key="font" usesAppearanceFont="YES"/>

+ 5 - 7
PDF Office/PDF Master/Class/Purchase/DMG/Verification/KMVerificationMessageViewController.m

@@ -108,7 +108,7 @@ NSPopoverDelegate>
     
     NSString *tTips = NSLocalizedString(@"Upgrade to Pro", nil);
 #if VERSION_DMG
-    tTips = [NSString stringWithFormat:@"%@\n%@", NSLocalizedString(@"Upgrade to Permanent License with one time purchase", nil), NSLocalizedString(@"Complete the purchase in your web browser to get a license", nil)];
+    tTips = @"";
 #else
     tTips = [NSString stringWithFormat:@"%@\n%@", NSLocalizedString(@"Subscribe to All Access Pack to enjoy more expanded features.", nil), NSLocalizedString(@"Choose your favorite payment and enjoy flexible upgrades.", nil)];
 #endif
@@ -246,12 +246,12 @@ NSPopoverDelegate>
         type == KMUserScenarioTypeDmg_type44 ||
         type == KMUserScenarioTypeDmg_type45) {
         self.button.title = [NSString stringWithFormat:@" %@ ",NSLocalizedString(@"Upgrade", nil)];
-    } else if (type == KMUserScenarioTypeDmg_type4 ||
-               type == KMUserScenarioTypeDmg_type19 ||
-               type == KMUserScenarioTypeDmg_type34) {
+    } else if (type == KMUserScenarioTypeDmg_type4 ) {
         self.button.title = [NSString stringWithFormat:@" %@ ",NSLocalizedString(@"Free Trial", nil)];
     } else if (type == KMUserScenarioTypeDmg_type11 ||
+               type == KMUserScenarioTypeDmg_type19 ||
                type == KMUserScenarioTypeDmg_type22 ||
+               type == KMUserScenarioTypeDmg_type34 ||
                type == KMUserScenarioTypeDmg_type37 ) {
         self.button.title = [NSString stringWithFormat:@" %@ ",NSLocalizedStringFromTable(@"Buy Now", @"MemberCenterLocalizable", nil)];
     } else if (type == KMUserScenarioTypeDmg_type18 ||
@@ -527,9 +527,7 @@ NSPopoverDelegate>
 
 - (IBAction)buttonAction:(id)sender {
     KMUserScenarioType type = [KMMemberInfo shared].userScenarioType;
-    if (type == KMUserScenarioTypeDmg_type4 ||
-        type == KMUserScenarioTypeDmg_type19 ||
-        type == KMUserScenarioTypeDmg_type34) {
+    if (type == KMUserScenarioTypeDmg_type4) {
         [[KMProductCompareWC shared] setOrientation:YES];
         [[KMProductCompareWC shared] setOrientationType:KMCompareTableTypeTrial];
         [[KMProductCompareWC shared] showWindow:nil];

+ 5 - 3
PDF Office/PDF Master/MemberCenter/Assets/en.lproj/MemberCenterLocalizable.strings

@@ -99,9 +99,9 @@
 "Log in to the current device" = "Log in to the current device";
 "Unbind" = "Unbind";
 
-"PDF Reader Pro Standard - Annual Plan" = "PDF Reader Pro Advanced Annual Plan";
-"PDF Reader Pro Advanced - Annual Plan" = "PDF Reader Pro Advanced Annual Plan";
-"PDF Reader Pro Permanent" = "PDF Reader Pro Advanced Annual Plan";
+"PDF Reader Pro Standard - Annual Plan" = "PDF Reader Pro Standard - Annual Plan";
+"PDF Reader Pro Advanced - Annual Plan" = "PDF Reader Pro Advanced - Annual Plan";
+"PDF Reader Pro Permanent" = "PDF Reader Pro Permanent";
 "Subscribe to All Access Pack to Enjoy More Expanded Features" = "Subscribe to All Access Pack to Enjoy More Expanded Features";
 "Auto-renewal | Billed yearly" = "Auto-renewal | Billed yearly";
 "(Tax Incl.)" = "(Tax Incl.)";
@@ -185,3 +185,5 @@
 "enterprise version" = "enterprise version";
 
 "You can purchase with the account linked to this email. If the email is not registered, an account will be automatically created for you upon successful purchase." = "You can purchase with the account linked to this email. If the email is not registered, an account will be automatically created for you upon successful purchase.";
+
+"USD" = "USD";

+ 2 - 0
PDF Office/PDF Master/MemberCenter/Assets/zh-Hans.lproj/MemberCenterLocalizable.strings

@@ -181,3 +181,5 @@
 "enterprise version" = "企业版";
 
 "You can purchase with the account linked to this email. If the email is not registered, an account will be automatically created for you upon successful purchase." = "您可以通过此邮箱关联的账户购买。如该邮箱未注册,购买后将自动为您注册。";
+
+"USD" = "CN";

+ 2 - 0
PDF Office/PDF Master/MemberCenter/Assets/zh-Hant.lproj/MemberCenterLocalizable.strings

@@ -182,3 +182,5 @@
 "enterprise version" = "企業版";
 
 "You can purchase with the account linked to this email. If the email is not registered, an account will be automatically created for you upon successful purchase." = "您可以透過此郵箱關聯的帳戶購買。";
+
+"USD" = "TW";

+ 0 - 27
PDF Office/PDF Master/MemberCenter/Model/KMMemberInfo.swift

@@ -851,30 +851,6 @@ import Cocoa
     
     // 是否允许使用AI
     var isPermitAI: Bool {
-#if VERSION_FREE
-#if VERSION_DMG
-    // DMG
-  
-#else
-    // AppStore 免费版本
-        if KMMemberInfo.shared.isLogin {
-            if KMMemberInfo.shared.aiPoint > 0 {
-                return true
-            }
-            if AIInfoManager.default().aiInfo.totalToken - AIInfoManager.default().aiInfo.usedTimes > 0 {
-                return true
-            } else {
-                return false
-            }
-        } else {
-            if AIInfoManager.default().aiInfo.totalToken - AIInfoManager.default().aiInfo.usedTimes > 0 {
-                return true
-            }
-        }
-        return false
-#endif
-#else
-    // AppStore 付费版
         if KMMemberInfo.shared.isLogin {
             if KMMemberInfo.shared.aiPoint > 0 {
                 return true
@@ -882,14 +858,11 @@ import Cocoa
             if AIInfoManager.default().aiInfo.totalToken - AIInfoManager.default().aiInfo.usedTimes > 0 {
                 return true
             }
-            return false
         } else {
             if AIInfoManager.default().aiInfo.totalToken - AIInfoManager.default().aiInfo.usedTimes > 0 {
                 return true
             }
-            return false
         }
-#endif
         return false
     }
     

+ 5 - 1
PDF Office/PDF Master/MemberCenter/ViewController/KMUserInfoViewController.swift

@@ -1143,7 +1143,11 @@ class KMUserInfoViewController: NSViewController {
                     buyNow2Box.isHidden = true
                     buyNow1BoxLeftConst.constant = (CGRectGetWidth(view.bounds) - CGRectGetWidth(buyNow1Box.frame))/2
                 } else { // 免费
-                    
+                    if KMMemberInfo.shared.userScenarioType == .dmg_type19 ||
+                        KMMemberInfo.shared.userScenarioType == .dmg_type34 {
+                        buyNow2Box.isHidden = true
+                        buyNow1BoxLeftConst.constant = (CGRectGetWidth(view.bounds) - CGRectGetWidth(buyNow1Box.frame))/2
+                    }
                 }
             }
         }

+ 38 - 10
PDF Office/PDF Master/MemberCenter/ViewModel/KMProductModel.swift

@@ -429,25 +429,53 @@ class KMProductModel: ObservableObject {
 #if VERSION_DMG
     // DMG
             if type == .pdfReaderProStandard_dmg {
-                return getDMGPrice(productCode: "standard-annual-subscription")
+                if NSLocalizedString("USD", tableName: "MemberCenterLocalizable", comment: "") == "CN" {
+                    return String(format: "USD $%@", getDMGPrice(productCode: KMStandardAnnualSubscriptionCodeKey_DMG))
+                } else {
+                    return String(format: "CNY ¥%@", getDMGCNYPrice(productCode: KMStandardAnnualSubscriptionCodeKey_DMG))
+                }
             } else if type == .pdfReaderProAdvanced_dmg {
                 if isBlackFive {
-                    return getDMGPrice(productCode: "advanced-annual-subscription-blackFive")
+                    if NSLocalizedString("USD", tableName: "MemberCenterLocalizable", comment: "") == "CN" {
+                        return String(format: "USD $%@", getDMGPrice(productCode: KMAdvancedAnnualSubscriptionBlackFiveCodeKey_DMG))
+                    } else {
+                        return String(format: "CNY ¥%@", getDMGCNYPrice(productCode: KMAdvancedAnnualSubscriptionBlackFiveCodeKey_DMG))
+                    }
                 } else {
-                    return getDMGPrice(productCode: "advanced-annual-subscription")
+                    if NSLocalizedString("USD", tableName: "MemberCenterLocalizable", comment: "") == "CN" {
+                        return String(format: "USD $%@", getDMGPrice(productCode: KMAdvancedAnnualSubscriptionCodeKey_DMG))
+                    } else {
+                        return String(format: "CNY ¥%@", getDMGCNYPrice(productCode: KMAdvancedAnnualSubscriptionCodeKey_DMG))
+                    }
                 }
             } else if type == .pdfReaderProPermanent_dmg {
                 if isBlackFive {
-                    return getDMGPrice(productCode: "advanced-permanent-blackFive")
+                    if NSLocalizedString("USD", tableName: "MemberCenterLocalizable", comment: "") == "CN" {
+                        return String(format: "USD $%@", getDMGPrice(productCode: KMAdvancedPermanentBlackFiveCodeKey_DMG))
+                    } else {
+                        return String(format: "CNY ¥%@", getDMGCNYPrice(productCode: KMAdvancedPermanentBlackFiveCodeKey_DMG))
+                    }
                 } else {
-                    return getDMGPrice(productCode: "advanced-permanent")
+                    if NSLocalizedString("USD", tableName: "MemberCenterLocalizable", comment: "") == "CN" {
+                        return String(format: "USD $%@", getDMGPrice(productCode: KMAdvancedPermanentCodeKey_DMG))
+                    } else {
+                        return String(format: "CNY ¥%@", getDMGCNYPrice(productCode: KMAdvancedPermanentCodeKey_DMG))
+                    }
                 }
             } else if type == .pdfReaderProAIAnnual_dmg {
-                return getDMGPrice(productCode: "ai-subscription-year-trail")
+                if NSLocalizedString("USD", tableName: "MemberCenterLocalizable", comment: "") == "CN" {
+                    return String(format: "USD $%@", getDMGPrice(productCode: KMAISubscriptionYearTrailCodeKey_DMG))
+                } else {
+                    return String(format: "CNY ¥%@", getDMGCNYPrice(productCode: KMAISubscriptionYearTrailCodeKey_DMG))
+                }
             } else if type == .pdfReaderProAIMonthly_dmg {
-                return getDMGPrice(productCode: "ai-subscription-month")
+                if NSLocalizedString("USD", tableName: "MemberCenterLocalizable", comment: "") == "CN" {
+                    return String(format: "USD $%@", getDMGPrice(productCode: KMAISubscriptionMonthCodeKey_DMG))
+                } else {
+                    return String(format: "CNY ¥%@", getDMGCNYPrice(productCode: KMAISubscriptionMonthCodeKey_DMG))
+                }
             } else if type == .pdfToOffice_dmg {
-                return getDMGPrice(productCode: "PDF to Office")
+                
             } else if type == .add2Device_dmg {
             } else if type == .add3Device_dmg {
             }
@@ -911,7 +939,7 @@ class KMProductModel: ObservableObject {
             return [
                 "Benefit",
                 ["Supported platforms",                                                 "mac, windows, ios, android",   "mac, windows, ios, android",   "mac, windows, ios, android",   "mac, windows", "mac"],
-                ["Maximum number of accessible devices",                                "4 devices",                    "4 devices",                    "4 devices",                    "2 devices",    "1 devices"],
+                ["Maximum number of accessible devices",                                "4 devices",                    "4 devices",                    "4 devices",                    "1 devices",    "1 devices"],
                 "PDF to Office",
                 ["Convert PDFs to Word, HTML, TXT, JPEG or PNG files",                  "Only first 10 pages",          "Standard",                     "Advanced",                     "Advanced",     "Advanced"],
                 ["Turn PDF to PPT, Excel, RTF, CSV, and more",                          "Only first 10 pages",          "Only first 10 pages",          "✓",                            "✓",            "✓"],
@@ -963,7 +991,7 @@ class KMProductModel: ObservableObject {
             return [
                 "Benefit",
                 ["Supported platforms",                                                 "mac, windows, ios, android",   "mac, windows, ios, android",   "mac, windows, ios, android",   "mac, windows", "mac"],
-                ["Maximum number of accessible devices",                                "4 devices",                    "4 devices",                    "4 devices",                    "2 devices",    "1 devices"],
+                ["Maximum number of accessible devices",                                "4 devices",                    "4 devices",                    "4 devices",                    "1 devices",    "1 devices"],
                 "PDF to Office",
                 ["Convert PDFs to Word, HTML, TXT, JPEG or PNG files",                  "Only first 10 pages",          "Standard",                     "Advanced",                     "Advanced",     "Advanced"],
                 ["Turn PDF to PPT, Excel, RTF, CSV, and more",                          "Only first 10 pages",          "Only first 10 pages",          "✓",                            "✓",            "✓"],

+ 3 - 5
PDF Office/PDF Master/MemberCenter/WindowsController/KMLoginWindowsController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" 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="23504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -21,7 +21,7 @@
         <window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" titlebarAppearsTransparent="YES" id="F0z-JX-Cv5">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" fullSizeContentView="YES"/>
             <rect key="contentRect" x="196" y="240" width="661" height="443"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1512" height="944"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
             <value key="minSize" type="size" width="661" height="443"/>
             <value key="maxSize" type="size" width="661" height="443"/>
             <view key="contentView" id="se5-gp-TjO">
@@ -85,7 +85,6 @@
                         <constraints>
                             <constraint firstAttribute="width" constant="300" id="gk9-9U-WMj"/>
                         </constraints>
-                        <font key="titleFont" metaFont="message" size="11"/>
                     </box>
                     <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="L5U-6O-P63">
                         <rect key="frame" x="300" y="0.0" width="361" height="443"/>
@@ -93,7 +92,6 @@
                             <rect key="frame" x="0.0" y="0.0" width="361" height="443"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         </view>
-                        <font key="titleFont" metaFont="message" size="11"/>
                     </box>
                 </subviews>
                 <constraints>

+ 4 - 0
PDF Office/PDF Master/MemberCenter/WindowsController/KMProductCompareWC.swift

@@ -212,6 +212,10 @@ class KMProductCompareWC: NSWindowController {
 
         window?.backgroundColor = KMAppearance.Upgrade.vipBGColor()
         window?.isMovableByWindowBackground = true
+        
+#if VERSION_DMG
+        btnRestore.isHidden = true
+#endif
 
         // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
         bindViewModel()

+ 3 - 3
PDF Office/PDF Master/MemberCenter/WindowsController/KMProductCompareWC.xib

@@ -180,10 +180,10 @@
                                     <rect key="frame" x="28" y="61" width="320" height="43"/>
                                     <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="Euu-kC-XYf">
                                         <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
-                                        <autoresizingMask key="autoresizingMask"/>
+                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
                                             <textView editable="NO" importsGraphics="NO" richText="NO" verticallyResizable="YES" spellingCorrection="YES" smartInsertDelete="YES" id="GaB-cW-JRI">
-                                                <rect key="frame" x="0.0" y="13.456024169921875" width="320" height="263"/>
+                                                <rect key="frame" x="0.0" y="14" width="320" height="263"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -448,7 +448,7 @@ https://www.pdfreaderpro.com/privacy-policy</mutableString>
                         <rect key="frame" x="0.0" y="-50" width="970" height="518"/>
                         <clipView key="contentView" drawsBackground="NO" id="mXx-Ex-E5u">
                             <rect key="frame" x="0.0" y="0.0" width="970" height="518"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" tableStyle="plain" selectionHighlightStyle="none" columnSelection="YES" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="49" rowSizeStyle="automatic" viewBased="YES" id="UQf-R2-MfQ">
                                     <rect key="frame" x="0.0" y="0.0" width="970" height="518"/>