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

PDF Office/PDF Master/AppDelegate.swift

@@ -127,8 +127,17 @@ class AppDelegate: NSObject, NSApplicationDelegate, iRateDelegate{
                     } else {
                         KMMemberInfo.shared.isLogin = false
                     }
+#if VERSION_DMG
+            let model = KMProductModel()
+            model.getDMGProductDatas()
+#endif
                 }
             }
+        } else {
+#if VERSION_DMG
+            let model = KMProductModel()
+            model.getDMGProductDatas()
+#endif
         }
 
         KMStatusBar.system()
@@ -187,9 +196,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, iRateDelegate{
 #if VERSION_DMG
         VerificationManager.default()
         KMDMGProductsManager.shareInstance.getProductDatas()
-        
-        let model = KMProductModel()
-        model.getDMGProductDatas()
 #else
         self.initiVersionData()
         IAPProductsManager.default().initIAP()

PDF Office/PDF Master/Class/Batch/WindowController/VC/KMBatchOperateConvertViewController.swift

@@ -407,20 +407,9 @@ class KMBatchOperateConvertViewController: KMBatchOperateBaseViewController{
     }
     
     func convertActionVC() {
-        var vc: KMToolCompareWindowController? = nil
-        if(.WordStandard == self.convertType ||
-            .WordAdvance == self.convertType) {
-            vc = KMToolCompareWindowController(toolType: .Convert, selectNum: 1)
-        } else if (.Excel == self.convertType) {
-            vc = KMToolCompareWindowController(toolType: .Convert, selectNum: 2)
-        } else if (.PowerPoint == self.convertType) {
-            vc = KMToolCompareWindowController(toolType: .Convert, selectNum: 3)
-        } else if (self.convertType == .JPG || self.convertType == .PNG || self.convertType == .GIF || self.convertType == .TIFF || self.convertType == .TGA || self.convertType == .BMP){
-            vc = KMToolCompareWindowController(toolType: .Convert, selectNum: 4)
-        } else {
-            vc = KMToolCompareWindowController(toolType: .Convert, selectNum: 0)
+        if(KMMemberInfo.shared.isLogin == false) {
+            KMLoginWindowsController.shared.showWindow(nil)
         }
-        vc?.showWindow(nil)
     }
     
     func prepareData() {
@@ -630,6 +619,14 @@ class KMBatchOperateConvertViewController: KMBatchOperateBaseViewController{
         }
     }
     
+    @IBAction func buttonClicked_MoreConvert(_ sender: NSButton) {
+        if KMMemberInfo.shared.isMemberAllFunction == true {
+            if(KMMemberInfo.shared.isLogin == false) {
+                KMLoginWindowsController.shared.showWindow(nil)
+            }
+        }
+    }
+    
     @IBAction func buttonClicked_excelStyle(_ sender: NSButton) {
         if sender == onlyTextBtn {
             onlyTextBtn.state = NSControl.StateValue.on

PDF Office/PDF Master/Class/Batch/WindowController/VC/KMBatchOperateConvertViewController.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>
@@ -44,32 +44,32 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView id="Hz6-mo-xeY">
-            <rect key="frame" x="0.0" y="0.0" width="334" height="575"/>
+            <rect key="frame" x="0.0" y="0.0" width="340" height="575"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="RWh-gu-eYa">
-                    <rect key="frame" x="0.0" y="0.0" width="334" height="525"/>
+                    <rect key="frame" x="0.0" y="0.0" width="340" height="525"/>
                     <subviews>
                         <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="x4l-h4-1bj">
-                            <rect key="frame" x="16" y="16" width="302" height="32"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="32" id="SUn-Xj-aci"/>
-                            </constraints>
+                            <rect key="frame" x="16" y="16" width="308" height="32"/>
                             <buttonCell key="cell" type="square" title="Button" bezelStyle="shadowlessSquare" alignment="center" imageScaling="proportionallyDown" inset="2" id="46F-Eo-5Pf">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                 <font key="font" metaFont="system"/>
                             </buttonCell>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="32" id="SUn-Xj-aci"/>
+                            </constraints>
                             <connections>
                                 <action selector="buttonClicked_Convert:" target="-2" id="Lwc-MC-9me"/>
                             </connections>
                         </button>
                         <box borderType="none" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="CFq-W0-Zmt">
-                            <rect key="frame" x="7" y="421" width="320" height="96"/>
+                            <rect key="frame" x="10" y="419" width="320" height="96"/>
                             <view key="contentView" id="nMO-Go-Yia">
                                 <rect key="frame" x="0.0" y="0.0" width="320" height="96"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <subviews>
-                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QnU-CY-IXa">
+                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QnU-CY-IXa">
                                         <rect key="frame" x="8" y="80" width="47" height="16"/>
                                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Format" id="L4l-l6-Cwv">
                                             <font key="font" metaFont="system"/>
@@ -102,16 +102,19 @@
                                             <subviews>
                                                 <button translatesAutoresizingMaskIntoConstraints="NO" id="NEt-WC-ZBS">
                                                     <rect key="frame" x="0.0" y="17" width="20" height="14"/>
-                                                    <constraints>
-                                                        <constraint firstAttribute="height" constant="14" id="JCq-cE-ega"/>
-                                                        <constraint firstAttribute="width" constant="20" id="hrx-ih-W3K"/>
-                                                    </constraints>
                                                     <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="KMImageNameElsei" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="DQY-j6-yh4">
                                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                         <font key="font" metaFont="system"/>
                                                     </buttonCell>
+                                                    <constraints>
+                                                        <constraint firstAttribute="height" constant="14" id="JCq-cE-ega"/>
+                                                        <constraint firstAttribute="width" constant="20" id="hrx-ih-W3K"/>
+                                                    </constraints>
+                                                    <connections>
+                                                        <action selector="moreButtonAction:" target="-2" id="9u4-j3-jvc"/>
+                                                    </connections>
                                                 </button>
-                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="l7W-85-8as">
+                                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="l7W-85-8as">
                                                     <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="pwH-2G-D1M">
                                                         <font key="font" metaFont="system"/>
@@ -162,13 +165,13 @@
                             </view>
                         </box>
                         <box hidden="YES" boxType="custom" borderWidth="0.0" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="ibJ-Ae-4ze">
-                            <rect key="frame" x="10" y="368" width="314" height="52"/>
+                            <rect key="frame" x="10" y="362" width="320" height="52"/>
                             <view key="contentView" id="wyk-JI-a7n">
-                                <rect key="frame" x="0.0" y="0.0" width="314" height="52"/>
+                                <rect key="frame" x="0.0" y="0.0" width="320" height="52"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <subviews>
                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="25B-gC-8fw">
-                                        <rect key="frame" x="8" y="35" width="296" height="18"/>
+                                        <rect key="frame" x="8" y="35" width="302" height="18"/>
                                         <buttonCell key="cell" type="radio" title="Convert each page to a separate worksheet" bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on" inset="2" id="1mv-Zc-aNk">
                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                             <font key="font" metaFont="system"/>
@@ -178,7 +181,7 @@
                                         </connections>
                                     </button>
                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="W18-qh-sPN">
-                                        <rect key="frame" x="8" y="9" width="296" height="18"/>
+                                        <rect key="frame" x="8" y="9" width="302" height="18"/>
                                         <buttonCell key="cell" type="radio" title="Convert all pages to a single worksheet(.xlsx)" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="QLl-EC-oIz">
                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                             <font key="font" metaFont="system"/>
@@ -201,17 +204,13 @@
                             <font key="titleFont" metaFont="system"/>
                         </box>
                         <box boxType="custom" borderWidth="0.0" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="uy4-Qr-7eJ">
-                            <rect key="frame" x="10" y="342" width="314" height="78"/>
+                            <rect key="frame" x="10" y="336" width="320" height="78"/>
                             <view key="contentView" id="R8m-s9-ne3">
-                                <rect key="frame" x="0.0" y="0.0" width="314" height="78"/>
+                                <rect key="frame" x="0.0" y="0.0" width="320" height="78"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <subviews>
                                     <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9la-KC-6B2">
                                         <rect key="frame" x="105" y="56" width="142" height="25"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" relation="lessThanOrEqual" constant="135" id="JWV-qB-ggN"/>
-                                            <constraint firstAttribute="height" constant="20" id="fWe-45-Ym6"/>
-                                        </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="epp-Ft-5F3" id="xeQ-6P-lCV">
                                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="menu"/>
@@ -222,6 +221,10 @@
                                                 </items>
                                             </menu>
                                         </popUpButtonCell>
+                                        <constraints>
+                                            <constraint firstAttribute="width" relation="lessThanOrEqual" constant="135" id="JWV-qB-ggN"/>
+                                            <constraint firstAttribute="height" constant="20" id="fWe-45-Ym6"/>
+                                        </constraints>
                                         <connections>
                                             <action selector="buttonClickec_allContentMenu:" target="-2" id="eQx-K2-gok"/>
                                         </connections>
@@ -248,10 +251,6 @@
                                     </button>
                                     <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7w3-37-Dma">
                                         <rect key="frame" x="96" y="30" width="152" height="25"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" constant="145" id="2cD-S3-EPI"/>
-                                            <constraint firstAttribute="height" constant="20" id="tN7-9c-6nd"/>
-                                        </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="lcq-HI-HHW" id="92O-me-cxZ">
                                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="menu"/>
@@ -263,6 +262,10 @@
                                                 </items>
                                             </menu>
                                         </popUpButtonCell>
+                                        <constraints>
+                                            <constraint firstAttribute="width" constant="145" id="2cD-S3-EPI"/>
+                                            <constraint firstAttribute="height" constant="20" id="tN7-9c-6nd"/>
+                                        </constraints>
                                         <connections>
                                             <action selector="buttonClicked_tableMenu:" target="-2" id="Wev-Mw-MFp"/>
                                         </connections>
@@ -297,7 +300,7 @@
                             <font key="titleFont" metaFont="system"/>
                         </box>
                         <button hidden="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9oz-Jm-qNR">
-                            <rect key="frame" x="13" y="403" width="306" height="18"/>
+                            <rect key="frame" x="13" y="397" width="312" height="18"/>
                             <buttonCell key="cell" type="check" title="Check" bezelStyle="regularSquare" imagePosition="left" inset="2" id="SV4-we-las">
                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                 <font key="font" metaFont="system"/>
@@ -307,7 +310,7 @@
                             </connections>
                         </button>
                         <box borderType="none" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="pvL-bb-6g1">
-                            <rect key="frame" x="7" y="168" width="320" height="104"/>
+                            <rect key="frame" x="10" y="165" width="320" height="101"/>
                             <view key="contentView" id="wNe-bc-ZiD">
                                 <rect key="frame" x="0.0" y="0.0" width="320" height="87"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -322,7 +325,7 @@
                                             <action selector="comboxClicked_SupoortOCR:" target="-2" id="Pkn-i5-sfR"/>
                                         </connections>
                                     </button>
-                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="IFE-Qi-wNe">
+                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="IFE-Qi-wNe">
                                         <rect key="frame" x="18" y="35" width="294" height="16"/>
                                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Document Language:" id="cJh-KZ-pao">
                                             <font key="font" metaFont="system"/>
@@ -508,7 +511,7 @@
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="HlZ-Fb-Ttq" customClass="KMConvertCollectionViewHeader" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                    <rect key="frame" x="0.0" y="525" width="334" height="50"/>
+                    <rect key="frame" x="0.0" y="525" width="340" height="50"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="50" id="H2J-A1-Bx6"/>
                     </constraints>

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

@@ -1040,19 +1040,9 @@ let kConvertFileSavePath = (kTempSavePath?.stringByAppendingPathComponent("conve
         }
 #else
         if KMMemberInfo.shared.isMemberAllFunction == true {
-            var vc: KMToolCompareWindowController? = nil
-            if convertType == .Word || convertType == .AdvancedWord {
-                vc = KMToolCompareWindowController.toolCompare(toolType: .Convert, selectNum: 1)
-            } else if convertType == .Excel {
-                vc = KMToolCompareWindowController.toolCompare(toolType: .Convert, selectNum: 2)
-            } else if convertType == .PPT {
-                vc = KMToolCompareWindowController.toolCompare(toolType: .Convert, selectNum: 3)
-            } else if convertType.rawValue < 15 && convertType.rawValue > 7 {
-                vc = KMToolCompareWindowController.toolCompare(toolType: .Convert, selectNum: 4)
-            } else {
-                vc = KMToolCompareWindowController.toolCompare(toolType: .Convert, selectNum: 0)
+            if(KMMemberInfo.shared.isLogin == false) {
+                KMLoginWindowsController.shared.showWindow(nil)
             }
-            vc?.showWindow(nil)
         } else {
             KMMemberInfo.shared.advancedFunctionUsage()
         }

PDF Office/PDF Master/MemberCenter/ViewController/KMUserInfoViewController.xib

@@ -547,7 +547,7 @@
                         <subviews>
                             <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="xbI-Sr-E2G">
                                 <rect key="frame" x="0.0" y="0.0" width="81" height="39"/>
-                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="5ot-4m-K7m"/>
+                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="axesIndependently" id="5ot-4m-K7m"/>
                             </imageView>
                             <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="t8m-r3-wJE">
                                 <rect key="frame" x="10" y="12" width="41" height="16"/>
@@ -714,7 +714,7 @@
                                             <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cjO-qk-Gbb">
                                                 <rect key="frame" x="15" y="2" width="24" height="14"/>
                                                 <textFieldCell key="cell" lineBreakMode="clipping" title="dev" id="0a3-kx-4jm">
-                                                    <font key="font" metaFont="system" size="11"/>
+                                                    <font key="font" metaFont="smallSystem"/>
                                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                 </textFieldCell>

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

@@ -1233,6 +1233,8 @@ extension KMProductCompareWC: NSTableViewDelegate, NSTableViewDataSource {
     // Helper function to configure each individual value
     private func configureCellView(_ cellView: KMProductCompareTableCell, value: String, label: NSTextField?, imageView: NSImageView?, platformsBox: NSBox?) {
         platformsBox?.isHidden = true
+        label?.isHidden = false
+        imageView?.isHidden = false
         switch value {
         case "X":
             label?.stringValue = ""