Browse Source

综合-偏好设置去除高亮表单

tangchao 2 years ago
parent
commit
0ce000393e

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


+ 32 - 32
PDF Office/PDF Office/Class/Preference/Controller/KMPreferenceDisplayController.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="21225" 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="21225"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -47,12 +47,12 @@
         </customObject>
         <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="512" height="502"/>
+        <customView misplaced="YES" id="Hz6-mo-xeY">
+            <rect key="frame" x="0.0" y="0.0" width="512" height="470"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Del-t8-fOz">
-                    <rect key="frame" x="14" y="476" width="37" height="16"/>
+                    <rect key="frame" x="14" y="398" width="37" height="16"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="peA-3h-2xi">
                         <font key="font" usesAppearanceFont="YES"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -60,7 +60,7 @@
                     </textFieldCell>
                 </textField>
                 <box boxType="custom" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="Xhq-lP-rLf">
-                    <rect key="frame" x="16" y="406" width="480" height="68"/>
+                    <rect key="frame" x="16" y="328" width="480" height="68"/>
                     <view key="contentView" id="gBT-DI-ozZ">
                         <rect key="frame" x="1" y="1" width="478" height="66"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -82,7 +82,7 @@
                                 </textFieldCell>
                             </textField>
                             <comboBox verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="BQa-oR-Fsd">
-                                <rect key="frame" x="50" y="36" width="250" height="23"/>
+                                <rect key="frame" x="51" y="35" width="249" height="25"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="246" id="6Cm-Rp-bzD"/>
                                 </constraints>
@@ -98,7 +98,7 @@
                                 </comboBoxCell>
                             </comboBox>
                             <comboBox verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zvd-u1-6yG">
-                                <rect key="frame" x="50" y="6" width="250" height="23"/>
+                                <rect key="frame" x="51" y="5" width="249" height="25"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="246" id="W4g-NH-JbJ"/>
                                 </constraints>
@@ -128,7 +128,7 @@
                     </view>
                 </box>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3Ap-hh-tvL">
-                    <rect key="frame" x="14" y="374" width="37" height="16"/>
+                    <rect key="frame" x="14" y="296" width="37" height="16"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="SM4-Lj-IPI">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -136,7 +136,7 @@
                     </textFieldCell>
                 </textField>
                 <box boxType="custom" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="LZG-xJ-N2a">
-                    <rect key="frame" x="16" y="282" width="480" height="90"/>
+                    <rect key="frame" x="16" y="204" width="480" height="90"/>
                     <view key="contentView" id="bhK-3o-Xne">
                         <rect key="frame" x="1" y="1" width="478" height="88"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -188,7 +188,7 @@
                     </view>
                 </box>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="GFH-yg-mdC">
-                    <rect key="frame" x="14" y="250" width="37" height="16"/>
+                    <rect key="frame" x="14" y="172" width="37" height="16"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="hhw-L5-Yuf">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -196,7 +196,7 @@
                     </textFieldCell>
                 </textField>
                 <box boxType="custom" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="IJc-wD-euh">
-                    <rect key="frame" x="16" y="214" width="480" height="34"/>
+                    <rect key="frame" x="16" y="136" width="480" height="34"/>
                     <view key="contentView" id="v0b-ZJ-zwh">
                         <rect key="frame" x="1" y="1" width="478" height="32"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -236,7 +236,7 @@
                     </view>
                 </box>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="CEf-9c-eJt">
-                    <rect key="frame" x="14" y="182" width="37" height="16"/>
+                    <rect key="frame" x="14" y="104" width="37" height="16"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="NGq-zT-c3H">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -244,13 +244,13 @@
                     </textFieldCell>
                 </textField>
                 <box boxType="custom" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="1cr-l2-aIQ">
-                    <rect key="frame" x="16" y="64" width="480" height="116"/>
+                    <rect key="frame" x="16" y="64" width="480" height="38"/>
                     <view key="contentView" id="xx2-8k-O7b">
-                        <rect key="frame" x="1" y="1" width="478" height="114"/>
+                        <rect key="frame" x="1" y="1" width="478" height="36"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="UaR-p3-xs5">
-                                <rect key="frame" x="6" y="82" width="37" height="16"/>
+                                <rect key="frame" x="6" y="10" width="37" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="mKC-gD-YND">
                                     <font key="font" usesAppearanceFont="YES"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -258,7 +258,7 @@
                                 </textFieldCell>
                             </textField>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Jci-vH-8jb">
-                                <rect key="frame" x="47" y="82" width="37" height="16"/>
+                                <rect key="frame" x="47" y="10" width="37" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="ddM-yT-p9s">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -266,7 +266,7 @@
                                 </textFieldCell>
                             </textField>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Fag-0w-xjP">
-                                <rect key="frame" x="96" y="80" width="20" height="20"/>
+                                <rect key="frame" x="96" y="8" width="20" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="5Hc-td-7jh"/>
                                     <constraint firstAttribute="width" constant="20" id="Vdh-hw-Izi"/>
@@ -277,7 +277,7 @@
                                 </buttonCell>
                             </button>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XiB-j0-82P">
