Selaa lähdekoodia

【综合】文件对比引导处理

niehaoyu 1 vuosi sitten
vanhempi
commit
c290f0dbec
16 muutettua tiedostoa jossa 628 lisäystä ja 10 poistoa
  1. 66 0
      PDF Office/PDF Master.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  2. 3 5
      PDF Office/PDF Master/Class/GuideInfo/Controllers/FunctionGuide/KMConvertGuideView.xib
  3. 1 1
      PDF Office/PDF Master/Class/GuideInfo/Controllers/FunctionGuide/KMOpenFileFunctionView.swift
  4. 22 0
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/guideConvert.imageset/Contents.json
  5. BIN
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/guideConvert.imageset/Frame 1000006538.pdf
  6. BIN
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/guideConvert.imageset/guideConvert.pdf
  7. 12 0
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/guide_Convert_tip.imageset/Contents.json
  8. 93 0
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/guide_Convert_tip.imageset/guide_Convert_tip.pdf
  9. 22 0
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/vipSecond.imageset/Contents.json
  10. 82 0
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/vipSecond.imageset/vip-3.pdf
  11. 81 0
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/vipSecond.imageset/vipSecond.pdf
  12. 22 0
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/vipSecondDark.imageset/Contents.json
  13. 81 0
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/vipSecondDark.imageset/vipSecond 1.pdf
  14. 81 0
      PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/vipSecondDark.imageset/vipSecond.pdf
  15. 4 0
      PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift
  16. 58 4
      PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController.swift

+ 66 - 0
PDF Office/PDF Master.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -3,4 +3,70 @@
    uuid = "1CCF492B-C35D-4676-9A6F-6C1FA4C62FF1"
    type = "1"
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "4866007A-0701-444E-AFC7-C571286D5EE8"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "726"
+            endingLineNumber = "726"
+            landmarkName = "loadOpenFileFunctionGuide(_:)"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "4866007A-0701-444E-AFC7-C571286D5EE8 - c7c9950d5bad685"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Master.KMMainViewController.loadOpenFileFunctionGuide(PDF_Master.KMGuideInfoType) -&gt; ()"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/KMMainViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "726"
+                  endingLineNumber = "726"
+                  offsetFromSymbolStart = "3252">
+               </Location>
+               <Location
+                  uuid = "4866007A-0701-444E-AFC7-C571286D5EE8 - c7c9950d5bad685"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Master.KMMainViewController.loadOpenFileFunctionGuide(PDF_Master.KMGuideInfoType) -&gt; ()"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/KMMainViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "726"
+                  endingLineNumber = "726"
+                  offsetFromSymbolStart = "3552">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "A48A3A00-B739-4074-9577-B3FF666D041E"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "3025"
+            endingLineNumber = "3025"
+            landmarkName = "mainToolDidClicked(_:_:_:_:_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>

+ 3 - 5
PDF Office/PDF Master/Class/GuideInfo/Controllers/FunctionGuide/KMConvertGuideView.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="KMConvertGuideView" customModule="PDF_Reader_Pro" customModuleProvider="target">
+        <customView id="c22-O7-iKe" customClass="KMConvertGuideView" customModule="PDF_Master" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="678" height="650"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
@@ -223,7 +223,6 @@
                                     <constraints>
                                         <constraint firstAttribute="height" constant="32" id="ysN-nq-4L9"/>
                                     </constraints>
-                                    <font key="titleFont" metaFont="smallSystem"/>
                                 </box>
                                 <box boxType="custom" borderType="line" cornerRadius="5" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="PWh-gy-TmU" customClass="KMBox">
                                     <rect key="frame" x="235" y="20" width="145" height="32"/>
@@ -263,7 +262,6 @@
                                     <constraints>
                                         <constraint firstAttribute="height" constant="32" id="Yxg-6j-mab"/>
                                     </constraints>
-                                    <font key="titleFont" metaFont="smallSystem"/>
                                 </box>
                             </subviews>
                             <constraints>

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

