【综合】PDF界面 通过自定义工具栏添加的按钮，无提示文字，点击无效果(已修复)

PDF Office/PDF Master/Class/PDFTools/Merge/View/KMPDFThumbnialPageView.swift

@@ -89,8 +89,25 @@ class KMPDFThumbnialPageLayer: CATiledLayer {
                 
                 ctx.scaleBy(x: viewWidth / bounds.size.width,
                             y: viewHeight / bounds.size.height);
+//                self.page!.drawEdit(with: .cropBox, to: ctx)
+//            self.page?.draw(with: .cropBox, to: ctx)
+//            if let tiffData = (self.page?.thumbnail(of: self.page?.size ?? .zero))?.tiffRepresentation {
+//            if let tiffData = self.page?.PDFListViewTIFFData(for: self.page?.bounds ?? .zero) {
+//                let image = NSImage(data: tiffData)
+//                image?.draw(in: ctx as! NSRect)
+//                image?.draw(in: bounds)
+//                let bitmap = NSBitmapImageRep(data: tiffData)
+//                ctx.draw((bitmap?.cgImage)!, in: NSMakeRect(0, 0, bounds.size.width, bounds.size.height))
+//                ctx.restoreGState();
+//                self.contents = bitmap?.cgImage
+//            } else {
+//            km_synchronized(self.page!.document) {
                 self.page!.drawEdit(with: .cropBox, to: ctx)
+//            }
+//                self.page!.drawEdit(with: .cropBox, to: ctx)
                 ctx.restoreGState();
+//            }
+//                ctx.restoreGState();
                 
                 if let _image = ctx.makeImage() {
                     let image = NSImage(cgImage: _image, size: NSSize(width: viewWidth, height: viewHeight))

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

@@ -188,7 +188,11 @@ class KMToolbarViewController: NSViewController, NSTextFieldDelegate {
     
     @IBAction func changeAnnotationMode(item: KMToolbarClickButton) {
         self.delegate?.changeAnnotationModeAction?(item: item)
-        self._itemSetPromptFlag(item: item.clickObject as? KMToolbarItemView)
+        if item.isKind(of: KMToolbarClickButton.self) {
+            self._itemSetPromptFlag(item: item.clickObject as? KMToolbarItemView)
+        } else {
+            
+        }
     }
     
     @IBAction func leftControllButtonAction(item: KMToolbarClickButton) {
@@ -788,11 +792,12 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                         item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarPageInsert)
                         item?.target = self
                         item?.btnTag = KMPageEditType.insert.rawValue
-            //            item?.toolTip = NSLocalizedString("Inserting pages into an existing PDF", comment: "")
+                        item?.isShowCustomToolTip = true
+                        item?.toolTip = NSLocalizedString("Inserting pages into an existing PDF", comment: "")
+                        item?.isPopToolTip = true
                         item?.titleName = NSLocalizedString("Insert", comment: "")
-                        item?.boxImagePosition = .imageExpandLeft
-            //            item?.btnAction = #selector(insertMenuAction)
-                        item?.needExpandAction = true
+                        item?.boxImagePosition = .imageOnly
+                        item?.btnAction = #selector(_itemAction)
                     } else if (identifier == KMToolbarPageEditExtractItemIdentifier) {
                         item?.image = NSImage(named: KMImageNameUXIconSubtoolbarPageExtract)
                         item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarPageExtract)
@@ -816,10 +821,12 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                         item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarPageSplit)
                         item?.target = self
                         item?.btnTag = KMPageEditType.split.rawValue
-            //            item?.toolTip = NSLocalizedString("Split and save selected PDF pages as a new separate document", comment: "")
+                        item?.isShowCustomToolTip = true
+                        item?.toolTip = NSLocalizedString("Split and save selected PDF pages as a new separate document", comment: "")
+                        item?.isPopToolTip = true
                         item?.titleName = NSLocalizedString("Split", comment: "")
-                        item?.boxImagePosition = .imageExpandLeft
-                        item?.needExpandAction = true
+                        item?.boxImagePosition = .imageOnly
+                        item?.btnAction = #selector(_itemAction)
                     } else if (identifier == KMToolbarPageEditReverseItemIdentifier) {
                         item?.image = NSImage(named: KMImageNameUXIconSubtoolbarPageReverse)
                         item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarPageReverse)

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

@@ -4643,6 +4643,11 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
                     self.imageAnnotation(toolbarItem)
                 } else if toolbarItem.itemIdentifier == KMAnnotationTableToolbarItemIdentifier {
                     self.tableAnnotation(toolbarItem)
+                } else if toolbarItem.itemIdentifier == KMToolbarPageEditInsetItemIdentifier { // 插入
+                    self.leftSideViewController.insertPDF(nil)
+                } else if toolbarItem.itemIdentifier == KMToolbarPageEditSplitItemIdentifier { // 拆分
+                    let windowC = SplitWindowController(document: self.listView.document)
+                    self.km_beginSheet(windowC: windowC)
                 }
             }
         }

PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -548,22 +548,6 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "3BE36286-8C36-4B23-9D98-9E718AA417D4"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/PDFWindowController/Side/LeftSide/KMImageToolTipWindow.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "104"
-            endingLineNumber = "104"
-            landmarkName = "_showDelayed()"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -612,21 +596,5 @@
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "D709AEF9-E2F7-45B8-9385-2CE9A0A35DBF"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/Common/Base/KMBaseWindowController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "17"
-            endingLineNumber = "17"
-            landmarkName = "KMBaseWindowController"
-            landmarkType = "3">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>