【toolbar】注释工具UI替换和形状注释部分处理

PDF Office/PDF Master/Class/Appearance/KMAppearance.swift

@@ -7,6 +7,562 @@
 
 import Cocoa
 
+let KMImageNameToolbarLeftPanel = "KMImageNameToolbarLeftPanel";
+let KMImageNameToolbarRightPanel = "KMImageNameToolbarRightPanel";
+let KMImageNameToolbarMinus = "KMImageNameToolbarMinus";
+let KMImageNameToolbarPlus = "KMImageNameToolbarPlus";
+let KMImageNameToolbarPrevious = "KMImageNameToolbarPrevious";
+let KMImageNameToolbarNext = "KMImageNameToolbarNext";
+let KMImageNameToolbarTools = "KMImageNameToolbarTools";
+let KMImageNameToolbarPageEdit = "KMImageNameToolbarPageEdit";
+let KMImageNameToolbarEdit = "KMImageNameToolbarEdit";
+let KMImageNameToolbarConvert = "KMImageNameToolbarConvert";
+let KMImageNameToolbarSettings = "KMImageNameToolbarSettings";
+let KMImageNameToolbarShare = "KMImageNameToolbarShare";
+let KMImageNameToolbarBack = "KMImageNameToolbarBack";
+let KMImageNameToolbarForward = "KMImageNameToolbarForward";
+let KMImageNameToolbarFirst = "KMImageNameToolbarFirst";
+let KMImageNameToolbarLast = "KMImageNameToolbarLast";
+let KMImageNameToolbarInfo = "KMImageNameToolbarInfo";
+let KMImageNameToolbarLines = "KMImageNameToolbarLines";
+let KMImageNameToolbarFont = "KMImageNameToolbarFont";
+let KMImageNameToolbarPrint = "KMImageNameToolbarPrint";
+let KMImageNameToolbarPlay = "KMImageNameToolbarPlay";
+let KMImageNameToolbarHome = "KMImageNameToolbarHome";
+let KMImageNameToolbarForm = "KMImageNameToolbarForm";
+let KMImageNameToolbarSelfSign = "KMImageNameToolbarSelfSign";
+let KMImageNameToolbarTextEdit = "KMImageNameToolbarTextEdit";
+
+let KMImageNameToolbarLeftPanelSelected = "KMImageNameToolbarLeftPanelSelected";
+let KMImageNameToolbarRightPanelSelected = "KMImageNameToolbarRightPanelSelected";
+let KMImageNameToolbarToolsSelected = "KMImageNameToolbarToolsSelected";
+let KMImageNameToolbarSettingsSelected = "KMImageNameToolbarSettingsSelected";
+let KMImageNameToolbarPageEditSelected = "KMImageNameToolbarPageEditSelected";
+let KMImageNameToolbarConvertSelected = "KMImageNameToolbarConvertSelected";
+let KMImageNameToolbarEditSelected = "KMImageNameToolbarEditSelected";
+let KMImageNameToolbarHomeSelected = "KMImageNameToolbarHomeSelected";
+let KMImageNameToolbarFormSelected = "KMImageNameToolbarFormSelected";
+let KMImageNameToolbarSelfSignSelected = "KMImageNameToolbarSelfSignSelected";
+let KMImageNameToolbarTextEditSelected = "KMImageNameToolbarTextEditSelected";
+
+let KMImageNameToolbarHand = "KMImageNameToolbarHand";
+let KMImageNameToolbarZoom = "KMImageNameToolbarZoom";
+let KMImageNameToolbarSelect = "KMImageNameToolbarSelect";
+let KMImageNameToolbarSelectZoom = "KMImageNameToolbarSelectZoom";
+let KMImageNameToolbarHighlight = "KMImageNameToolbarHighlight";
+let KMImageNameToolbarUnderline = "KMImageNameToolbarUnderline";
+let KMImageNameToolbarStrickout = "KMImageNameToolbarStrickout";
+let KMImageNameToolbarInk = "KMImageNameToolbarInk";
+let KMImageNameToolbarFreeText = "KMImageNameToolbarFreeText";
+let KMImageNameToolbarNote = "KMImageNameToolbarNote";
+let KMImageNameToolbarSquare = "KMImageNameToolbarSquare";
+let KMImageNameToolbarCircle = "KMImageNameToolbarCircle";
+let KMImageNameToolbarArrow = "KMImageNameToolbarArrow";
+let KMImageNameToolbarLine = "KMImageNameToolbarLine";
+let KMImageNameToolbarLink = "KMImageNameToolbarLink";
+let KMImageNameToolbarStamp = "KMImageNameToolbarStamp";
+let KMImageNameToolbarImage = "KMImageNameToolbarImage";
+let KMImageNameToolbarSign = "KMImageNameToolbarSign";
+let KMImageNameToolbarSet = "KMImageNameToolbarSet";
+let KMImageNameToolbarSpace = "KMImageNameToolbarSpace";
+
+let KMImageNameToolbarInsert = "KMImageNameToolbarInsert";
+let KMImageNameToolbarMerge = "KMImageNameToolbarMerge";
+let KMImageNameToolbarReplace = "KMImageNameToolbarReplace";
+let KMImageNameToolbarExtract = "KMImageNameToolbarExtract";
+let KMImageNameToolbarSplit = "KMImageNameToolbarSplit";
+let KMImageNameToolbarRotate = "KMImageNameToolbarRotate";
+let KMImageNameToolbarPaste = "KMImageNameToolbarPaste";
+let KMImageNameToolbarCopy = "KMImageNameToolbarCopy";
+let KMImageNameToolbarDelete = "KMImageNameToolbarDelete";
+let KMImageNameToolbarReverse = "KMImageNameToolbarReverse";
+
+let KMImageNameToolbarCompress = "KMImageNameToolbarCompress";
+let KMImageNameToolbarSercurity = "KMImageNameToolbarSercurity";
+let KMImageNameToolbarWatermark = "KMImageNameToolbarWatermark";
+let KMImageNameToolbarBackground = "KMImageNameToolbarBackground";
+let KMImageNameToolbarHeaderFooter = "KMImageNameToolbarHeaderFooter";
+let KMImageNameToolbarBates = "KMImageNameToolbarBates";
+
+let KMImageNameToolbarPDFToWord = "KMImageNameToolbarPDFToWord";
+let KMImageNameToolbarPDFToHtml = "KMImageNameToolbarPDFToHtml";
+let KMImageNameToolbarPDFToText = "KMImageNameToolbarPDFToText";
+let KMImageNameToolbarPDFToImage = "KMImageNameToolbarPDFToImage";
+let KMImageNameToolbarImageToPDF = "KMImageNameToolbarImageToPDF";
+
+let KMImageNameToolbarThemes = "KMImageNameToolbarThemes";
+let KMImageNameToolbarTurning = "KMImageNameToolbarTurning";
+let KMImageNameToolbarSplitScreen = "KMImageNameToolbarSplitScreen";
+let KMImageNameToolbarBreaks = "KMImageNameToolbarBreaks";
+let KMImageNameToolbarRotateRight = "KMImageNameToolbarRotateRight";
+let KMImageNameToolbarRotateLeft = "KMImageNameToolbarRotateLeft";
+let KMImageNameToolbarCrop = "KMImageNameToolbarCrop";
+let KMImageNameToolbarSnapshots = "KMImageNameToolbarSnapshots";
+
+let KMImageNamePanelContent = "KMImageNamePanelContent";
+let KMImageNamePanelRange = "KMImageNamePanelRange";
+let KMImageNamePanelAdd = "KMImageNamePanelAdd";
+let KMImageNamePanelDelete = "KMImageNamePanelDelete";
+let KMImageNamePanelFilter = "KMImageNamePanelFilter";
+let KMImageNamePanelExport = "KMImageNamePanelExport";
+let KMImageNamePanelPrint = "KMImageNamePanelPrint";
+let KMImageNamePanelSettings = "KMImageNamePanelSettings";
+
+let KMImageNameHomeDelete = "KMImageNameHomeDelete";
+let KMImageNameHomeDeleteHover = "KMImageNameHomeDeleteHover";
+
+let KMImageNameFormTextField = "KMImageNameFormTextField";
+let KMImageNameFormTable = "KMImageNameFormTable";
+let KMImageNameFormRadio = "KMImageNameFormRadio";
+let KMImageNameFormList = "KMImageNameFormList";
+let KMImageNameFormComboBox = "KMImageNameFormComboBox";
+let KMImageNameFormCheckBox = "KMImageNameFormCheckBox";
+let KMImageNameFormActionButton = "KMImageNameFormActionButton";
+let KMImageNameFormSignature = "KMImageNameFormSignature";
+let KMImageNameFormSegmentation = "KMImageNameFormSegmentation";
+let KMImageNameFormAlignment = "KMImageNameFormAlignment";
+
+let KMImageNameSelfSignCircle = "KMImageNameSelfSignCircle";
+let KMImageNameSelfSignCircleMouse = "KMImageNameSelfSignCircleMouse";
+let KMImageNameSelfSignCircleSel = "KMImageNameSelfSignCircleSel";
+let KMImageNameSelfSignDot = "KMImageNameSelfSignDot";
+let KMImageNameSelfSignDotSel = "KMImageNameSelfSignDotSel";
+let KMImageNameSelfSignFalse = "KMImageNameSelfSignFalse";
+let KMImageNameSelfSignFalseMouse = "KMImageNameSelfSignFalseMouse";
+let KMImageNameSelfSignFalseSel = "KMImageNameSelfSignFalseSel";
+let KMImageNameSelfSignTure = "KMImageNameSelfSignTure";
+let KMImageNameSelfSignTureMouse = "KMImageNameSelfSignTureMouse";
+let KMImageNameSelfSignTureSel = "KMImageNameSelfSignTureSel";
+let KMImageNameSelfSignLine = "KMImageNameSelfSignLine";
+let KMImageNameSelfSignLineSel = "KMImageNameSelfSignLineSel";
+let KMImageNameSelfSignLineMouse = "KMImageNameSelfSignLineMouse";
+let KMImageNameSelfSignDotMouse = "KMImageNameSelfSignDotMouse";
+let KMImageNameSelfSignProfile = "KMImageNameSelfSignProfile";
+let KMImageNameSelfSignDate = "KMImageNameSelfSignDate";
+let KMImageNameSelfSignDateMouse = "KMImageNameSelfSignDateMouse";
+
+let KMImageNameSplitOne = "KMImageNameSplitOne";
+let KMImageNameSplitOneSelect = "KMImageNameSplitOneSelect";
+let KMImageNameSplitHorizontal = "KMImageNameSplitHorizontal";
+let KMImageNameSplitHorizontalSelect = "KMImageNameSplitHorizontalSelect";
+let KMImageNameSplitVertical = "KMImageNameSplitVertical";
+let KMImageNameSplitVerticalSelect = "KMImageNameSplitVerticalSelect";
+
+//UX 改版
+//Home
+let KMImageNameUXIconHomeGuideNor = "KMImageNameUXIconHomeGuideNor";
+let KMImageNameUXIconHomeGuidePre = "KMImageNameUXIconHomeGuidePre";
+let KMImageNameUXIconHomeIosNor = "KMImageNameUXIconHomeIosNor";
+let KMImageNameUXIconHomeIosPre = "KMImageNameUXIconHomeIosPre";
+let KMImageNameUXIconHomeViewlistNor = "KMImageNameUXIconHomeViewlistNor";
+let KMImageNameUXIconHomeViewlistPre = "KMImageNameUXIconHomeViewlistPre";
+let KMImageNameUXIconHomeViewthumbnailNor = "KMImageNameUXIconHomeViewthumbnailNor";
+let KMImageNameUXIconHomeViewthumbnailPre = "KMImageNameUXIconHomeViewthumbnailPre";
+let KMImageNameUXIconHomeQuicktoolBackgroundNor = "KMImageNameUXIconHomeQuicktoolBackgroundNor";
+let KMImageNameUXIconHomeQuicktoolBatchNor = "KMImageNameUXIconHomeQuicktoolBatchNor";
+let KMImageNameUXIconHomeQuicktoolComprison = "KMImageNameUXIconHomeQuicktoolComprison";
+let KMImageNameUXIconHomeQuicktoolBatesNor = "KMImageNameUXIconHomeQuicktoolBatesNor";
+let KMImageNameUXIconHomeQuicktoolBookNor = "KMImageNameUXIconHomeQuicktoolBookNor";
+let KMImageNameUXIconHomeQuicktoolConvertNor = "KMImageNameUXIconHomeQuicktoolConvertNor";
+let KMImageNameUXIconHomeQuicktoolExcelNor = "KMImageNameUXIconHomeQuicktoolExcelNor";
+let KMImageNameUXIconHomeQuicktoolExtractNor = "KMImageNameUXIconHomeQuicktoolExtractNor";
+let KMImageNameUXIconHomeQuicktoolHeaderandfooterNor = "KMImageNameUXIconHomeQuicktoolHeaderandfooterNor";
+let KMImageNameUXIconHomeQuicktoolInsertNor = "KMImageNameUXIconHomeQuicktoolInsertNor";
+let KMImageNameUXIconHomeQuicktoolMergeNor = "KMImageNameUXIconHomeQuicktoolMergeNor";
+let KMImageNameUXIconHomeQuicktoolMultipageNor = "KMImageNameUXIconHomeQuicktoolMultipageNor";
+let KMImageNameUXIconHomeQuicktoolOcrNor = "KMImageNameUXIconHomeQuicktoolOcrNor";
+let KMImageNameUXIconHomeQuicktoolOptimizeNor = "KMImageNameUXIconHomeQuicktoolOptimizeNor";
+let KMImageNameUXIconHomeQuicktoolPageeditNor = "KMImageNameUXIconHomeQuicktoolPageeditNor";
+let KMImageNameUXIconHomeQuicktoolPdftoimgNor = "KMImageNameUXIconHomeQuicktoolPdftoimgNor";
+let KMImageNameUXIconHomeQuicktoolPosterNor = "KMImageNameUXIconHomeQuicktoolPosterNor";
+let KMImageNameUXIconHomeQuicktoolPPTNor = "KMImageNameUXIconHomeQuicktoolPPTNor";
+let KMImageNameUXIconHomeQuicktoolSafeNor = "KMImageNameUXIconHomeQuicktoolSafeNor";
+let KMImageNameUXIconHomeQuicktoolSplitNor = "KMImageNameUXIconHomeQuicktoolSplitNor";
+let KMImageNameUXIconHomeQuicktoolWatermarkNor = "KMImageNameUXIconHomeQuicktoolWatermarkNor";
+let KMImageNameUXIconHomeQuicktoolWordNor = "KMImageNameUXIconHomeQuicktoolWordNor";
+let KMImageNameUXIconHomeRemoveNor = "KMImageNameUXIconHomeRemoveNor";
+let KMImageNameUXIconHomeRemoveHov = "KMImageNameUXIconHomeRemoveHov";
+//Batch
+let KMImageNameUXIconBatchBackground = "KMImageNameUXIconBatchBackground";
+let KMImageNameUXIconBatchBates = "KMImageNameUXIconBatchBates";
+let KMImageNameUXIconBatchConvert = "KMImageNameUXIconBatchConvert";
+let KMImageNameUXIconBatchConvertOCR = "KMImageNameUXIconBatchConvertOCR";
+let KMImageNameUXIconBatchHeaderandfooter = "KMImageNameUXIconBatchHeaderandfooter";
+let KMImageNameUXIconBatchMerge = "KMImageNameUXIconBatchMerge";
+let KMImageNameUXIconBatchOptimize = "KMImageNameUXIconBatchOptimize";
+let KMImageNameUXIconBatchComparison = "KMImageNameUXIconBatchComparison";
+let KMImageNameUXIconBatchSafe = "KMImageNameUXIconBatchSafe";
+let KMImageNameUXIconBatchWatermark = "KMImageNameUXIconBatchWatermark";
+//Toolbar
+let KMImageNameUXIconToolbarConvertNor = "KMImageNameUXIconToolbarConvertNor";
+let KMImageNameUXIconToolbarConvertSel = "KMImageNameUXIconToolbarConvertSel";
+let KMImageNameUXIconToolbarEditNor = "KMImageNameUXIconToolbarEditNor";
+let KMImageNameUXIconToolbarEditSel = "KMImageNameUXIconToolbarEditSel";
+let KMImageNameUXIconToolbarRedactNor = "KMImageNameUXIconToolbarRedactNor";
+let KMImageNameUXIconToolbarRedactSel = "KMImageNameUXIconToolbarRedactSel";
+let KMImageNameUXIconToolbarEdittoolNor = "KMImageNameUXIconToolbarEdittoolNor";
+let KMImageNameUXIconToolbarEdittoolSel = "KMImageNameUXIconToolbarEdittoolSel";
+let KMImageNameUXIconToolbarFillsignNor = "KMImageNameUXIconToolbarFillsignNor";
+let KMImageNameUXIconToolbarFillsignSel = "KMImageNameUXIconToolbarFillsignSel";
+let KMImageNameUXIconToolbarFormNor = "KMImageNameUXIconToolbarFormNor";
+let KMImageNameUXIconToolbarFormSel = "KMImageNameUXIconToolbarFormSel";
+let KMImageNameUXIconToolbarMytoolsNor = "KMImageNameUXIconToolbarMytoolsNor";
+let KMImageNameUXIconToolbarMytoolsSel = "KMImageNameUXIconToolbarMytoolsSel";
+let KMImageNameUXIconToolbarPageeditNor = "KMImageNameUXIconToolbarPageeditNor";
+let KMImageNameUXIconToolbarPageeditSel = "KMImageNameUXIconToolbarPageeditSel";
+let KMImageNameUXIconToolbarPageviewNor = "KMImageNameUXIconToolbarPageviewNor";
+let KMImageNameUXIconToolbarPageviewSel = "KMImageNameUXIconToolbarPageviewSel";
+let KMImageNameUXIconToolbarShareNor = "KMImageNameUXIconToolbarShareNor";
+let KMImageNameUXIconToolbarShareSel = "KMImageNameUXIconToolbarShareSel";
+let KMImageNameUXIconToolbarZoominNor = "KMImageNameUXIconToolbarZoominNor";
+let KMImageNameUXIconToolbarZoominSel = "KMImageNameUXIconToolbarZoominSel";
+let KMImageNameUXIconToolbarZoomoutNor = "KMImageNameUXIconToolbarZoomoutNor";
+let KMImageNameToolbarZoomoutPre = "KMImageNameToolbarZoomoutPre";
+let KMImageNameToolbarBackwardNor = "KMImageNameToolbarBackwardNor";
+let KMImageNameToolbarBackwardSel = "KMImageNameToolbarBackwardSel";
+let KMImageNameToolbarFirstpageNor = "KMImageNameToolbarFirstpageNor";
+let KMImageNameToolbarFirstpageSel = "KMImageNameToolbarFirstpageSel";
+let KMImageNameToolbarForwardNor = "KMImageNameToolbarForwardNor";
+let KMImageNameToolbarForwardSel = "KMImageNameToolbarForwardSel";
+let KMImageNameToolbarHomeNor = "KMImageNameToolbarHomeNor";
+let KMImageNameToolbarHomeSel = "KMImageNameToolbarHomeSel";
+let KMImageNameToolbarLastpageNor = "KMImageNameToolbarLastpageNor";
+let KMImageNameToolbarLastpageSel = "KMImageNameToolbarLastpageSel";
+let KMImageNameToolbarPagenextNor = "KMImageNameToolbarPagenextNor";
+let KMImageNameToolbarPagenextSel = "KMImageNameToolbarPagenextSel";
+let KMImageNameToolbarPagepreviousNor = "KMImageNameToolbarPagepreviousNor";
+let KMImageNameToolbarPagepreviousSel = "KMImageNameToolbarPagepreviousSel";
+let KMImageNameToolbarSlideshowNor = "KMImageNameToolbarSlideshowNor";
+let KMImageNameToolbarSlideshowSel = "KMImageNameToolbarSlideshowSel";
+let KMImageNameToolbarFontNor = "KMImageNameToolbarFontNor";
+let KMImageNameToolbarFontSel = "KMImageNameToolbarFontSel";
+let KMImageNameToolbarInfoNor = "KMImageNameToolbarInfoNor";
+let KMImageNameToolbarInfoSel = "KMImageNameToolbarInfoSel";
+let KMImageNameToolbarOCRNor = "KMImageNameToolbarOCRNor";
+let KMImageNameToolbarOCRSel = "KMImageNameToolbarOCRSel";
+let KMImageNameToolbarPrintNor = "KMImageNameToolbarPrintNor";
+let KMImageNameToolbarPrintSel = "KMImageNameToolbarPrintSel";
+let KMImageNameToolbarStirkeNor = "KMImageNameToolbarStirkeNor";
+let KMImageNameToolbarStirkeSel = "KMImageNameToolbarStirkeSel";
+//ic_Subtoolbar
+let KMImageNameUXIconSubtoolbarConvertCreatPDF = "KMImageNameUXIconSubtoolbarConvertCreatpdf";
+let KMImageNameUXIconSubtoolbarConvertCSV = "KMImageNameUXIconSubtoolbarConvertCSV";
+let KMImageNameUXIconSubtoolbarConvertExcel = "KMImageNameUXIconSubtoolbarConvertExcel";
+let KMImageNameUXIconSubtoolbarConvertHtml = "KMImageNameUXIconSubtoolbarConvertHtml";
+let KMImageNameUXIconSubtoolbarConvertOCR = "KMImageNameUXIconSubtoolbarConvertOCR";
+let KMImageNameUXIconSubtoolbarConvertPDFToIMG = "KMImageNameUXIconSubtoolbarConvertPDFToIMG";
+let KMImageNameUXIconSubtoolbarConvertExportImage = "KMImageNameUXIconSubtoolbarConvertExportImage";
+let KMImageNameUXIconSubtoolbarConvertPPT = "KMImageNameUXIconSubtoolbarConvertPPT";
+let KMImageNameUXIconSubtoolbarConvertRTF = "KMImageNameUXIconSubtoolbarConvertRTF";
+let KMImageNameUXIconSubtoolbarConvertText = "KMImageNameUXIconSubtoolbarConvertText";
+let KMImageNameUXIconSubtoolbarConvertWord = "KMImageNameUXIconSubtoolbarConvertWord";
+let KMImageNameUXIconSubtoolbarDisplaySnapshot = "KMImageNameUXIconSubtoolbarDisplaySnapshot";
+let KMImageNameUXIconSubtoolbarDisplayTailor = "KMImageNameUXIconSubtoolbarDisplayTailor";
+let KMImageNameUXIconSubtoolbarDisplayTTS = "KMImageNameUXIconSubtoolbarDisplayTTS";
+let KMImageNameUXIconSubtoolbarDisplayView = "KMImageNameUXIconSubtoolbarDisplayView";
+let KMImageNameUXIconSubtoolbarEdittoolRemovepassword = "KMImageNameUXIconSubtoolbarEdittoolRemovepassword";
+let KMImageNameUXIconSubtoolbarEdittoolSafe = "KMImageNameUXIconSubtoolbarEdittoolSafe";
+let KMImageNameUXIconSubtoolbarFillsignDate = "KMImageNameUXIconSubtoolbarFillsignDate";
+let KMImageNameUXIconSubtoolbarFillsignDigitalsignature = "KMImageNameUXIconSubtoolbarFillsignDigitalsignature";
+let KMImageNameUXIconSubtoolbarFillsignFork = "KMImageNameUXIconSubtoolbarFillsignFork";
+let KMImageNameUXIconSubtoolbarFillsignLine = "KMImageNameUXIconSubtoolbarFillsignLine";
+let KMImageNameUXIconSubtoolbarFillsignMyprofile = "KMImageNameUXIconSubtoolbarFillsignMyprofile";
+let KMImageNameUXIconSubtoolbarFillsignMysignature = "KMImageNameUXIconSubtoolbarFillsignMysignature";
+let KMImageNameUXIconSubtoolbarFillsignPoint = "KMImageNameUXIconSubtoolbarFillsignPoint";
+let KMImageNameButtonRedactText = "KMImageNameButtonRedactText";
+let KMImageNameUXIconSubtoolbarFillsignRoundedrec = "KMImageNameUXIconSubtoolbarFillsignRoundedrec";
+let KMImageNameUXIconSubtoolbarFillsignTick = "KMImageNameUXIconSubtoolbarFillsignTick";
+let KMImageNameUXIconSubtoolbarFormButton = "KMImageNameUXIconSubtoolbarFormButton";
+let KMImageNameUXIconSubtoolbarFormCheckbox = "KMImageNameUXIconSubtoolbarFormCheckbox";
+let KMImageNameUXIconSubtoolbarFormListbox = "KMImageNameUXIconSubtoolbarFormListbox";
+let KMImageNameUXIconSubtoolbarFormPulldownmenu = "KMImageNameUXIconSubtoolbarFormPulldownmenu";
+let KMImageNameUXIconSubtoolbarFormRadiobutton = "KMImageNameUXIconSubtoolbarFormRadiobutton";
+let KMImageNameUXIconSubtoolbarFormSet = "KMImageNameUXIconSubtoolbarFormSet";
+let KMImageNameUXIconSubtoolbarFormSign = "KMImageNameUXIconSubtoolbarFormSign";
+let KMImageNameUXIconSubtoolbarFormClear = "KMImageNameUXIconSubtoolbarFormClear";
+let KMImageNameUXIconSubtoolbarFormTextfield = "KMImageNameUXIconSubtoolbarFormTextfield";
+let KMImageNameUXIconSubtoolbarMytoolsAreazoom = "KMImageNameUXIconSubtoolbarMytoolsAreazoom";
+let KMImageNameUXIconSubtoolbarMytoolsArrow = "KMImageNameUXIconSubtoolbarMytoolsArrow";
+let KMImageNameUXIconSubtoolbarMytoolsContentsel = "KMImageNameUXIconSubtoolbarMytoolsContentsel";
+let KMImageNameUXIconSubtoolbarMytoolsHighlight = "KMImageNameUXIconSubtoolbarMytoolsHighlight";
+let KMImageNameUXIconSubtoolbarMytoolsImage = "KMImageNameUXIconSubtoolbarMytoolsImage";
+let KMImageNameUXIconSubtoolbarMytoolsLine = "KMImageNameUXIconSubtoolbarMytoolsLine";
+let KMImageNameUXIconSubtoolbarMytoolsLink = "KMImageNameUXIconSubtoolbarMytoolsLink";
+let KMImageNameUXIconSubtoolbarMytoolsMagnifier = "KMImageNameUXIconSubtoolbarMytoolsMagnifier";
+let KMImageNameUXIconSubtoolbarMytoolsNote = "KMImageNameUXIconSubtoolbarMytoolsNote";
+let KMImageNameUXIconSubtoolbarMytoolsOval = "KMImageNameUXIconSubtoolbarMytoolsOval";
+let KMImageNameUXIconSubtoolbarMytoolsPantool = "KMImageNameUXIconSubtoolbarMytoolsPantool";
+let KMImageNameUXIconSubtoolbarMytoolsPen = "KMImageNameUXIconSubtoolbarMytoolsPen";
+let KMImageNameUXIconSubtoolbarMytoolsRec = "KMImageNameUXIconSubtoolbarMytoolsRec";
+let KMImageNameUXIconSubtoolbarMytoolsSign = "KMImageNameUXIconSubtoolbarMytoolsSign";
+let KMImageNameUXIconSubtoolbarMytoolsStamp = "KMImageNameUXIconSubtoolbarMytoolsStamp";
+let KMImageNameUXIconSubtoolbarMytoolsStrikeout = "KMImageNameUXIconSubtoolbarMytoolsStrikeout";
+let KMImageNameUXIconSubtoolbarMytoolsTable = "KMImageNameUXIconSubtoolbarMytoolsTable";
+let KMImageNameUXIconSubtoolbarMytoolsText = "KMImageNameUXIconSubtoolbarMytoolsText";
+let KMImageNameUXIconSubtoolbarMytoolsUnderline = "KMImageNameUXIconSubtoolbarMytoolsUnderline";
+let KMImageNameUXIconSubtoolbarPageCopy = "KMImageNameUXIconSubtoolbarPageCopy";
+let KMImageNameUXIconSubtoolbarPageDelete = "KMImageNameUXIconSubtoolbarPageDelete";
+let KMImageNameUXIconSubtoolbarPageExtract = "KMImageNameUXIconSubtoolbarPageExtract";
+let KMImageNameUXIconSubtoolbarPageInsert = "KMImageNameUXIconSubtoolbarPageInsert";
+let KMImageNameUXIconSubtoolbarPagePaste = "KMImageNameUXIconSubtoolbarPagePaste";
+let KMImageNameUXIconSubtoolbarPageRange = "KMImageNameUXIconSubtoolbarPageRange";
+let KMImageNameUXIconSubtoolbarPageReverse = "KMImageNameUXIconSubtoolbarPageReverse";
+let KMImageNameUXIconSubtoolbarPageRotate = "KMImageNameUXIconSubtoolbarPageRotate";
+let KMImageNameUXIconSubtoolbarPageSplit = "KMImageNameUXIconSubtoolbarPageSplit";
+let KMImageNameUXIconSubtoolbarPageTailor = "KMImageNameUXIconSubtoolbarPageTailor";
+//ic_Sidetabbar
+let KMImageNameUXIconSidetabbarAnnotationNor = "KMImageNameUXIconSidetabbarAnnotationNor";
+let KMImageNameUXIconSidetabbarAnnotationSel = "KMImageNameUXIconSidetabbarAnnotationSel";
+let KMImageNameUXIconSidetabbarOutlineNor = "KMImageNameUXIconSidetabbarOutlineNor";
+let KMImageNameUXIconSidetabbarOutlineSel = "KMImageNameUXIconSidetabbarOutlineSel";
+let KMImageNameUXIconSidetabbarSearchNor = "KMImageNameUXIconSidetabbarSearchNor";
+let KMImageNameUXIconSidetabbarSearchSel = "KMImageNameUXIconSidetabbarSearchSel";
+let KMImageNameUXIconSidetabbarSnapshotNor = "KMImageNameUXIconSidetabbarSnapshotNor";
+let KMImageNameUXIconSidetabbarSnapshotSel = "KMImageNameUXIconSidetabbarSnapshotSel";
+let KMImageNameUXIconSidetabbarThumbnailNor = "KMImageNameUXIconSidetabbarThumbnailNor";
+let KMImageNameUXIconSidetabbarThumbnailSel = "KMImageNameUXIconSidetabbarThumbnailSel";
+//ic_Sidebar
+let KMImageNameUXIconSidebarAnnotationFilterHightlightNor = "KMImageNameUXIconSidebarAnnotationFilterHightlightNor";
+let KMImageNameUXIconSidebarAnnotationFilterHightlightWhite = "KMImageNameUXIconSidebarAnnotationFilterHightlightWhite";
+let KMImageNameUXIconSidebarAnnotationFilterOvalNor = "KMImageNameUXIconSidebarAnnotationFilterOvalNor";
+let KMImageNameUXIconSidebarAnnotationFilterOvalWhite = "KMImageNameUXIconSidebarAnnotationFilterOvalWhite";
+let KMImageNameUXIconSidebarAnnotationFilterStampNor = "KMImageNameUXIconSidebarAnnotationFilterStampNor";
+let KMImageNameUXIconSidebarAnnotationFilterStampWhite = "KMImageNameUXIconSidebarAnnotationFilterStampWhite";
+let KMImageNameUXIconSidebarAnnotationFilterTextNor = "KMImageNameUXIconSidebarAnnotationFilterTextNor";
+let KMImageNameUXIconSidebarAnnotationFilterTextWhite = "KMImageNameUXIconSidebarAnnotationFilterTextWhite";
+let KMImageNameUXIconSidebarAnnotationFilterUnderlineNor = "KMImageNameUXIconSidebarAnnotationFilterUnderlineNor";
+let KMImageNameUXIconSidebarAnnotationFilterUnderlineWhite = "KMImageNameUXIconSidebarAnnotationFilterUnderlineWhite";
+let KMImageNameUXIconSidebarAnnotationHightlight = "KMImageNameUXIconSidebarAnnotationHightlight";
+let KMImageNameUXIconSidebarAnnotationOval = "KMImageNameUXIconSidebarAnnotationOval";
+let KMImageNameUXIconSidebarAnnotationStamp = "KMImageNameUXIconSidebarAnnotationStamp";
+let KMImageNameUXIconSidebarAnnotationText = "KMImageNameUXIconSidebarAnnotationText";
+let KMImageNameUXIconSidebarAnnotationUnderline = "KMImageNameUXIconSidebarAnnotationUnderline";
+let KMImageNameUXIconSidebarFormButton = "KMImageNameUXIconSidebarFormButton";
+let KMImageNameUXIconSidebarFormCheckbox = "KMImageNameUXIconSidebarFormCheckbox";
+let KMImageNameUXIconSidebarFormListbox = "KMImageNameUXIconSidebarFormListbox";
+let KMImageNameUXIconSidebarFormPulldownmenu = "KMImageNameUXIconSidebarFormPulldownmenu";
+let KMImageNameUXIconSidebarFormRadiobutton = "KMImageNameUXIconSidebarFormRadiobutton";
+let KMImageNameUXIconSidebarFormSign = "KMImageNameUXIconSidebarFormSign";
+let KMImageNameUXIconSidebarFormTextfield = "KMImageNameUXIconSidebarFormTextfield";
+let KMImageNameUXIconSidebarSnapshotWindowNor = "KMImageNameUXIconSidebarSnapshotWindowNor";
+let KMImageNameUXIconSidebarSnapshotWindowSel = "KMImageNameUXIconSidebarSnapshotWindowSel";
+let KMImageNameSidebarAnnotationLink = "KMImageNameSidebarAnnotationLink";
+let KMImageNameSidebarAnnotationImage = "KMImageNameSidebarAnnotationImage";
+let KMImageNameSidebarAnnotationSign = "KMImageNameSidebarAnnotationSign";
+let KMImageNameSidebarAnnotationTable = "KMImageNameSidebarAnnotationTable";
+let KMImageNameSidebarAnnotationMarkup = "KMImageNameSidebarAnnotationMarkup";
+let KMImageNameSidebarAnnotationNote = "KMImageNameSidebarAnnotationNote";
+//ic_Propertybar
+let KMImageNameUXIconPropertybarAlignDownNor = "KMImageNameUXIconPropertybarAlignDownNor";
+let KMImageNameUXIconPropertybarAlignDownPre = "KMImageNameUXIconPropertybarAlignDownPre";
+let KMImageNameUXIconPropertybarAlignHorcenterNor = "KMImageNameUXIconPropertybarAlignHorcenterNor";
+let KMImageNameUXIconPropertybarAlignHorcenterPre = "KMImageNameUXIconPropertybarAlignHorcenterPre";
+let KMImageNameUXIconPropertybarAlignHorsplitNor = "KMImageNameUXIconPropertybarAlignHorsplitNor";
+let KMImageNameUXIconPropertybarAlignHorsplitPre = "KMImageNameUXIconPropertybarAlignHorsplitPre";
+let KMImageNameUXIconPropertybarAlignLeftNor = "KMImageNameUXIconPropertybarAlignLeftNor";
+let KMImageNameUXIconPropertybarAlignLeftPre = "KMImageNameUXIconPropertybarAlignLeftPre";
+let KMImageNameUXIconPropertybarAlignLeftToor = "KMImageNameUXIconPropertybarAlignLeftToor";
+let KMImageNameUXIconPropertybarAlignRightNor = "KMImageNameUXIconPropertybarAlignRightNor";
+let KMImageNameUXIconPropertybarAlignRightPre = "KMImageNameUXIconPropertybarAlignRightPre";
+let KMImageNameUXIconPropertybarAlignUpNor = "KMImageNameUXIconPropertybarAlignUpNor";
+let KMImageNameUXIconPropertybarAlignUpPre = "KMImageNameUXIconPropertybarAlignUpPre";
+let KMImageNameUXIconPropertybarAlignVercenterNor = "KMImageNameUXIconPropertybarAlignVercenterNor";
+let KMImageNameUXIconPropertybarAlignVercenterPre = "KMImageNameUXIconPropertybarAlignVercenterPre";
+let KMImageNameUXIconPropertybarAlignVersplitNor = "KMImageNameUXIconPropertybarAlignVersplitNor";
+let KMImageNameUXIconPropertybarAlignVersplitPre = "KMImageNameUXIconPropertybarAlignVersplitPre";
+let KMImageNameUXIconPropertybarFileElse = "KMImageNameUXIconPropertybarFileElse";
+let KMImageNameUXIconPropertybarFileExcel = "KMImageNameUXIconPropertybarFileExcel";
+let KMImageNameUXIconPropertybarFileIMG = "KMImageNameUXIconPropertybarFileIMG";
+let KMImageNameUXIconPropertybarFilePdf = "KMImageNameUXIconPropertybarFilePdf";
+let KMImageNameUXIconPropertybarFilePPT = "KMImageNameUXIconPropertybarFilePPT";
+let KMImageNameUXIconPropertybarFileWord = "KMImageNameUXIconPropertybarFileWord";
+let KMImageNameUXIconPropertybarFillsignForkNor = "KMImageNameUXIconPropertybarFillsignForkNor";
+let KMImageNameUXIconPropertybarFillsignForkSel = "KMImageNameUXIconPropertybarFillsignForkSel";
+let KMImageNameUXIconPropertybarFillsignLineNor = "KMImageNameUXIconPropertybarFillsignLineNor";
+let KMImageNameUXIconPropertybarFillsignLineSel = "KMImageNameUXIconPropertybarFillsignLineSel";
+let KMImageNameUXIconPropertybarFillsignPointNor = "KMImageNameUXIconPropertybarFillsignPointNor";
+let KMImageNameUXIconPropertybarFillsignPointSel = "KMImageNameUXIconPropertybarFillsignPointSel";
+let KMImageNameUXIconPropertybarFillsignRoundedrecNor = "KMImageNameUXIconPropertybarFillsignRoundedrecNor";
+let KMImageNameUXIconPropertybarFillsignRoundedrecSel = "KMImageNameUXIconPropertybarFillsignRoundedrecSel";
+let KMImageNameUXIconPropertybarFillsignTickNor = "KMImageNameUXIconPropertybarFillsignTickNor";
+let KMImageNameUXIconPropertybarFillsignTickSel = "KMImageNameUXIconPropertybarFillsignTickSel";
+let KMImageNameUXIconPropertybarLinkEmail = "KMImageNameUXIconPropertybarLinkEmail";
+let KMImageNameUXIconPropertybarLinkPage = "KMImageNameUXIconPropertybarLinkPage";
+let KMImageNameUXIconPropertybarLinkUrl = "KMImageNameUXIconPropertybarLinkUrl";
+let KMImageNameUXIconPropertybarNoteAnnotationNor = "KMImageNameUXIconPropertybarNoteAnnotationNor";
+let KMImageNameUXIconPropertybarNoteAnnotationSel = "KMImageNameUXIconPropertybarNoteAnnotationSel";
+let KMImageNameUXIconPropertybarNoteHelpNor = "KMImageNameUXIconPropertybarNoteHelpNor";
+let KMImageNameUXIconPropertybarNoteHelpSel = "KMImageNameUXIconPropertybarNoteHelpSel";
+let KMImageNameUXIconPropertybarNoteInsertNor = "KMImageNameUXIconPropertybarNoteInsertNor";
+let KMImageNameUXIconPropertybarNoteInsertSel = "KMImageNameUXIconPropertybarNoteInsertSel";
+let KMImageNameUXIconPropertybarNoteKeywordNor = "KMImageNameUXIconPropertybarNoteKeywordNor";
+let KMImageNameUXIconPropertybarNoteKeywordSel = "KMImageNameUXIconPropertybarNoteKeywordSel";
+let KMImageNameUXIconPropertybarNoteNewparagraphNor = "KMImageNameUXIconPropertybarNoteNewparagraphNor";
+let KMImageNameUXIconPropertybarNoteNewparagraphSel = "KMImageNameUXIconPropertybarNoteNewparagraphSel";
+let KMImageNameUXIconPropertybarNoteNotesNor = "KMImageNameUXIconPropertybarNoteNotesNor";
+let KMImageNameUXIconPropertybarNoteNotesSel = "KMImageNameUXIconPropertybarNoteNotesSel";
+let KMImageNameUXIconPropertybarNoteParagraphNor = "KMImageNameUXIconPropertybarNoteParagraphNor";
+let KMImageNameUXIconPropertybarNoteParagraphSel = "KMImageNameUXIconPropertybarNoteParagraphSel";
+let KMImageNameUXIconPropertybarRotateClockwiseNor = "KMImageNameUXIconPropertybarRotateClockwiseNor";
+let KMImageNameUXIconPropertybarRotateClockwisePre = "KMImageNameUXIconPropertybarRotateClockwisePre";
+let KMImageNameUXIconPropertybarRotateCounterclockwiseNor = "KMImageNameUXIconPropertybarRotateCounterclockwiseNor";
+let KMImageNameUXIconPropertybarRotateCounterclockwisePre = "KMImageNameUXIconPropertybarRotateCounterclockwisePre";
+let KMImageNameUXIconPropertybarTableBottom = "KMImageNameUXIconPropertybarTableBottom";
+let KMImageNameUXIconPropertybarTableTitleAbove = "KMImageNameUXIconPropertybarTableTitleAbove";
+let KMImageNameUXIconPropertybarTableTitleLeft = "KMImageNameUXIconPropertybarTableTitleLeft";
+let KMImageNameUXIconPropertybarTextalignCenterNor = "KMImageNameUXIconPropertybarTextalignCenterNor";
+let KMImageNameUXIconPropertybarTextalignCenterSel = "KMImageNameUXIconPropertybarTextalignCenterSel";
+let KMImageNameUXIconPropertybarTextalignCenterWhite = "KMImageNameUXIconPropertybarTextalignCenterWhite";
+let KMImageNameUXIconPropertybarTextalignJustifyNor = "KMImageNameUXIconPropertybarTextalignJustifyNor";
+let KMImageNameUXIconPropertybarTextalignJustifySel = "KMImageNameUXIconPropertybarTextalignJustifySel";
+let KMImageNameUXIconPropertybarTextalignJustifyWhite = "KMImageNameUXIconPropertybarTextalignJustifyWhite";
+let KMImageNameUXIconPropertybarTextalignLeftNor = "KMImageNameUXIconPropertybarTextalignLeftNor";
+let KMImageNameUXIconPropertybarTextalignLeftSel = "KMImageNameUXIconPropertybarTextalignLeftSel";
+let KMImageNameUXIconPropertybarTextalignLeftWhite = "KMImageNameUXIconPropertybarTextalignLeftWhite";
+let KMImageNameUXIconPropertybarTextalignRightNor = "KMImageNameUXIconPropertybarTextalignRightNor";
+let KMImageNameUXIconPropertybarTextalignRightSel = "KMImageNameUXIconPropertybarTextalignRightSel";
+let KMImageNameUXIconPropertybarTextalignRightWhite = "KMImageNameUXIconPropertybarTextalignRightWhite";
+let KMImageNameUXIconPropertybarViewPagecoverNor = "KMImageNameUXIconPropertybarViewPagecoverNor";
+let KMImageNameUXIconPropertybarViewPagecoverSel = "KMImageNameUXIconPropertybarViewPagecoverSel";
+let KMImageNameUXIconPropertybarViewPagedoubleNor = "KMImageNameUXIconPropertybarViewPagedoubleNor";
+let KMImageNameUXIconPropertybarViewPagedoubleSel = "KMImageNameUXIconPropertybarViewPagedoubleSel";
+let KMImageNameUXIconPropertybarViewPagereadingNor = "KMImageNameUXIconPropertybarViewPagereadingNor";
+let KMImageNameUXIconPropertybarViewPagereadingSel = "KMImageNameUXIconPropertybarViewPagereadingSel";
+let KMImageNameUXIconPropertybarViewPagesingleNor = "KMImageNameUXIconPropertybarViewPagesingleNor";
+let KMImageNameUXIconPropertybarViewPagesingleSel = "KMImageNameUXIconPropertybarViewPagesingleSel";
+let KMImageNameUXIconPropertybarViewSplitscreenhorNor = "KMImageNameUXIconPropertybarViewSplitscreenhorNor";
+let KMImageNameUXIconPropertybarViewSplitscreenhorSel = "KMImageNameUXIconPropertybarViewSplitscreenhorSel";
+let KMImageNameUXIconPropertybarViewSplitscreensingleNor = "KMImageNameUXIconPropertybarViewSplitscreensingleNor";
+let KMImageNameUXIconPropertybarViewSplitscreensingleSel = "KMImageNameUXIconPropertybarViewSplitscreensingleSel";
+let KMImageNameUXIconPropertybarViewSplitscreenverNor = "KMImageNameUXIconPropertybarViewSplitscreenverNor";
+let KMImageNameUXIconPropertybarViewSplitscreenverSel = "KMImageNameUXIconPropertybarViewSplitscreenverSel";
+
+let KMImageNameUXIconPropertybarFileHTML = "KMImageNameUXIconPropertybarFileHTML";
+let KMImageNameUXIconPropertybarFileCSV = "KMImageNameUXIconPropertybarFileCSV";
+let KMImageNameUXIconPropertybarFileTXT = "KMImageNameUXIconPropertybarFileTXT";
+let KMImageNameUXIconPropertybarFileJPEG = "KMImageNameUXIconPropertybarFileJPEG";
+let KMImageNameUXIconPropertybarFileJPG = "KMImageNameUXIconPropertybarFileJPG";
+let KMImageNameUXIconPropertybarFilePNG = "KMImageNameUXIconPropertybarFilePNG";
+let KMImageNameUXIconPropertybarFileGIF = "KMImageNameUXIconPropertybarFileGIF";
+let KMImageNameUXIconPropertybarFileTIFF = "KMImageNameUXIconPropertybarFileTIFF";
+let KMImageNameUXIconPropertybarFileTGA = "KMImageNameUXIconPropertybarFileTGA";
+let KMImageNameUXIconPropertybarFileBMP = "KMImageNameUXIconPropertybarFileBMP";
+let KMImageNameUXIconPropertybarFileJP2 = "KMImageNameUXIconPropertybarFileJP2";
+
+//ic_Cursors
+let KMImageNameUXIconCursorsText = "KMImageNameUXIconCursorsText";
+//ic_Progress
+let KMImageNameUXIconProgressComplete = "KMImageNameUXIconProgressComplete";
+let KMImageNameUXIconProgressFailure = "KMImageNameUXIconProgressFailure";
+let KMImageNameUXIconProgressWaiting = "KMImageNameUXIconProgressWaiting";
+//ic_Vip
+let KMImageNameUXIconVip = "KMImageNameUXIconVip";
+//ic_Btn
+let KMImageNameUXIconBtnAddHov = "KMImageNameUXIconBtnAddHov";
+let KMImageNameUXIconBtnAddNor = "KMImageNameUXIconBtnAddNor";
+let KMImageNameUXIconBtnAddWhite = "KMImageNameUXIconBtnAddWhite";
+let KMImageNameUXIconBtnArrowDown = "KMImageNameUXIconBtnArrowDown";
+let KMImageNameUXIconBtnArrowLeft = "KMImageNameUXIconBtnArrowLeft";
+let KMImageNameUXIconBtnArrowRight = "KMImageNameUXIconBtnArrowRight";
+let KMImageNameUXIconBtnArrowUp = "KMImageNameUXIconBtnArrowUp";
+let KMImageNameUXIconBtnArrowUpdown = "KMImageNameUXIconBtnArrowUpdown";
+let KMImageNameUXIconBtnCheckboxDis = "KMImageNameUXIconBtnCheckboxDis";
+let KMImageNameUXIconBtnCheckboxSel = "KMImageNameUXIconBtnCheckboxSel";
+let KMImageNameUXIconBtnClear = "KMImageNameUXIconBtnClear";
+let KMImageNameUXIconBtnCloseHov = "KMImageNameUXIconBtnCloseHov";
+let KMImageNameUXIconBtnCloseNor = "KMImageNameUXIconBtnCloseNor";
+let KMImageNameUXIconBtnCloseWhite = "KMImageNameUXIconBtnCloseWhite";
+let KMImageNameUXIconBtnColor = "KMImageNameUXIconBtnColor";
+let KMImageNameUXIconBtnDeletAccent = "KMImageNameUXIconBtnDeletAccent";
+let KMImageNameUXIconBtnDeletHov = "KMImageNameUXIconBtnDeletHov";
+let KMImageNameUXIconBtnDeletNor = "KMImageNameUXIconBtnDeletNor";
+let KMImageNameUXIconBtnEditHov = "KMImageNameUXIconBtnEditHov";
+let KMImageNameUXIconBtnEditNor = "KMImageNameUXIconBtnEditNor";
+let KMImageNameUXIconBtnEyesInvisible = "KMImageNameUXIconBtnEyesInvisible";
+let KMImageNameUXIconBtnEyesVisible = "KMImageNameUXIconBtnEyesVisible";
+let KMImageNameUXIconBtnFontsetNor = "KMImageNameUXIconBtnFontsetNor";
+let KMImageNameUXIconBtnFontsetPre = "KMImageNameUXIconBtnFontsetPre";
+let KMImageNameUXIconBtnOpenfileNor = "KMImageNameUXIconBtnOpenfileNor";
+let KMImageNameUXIconBtnOpenfileWhite = "KMImageNameUXIconBtnOpenfileWhite";
+let KMImageNameUXIconBtnOvalarrowDown = "KMImageNameUXIconBtnOvalarrowDown";
+let KMImageNameUXIconBtnRadioDis = "KMImageNameUXIconBtnRadioDis";
+let KMImageNameUXIconBtnRadioSel = "KMImageNameUXIconBtnRadioSel";
+let KMImageNameUXIconBtnSearchbarSearch = "KMImageNameUXIconBtnSearchbarSearch";
+let KMImageNameUXIconBtnSearchbarSearchfilter = "KMImageNameUXIconBtnSearchbarSearchfilter";
+let KMImageNameUXIconBtnSetNor = "KMImageNameUXIconBtnSetNor";
+let KMImageNameUXIconBtnSetPre = "KMImageNameUXIconBtnSetPre";
+let KMImageNameUXIconBtnSidebarAddNor = "KMImageNameUXIconBtnSidebarAddNor";
+let KMImageNameUXIconBtnSidebarAddPre = "KMImageNameUXIconBtnSidebarAddPre";
+let KMImageNameUXIconBtnSidebarFilterNor = "KMImageNameUXIconBtnSidebarFilterNor";
+let KMImageNameUXIconBtnSidebarFilterPre = "KMImageNameUXIconBtnSidebarFilterPre";
+let KMImageNameUXIconBtnSidebarListNor = "KMImageNameUXIconBtnSidebarListNor";
+let KMImageNameUXIconBtnSidebarListPre = "KMImageNameUXIconBtnSidebarListPre";
+let KMImageNameUXIconBtnSidebarMoreNor = "KMImageNameUXIconBtnSidebarMoreNor";
+let KMImageNameUXIconBtnSidebarMorePre = "KMImageNameUXIconBtnSidebarMorePre";
+let KMImageNameUXIconBtnSidebarMoreSecondary = "KMImageNameUXIconBtnSidebarMoreSecondary";
+let KMImageNameUXIconBtnSidebarPageNor = "KMImageNameUXIconBtnSidebarPageNor";
+let KMImageNameUXIconBtnSidebarPagePre = "KMImageNameUXIconBtnSidebarPagePre";
+let KMImageNameUXIconBtnSidebarSearchNor = "KMImageNameUXIconBtnSidebarSearchNor";
+let KMImageNameUXIconBtnSidebarSearchPre = "KMImageNameUXIconBtnSidebarSearchPre";
+let KMImageNameUXIconBtnSidebarZoominNor = "KMImageNameUXIconBtnSidebarZoominNor";
+let KMImageNameUXIconBtnSidebarZoominPre = "KMImageNameUXIconBtnSidebarZoominPre";
+let KMImageNameUXIconBtnSidebarZoomoutNor = "KMImageNameUXIconBtnSidebarZoomoutNor";
+let KMImageNameUXIconBtnSidebarZoomoutPre = "KMImageNameUXIconBtnSidebarZoomoutPre";
+let KMImageNameUXIconBtnStrikeNor = "KMImageNameUXIconBtnStrikeNor";
+let KMImageNameUXIconBtnStrikePre = "KMImageNameUXIconBtnStrikePre";
+let KMImageNameUXIconBtnsysArrowLeft = "KMImageNameUXIconBtnsysArrowLeft";
+let KMImageNameUXIconBtnSysArrowRight = "KMImageNameUXIconBtnSysArrowRight";
+let KMImageNameUXIconBtnTriDownNor = "KMImageNameUXIconBtnTriDownNor";
+let KMImageNameUXIconBtnTriDownPre = "KMImageNameUXIconBtnTriDownPre";
+let KMImageNameUXIconBtnTriLeftNor = "KMImageNameUXIconBtnTriLeftNor";
+let KMImageNameUXIconBtnTriLeftPre = "KMImageNameUXIconBtnTriLeftPre";
+let KMImageNameUXIconBtnTriLeftSel = "KMImageNameUXIconBtnTriLeftSel";
+let KMImageNameUXIconBtnTriRightNor = "KMImageNameUXIconBtnTriRightNor";
+let KMImageNameUXIconBtnTriRightPre = "KMImageNameUXIconBtnTriRightPre";
+let KMImageNameUXIconBtnTriRightSel = "KMImageNameUXIconBtnTriRightSel";
+let KMImageNameUXIconBtnTriUpNor = "KMImageNameUXIconBtnTriUpNor";
+let KMImageNameUXIconBtnTriUpPre = "KMImageNameUXIconBtnTriUpPre";
+let KMImageNameBtnSidebarRankPositive = "KMImageNameBtnSidebarRankPositive";
+let KMImageNameBtnSidebarRankReverse = "KMImageNameBtnSidebarRankReverse";
+let KMImageNameEmptyOutline = "KMImageNameEmptyOutline";
+let KMImageNameEmptyAnnotation = "KMImageNameEmptyAnnotation";
+let KMImageNameEmptySearch = "KMImageNameEmptySearch";
+let KMImageNameEmptyStamp = "KMImageNameEmptyStamp";
+let KMImageNameEmptySign = "KMImageNameEmptySign";
+let KMImageNameEmptyWatermark = "KMImageNameEmptyWatermark";
+let KMImageNameEmptyBackground = "KMImageNameEmptyBackground";
+let KMImageNameEmptyHeaderandfooter = "KMImageNameEmptyHeaderandfooter";
+let KMImageNameEmptySplitview = "KMImageNameEmptySplitview";
+let KMImageNameCursorsUnderline = "KMImageNameCursorsUnderline";
+let KMImageNameCursorsHighlight = "KMImageNameCursorsHighlight";
+let KMImageNameCursorsStrikeout = "KMImageNameCursorsStrikeout";
+let KMImageNameCursorsFreehand = "KMImageNameCursorsFreehand";
+let KMImageNameCursorsText = "KMImageNameCursorsText";
+let KMImageNameCursorsNote = "KMImageNameCursorsNote";
+let KMImageNameCursorsRec = "KMImageNameCursorsRec";
+let KMImageNameCursorsOval = "KMImageNameCursorsOval";
+let KMImageNameCursorsArrow = "KMImageNameCursorsArrow";
+let KMImageNameCursorsTable = "KMImageNameCursorsTable";
+let KMImageNameCursorsLink = "KMImageNameCursorsLink";
+let KMImageNameCursorsLine = "KMImageNameCursorsLine";
+
+let KMImageNameCursorsButton = "KMImageNameCursorsButton";
+let KMImageNameCursorsCheckbox = "KMImageNameCursorsCheckbox";
+let KMImageNameCursorsDate = "KMImageNameCursorsDate";
+let KMImageNameCursorsFork = "KMImageNameCursorsFork";
+let KMImageNameCursorsFormLine = "KMImageNameCursorsFormLine";
+let KMImageNameCursorsListbox = "KMImageNameCursorsListbox";
+let KMImageNameCursorsPoint = "KMImageNameCursorsPoint";
+let KMImageNameCursorsPulldownmenu = "KMImageNameCursorsPulldownmenu";
+let KMImageNameCursorsRadiobutton = "KMImageNameCursorsRadiobutton";
+let KMImageNameCursorsRoundedrec = "KMImageNameCursorsRoundedrec";
+let KMImageNameCursorsSign = "KMImageNameCursorsSign";
+let KMImageNameCursorsTextfield = "KMImageNameCursorsTextfield";
+let KMImageNameCursorsTick = "KMImageNameCursorsTick";
+let KMImageNameElse1 = "KMImageNameElse1";
+let KMImageNameElse2 = "KMImageNameElse2";
+let KMImageNameElsei = "KMImageNameElsei";
+
 @objc class KMAppearance: NSObject {
     
     class func isDarkMode() -> Bool {
@@ -1354,9 +1910,4 @@ extension KMAppearance {
     struct Status {}
     struct Interactive {}
     struct Layout {}
-    
-    /*
-     
-     
-     */
 }

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

@@ -436,7 +436,7 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                     KMToolbarInkAnnotationItemIdentifier,
                     KMToolbarFreeTextAnnotationItemIdentifier,
                     KMToolbarAnchoredAnnotationItemIdentifier,
-                    KMToolbarSquareAnnotationItemIdentifier,
+                    KMToolbarSquareAnnotationItemIdentifier, KMToolbarCircleAnnotationItemIdentifier, KMToolbarArrowAnnotationItemIdentifier, KMToolbarLineAnnotationItemIdentifier,
                     KMToolbarLinkAnnotationItemIdentifier,
                     KMAnnotationStampToolbarItemIdentifier,
                     KMToolbarSignSignatureAnnotationItemIdentifier,
@@ -816,10 +816,7 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 view.addSubview(titleLabel)
                 titleLabel.frame = NSMakeRect(0, 0, 130, 16)
                 titleLabel.alignment = .center
-                
-//                boxView.wantsLayer = true
-//                boxView.layer?.borderWidth = 1
-//                boxView.layer?.borderColor = NSColor.lightGray.cgColor
+
                 item?.customizeView = view
             } else if identifier == KMRightControlToolbarItemIdentifier {
                 item?.image = NSImage(named: "KMImageNameUXIconBtnTriRightNor")
@@ -836,8 +833,8 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 menuItem.tag = item!.btnTag
                 item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarMoveToolModeItemIdentifier {
-                item?.image = NSImage(named: "KMImageNameMainToolMove")
-                item?.alternateImage = NSImage(named: "KMImageNameMainToolMove")
+                item?.image = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsPantool)
+                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsPantool)
                 item?.target = self
                 item?.btnTag = KMToolbarViewType.Move.rawValue
                 item?.toolTip = NSLocalizedString("Scroll Tool", comment: "")
@@ -848,8 +845,8 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 menuItem.tag = KMToolbarViewType.Move.rawValue
                 item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarMagnifyToolModeItemIdentifier {
-                item?.image = NSImage(named: "KMImageNameMainToolMagnify")
-                item?.alternateImage = NSImage(named: "KMImageNameMainToolMagnify")
+                item?.image = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsMagnifier)
+                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsMagnifier)
                 item?.target = self
                 item?.btnTag = KMToolbarViewType.Magnify.rawValue
                 item?.toolTip = NSLocalizedString("Magnify Tool", comment: "")
