tangchao 2 лет назад
Родитель
Сommit
c284a9c7da

BIN
PDF Office/PDF Office.xcodeproj/project.xcworkspace/xcuserdata/kdanmobile.xcuserdatad/UserInterfaceState.xcuserstate


+ 1 - 1
PDF Office/PDF Office/Class/Common/Tools/KMTools.swift

@@ -10,7 +10,7 @@ import Cocoa
 @objc class KMTools: NSObject {
     
     // MARK: -
-    // 获取已打开的文件
+    // MARK: 获取已打开的文件
     @objc class func getOpenDocumentURLs() -> [URL] {
         var files:[URL] = []
         for window in NSApp.windows {

+ 15 - 15
PDF Office/PDF Office/Class/PDFTools/Convert/Controller/KMConvertBaseWindowController.xib

@@ -30,7 +30,7 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="586" height="483"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="3008" height="1667"/>
             <value key="minSize" type="size" width="586" height="483"/>
             <value key="maxSize" type="size" width="586" height="483"/>
             <view key="contentView" id="se5-gp-TjO">
@@ -279,14 +279,14 @@
             <rect key="frame" x="0.0" y="0.0" width="276" height="250"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="5he-u9-XoC">
-                    <rect key="frame" x="0.0" y="170" width="276" height="80"/>
+                <box hidden="YES" boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="5he-u9-XoC">
+                    <rect key="frame" x="0.0" y="249" width="276" height="1"/>
                     <view key="contentView" id="eeu-BZ-k90">
-                        <rect key="frame" x="0.0" y="0.0" width="276" height="80"/>
+                        <rect key="frame" x="0.0" y="0.0" width="276" height="1"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="whh-eW-WBM">
-                                <rect key="frame" x="14" y="59" width="35" height="15"/>
+                                <rect key="frame" x="14" y="-20" width="35" height="15"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="ROy-KL-lN4">
                                     <font key="font" metaFont="cellTitle"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -294,13 +294,13 @@
                                 </textFieldCell>
                             </textField>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="sIu-Jp-911" customClass="KMImageTitleButton" customModule="PDF_Office" customModuleProvider="target">
-                                <rect key="frame" x="16" y="29" width="244" height="22"/>
+                                <rect key="frame" x="16" y="-50" width="244" height="22"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="22" id="vJn-IG-4gT"/>
                                 </constraints>
                             </customView>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="y6s-OJ-cG8" customClass="KMImageTitleButton" customModule="PDF_Office" customModuleProvider="target">
-                                <rect key="frame" x="16" y="-1" width="244" height="22"/>
+                                <rect key="frame" x="16" y="-80" width="244" height="22"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="22" id="obd-W8-at7"/>
                                 </constraints>
@@ -318,11 +318,11 @@
                         </constraints>
                     </view>
                     <constraints>
-                        <constraint firstAttribute="height" constant="80" id="WFv-SH-7qr"/>
+                        <constraint firstAttribute="height" constant="1" id="WFv-SH-7qr"/>
                     </constraints>
                 </box>
                 <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="oS9-mp-RTl">
-                    <rect key="frame" x="0.0" y="169" width="276" height="1"/>
+                    <rect key="frame" x="0.0" y="248" width="276" height="1"/>
                     <view key="contentView" id="bKQ-mM-Aps">
                         <rect key="frame" x="0.0" y="0.0" width="276" height="1"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -332,7 +332,7 @@
                     </constraints>
                 </box>
                 <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="zlB-1P-aoC">
-                    <rect key="frame" x="0.0" y="93" width="276" height="60"/>
+                    <rect key="frame" x="0.0" y="180" width="276" height="60"/>
                     <view key="contentView" id="0WM-4e-ju8">
                         <rect key="frame" x="0.0" y="0.0" width="276" height="60"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -348,7 +348,7 @@
                 <constraint firstItem="zlB-1P-aoC" firstAttribute="leading" secondItem="LzC-nd-jo2" secondAttribute="leading" id="X9f-jY-z7h"/>
                 <constraint firstAttribute="trailing" secondItem="5he-u9-XoC" secondAttribute="trailing" id="YCV-gd-cQ1"/>
                 <constraint firstItem="oS9-mp-RTl" firstAttribute="top" secondItem="5he-u9-XoC" secondAttribute="bottom" id="Yvo-B6-KOz"/>
-                <constraint firstItem="zlB-1P-aoC" firstAttribute="top" secondItem="oS9-mp-RTl" secondAttribute="bottom" constant="16" id="dr9-jQ-dN1"/>
+                <constraint firstItem="zlB-1P-aoC" firstAttribute="top" secondItem="oS9-mp-RTl" secondAttribute="bottom" constant="8" id="dr9-jQ-dN1"/>
                 <constraint firstAttribute="trailing" secondItem="oS9-mp-RTl" secondAttribute="trailing" id="hR0-ek-1Ah"/>
                 <constraint firstItem="5he-u9-XoC" firstAttribute="leading" secondItem="LzC-nd-jo2" secondAttribute="leading" id="s0p-Yk-GHo"/>
                 <constraint firstItem="5he-u9-XoC" firstAttribute="top" secondItem="LzC-nd-jo2" secondAttribute="top" id="xJ1-Hx-LUO"/>
@@ -382,7 +382,7 @@
                     </buttonCell>
                 </button>
                 <comboBox verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yE5-BA-JsU">
-                    <rect key="frame" x="23" y="15" width="234" height="23"/>
+                    <rect key="frame" x="24" y="14" width="233" height="25"/>
                     <comboBoxCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" completes="NO" numberOfVisibleItems="5" id="X84-Gf-tPc">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -468,7 +468,7 @@
                                 </textFieldCell>
                             </textField>
                             <comboBox hidden="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="A3v-M6-Ruh">
-                                <rect key="frame" x="23" y="51" width="216" height="23"/>
+                                <rect key="frame" x="24" y="50" width="215" height="25"/>
                                 <comboBoxCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" completes="NO" numberOfVisibleItems="5" id="KT9-cv-uGO">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -481,7 +481,7 @@
                                 </comboBoxCell>
                             </comboBox>
                             <comboBox verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yhD-91-oLg">
-                                <rect key="frame" x="23" y="13" width="216" height="23"/>
+                                <rect key="frame" x="24" y="13" width="215" height="25"/>
                                 <comboBoxCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" completes="NO" numberOfVisibleItems="5" id="TKk-wg-Ocx">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -576,7 +576,7 @@
                                 </buttonCell>
                             </button>
                             <comboBox verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="uah-L1-IyT">
-                                <rect key="frame" x="31" y="-13" width="215" height="23"/>
+                                <rect key="frame" x="32" y="-14" width="214" height="25"/>
                                 <comboBoxCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" completes="NO" numberOfVisibleItems="5" id="X1R-ss-GZO">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>

+ 1 - 1
PDF Office/PDF Office/Class/PDFTools/Convert/View/KMConvertWordSettingView.swift

@@ -27,7 +27,7 @@ class KMConvertWordSettingView: KMConvertSettingView, NibLoadable {
             return ocrItemView.languageComboBox.stringValue
         }
     }
-    
+    // 流排 0 框排 1
     var pageSettingSelectedIndex: Int = 0
     
     static var nibName: String? {