Parcourir la source

【toolbar】整理代码

tangchao il y a 1 an
Parent
commit
5b0537ebdd

+ 1 - 221
PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarViewController.swift

@@ -765,224 +765,139 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
             } else if identifier == KMToolbarMoveToolModeItemIdentifier {
                 item?.titleName = NSLocalizedString("Scroll Tool", comment: "")
                 item?.image = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsPantool)
-                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsPantool)
                 item?.target = self
                 item?.btnTag = KMToolbarViewType.Move.rawValue
                 item?.toolTip = NSLocalizedString("Scroll Tool", comment: "")
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(leftControllButtonAction)
-                
-                let menuItem = NSMenuItem.init(title: "Scroll Tool", action: #selector(leftControllButtonAction), target: self)
-                menuItem.tag = KMToolbarViewType.Move.rawValue
-                item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarMagnifyToolModeItemIdentifier {
                 item?.titleName = NSLocalizedString("Magnify Tool", comment: "")
                 item?.image = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsMagnifier)
-                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsMagnifier)
                 item?.target = self
                 item?.btnTag = KMToolbarViewType.Magnify.rawValue
                 item?.toolTip = NSLocalizedString("Magnify Tool", comment: "")
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(leftControllButtonAction)
-                
-                let menuItem = NSMenuItem.init(title: "Magnify Tool", action: #selector(leftControllButtonAction), target: self)
-                menuItem.tag = KMToolbarViewType.Magnify.rawValue
-                item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarSelectToolModeItemIdentifier {
                 item?.titleName = NSLocalizedString("Content Selection Tool", comment: "")
                 item?.image = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsContentsel)
-                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsContentsel)
                 item?.target = self
                 item?.btnTag = KMToolbarViewType.Select.rawValue
                 item?.toolTip = NSLocalizedString("Content Selection Tool", comment: "")
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(leftControllButtonAction)
-                
-                let menuItem = NSMenuItem.init(title: "Content Selection", action: #selector(leftControllButtonAction), target: self)
-                menuItem.tag = KMToolbarViewType.Select.rawValue
-                item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarZoomToSelectionItemIdentifier {
                 item?.titleName = NSLocalizedString("Zoom to selected area", comment: "")
                 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: "")
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(leftControllButtonAction)
-                
-                let menuItem = NSMenuItem.init(title: "", action: #selector(leftControllButtonAction), target: self)
-                menuItem.tag = KMToolbarViewType.SelectZoom.rawValue
-                item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarHighlightAnnotationItemIdentifier {
                 item?.titleName = NSLocalizedString("Highlight", comment: "")
                 item?.image = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsUnderline)
-                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsUnderline)
                 item?.target = self
                 item?.btnTag = CAnnotationType.highlight.rawValue
                 item?.toolTip = String(format: "%@ (⌃⌘H)", NSLocalizedString("Highlight", comment: ""))
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(changeAnnotationMode)
-                
-                let menuItem = NSMenuItem.init(title: "highlight", action: #selector(changeAnnotationMode), target: self)
-                menuItem.tag = CAnnotationType.highlight.rawValue
-                item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarUnderlineAnnotationItemIdentifier {
                 item?.titleName = NSLocalizedString("Underline", comment: "")
                 item?.image = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsUnderline)
-                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsUnderline)
                 item?.target = self
                 item?.btnTag = CAnnotationType.underline.rawValue
                 item?.toolTip = String(format: "%@ (⇧⌘M)", NSLocalizedString("Underline", comment: ""))
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(changeAnnotationMode)
-                
-                let menuItem = NSMenuItem.init(title: "underline", action: #selector(changeAnnotationMode), target: self)
-                menuItem.tag = CAnnotationType.underline.rawValue
-                item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarStrikeOutAnnotationItemIdentifier {
                 item?.titleName = NSLocalizedString("Strikethrough", comment: "")
                 item?.image = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsStrikeout)
-                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsStrikeout)
                 item?.target = self
                 item?.btnTag = CAnnotationType.strikeOut.rawValue
                 item?.toolTip = String(format: "%@ (⌃⌘M)", NSLocalizedString("Strikethrough", comment: ""))
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(changeAnnotationMode)
-                
-                let menuItem = NSMenuItem.init(title: "strikeOut", action: #selector(changeAnnotationMode), target: self)
-                menuItem.tag = CAnnotationType.strikeOut.rawValue
-                item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarInkAnnotationItemIdentifier {
                 item?.titleName = NSLocalizedString("Freehand", comment: "")
                 item?.image = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsPen)
-                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsPen)
                 item?.target = self
                 item?.btnTag = CAnnotationType.ink.rawValue
                 item?.toolTip = NSLocalizedString("Add freehand drawings by hand writing just like you do with a pen.", comment: "")
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(changeAnnotationMode)
-                
-                let menuItem = NSMenuItem.init(title: "Freehand", action: #selector(changeAnnotationMode), target: self)
-                menuItem.tag = CAnnotationType.ink.rawValue
-                item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarFreeTextAnnotationItemIdentifier {
                 item?.titleName = NSLocalizedString("Text Note", comment: "")
                 item?.image = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsText)
-                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsText)
                 item?.target = self
                 item?.btnTag = CAnnotationType.freeText.rawValue
                 item?.toolTip = String(format: "%@ (⌘N)", NSLocalizedString("Text Note", comment: ""))
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(changeAnnotationMode)
-                
-                let menuItem = NSMenuItem.init(title: "FreeText", action: #selector(changeAnnotationMode), target: self)
-                menuItem.tag = CAnnotationType.freeText.rawValue
-                item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarAnchoredAnnotationItemIdentifier {
                 item?.titleName = NSLocalizedString("Anchored Note", comment: "")
                 item?.image = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsNote)
-                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsNote)
                 item?.target = self
                 item?.btnTag = CAnnotationType.anchored.rawValue
                 item?.toolTip = String(format: "%@ (⌥⌘N)", NSLocalizedString("Anchored Note", comment: ""))
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(changeAnnotationMode)
-                
-                let menuItem = NSMenuItem.init(title: "Anchored", action: #selector(changeAnnotationMode), target: self)
-                menuItem.tag = CAnnotationType.anchored.rawValue
-                item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarSquareAnnotationItemIdentifier {
                 item?.titleName = NSLocalizedString("Square", comment: "")
                 item?.image = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsRec)
-                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsRec)
                 item?.target = self
                 item?.btnTag = CAnnotationType.square.rawValue
                 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?.titleName = NSLocalizedString("oval", comment: "")
                 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?.titleName = NSLocalizedString("Arrow", comment: "")
                 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?.titleName = NSLocalizedString("Square", comment: "")
                 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)
