Browse Source

【2025】【综合】Lite兼容处理

niehaoyu 2 months ago
parent
commit
59d1081346

+ 49 - 49
PDF Office/PDF Master/Class/PDFTools/PageEdit/Base/KMPageEditSettingBaseWindowController.xib

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMPageEditSettingBaseWindowController" customModule="PDF_Master" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMPageEditSettingBaseWindowController" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="cancelButton" destination="aGH-iF-dyv" id="GkV-FC-Pc2"/>
                 <outlet property="contentBox" destination="iAV-mV-fXp" id="8Xv-WA-JVI"/>
@@ -23,7 +23,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="480" height="270"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="875"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
             <view key="contentView" id="se5-gp-TjO">
                 <rect key="frame" x="0.0" y="0.0" width="480" height="270"/>
                 <autoresizingMask key="autoresizingMask"/>
@@ -34,7 +34,7 @@
                             <rect key="frame" x="0.0" y="0.0" width="480" height="44"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
-                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ghc-ac-Ody">
+                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ghc-ac-Ody">
                                     <rect key="frame" x="14" y="13" width="44" height="19"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="no6-Hi-4JB">
                                         <font key="font" metaFont="system" size="16"/>
@@ -80,25 +80,25 @@
                                 </box>
                                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hWv-ct-X84">
                                     <rect key="frame" x="366" y="14" width="98" height="32"/>
-                                    <constraints>
-                                        <constraint firstAttribute="width" constant="98" id="XvX-Gm-FfV"/>
-                                        <constraint firstAttribute="height" constant="32" id="zqd-qy-cqQ"/>
-                                    </constraints>
                                     <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="xve-Pi-8fZ">
                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                         <font key="font" metaFont="system"/>
                                     </buttonCell>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="98" id="XvX-Gm-FfV"/>
+                                        <constraint firstAttribute="height" constant="32" id="zqd-qy-cqQ"/>
+                                    </constraints>
                                 </button>
                                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aGH-iF-dyv">
                                     <rect key="frame" x="256" y="14" width="98" height="32"/>
-                                    <constraints>
-                                        <constraint firstAttribute="width" constant="98" id="YMp-xm-JXV"/>
-                                        <constraint firstAttribute="height" constant="32" id="y2o-XD-wEs"/>
-                                    </constraints>
                                     <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="WaC-ig-Y9B">
                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                         <font key="font" metaFont="system"/>
                                     </buttonCell>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="98" id="YMp-xm-JXV"/>
+                                        <constraint firstAttribute="height" constant="32" id="y2o-XD-wEs"/>
+                                    </constraints>
                                 </button>
                             </subviews>
                             <constraints>
@@ -134,29 +134,29 @@
             </connections>
             <point key="canvasLocation" x="-10" y="144"/>
         </window>
-        <customView id="zj4-rU-o3s" customClass="KMPageEditExtractSettingView" customModule="PDF_Master" customModuleProvider="target">
+        <customView id="zj4-rU-o3s" customClass="KMPageEditExtractSettingView" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="447" height="104"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="W3n-Ay-Svt">
                     <rect key="frame" x="16" y="78" width="415" height="22"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="22" id="gm2-yc-Edc"/>
-                    </constraints>
                     <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" state="on" inset="2" id="O5v-R3-pn9">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="22" id="gm2-yc-Edc"/>
+                    </constraints>
                 </button>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XYW-lg-dA9">
                     <rect key="frame" x="16" y="40" width="415" height="22"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="22" id="Opk-Pm-pDy"/>
-                    </constraints>
                     <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" state="on" inset="2" id="9ms-Vw-0wt">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="22" id="Opk-Pm-pDy"/>
+                    </constraints>
                 </button>
             </subviews>
             <constraints>
@@ -174,7 +174,7 @@
             </connections>
             <point key="canvasLocation" x="-37" y="394"/>
         </customView>
-        <customView id="8HO-Hy-Nag" customClass="KMPageEditSplitSettingView" customModule="PDF_Master" customModuleProvider="target">
+        <customView id="8HO-Hy-Nag" customClass="KMPageEditSplitSettingView" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="480" height="370"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
@@ -184,7 +184,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="480" height="150"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aRC-Og-uMz">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aRC-Og-uMz">
                                 <rect key="frame" x="14" y="129" width="40" height="17"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="ELd-cx-Zg3">
                                     <font key="font" metaFont="system" size="14"/>
@@ -194,34 +194,34 @@
                             </textField>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="wET-YY-DYd">
                                 <rect key="frame" x="16" y="93" width="448" height="22"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="22" id="zWR-Qh-FmK"/>
-                                </constraints>
                                 <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" state="on" inset="2" id="qEf-UO-0QI">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="22" id="zWR-Qh-FmK"/>
