Sfoglia il codice sorgente

【综合】新手引导处理

niehaoyu 1 anno fa
parent
commit
b8f04d9185
19 ha cambiato i file con 220 aggiunte e 95 eliminazioni
  1. 1 1
      PDF Office/PDF Master/Class/GuideInfo/Controllers/FunctionGuide/KMOpenFileFunctionView.swift
  2. 8 8
      PDF Office/PDF Master/Class/GuideInfo/Controllers/FunctionGuide/KMOpenFileFunctionView.xib
  3. 7 8
      PDF Office/PDF Master/Class/GuideInfo/Controllers/OpenFileGuide/KMOpenFileGuidePanel.xib
  4. 8 8
      PDF Office/PDF Master/Class/GuideInfo/Controllers/OpenFileGuide/KMOpenFileGuideProperty.xib
  5. 11 11
      PDF Office/PDF Master/Class/GuideInfo/Controllers/OpenFileGuide/KMOpenFileGuideToolbar.xib
  6. 22 0
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/guideDigitalSign.imageset/Contents.json
  7. BIN
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/guideDigitalSign.imageset/Frame 1000006534.pdf
  8. BIN
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/guideDigitalSign.imageset/guideDigitalSign.pdf
  9. 22 0
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/guidePDFCompare.imageset/Contents.json
  10. BIN
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/guidePDFCompare.imageset/Frame 1000006535.pdf
  11. BIN
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/guidePDFCompare.imageset/guidePDFCompare.pdf
  12. BIN
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/guideToolbar.imageset/1.pdf
  13. 22 0
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/guideToolbar.imageset/Contents.json
  14. BIN
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/guideToolbar.imageset/guideToolbar.pdf
  15. 21 41
      PDF Office/PDF Master/Class/GuideInfo/KMGuideInfoWindowController.swift
  16. 28 0
      PDF Office/PDF Master/Class/Home/ViewController/KMHomeViewController.swift
  17. 3 2
      PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarController.xib
  18. 2 2
      PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarViewController.xib
  19. 65 14
      PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController.swift

+ 1 - 1
PDF Office/PDF Master/Class/GuideInfo/Controllers/FunctionGuide/KMOpenFileFunctionView.swift