@@ -860,11 +857,11 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 menuItem.tag = KMToolbarViewType.Magnify.rawValue
                 item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarSelectToolModeItemIdentifier {
-                item?.image = NSImage(named: "KMImageNameMainToolSelect")
-                item?.alternateImage = NSImage(named: "KMImageNameMainToolSelect")
+                item?.image = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsContentsel)
+                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsContentsel)
                 item?.target = self
                 item?.btnTag = KMToolbarViewType.Select.rawValue
-                item?.toolTip = NSLocalizedString("Content Selection", comment: "")
+                item?.toolTip = NSLocalizedString("Content Selection Tool", comment: "")
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(leftControllButtonAction)
                 
@@ -872,8 +869,8 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 menuItem.tag = KMToolbarViewType.Select.rawValue
                 item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarZoomToSelectionItemIdentifier {
-                item?.image = NSImage(named: "KMImageNameMainToolSelectZoom")
-                item?.alternateImage = NSImage(named: "KMImageNameMainToolSelectZoom")
+                item?.image = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsAreazoom)
+                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsAreazoom)
                 item?.target = self
                 item?.btnTag = KMToolbarViewType.SelectZoom.rawValue
                 item?.toolTip = NSLocalizedString("Zoom to selected area", comment: "")
@@ -884,11 +881,11 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 menuItem.tag = KMToolbarViewType.SelectZoom.rawValue
                 item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarHighlightAnnotationItemIdentifier {
-                item?.image = NSImage(named: "KMImageNameMainToolHighlight")
-                item?.alternateImage = NSImage(named: "KMImageNameMainToolHighlight")
+                item?.image = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsUnderline)
+                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsUnderline)
                 item?.target = self
                 item?.btnTag = CAnnotationType.highlight.rawValue
