【toolbar】FillSign表单UI替换

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarViewController.swift

@@ -503,6 +503,7 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                     KMToolbarToolLineItemIdentifier,
                     KMToolbarToolDotItemIdentifier,
                     KMToolbarToolDateIdentifier,
+                    KMToolbarToolProfileIdentifier,
                     KMToolbarFillSignSignatureIdentifier]
         case .Conversion:
             return [KMToolbarConversionWordItemIdentifier,
@@ -1192,58 +1193,59 @@ extension KMToolbarViewController {
             item?.boxImagePosition = .imageOnly
             item?.btnAction = #selector(changeAnnotationMode)
         } else if identifier == KMToolbarToolForkItemIdentifier {
-            item?.image = NSImage(named: "KMImageNameFillSignFork")
+            item?.image = NSImage(named: KMImageNameUXIconSubtoolbarFillsignFork)
             item?.target = self
             item?.btnTag = CAnnotationType.signFalse.rawValue
-            item?.toolTip = NSLocalizedString("X", comment: "")
-            item?.titleName = NSLocalizedString("signFalse", comment: "")
+            item?.toolTip = NSLocalizedString("Add X", comment: "")
             item?.boxImagePosition = .imageOnly
             item?.btnAction = #selector(changeAnnotationMode)
         } else if identifier == KMToolbarToolLineItemIdentifier {
-            item?.image = NSImage(named: "KMImageNameFillSignLine")
+            item?.image = NSImage(named: KMImageNameUXIconSubtoolbarFillsignLine)
             item?.target = self
             item?.btnTag = CAnnotationType.signLine.rawValue
-            item?.toolTip = NSLocalizedString("Line", comment: "")
-            item?.titleName = NSLocalizedString("Line", comment: "")
+            item?.toolTip = NSLocalizedString("Add line", comment: "")
             item?.boxImagePosition = .imageOnly
             item?.btnAction = #selector(changeAnnotationMode)
         } else if identifier == KMToolbarToolDotItemIdentifier {
-            item?.image = NSImage(named: "KMImageNameFillSignDot")
+            item?.image = NSImage(named: KMImageNameUXIconSubtoolbarFillsignPoint)
             item?.target = self
             item?.btnTag = CAnnotationType.signDot.rawValue
-            item?.toolTip = NSLocalizedString("Dot", comment: "")
-            item?.titleName = NSLocalizedString("Dot", comment: "")
+            item?.toolTip = NSLocalizedString("Add dot", comment: "")
             item?.boxImagePosition = .imageOnly
             item?.btnAction = #selector(changeAnnotationMode)
         } else if identifier == KMToolbarToolRectangleIdentifier {
-            item?.image = NSImage(named: "KMImageNameFillSignRectangle")
+            item?.image = NSImage(named: KMImageNameUXIconSubtoolbarFillsignRoundedrec)
             item?.target = self
             item?.btnTag = CAnnotationType.signCircle.rawValue
-            item?.toolTip = NSLocalizedString("Rectangle", comment: "")
-            item?.titleName = NSLocalizedString("Rectangle", comment: "")
+            item?.toolTip = NSLocalizedString("Add circle", comment: "")
             item?.boxImagePosition = .imageOnly
             item?.btnAction = #selector(changeAnnotationMode)
         } else if identifier == KMToolbarToolTextIdentifier {
-            item?.image = NSImage(named: "KMImageNameMainToolFreeText")
+            item?.image = NSImage(named: KMImageNameToolbarFreeText)
             item?.target = self
             item?.btnTag = CAnnotationType.signText.rawValue
-            item?.toolTip = NSLocalizedString("Add a handwritten signature or create a signature via the trackpad", comment: "")
-            item?.titleName = NSLocalizedString("signText", comment: "")
+            item?.toolTip = NSLocalizedString("Add text", comment: "")
+            item?.titleName = NSLocalizedString("Text", comment: "")
             item?.boxImagePosition = .imageOnly
             item?.btnAction = #selector(changeAnnotationMode)
         } else if identifier == KMToolbarToolDateIdentifier {
-            item?.image = NSImage(named: "KMImageNameFillSignDate")
+            item?.image = NSImage(named: KMImageNameUXIconSubtoolbarFillsignDate)
             item?.target = self
             item?.btnTag = CAnnotationType.signDate.rawValue
             item?.toolTip = NSLocalizedString("Date", comment: "")
-            item?.titleName = NSLocalizedString("Date", comment: "")
             item?.boxImagePosition = .imageOnly
             item?.btnAction = #selector(changeAnnotationMode)
-        } else if (identifier == KMToolbarFillSignSignatureIdentifier) {
-            item?.image = NSImage(named: "KMImageNameMainToolSignSignature")
+        } else if (identifier == KMToolbarToolProfileIdentifier) {
+            item?.image = NSImage(named: KMImageNameUXIconSubtoolbarFillsignMyprofile)
+            item?.target = self
+            item?.toolTip = NSLocalizedString("My Profile", comment: "")
+            item?.boxImagePosition = .imageOnly
+            item?.btnAction = #selector(_itemAction)
+        }else if (identifier == KMToolbarFillSignSignatureIdentifier) {
+            item?.image = NSImage(named: KMImageNameUXIconSubtoolbarFillsignMysignature)
             item?.target = self
             item?.btnTag = CAnnotationType.signSignature.rawValue
-            item?.toolTip = NSLocalizedString("Add a handwritten signature or create a signature via the trackpad", comment: "")
+            item?.toolTip = NSLocalizedString("Sign document by typing or drawing a signature", comment: "")
             item?.boxImagePosition = .imageOnly
             item?.btnAction = #selector(changeAnnotationMode)
         }

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/PublicKey.swift

@@ -148,11 +148,13 @@ let KMToolbarToolDotItemIdentifier      =  "KMToolbarToolDotItemIdentifier"
 let KMToolbarToolRectangleIdentifier    =  "KMToolbarToolRectangleIdentifier"
 let KMToolbarToolTextIdentifier         =  "KMToolbarToolTextIdentifier"
 let KMToolbarToolDateIdentifier         =  "KMToolbarToolDateIdentifier"
+let KMToolbarToolProfileIdentifier         =  "KMToolbarToolProfileIdentifier"
 let KMToolbarFillSignSignatureIdentifier = "KMToolbarFillSignSignatureIdentifier"
 let fillSignToolIdentifiers = [KMToolbarToolHookItemIdentifier, KMToolbarToolForkItemIdentifier,
                                KMToolbarToolLineItemIdentifier, KMToolbarToolDotItemIdentifier,
                                KMToolbarToolRectangleIdentifier, KMToolbarToolTextIdentifier,
-                               KMToolbarToolDateIdentifier, KMToolbarFillSignSignatureIdentifier]
+                               KMToolbarToolDateIdentifier, KMToolbarToolProfileIdentifier,
+                               KMToolbarFillSignSignatureIdentifier]
 
 //Scan OCR
 let KMToolbarToolOCRTextIdentifier     =  "KMToolbarToolOCRTextIdentifier"

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

@@ -2930,6 +2930,8 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
         } else if toolbarItem.itemIdentifier == KMDocumentPrintToolbarItemIdentifier {
             self.trackEvent_print()
             self.showPrintWindow()
+        } else if toolbarItem.itemIdentifier == KMToolbarToolProfileIdentifier {
+            Swift.debugPrint("KMToolbarToolProfileIdentifier ...")
         }
     }