【综合】注释toolbar补充图片和表格item

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

@@ -567,7 +567,6 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                         KMToolbarSelectToolModeItemIdentifier,
                         KMToolbarZoomToSelectionItemIdentifier,
                         KMNewToolbarSpaceItemIdentifier,
-                        KMToolbarDividerItemIdentifier,
                         KMNewToolbarSpaceItemIdentifier,
                         KMToolbarHighlightAnnotationItemIdentifier,
                         KMToolbarUnderlineAnnotationItemIdentifier,
@@ -577,10 +576,9 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                         KMToolbarAnchoredAnnotationItemIdentifier,
                         KMToolbarSquareAnnotationItemIdentifier, KMToolbarCircleAnnotationItemIdentifier, KMToolbarArrowAnnotationItemIdentifier, KMToolbarLineAnnotationItemIdentifier,
                         KMToolbarLinkAnnotationItemIdentifier,
-                        KMAnnotationStampToolbarItemIdentifier,
-                        KMToolbarSignSignatureAnnotationItemIdentifier,
-                        KMToolbarDividerItemIdentifier,
-                        KMToolbarShowToolbarItemIdentifier]
+                        KMNewToolbarSpaceItemIdentifier, KMNewToolbarSpaceItemIdentifier,
+                        KMAnnotationStampToolbarItemIdentifier, KMAnnotationImageToolbarItemIdentifier,
+                        KMToolbarSignSignatureAnnotationItemIdentifier, KMAnnotationTableToolbarItemIdentifier]
             }
             return itemIdentifiers!
         case .editPDF:
@@ -1222,6 +1220,20 @@ extension KMToolbarViewController {
             item?.titleName = NSLocalizedString("Setting", comment: "")
             item?.boxImagePosition = .imageOnly
             item?.btnAction = #selector(_itemAction)
+        } else if identifier == KMAnnotationImageToolbarItemIdentifier {
+            item?.image = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsImage)
+            item?.target = self
+            item?.titleName = NSLocalizedString("Image", comment: "")
+            item?.toolTip = NSLocalizedString("Choose an image to insert in a page.", comment: "")
+            item?.boxImagePosition = .imageOnly
+            item?.btnAction = #selector(_itemAction)
+        } else if identifier == KMAnnotationTableToolbarItemIdentifier {
+            item?.image = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsTable)
+            item?.target = self
+            item?.titleName = NSLocalizedString("Table", comment: "")
+            item?.toolTip = NSLocalizedString("Table", comment: "")
+            item?.boxImagePosition = .imageOnly
+            item?.btnAction = #selector(_itemAction)
         }
     }
     

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

@@ -57,6 +57,8 @@ let KMToolbarArrowAnnotationItemIdentifier =  "KMToolbarArrowAnnotationItemIdent
 let KMToolbarLinkAnnotationItemIdentifier =  "KMToolbarLinkAnnotationItemIdentifier"
 let KMToolbarSignSignatureAnnotationItemIdentifier =  "KMToolbarSignSignatureAnnotationItemIdentifier"
 let KMAnnotationStampToolbarItemIdentifier =  "KMAnnotationStampToolbarItemIdentifier"
+let KMAnnotationImageToolbarItemIdentifier =  "KMAnnotationImageToolbarItemIdentifier"
+let KMAnnotationTableToolbarItemIdentifier =  "KMAnnotationTableToolbarItemIdentifier"
 let KMToolbarShowToolbarItemIdentifier =  "KMToolbarShowToolbarItemIdentifier"
 let KMToolbarAnnotationSettingItemIdentifier =  "KMToolbarAnnotationSettingItemIdentifier"
 let annotationToolIdentifiers = [KMToolbarMoveToolModeItemIdentifier, KMToolbarMagnifyToolModeItemIdentifier, KMToolbarSelectToolModeItemIdentifier,
@@ -64,7 +66,7 @@ let annotationToolIdentifiers = [KMToolbarMoveToolModeItemIdentifier, KMToolbarM
                                  KMToolbarStrikeOutAnnotationItemIdentifier, KMToolbarInkAnnotationItemIdentifier, KMToolbarFreeTextAnnotationItemIdentifier,
                                  KMToolbarAnchoredAnnotationItemIdentifier, KMToolbarSquareAnnotationItemIdentifier, KMToolbarCircleAnnotationItemIdentifier,
                                  KMToolbarLineAnnotationItemIdentifier, KMToolbarArrowAnnotationItemIdentifier, KMToolbarLinkAnnotationItemIdentifier,
-                                 KMToolbarSignSignatureAnnotationItemIdentifier, KMAnnotationStampToolbarItemIdentifier, KMToolbarShowToolbarItemIdentifier, KMToolbarAnnotationSettingItemIdentifier]
+                                 KMToolbarSignSignatureAnnotationItemIdentifier, KMAnnotationStampToolbarItemIdentifier, KMAnnotationImageToolbarItemIdentifier, KMAnnotationTableToolbarItemIdentifier, KMToolbarAnnotationSettingItemIdentifier]
 
 // PageEdit
 let KMToolbarPageEditPageRangeItemIdentifier = "KMToolbarPageEditPageRangeItemIdentifier"

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

@@ -3583,6 +3583,10 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
                     Swift.debugPrint("KMToolbarTTSIdentifier ...")
                 } else if toolbarItem.itemIdentifier == KMToolbarConversionOCRIdentifier {
                     self.showOCRWindow()
+                } else if toolbarItem.itemIdentifier == KMAnnotationImageToolbarItemIdentifier {
+                    Swift.debugPrint("KMAnnotationImageToolbarItemIdentifier ...")
+                } else if toolbarItem.itemIdentifier == KMAnnotationTableToolbarItemIdentifier {
+                    Swift.debugPrint("KMAnnotationTableToolbarItemIdentifier ...")
                 }
             }
         }