-                item?.toolTip = NSLocalizedString("Highlight (⌃⌘H)", comment: "")
+                item?.toolTip = String(format: "%@ (⌃⌘H)", NSLocalizedString("Highlight", comment: ""))
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(changeAnnotationMode)
                 
@@ -896,11 +893,11 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 menuItem.tag = CAnnotationType.highlight.rawValue
                 item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarUnderlineAnnotationItemIdentifier {
-                item?.image = NSImage(named: "KMImageNameMainToolUnderline")
-                item?.alternateImage = NSImage(named: "KMImageNameMainToolUnderline")
+                item?.image = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsUnderline)
+                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsUnderline)
                 item?.target = self
                 item?.btnTag = CAnnotationType.underline.rawValue
-                item?.toolTip = NSLocalizedString("Underline (⌃⌘U)", comment: "")
+                item?.toolTip = String(format: "%@ (⇧⌘M)", NSLocalizedString("Underline", comment: ""))
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(changeAnnotationMode)
                 
@@ -908,11 +905,11 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 menuItem.tag = CAnnotationType.underline.rawValue
                 item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarStrikeOutAnnotationItemIdentifier {
-                item?.image = NSImage(named: "KMImageNameMainToolStrikeththrough")
-                item?.alternateImage = NSImage(named: "KMImageNameMainToolStrikeththrough")
+                item?.image = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsStrikeout)
+                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsStrikeout)
                 item?.target = self
                 item?.btnTag = CAnnotationType.strikeOut.rawValue