@@ -97,7 +97,7 @@ class KMOpenFileFunctionView: NSView, NibLoadable {
     @objc func updateViewColor() {
         
         if self.type == .digitalSignGuide {
-            self.circleTopConst.constant = 0
+            self.circleTopConst.constant = 20
             self.circleLeftConst.constant = CGRectGetMinX(self.circleRect) - CGRectGetWidth(self.bigCircleView.frame)/2 + CGRectGetWidth(self.circleRect)/2
             self.tipImage.image = NSImage(named: "guideDigitalSign")
             self.tipTitleLabel.stringValue = NSLocalizedString("Digital Signature", comment: "")

+ 8 - 8
PDF Office/PDF Master/Class/GuideInfo/Controllers/FunctionGuide/KMOpenFileFunctionView.xib

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22155" 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="22155"/>
+        <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"/>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customView id="c22-O7-iKe" customClass="KMOpenFileFunctionView" customModule="PDF_Reader_Pro" customModuleProvider="target">
+        <customView id="c22-O7-iKe" customClass="KMOpenFileFunctionView" customModule="PDF_Master" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="650" height="555"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
@@ -17,7 +17,7 @@
                     <rect key="frame" x="0.0" y="0.0" width="650" height="555"/>
                     <subviews>
                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="eyC-C4-Pb6">
-                            <rect key="frame" x="110" y="505" width="50" height="50"/>
+                            <rect key="frame" x="110" y="485" width="50" height="50"/>
                             <subviews>
                                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="1h8-bQ-2VN">
                                     <rect key="frame" x="5" y="5" width="40" height="40"/>
@@ -35,11 +35,11 @@
                             </constraints>
                         </customView>
                         <customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="e64-iZ-rOR">
-                            <rect key="frame" x="50" y="122" width="320" height="377"/>
+                            <rect key="frame" x="50" y="102" width="320" height="377"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         </customView>
                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="M5p-u9-5xx">
-                            <rect key="frame" x="50" y="122" width="320" height="377"/>
+                            <rect key="frame" x="50" y="102" width="320" height="377"/>
                             <subviews>
                                 <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="7Iy-Pz-Emb">
                                     <rect key="frame" x="20" y="197" width="280" height="160"/>
@@ -102,7 +102,7 @@
                                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                 </textFieldCell>
                                             </textField>
-                                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="eRC-jL-IiE" customClass="KMButton">
+                                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="eRC-jL-IiE" customClass="KMButton" customModule="PDF_Master" customModuleProvider="target">
                                                 <rect key="frame" x="0.0" y="0.0" width="140" height="32"/>
                                                 <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="0lx-HA-MnD">
                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -148,7 +148,7 @@
                     <constraints>
                         <constraint firstItem="eyC-C4-Pb6" firstAttribute="leading" secondItem="Hxc-9r-cWI" secondAttribute="leading" constant="110" id="00u-gI-nep"/>
                         <constraint firstItem="M5p-u9-5xx" firstAttribute="leading" secondItem="eyC-C4-Pb6" secondAttribute="leading" constant="-60" id="BRK-Aq-cpq"/>
-                        <constraint firstItem="eyC-C4-Pb6" firstAttribute="top" secondItem="Hxc-9r-cWI" secondAttribute="top" id="cKO-UJ-95I"/>
+                        <constraint firstItem="eyC-C4-Pb6" firstAttribute="top" secondItem="Hxc-9r-cWI" secondAttribute="top" constant="20" id="cKO-UJ-95I"/>
                         <constraint firstItem="M5p-u9-5xx" firstAttribute="top" secondItem="eyC-C4-Pb6" secondAttribute="bottom" constant="6" id="vf6-3c-caF"/>
                     </constraints>
                 </customView>

+ 7 - 8
PDF Office/PDF Master/Class/GuideInfo/Controllers/OpenFileGuide/KMOpenFileGuidePanel.xib

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22155" 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="22155"/>
+        <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"/>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customView id="c22-O7-iKe" customClass="KMOpenFileGuidePanel" customModule="PDF_Reader_Pro" customModuleProvider="target">
+        <customView id="c22-O7-iKe" customClass="KMOpenFileGuidePanel" customModule="PDF_Master" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="542" height="333"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
@@ -17,7 +17,7 @@
                     <rect key="frame" x="0.0" y="0.0" width="542" height="333"/>
                     <subviews>
                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="pdf-Yo-pxP">
-                            <rect key="frame" x="100" y="283" width="50" height="50"/>
+                            <rect key="frame" x="100" y="263" width="50" height="50"/>
                             <subviews>
                                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="L50-i6-Z80">
                                     <rect key="frame" x="5" y="5" width="40" height="40"/>
@@ -59,7 +59,7 @@
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
-                                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1Vr-wV-SBn" customClass="HyperLinkButton">
+                                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1Vr-wV-SBn" customClass="HyperLinkButton" customModule="PDF_Master" customModuleProvider="target">
                                     <rect key="frame" x="20" y="24" width="31" height="16"/>
                                     <buttonCell key="cell" type="bevel" title="Skip" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="pZd-Hn-tkd">
                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -91,7 +91,7 @@
                                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                 </textFieldCell>
                                             </textField>
-                                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Rcg-Wi-UML" customClass="KMButton">
+                                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Rcg-Wi-UML" customClass="KMButton" customModule="PDF_Master" customModuleProvider="target">
                                                 <rect key="frame" x="0.0" y="0.0" width="52" height="22"/>
                                                 <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="Wdi-PP-b3A">
                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -115,7 +115,6 @@
                                         <constraint firstAttribute="height" constant="24" id="9bR-L0-BhX"/>
                                         <constraint firstAttribute="width" constant="54" id="co4-Mu-cbc"/>
                                     </constraints>
-                                    <font key="titleFont" metaFont="smallSystem"/>
                                 </box>
                             </subviews>
                             <constraints>
@@ -137,7 +136,7 @@
                     <constraints>
                         <constraint firstItem="jpN-zk-9b9" firstAttribute="trailing" secondItem="BGa-9j-knl" secondAttribute="trailing" id="24f-4v-Liu"/>
                         <constraint firstItem="jpN-zk-9b9" firstAttribute="top" secondItem="BGa-9j-knl" secondAttribute="top" id="Fpj-3k-q9J"/>
-                        <constraint firstItem="pdf-Yo-pxP" firstAttribute="top" secondItem="J1s-e6-GWs" secondAttribute="top" id="KVy-Lq-MgU"/>
+                        <constraint firstItem="pdf-Yo-pxP" firstAttribute="top" secondItem="J1s-e6-GWs" secondAttribute="top" constant="20" id="KVy-Lq-MgU"/>
                         <constraint firstItem="BGa-9j-knl" firstAttribute="top" secondItem="J1s-e6-GWs" secondAttribute="top" constant="40" id="Qt5-3g-IN8"/>
                         <constraint firstItem="BGa-9j-knl" firstAttribute="leading" secondItem="pdf-Yo-pxP" secondAttribute="trailing" constant="10" id="TMg-PA-ii5"/>
                         <constraint firstItem="jpN-zk-9b9" firstAttribute="leading" secondItem="BGa-9j-knl" secondAttribute="leading" id="iNe-Mb-sY5"/>

+ 8 - 8
PDF Office/PDF Master/Class/GuideInfo/Controllers/OpenFileGuide/KMOpenFileGuideProperty.xib

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22155" 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="22155"/>
+        <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"/>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customView id="c22-O7-iKe" customClass="KMOpenFileGuideProperty" customModule="PDF_Reader_Pro" customModuleProvider="target">
+        <customView id="c22-O7-iKe" customClass="KMOpenFileGuideProperty" customModule="PDF_Master" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="585" height="366"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
@@ -17,7 +17,7 @@
                     <rect key="frame" x="0.0" y="0.0" width="585" height="366"/>
                     <subviews>
                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="eRC-CW-Z7U">
-                            <rect key="frame" x="535" y="316" width="50" height="50"/>
+                            <rect key="frame" x="535" y="296" width="50" height="50"/>
                             <subviews>
                                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="7BU-0Y-uxe">
                                     <rect key="frame" x="5" y="5" width="40" height="40"/>
@@ -59,7 +59,7 @@
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
-                                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="46r-va-mAx" customClass="HyperLinkButton">
+                                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="46r-va-mAx" customClass="HyperLinkButton" customModule="PDF_Master" customModuleProvider="target">
                                     <rect key="frame" x="20" y="24" width="31" height="16"/>
                                     <buttonCell key="cell" type="bevel" title="Skip" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="YCH-1c-XwV">
                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -91,7 +91,7 @@
                                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                 </textFieldCell>
                                             </textField>
-                                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="E20-c9-JNo" customClass="KMButton">
+                                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="E20-c9-JNo" customClass="KMButton" customModule="PDF_Master" customModuleProvider="target">
                                                 <rect key="frame" x="0.0" y="0.0" width="72" height="22"/>
                                                 <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="y1b-Mz-GlH">
                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -130,7 +130,7 @@
                                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                 </textFieldCell>
                                             </textField>
-                                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9zr-OX-UJ0" customClass="KMButton">
+                                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9zr-OX-UJ0" customClass="KMButton" customModule="PDF_Master" customModuleProvider="target">
                                                 <rect key="frame" x="0.0" y="0.0" width="52" height="22"/>
                                                 <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="25f-OL-Gbl">
                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -178,7 +178,7 @@
                         <constraint firstItem="G9k-gU-ce4" firstAttribute="top" secondItem="9Rh-1h-Oif" secondAttribute="top" constant="40" id="1B5-S1-w2i"/>
                         <constraint firstItem="G9k-gU-ce4" firstAttribute="leading" secondItem="PYv-yj-Jk2" secondAttribute="leading" id="KcS-mL-hBZ"/>
                         <constraint firstItem="G9k-gU-ce4" firstAttribute="top" secondItem="PYv-yj-Jk2" secondAttribute="top" id="aXD-Ld-W5b"/>
-                        <constraint firstItem="eRC-CW-Z7U" firstAttribute="top" secondItem="9Rh-1h-Oif" secondAttribute="top" id="gdo-fo-JWA"/>
+                        <constraint firstItem="eRC-CW-Z7U" firstAttribute="top" secondItem="9Rh-1h-Oif" secondAttribute="top" constant="20" id="gdo-fo-JWA"/>
                         <constraint firstItem="G9k-gU-ce4" firstAttribute="trailing" secondItem="PYv-yj-Jk2" secondAttribute="trailing" id="hKP-SQ-fZO"/>
                         <constraint firstItem="G9k-gU-ce4" firstAttribute="bottom" secondItem="PYv-yj-Jk2" secondAttribute="bottom" id="i2o-bZ-VXh"/>
                         <constraint firstItem="eRC-CW-Z7U" firstAttribute="leading" secondItem="G9k-gU-ce4" secondAttribute="trailing" constant="5" id="mW3-JD-bO6"/>

+ 11 - 11
PDF Office/PDF Master/Class/GuideInfo/Controllers/OpenFileGuide/KMOpenFileGuideToolbar.xib

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22155" 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="22155"/>
+        <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"/>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customView id="c22-O7-iKe" customClass="KMOpenFileGuideToolbar" customModule="PDF_Reader_Pro" customModuleProvider="target">
+        <customView id="c22-O7-iKe" customClass="KMOpenFileGuideToolbar" customModule="PDF_Master" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="834" height="600"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
@@ -17,7 +17,7 @@
                     <rect key="frame" x="0.0" y="0.0" width="834" height="600"/>
                     <subviews>
                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="77Z-n0-hji">
-                            <rect key="frame" x="10" y="548" width="814" height="50"/>
+                            <rect key="frame" x="10" y="530" width="814" height="50"/>
                             <subviews>
                                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="VzT-Da-qac">
                                     <rect key="frame" x="6" y="6" width="802" height="38"/>
@@ -35,10 +35,10 @@
                             </constraints>
                         </customView>
                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="HaS-YF-x3q">
-                            <rect key="frame" x="427" y="247" width="320" height="298"/>
+                            <rect key="frame" x="427" y="227" width="320" height="298"/>
                         </customView>
                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="HeV-5t-Crd">
-                            <rect key="frame" x="427" y="247" width="320" height="298"/>
+                            <rect key="frame" x="427" y="227" width="320" height="298"/>
                             <subviews>
                                 <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="oBS-CV-N71">
                                     <rect key="frame" x="20" y="118" width="280" height="160"/>
@@ -67,7 +67,7 @@
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
-                                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="IcK-uc-vJ1" customClass="HyperLinkButton">
+                                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="IcK-uc-vJ1" customClass="HyperLinkButton" customModule="PDF_Master" customModuleProvider="target">
                                     <rect key="frame" x="20" y="24" width="31" height="16"/>
                                     <buttonCell key="cell" type="bevel" title="Skip" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="LDh-Vl-Io3">
                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -91,7 +91,7 @@
                                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                 </textFieldCell>
                                             </textField>
-                                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="58D-bW-g7B" customClass="KMButton">
+                                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="58D-bW-g7B" customClass="KMButton" customModule="PDF_Master" customModuleProvider="target">
                                                 <rect key="frame" x="0.0" y="0.0" width="85" height="22"/>
                                                 <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="BFx-9S-vka">
                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -139,7 +139,7 @@
                                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                 </textFieldCell>
                                             </textField>
-                                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="esa-bm-Tgn" customClass="KMButton">
+                                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="esa-bm-Tgn" customClass="KMButton" customModule="PDF_Master" customModuleProvider="target">
                                                 <rect key="frame" x="0.0" y="0.0" width="67" height="22"/>
                                                 <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="bZf-5y-kyg">
                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -188,12 +188,12 @@
                     </subviews>
                     <constraints>
                         <constraint firstItem="77Z-n0-hji" firstAttribute="leading" secondItem="kwO-8y-G0h" secondAttribute="leading" constant="10" id="Boj-oM-yOb"/>
-                        <constraint firstItem="77Z-n0-hji" firstAttribute="top" secondItem="kwO-8y-G0h" secondAttribute="top" constant="2" id="DeB-x1-feP"/>
+                        <constraint firstItem="77Z-n0-hji" firstAttribute="top" secondItem="kwO-8y-G0h" secondAttribute="top" constant="20" id="DeB-x1-feP"/>
                         <constraint firstItem="HeV-5t-Crd" firstAttribute="centerX" secondItem="kwO-8y-G0h" secondAttribute="centerX" constant="170" id="Itb-Oj-0dr"/>
                         <constraint firstItem="HeV-5t-Crd" firstAttribute="bottom" secondItem="HaS-YF-x3q" secondAttribute="bottom" id="KuY-gr-Nd3"/>
                         <constraint firstItem="HeV-5t-Crd" firstAttribute="top" secondItem="HaS-YF-x3q" secondAttribute="top" id="QCT-el-Rpm"/>
                         <constraint firstAttribute="trailing" secondItem="77Z-n0-hji" secondAttribute="trailing" constant="10" id="dnr-gT-jRG"/>
-                        <constraint firstItem="HeV-5t-Crd" firstAttribute="top" secondItem="kwO-8y-G0h" secondAttribute="top" constant="55" id="fIc-Ni-bSi"/>
+                        <constraint firstItem="HeV-5t-Crd" firstAttribute="top" secondItem="kwO-8y-G0h" secondAttribute="top" constant="75" id="fIc-Ni-bSi"/>
                         <constraint firstItem="HeV-5t-Crd" firstAttribute="leading" secondItem="HaS-YF-x3q" secondAttribute="leading" id="jnN-Y2-7E6"/>
                         <constraint firstItem="HeV-5t-Crd" firstAttribute="trailing" secondItem="HaS-YF-x3q" secondAttribute="trailing" id="li3-76-xrF"/>
                     </constraints>

+ 22 - 0
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/guideDigitalSign.imageset/Contents.json

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

BIN
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/guideDigitalSign.imageset/Frame 1000006534.pdf


BIN
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/guideDigitalSign.imageset/guideDigitalSign.pdf


+ 22 - 0
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/guidePDFCompare.imageset/Contents.json

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

BIN
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/guidePDFCompare.imageset/Frame 1000006535.pdf


BIN
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/guidePDFCompare.imageset/guidePDFCompare.pdf


BIN
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/guideToolbar.imageset/1.pdf


+ 22 - 0
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/guideToolbar.imageset/Contents.json

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

BIN
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/guideToolbar.imageset/guideToolbar.pdf


+ 21 - 41
PDF Office/PDF Master/Class/GuideInfo/KMGuideInfoWindowController.swift

@@ -34,27 +34,27 @@ class KMGuideInfoWindowController: NSWindowController {
 
     //MARK: Static Method
     @objc static func availableShow(_ type: KMGuideInfoType) -> Bool {
-        if type == .openFileNormal {
-            if (UserDefaults.standard.object(forKey: kKMGuideInfoOpenFileNormalKey) == nil) {
-                return true
-            }
-        } else if type == .digitalSignGuide {
-            if (UserDefaults.standard.object(forKey: kKMGuideInfoDigitalSignKey) == nil) {
-                return true
-            }
-        } else if type == .pdfCompareGuide {
-            if (UserDefaults.standard.object(forKey: kKMGuideInfoPDFCompareKey) == nil) {
-                return true
-            }
-        } else if type == .convertGuide {
-            if (UserDefaults.standard.object(forKey: kKMGuideInfoFileConvertKey) == nil) {
-                return true
-            }
-        } else if type == .customColor {
-            if (UserDefaults.standard.object(forKey: kKMGuideInfoCustomColorKey) == nil) {
-                return true
-            }
-        }
+//        if type == .openFileNormal {
+//            if (UserDefaults.standard.object(forKey: kKMGuideInfoOpenFileNormalKey) == nil) {
+//                return true
+//            }
+//        } else if type == .digitalSignGuide {
+//            if (UserDefaults.standard.object(forKey: kKMGuideInfoDigitalSignKey) == nil) {
+//                return true
+//            }
+//        } else if type == .pdfCompareGuide {
+//            if (UserDefaults.standard.object(forKey: kKMGuideInfoPDFCompareKey) == nil) {
+//                return true
+//            }
+//        } else if type == .convertGuide {
+//            if (UserDefaults.standard.object(forKey: kKMGuideInfoFileConvertKey) == nil) {
+//                return true
+//            }
+//        } else if type == .customColor {
+//            if (UserDefaults.standard.object(forKey: kKMGuideInfoCustomColorKey) == nil) {
+//                return true
+//            }
+//        }
         return false
     }
     
@@ -213,11 +213,6 @@ class KMGuideInfoWindowController: NSWindowController {
                         //Next
                         self.type = .openFileNormalProperty
                         self.loadGuideInfoView()
-//                        guard let callBack = self.openFileToggleHandle else {
-//                            return
-//                        }
-//                        callBack(self, .openFileNormalProperty)
-//                        self.closeAction()
                     }
                 }
                 self.openFileGuidePanel.circleRect = self.openPanelRect
@@ -262,20 +257,10 @@ class KMGuideInfoWindowController: NSWindowController {
                             return
                         }
                         callBack(self)
-//                        guard let callBack = self.openFileToggleHandle else {
-//                            return
-//                        }
-//                        callBack(self, .openFileNormalPanel)
-//                        self.closeAction()
                     } else if actionType == .next {
                         //Next
                         self.type = .openFileNormalToolbar
                         self.loadGuideInfoView()
-//                        guard let callBack = self.openFileToggleHandle else {
-//                            return
-//                        }
-//                        callBack(self, .openFileNormalToolbar)
-//                        self.closeAction()
                     }
                 }
                 self.openFileGuideProperty.circleRect = self.rightPanelRect
@@ -311,11 +296,6 @@ class KMGuideInfoWindowController: NSWindowController {
                         //Next
                         self.type = .openFileNormalProperty
                         self.loadGuideInfoView()
-//                        guard let callBack = self.openFileToggleHandle else {
-//                            return
-//                        }
-//                        callBack(self, .openFileNormalProperty)
-//                        self.closeAction()
                     } else if actionType == .finish {
                         guard let callBack = self.normalGuideFinishHandle else {
                             return

+ 28 - 0
PDF Office/PDF Master/Class/Home/ViewController/KMHomeViewController.swift

@@ -147,6 +147,11 @@ import Cocoa
 //        NotificationCenter.default.addObserver(self, selector: #selector(appearanceChanged), name: NSNotification.Name(NSApplication.didUpdateNotification.rawValue), object: nil)
 //        NotificationCenter.default.addObserver(self, selector: #selector(appearanceChanged), name: NSNotification.Name(NSWindow.didBecomeMainNotification.rawValue), object: nil)
 //        NotificationCenter.default.addObserver(self, selector: #selector(appearanceChanged), name: NSNotification.Name("AppleInterfaceThemeChangedNotification"), object: nil)
+        
+        
+        self.loadFunctionGuide()
+        
+        
     }
     
     override func viewDidAppear() {
@@ -752,4 +757,27 @@ extension KMHomeViewController {
 //            }
 //        }
     }
+    
+    
+    //MARK: - 引导
+    func loadFunctionGuide() -> Void {
+#if VERSION_DMG
+        
+#else
+        self.loadNewUserGuide()
+#endif
+        
+    }
+    
+    //MARK: what's New
+    func loadNewUserGuide() -> Void {
+        if KMFunctionGuideWindowController.availableShow(.functionMulitDidital) {
+            let guideWindowVC = KMFunctionGuideWindowController.init(windowNibName: "KMFunctionGuideWindowController")
+            guideWindowVC.type = .functionMulti
+            guideWindowVC.showWindow(nil)
+            guideWindowVC.window?.orderFront(nil)
+            
+            KMFunctionGuideWindowController.setDidShowFor(.functionMulitDidital)
+        }
+    }
 }

+ 3 - 2
PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarController.xib

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21701" 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>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>

+ 2 - 2
PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarViewController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22155" 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="22155"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>

+ 65 - 14
PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController.swift

@@ -638,23 +638,74 @@ import Cocoa
     
     //MARK: - 引导
     func loadFunctionGuide() -> Void {
-#if VERSION_DMG
-        
-#else
-        self.loadNewUserGuide()
-#endif
-        
+
+        DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 1) {
+            self.loadOpenFileFunctionGuide()
+        }
     }
     
-    //MARK: what's New
-    func loadNewUserGuide() -> Void {
-        if KMFunctionGuideWindowController.availableShow(.functionMulitDidital) {
-            let guideWindowVC = KMFunctionGuideWindowController.init(windowNibName: "KMFunctionGuideWindowController")
-            guideWindowVC.type = .functionMulti
-            guideWindowVC.showWindow(nil)
-            guideWindowVC.window?.orderFront(nil)
+    
+    func loadOpenFileFunctionGuide() -> Void {
+
+        if KMGuideInfoWindowController.availableShow(.openFileNormal) {
+//            KMGuideInfoWindowController *guideWC = [KMGuideInfoWindowController currentWC];
+//            guideWC.type = KMGuideInfoTypeOpenFileNormal;
+//            guideWC.openPanelRect = [self.window.contentView convertRect:self.toolbarController.viewPanelModeBox.frame fromView:self.toolbarController.viewPanelModeBox.superview];
+//            guideWC.window.collectionBehavior |= self.window.collectionBehavior & NSWindowCollectionBehaviorCanJoinAllSpaces;
+//            guideWC.normalGuideFinishHandle = ^(KMGuideInfoWindowController * _Nonnull windowVC) {
+//                windowVC.rightPanelRect = [self.window.contentView convertRect:self.toolbarController.rightPanelModeBox.frame fromView:self.toolbarController.rightPanelModeBox.superview];
+//                guideWC.digitalBoxRect = [self.window.contentView convertRect:self.toolbarController.digitalSignBox.frame fromView:self.toolbarController.digitalSignBox.superview];
+//            };
+//            guideWC.finishHandle = ^(KMGuideInfoWindowController * _Nonnull windowVC, enum KMGuideActionType type) {
+//                if (type == KMGuideActionTypeWindowNewFinish ||
+//                    type == KMGuideActionTypeWindowDigitalFinish) {
+//                    [self checkFirstTrialController];
+//                }
+//            };
+//            guideWC.openFileToggleHandle = ^(KMGuideInfoWindowController * _Nonnull windowVC, enum KMGuideInfoType type) {
+//                [self loadOpenFileNormalProperty:type];
+//            };
+//            
+//            CGRect rect = self.window.frame;
+//            rect.size.height -= 20;
+//            [guideWC.window setFrame:rect display:NO];
+//            [guideWC.window setMinSize:rect.size];
+//            [guideWC.window setMaxSize:rect.size];
+//            [self.window addChildWindow:guideWC.window ordered:NSWindowAbove];
+//            [guideWC show];
+            let leftPanelItem:KMToolbarItemView = self.toolbarController.findItem("KMLeftControlToolbarItemIdentifier")!
+            
+            let guideWC = KMGuideInfoWindowController.currentWC()
+            guideWC.type = .openFileNormal
+            guideWC.openPanelRect = (self.view.window?.contentView?.convert(leftPanelItem.frame, from: leftPanelItem.superview))!
+            guideWC.window?.collectionBehavior = [.canJoinAllSpaces]
+            guideWC.normalGuideFinishHandle = { [weak self] windowVC in
+                let rightPanelItem:KMToolbarItemView = self!.toolbarController.findItem("KMRightControlToolbarItemIdentifier")!
+                let digitalPanelItem:KMToolbarItemView = self!.toolbarController.findItem("KMDocumentDigitalSignToolbarItemIdentifier")!
+                                
+                windowVC.rightPanelRect = (self!.view.window?.contentView?.convert(rightPanelItem.frame, from: rightPanelItem.superview))!
+                guideWC.digitalBoxRect = (self!.view.window?.contentView?.convert(digitalPanelItem.frame, from: digitalPanelItem.superview))!
+                
+            }
+            guideWC.finishHandle = { [weak self] windowVC, type in
+                
+            }
+            guideWC.openFileToggleHandle = { [weak self] windowVC, type in
+                
+            }
+            var rect = self.view.window!.frame
+            rect.size.height -= 20
+            guideWC.window?.setFrame(rect, display: false)
+            guideWC.window?.minSize = rect.size
+            guideWC.window?.maxSize = rect.size
+            self.view.window?.addChildWindow(guideWC.window!, ordered: .above)
+            guideWC.show()
+            
+            
+        } else if KMGuideInfoWindowController.availableShow(.digitalSignGuide) {
+            
+        } else {
             
-            KMFunctionGuideWindowController.setDidShowFor(.functionMulitDidital)
         }
     }