@@ -106,7 +106,7 @@ class KMOpenFileFunctionView: NSView, NibLoadable {
             
         } else if self.type == .pdfCompareGuide {
             if self.window != nil {
-                self.circleTopConst.constant = (self.window?.frame.size.height)! - self.circleRect.origin.y - CGRectGetHeight(self.bigCircleView.frame) + 5
+                self.circleTopConst.constant = (self.window?.frame.size.height)! - self.circleRect.origin.y - CGRectGetHeight(self.bigCircleView.frame) + 50
             }
             self.circleLeftConst.constant = CGRectGetMinX(KMGuideInfoWindowController.currentWC().compareItemRect) - CGRectGetWidth(self.bigCircleView.frame)/2 + CGRectGetWidth(KMGuideInfoWindowController.currentWC().compareItemRect)/2
             self.tipImage.image = NSImage(named: "guidePDFCompare")

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

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

BIN
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/guideConvert.imageset/Frame 1000006538.pdf


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


+ 12 - 0
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/guide_Convert_tip.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "guide_Convert_tip.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

+ 93 - 0
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/guide_Convert_tip.imageset/guide_Convert_tip.pdf

@@ -0,0 +1,93 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 3.000000 2.500000 cm
+0.133333 0.478431 1.000000 scn
+14.000000 7.000000 m
+14.000000 3.177451 10.829412 0.000000 7.000000 0.000000 c
+3.177451 0.000000 0.000000 3.177451 0.000000 7.000000 c
+0.000000 10.829412 3.170588 14.000000 6.993137 14.000000 c
+10.822549 14.000000 14.000000 10.829412 14.000000 7.000000 c
+h
+6.947363 9.249903 m
+6.471289 9.249903 6.090430 9.630762 6.090430 10.113184 c
+6.090430 10.595606 6.471289 10.976465 6.947363 10.976465 c
+7.423438 10.976465 7.797949 10.595606 7.797949 10.113184 c
+7.797949 9.630762 7.423438 9.249903 6.947363 9.249903 c
+h
+8.521582 3.321192 m
+5.861914 3.321192 l
+5.588965 3.321192 5.379492 3.517969 5.379492 3.790918 c
+5.379492 4.044825 5.588965 4.254297 5.861914 4.254297 c
+6.668067 4.254297 l
+6.668067 7.237695 l
+5.969824 7.237695 l
+5.703223 7.237695 5.493750 7.434473 5.493750 7.707422 c
+5.493750 7.961328 5.703223 8.170801 5.969824 8.170801 c
+7.201270 8.170801 l
+7.537695 8.170801 7.715430 7.929590 7.715430 7.574121 c
+7.715430 4.254297 l
+8.521582 4.254297 l
+8.794531 4.254297 9.004004 4.044825 9.004004 3.790918 c
+9.004004 3.517969 8.794531 3.321192 8.521582 3.321192 c
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  1190
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.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
+0000000034 00000 n
+0000001280 00000 n
+0000001303 00000 n
+0000001476 00000 n
+0000001550 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1609
+%%EOF

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

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

+ 82 - 0
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/vipSecond.imageset/vip-3.pdf

@@ -0,0 +1,82 @@
+%PDF-1.7
+
+1 0 obj
+  << /ExtGState << /E1 << /ca 0.800000 >> >> >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+/E1 gs
+1.000000 0.000000 -0.000000 1.000000 2.500000 2.500000 cm
+1.000000 1.000000 1.000000 scn
+7.500000 0.000000 m
+11.642136 0.000000 15.000000 3.357864 15.000000 7.500000 c
+15.000000 11.642136 11.642136 15.000000 7.500000 15.000000 c
+3.357864 15.000000 0.000000 11.642136 0.000000 7.500000 c
+0.000000 3.357864 3.357864 0.000000 7.500000 0.000000 c
+h
+7.242832 4.519862 m
+11.409499 9.519861 l
+10.257167 10.480139 l
+6.616268 6.111059 l
+4.696997 8.030331 l
+3.636337 6.969670 l
+6.136336 4.469670 l
+6.717065 3.888942 l
+7.242832 4.519862 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  574
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.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
+0000000704 00000 n
+0000000726 00000 n
+0000000899 00000 n
+0000000973 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1032
+%%EOF

+ 81 - 0
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/vipSecond.imageset/vipSecond.pdf

@@ -0,0 +1,81 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 2.500000 2.500000 cm
+0.152276 0.234759 0.385445 scn
+7.500000 0.000000 m
+11.642136 0.000000 15.000000 3.357864 15.000000 7.500000 c
+15.000000 11.642136 11.642136 15.000000 7.500000 15.000000 c
+3.357864 15.000000 0.000000 11.642136 0.000000 7.500000 c
+0.000000 3.357864 3.357864 0.000000 7.500000 0.000000 c
+h
+7.242832 4.519862 m
+11.409499 9.519861 l
+10.257167 10.480139 l
+6.616268 6.111059 l
+4.696997 8.030331 l
+3.636337 6.969670 l
+6.136336 4.469670 l
+6.717065 3.888942 l
+7.242832 4.519862 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  567
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.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
+0000000034 00000 n
+0000000657 00000 n
+0000000679 00000 n
+0000000852 00000 n
+0000000926 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+985
+%%EOF

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

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

+ 81 - 0
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/vipSecondDark.imageset/vipSecond 1.pdf

@@ -0,0 +1,81 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 2.500000 2.500000 cm
+0.152276 0.234759 0.385445 scn
+7.500000 0.000000 m
+11.642136 0.000000 15.000000 3.357864 15.000000 7.500000 c
+15.000000 11.642136 11.642136 15.000000 7.500000 15.000000 c
+3.357864 15.000000 0.000000 11.642136 0.000000 7.500000 c
+0.000000 3.357864 3.357864 0.000000 7.500000 0.000000 c
+h
+7.242832 4.519862 m
+11.409499 9.519861 l
+10.257167 10.480139 l
+6.616268 6.111059 l
+4.696997 8.030331 l
+3.636337 6.969670 l
+6.136336 4.469670 l
+6.717065 3.888942 l
+7.242832 4.519862 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  567
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.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
+0000000034 00000 n
+0000000657 00000 n
+0000000679 00000 n
+0000000852 00000 n
+0000000926 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+985
+%%EOF

+ 81 - 0
PDF Office/PDF Master/Class/GuideInfo/GuideInfoImages.xcassets/vipSecondDark.imageset/vipSecond.pdf

@@ -0,0 +1,81 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 2.500000 2.500000 cm
+0.152276 0.234759 0.385445 scn
+7.500000 0.000000 m
+11.642136 0.000000 15.000000 3.357864 15.000000 7.500000 c
+15.000000 11.642136 11.642136 15.000000 7.500000 15.000000 c
+3.357864 15.000000 0.000000 11.642136 0.000000 7.500000 c
+0.000000 3.357864 3.357864 0.000000 7.500000 0.000000 c
+h
+7.242832 4.519862 m
+11.409499 9.519861 l
+10.257167 10.480139 l
+6.616268 6.111059 l
+4.696997 8.030331 l
+3.636337 6.969670 l
+6.136336 4.469670 l
+6.717065 3.888942 l
+7.242832 4.519862 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  567
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.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
+0000000034 00000 n
+0000000657 00000 n
+0000000679 00000 n
+0000000852 00000 n
+0000000926 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+985
+%%EOF

+ 4 - 0
PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift

@@ -3057,6 +3057,10 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
             self.rightSideViewController.subViewType = .AnnotationProperts
         } else if type == .redact {
             self.enterRedact()
+        } else if type == .Tool {
+            self.loadOpenFileFunctionGuide(.pdfCompareGuide)
+        } else if type == . Conversion {
+            self.loadOpenFileFunctionGuide(.convertGuide)
         }
     }
     

