Merge branch 'develop_PDFReaderProNew' of git.kdan.cc:Mac_PDF/PDF_Office into develop_PDFReaderProNew

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFAnnotationModel.m

@@ -262,7 +262,7 @@
             case CAnnotationTypeFreeText:
             case CAnnotationTypeSignText:
             case CAnnotationTypeSignDate:
-                color = [userDefaults PDFListViewColorForKey:CFreeTextNoteBorderColorKey] ? : NSColor.blackColor;
+                color = [userDefaults PDFListViewColorForKey:CFreeTextNoteBorderColorKey] ? : NSColor.whiteColor;
                 break;
             case CAnnotationTypeAnchored:
                 color = [userDefaults PDFListViewColorForKey:CAnchoredNoteColorKey];

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMColorPickerView.swift

@@ -437,36 +437,7 @@ class KMColorPickerView: NSControl {
     }
     
     @objc func menuItemRestoreColorAction(_ sender: NSMenuItem) {
-        switch annotationType {
-        case .markupHighlightColors:
-            setColors(KMAnnotationPropertiesColorManager.manager.markHighlightColors)
-        case .markupOtherColors:
-            setColors(KMAnnotationPropertiesColorManager.manager.markOtherColors)
-        case .lineColors:
-            setColors(KMAnnotationPropertiesColorManager.manager.lineColors)
-        case .lineFillColors:
-            setColors(KMAnnotationPropertiesColorManager.manager.fillLineColors)
-        case .inkColors:
-            setColors(KMAnnotationPropertiesColorManager.manager.inkColors)
-        case .inkFillColors:
-            setColors(KMAnnotationPropertiesColorManager.manager.inkFillColors)
-        case .freeTextColors:
-            setColors(KMAnnotationPropertiesColorManager.manager.freeTextColors)
-        case .freeTextFillColors:
-            setColors(KMAnnotationPropertiesColorManager.manager.freeFillTextColors)
-        case .anchoredNoteColors:
-            setColors(KMAnnotationPropertiesColorManager.manager.anchoredNoteColors)
-        case .fromColors:
-            setColors(KMAnnotationPropertiesColorManager.manager.fromColors)
-        case .fromFillColors:
-            setColors(KMAnnotationPropertiesColorManager.manager.fromFillColors)
-        case .selfSignColors, .editText:
-            setColors(KMAnnotationPropertiesColorManager.manager.selfSignColors)
-        case .otherColors:
-            setColors(KMAnnotationPropertiesColorManager.manager.otherColors)
-        default:
-            break
-        }
+        setColors(KMAnnotationPropertiesColorManager.manager.defaultColors(type: annotationType))
         saveColors()
     }
     

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/ViewController/FormProperties/KMAnnotationChoiceWidgetAppearanceViewController.swift

