Browse Source

【fix】【新功能介绍】测量介绍,箭头放错,样式和高保真不一样

tangchao 6 months ago
parent
commit
a822e8998a

+ 6 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/Guide/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

+ 22 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/Guide/KMImageNameGuideNextIcon.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "Frame 1000006527.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "Frame 1000006550.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

+ 100 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/Guide/KMImageNameGuideNextIcon.imageset/Frame 1000006527.pdf

@@ -0,0 +1,100 @@
+%PDF-1.7
+
+1 0 obj
+  << /ExtGState << /E1 << /ca 0.100000 >> >> >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+/E1 gs
+-1.000000 -0.000000 -0.000000 1.000000 24.000000 0.000000 cm
+0.152276 0.234759 0.385445 scn
+0.000000 22.000000 m
+0.000000 23.104570 0.895431 24.000000 2.000000 24.000000 c
+22.000000 24.000000 l
+23.104570 24.000000 24.000000 23.104568 24.000000 22.000000 c
+24.000000 2.000000 l
+24.000000 0.895430 23.104568 0.000000 22.000000 0.000000 c
+2.000000 0.000000 l
+0.895430 0.000000 0.000000 0.895432 0.000000 2.000000 c
+0.000000 22.000000 l
+h
+f
+n
+Q
+q
+-0.707107 -0.707107 -0.707107 0.707107 17.571014 9.428986 cm
+0.258000 0.273273 0.300000 scn
+0.000000 3.635963 m
+-0.500000 3.635963 l
+-0.500000 3.135963 l
+-0.000000 3.135963 l
+0.000000 3.635963 l
+h
+7.071069 4.135962 m
+0.000000 4.135963 l
+-0.000000 3.135963 l
+7.071069 3.135962 l
+7.071069 4.135962 l
+h
+0.500000 3.635963 m
+0.500000 10.707031 l
+-0.500000 10.707031 l
+-0.500000 3.635963 l
+0.500000 3.635963 l
+h
+f
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  892
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 24.000000 24.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000074 00000 n
+0000001022 00000 n
+0000001044 00000 n
+0000001217 00000 n
+0000001291 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1350
+%%EOF

+ 100 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/Guide/KMImageNameGuideNextIcon.imageset/Frame 1000006550.pdf

@@ -0,0 +1,100 @@
+%PDF-1.7
+
+1 0 obj
+  << /ExtGState << /E1 << /ca 0.100000 >> >> >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+/E1 gs
+-1.000000 -0.000000 -0.000000 1.000000 24.000000 0.000000 cm
+1.000000 1.000000 1.000000 scn
+0.000000 22.000000 m
+0.000000 23.104570 0.895431 24.000000 2.000000 24.000000 c
+22.000000 24.000000 l
+23.104570 24.000000 24.000000 23.104568 24.000000 22.000000 c
+24.000000 2.000000 l
+24.000000 0.895430 23.104568 0.000000 22.000000 0.000000 c
+2.000000 0.000000 l
+0.895430 0.000000 0.000000 0.895432 0.000000 2.000000 c
+0.000000 22.000000 l
+h
+f
+n
+Q
+q
+-0.707107 -0.707107 -0.707107 0.707107 17.571014 9.428986 cm
+0.784314 0.788235 0.800000 scn
+0.000000 3.635963 m
+-0.500000 3.635963 l
+-0.500000 3.135963 l
+-0.000000 3.135963 l
+0.000000 3.635963 l
+h
+7.071069 4.135962 m
+0.000000 4.135963 l
+-0.000000 3.135963 l
+7.071069 3.135962 l
+7.071069 4.135962 l
+h
+0.500000 3.635963 m
+0.500000 10.707031 l
+-0.500000 10.707031 l
+-0.500000 3.635963 l
+0.500000 3.635963 l
+h
+f
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  892
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 24.000000 24.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000074 00000 n
+0000001022 00000 n
+0000001044 00000 n
+0000001217 00000 n
+0000001291 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1350
+%%EOF

+ 22 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/Guide/KMImageNameGuidePreviousIcon.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "Frame 8.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "Frame 8-2.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

+ 100 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/Guide/KMImageNameGuidePreviousIcon.imageset/Frame 8-2.pdf

