【工具栏】功能调式

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

@@ -1202,7 +1202,6 @@ extension KMToolbarViewController {
             item?.boxImagePosition = .imageAbove
             item?.selectBackgroundType = .imageBox
             item?.promptIdentifier = identifier
-            
         } else if identifier == KMDocumentScanOCRToolbarItemIdentifier {
             item?.titleName = NSLocalizedString("OCR", comment: "")
             item?.target = self
@@ -1414,6 +1413,7 @@ extension KMToolbarViewController {
             
             let menuItem = NSMenuItem.init(title: NSLocalizedString("Redact", comment: ""), action: #selector(redactMenuAction), target: self)
             menuItem.tag = item!.btnTag
+            menuItem.representedObject = identifier
             item?.menuFormRepresentation = menuItem
         } else if identifier == KMDocumentDigitalSignToolbarItemIdentifier {
             item?.image = NSImage(named: "DigitalSign_icon")
@@ -1448,9 +1448,8 @@ extension KMToolbarViewController {
                 }
             }
         } else if identifier == KMDocumentPageIndicatorToolbarItemIdentifier {
-            item?.titleName = NSLocalizedString("Zoom", comment: "")
-            let view = KMToolbarPageIndicatorItemView(zoomView: nil)
-            item?.customizeView = view
+//            let view = KMToolbarPageIndicatorItemView(zoomView: nil)
+//            item?.customizeView = view
         } else if identifier == KMDocumentPresentationToolbarItemIdentifier {
             item?.image = NSImage(named: "KMImageNameToolbarSlideshowNor")
             item?.titleName = NSLocalizedString("Presentation", comment: "")
@@ -1462,19 +1461,6 @@ extension KMToolbarViewController {
 //            item?.toolTip = NSLocalizedString("Convert PDF to JPEG, PNG, TIFF, BMP, GIF or TGA files", comment: "")
             item?.btnAction = #selector(_itemAction)
             item?.promptIdentifier = identifier
-            
-//            let menuItem = NSMenuItem.init(title: item?.titleName ?? "", action: #selector(conversionMenuItemAction), target: self)
-//            let subMenu = NSMenu()
-//            subMenu.addItem(title: NSLocalizedString("PDF To JPEG", comment: ""), action: #selector(_pdfToImageAction), target: self, tag: KMPDFConvertType.jpeg.rawValue)
-//            subMenu.addItem(title: NSLocalizedString("PDF To JPG", comment: ""), action: #selector(_pdfToImageAction), target: self, tag: KMPDFConvertType.jpg.rawValue)
-//            subMenu.addItem(title: NSLocalizedString("PDF To PNG", comment: ""), action: #selector(_pdfToImageAction), target: self, tag: KMPDFConvertType.png.rawValue)
-//            subMenu.addItem(title: NSLocalizedString("PDF To GIF", comment: ""), action: #selector(_pdfToImageAction), target: self, tag: KMPDFConvertType.gif.rawValue)
-//            subMenu.addItem(title: NSLocalizedString("PDF To TIFF", comment: ""), action: #selector(_pdfToImageAction), target: self, tag: KMPDFConvertType.tiff.rawValue)
-//            subMenu.addItem(title: NSLocalizedString("PDF To TGA", comment: ""), action: #selector(_pdfToImageAction), target: self, tag: KMPDFConvertType.tga.rawValue)
-//            subMenu.addItem(title: NSLocalizedString("PDF To BMP", comment: ""), action: #selector(_pdfToImageAction), target: self, tag: KMPDFConvertType.bmp.rawValue)
-//
-//            menuItem.submenu = subMenu
-//            item?.menuFormRepresentation = menuItem
         } else if identifier == KMToolbarFixedSpaceItemIdentifier {
             let view = NSView()
             view.frame = NSMakeRect(0, 0, 36, 36)

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/Model/KMToolbarConfigModel.swift

@@ -209,14 +209,14 @@ class KMToolbarConfigModel: NSObject {
     
     func addItem(itemId: String, at idx: Int) -> Bool {
         let isFixedSpaceItem = itemId == KMToolbarFixedSpaceItemIdentifier
-        if self.isLeft(at: idx) {
+        if self.isLeft(at: idx) || idx == self.leftCount {
             let contains = self.leftCellIdentifiers?.contains(itemId) ?? false
             if contains == false || isFixedSpaceItem {
                 self.leftCellIdentifiers?.insert(itemId, at: idx)
             }
             return true
         }
-        if self.isCenter(at: idx) {
+        if self.isCenter(at: idx) || idx == (self.leftCount+self.centerCount+1) {
             let theIdx = idx-self.leftCount-1
             let contains = self.centerCellIdentifiers?.contains(itemId) ?? false
             if contains == false || isFixedSpaceItem {
@@ -224,7 +224,7 @@ class KMToolbarConfigModel: NSObject {
             }
             return true
         }
-        if self.isRight(at: idx) {
+        if self.isRight(at: idx) || idx == (self.leftCount+self.centerCount+self.rightCount+2) {
             let theIdx = idx-self.leftCount-self.centerCount-2
             let contains = self.rightCellIdentifiers?.contains(itemId) ?? false
             if contains == false || isFixedSpaceItem {