【toolbar】选中区域和背景色调整以及一级菜单的tooptip调整

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

@@ -45,12 +45,14 @@ extension KMToolbarItemView {
             if self.itemIdentifier != KMToolbarDividerItemIdentifier {
                 if (isSelected) {
                     if (isMainTool) {
-                        self.layer?.backgroundColor = self.normalBackgroundColor.cgColor
+//                        self.layer?.backgroundColor = self.normalBackgroundColor.cgColor
+                        self.imageViewBox.fillColor = self.normalBackgroundColor
                         self.nameBtn.setTitleColor(color: KMAppearance.titleColor(), font: .SFProTextSemiboldFont(14))
                         self.linView.isHidden = false
                         return
                     }
-                    self.layer?.backgroundColor = self.selectedBackgroundColor.cgColor
+//                    self.layer?.backgroundColor = self.selectedBackgroundColor.cgColor
+                    self.imageViewBox.fillColor = self.selectedBackgroundColor
                     if(self.image != nil && self.alternateImage != nil) {
                         if (self.selectedImage != nil) {
                             self.imageViewBtn.image = self.selectedImage!
@@ -66,12 +68,14 @@ extension KMToolbarItemView {
                     }
                 } else {
                     if (isMainTool) {
-                        self.layer?.backgroundColor = self.normalBackgroundColor.cgColor
+//                        self.layer?.backgroundColor = self.normalBackgroundColor.cgColor
+                        self.imageViewBox.fillColor = self.normalBackgroundColor
                         self.nameBtn.setTitleColor(color: NSColor(red: 97.0/255.0, green: 100.0/255.0, blue: 105.0/255.0, alpha: 1.0),font: .SFProTextRegularFont(14))
                         self.linView.isHidden = true
                         return
                     }
-                    self.layer?.backgroundColor = self.normalBackgroundColor.cgColor
+//                    self.layer?.backgroundColor = self.normalBackgroundColor.cgColor
+                    self.imageViewBox.fillColor = self.normalBackgroundColor
                     if (self.needExpandAction) {
                         self.needExpandButton.image = NSImage(named: "KMImageNameUXIconBtnTriDownNor")
                     }
@@ -164,7 +168,7 @@ extension KMToolbarItemView {
     }()
   
     var normalBackgroundColor: NSColor = .clear
-    var selectedBackgroundColor: NSColor = .clear
+    var selectedBackgroundColor: NSColor = KMAppearance.Status.selColor()
     
     var imageViewBox: NSBox = {
         let _imageViewBox = NSBox()
@@ -236,8 +240,8 @@ extension KMToolbarItemView {
         self.layer?.cornerRadius = 5
         self.layer?.masksToBounds = true
         
-        self.normalBackgroundColor = .clear
-        self.selectedBackgroundColor = NSColor(red: 223.0/255.0, green: 225.0/255.0, blue: 229.0/255.0, alpha: 1)
+//        self.normalBackgroundColor = .clear
+//        self.selectedBackgroundColor = NSColor(red: 223.0/255.0, green: 225.0/255.0, blue: 229.0/255.0, alpha: 1)
         
         self._addTrackingArea()
         NotificationCenter.default.addObserver(self, selector: #selector(_windowClosedPop), name: KMToolbarItemView.popOverClosedNotificationName, object: nil)
@@ -253,8 +257,8 @@ extension KMToolbarItemView {
         self.layer?.cornerRadius = 4
         self.layer?.masksToBounds = true
         
-        self.normalBackgroundColor = .clear
-        self.selectedBackgroundColor = NSColor(red: 223.0/255.0, green: 225.0/255.0, blue: 229.0/255.0, alpha: 1)
+//        self.normalBackgroundColor = .clear
+//        self.selectedBackgroundColor = NSColor(red: 223.0/255.0, green: 225.0/255.0, blue: 229.0/255.0, alpha: 1)
         
         self._addTrackingArea()
         self._layoutView()
@@ -310,7 +314,8 @@ extension KMToolbarItemView {
             return
         }
         if (!self.isSelected) {
-            self.layer?.backgroundColor = self.selectedBackgroundColor.cgColor
+//            self.layer?.backgroundColor = self.selectedBackgroundColor.cgColor
+            self.imageViewBox.fillColor = self.selectedBackgroundColor
             if(self.image != nil && self.alternateImage != nil) {
                 self._kNormalImage = self.image
                 self.imageViewBtn.image = self.alternateImage
@@ -331,7 +336,8 @@ extension KMToolbarItemView {
         super.mouseExited(with: event)
         
         if (!self.isSelected && !self.needExpandAction) {
-            self.layer?.backgroundColor = self.normalBackgroundColor.cgColor
+//            self.layer?.backgroundColor = self.normalBackgroundColor.cgColor
+            self.imageViewBox.fillColor = self.normalBackgroundColor
             if(self.image != nil && self.alternateImage != nil) {
                 self.imageViewBtn.image = self._kNormalImage ?? self.image!
             }

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

@@ -394,7 +394,7 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
     func toolbarLeftDefaultItemIdentifiers(_ toolbar: KMToolbarView) -> [String] {
         if toolbarType == .Main {
             return [KMLeftControlToolbarItemIdentifier,
-                    KMDocumentZoomViewToolbarItemIdentifier, KMDocumentZoomToolbarItemIdentifier, KMDocumentZoomOutToolbarItemIdentifier,
+                    KMDocumentZoomViewToolbarItemIdentifier, KMDocumentZoomOutToolbarItemIdentifier, KMDocumentZoomToolbarItemIdentifier,
                     KMDocumentPreviousPageToolbarItemIdentifier, KMDocumentNextPageToolbarItemIdentifier, KMDocumentHomeToolbarItemIdentifier]
         }
         return []
@@ -515,8 +515,8 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 item?.titleName = NSLocalizedString("", comment: "")
                 item?.alternateImage = NSImage(named: "KMImageNameUXIconToolbarZoominNor")
                 item?.target = self
-                item?.btnTag = 0
-                item?.toolTip = NSLocalizedString("", comment: "")
+                item?.btnTag = 1
+                item?.toolTip = NSLocalizedString("Zoom In", comment: "")
                 item?.boxImagePosition = .imageAbove
                 item?.btnAction = #selector(zoomPDFViewButtonAction)
                 
@@ -529,8 +529,8 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 item?.titleName = NSLocalizedString("", comment: "")
                 item?.alternateImage = NSImage(named: "KMImageNameUXIconToolbarZoomoutNor")
                 item?.target = self
-                item?.btnTag = 1
-//                item?.toolTip = NSLocalizedString("Annotate PDF with highlight, text box and markup tools", comment: "")
+                item?.btnTag = 0
+                item?.toolTip = NSLocalizedString("Zoom Out", comment: "")
                 item?.boxImagePosition = .imageAbove
                 item?.btnAction = #selector(zoomPDFViewButtonAction)
                 
@@ -563,7 +563,7 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 item?.alternateImage = NSImage(named: "KMImageNameToolbarPagenextNor")
                 item?.target = self
                 item?.btnTag = 2
-                item?.toolTip = NSLocalizedString("Next", comment: "")
+                item?.toolTip = NSLocalizedString("Go To Next Page", comment: "")
                 item?.boxImagePosition = .imageAbove
                 item?.btnAction = #selector(itemAction)
                 
@@ -577,7 +577,7 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 item?.alternateImage = NSImage(named: "KMImageNameToolbarPagepreviousNor")
                 item?.target = self
                 item?.btnTag = 3
-                item?.toolTip = NSLocalizedString("Previous", comment: "")
+                item?.toolTip = NSLocalizedString("Go To Previous Page", comment: "")
                 item?.boxImagePosition = .imageAbove
                 item?.btnAction = #selector(itemAction)
                 
@@ -591,7 +591,7 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 item?.alternateImage = NSImage(named: "KMImageNameToolbarHomeNor")
                 item?.target = self
                 item?.btnTag = 4
-                item?.toolTip = NSLocalizedString("Home", comment: "")
+                item?.toolTip = NSLocalizedString("A Welcome Gift from Us", comment: "")
                 item?.boxImagePosition = .imageAbove
                 item?.btnAction = #selector(itemAction)
                 
@@ -604,7 +604,7 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 item?.image = NSImage(named: "KMImageNameUXIconToolbarMytoolsNor")
                 item?.target = self
 //                item?.isMainTool = true
-                item?.toolTip = NSLocalizedString("Add annotation with highlight, text and shape tool", comment: "")
+                item?.toolTip = String(format: "%@: %@, %@, %@, %@",  KMLocalizedString("Tool Mode", nil),KMLocalizedString("Annotate", nil),KMLocalizedString("Scroll", nil),KMLocalizedString("Magnify", nil),KMLocalizedString("Select", nil))
                 item?.btnTag = KMToolbarViewType.Annatiton.rawValue
                 item?.btnAction = #selector(leftControllButtonAction)
                 item?.boxImagePosition = .imageAbove
@@ -618,7 +618,7 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 item?.target = self
 //                item?.isMainTool = true
                 item?.image = NSImage(named: "KMImageNameUXIconToolbarPageeditNor")
-                item?.toolTip = NSLocalizedString("PDF Page Editor: rotate, delete, paste, copy, and cut pages", comment: "")
+                item?.toolTip = NSLocalizedString("PDF page editor: insert, delete, extract, rotate, reposition, and replace pages in a PDF", comment: "")
                 item?.btnTag = KMToolbarViewType.Page.rawValue
                 item?.btnAction = #selector(leftControllButtonAction)
                 item?.boxImagePosition = .imageAbove
@@ -632,7 +632,7 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 item?.target = self
 //                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?.toolTip = NSLocalizedString("Convert PDFs to Microsoft Word, PowerPoint, Excel, RTF, Text, Image, CSV, and more Offline", comment: "")
                 item?.btnTag = KMToolbarViewType.Conversion.rawValue
                 item?.btnAction = #selector(leftControllButtonAction)
                 item?.boxImagePosition = .imageAbove
@@ -648,7 +648,7 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 item?.image = NSImage(named: "KMImageNameToolbarOCRNor")
                 item?.boxImagePosition = .imageAbove
                 item?.btnTag = KMToolbarViewType.ScanOCR.rawValue
-                item?.toolTip = NSLocalizedString("Scan & OCR", comment: "")
+                item?.toolTip = NSLocalizedString("Recognize text from Image-based or Scanned PDF with OCR", comment: "")
                 item?.btnAction = #selector(leftControllButtonAction)
                 let menuItem = NSMenuItem.init(title: item!.titleName ?? "", action: #selector(leftControllButtonAction), target: self)
                 menuItem.target = self
@@ -695,7 +695,7 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 item?.image = NSImage(named: "KMImageNameUXIconToolbarFormNor")
                 item?.boxImagePosition = .imageAbove
                 item?.btnTag = KMToolbarViewType.Form.rawValue
-                item?.toolTip = NSLocalizedString("Form", comment: "")
+                item?.toolTip = NSLocalizedString("Edit PDF Form", comment: "")
                 item?.btnAction = #selector(leftControllButtonAction)
                 
                 let menuItem = NSMenuItem.init(title: item!.titleName ?? "", action: #selector(leftControllButtonAction), target: self)
@@ -709,7 +709,7 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 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?.toolTip = NSLocalizedString("Fill and sign forms", comment: "")
                 item?.btnAction = #selector(leftControllButtonAction)
                 
                 let menuItem = NSMenuItem.init(title: item!.titleName ?? "", action: #selector(leftControllButtonAction), target: self)
@@ -723,7 +723,7 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 item?.image = NSImage(named: "KMImageNameUXIconToolbarEdittoolNor")
                 item?.boxImagePosition = .imageAbove
                 item?.btnTag = KMToolbarViewType.Tool.rawValue
-                item?.toolTip = NSLocalizedString("Advanced editing tools", comment: "")
+                item?.toolTip = NSLocalizedString("Edit, delete, cut, copy, paste, and insert text in PDFs", comment: "")
                 item?.btnAction = #selector(leftControllButtonAction)
                 
                 let menuItem = NSMenuItem.init(title: item!.titleName ?? "", action: #selector(leftControllButtonAction), target: self)
@@ -736,7 +736,7 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 item?.image = NSImage(named: "KMImageNameUXIconToolbarRedactNor")
                 item?.boxImagePosition = .imageAbove
                 item?.btnTag = KMToolbarViewType.redact.rawValue
-                item?.toolTip = NSLocalizedString("Advanced editing tools", comment: "")
+                item?.toolTip = NSLocalizedString("Mark for redaction", comment: "")
                 item?.btnAction = #selector(leftControllButtonAction)
                 
                 let menuItem = NSMenuItem.init(title: item!.titleName ?? "", action: #selector(leftControllButtonAction), target: self)
@@ -827,7 +827,7 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 item?.alternateImage = NSImage(named: "KMImageNameUXIconBtnTriRightNor")
                 item?.target = self
                 item?.btnTag = KMToolbarViewType.RightPanel.rawValue
-                item?.toolTip = NSLocalizedString("Show/hide the right properties panel", comment: "")
+                item?.toolTip = NSLocalizedString("Show/Hide Annotation Properties Panel", comment: "")
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(rightPanelControllButtonAction)