【Toolbar】原始数据兼容

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

@@ -56,10 +56,10 @@ let KMToolbarCircleAnnotationItemIdentifier =  "KMToolbarCircleAnnotationItemIde
 let KMToolbarLineAnnotationItemIdentifier =  "KMToolbarLineAnnotationItemIdentifier"
 let KMToolbarArrowAnnotationItemIdentifier =  "KMToolbarArrowAnnotationItemIdentifier"
 let KMToolbarLinkAnnotationItemIdentifier =  "KMToolbarLinkAnnotationItemIdentifier"
-let KMToolbarSignSignatureAnnotationItemIdentifier =  "KMToolbarSignSignatureAnnotationItemIdentifier"
-let KMAnnotationStampToolbarItemIdentifier =  "KMAnnotationStampToolbarItemIdentifier"
-let KMAnnotationImageToolbarItemIdentifier =  "KMAnnotationImageToolbarItemIdentifier"
-let KMAnnotationTableToolbarItemIdentifier =  "KMAnnotationTableToolbarItemIdentifier"
+let KMToolbarSignSignatureAnnotationItemIdentifier =  "KMToolbarSignatureAnnotationItemIdentifier"
+let KMAnnotationStampToolbarItemIdentifier =  "KMToolbarStampAnnotationItemIdentifier"
+let KMAnnotationImageToolbarItemIdentifier =  "KMToolbarImageAnnotationItemIdentifier"
+let KMAnnotationTableToolbarItemIdentifier =  "KMToolbarTableAnnotationItemIdentifier"
 let KMToolbarShowToolbarItemIdentifier =  "KMToolbarShowToolbarItemIdentifier"
 let KMToolbarAnnotationSettingItemIdentifier =  "KMToolbarAnnotationSettingItemIdentifier"
 let annotationToolIdentifiers = [KMToolbarMoveToolModeItemIdentifier, KMToolbarMagnifyToolModeItemIdentifier, KMToolbarSelectToolModeItemIdentifier,
@@ -74,7 +74,7 @@ let KMToolbarPageEditPageRangeItemIdentifier = "KMToolbarPageEditPageRangeItemId
 let KMToolbarPageEditRotateItemIdentifier = "KMToolbarPageEditRotateItemIdentifier"
 let KMToolbarPageEditLeftRotateItemIdentifier = "KMToolbarPageEditLeftRotateItemIdentifier"
 let KMToolbarPageEditRightRotateItemIdentifier = "KMToolbarPageEditRightRotateItemIdentifier"
-let KMToolbarPageEditInsetItemIdentifier = "KMToolbarPageEditInsetItemIdentifier"
+let KMToolbarPageEditInsetItemIdentifier = "KMToolbarPageEditInsertItemIdentifier"
 let KMToolbarPageEditExtractItemIdentifier = "KMToolbarPageEditExtractItemIdentifier"
 let KMToolbarPageEditReplaceItemIdentifier = "KMToolbarPageEditReplaceItemIdentifier"
 let KMToolbarPageEditSplitItemIdentifier = "KMToolbarPageEditSplitItemIdentifier"
@@ -90,17 +90,17 @@ let pageEditToolIdentifiers = [KMToolbarPageEditPageRangeItemIdentifier, KMToolb
                                KMToolbarPageEditPasteItemIdentifier, KMToolbarPageEditDeleteItemIdentifier]
 
 // conversion
-let KMToolbarConversionCreatePDFItemIdentifier = "KMToolbarConversionCreatePDFItemIdentifier"
-let KMToolbarConversionWordItemIdentifier = "KMToolbarConversionWordItemIdentifier"
-let KMToolbarConversionExcelItemIdentifier = "KMToolbarConversionExcelItemIdentifier"
-let KMToolbarConversionPPTItemIdentifier = "KMToolbarConversionPPTItemIdentifier"
-let KMToolbarConversionRTFItemIdentifier = "KMToolbarConversionRTFItemIdentifier"
-let KMToolbarConversionCSVItemIdentifier = "KMToolbarConversionCSVItemIdentifier"
-let KMToolbarConversionHTMLItemIdentifier = "KMToolbarConversionHTMLItemIdentifier"
-let KMToolbarConversionTextItemIdentifier = "KMToolbarConversionTextItemIdentifier"
-let KMToolbarConversionImageItemIdentifier = "KMToolbarConversionImageItemIdentifier"
+let KMToolbarConversionCreatePDFItemIdentifier = "KMToolbarImageToPDFItemIdentifier"
+let KMToolbarConversionWordItemIdentifier = "KMToolbarPDFToWordItemIdentifier"
+let KMToolbarConversionExcelItemIdentifier = "KMToolbarPDFToExcelItemIdentifier"
+let KMToolbarConversionPPTItemIdentifier = "KMToolbarPDFToPPTItemIdentifier"
+let KMToolbarConversionRTFItemIdentifier = "KMToolbarPDFToRTFItemIdentifier"
+let KMToolbarConversionCSVItemIdentifier = "KMToolbarPDFToCSVItemIdentifier"
+let KMToolbarConversionHTMLItemIdentifier = "KMToolbarPDFToHtmlItemIdentifier"
+let KMToolbarConversionTextItemIdentifier = "KMToolbarPDFToTextItemIdentifier"
+let KMToolbarConversionImageItemIdentifier = "KMToolbarPDFToImageItemIdentifier"
 let KMToolbarConversionOCRIdentifier = "KMToolbarConversionOCRIdentifier"
-let KMToolbarConversionExportImageItemIdentifier = "KMToolbarConversionExportImageItemIdentifier"
+let KMToolbarConversionExportImageItemIdentifier = "KMToolbarExtractPDFImageItemIdentifier"
 
 let conversionToolIdentifiers = [KMToolbarConversionCreatePDFItemIdentifier,
                                  KMToolbarConversionWordItemIdentifier, KMToolbarConversionExcelItemIdentifier,
@@ -118,14 +118,14 @@ let KMToolbarDividerItemIdentifier = "KMToolbarDividerItemIdentifier"
 
 /// Tool
 let KMToolbarToolCropItemIdentifier =  "KMToolbarToolCropItemIdentifier"
-let KMToolbarToolBatesItemIdentifier =  "KMToolbarToolBatesItemIdentifier"
-let KMToolbarToolHeaderFooterItemIdentifier =  "KMToolbarToolHeaderFooterItemIdentifier"
-let KMToolbarToolBackgroundItemIdentifier =  "KMToolbarToolBackgroundItemIdentifier"
-let KMToolbarToolWatermarkItemIdentifier =  "KMToolbarToolWatermarkItemIdentifier"
+let KMToolbarToolBatesItemIdentifier =  "KMToolbarBatesItemIdentifier"
+let KMToolbarToolHeaderFooterItemIdentifier =  "KMToolbarHeaderFooterItemIdentifier"
+let KMToolbarToolBackgroundItemIdentifier =  "KMToolbarBackgroundItemIdentifier"
+let KMToolbarToolWatermarkItemIdentifier =  "KMToolbarWatermarkItemIdentifier"
 let KMToolbarToolRedactItemIdentifier =  "KMToolbarToolRedactItemIdentifier"
-let KMToolbarToolCompressItemIdentifier =  "KMToolbarToolCompressItemIdentifier"
-let KMToolbarToolSecureItemIdentifier =  "KMToolbarToolSecureItemIdentifier"
-let KMToolbarToolMergeItemIdentifier =  "KMToolbarToolMergeItemIdentifier"
+let KMToolbarToolCompressItemIdentifier =  "KMToolbarCompressionItemIdentifier"
+let KMToolbarToolSecureItemIdentifier =  "KMToolbarSecurityItemIdentifier"
+let KMToolbarToolMergeItemIdentifier =  "KMToolbarMergeItemIdentifier"
 let KMToolbarComparisonItemIdentifier =  "KMToolbarComparisonItemIdentifier"
 let toolToolIdentifiers = [KMToolbarToolCropItemIdentifier, KMToolbarToolBatesItemIdentifier,
                            KMToolbarToolHeaderFooterItemIdentifier, KMToolbarToolBackgroundItemIdentifier,
@@ -134,14 +134,14 @@ let toolToolIdentifiers = [KMToolbarToolCropItemIdentifier, KMToolbarToolBatesIt
                            KMToolbarToolMergeItemIdentifier,KMToolbarComparisonItemIdentifier]
 
 /// Form
-let KMToolbarToolTextFieldItemIdentifier =  "KMToolbarToolTextFieldItemIdentifier"
-let KMToolbarToolCheckBoxItemIdentifier =  "KMToolbarToolCheckBoxItemIdentifier"
-let KMToolbarToolRadioButtonItemIdentifier =  "KMToolbarToolRadioButtonItemIdentifier"
+let KMToolbarToolTextFieldItemIdentifier =  "KMToolbarFormTextFieldItemIdentifier"
+let KMToolbarToolCheckBoxItemIdentifier =  "KMToolbarFormCheckBoxItemIdentifier"
+let KMToolbarToolRadioButtonItemIdentifier =  "KMToolbarFormRadioButtonItemIdentifier"
 let KMToolbarToolListBoxItemIdentifier =  "KMToolbarToolListBoxItemIdentifier"
-let KMToolbarToolPullDownmenuItemIdentifier =  "KMToolbarToolPullDownmenuItemIdentifier"
-let KMToolbarToolButtonIdentifier =  "KMToolbarToolButtonIdentifier"
-let KMToolbarToolSignBoxIdentifier =  "KMToolbarToolSignBoxIdentifier"
-let KMToolbarToolFormAlignIdentifier =  "KMToolbarToolFormAlignIdentifier"
+let KMToolbarToolPullDownmenuItemIdentifier =  "KMToolbarFormComboBoxItemIdentifier"
+let KMToolbarToolButtonIdentifier =  "KMToolbarFormActionButtonItemIdentifier"
+let KMToolbarToolSignBoxIdentifier =  "KMToolbarFormSignatureButtonItemIdentifier"
+let KMToolbarToolFormAlignIdentifier =  "KMToolbarFormAlignmentIdentifier"
 let KMToolbarToolFormMoreIdentifier =  "KMToolbarToolFormMoreIdentifier"
 let formToolIdentifiers = [KMToolbarToolTextFieldItemIdentifier, KMToolbarToolCheckBoxItemIdentifier,
                            KMToolbarToolRadioButtonItemIdentifier, KMToolbarToolListBoxItemIdentifier,
@@ -169,10 +169,10 @@ let fillSignToolIdentifiers = [KMToolbarToolHookItemIdentifier, KMToolbarToolFor
 let KMToolbarToolOCRTextIdentifier     =  "KMToolbarToolOCRTextIdentifier"
 let KMToolbarToolEnhancedScanIdentifier     =  "KMToolbarToolEnhancedScanIdentifier"
 
-let KMToolbarViewSettingIdentifier = "KMToolbarViewSettingIdentifier"
-let KMToolbarCropIdentifier = "KMToolbarCropIdentifier"
-let KMToolbarSnapshotIdentifier = "KMToolbarSnapshotIdentifier"
-let KMToolbarTTSIdentifier = "KMToolbarTTSIdentifier"
+let KMToolbarViewSettingIdentifier = "KMToolbarSplitScreenModeItemIdentifier"
+let KMToolbarCropIdentifier = "KMToolbarCropItemIdentifier"
+let KMToolbarSnapshotIdentifier = "KMToolbarTakeSnapshotItemIdentifier"
+let KMToolbarTTSIdentifier = "KMToolbarTTSViewItemIdentifier"
 let KMViewDisplayIdentifiers = [KMToolbarViewSettingIdentifier, KMToolbarCropIdentifier, KMToolbarSnapshotIdentifier, KMToolbarTTSIdentifier]
 
 let KMNewToolbarSpaceItemIdentifier         =  "KMNewToolbarSpaceItemIdentifier"

PDF Office/PDF Master/Class/README.md

@@ -51,6 +51,8 @@
 ## 注释工具
 * 笔记 CPDFListAnnotationNoteWindowController
 
+* 自定义注释工具 KMToolbarCustomWindowController
+
 ## xxx
 
 [sign in](https://www.baidu.com) the [dashboard](https://www.baidu.com). to [sign up](https://www.baidu.com)