【2025】【综合】细节问题修正

PDF Office/PDF Master/Class/PDFTools/TTS/WindowController/KMTTSWindowController.swift

@@ -216,7 +216,7 @@ class KMTTSWindowController: NSWindowController, KMTTSManagerDelegate, NSWindowD
             KMTTSManager.defalutManager.stopSpeaking()
             self.speedSlider.isEnabled = true
             self.speedStepper.isEnabled = true
-            self.playButton.image = NSImage(named: "KMImageNameTTSStop")
+            self.playButton.image = NSImage(named: "pause_fill")
             self.playButton.toolTip = NSLocalizedString("Play", comment: "")
             self.pdfView.setHighlightedSelections([])
         }
@@ -243,12 +243,12 @@ class KMTTSWindowController: NSWindowController, KMTTSManagerDelegate, NSWindowD
         KMTTSManager.defalutManager.rate = self.speedSlider.floatValue * Float(standardSpeed)
         let isSuccess = KMTTSManager.defalutManager.startSpeakingPDFPage(page)
         if isSuccess {
-            self.playButton.image = NSImage(named: "KMImageNameTTSPause")
+            self.playButton.image = NSImage(named: "play_fill")
             self.playButton.toolTip = NSLocalizedString("Pause", comment: "")
             self.speedSlider.isEnabled = false
             self.speedStepper.isEnabled = false
         } else {
-            self.playButton.image = NSImage(named: "KMImageNameTTSStop")
+            self.playButton.image = NSImage(named: "pause_fill")
             self.playButton.toolTip = NSLocalizedString("Play", comment: "")
             self.speedSlider.isEnabled = true
             self.speedStepper.isEnabled = true
@@ -273,12 +273,12 @@ class KMTTSWindowController: NSWindowController, KMTTSManagerDelegate, NSWindowD
         if isSuccess {
             self.speedSlider.isEnabled = false
             self.speedStepper.isEnabled = false
-            self.playButton.image = NSImage(named: "KMImageNameTTSPause")
+            self.playButton.image = NSImage(named: "play_fill")
             self.playButton.toolTip = NSLocalizedString("Pause", comment: "")
         } else {
             self.speedSlider.isEnabled = true
             self.speedStepper.isEnabled = true
-            self.playButton.image = NSImage(named: "KMImageNameTTSStop")
+            self.playButton.image = NSImage(named: "pause_fill")
             self.playButton.toolTip = NSLocalizedString("Play", comment: "")
         }
     }