-                item?.toolTip = NSLocalizedString("Strikethrough (⌃⌘S)", comment: "")
+                item?.toolTip = String(format: "%@ (⌃⌘M)", NSLocalizedString("Strikethrough", comment: ""))
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(changeAnnotationMode)
                 
@@ -920,11 +917,11 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 menuItem.tag = CAnnotationType.strikeOut.rawValue
                 item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarInkAnnotationItemIdentifier {
-                item?.image = NSImage(named: "KMImageNameMainToolPen")
-                item?.alternateImage = NSImage(named: "KMImageNameMainToolPen")
+                item?.image = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsPen)
+                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsPen)
                 item?.target = self
                 item?.btnTag = CAnnotationType.ink.rawValue
-                item?.toolTip = NSLocalizedString("Draw freely as you do with a pen", comment: "")
+                item?.toolTip = NSLocalizedString("Add freehand drawings by hand writing just like you do with a pen.", comment: "")
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(changeAnnotationMode)
                 
@@ -932,11 +929,11 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 menuItem.tag = CAnnotationType.ink.rawValue
                 item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarFreeTextAnnotationItemIdentifier {
-                item?.image = NSImage(named: "KMImageNameMainToolFreeText")
-                item?.alternateImage = NSImage(named: "KMImageNameMainToolFreeText")
+                item?.image = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsText)
+                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsText)
                 item?.target = self
                 item?.btnTag = CAnnotationType.freeText.rawValue