@@ -0,0 +1,100 @@
+%PDF-1.7
+
+1 0 obj
+  << /ExtGState << /E1 << /ca 0.100000 >> >> >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+/E1 gs
+1.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 cm
+1.000000 1.000000 1.000000 scn
+0.000000 22.000000 m
+0.000000 23.104570 0.895431 24.000000 2.000000 24.000000 c
+22.000000 24.000000 l
+23.104570 24.000000 24.000000 23.104568 24.000000 22.000000 c
+24.000000 2.000000 l
+24.000000 0.895430 23.104568 0.000000 22.000000 0.000000 c
+2.000000 0.000000 l
+0.895430 0.000000 0.000000 0.895432 0.000000 2.000000 c
+0.000000 22.000000 l
+h
+f
+n
+Q
+q
+0.707107 -0.707107 0.707107 0.707107 6.428986 9.428986 cm
+0.784314 0.788235 0.800000 scn
+0.000000 3.635963 m
+-0.500000 3.635963 l
+-0.500000 3.135963 l
+-0.000000 3.135963 l
+0.000000 3.635963 l
+h
+7.071069 4.135962 m
+0.000000 4.135963 l
+-0.000000 3.135963 l
+7.071069 3.135962 l
+7.071069 4.135962 l
+h
+0.500000 3.635963 m
+0.500000 10.707031 l
+-0.500000 10.707031 l
+-0.500000 3.635963 l
+0.500000 3.635963 l
+h
+f
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  886
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 24.000000 24.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000074 00000 n
+0000001016 00000 n
+0000001038 00000 n
+0000001211 00000 n
+0000001285 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1344
+%%EOF

+ 100 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/Guide/KMImageNameGuidePreviousIcon.imageset/Frame 8.pdf

@@ -0,0 +1,100 @@
+%PDF-1.7
+
+1 0 obj
+  << /ExtGState << /E1 << /ca 0.100000 >> >> >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+/E1 gs
+1.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 cm
+0.152276 0.234759 0.385445 scn
+0.000000 22.000000 m
+0.000000 23.104570 0.895431 24.000000 2.000000 24.000000 c
+22.000000 24.000000 l
+23.104570 24.000000 24.000000 23.104568 24.000000 22.000000 c
+24.000000 2.000000 l
+24.000000 0.895430 23.104568 0.000000 22.000000 0.000000 c
+2.000000 0.000000 l
+0.895430 0.000000 0.000000 0.895432 0.000000 2.000000 c
+0.000000 22.000000 l
+h
+f
+n
+Q
+q
+0.707107 -0.707107 0.707107 0.707107 6.428986 9.428986 cm
+0.258000 0.273273 0.300000 scn
+0.000000 3.635963 m
+-0.500000 3.635963 l
+-0.500000 3.135963 l
+-0.000000 3.135963 l
+0.000000 3.635963 l
+h
+7.071069 4.135962 m
+0.000000 4.135963 l
+-0.000000 3.135963 l
+7.071069 3.135962 l
+7.071069 4.135962 l
+h
+0.500000 3.635963 m
+0.500000 10.707031 l
+-0.500000 10.707031 l
+-0.500000 3.635963 l
+0.500000 3.635963 l
+h
+f
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  886
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 24.000000 24.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000074 00000 n
+0000001016 00000 n
+0000001038 00000 n
+0000001211 00000 n
+0000001285 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1344
+%%EOF

+ 3 - 0
PDF Office/PDF Master/Class/GuideInfo/Controllers/KMFunctionGuideMultiController.swift