@@ -298,8 +298,8 @@ private enum KMPDFAnnotationFontWeightType: Int {
     private func updateAnnotation() {
         if annotationModel?.annotation != nil {
             for tAnnotation in annotations {
-                tAnnotation.updateAppearanceStream()
                 pdfView?.setNeedsDisplayAnnotationViewFor(tAnnotation.page)
+                tAnnotation.updateAppearanceStream()
             }
         }
     }
@@ -356,14 +356,16 @@ private enum KMPDFAnnotationFontWeightType: Int {
     }
 
     @IBAction func fillColorPickerViewAction(_ sender: Any) {
-        if annotations.count > 0 {
-            for tAnnotation in annotations {
-                tAnnotation.backgroundColor = fillColorPickerView.color
+        var color = self.fillColorPickerView.color
+        var r: CGFloat = 0.0, g: CGFloat = 0.0, b: CGFloat = 0.0, a: CGFloat = 0.0
+        if color != nil {
+            color!.usingColorSpace(.deviceRGB)?.getRed(&r, green: &g, blue: &b, alpha: &a)
+            if fabs(a - 0) < 0.001 {
+                color = .clear
             }
-        } else {
-            annotationModel?.setBackgroundColor(fillColorPickerView.color)
-            updateAnnotationMode()
         }
+        annotationModel?.setBackgroundColor(color)
+        annotationModel?.setBackgroundOpacity(a)
         updateAnnotation()
     }
     

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

@@ -3118,6 +3118,21 @@
                   endingLineNumber = "750"
                   offsetFromSymbolStart = "15184">
                </Location>
+               <Location
+                  uuid = "18B2AE70-9733-466E-83BA-36FD4726B700 - ac01a472a87b494f"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[CPDFListView(Event) menuForEvent:]"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Event.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "750"
+                  endingLineNumber = "750"
+                  offsetFromSymbolStart = "14856">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -3853,6 +3868,21 @@
                   endingLineNumber = "2161"
                   offsetFromSymbolStart = "212">
                </Location>
+               <Location
+                  uuid = "E6C993FB-0842-4F52-AE53-E75F3AD220CC - cd430d4da4ce4749"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[CPDFListView(Event) doDrawLinkDestinationAreaWithEvent:]"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Event.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "2160"
+                  endingLineNumber = "2160"
+                  offsetFromSymbolStart = "80">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -3868,7 +3898,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "2351"
             endingLineNumber = "2351"
-            landmarkName = "-doDragAddAnnotationWithEvent:"
+            landmarkName = "-doDrawRedactErasureWithEvent:"
             landmarkType = "7">
             <Locations>
                <Location
@@ -3961,6 +3991,21 @@
                   endingLineNumber = "2351"
                   offsetFromSymbolStart = "220">
                </Location>
+               <Location
+                  uuid = "31E2802F-4470-4A8B-AA9C-72955A42BC77 - 5f3e27e90d2614e2"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[CPDFListView(Event) doDrawRedactErasureWithEvent:]"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Event.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "2352"
+                  endingLineNumber = "2352"
+                  offsetFromSymbolStart = "1676">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -4069,6 +4114,21 @@
                   endingLineNumber = "2360"
                   offsetFromSymbolStart = "436">
                </Location>
+               <Location
+                  uuid = "45AC1B80-85C6-4653-8A68-F7B5D967D61C - 99ff006268ffb294"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[CPDFListView(Event) doDragAddAnnotationWithEvent:]"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Event.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "2360"
+                  endingLineNumber = "2360"
+                  offsetFromSymbolStart = "228">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -20090,7 +20150,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "3870"
             endingLineNumber = "3870"
-            landmarkName = "clickChildTool(type:index:)"
+            landmarkName = "mainToolDidClicked(_:_:_:_:_:)"
             landmarkType = "7">
             <Locations>
                <Location
@@ -26208,6 +26268,21 @@
                   endingLineNumber = "1623"
                   offsetFromSymbolStart = "2544">
                </Location>
+               <Location
+                  uuid = "1AB3D8BB-3287-493A-B9D3-B247463DFF9E - b58d3c23d97ac14a"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMGeneralAnnotationViewController.colorPickerViewAction(Any) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "1623"
+                  endingLineNumber = "1623"
+                  offsetFromSymbolStart = "180">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -26379,8 +26454,100 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "4567"
             endingLineNumber = "4567"
-            landmarkName = "KMMainViewController"
-            landmarkType = "21">
+            landmarkName = "clickChildTool(type:index:)"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "C5243CC7-A1A2-4358-86A9-63A8110B427B - 671f9f5a9fe17bb6"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "(1) suspend resume partial function for closure #1 @Sendable () async -&gt; () in PDF_Reader_Pro.KMMainViewController.clickChildTool(type: PDF_Reader_Pro.KMToolbarType, index: Swift.Int) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "4567"
+                  endingLineNumber = "4567"
+                  offsetFromSymbolStart = "51016">
+               </Location>
+               <Location
+                  uuid = "C5243CC7-A1A2-4358-86A9-63A8110B427B - d3ed4b3ef907a7b8"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "(3) suspend resume partial function for closure #1 @Sendable () async -&gt; () in PDF_Reader_Pro.KMMainViewController.clickChildTool(type: PDF_Reader_Pro.KMToolbarType, index: Swift.Int) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "4567"
+                  endingLineNumber = "4567"
+                  offsetFromSymbolStart = "404">
+               </Location>
+               <Location
+                  uuid = "C5243CC7-A1A2-4358-86A9-63A8110B427B - 4e7b27e2432ce3ba"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "(5) suspend resume partial function for closure #1 @Sendable () async -&gt; () in PDF_Reader_Pro.KMMainViewController.clickChildTool(type: PDF_Reader_Pro.KMToolbarType, index: Swift.Int) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "4567"
+                  endingLineNumber = "4567"
+                  offsetFromSymbolStart = "632">
+               </Location>
+               <Location
+                  uuid = "C5243CC7-A1A2-4358-86A9-63A8110B427B - bac91247ad752fbc"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "(7) suspend resume partial function for closure #1 @Sendable () async -&gt; () in PDF_Reader_Pro.KMMainViewController.clickChildTool(type: PDF_Reader_Pro.KMToolbarType, index: Swift.Int) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "4567"
+                  endingLineNumber = "4567"
+                  offsetFromSymbolStart = "424">
+               </Location>
+               <Location
+                  uuid = "C5243CC7-A1A2-4358-86A9-63A8110B427B - 1554ce2b089a6bbe"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "(9) suspend resume partial function for closure #1 @Sendable () async -&gt; () in PDF_Reader_Pro.KMMainViewController.clickChildTool(type: PDF_Reader_Pro.KMToolbarType, index: Swift.Int) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "4567"
+                  endingLineNumber = "4567"
+                  offsetFromSymbolStart = "460">
+               </Location>
+               <Location
+                  uuid = "C5243CC7-A1A2-4358-86A9-63A8110B427B - d8b9b1c2a33acc74"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "(11) suspend resume partial function for closure #1 @Sendable () async -&gt; () in PDF_Reader_Pro.KMMainViewController.clickChildTool(type: PDF_Reader_Pro.KMToolbarType, index: Swift.Int) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "4567"
+                  endingLineNumber = "4567"
+                  offsetFromSymbolStart = "496">
+               </Location>
+            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -27157,6 +27324,21 @@
                   endingLineNumber = "4067"
                   offsetFromSymbolStart = "152">
                </Location>
+               <Location
+                  uuid = "B835E979-59DA-4670-936B-6B56D04AC8F9 - c36ea22f869aa6f9"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[CPDFListView(Event) doDragMultipleAnnotationWithEvent:]"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Event.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "4067"
+                  endingLineNumber = "4067"
+                  offsetFromSymbolStart = "5888">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -27427,7 +27609,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "4147"
             endingLineNumber = "4147"
-            landmarkName = "-doDragTableAnnotationWithEvent:"
+            landmarkName = "-doDragAnnotationWithEvent:forAnnotation:"
             landmarkType = "7">
             <Locations>
                <Location
@@ -27460,53 +27642,20 @@
                   endingLineNumber = "4147"
                   offsetFromSymbolStart = "2448">
                </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "27531FE6-4B5A-4D44-9E85-5E38FBF0DFF2"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Event.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "3760"
-            endingLineNumber = "3760"
-            landmarkName = "-adjustFreetText:rect:"
-            landmarkType = "7">
-            <Locations>
                <Location
-                  uuid = "27531FE6-4B5A-4D44-9E85-5E38FBF0DFF2 - abb043c45ac11d24"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "-[CPDFListView(Event) doSelectAnnotationWithEvent:]"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Event.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "3760"
-                  endingLineNumber = "3760"
-                  offsetFromSymbolStart = "224">
-               </Location>
-               <Location
-                  uuid = "27531FE6-4B5A-4D44-9E85-5E38FBF0DFF2 - 771590c89ca23601"
+                  uuid = "1F78A013-8A4E-460A-B7C4-A15ABD763D92 - 2f2a134ffb54bdd2"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
-                  symbolName = "-[CPDFListView(Event) adjustFreetText:rect:]"
+                  symbolName = "-[CPDFListView(Event) doDragTableAnnotationWithEvent:]"
                   moduleName = "PDF Reader Pro"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Event.m"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "3760"
-                  endingLineNumber = "3760"
-                  offsetFromSymbolStart = "504">
+                  startingLineNumber = "4147"
+                  endingLineNumber = "4147"
+                  offsetFromSymbolStart = "2252">
                </Location>
             </Locations>
          </BreakpointContent>
@@ -27539,7 +27688,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "4590"
             endingLineNumber = "4590"
-            landmarkName = "toolbarViewController(_:itemDidClick:)"
+            landmarkName = "showBatchWindow(type:filepaths:)"
             landmarkType = "7">
             <Locations>
                <Location
@@ -27572,6 +27721,21 @@
                   endingLineNumber = "4590"
                   offsetFromSymbolStart = "424">
                </Location>
+               <Location
+                  uuid = "6C075581-DD64-44D1-BBAB-B7E9168DDC87 - 55c1c7477946969f"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMMainViewController.showBatchWindow(type: PDF_Reader_Pro.KMBatchOperationType, filepaths: Swift.Optional&lt;Swift.Array&lt;Swift.String&gt;&gt;) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "4590"
+                  endingLineNumber = "4590"
+                  offsetFromSymbolStart = "508">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -27749,6 +27913,53 @@
             endingLineNumber = "892"
             landmarkName = "-formAppearanceProperties"
             landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "6098DF1D-5D1A-489D-8FBE-86FCADF3A992 - a87cabe00399195c"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[KMAnnotationPropertiesViewController formAppearanceProperties]"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMAnnotationPropertiesViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "892"
+                  endingLineNumber = "892"
+                  offsetFromSymbolStart = "132">
+               </Location>
+               <Location
+                  uuid = "6098DF1D-5D1A-489D-8FBE-86FCADF3A992 - a87cabe00399195c"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[KMAnnotationPropertiesViewController formAppearanceProperties]"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMAnnotationPropertiesViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "892"
+                  endingLineNumber = "892"
+                  offsetFromSymbolStart = "652">
+               </Location>
+               <Location
+                  uuid = "6098DF1D-5D1A-489D-8FBE-86FCADF3A992 - a87cabe00399195c"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[KMAnnotationPropertiesViewController formAppearanceProperties]"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMAnnotationPropertiesViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "892"
+                  endingLineNumber = "892"
+                  offsetFromSymbolStart = "656">
+               </Location>
+            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -27881,32 +28092,287 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "A8DA01B7-FEED-4B83-A542-595A5C831D7B"
+            uuid = "3E89A017-C374-4865-8676-ED515BBF8AD4"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "PDF Master/Class/Common/OC/Property/KMInfoWindowController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "163"
-            endingLineNumber = "163"
-            landmarkName = "updateForDocument(_:)"
+            startingLineNumber = "409"
+            endingLineNumber = "409"
+            landmarkName = "tableView(_:viewFor:row:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "3E89A017-C374-4865-8676-ED515BBF8AD4"
+            uuid = "50538BB6-A7C7-4F48-9969-B005766C4429"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/Common/OC/Property/KMInfoWindowController.swift"
+            filePath = "PDF Master/Class/PDFTools/KMBookmark/View/OutlineView/KMBookmarkOutlineView.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "409"
-            endingLineNumber = "409"
-            landmarkName = "tableView(_:viewFor:row:)"
+            startingLineNumber = "87"
+            endingLineNumber = "87"
+            landmarkName = "outlineView(_:viewFor:item:)"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "50538BB6-A7C7-4F48-9969-B005766C4429 - 3133df900d874f4f"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMBookmarkOutlineView.outlineView(_: __C.NSOutlineView, viewFor: Swift.Optional&lt;__C.NSTableColumn&gt;, item: Any) -&gt; Swift.Optional&lt;__C.NSView&gt;"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFTools/KMBookmark/View/OutlineView/KMBookmarkOutlineView.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "83"
+                  endingLineNumber = "83"
+                  offsetFromSymbolStart = "652">
+               </Location>
+               <Location
+                  uuid = "50538BB6-A7C7-4F48-9969-B005766C4429 - 3133df900d874f2e"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMBookmarkOutlineView.outlineView(_: __C.NSOutlineView, viewFor: Swift.Optional&lt;__C.NSTableColumn&gt;, item: Any) -&gt; Swift.Optional&lt;__C.NSView&gt;"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFTools/KMBookmark/View/OutlineView/KMBookmarkOutlineView.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "82"
+                  endingLineNumber = "82"
+                  offsetFromSymbolStart = "424">
+               </Location>
+               <Location
+                  uuid = "50538BB6-A7C7-4F48-9969-B005766C4429 - 3133df900d8770c3"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMBookmarkOutlineView.outlineView(_: __C.NSOutlineView, viewFor: Swift.Optional&lt;__C.NSTableColumn&gt;, item: Any) -&gt; Swift.Optional&lt;__C.NSView&gt;"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFTools/KMBookmark/View/OutlineView/KMBookmarkOutlineView.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "87"
+                  endingLineNumber = "87"
+                  offsetFromSymbolStart = "424">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "7CE0872C-C778-415C-B086-79862F846E58"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFTools/KMBookmark/Old/Controller/SKBookmarkSheetController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "65"
+            endingLineNumber = "65"
+            landmarkName = "-beginSheetModalForWindow:completionHandler:"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "7CE0872C-C778-415C-B086-79862F846E58 - 2854d40094adc56d"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[SKBookmarkSheetController addMenuItemsForBookmarks:level:toMenu:]"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFTools/KMBookmark/Old/Controller/SKBookmarkSheetController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "65"
+                  endingLineNumber = "65"
+                  offsetFromSymbolStart = "624">
+               </Location>
+               <Location
+                  uuid = "7CE0872C-C778-415C-B086-79862F846E58 - 15dbc43b41516f66"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[SKBookmarkSheetController beginSheetModalForWindow:completionHandler:]"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFTools/KMBookmark/Old/Controller/SKBookmarkSheetController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "65"
+                  endingLineNumber = "65"
+                  offsetFromSymbolStart = "100">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "BB3F229D-4C05-4C55-9132-84D13D8B4E9E"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFTools/KMBookmark/Old/Controller/SKBookmarkSheetController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "52"
+            endingLineNumber = "52"
+            landmarkName = "-addMenuItemsForBookmarks:level:toMenu:"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "BB3F229D-4C05-4C55-9132-84D13D8B4E9E - 9d681f9fdad352b4"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[SKBookmarkSheetController windowDidLoad]"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFTools/KMBookmark/Old/Controller/SKBookmarkSheetController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "52"
+                  endingLineNumber = "52"
+                  offsetFromSymbolStart = "184">
+               </Location>
+               <Location
+                  uuid = "BB3F229D-4C05-4C55-9132-84D13D8B4E9E - 2854d40094adc2c2"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[SKBookmarkSheetController addMenuItemsForBookmarks:level:toMenu:]"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFTools/KMBookmark/Old/Controller/SKBookmarkSheetController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "52"
+                  endingLineNumber = "52"
+                  offsetFromSymbolStart = "340">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "3C0E030B-51BD-41A4-8C06-E8B274CAB778"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/PDFListView/CPDFListView.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "643"
+            endingLineNumber = "643"
+            landmarkName = "-addAnnotationWithType:selection:page:bounds:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "EBC400E5-80F5-4D79-882B-3EF72E132D8E"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/PDFListView/CPDFListView.m"
+            startingColumnNumber = "17"
+            endingColumnNumber = "75"
+            startingLineNumber = "737"
+            endingLineNumber = "737"
+            landmarkName = "-addAnnotationWithType:selection:page:bounds:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "36277EAF-D670-46F5-BB2B-D7CB32ABDBD8"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/SelfSign/CSelfSignAnnotation.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "77"
+            endingLineNumber = "77"
+            landmarkName = "-updateAppearanceStream"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "663BAB5D-3E33-4A75-AF4A-E578BC438D4D"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMColorPickerViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "484"
+            endingLineNumber = "484"
+            landmarkName = "-menuItemRestoreColorAction:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "FE82C7E2-5613-4861-B689-B50EACBF3CDF"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/NSObject/KMAnnotationPropertiesColorManager.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "51"
+            endingLineNumber = "51"
+            landmarkName = "lineColors"
+            landmarkType = "24">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "1C1B7F22-A697-43DD-82C7-360E8E72FD75"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/NSObject/KMAnnotationPropertiesColorManager.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "54"
+            endingLineNumber = "54"
+            landmarkName = "lineColors"
+            landmarkType = "24">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "494B7D86-DBC6-4A61-A223-76B0277398A8"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFAnnotationModel.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "251"
+            endingLineNumber = "251"
+            landmarkName = "-color"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>