@@ -318,14 +318,14 @@ class KMTTSWindowController: NSWindowController, KMTTSManagerDelegate, NSWindowD
     }
     @IBAction func buttonItemClick_Play(_ sender: NSButton) {
         if (KMTTSManager.defalutManager.isPaused) {
-            self.playButton.image = NSImage(named: "KMImageNameTTSPause")
+            self.playButton.image = NSImage(named: "play_fill")
             self.playButton.toolTip = KMLocalizedString("Pause")
             self.speedSlider.isEnabled = false
             self.speedStepper.isEnabled = false
             KMTTSManager.defalutManager.continueSpeaking()
         } else if (KMTTSManager.defalutManager.isSpeaking()) {
             self.isChangePage = true
-            self.playButton.image = NSImage(named: "KMImageNameTTSStop")
+            self.playButton.image = NSImage(named: "pause_fill")
             self.playButton.toolTip = KMLocalizedString("Play")
 
             self.speedSlider.isEnabled = true
@@ -394,7 +394,7 @@ class KMTTSWindowController: NSWindowController, KMTTSManagerDelegate, NSWindowD
         if self.pdfSelection != nil {
             self.pdfSelection = nil
             self.pdfView.setHighlightedSelections(nil)
-            self.playButton.image = NSImage(named: "KMImageNameTTSStop")
+            self.playButton.image = NSImage(named: "pause_fill")
             self.speedSlider.isEnabled = true
             self.speedStepper.isEnabled = true
             self.playButton.toolTip = KMLocalizedString("Play")
@@ -403,7 +403,7 @@ class KMTTSWindowController: NSWindowController, KMTTSManagerDelegate, NSWindowD
                 if !isChangePage {
                     if let pdfSelection = self.pdfSelection {
                         self.pdfView.setHighlightedSelections(nil)
-                        self.playButton.image = NSImage(named: "KMImageNameTTSStop")
+                        self.playButton.image = NSImage(named: "pause_fill")
                         self.speedSlider.isEnabled = true
                         self.speedStepper.isEnabled = true
                         self.playButton.toolTip = KMLocalizedString("Play")
@@ -417,7 +417,7 @@ class KMTTSWindowController: NSWindowController, KMTTSManagerDelegate, NSWindowD
                             isFinish = false
                         } else {
                             self.pdfView.setHighlightedSelections(nil)
-                            self.playButton.image = NSImage(named: "KMImageNameTTSStop")
+                            self.playButton.image = NSImage(named: "pause_fill")
                             self.speedSlider.isEnabled = true
                             self.speedStepper.isEnabled = true
                             self.playButton.toolTip = KMLocalizedString("Play")
@@ -429,7 +429,7 @@ class KMTTSWindowController: NSWindowController, KMTTSManagerDelegate, NSWindowD
                     self.speedSlider.isEnabled = true
                     self.speedStepper.isEnabled = true
                     self.pdfView.setHighlightedSelections(nil)
-                    self.playButton.image = NSImage(named: "KMImageNameTTSStop")
+                    self.playButton.image = NSImage(named: "pause_fill")
                     self.playButton.toolTip = KMLocalizedString("Play")
                 }
             }

PDF Office/PDF Master/Class/PDFTools/TTS/WindowController/KMTTSWindowController.xib

@@ -38,7 +38,7 @@
                 <subviews>
                     <button focusRingType="none" translatesAutoresizingMaskIntoConstraints="NO" id="e4k-fY-QVV">
                         <rect key="frame" x="77" y="127" width="20" height="20"/>
-                        <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="KMImageNameTTSForward" imagePosition="only" alignment="center" focusRingType="none" imageScaling="proportionallyUpOrDown" inset="2" id="cZo-qa-ElH">
+                        <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="previous_fill" imagePosition="only" alignment="center" focusRingType="none" imageScaling="proportionallyUpOrDown" inset="2" id="cZo-qa-ElH">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
                         </buttonCell>
@@ -52,7 +52,7 @@
                     </button>
                     <button focusRingType="none" translatesAutoresizingMaskIntoConstraints="NO" id="J22-av-VRD">
                         <rect key="frame" x="167" y="127" width="20" height="20"/>
-                        <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="KMImageNameTTSStop" imagePosition="only" alignment="center" focusRingType="none" imageScaling="proportionallyUpOrDown" inset="2" id="4wL-Pk-QMU">
+                        <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="pause_fill" imagePosition="only" alignment="center" focusRingType="none" imageScaling="proportionallyUpOrDown" inset="2" id="4wL-Pk-QMU">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
                         </buttonCell>
@@ -66,7 +66,7 @@
                     </button>
                     <button focusRingType="none" translatesAutoresizingMaskIntoConstraints="NO" id="iPi-uv-9TU">
                         <rect key="frame" x="257" y="127" width="20" height="20"/>
-                        <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="KMImageNameTTSNext" imagePosition="only" alignment="center" focusRingType="none" imageScaling="proportionallyUpOrDown" inset="2" id="gr1-LS-zDz">
+                        <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="next_fill" imagePosition="only" alignment="center" focusRingType="none" imageScaling="proportionallyUpOrDown" inset="2" id="gr1-LS-zDz">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
                         </buttonCell>
@@ -225,8 +225,8 @@
         </window>
     </objects>
     <resources>
-        <image name="KMImageNameTTSForward" width="20" height="20"/>
-        <image name="KMImageNameTTSNext" width="20" height="20"/>
-        <image name="KMImageNameTTSStop" width="20" height="20"/>
+        <image name="next_fill" width="24" height="24"/>
+        <image name="pause_fill" width="24" height="24"/>
+        <image name="previous_fill" width="24" height="24"/>
     </resources>
 </document>

PDF Office/PDF Master/KMClass/KMPDFViewController/KMMainViewController.swift

@@ -969,9 +969,17 @@ struct KMNMWCFlags {
     func updatePDFDisplaySettingView() {
         
         if viewManager.showDisplayView {
-            infoSplitViewLeftConst.constant = MIN_SIDE_PANE_WIDTH.doubleValue
+            infoSplitViewLeftConst.constant = 0
+            
+            infoContendSplitView.setPosition(MIN_SIDE_PANE_WIDTH.doubleValue, ofDividerAt: 0)
         } else {
             infoSplitViewLeftConst.constant = 44
+            
+            if viewManager.pdfSideBarType == .none {
+                toggleCloseLeftSide()
+            } else {
+                toggleOpenLeftSide(pdfSideBarType: viewManager.pdfSideBarType)
+            }
         }
         
         if viewManager.showDisplayView {
@@ -979,8 +987,10 @@ struct KMNMWCFlags {
                 displaySettingController = KMNDisplayViewController.init()
             }
             displaySettingController?.view.frame = CGRectMake(0, 0, MIN_SIDE_PANE_WIDTH.doubleValue, CGRectGetHeight(bottomContendBox.frame))
-            displaySettingController?.view.autoresizingMask = [.height, .maxXMargin]
-            bottomContendBox.addSubview(displaySettingController!.view)
+//            displaySettingController?.view.frame = infoSplitLeftView.bounds
+            displaySettingController?.view.autoresizingMask = [.height, .width]
+//            bottomContendBox.addSubview(displaySettingController!.view)
+            infoSplitLeftView.addSubview(displaySettingController!.view)
             displaySettingController?.pdfView = self.listView
             displaySettingController?.viewManager = self.viewManager
             displaySettingController?.delegate = self
@@ -1064,14 +1074,16 @@ struct KMNMWCFlags {
         
         reloadPDFPageNumberToolbar()
         
-        let readModeMessage: ComponentMessage = ComponentMessage()
-        readModeMessage.properties = ComponentMessageProperty(messageType: .normal_custom, title: KMLocalizedString("Read Mode Off"))
-        readModeMessage.frame = CGRectMake((CGRectGetWidth(self.view.frame) - readModeMessage.properties.propertyInfo.viewWidth)/2,
-                                           CGRectGetHeight(self.view.frame) - readModeMessage.properties.propertyInfo.viewHeight - 8,
-                                           readModeMessage.properties.propertyInfo.viewWidth,
-                                           readModeMessage.properties.propertyInfo.viewHeight)
-        readModeMessage.reloadData()
-        readModeMessage.show(inView: self.view, autoHideSeconde: 2)
+        DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 0.1) {
+            let readModeMessage: ComponentMessage = ComponentMessage()
+            readModeMessage.properties = ComponentMessageProperty(messageType: .normal_custom, title: KMLocalizedString("Read Mode Off"))
+            readModeMessage.frame = CGRectMake((CGRectGetWidth(self.infoSplitCenterView.frame) - readModeMessage.properties.propertyInfo.viewWidth)/2,
+                                               CGRectGetHeight(self.infoSplitCenterView.frame) - readModeMessage.properties.propertyInfo.viewHeight - 8,
+                                               readModeMessage.properties.propertyInfo.viewWidth,
+                                               readModeMessage.properties.propertyInfo.viewHeight)
+            readModeMessage.reloadData()
+            readModeMessage.show(inView: self.infoSplitCenterView, autoHideSeconde: 2)
+        }
     }
     
     //MARK: - PPT
@@ -3542,6 +3554,9 @@ extension KMMainViewController: NSSplitViewDelegate {
     func splitView(_ splitView: NSSplitView, constrainMaxCoordinate proposedMaximumPosition: CGFloat, ofSubviewAt dividerIndex: Int) -> CGFloat {
         if splitView == infoContendSplitView {
             if dividerIndex == 0 {
+                if viewManager.showDisplayView {
+                    return MIN_SIDE_PANE_WIDTH.doubleValue
+                }
                 return infoContendSplitView.bounds.width/2
             } else if (dividerIndex == 1) {
                 return proposedMaximumPosition - MIN_SIDE_PANE_WIDTH.doubleValue

PDF Office/PDF Master/KMClass/KMPDFViewController/PDFImages.xcassets/Toolbar/Fill/fill_diamond.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "fill_diamond.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PDF Office/PDF Master/KMClass/KMPDFViewController/PDFImages.xcassets/Toolbar/Fill/fill_square.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "fill_square.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PDF Office/PDF Master/KMClass/KMPDFViewController/PDFImages.xcassets/Toolbar/Fill/fill_star.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "fill_star.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PDF Office/PDF Master/KMClass/KMPDFViewController/PDFImages.xcassets/Toolbar/Fill/fill_tick.imageset/Contents.json

@@ -8,5 +8,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "localizable" : true
   }
 }

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Forms/Forms_CheckBox/FormsCheckBoxController.swift

@@ -104,9 +104,16 @@ class FormsCheckBoxController: NSViewController {
         borderColorGroup.delegate = self
         fillColorGroup.delegate = self
         
+        
+        let imageNames = ["fill_tick", "fill_fork", "fill_dot",
+                          "fill_square", "fill_diamond", "fill_star"]
+        let stringItems = ["Check", "Cross", "Circle", "Square", "Diamond", "Star"]
         var styleItems: [ComponentMenuitemProperty] = []
-        for string in ["Check", "Cross", "Circle", "Square", "Diamond", "Star"] {
-            let item = ComponentMenuitemProperty(type: .normal, text: string)
+        for i in 0...stringItems.count-1 {
+            let string = stringItems[i]
+            let imageName = imageNames[i]
+            
+            let item = ComponentMenuitemProperty(type: .normal, lefticon: NSImage(named: imageName), text: string, identifier: string)
             styleItems.append(item)
         }
         buttonStyleSelect.properties = ComponentSelectProperties(size: .s,

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Forms/Forms_List/FormsListController.swift

@@ -33,7 +33,7 @@ class FormsListController: NSViewController {
     
     @IBOutlet var itemListBGView: NSView!
     @IBOutlet var itemListLabel: NSTextField!
-    @IBOutlet var itemListTooltip: ComponentToolTip!
+    @IBOutlet var itemListTooltip: ComponentToolTipsHelp!
     
     @IBOutlet var listScrollView: NSScrollView!
     @IBOutlet var itemlistInfoView: NSView!
@@ -167,7 +167,7 @@ class FormsListController: NSViewController {
         }
         fontSizeSelect.delegate = self
         
-        
+        itemListTooltip.toolTip = KMLocalizedString("Select an item in the list to make it the default option.")
     }
     
     func reloadUI() {
@@ -234,14 +234,19 @@ class FormsListController: NSViewController {
                 choicesList.append(itemInput.properties.text)
             }
             CPDFChoiceWidgetAnnotation.update(annotations, widgetChoices: choicesList, PDFView: pdfView)
-            
-            itemInput.properties.text = ""
-            itemInput.reloadData()
-            
+             
             exportValueInput.properties.placeholder = itemInput.properties.text
             exportValueInput.reloadData()
             
             reloadData()
+            
+            let indexpath = IndexPath(item: choicesList.count - 1, section: 0)
+            var set = Set<IndexPath>()
+            set.insert(indexpath)
+            
+            listCollectionView.selectItems(at: set, scrollPosition: .bottom)
+            
+            itemInput.beginEditing()
         }
     }
     

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Forms/Forms_List/FormsListController.xib

@@ -437,7 +437,7 @@
                                                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                 </textFieldCell>
                                                             </textField>
-                                                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="Liy-Sl-Y8Z" customClass="ComponentToolTip" customModule="KMComponentLibrary">
+                                                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="Liy-Sl-Y8Z" customClass="ComponentToolTipsHelp" customModule="KMComponentLibrary">
                                                                 <rect key="frame" x="216" y="12" width="16" height="16"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="width" constant="16" id="17N-su-rOB"/>

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Forms/Forms_List/Items/KMFormListItem.swift

@@ -28,8 +28,18 @@ class KMFormListItem: NSCollectionViewItem {
     var moveUpItem: ComponentMenuitemProperty = ComponentMenuitemProperty(multipleSelect: false, itemSelected: false, isDisabled: false, lefticon: NSImage(named: "arrow_up"), text: KMLocalizedString("Move Up"), identifier: KMPDFToolbar_PageEdit_InsertBlank_Identifier)
     var moveDownItem: ComponentMenuitemProperty = ComponentMenuitemProperty(multipleSelect: false, itemSelected: false, isDisabled: false, lefticon: NSImage(named: "arrow_down"), text: KMLocalizedString("Move Down"), identifier: KMPDFToolbar_PageEdit_InsertBlank_Identifier)
     
+    private var area: NSTrackingArea?
+    private var isMouseEnter: Bool = false
+    
     weak open var delegate: KMFormListItemDelegate?
     
+    deinit {
+        if (self.area != nil) {
+            self.contendBox.removeTrackingArea(self.area!)
+            self.area = nil
+        }
+    }
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         // Do view setup here.
@@ -37,23 +47,71 @@ class KMFormListItem: NSCollectionViewItem {
         moreButton.properties = ComponentDropdownToolProperty(state: .normal, leftIcon: NSImage(named: "dropdown_basic"), identifier: "")
         moreButton.properties.menuItemArr = [deleteItem, moveUpItem, moveDownItem]
         moreButton.delegate = self
+        moreButton.isHidden = true
+        
+        isMouseEnter = false
+        
+        self.refreshUI()
         
+        self.updateTrackingArea()
     }
     
+    //MARK: - Setter
     override var isSelected: Bool {
         didSet {
-            self.reloadData()
+            self.refreshUI()
         }
     }
     
+    //MARK: - func
+    func updateTrackingArea() {
+        if (self.area != nil) {
+            self.view.removeTrackingArea(self.area!)
+            self.area = nil
+        }
+        self.area = NSTrackingArea(rect: self.contendBox.bounds, options: [.mouseEnteredAndExited, .mouseMoved, .activeAlways], owner: self)
+        self.contendBox.addTrackingArea(self.area!)
+        
+    }
+    
     func reloadData() {
+        
+    }
+    
+    func refreshUI() {
         if self.isSelected {
             contendBox.fillColor = ComponentLibrary.shared.getComponentColorFromKey("colorPrimary/bg-opacity-dark")
         } else {
-            contendBox.fillColor = ComponentLibrary.shared.getComponentColorFromKey("")
+            if self.isMouseEnter {
+                contendBox.fillColor = ComponentLibrary.shared.getComponentColorFromKey("colorFill/hov-opacity")
+            } else {
+                contendBox.fillColor = NSColor.clear
+            }
+        }
+        if self.isMouseEnter {
+            self.moreButton.isHidden = false
+        } else {
+            self.moreButton.isHidden = true
         }
     }
     
+    //MARK: - Mouse Event
+    override func mouseEntered(with event: NSEvent) {
+        super.mouseEntered(with: event)
+        
+        self.isMouseEnter = true
+        
+        refreshUI()
+        
+    }
+    
+    override func mouseExited(with event: NSEvent) {
+        super.mouseExited(with: event)
+        
+        self.isMouseEnter = false
+        
+        refreshUI()
+    }
 }
 
 extension KMFormListItem: ComponentDropdownToolDelegate {

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Forms/Forms_List/Items/KMFormListItem.xib

@@ -26,7 +26,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="274" height="59"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Uaq-PD-dc0">
+                            <imageView hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Uaq-PD-dc0">
                                 <rect key="frame" x="4" y="22" width="10" height="16"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="16" id="4Qk-Gf-jBR"/>
@@ -35,7 +35,7 @@
                                 <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="item_More" id="PzO-wz-uh3"/>
                             </imageView>
                             <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aD8-DL-daL">
-                                <rect key="frame" x="16" y="22" width="37" height="16"/>
+                                <rect key="frame" x="6" y="22" width="37" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="Csb-sa-BuP">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -52,7 +52,7 @@
                         </subviews>
                         <constraints>
                             <constraint firstItem="DLY-N3-yHO" firstAttribute="centerY" secondItem="3zW-Zn-pWK" secondAttribute="centerY" id="9T9-aG-un8"/>
-                            <constraint firstItem="aD8-DL-daL" firstAttribute="leading" secondItem="3zW-Zn-pWK" secondAttribute="leading" constant="18" id="IAd-US-K3v"/>
+                            <constraint firstItem="aD8-DL-daL" firstAttribute="leading" secondItem="3zW-Zn-pWK" secondAttribute="leading" constant="8" id="IAd-US-K3v"/>
                             <constraint firstItem="Uaq-PD-dc0" firstAttribute="centerY" secondItem="3zW-Zn-pWK" secondAttribute="centerY" id="bIh-Hn-fTk"/>
                             <constraint firstItem="aD8-DL-daL" firstAttribute="centerY" secondItem="3zW-Zn-pWK" secondAttribute="centerY" id="fBP-t2-SCI"/>
                             <constraint firstAttribute="trailing" secondItem="DLY-N3-yHO" secondAttribute="trailing" constant="4" id="l5B-eb-Q5f"/>

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Forms/Forms_Raido/FormsRadioController.swift

@@ -109,9 +109,15 @@ class FormsRadioController: NSViewController {
         borderColorGroup.delegate = self
         fillColorGroup.delegate = self
         
+        let imageNames = ["fill_tick", "fill_fork", "fill_dot",
+                          "fill_square", "fill_diamond", "fill_star"]
+        let stringItems = ["Check", "Cross", "Circle", "Square", "Diamond", "Star"]
         var styleItems: [ComponentMenuitemProperty] = []
-        for string in ["Check", "Cross", "Circle", "Square", "Diamond", "Star"] {
-            let item = ComponentMenuitemProperty(type: .normal, text: string)
+        for i in 0...stringItems.count-1 {
+            let string = stringItems[i]
+            let imageName = imageNames[i]
+            
+            let item = ComponentMenuitemProperty(type: .normal, lefticon: NSImage(named: imageName), text: string, identifier: string)
             styleItems.append(item)
         }
         buttonStyleSelect.properties = ComponentSelectProperties(size: .s,