+                                </constraints>
                             </button>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1Xw-bg-2TE">
                                 <rect key="frame" x="16" y="57" width="448" height="22"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="22" id="JtJ-ux-fYI"/>
-                                </constraints>
                                 <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" state="on" inset="2" id="Ytk-Wn-VEL">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="22" id="JtJ-ux-fYI"/>
+                                </constraints>
                             </button>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="c7L-ui-7Lb">
                                 <rect key="frame" x="16" y="19" width="250" height="22"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="22" id="A0L-nb-gqj"/>
-                                    <constraint firstAttribute="width" constant="250" id="nXL-uH-xYb"/>
-                                </constraints>
                                 <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" state="on" inset="2" id="gYc-Of-zbU">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="22" id="A0L-nb-gqj"/>
+                                    <constraint firstAttribute="width" constant="250" id="nXL-uH-xYb"/>
+                                </constraints>
                             </button>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="ZQL-FL-f9k">
                                 <rect key="frame" x="138" y="91" width="110" height="32"/>
@@ -237,7 +237,7 @@
                                     <constraint firstAttribute="height" constant="32" id="hzW-bd-uce"/>
                                 </constraints>
                             </customView>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hu2-bV-yft">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hu2-bV-yft">
                                 <rect key="frame" x="254" y="99" width="37" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" continuous="YES" enabled="NO" refusesFirstResponder="YES" title="Label" id="GjV-IM-Z9j">
                                     <font key="font" metaFont="system"/>
@@ -245,7 +245,7 @@
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="baP-W7-Evc">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="baP-W7-Evc">
                                 <rect key="frame" x="279" y="60" width="37" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="E5I-FK-kGi">
                                     <font key="font" metaFont="system"/>
@@ -253,8 +253,8 @@
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <comboBox verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nTX-d3-Nl3">
-                                <rect key="frame" x="177" y="13" width="187" height="32"/>
+                            <comboBox focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nTX-d3-Nl3">
+                                <rect key="frame" x="176" y="15" width="188" height="29"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="26" id="8bX-iF-dUu"/>
                                     <constraint firstAttribute="width" constant="184" id="Hk4-Ak-R8M"/>
@@ -304,7 +304,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="480" height="180"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jHQ-JM-bgx">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jHQ-JM-bgx">
                                 <rect key="frame" x="14" y="160" width="37" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="Vzb-mF-8Pm">
                                     <font key="font" usesAppearanceFont="YES"/>
@@ -315,7 +315,7 @@
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="4Wl-y0-47A">
                                 <rect key="frame" x="16" y="118" width="346" height="32"/>
                                 <subviews>
-                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rBb-tH-78V">
+                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rBb-tH-78V">
                                         <rect key="frame" x="14" y="8" width="318" height="16"/>
                                         <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="rTF-JM-5FG">
                                             <font key="font" usesAppearanceFont="YES"/>
@@ -334,35 +334,35 @@
                             </customView>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="a0r-63-2jU">
                                 <rect key="frame" x="16" y="86" width="448" height="22"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="22" id="ASx-78-Hbi"/>
-                                </constraints>
                                 <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" state="on" inset="2" id="aRB-8C-9A9">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="22" id="ASx-78-Hbi"/>
+                                </constraints>
                             </button>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="fhq-6e-30z">
                                 <rect key="frame" x="16" y="52" width="200" height="22"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="200" id="0W9-DX-Zd7"/>
-                                    <constraint firstAttribute="height" constant="22" id="PVm-SU-4r2"/>
-                                </constraints>
                                 <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" state="on" inset="2" id="snM-dt-ve4">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="200" id="0W9-DX-Zd7"/>
+                                    <constraint firstAttribute="height" constant="22" id="PVm-SU-4r2"/>
+                                </constraints>
                             </button>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="tx2-2Q-utf">
                                 <rect key="frame" x="16" y="10" width="200" height="22"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="22" id="5e7-RB-QdJ"/>
-                                    <constraint firstAttribute="width" constant="200" id="CiJ-dD-TFE"/>
-                                </constraints>
                                 <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" state="on" inset="2" id="UbX-QD-gHm">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="22" id="5e7-RB-QdJ"/>
+                                    <constraint firstAttribute="width" constant="200" id="CiJ-dD-TFE"/>
+                                </constraints>
                             </button>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="OLI-bg-hBY">
                                 <rect key="frame" x="86" y="47" width="110" height="32"/>

+ 0 - 4
PDF Office/PDF Master/PDF_Reader_Pro-Bridging-Header.h

@@ -26,10 +26,6 @@
 #import "NSBitmapImageRep_SKExtensions.h"
 #import <Masonry/Masonry.h>
 
-#import "KMCloudServer.h"
-#import <ObjectiveDropboxOfficial/ObjectiveDropboxOfficial.h>
-#import "KMCloudOperation.h"
-
 #import "KMPrintAccessoryController_OC.h"
 
 #import "CStringConstants.h"