+ 58 - 4
PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController.swift

@@ -640,14 +640,14 @@ import Cocoa
     func loadFunctionGuide() -> Void {
 
         DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 1) {
-            self.loadOpenFileFunctionGuide()
+            self.loadOpenFileFunctionGuide(.openFileNormal)
         }
     }
     
     
-    func loadOpenFileFunctionGuide() -> Void {
+    func loadOpenFileFunctionGuide(_ showType: KMGuideInfoType) -> Void {
 
-        if KMGuideInfoWindowController.availableShow(.openFileNormal) {
+        if showType == .openFileNormal && 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];
@@ -702,8 +702,62 @@ import Cocoa
             guideWC.show()
             
             
-        } else if KMGuideInfoWindowController.availableShow(.digitalSignGuide) {
+        } else if showType == .digitalSignGuide && KMGuideInfoWindowController.availableShow(.digitalSignGuide) {
+            //            KMGuideInfoWindowController *guideWC = [KMGuideInfoWindowController currentWC];
+            //            guideWC.type = KMGuideInfoTypeDigitalSignGuide;
+            //            guideWC.digitalBoxRect = [self.window.contentView convertRect:self.toolbarController.digitalSignBox.frame fromView:self.toolbarController.digitalSignBox.superview];
+            //            guideWC.window.collectionBehavior |= self.window.collectionBehavior & NSWindowCollectionBehaviorCanJoinAllSpaces;
+            //            guideWC.finishHandle = ^(KMGuideInfoWindowController * _Nonnull windowVC, enum KMGuideActionType type) {
+            //                if (type == KMGuideActionTypeWindowNewFinish ||
+            //                    type == KMGuideActionTypeWindowDigitalFinish) {
+            //                    [self checkFirstTrialController];
+            //                }
+            //            };
+            //
+            //            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 guideWC = KMGuideInfoWindowController.currentWC()
+            guideWC.type = .digitalSignGuide
+            let digitalPanelItem:KMToolbarItemView = self.toolbarController.findItem(KMDocumentDigitalSignToolbarItemIdentifier)!
+            guideWC.digitalBoxRect = (self.view.window?.contentView?.convert(digitalPanelItem.frame, from: digitalPanelItem.superview))!
+            guideWC.window?.collectionBehavior = [.canJoinAllSpaces]
+            guideWC.finishHandle = { [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 showType == .pdfCompareGuide && KMGuideInfoWindowController.availableShow(.pdfCompareGuide) {
+            DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 1) {
+                let guideWC = KMGuideInfoWindowController.currentWC()
+                guideWC.type = .pdfCompareGuide
+                
+                let digitalPanelItem:KMToolbarItemView = self.toolbarController.findItem(KMDocumentDigitalSignToolbarItemIdentifier)!
+                guideWC.digitalBoxRect = (self.view.window?.contentView?.convert(digitalPanelItem.frame, from: digitalPanelItem.superview))!
+                
+                let compareItem:KMToolbarItemView = self.toolbarController.findItem(KMToolbarComparisonItemIdentifier)!
+                guideWC.compareItemRect = (self.view.window?.contentView?.convert(compareItem.frame, from: compareItem.superview))!
+                
+                guideWC.window?.collectionBehavior = [.canJoinAllSpaces]
+                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 {
             
         }