-                                <rect key="frame" x="128" y="82" width="37" height="16"/>
+                                <rect key="frame" x="128" y="10" width="37" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="fKi-2i-H3L">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -285,7 +285,7 @@
                                 </textFieldCell>
                             </textField>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Q80-wB-gmd">
-                                <rect key="frame" x="177" y="80" width="20" height="20"/>
+                                <rect key="frame" x="177" y="8" width="20" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="R8F-ro-FHe"/>
                                     <constraint firstAttribute="width" constant="20" id="eQf-dK-yEi"/>
@@ -295,23 +295,23 @@
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
                             </button>
-                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="EVY-Zu-pJd">
-                                <rect key="frame" x="6" y="47" width="65" height="18"/>
+                            <button hidden="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="EVY-Zu-pJd">
+                                <rect key="frame" x="6" y="-25" width="65" height="18"/>
                                 <buttonCell key="cell" type="check" title="Check" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="cWa-PF-jJx">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
                             </button>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8oD-2O-814">
-                                <rect key="frame" x="6" y="16" width="37" height="16"/>
+                            <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8oD-2O-814">
+                                <rect key="frame" x="6" y="-56" width="37" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="WtD-wt-htS">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="wVm-df-CrW">
-                                <rect key="frame" x="55" y="14" width="20" height="20"/>
+                            <button hidden="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="wVm-df-CrW">
+                                <rect key="frame" x="55" y="-58" width="20" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="20" id="X1w-lq-fiC"/>
                                     <constraint firstAttribute="height" constant="20" id="Zr6-68-6cU"/>
@@ -321,16 +321,16 @@
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
                             </button>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dc1-ku-LdG">
-                                <rect key="frame" x="89" y="16" width="37" height="16"/>
+                            <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dc1-ku-LdG">
+                                <rect key="frame" x="89" y="-56" width="37" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="VGC-on-Efk">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="shl-Fm-1kp">
-                                <rect key="frame" x="138" y="14" width="20" height="20"/>
+                            <button hidden="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="shl-Fm-1kp">
+                                <rect key="frame" x="138" y="-58" width="20" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="mBD-Rh-y9y"/>
                                     <constraint firstAttribute="width" constant="20" id="uiC-oY-o1F"/>
@@ -350,10 +350,10 @@
                             <constraint firstItem="EVY-Zu-pJd" firstAttribute="leading" secondItem="xx2-8k-O7b" secondAttribute="leading" constant="8" id="Pk2-Pe-ytO"/>
                             <constraint firstItem="wVm-df-CrW" firstAttribute="leading" secondItem="8oD-2O-814" secondAttribute="trailing" constant="14" id="QbF-dx-3Ob"/>
                             <constraint firstItem="UaR-p3-xs5" firstAttribute="leading" secondItem="xx2-8k-O7b" secondAttribute="leading" constant="8" id="R1E-I5-RuN"/>
-                            <constraint firstItem="UaR-p3-xs5" firstAttribute="top" secondItem="xx2-8k-O7b" secondAttribute="top" constant="16" id="RPN-23-8aA"/>
+                            <constraint firstItem="UaR-p3-xs5" firstAttribute="top" secondItem="xx2-8k-O7b" secondAttribute="top" constant="10" id="RPN-23-8aA"/>
                             <constraint firstItem="Fag-0w-xjP" firstAttribute="centerY" secondItem="Jci-vH-8jb" secondAttribute="centerY" id="SBs-K5-IaV"/>
                             <constraint firstItem="8oD-2O-814" firstAttribute="leading" secondItem="xx2-8k-O7b" secondAttribute="leading" constant="8" id="Sh5-oa-D5X"/>
-                            <constraint firstAttribute="bottom" secondItem="8oD-2O-814" secondAttribute="bottom" constant="16" id="UKv-zP-xIb"/>
+                            <constraint firstAttribute="bottom" secondItem="8oD-2O-814" secondAttribute="bottom" constant="-56" id="UKv-zP-xIb"/>
                             <constraint firstItem="Jci-vH-8jb" firstAttribute="centerY" secondItem="UaR-p3-xs5" secondAttribute="centerY" id="XsU-1O-EEi"/>
                             <constraint firstItem="Jci-vH-8jb" firstAttribute="leading" secondItem="UaR-p3-xs5" secondAttribute="trailing" constant="8" id="YfU-sS-wiB"/>
                             <constraint firstItem="XiB-j0-82P" firstAttribute="centerY" secondItem="Fag-0w-xjP" secondAttribute="centerY" id="b5m-eA-FPx"/>

+ 1 - 1
PDF Office/PDF Office/Class/Preference/Window/KMPreferenceWindowController.swift

@@ -145,7 +145,7 @@ class KMPreferenceWindowController: NSWindowController {
             controller.view.autoresizingMask = [.width, .height]
             self.currentController = controller
         } else if (index == 2) {
-            self.adjectWindowSize(NSSize(width: 512, height: 678-30-20), false)
+            self.adjectWindowSize(NSSize(width: 512, height: 678-30-20-80), false)
             
             let controller = KMPreferenceDisplayController()
             self.contentBox.contentView?.addSubview(controller.view)