-                item?.toolTip = NSLocalizedString("Text (⌃⌘T)", comment: "")
+                item?.toolTip = String(format: "%@ (⌘N)", NSLocalizedString("Text Note", comment: ""))
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(changeAnnotationMode)
                 
@@ -944,11 +941,11 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 menuItem.tag = CAnnotationType.freeText.rawValue
                 item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarAnchoredAnnotationItemIdentifier {
-                item?.image = NSImage(named: "KMImageNameMainToolAnchored")
-                item?.alternateImage = NSImage(named: "KMImageNameMainToolAnchored")
+                item?.image = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsNote)
+                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsNote)
                 item?.target = self
                 item?.btnTag = CAnnotationType.anchored.rawValue
-                item?.toolTip = NSLocalizedString("Sticky Note(⌃⌘N)", comment: "")
+                item?.toolTip = String(format: "%@ (⌥⌘N)", NSLocalizedString("Anchored Note", comment: ""))
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(changeAnnotationMode)
                 
@@ -956,11 +953,47 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 menuItem.tag = CAnnotationType.anchored.rawValue
                 item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarSquareAnnotationItemIdentifier {
-                item?.image = NSImage(named: "KMImageNameMainToolSquare_Default")
-                item?.alternateImage = NSImage(named: "KMImageNameMainToolSquare_Default")
+                item?.image = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsRec)
+                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsRec)
                 item?.target = self
                 item?.btnTag = CAnnotationType.square.rawValue
