【2025】【Markup】图章&签名列表处理

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

@@ -611,8 +611,6 @@ struct KMNMWCFlags {
     func initToolbar() {
         toolbarBox.borderWidth = 0
         
-        viewManager.toolMode = .Markup
-        
         if pdfToolbarController == nil {
             pdfToolbarController = KMPDFToolbarController.init()
         }
@@ -627,10 +625,14 @@ struct KMNMWCFlags {
         pdfToolbarController?.setUpData()
         
         refreshToolbarViewHeightInfo()
+        
+        DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 0.15) {
+            self.pdfToolbarController?.clickWithIdentify(KMPDFToolbar_Markup_Identifier)
+        }
+        
     }
     
     func refreshToolbarViewHeightInfo() {
-        
         let _manager = viewManager
         
         if _manager.isPageEditMode {

PDF Office/PDF Master/KMClass/KMPDFViewController/PDFImages.xcassets/Toolbar/Tools/stampDynamic_Setting.imageset/Contents.json

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

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/KMRightSideController.swift

@@ -98,17 +98,12 @@ class KMRightSideController: NSViewController {
     }
     
     func setEmptyView(isHidden hidden: Bool) {
-        //        if hidden {
+      
         infoContendView.isHidden = false
         headerBGView.isHidden = false
         
         emptyView.isHidden = true
-        //        } else {
-        //            headerBGView.isHidden = true
-        //            infoContendView.isHidden = true
-        //
-        //            emptyView.isHidden = false
-        //        }
+       
     }
     
     func updateTitleLabel() {
@@ -354,6 +349,7 @@ class KMRightSideController: NSViewController {
             } else if subToolMode == .Stamp {
                 if stamplist_Controller == nil {
                     stamplist_Controller = KMStampListController.init()
+                    stamplist_Controller?.delegate = self
                 }
                 stamplist_Controller?.pdfView = self.pdfView
                 
@@ -385,9 +381,7 @@ class KMRightSideController: NSViewController {
             }
             
         }
-        
-        
-        
+         
         if let contendVC = contentViewController {
             contendVC.view.frame = infoContendView.bounds
             contendVC.view.autoresizingMask = [.width, .height]
@@ -419,6 +413,28 @@ class KMRightSideController: NSViewController {
         
     }
     
+    func reloadTopRightButtonInfo() {
+        headerRightButton.isHidden = true
+        
+        if contentViewController is KMStampListController {
+            let stampListVC = contentViewController as! KMStampListController
+            if stampListVC.stampType == .dynamic {
+                headerRightButton.isHidden = false
+                headerRightButton.properties = ComponentButtonProperty(type: .text_gray, size: .xxs, onlyIcon: true, icon: NSImage(named: "stampDynamic_Setting"), keepPressState: false)
+
+            } else if stampListVC.stampType == .custom {
+                headerRightButton.isHidden = false
+                headerRightButton.properties = ComponentButtonProperty(type: .text_gray, size: .xxs, onlyIcon: true, icon: NSImage(named: "watermark_template_add"), keepPressState: false)
+
+            }
+        } else if contentViewController is KMSignatureListController {
+            headerRightButton.isHidden = false
+            headerRightButton.properties = ComponentButtonProperty(type: .text_gray, size: .xxs, onlyIcon: true, icon: NSImage(named: "watermark_template_add"), keepPressState: false)
+        }
+        headerRightButton.setTarget(self, action: #selector(headerRightButtonClicked(_:)))
+
+    }
+    
     func reloadData() {
         let toolMode = viewManager?.toolMode ?? .None
         
@@ -502,6 +518,8 @@ class KMRightSideController: NSViewController {
         }
         
         reloadContendTopConst()
+        
+        reloadTopRightButtonInfo()
     }
     
     public func reloadDataWithPDFView(pdfView: CPDFListView) {
@@ -512,6 +530,22 @@ class KMRightSideController: NSViewController {
         reloadData()
         
     }
+
+    //MARK: - Action
+    @objc func headerRightButtonClicked(_ button: ComponentButton) {
+        if contentViewController is KMStampListController {
+            let stampListVC = contentViewController as! KMStampListController
+            if stampListVC.stampType == .dynamic {
+                stampListVC.showDynamicSetting()
+            } else if stampListVC.stampType == .custom {
+                stampListVC.createCustomStamp()
+            }
+        } else if contentViewController is KMSignatureListController {
+            let vc = contentViewController as! KMSignatureListController
+            vc.createCustomStamp()
+            
+        }
+    }
     
     //MARK: - 重新刷新编辑中内容
     public func reloadEditingAreas() {
@@ -531,3 +565,10 @@ class KMRightSideController: NSViewController {
     }
     
 }
+
+
+extension KMRightSideController: KMStampListControllerDelegate {
+    func kmStampListControllerDidStampTypeUpdated(_ controller: KMStampListController) {
+        reloadTopRightButtonInfo()
+    }
+}

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Signature/KMSignatureListController.swift

@@ -13,9 +13,9 @@ class KMSignatureListController: NSViewController {
     @IBOutlet var scrollView: NSScrollView!
     @IBOutlet var collectionView: NSCollectionView!
    
-    var createSignWC: KMCreateSignWindowController = KMCreateSignWindowController(windowNibName: "KMCreateSignWindowController")
+    private var createSignWC: KMCreateSignWindowController = KMCreateSignWindowController(windowNibName: "KMCreateSignWindowController")
     
-    var allObjects: [KMSignature] = []
+    private var allObjects: [KMSignature] = []
     
     var pdfView: CPDFListView?
     var selectedObject: KMSignature?
@@ -79,11 +79,7 @@ class KMSignatureListController: NSViewController {
         }
     }
     
-    //MARK: - Action
-    @IBAction func testClick(_ sender: Any) {
- 
-        self.createCustomStamp()
-    }
+    //MARK: - Action 
      
     func createCustomStamp() {
         createSignWC.own_beginSheetModal(for: view.window) { string in

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Signature/KMSignatureListController.xib

@@ -58,21 +58,9 @@
                                 <constraint firstItem="0Ot-qZ-lNC" firstAttribute="leading" secondItem="RgJ-CA-Q5a" secondAttribute="leading" id="yvt-QY-NX8"/>
                             </constraints>
                         </customView>
-                        <button translatesAutoresizingMaskIntoConstraints="NO" id="OzG-Oj-qnw">
-                            <rect key="frame" x="0.0" y="440" width="45" height="16"/>
-                            <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="3Fn-Vl-jBT">
-                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                <font key="font" metaFont="system"/>
-                            </buttonCell>
-                            <connections>
-                                <action selector="testClick:" target="-2" id="knY-Ds-egJ"/>
-                            </connections>
-                        </button>
                     </subviews>
                     <constraints>
                         <constraint firstItem="RgJ-CA-Q5a" firstAttribute="leading" secondItem="sjQ-Qg-9Ta" secondAttribute="leading" id="CdR-Ot-AGb"/>
-                        <constraint firstItem="OzG-Oj-qnw" firstAttribute="top" secondItem="sjQ-Qg-9Ta" secondAttribute="top" constant="10" id="GiF-uM-Yus"/>
-                        <constraint firstItem="OzG-Oj-qnw" firstAttribute="leading" secondItem="sjQ-Qg-9Ta" secondAttribute="leading" id="IDJ-kc-1W6"/>
                         <constraint firstAttribute="trailing" secondItem="RgJ-CA-Q5a" secondAttribute="trailing" id="QTI-Px-1SU"/>
                         <constraint firstAttribute="bottom" secondItem="RgJ-CA-Q5a" secondAttribute="bottom" id="SXp-jT-028"/>
                         <constraint firstItem="RgJ-CA-Q5a" firstAttribute="top" secondItem="sjQ-Qg-9Ta" secondAttribute="top" id="ykA-01-Qfx"/>

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/StampList/KMStampListController.swift

@@ -8,6 +8,13 @@
 import Cocoa
 import KMComponentLibrary
 
+@objc protocol KMStampListControllerDelegate: AnyObject {
+    
+    @objc optional func kmStampListControllerDidStampTypeUpdated(_ controller: KMStampListController)
+    
+}
+
+
 class KMStampListController: NSViewController {
     
     @IBOutlet var typeTabs: ComponentTabs!
@@ -17,15 +24,20 @@ class KMStampListController: NSViewController {
     private var standardTabProperty: ComponentTabsProperty = ComponentTabsProperty(tabsType: .underline_Fill, state: .normal, showIcon: false, title: KMLocalizedString("Standard"))
     private var dynamicTabProperty: ComponentTabsProperty = ComponentTabsProperty(tabsType: .underline_Fill, state: .normal, showIcon: false, title: KMLocalizedString("Dynamic"))
     private var customTabProperty: ComponentTabsProperty = ComponentTabsProperty(tabsType: .underline_Fill, state: .normal, showIcon: false, title: KMLocalizedString("Custom"))
+     
+    private var stampObjects: [CStampObject] = []
+    
+    private var stampSettingWC: KMStampSettingWindowController = KMStampSettingWindowController.init(windowNibName: "KMStampSettingWindowController")
+    private var createStampWC: KMCreateStampWindowController = KMCreateStampWindowController(windowNibName: "KMCreateStampWindowController")
+    
+    weak open var delegate: KMStampListControllerDelegate?
     
     var stampType: KMStampList_Type = .standard
-    var stampObjects: [CStampObject] = []
     
     var pdfView: CPDFListView?
+    
     var selectedStamp: CStampObject?
     
-    var stampSettingWC: KMStampSettingWindowController = KMStampSettingWindowController.init(windowNibName: "KMStampSettingWindowController")
-    var createStampWC: KMCreateStampWindowController = KMCreateStampWindowController(windowNibName: "KMCreateStampWindowController")
     
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -131,20 +143,14 @@ class KMStampListController: NSViewController {
     }
     
     //MARK: - Action
-    @IBAction func testClick(_ sender: Any) {
-//        self.showDynamicSetting()
-        
-        self.createCustomStamp()
-    }
-    
-    func showDynamicSetting() {
+    public func showDynamicSetting() {
         stampSettingWC.own_beginSheetModal(for: self.view.window) { string in
             
         }
         
     }
     
-    func createCustomStamp() {
+    public func createCustomStamp() {
         createStampWC.own_beginSheetModal(for: self.view.window) { string in
             
         }
@@ -165,6 +171,8 @@ extension KMStampListController: ComponentTabsDelegate {
                 stampType = .custom
             }
             reloadData()
+            
+            delegate?.kmStampListControllerDidStampTypeUpdated?(self)
         }
     }
 }
@@ -180,13 +188,6 @@ extension KMStampListController: KMStampSettingWindowControllerDelegate {
 //MARK: - NSCollectionViewDelegate, NSCollectionViewDataSource
 extension KMStampListController: NSCollectionViewDelegate, NSCollectionViewDataSource, NSCollectionViewDelegateFlowLayout {
     public func collectionView(_ collectionView: NSCollectionView, numberOfItemsInSection section: Int) -> Int {
-        //        if stampType == .standard {
-        //            return standardStamps?.count ?? 0
-        //        } else if stampType == .dynamic {
-        //            return dynamicStamps?.count ?? 0
-        //        } else if stampType == .custom {
-        //            return customStamps?.count ?? 0
-        //        }
         return stampObjects.count
     }
     

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/StampList/KMStampListController.xib

@@ -23,16 +23,6 @@
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="6ZJ-3s-joE">
                     <rect key="frame" x="0.0" y="0.0" width="343" height="442"/>
                     <subviews>
-                        <button misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="OMN-oR-4Pm">
-                            <rect key="frame" x="0.0" y="394" width="32" height="38"/>
-                            <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="yB6-i8-AKd">
-                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                <font key="font" metaFont="system"/>
-                            </buttonCell>
-                            <connections>
-                                <action selector="testClick:" target="-2" id="fIY-h7-R6W"/>
-                            </connections>
-                        </button>
                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="6zf-53-4LV">
                             <rect key="frame" x="40" y="386" width="264" height="56"/>
                             <subviews>
@@ -91,10 +81,8 @@
                     <constraints>
                         <constraint firstItem="riV-Sk-dpT" firstAttribute="top" secondItem="6zf-53-4LV" secondAttribute="bottom" id="7Va-Y2-Sau"/>
                         <constraint firstAttribute="bottom" secondItem="riV-Sk-dpT" secondAttribute="bottom" id="Prt-TU-Vhs"/>
-                        <constraint firstItem="OMN-oR-4Pm" firstAttribute="leading" secondItem="6ZJ-3s-joE" secondAttribute="leading" id="QOG-89-MR1"/>
                         <constraint firstItem="6zf-53-4LV" firstAttribute="centerX" secondItem="6ZJ-3s-joE" secondAttribute="centerX" id="Uzq-gJ-xgQ"/>
                         <constraint firstAttribute="trailing" secondItem="riV-Sk-dpT" secondAttribute="trailing" id="XXz-QG-Jqe"/>
-                        <constraint firstItem="OMN-oR-4Pm" firstAttribute="top" secondItem="6ZJ-3s-joE" secondAttribute="top" constant="10" id="Zjs-f0-AHN"/>
                         <constraint firstItem="riV-Sk-dpT" firstAttribute="leading" secondItem="6ZJ-3s-joE" secondAttribute="leading" id="aRg-AE-Lde"/>
                         <constraint firstItem="6zf-53-4LV" firstAttribute="top" secondItem="6ZJ-3s-joE" secondAttribute="top" id="lhb-Fd-pch"/>
                     </constraints>

PDF Office/PDF Master/KMClass/KMPDFViewController/Toolbar/KMPDFToolbarController.swift

@@ -507,8 +507,8 @@ class KMPDFToolbarController: NSViewController {
     }
     
     //MARK: - Action点击
-    func clickWithIdentify(_ identify: String) {
-        guard let _ = self.toolbarManager, let viewManager = self.viewManager else {
+    public func clickWithIdentify(_ identify: String) {
+        guard let toolbarManager = self.toolbarManager, let viewManager = self.viewManager else {
             return
         }
         
@@ -522,6 +522,10 @@ class KMPDFToolbarController: NSViewController {
             delegate?.kmPDFToolbarControllerDidToolbarItemClicked?(self, pageButton.properties.identifier)
             
             reloadData()
+            
+        } else if identify == KMPDFToolbar_Markup_Identifier {
+            componentTabsDidSelected(tabsView, toolbarManager.markupMode_Property)
+            
         }
     }
     

PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -2928,13 +2928,13 @@
             filePath = "PDF Master/KMClass/KMPDFViewController/KMMainViewController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2654"
-            endingLineNumber = "2654"
+            startingLineNumber = "2656"
+            endingLineNumber = "2656"
             landmarkName = "kmEditToolbarViewDidChooseApply(_:)"
             landmarkType = "7">
             <Locations>
                <Location
-                  uuid = "18021D19-EAF7-4279-A121-953E8941B3AE - ce3d9fcaeb6c9d9a"
+                  uuid = "18021D19-EAF7-4279-A121-953E8941B3AE - ce3d9fcaeb6c9d07"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -2944,12 +2944,12 @@
                   urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/KMMainViewController.swift"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "2654"
-                  endingLineNumber = "2654"
-                  offsetFromSymbolStart = "1556">
+                  startingLineNumber = "2657"
+                  endingLineNumber = "2657"
+                  offsetFromSymbolStart = "2708">
                </Location>
                <Location
-                  uuid = "18021D19-EAF7-4279-A121-953E8941B3AE - ce3d9fcaeb6c9d9a"
+                  uuid = "18021D19-EAF7-4279-A121-953E8941B3AE - ce3d9fcaeb6c9d24"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -2959,9 +2959,9 @@
                   urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/KMMainViewController.swift"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "2654"
-                  endingLineNumber = "2654"
-                  offsetFromSymbolStart = "1316">
+                  startingLineNumber = "2656"
+                  endingLineNumber = "2656"
+                  offsetFromSymbolStart = "2848">
                </Location>
             </Locations>
          </BreakpointContent>
@@ -3008,13 +3008,13 @@
             filePath = "PDF Master/KMClass/KMPDFViewController/KMMainViewController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "4106"
-            endingLineNumber = "4106"
+            startingLineNumber = "4108"
+            endingLineNumber = "4108"
             landmarkName = "awakeFromNibFunction()"
             landmarkType = "7">
             <Locations>
                <Location
-                  uuid = "92759DD6-8CD9-4B54-BF74-D83EF6A6D5A5 - 8f899cce43942cbd"
+                  uuid = "92759DD6-8CD9-4B54-BF74-D83EF6A6D5A5 - 8f899cce43942cfb"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -3024,12 +3024,12 @@
                   urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/KMMainViewController.swift"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "4106"
-                  endingLineNumber = "4106"
+                  startingLineNumber = "4108"
+                  endingLineNumber = "4108"
                   offsetFromSymbolStart = "752">
                </Location>
                <Location
-                  uuid = "92759DD6-8CD9-4B54-BF74-D83EF6A6D5A5 - 8f899cce43942cbd"
+                  uuid = "92759DD6-8CD9-4B54-BF74-D83EF6A6D5A5 - 8f899cce43942cfb"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -3039,24 +3039,9 @@
                   urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/KMMainViewController.swift"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "4106"
-                  endingLineNumber = "4106"
-                  offsetFromSymbolStart = "720">
-               </Location>
-               <Location
-                  uuid = "92759DD6-8CD9-4B54-BF74-D83EF6A6D5A5 - 8f899cce43942cda"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMMainViewController.awakeFromNibFunction() -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/KMMainViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "4107"
-                  endingLineNumber = "4107"
-                  offsetFromSymbolStart = "652">
+                  startingLineNumber = "4108"
+                  endingLineNumber = "4108"
+                  offsetFromSymbolStart = "808">
                </Location>
             </Locations>
          </BreakpointContent>
@@ -3071,13 +3056,13 @@
             filePath = "PDF Master/KMClass/KMPDFViewController/KMMainViewController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "4438"
-            endingLineNumber = "4438"
+            startingLineNumber = "4440"
+            endingLineNumber = "4440"
             landmarkName = "enterRedact()"
             landmarkType = "7">
             <Locations>
                <Location
-                  uuid = "4E0E8246-D746-4D5F-A4A2-89C78AEA0880 - 1c7307af3eb0a97d"
+                  uuid = "4E0E8246-D746-4D5F-A4A2-89C78AEA0880 - 1c7307af3eb0a93f"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -3087,8 +3072,8 @@
                   urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/KMMainViewController.swift"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "4439"
-                  endingLineNumber = "4439"
+                  startingLineNumber = "4441"
+                  endingLineNumber = "4441"
                   offsetFromSymbolStart = "4420">
                </Location>
                <Location
@@ -3104,22 +3089,7 @@
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "4440"
                   endingLineNumber = "4440"
-                  offsetFromSymbolStart = "4420">
-               </Location>
-               <Location
-                  uuid = "4E0E8246-D746-4D5F-A4A2-89C78AEA0880 - 1c7307af3eb0a992"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMMainViewController.enterRedact() -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/KMMainViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "4438"
-                  endingLineNumber = "4438"
-                  offsetFromSymbolStart = "3852">
+                  offsetFromSymbolStart = "4460">
                </Location>
             </Locations>
          </BreakpointContent>
@@ -4512,6 +4482,21 @@
                   endingLineNumber = "1136"
                   offsetFromSymbolStart = "144">
                </Location>
+               <Location
+                  uuid = "E82D6160-482C-43EB-9E78-7C3112283FF8 - a25566082504296"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMNPopOperationWindowController.componentCColorDidChooseColor(__C.NSView, Swift.Optional&lt;__C.NSColor&gt;) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/PDFListView/WindowController/KMNPopOperationWindowController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "1135"
+                  endingLineNumber = "1135"
+                  offsetFromSymbolStart = "3144">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -4557,10 +4542,42 @@
             filePath = "PDF Master/KMClass/KMPDFViewController/Toolbar/KMPDFToolbarController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1124"
-            endingLineNumber = "1124"
+            startingLineNumber = "1128"
+            endingLineNumber = "1128"
             landmarkName = "componentGroupDidSelect(group:menuItemProperty:)"
             landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "343E7BFB-E0E6-4622-82D3-22CE9BA091CD - 1f09890bef13355f"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMPDFToolbarController.componentGroupDidSelect(group: Swift.Optional&lt;KMComponentLibrary.ComponentGroup&gt;, menuItemProperty: Swift.Optional&lt;KMComponentLibrary.ComponentMenuitemProperty&gt;) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/Toolbar/KMPDFToolbarController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "1127"
+                  endingLineNumber = "1127"
+                  offsetFromSymbolStart = "3164">
+               </Location>
+               <Location
+                  uuid = "343E7BFB-E0E6-4622-82D3-22CE9BA091CD - 1f09890bef1335bc"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMPDFToolbarController.componentGroupDidSelect(group: Swift.Optional&lt;KMComponentLibrary.ComponentGroup&gt;, menuItemProperty: Swift.Optional&lt;KMComponentLibrary.ComponentMenuitemProperty&gt;) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/Toolbar/KMPDFToolbarController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "1128"
+                  endingLineNumber = "1128"
+                  offsetFromSymbolStart = "3040">
+               </Location>
+            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy