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

PDF Office/PDF Master/Class/KMLightMember/Controller/SubscriptionView/WaterMark/KMSubscribeWaterMarkWindowController.swift

@@ -125,7 +125,12 @@ class KMSubscribeWaterMarkWindowController: NSWindowController {
             }
             
             subscribeWaterMarkWindowController.watermarkExportAction = { controller in
-                completion(false, true, false)
+                if type.isConvertType() && !KMLightMemberManager.manager.isLogin() {
+                    completion(false, false, true)
+                } else {
+                    completion(false, true, false)
+                }
+                
                 subscribeWaterMarkMainWindow?.endSheet(controller.window!)
                 controller.window?.close()
                 subscribeWaterMarkController = nil
@@ -150,16 +155,16 @@ class KMSubscribeWaterMarkWindowController: NSWindowController {
             }
             
             if isContinue {
-                if type == .merge {
-                    subscribeWaterMarkWindowController.waterMarkView.waterExportButton.title = NSLocalizedString("Save with Watermark", comment: "")
-                } else {
-                    subscribeWaterMarkWindowController.waterMarkView.waterExportButton.title = NSLocalizedString("Save and Continue", comment: "")
-                }
+                subscribeWaterMarkWindowController.waterMarkView.waterExportButton.title = NSLocalizedString("Save with Watermark", comment: "")
             } else {
                 if type == .merge {
-                    subscribeWaterMarkWindowController.waterMarkView.waterExportButton.title = NSLocalizedString("Delete from the file list.", comment: "")
+                    subscribeWaterMarkWindowController.waterMarkView.waterExportButton.title = NSLocalizedString("Delete From the File List", comment: "")
                 } else if type.isConvertType() {
-                    subscribeWaterMarkWindowController.waterMarkView.waterExportButton.title = NSLocalizedString("Convert First 10 Pages", comment: "")
+                    if KMLightMemberManager.manager.isLogin() {
+                        subscribeWaterMarkWindowController.waterMarkView.waterExportButton.title = NSLocalizedString("Convert First 10 Pages", comment: "")
+                    } else {
+                        subscribeWaterMarkWindowController.waterMarkView.waterExportButton.title = NSLocalizedString("Cancel", comment: "")
+                    }
                 } else {
                     subscribeWaterMarkWindowController.waterMarkView.waterExportButton.title = NSLocalizedString("Save with Watermark", comment: "")
                 }
@@ -211,7 +216,7 @@ class KMSubscribeWaterMarkWindowController: NSWindowController {
         if KMLightMemberManager.manager.isLogin() {
             self.waterViewHeightConstrain.constant = 624
         } else {
-            self.waterViewHeightConstrain.constant = 505
+            self.waterViewHeightConstrain.constant = 485
         }
     }
     

PDF Office/PDF Master/Class/KMLightMember/Controller/SubscriptionView/WaterMark/View/KMSubscribeWaterMarkView.swift

@@ -132,16 +132,16 @@ class KMSubscribeWaterMarkView: KMBaseXibView {
             self.waterExportButton.title = NSLocalizedString("Save with Watermark", comment: "")
             self.subscribeLabel.stringValue = NSLocalizedString("Upgrade Now", comment: "")
         } else {
-            self.subtitleContentHeightConstraint.constant = 80
+            self.subtitleContentHeightConstraint.constant = 60
             self.collectionContentViewHeightConstraint.constant = 180
-            self.collectionViewContentTopConstraint.constant = 116
+            self.collectionViewContentTopConstraint.constant = 96
             self.titleLabel.stringValue = NSLocalizedString("Login Benefits", comment: "")
             self.waterExportButton.title = NSLocalizedString("Save with Watermark ", comment: "")
             self.subscribeLabel.stringValue = NSLocalizedString("Login or Sign up", comment: "")
         }
 //        + "  " + NSLocalizedString("Subscription", comment: ""
         
-        let subtitleString = NSLocalizedString("This is a trial version. While saving, PDF Master's watermark will be added to the document. Upgrade to enjoy our powerful PDF Master!", comment: "")
+        let subtitleString = NSLocalizedString("This is a trial version. While saving, PDF Master's watermark will be added to the document.", comment: "")
         let paragraphStyle = NSMutableParagraphStyle()
         paragraphStyle.lineHeightMultiple = 1.32
         paragraphStyle.alignment = .left

PDF Office/PDF Master/Class/KMLightMember/Controller/SubscriptionView/WaterMark/View/KMSubscribeWaterMarkView.xib

@@ -76,7 +76,7 @@
                     </textFieldCell>
                 </textField>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="MG4-H3-ZA1">
-                    <rect key="frame" x="28" y="153" width="324" height="180"/>
+                    <rect key="frame" x="28" y="173" width="324" height="180"/>
                     <subviews>
                         <scrollView wantsLayer="YES" borderType="none" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iQs-EU-LBJ">
                             <rect key="frame" x="0.0" y="0.0" width="324" height="180"/>
@@ -124,13 +124,12 @@
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="Ja4-Z7-bde">
-                    <rect key="frame" x="28" y="353" width="324" height="80"/>
+                    <rect key="frame" x="28" y="373" width="324" height="60"/>
                     <subviews>
                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gOH-TM-kj5">
-                            <rect key="frame" x="6" y="16" width="312" height="64"/>
-                            <textFieldCell key="cell" alignment="center" id="IIZ-dr-HjX">
+                            <rect key="frame" x="6" y="28" width="312" height="32"/>
+                            <textFieldCell key="cell" alignment="center" title="This is a trial version. While saving, PDF Master's watermark will be added to the document." id="IIZ-dr-HjX">
                                 <font key="font" usesAppearanceFont="YES"/>
-                                <string key="title">You are currently a trial version. When you perform the save operation, the file will be saved and the PDF Master official trial watermark will be added.</string>
                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                             </textFieldCell>
@@ -144,7 +143,7 @@
                     </subviews>
                     <constraints>
                         <constraint firstItem="gOH-TM-kj5" firstAttribute="top" secondItem="Ja4-Z7-bde" secondAttribute="top" id="J7i-aX-LIu"/>
-                        <constraint firstAttribute="height" constant="80" id="K87-HL-fyQ"/>
+                        <constraint firstAttribute="height" constant="60" id="K87-HL-fyQ"/>
                         <constraint firstItem="FOh-IP-TS8" firstAttribute="leading" secondItem="Ja4-Z7-bde" secondAttribute="leading" id="Rwz-0E-Zj1"/>
                         <constraint firstItem="gOH-TM-kj5" firstAttribute="leading" secondItem="Ja4-Z7-bde" secondAttribute="leading" constant="8" id="T6O-zG-DYq"/>
                         <constraint firstAttribute="width" constant="324" id="dFa-YB-Dgm"/>
@@ -197,7 +196,7 @@
                 </customView>
             </subviews>
             <constraints>
-                <constraint firstItem="MG4-H3-ZA1" firstAttribute="top" secondItem="2cQ-02-iHc" secondAttribute="bottom" constant="116" id="1nd-N2-IpE"/>
+                <constraint firstItem="MG4-H3-ZA1" firstAttribute="top" secondItem="2cQ-02-iHc" secondAttribute="bottom" constant="96" id="1nd-N2-IpE"/>
                 <constraint firstItem="Ja4-Z7-bde" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="28" id="5v1-aH-ewg"/>
                 <constraint firstItem="2cQ-02-iHc" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" constant="40" id="GRL-zJ-hGD"/>
                 <constraint firstItem="ki6-ve-E1f" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="28" id="HdL-el-MI0"/>

PDF Office/PDF Master/Strings/en.lproj/Localizable.strings

@@ -743,9 +743,9 @@
 "On upgrading your account, you can enjoy all AI features in PDF Master."     =     "On upgrading your account, you can enjoy all AI features in PDF Master.";
 "OK"     =     "OK";
 "The trial version can convert only 2 files at a time."     =     "The trial version can convert only 2 files at a time.";
-"Delete from the file list."     =     "Delete from the file list.";
+"Delete From the File List"     =     "Delete From the File List";
 "Save and Continue" = "Save and Continue";
-"This is a trial version. While saving, PDF Master's watermark will be added to the document. Upgrade to enjoy our powerful PDF Master!" = "This is a trial version. While saving, PDF Master's watermark will be added to the document. Upgrade to enjoy our powerful PDF Master!";
+"This is a trial version. While saving, PDF Master's watermark will be added to the document." = "This is a trial version. While saving, PDF Master's watermark will be added to the document.";
 "Merge 2 files at a time" = "Merge 2 files at a time";
 //MARK: - Pro Mac 多语