-                item?.toolTip = NSLocalizedString("Hold shift to draw square/circle/straight arrow/line", comment: "")
+                item?.toolTip = NSLocalizedString("Draw rectangle; draw square by holding Shift key", comment: "")
+                item?.boxImagePosition = .imageOnly
+                item?.btnAction = #selector(changeAnnotationMode)
+                
+                let menuItem = NSMenuItem.init(title: "Square", action: #selector(changeAnnotationMode), target: self)
+                menuItem.tag = CAnnotationType.square.rawValue
+                item?.menuFormRepresentation = menuItem
+            }else if identifier == KMToolbarCircleAnnotationItemIdentifier {
+                item?.image = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsOval)
+                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsOval)
+                item?.target = self
+                item?.btnTag = CAnnotationType.circle.rawValue
+                item?.toolTip = NSLocalizedString("Draw oval; draw circle by holding Shift key", comment: "")
+                item?.boxImagePosition = .imageOnly
+                item?.btnAction = #selector(changeAnnotationMode)
+                
+                let menuItem = NSMenuItem.init(title: "Square", action: #selector(changeAnnotationMode), target: self)
+                menuItem.tag = CAnnotationType.square.rawValue
+                item?.menuFormRepresentation = menuItem
+            }  else if identifier == KMToolbarArrowAnnotationItemIdentifier {
+                item?.image = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsArrow)
+                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsArrow)
+                item?.target = self
+                item?.btnTag = CAnnotationType.arrow.rawValue
+                item?.toolTip = NSLocalizedString("Draw arrow; draw straight arrow by holding Shift key", comment: "")
+                item?.boxImagePosition = .imageOnly
+                item?.btnAction = #selector(changeAnnotationMode)
+                
+                let menuItem = NSMenuItem.init(title: "Square", action: #selector(changeAnnotationMode), target: self)
+                menuItem.tag = CAnnotationType.square.rawValue
+                item?.menuFormRepresentation = menuItem
+            }  else if identifier == KMToolbarLineAnnotationItemIdentifier {
+                item?.image = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsLine)
+                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsLine)
+                item?.target = self
+                item?.btnTag = CAnnotationType.line.rawValue
+                item?.toolTip = NSLocalizedString("Draw line; draw straight line by holding Shift key", comment: "")
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(changeAnnotationMode)
                 