@@ -85,6 +85,9 @@ class KMFunctionGuideMultiController: NSViewController {
         self.desLabel.font = NSFont.SFProTextSemiboldFont(14)
         self.desSubLabel.font = NSFont.SFProTextRegularFont(14)
         
+        self.previousButton.image = NSImage(named: "KMImageNameGuidePreviousIcon")
+        self.nextButton.image = NSImage(named: "KMImageNameGuideNextIcon")
+        
         self.getStartButton.wantsLayer = true
         self.getStartButton.mouseMoveCallback = { [weak self] mouseEntered in
             if KMAppearance.isDarkMode() {

+ 17 - 17
PDF Office/PDF Master/Class/GuideInfo/Controllers/KMFunctionGuideMultiController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -41,7 +41,7 @@
                                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="D5c-c1-cPI">
                                     <rect key="frame" x="32" y="40" width="240" height="380"/>
                                     <subviews>
-                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xjo-FI-pJ7">
+                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xjo-FI-pJ7">
                                             <rect key="frame" x="-2" y="348" width="244" height="24"/>
                                             <textFieldCell key="cell" alignment="left" title="PDF to Office" id="d7J-z9-bfT">
                                                 <font key="font" metaFont="systemBold" size="20"/>
@@ -61,7 +61,7 @@
                                                 <rect key="frame" x="0.0" y="0.0" width="120" height="32"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yRK-B3-klu">
+                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yRK-B3-klu">
                                                         <rect key="frame" x="27" y="8" width="67" height="16"/>
                                                         <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="Get Start" id="EQ3-hW-Ubb">
                                                             <font key="font" metaFont="systemBold"/>
@@ -98,7 +98,7 @@
                                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="ZqB-a4-2Kx">
                                             <rect key="frame" x="120" y="0.0" width="120" height="32"/>
                                             <subviews>
-                                                <button allowsExpansionToolTips="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="BLI-t8-GUb" customClass="HyperLinkButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
+                                                <button verticalHuggingPriority="750" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="BLI-t8-GUb" customClass="HyperLinkButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
                                                     <rect key="frame" x="20" y="8" width="73" height="16"/>
                                                     <buttonCell key="cell" type="bevel" title="Learn More" bezelStyle="rounded" alignment="center" lineBreakMode="truncatingTail" imageScaling="proportionallyDown" inset="2" id="rFj-Aj-3Hq">
                                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -153,19 +153,19 @@
                                 </imageView>
                                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WXK-no-Mi5" customClass="KMButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
                                     <rect key="frame" x="360" y="168" width="24" height="24"/>
-                                    <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="arrow_down_sel" imagePosition="overlaps" alignment="center" imageScaling="proportionallyDown" inset="2" id="eel-L1-lBe">
-                                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                        <font key="font" metaFont="system"/>
-                                    </buttonCell>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="24" id="PI7-n2-d4Y"/>
                                         <constraint firstAttribute="height" constant="24" id="mjf-2n-qgb"/>
                                     </constraints>
+                                    <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="arrow_down_sel" imagePosition="overlaps" alignment="center" imageScaling="proportionallyDown" inset="2" id="eel-L1-lBe">
+                                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                        <font key="font" metaFont="system"/>
+                                    </buttonCell>
                                     <connections>
                                         <action selector="previousAction:" target="-2" id="waG-00-gZk"/>
                                     </connections>
                                 </button>
-                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="h9u-pa-nqn">
+                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="h9u-pa-nqn">
                                     <rect key="frame" x="22" y="175" width="100" height="17"/>
                                     <textFieldCell key="cell" alignment="center" title="PDF to Office" id="KeU-j9-76b">
                                         <font key="font" metaFont="systemBold" size="14"/>
@@ -173,8 +173,8 @@
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
-                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Pne-a2-Dn9">
-                                    <rect key="frame" x="22" y="117" width="396" height="48"/>
+                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Pne-a2-Dn9">
+                                    <rect key="frame" x="22" y="109" width="396" height="48"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="392" id="oeV-C5-fYn"/>
                                     </constraints>
@@ -187,14 +187,14 @@
                                 </textField>
                                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="g30-Mi-n9I" customClass="KMButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
                                     <rect key="frame" x="392" y="168" width="24" height="24"/>
-                                    <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="arrow_right_sel" imagePosition="overlaps" alignment="center" imageScaling="proportionallyDown" inset="2" id="beh-Eg-Ukr">
-                                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                        <font key="font" metaFont="system"/>
-                                    </buttonCell>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="24" id="TQc-Fv-ttP"/>
                                         <constraint firstAttribute="height" constant="24" id="l9g-jD-Afd"/>
                                     </constraints>
+                                    <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="arrow_right_sel" imagePosition="overlaps" alignment="center" imageScaling="proportionallyDown" inset="2" id="beh-Eg-Ukr">
+                                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                        <font key="font" metaFont="system"/>
+                                    </buttonCell>
                                     <connections>
                                         <action selector="nextAction:" target="-2" id="jpg-NT-7xg"/>
                                     </connections>
@@ -203,7 +203,7 @@
                             <constraints>
                                 <constraint firstItem="g30-Mi-n9I" firstAttribute="top" secondItem="xO8-Ah-ElR" secondAttribute="bottom" constant="20" id="FEU-hV-GTx"/>
                                 <constraint firstItem="h9u-pa-nqn" firstAttribute="top" secondItem="xO8-Ah-ElR" secondAttribute="bottom" constant="20" id="FcF-Ef-b6d"/>
-                                <constraint firstItem="Pne-a2-Dn9" firstAttribute="top" secondItem="h9u-pa-nqn" secondAttribute="bottom" constant="10" id="HLm-w1-isS"/>
+                                <constraint firstItem="Pne-a2-Dn9" firstAttribute="top" secondItem="h9u-pa-nqn" secondAttribute="bottom" constant="18" id="HLm-w1-isS"/>
                                 <constraint firstItem="Pne-a2-Dn9" firstAttribute="leading" secondItem="x6Z-7B-NEU" secondAttribute="leading" constant="24" id="I7z-pu-1fr"/>
                                 <constraint firstItem="h9u-pa-nqn" firstAttribute="leading" secondItem="x6Z-7B-NEU" secondAttribute="leading" constant="24" id="Ka7-6f-ahk"/>
                                 <constraint firstItem="xO8-Ah-ElR" firstAttribute="centerX" secondItem="x6Z-7B-NEU" secondAttribute="centerX" id="R69-ZS-egX"/>