-                
-                let menuItem = NSMenuItem.init(title: "Square", action: #selector(changeAnnotationMode), target: self)
-                menuItem.tag = CAnnotationType.square.rawValue
-                item?.menuFormRepresentation = menuItem
             }  else if identifier ==  KMToolbarLinkAnnotationItemIdentifier {
                 item?.titleName = NSLocalizedString("Link", comment: "")
                 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 a page for a link to be inserted.", comment: "")
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(changeAnnotationMode)
-                
-                let menuItem = NSMenuItem.init(title: "Link", action: #selector(changeAnnotationMode), target: self)
-                menuItem.tag = CAnnotationType.link.rawValue
-                item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarSignSignatureAnnotationItemIdentifier {
                 item?.titleName = NSLocalizedString("SignSignature", comment: "")
                 item?.image = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsSign)
-                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsSign)
                 item?.target = self
                 item?.btnTag = CAnnotationType.signSignature.rawValue
                 item?.toolTip = NSLocalizedString("Add beautiful handwriting or use your trackpad to create your own signature.", comment: "")
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(changeAnnotationMode)
-                
-                let menuItem = NSMenuItem.init(title: "SignSignature", action: #selector(changeAnnotationMode), target: self)
-                menuItem.tag = CAnnotationType.signSignature.rawValue
-                item?.menuFormRepresentation = menuItem
             } else if identifier == KMAnnotationStampToolbarItemIdentifier {
                 item?.titleName = NSLocalizedString("Stamp", comment: "")
                 item?.image = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsStamp)
-                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarMytoolsStamp)
                 item?.target = self
                 item?.btnTag = CAnnotationType.stamp.rawValue
                 item?.toolTip = NSLocalizedString("Add New Stamp", comment: "")
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(changeAnnotationMode)
-                
-                let menuItem = NSMenuItem.init(title: "Stamp", action: #selector(changeAnnotationMode), target: self)
-                menuItem.tag = CAnnotationType.stamp.rawValue
-                item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarShowToolbarItemIdentifier {
                 item?.image = NSImage(named: "KMImageNameMainToolShow")
                 item?.selectedImage = NSImage(named: "KMImageNameMainToolHide")
@@ -993,35 +908,22 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 item?.titleName = NSLocalizedString("Hide", comment: "")
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(showPDFLayoutMode)
-                
-                let menuItem = NSMenuItem.init(title: "Hide", action: #selector(showPDFLayoutMode), target: self)
-                item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarAddTextEditPDFItemIdentifier {
                 item?.image = NSImage(named: "KMImageNameMainToolFreeText")
-                item?.alternateImage = NSImage(named: "KMImageNameMainToolFreeText")
                 item?.target = self
                 item?.btnTag = CAnnotationType.addText.rawValue
                 item?.toolTip = NSLocalizedString("Add Text", comment: "")
                 item?.titleName = NSLocalizedString("Add Text", comment: "")
                 item?.boxImagePosition = .imageLeft
                 item?.btnAction = #selector(changeAnnotationMode)
-                
-                let menuItem = NSMenuItem.init(title: "Add Text", action: #selector(changeAnnotationMode), target: self)
-                menuItem.tag = CAnnotationType.addText.rawValue
-                item?.menuFormRepresentation = menuItem
             }  else if identifier == KMToolbarAddImageEditPDFItemIdentifier {
                 item?.image = NSImage(named: "KMImageNameMainToolEditImage")
-                item?.alternateImage = NSImage(named: "KMImageNameMainToolEditImage")
                 item?.target = self
                 item?.btnTag = CAnnotationType.addImage.rawValue
                 item?.toolTip = NSLocalizedString("Add Image", comment: "")
                 item?.titleName = NSLocalizedString("Add Image", comment: "")
                 item?.boxImagePosition = .imageLeft
                 item?.btnAction = #selector(changeAnnotationMode)
-                
-                let menuItem = NSMenuItem.init(title: "Add Image", action: #selector(changeAnnotationMode), target: self)
-                menuItem.tag = CAnnotationType.addImage.rawValue
-                item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarToolCropItemIdentifier {
                 item?.image = NSImage(named: "KMImageNameMainToolsCrop")
                 item?.alternateImage = NSImage(named: "KMImageNameMainToolsCrop")
@@ -1033,23 +935,17 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 item?.btnAction = #selector(cropMenuAction)
                 
                 let menuItem = NSMenuItem.init(title: "Crop", action: #selector(cropMenuAction), target: self)
-                
                 item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarComparisonItemIdentifier {
                 item?.image = NSImage(named: KMImageNameUXIconBatchComparison)
-                item?.alternateImage = NSImage(named: KMImageNameUXIconBatchComparison)
                 item?.target = self
                 item?.btnTag = KMToolbarType.comparison.rawValue
                 item?.toolTip = NSLocalizedString("Compare", comment: "")
                 item?.titleName = NSLocalizedString("Compare", comment: "")
                 item?.boxImagePosition = .imageLeft
                 item?.btnAction = #selector(itemAction)
-                
-                let menuItem = NSMenuItem.init(title: "Compare", action: #selector(batesMenuAction), target: self)
-                item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarToolBatesItemIdentifier {
                 item?.image = NSImage(named: "KMImageNameUXIconBatchBatesNor")
-                item?.alternateImage = NSImage(named: "KMImageNameUXIconBatchBatesNor")
                 item?.target = self
                 item?.btnTag = KMToolbarType.bates.rawValue
                 item?.toolTip = NSLocalizedString("Add PDF Bates numbering to your legal, medical, or business documents", comment: "")
@@ -1061,7 +957,6 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarToolHeaderFooterItemIdentifier {
                 item?.image = NSImage(named: "KMImageNameUXIconBatchHeaderandfooterNor")
-                item?.alternateImage = NSImage(named: "KMImageNameUXIconBatchHeaderandfooterNor")
                 item?.target = self
                 item?.btnTag = KMToolbarType.headerAndFooter.rawValue
                 item?.toolTip = NSLocalizedString("Insert header, footer, and page numbers to PDF", comment: "")
@@ -1073,7 +968,6 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarToolBackgroundItemIdentifier {
                 item?.image = NSImage(named: "KMImageNameUXIconBatchBackgroundNor")
-                item?.alternateImage = NSImage(named: "KMImageNameUXIconBatchBackgroundNor")
                 item?.target = self
                 item?.btnTag = KMToolbarType.background.rawValue
                 item?.toolTip = NSLocalizedString("Insert PDF page background by color or image", comment: "")
@@ -1085,7 +979,6 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarToolWatermarkItemIdentifier {
                 item?.image = NSImage(named: "KMImageNameMainToolsWatermark")
-                item?.alternateImage = NSImage(named: "KMImageNameMainToolsWatermark")
                 item?.target = self
                 item?.btnTag = KMToolbarType.watermark.rawValue
                 item?.toolTip = NSLocalizedString("Watermark", comment: "")
@@ -1097,7 +990,6 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarToolTextFieldItemIdentifier {
                 item?.image = NSImage(named: "KMImageNameMainToolFormText")
-                item?.alternateImage = NSImage(named: "KMImageNameMainToolFormText")
                 item?.target = self
                 item?.btnTag = CAnnotationType.textField.rawValue
                 item?.toolTip = NSLocalizedString("TextField", comment: "")
@@ -1110,20 +1002,14 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarToolCheckBoxItemIdentifier {
                 item?.image = NSImage(named: "KMImageNameMainToolFormCheckbox")
-                item?.alternateImage = NSImage(named: "KMImageNameMainToolFormCheckbox")
                 item?.target = self
                 item?.btnTag = CAnnotationType.checkBox.rawValue
                 item?.toolTip = NSLocalizedString("CheckBox", comment: "")
                 item?.titleName = NSLocalizedString("CheckBox", comment: "")
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(changeAnnotationMode)
-                
-                let menuItem = NSMenuItem.init(title: "CheckBox", action: #selector(changeAnnotationMode), target: self)
-                menuItem.tag = item!.btnTag
-                item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarToolRadioButtonItemIdentifier {
                 item?.image = NSImage(named: "KMImageNameMainToolFormRadio")
-                item?.alternateImage = NSImage(named: "KMImageNameMainToolFormRadio")
                 item?.target = self
                 item?.btnTag = CAnnotationType.radioButton.rawValue
                 item?.toolTip = NSLocalizedString("RadioButton", comment: "")
@@ -1136,7 +1022,6 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarToolListBoxItemIdentifier {
                 item?.image = NSImage(named: "KMImageNameMainToolFormListBox")
-                item?.alternateImage = NSImage(named: "KMImageNameMainToolFormListBox")
                 item?.target = self
                 item?.btnTag = CAnnotationType.listMenu.rawValue
                 item?.toolTip = NSLocalizedString("ListBox", comment: "")
@@ -1149,7 +1034,6 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarToolPullDownmenuItemIdentifier {
                 item?.image = NSImage(named: "KMImageNameMainToolFormPulldown")
-                item?.alternateImage = NSImage(named: "KMImageNameMainToolFormPulldown")
                 item?.target = self
                 item?.btnTag = CAnnotationType.comboBox.rawValue
                 item?.toolTip = NSLocalizedString("PullDownmenu", comment: "")
@@ -1162,7 +1046,6 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarToolButtonIdentifier {
                 item?.image = NSImage(named: "KMImageNameMainToolFormButton")
-                item?.alternateImage = NSImage(named: "KMImageNameMainToolFormButton")
                 item?.target = self
                 item?.btnTag = CAnnotationType.actionButton.rawValue
                 item?.toolTip = NSLocalizedString("Button", comment: "")
@@ -1175,7 +1058,6 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarToolSignBoxIdentifier {
                 item?.image = NSImage(named: "KMImageNameMainToolFormSign")
-                item?.alternateImage = NSImage(named: "KMImageNameMainToolFormSign")
                 item?.target = self
                 item?.btnTag = CAnnotationType.signature.rawValue
                 item?.toolTip = NSLocalizedString("SignBox", comment: "")
@@ -1188,7 +1070,6 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarToolFormAlignIdentifier {
                 item?.image = NSImage(named: "KMImageNameMainToolFormAlignment")
-                item?.alternateImage = NSImage(named: "KMImageNameMainToolFormAlignment")
                 item?.target = self
                 item?.toolTip = NSLocalizedString("Alignment", comment: "")
                 item?.titleName = NSLocalizedString("Alignment", comment: "")
@@ -1200,7 +1081,6 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarToolFormMoreIdentifier {
                 item?.image = NSImage(named: "KMImageNameMainToolFormMore")
-                item?.alternateImage = NSImage(named: "KMImageNameMainToolFormMore")
                 item?.target = self
                 item?.toolTip = NSLocalizedString("More", comment: "")
                 item?.titleName = NSLocalizedString("More", comment: "")
@@ -1212,7 +1092,6 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarToolRedactItemIdentifier {
                 item?.image = NSImage(named: "KMImageNameMainToolsRedact")
-                item?.alternateImage = NSImage(named: "KMImageNameMainToolsRedact")
                 item?.target = self
                 item?.btnTag = KMToolbarType.redact.rawValue
                 item?.toolTip = NSLocalizedString("Redact", comment: "")
@@ -1224,22 +1103,15 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarToolCompressItemIdentifier {
                 item?.image = NSImage(named: "KMImageNameUXIconBatchOptimizeNor")
-                item?.alternateImage = NSImage(named: "KMImageNameUXIconBatchOptimizeNor")
                 item?.target = self
                 item?.btnTag = KMToolbarType.compress.rawValue
                 item?.boxImagePosition = .imageLeft
                 item?.toolTip = NSLocalizedString("Reduce file size", comment: "")
                 item?.titleName = NSLocalizedString("Compress", comment: "")
                 item?.btnAction = #selector(compressMenuAction)
-                
-                let menuItem = NSMenuItem.init(title: "Compress", action: #selector(compressMenuAction), target: self)
-                menuItem.tag = item!.btnTag
-                item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarToolSecureItemIdentifier {
                 item?.image = NSImage(named: "KMImageNameUXIconBatchSafeNor")
-                item?.alternateImage = NSImage(named: "KMImageNameUXIconBatchSafeNor")
                 item?.target = self
-                item?.btnTag = KMToolbarType.secure.rawValue
                 item?.toolTip = NSLocalizedString("Batch encrypting PDF documents", comment: "")
                 item?.titleName = NSLocalizedString("Security", comment: "")
                 item?.boxImagePosition = .imageExpandLeft
@@ -1250,237 +1122,145 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarToolHookItemIdentifier {
                 item?.image = NSImage(named: "KMImageNameFillSignHook")
-                item?.alternateImage = NSImage(named: "KMImageNameFillSignHook")
                 item?.target = self
                 item?.btnTag = CAnnotationType.signTure.rawValue
-                item?.toolTip = NSLocalizedString("Check", comment: "")
+                item?.toolTip = NSLocalizedString("Signature", comment: "")
                 item?.titleName = NSLocalizedString("Signature", comment: "")
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(changeAnnotationMode)
-                
-                let menuItem = NSMenuItem.init(title: "Signature", action: #selector(changeAnnotationMode), target: self)
-                menuItem.tag = item!.btnTag
-                item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarToolForkItemIdentifier {
                 item?.image = NSImage(named: "KMImageNameFillSignFork")
-                item?.alternateImage = NSImage(named: "KMImageNameFillSignFork")
                 item?.target = self
                 item?.btnTag = CAnnotationType.signFalse.rawValue
                 item?.toolTip = NSLocalizedString("X", comment: "")
                 item?.titleName = NSLocalizedString("signFalse", comment: "")
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(changeAnnotationMode)
-                
-                let menuItem = NSMenuItem.init(title: "signFalse", action: #selector(changeAnnotationMode), target: self)
-                menuItem.tag = item!.btnTag
-                item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarToolLineItemIdentifier {
                 item?.image = NSImage(named: "KMImageNameFillSignLine")
-                item?.alternateImage = NSImage(named: "KMImageNameFillSignLine")
                 item?.target = self
                 item?.btnTag = CAnnotationType.signLine.rawValue
                 item?.toolTip = NSLocalizedString("Line", comment: "")
                 item?.titleName = NSLocalizedString("Line", comment: "")
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(changeAnnotationMode)
-                
-                let menuItem = NSMenuItem.init(title: "Line", action: #selector(changeAnnotationMode), target: self)
-                menuItem.tag = item!.btnTag
-                item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarToolDotItemIdentifier {
                 item?.image = NSImage(named: "KMImageNameFillSignDot")
-                item?.alternateImage = NSImage(named: "KMImageNameFillSignDot")
                 item?.target = self
                 item?.btnTag = CAnnotationType.signDot.rawValue
                 item?.toolTip = NSLocalizedString("Dot", comment: "")
                 item?.titleName = NSLocalizedString("Dot", comment: "")
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(changeAnnotationMode)
-                
-                let menuItem = NSMenuItem.init(title: "Dot", action: #selector(changeAnnotationMode), target: self)
-                menuItem.tag = item!.btnTag
-                item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarToolRectangleIdentifier {
                 item?.image = NSImage(named: "KMImageNameFillSignRectangle")
-                item?.alternateImage = NSImage(named: "KMImageNameFillSignRectangle")
                 item?.target = self
                 item?.btnTag = CAnnotationType.signCircle.rawValue
                 item?.toolTip = NSLocalizedString("Rectangle", comment: "")
                 item?.titleName = NSLocalizedString("Rectangle", comment: "")
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(changeAnnotationMode)
-                
-                let menuItem = NSMenuItem.init(title: "Rectangle", action: #selector(changeAnnotationMode), target: self)
-                menuItem.tag = item!.btnTag
-                item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarToolTextIdentifier {
                 item?.image = NSImage(named: "KMImageNameMainToolFreeText")
-                item?.alternateImage = NSImage(named: "KMImageNameMainToolFreeText")
                 item?.target = self
                 item?.btnTag = CAnnotationType.signText.rawValue
                 item?.toolTip = NSLocalizedString("Add a handwritten signature or create a signature via the trackpad", comment: "")
                 item?.titleName = NSLocalizedString("signText", comment: "")
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(changeAnnotationMode)
-                
-                let menuItem = NSMenuItem.init(title: "signText", action: #selector(changeAnnotationMode), target: self)
-                menuItem.tag = item!.btnTag
-                item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarToolDateIdentifier {
                 item?.image = NSImage(named: "KMImageNameFillSignDate")
-                item?.alternateImage = NSImage(named: "KMImageNameFillSignDate")
                 item?.target = self
                 item?.btnTag = CAnnotationType.signDate.rawValue
                 item?.toolTip = NSLocalizedString("Date", comment: "")
                 item?.titleName = NSLocalizedString("Date", comment: "")
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(changeAnnotationMode)
-                
-                let menuItem = NSMenuItem.init(title: "Date", action: #selector(changeAnnotationMode), target: self)
-                menuItem.tag = item!.btnTag
-                item?.menuFormRepresentation = menuItem
             } else if (identifier == KMToolbarFillSignSignatureIdentifier) {
                 item?.image = NSImage(named: "KMImageNameMainToolSignSignature")
-                item?.alternateImage = NSImage(named: "KMImageNameMainToolSignSignature")
                 item?.target = self
                 item?.btnTag = CAnnotationType.signSignature.rawValue
                 item?.toolTip = NSLocalizedString("Add a handwritten signature or create a signature via the trackpad", comment: "")
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(changeAnnotationMode)
-                
-                let menuItem = NSMenuItem.init(title: "SignSignature", action: #selector(changeAnnotationMode), target: self)
-                menuItem.tag = CAnnotationType.signSignature.rawValue
-                item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarConversionWordItemIdentifier {
                 item?.image = NSImage(named: KMImageNameUXIconSubtoolbarConvertWord)
-                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarConvertWord)
                 item?.target = self
                 item?.btnTag = KMToolbarType.word.rawValue
                 item?.toolTip = NSLocalizedString("Convert all the great work stored in your PDF to a Word document that’s easy to update. Keep the fonts and layouts intact — including bullets and tables.", comment: "")
                 item?.titleName = NSLocalizedString("To Word", comment: "")
                 item?.boxImagePosition = .imageLeft
                 item?.btnAction = #selector(conversionMenuItemAction)
-                
-                let menuItem = NSMenuItem.init(title: "To Word", action: #selector(conversionMenuItemAction), target: self)
-                menuItem.tag = item!.btnTag
-                item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarConversionExcelItemIdentifier {
                 item?.image = NSImage(named: KMImageNameUXIconSubtoolbarConvertExcel)
-                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarConvertExcel)
                 item?.target = self
                 item?.btnTag = KMToolbarType.excel.rawValue
                 item?.toolTip = NSLocalizedString("Skip the data entry steps and tedious reformatting tasks, too. When you convert to Excel, your data is preserved along with your columns, layouts, and formatting.", comment: "")
                 item?.titleName = NSLocalizedString("To Excel", comment: "")
                 item?.boxImagePosition = .imageLeft
                 item?.btnAction = #selector(conversionMenuItemAction)
-                
-                let menuItem = NSMenuItem.init(title: "To Excel", action: #selector(conversionMenuItemAction), target: self)
-                menuItem.tag = item!.btnTag
-                item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarConversionPPTItemIdentifier {
                 item?.image = NSImage(named: KMImageNameUXIconSubtoolbarConvertPPT)
-                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarConvertPPT)
                 item?.target = self
                 item?.btnTag = KMToolbarType.ppt.rawValue
                 item?.toolTip = NSLocalizedString("When you use PDF Reader Pro to convert PDFs to PowerPoint, you know your formats will be saved, too. So you don’t have to bother redoing bullets, tables, objects, or master layouts.", comment: "")
                 item?.titleName = NSLocalizedString("To PPT", comment: "")
                 item?.boxImagePosition = .imageLeft
                 item?.btnAction = #selector(conversionMenuItemAction)
-                
-                let menuItem = NSMenuItem.init(title: "To PPT", action: #selector(conversionMenuItemAction), target: self)
-                menuItem.tag = item!.btnTag
-                item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarConversionRTFItemIdentifier {
                 item?.image = NSImage(named: KMImageNameUXIconSubtoolbarConvertRTF)
-                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarConvertRTF)
                 item?.target = self
                 item?.btnTag = KMToolbarType.rtf.rawValue
                 item?.toolTip = NSLocalizedString("Turn PDF documents into Rich Text Format (RTF) files that can be opened in virtually any word processor.", comment: "")
                 item?.titleName = NSLocalizedString("To RTF", comment: "")
                 item?.boxImagePosition = .imageLeft
                 item?.btnAction = #selector(conversionMenuItemAction)
-                
-                let menuItem = NSMenuItem.init(title: "To RTF", action: #selector(conversionMenuItemAction), target: self)
-                menuItem.tag = item!.btnTag
-                item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarConversionCSVItemIdentifier {
                 item?.image = NSImage(named: KMImageNameUXIconSubtoolbarConvertCSV)
-                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarConvertCSV)
                 item?.target = self
                 item?.btnTag = KMToolbarType.csv.rawValue
                 item?.toolTip = NSLocalizedString("PDF To CSV", comment: "")
                 item?.titleName = NSLocalizedString("To CSV", comment: "")
                 item?.boxImagePosition = .imageLeft
                 item?.btnAction = #selector(conversionMenuItemAction)
-                
-                let menuItem = NSMenuItem.init(title: "To CSV", action: #selector(conversionMenuItemAction), target: self)
-                menuItem.tag = item!.btnTag
-                item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarConversionHTMLItemIdentifier {
                 item?.image = NSImage(named: KMImageNameUXIconSubtoolbarConvertHtml)
-                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarConvertHtml)
                 item?.target = self
                 item?.btnTag = KMToolbarType.html.rawValue
                 item?.toolTip = NSLocalizedString("PDF To HTML", comment: "")
                 item?.titleName = NSLocalizedString("To HTML", comment: "")
                 item?.boxImagePosition = .imageLeft
                 item?.btnAction = #selector(conversionMenuItemAction)
-                
-                let menuItem = NSMenuItem.init(title: "To HTML", action: #selector(conversionMenuItemAction), target: self)
-                menuItem.tag = item!.btnTag
-                item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarConversionTextItemIdentifier {
                 item?.image = NSImage(named: KMImageNameUXIconSubtoolbarConvertText)
-                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarConvertText)
                 item?.target = self
                 item?.btnTag = KMToolbarType.conversion_text.rawValue
                 item?.toolTip = NSLocalizedString("PDF To Text", comment: "")
                 item?.titleName = NSLocalizedString("To Text", comment: "")
                 item?.boxImagePosition = .imageLeft
                 item?.btnAction = #selector(conversionMenuItemAction)
-                
-                let menuItem = NSMenuItem.init(title: "To Text", action: #selector(conversionMenuItemAction), target: self)
-                menuItem.tag = item!.btnTag
-                item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarConversionImageItemIdentifier {
                 item?.image = NSImage(named: KMImageNameUXIconSubtoolbarConvertPDFToIMG)
-                item?.alternateImage = NSImage(named: KMImageNameUXIconSubtoolbarConvertPDFToIMG)
                 item?.target = self
                 item?.btnTag = KMToolbarType.conversion_image.rawValue
                 item?.toolTip = NSLocalizedString("Convert PDF to JPEG, PNG, TIFF, BMP, GIF or TGA files", comment: "")
                 item?.titleName = NSLocalizedString("To Image", comment: "")
                 item?.boxImagePosition = .imageLeft
                 item?.btnAction = #selector(conversionMenuItemAction)
-                
-                let menuItem = NSMenuItem.init(title: "To Image", action: #selector(conversionMenuItemAction), target: self)
-                menuItem.tag = item!.btnTag
-                item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarToolMergeItemIdentifier {
                 item?.image = NSImage(named: "KMImageNameUXIconBatchMergeNor")
-                item?.alternateImage = NSImage(named: "KMImageNameUXIconBatchMergeNor")
                 item?.target = self
                 item?.btnTag = KMToolbarType.merge.rawValue
                 item?.toolTip = NSLocalizedString("Combine multiple documents into a new PDF, or borrow individual pages", comment: "")
                 item?.titleName = NSLocalizedString("Merge", comment: "")
                 item?.boxImagePosition = .imageLeft
                 item?.btnAction = #selector(mergeMenuItemAction)
-                
-                let menuItem = NSMenuItem.init(title: "Merge", action: #selector(mergeMenuItemAction), target: self)
-                menuItem.tag = item!.btnTag
-                item?.menuFormRepresentation = menuItem
             } else if identifier == KMToolbarAnnotationSettingItemIdentifier {
                 item?.image = NSImage(named: "KMImageNameUXIconBtnSetNor")
-                item?.alternateImage = NSImage(named: "KMImageNameUXIconBtnSetNor")
                 item?.target = self
-//                item?.btnTag = KMToolbarType.merge.rawValue
-//                item?.toolTip = NSLocalizedString("Combine multiple files into a new PDF.", comment: "")
                 item?.titleName = NSLocalizedString("Setting", comment: "")
                 item?.boxImagePosition = .imageOnly
                 item?.btnAction = #selector(itemAction)
-
-                let menuItem = NSMenuItem.init(title: "Setting", action: #selector(mergeMenuItemAction), target: self)
-                menuItem.tag = item!.btnTag
-                item?.menuFormRepresentation = menuItem
             }
         }
         return item!