@@ -968,11 +1001,11 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 menuItem.tag = CAnnotationType.square.rawValue
                 item?.menuFormRepresentation = menuItem
             }  else if identifier ==  KMToolbarLinkAnnotationItemIdentifier {
-                item?.image = NSImage(named: "KMImageNameMainToolLine")
-                item?.alternateImage = NSImage(named: "KMImageNameMainToolLine")
+                item?.image = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsLink)
+                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsLink)
                 item?.target = self
                 item?.btnTag = CAnnotationType.link.rawValue
-                item?.toolTip = NSLocalizedString("Select an area or text on the page for a link to be inserted", comment: "")
+                item?.toolTip = NSLocalizedString("Select an area or text on a page for a link to be inserted.", comment: "")
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(changeAnnotationMode)
                 
@@ -980,11 +1013,11 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 menuItem.tag = CAnnotationType.link.rawValue
                 item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarSignSignatureAnnotationItemIdentifier {
-                item?.image = NSImage(named: "KMImageNameMainToolSignSignature")
-                item?.alternateImage = NSImage(named: "KMImageNameMainToolSignSignature")
+                item?.image = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsSign)
+                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsSign)
                 item?.target = self
                 item?.btnTag = CAnnotationType.signSignature.rawValue
-                item?.toolTip = NSLocalizedString("Add a handwritten signature or create a signature via the trackpad", comment: "")
+                item?.toolTip = NSLocalizedString("Add beautiful handwriting or use your trackpad to create your own signature.", comment: "")
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(changeAnnotationMode)
                 
