【toolbar】UI替换

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

@@ -497,8 +497,7 @@ extension KMToolbarItemView {
                 make?.left.equalTo()(self.imageViewBox.mas_right)?.offset()(0)
                 make?.right.equalTo()(self.needExpandButton.mas_left)?.offset()(0)
             }
-        }
-        else if (self.boxImagePosition == .imageAbove) {
+        } else if (self.boxImagePosition == .imageAbove) {
             self.addSubview(self.nameBtn)
             self.nameBtn.alignment = .center
             self.nameBtn.mas_makeConstraints { make in
@@ -517,8 +516,10 @@ extension KMToolbarItemView {
         
             self.imageViewBox.contentView?.addSubview(self.imageViewBtn)
             self.imageViewBtn.mas_makeConstraints { make in
-                make?.left.top().right().equalTo()(offset)
-                make?.bottom.right().equalTo()(-offset)
+                make?.left.equalTo()(offset)
+                make?.right.equalTo()(-offset)
+                make?.top.equalTo()(0)
+                make?.bottom.equalTo()(0)
             }
         }
 

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

@@ -18,6 +18,7 @@ import Cocoa
     case Form
     case FillSign
     case Tool
+    case redact
     case Move
     case Magnify
     case Select
@@ -407,11 +408,14 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
             return []
         case .Main:
             return [KMDocumentAnnotationToolbarItemIdentifier,
-                    KMDocumentEditToolbarItemIdentifier,
                     KMDocumentPageToolbarItemIdentifier,
+                    KMDocumentToolToolbarItemIdentifier,
                     KMDocumentConversonToolbarItemIdentifier,
-//                    KMDocumentFillSginToolbarItemIdentifier,
-                    KMDocumentToolToolbarItemIdentifier]
+                    KMDocumentFormToolbarItemIdentifier,
+                    KMDocumentFillSginToolbarItemIdentifier,
+                    KMDocumentEditToolbarItemIdentifier,
+                    KMDocumentRedactToolbarItemIdentifier,
+                    KMDocumentScanOCRToolbarItemIdentifier]
         case .Annatiton,.Magnify,.Move,.Select,.SelectZoom:
             return [KMToolbarMoveToolModeItemIdentifier,
                     KMToolbarMagnifyToolModeItemIdentifier,
@@ -562,12 +566,14 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 menuItem.tag = item!.btnTag
                 item?.menuFormRepresentation = menuItem
             } else if identifier == KMDocumentAnnotationToolbarItemIdentifier {
-                item?.titleName = NSLocalizedString("Annotation", comment: "")
+                item?.titleName = NSLocalizedString("Tools", comment: "")
+                item?.image = NSImage(named: "KMImageNameUXIconToolbarMytoolsNor")
                 item?.target = self
-                item?.isMainTool = true
+//                item?.isMainTool = true
                 item?.toolTip = NSLocalizedString("Add annotation with highlight, text and shape tool", comment: "")
                 item?.btnTag = KMToolbarViewType.Annatiton.rawValue
                 item?.btnAction = #selector(leftControllButtonAction)
+                item?.boxImagePosition = .imageAbove
                 
                 let menuItem = NSMenuItem.init(title: item!.titleName ?? "", action: #selector(leftControllButtonAction), target: self)
                 menuItem.target = self
@@ -576,10 +582,13 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
             } else if identifier == KMDocumentPageToolbarItemIdentifier {
                 item?.titleName = NSLocalizedString("Page Edit", comment: "")
                 item?.target = self
-                item?.isMainTool = true
+//                item?.isMainTool = true
+                item?.image = NSImage(named: "KMImageNameUXIconToolbarPageeditNor")
                 item?.toolTip = NSLocalizedString("PDF Page Editor: rotate, delete, paste, copy, and cut pages", comment: "")
                 item?.btnTag = KMToolbarViewType.Page.rawValue
                 item?.btnAction = #selector(leftControllButtonAction)
+                item?.boxImagePosition = .imageAbove
+                
                 let menuItem = NSMenuItem.init(title: item!.titleName ?? "", action: #selector(leftControllButtonAction), target: self)
                 menuItem.target = self
                 menuItem.tag = item!.btnTag
@@ -587,19 +596,23 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
             } else if identifier == KMDocumentConversonToolbarItemIdentifier {
                 item?.titleName = NSLocalizedString("Converter", comment: "")
                 item?.target = self
-                item?.isMainTool = true
+//                item?.isMainTool = true
+                item?.image = NSImage(named: "KMImageNameUXIconToolbarConvertNor")
                 item?.toolTip = NSLocalizedString("Convert PDF to Word, Excel, PPT, RTF, CSV, HTML, Text and Image.", comment: "")
                 item?.btnTag = KMToolbarViewType.Conversion.rawValue
                 item?.btnAction = #selector(leftControllButtonAction)
+                item?.boxImagePosition = .imageAbove
                 
                 let menuItem = NSMenuItem.init(title: item!.titleName ?? "", action: #selector(leftControllButtonAction), target: self)
                 menuItem.target = self
                 menuItem.tag = item!.btnTag
                 item?.menuFormRepresentation = menuItem
             } else if identifier == KMDocumentScanOCRToolbarItemIdentifier {
-                item?.titleName = NSLocalizedString("Scan & OCR", comment: "")
+                item?.titleName = NSLocalizedString("OCR", comment: "")
                 item?.target = self
-                item?.isMainTool = true
+//                item?.isMainTool = true
+                item?.image = NSImage(named: "KMImageNameToolbarOCRNor")
+                item?.boxImagePosition = .imageAbove
                 item?.btnTag = KMToolbarViewType.ScanOCR.rawValue
                 item?.toolTip = NSLocalizedString("Scan & OCR", comment: "")
                 item?.btnAction = #selector(leftControllButtonAction)
@@ -628,9 +641,11 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 item?.btnAction = #selector(scanOCRModelSelect)
                 
             } else if identifier == KMDocumentEditToolbarItemIdentifier {
-                item?.titleName = NSLocalizedString("Edit", comment: "")
+                item?.titleName = NSLocalizedString("Edit PDF", comment: "")
                 item?.target = self
-                item?.isMainTool = true
+//                item?.isMainTool = true
+                item?.image = NSImage(named: "KMImageNameUXIconToolbarEditNor")
+                item?.boxImagePosition = .imageAbove
                 item?.btnTag = KMToolbarViewType.editPDF.rawValue
                 item?.toolTip = NSLocalizedString("Edit text and image in PDF", comment: "")
                 item?.btnAction = #selector(leftControllButtonAction)
@@ -640,9 +655,11 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 menuItem.tag = item!.btnTag
                 item?.menuFormRepresentation = menuItem
             } else if identifier == KMDocumentFormToolbarItemIdentifier {
-                item?.titleName = NSLocalizedString("Form", comment: "")
+                item?.titleName = NSLocalizedString("Forms", comment: "")
                 item?.target = self
-                item?.isMainTool = true
+//                item?.isMainTool = true
+                item?.image = NSImage(named: "KMImageNameUXIconToolbarFormNor")
+                item?.boxImagePosition = .imageAbove
                 item?.btnTag = KMToolbarViewType.Form.rawValue
                 item?.toolTip = NSLocalizedString("Form", comment: "")
                 item?.btnAction = #selector(leftControllButtonAction)
@@ -652,9 +669,11 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 menuItem.tag = item!.btnTag
                 item?.menuFormRepresentation = menuItem
             } else if identifier == KMDocumentFillSginToolbarItemIdentifier {
-                item?.titleName = NSLocalizedString("Fillsign", comment: "")
+                item?.titleName = NSLocalizedString("Fill & Sign", comment: "")
                 item?.target = self
-                item?.isMainTool = true
+//                item?.isMainTool = true
+                item?.image = NSImage(named: "KMImageNameUXIconToolbarFillsignNor")
+                item?.boxImagePosition = .imageAbove
                 item?.btnTag = KMToolbarViewType.FillSign.rawValue
                 item?.toolTip = NSLocalizedString("Fill and sign forms or allow others to sign them", comment: "")
                 item?.btnAction = #selector(leftControllButtonAction)
@@ -664,13 +683,28 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 menuItem.tag = item!.btnTag
                 item?.menuFormRepresentation = menuItem
             } else if identifier == KMDocumentToolToolbarItemIdentifier {
-                item?.titleName = NSLocalizedString("Tools", comment: "")
+                item?.titleName = NSLocalizedString("Editor", comment: "")
                 item?.target = self
-                item?.isMainTool = true
+//                item?.isMainTool = true
+                item?.image = NSImage(named: "KMImageNameUXIconToolbarEdittoolNor")
+                item?.boxImagePosition = .imageAbove
                 item?.btnTag = KMToolbarViewType.Tool.rawValue
                 item?.toolTip = NSLocalizedString("Advanced editing tools", comment: "")
                 item?.btnAction = #selector(leftControllButtonAction)
                 
+                let menuItem = NSMenuItem.init(title: item!.titleName ?? "", action: #selector(leftControllButtonAction), target: self)
+                menuItem.target = self
+                menuItem.tag = item!.btnTag
+                item?.menuFormRepresentation = menuItem
+            } else if identifier == KMDocumentRedactToolbarItemIdentifier {
+                item?.titleName = NSLocalizedString("Redact Text", comment: "")
+                item?.target = self
+                item?.image = NSImage(named: "KMImageNameUXIconToolbarRedactNor")
+                item?.boxImagePosition = .imageAbove
+                item?.btnTag = KMToolbarViewType.redact.rawValue
+                item?.toolTip = NSLocalizedString("Advanced editing tools", comment: "")
+                item?.btnAction = #selector(leftControllButtonAction)
+                
                 let menuItem = NSMenuItem.init(title: item!.titleName ?? "", action: #selector(leftControllButtonAction), target: self)
                 menuItem.target = self
                 menuItem.tag = item!.btnTag

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

@@ -22,6 +22,8 @@ let KMDocumentFormToolbarItemIdentifier = "KMDocumentFormToolbarItemIdentifier"
 let KMDocumentEditToolbarItemIdentifier = "KMDocumentPageEditToolbarItemIdentifier"
 let KMDocumentFillSginToolbarItemIdentifier = "KMDocumentFillSginToolbarItemIdentifier"
 let KMDocumentToolToolbarItemIdentifier = "KMDocumentToolToolbarItemIdentifier"
+let KMDocumentRedactToolbarItemIdentifier = "KMDocumentRedactToolbarItemIdentifier"
+let KMDocumentViewSettingToolbarItemIdentifier = "KMDocumentViewSettingToolbarItemIdentifier"
 let KMDocumentPrintToolbarItemIdentifier = "KMDocumentPrintToolbarItemIdentifier"
 let KMDocumentAITranslationToolbarItemIdentifier = "KMDocumentAITranslationToolbarItemIdentifier"
 let KMDocumentShareToolbarItemIdentifier = "KMDocumentShareToolbarItemIdentifier"
@@ -29,6 +31,7 @@ let KMRightControlToolbarItemIdentifier  = "KMRightControlToolbarItemIdentifier"
 let mainToolIdentifiers = [KMLeftControlToolbarItemIdentifier, KMDocumentZoomToolbarItemIdentifier, KMDocumentZoomOutToolbarItemIdentifier,
                            KMDocumentZoomViewToolbarItemIdentifier, KMDocumentPreviousPageToolbarItemIdentifier, KMDocumentNextPageToolbarItemIdentifier,
                            KMDocumentAnnotationToolbarItemIdentifier, KMDocumentPageToolbarItemIdentifier, KMDocumentConversonToolbarItemIdentifier,
+                           KMDocumentRedactToolbarItemIdentifier,KMDocumentViewSettingToolbarItemIdentifier,
                            KMDocumentScanOCRToolbarItemIdentifier, KMDocumentFormToolbarItemIdentifier, KMDocumentEditToolbarItemIdentifier,
                            KMDocumentFillSginToolbarItemIdentifier, KMDocumentToolToolbarItemIdentifier, KMDocumentPrintToolbarItemIdentifier,
                            KMDocumentShareToolbarItemIdentifier, KMRightControlToolbarItemIdentifier]