@@ -992,11 +1025,11 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 menuItem.tag = CAnnotationType.signSignature.rawValue
                 item?.menuFormRepresentation = menuItem
             } else if identifier == KMAnnotationStampToolbarItemIdentifier {
-                item?.image = NSImage(named: "KMImageNameMainToolStamp")
-                item?.alternateImage = NSImage(named: "KMImageNameMainToolStamp")
+                item?.image = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsStamp)
+                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsStamp)
                 item?.target = self
                 item?.btnTag = CAnnotationType.stamp.rawValue
-                item?.toolTip = NSLocalizedString("Add Stamp", comment: "")
+                item?.toolTip = NSLocalizedString("Add New Stamp", comment: "")
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(changeAnnotationMode)
                 
@@ -1530,7 +1563,19 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                         item.isSelected = true
                     }
                 } else if item.itemIdentifier == KMToolbarSquareAnnotationItemIdentifier {
-                    if annotationType == .square || annotationType == .circle || annotationType == .arrow || annotationType == .line {
+                    if annotationType == .square {
+                        item.isSelected = true
+                    }
+                } else if item.itemIdentifier == KMToolbarCircleAnnotationItemIdentifier {
+                    if annotationType == .circle {
+                        item.isSelected = true
+                    }
+                } else if item.itemIdentifier == KMToolbarArrowAnnotationItemIdentifier {
+                    if annotationType == .arrow {
+                        item.isSelected = true
+                    }
+                } else if item.itemIdentifier == KMToolbarLineAnnotationItemIdentifier {
+                    if annotationType == .line {
                         item.isSelected = true
                     }
                 } else if item.itemIdentifier == KMToolbarLinkAnnotationItemIdentifier {

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

@@ -120,20 +120,20 @@ extension KMMainViewController: KMToolbarControllerDelegate {
             editSelectd = true
         }
         //多边形工具栏点击特殊处理
-        if (self.listView.annotationType == .square ||
-            self.listView.annotationType == .circle ||
-            self.listView.annotationType == .arrow ||
-            self.listView.annotationType == .line) {
-            if CAnnotationType(rawValue: item.tag) ?? CAnnotationType.unkown == .square ||
-                CAnnotationType(rawValue: item.tag) ?? CAnnotationType.unkown == .circle ||
-                CAnnotationType(rawValue: item.tag) ?? CAnnotationType.unkown == .arrow ||
-                CAnnotationType(rawValue: item.tag) ?? CAnnotationType.unkown == .line {
-                isSelected = true
-            }
-        } else if (item.tag > 3 &&  item.tag < 8) {
-            let shape = UserDefaults.standard.object(forKey: KMToolBarToolPDFShapeStyle)
-            item.tag = shape as? Int ?? item.tag
-        }
+//        if (self.listView.annotationType == .square ||
+//            self.listView.annotationType == .circle ||
+//            self.listView.annotationType == .arrow ||
+//            self.listView.annotationType == .line) {
+//            if CAnnotationType(rawValue: item.tag) ?? CAnnotationType.unkown == .square ||
+//                CAnnotationType(rawValue: item.tag) ?? CAnnotationType.unkown == .circle ||
+//                CAnnotationType(rawValue: item.tag) ?? CAnnotationType.unkown == .arrow ||
+//                CAnnotationType(rawValue: item.tag) ?? CAnnotationType.unkown == .line {
+//                isSelected = true
+//            }
+//        } else if (item.tag > 3 &&  item.tag < 8) {
+//            let shape = UserDefaults.standard.object(forKey: KMToolBarToolPDFShapeStyle)
+//            item.tag = shape as? Int ?? item.tag
+//        }
         
         if isSelected {
             self.listView.toolMode = .textToolMode