فهرست منبع

【EditPDF】悬浮窗口适配暗黑

tangchao 8 ماه پیش
والد
کامیت
ae8f98a801
18فایلهای تغییر یافته به همراه253 افزوده شده و 103 حذف شده
  1. 38 0
      PDF Office/PDF Master/Class/Appearance/Color.xcassets/KMSeparatorLineColor.colorset/Contents.json
  2. 7 7
      PDF Office/PDF Master/Class/Appearance/Color.xcassets/UXNewColor/KM_757780_Color.colorset/Contents.json
  3. 9 0
      PDF Office/PDF Master/Class/Appearance/KMAppearance.swift
  4. 45 6
      PDF Office/PDF Master/Class/PDFTools/EditPDF/Controller/KMEditPDFPopToolBarController.swift
  5. 2 2
      PDF Office/PDF Master/Class/PDFTools/EditPDF/View/KMEditPDFColorView.swift
  6. 1 3
      PDF Office/PDF Master/Class/PDFTools/EditPDF/Window/KMEditPDFPopToolBarWindow.swift
  7. 2 0
      PDF Office/PDF Master/Strings/de.lproj/Localizable.strings
  8. 2 0
      PDF Office/PDF Master/Strings/en.lproj/Localizable.strings
  9. 2 0
      PDF Office/PDF Master/Strings/es.lproj/Localizable.strings
  10. 2 0
      PDF Office/PDF Master/Strings/fr.lproj/Localizable.strings
  11. 2 0
      PDF Office/PDF Master/Strings/it.lproj/Localizable.strings
  12. 2 0
      PDF Office/PDF Master/Strings/ja.lproj/Localizable.strings
  13. 2 0
      PDF Office/PDF Master/Strings/nl.lproj/Localizable.strings
  14. 2 0
      PDF Office/PDF Master/Strings/pl.lproj/Localizable.strings
  15. 2 0
      PDF Office/PDF Master/Strings/ru.lproj/Localizable.strings
  16. 2 0
      PDF Office/PDF Master/Strings/zh-Hans.lproj/Localizable.strings
  17. 2 0
      PDF Office/PDF Master/Strings/zh-Hant.lproj/Localizable.strings
  18. 129 85
      PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

+ 38 - 0
PDF Office/PDF Master/Class/Appearance/Color.xcassets/KMSeparatorLineColor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xDE",
+          "green" : "0xDB",
+          "red" : "0xDA"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x80",
+          "green" : "0x77",
+          "red" : "0x75"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

+ 7 - 7
PDF Office/PDF Master/Class/Appearance/Color.xcassets/UXNewColor/KM_757780_Color.colorset/Contents.json

@@ -2,12 +2,12 @@
   "colors" : [
     {
       "color" : {
-        "color-space" : "srgb",
+        "color-space" : "extended-srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "128",
-          "green" : "119",
-          "red" : "117"
+          "blue" : "0x80",
+          "green" : "0x76",
+          "red" : "0x75"
         }
       },
       "idiom" : "universal"
@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.800",
-          "green" : "0.788",
-          "red" : "0.784"
+          "blue" : "0xCC",
+          "green" : "0xC8",
+          "red" : "0xC7"
         }
       },
       "idiom" : "universal"

+ 9 - 0
PDF Office/PDF Master/Class/Appearance/KMAppearance.swift

@@ -688,6 +688,15 @@ let KMImageNameElsei = "KMImageNameElsei";
         return NSColor.km_init(hex: "#DADBDE", alpha: 1)
     }
     
+    class func separatorLineColor() -> NSColor {
+        if (!self.isSupportNewColor()) {
+            return NSColor.km_init(hex: "#DADBDE", alpha: 1)
+        }
+        if let _color = NSColor(named: "KMSeparatorLineColor") {
+            return _color
+        }
+        return NSColor.km_init(hex: "#DADBDE", alpha: 1)
+    }
     
     // MARK: - New UX Color
     

+ 45 - 6
PDF Office/PDF Master/Class/PDFTools/EditPDF/Controller/KMEditPDFPopToolBarController.swift

@@ -91,8 +91,7 @@ class KMEditPDFPopToolBarController: NSViewController {
         super.viewDidLoad()
         // Do view setup here.
         
-        self.view.wantsLayer = true
-        self.view.layer?.backgroundColor = .white
+        self.interfaceThemeDidChanged(NSApp.appearance?.name ?? .aqua)
 
         let toolbarView = KMEditPDFToolbarView()
         self.toolbarView = toolbarView
@@ -142,6 +141,21 @@ class KMEditPDFPopToolBarController: NSViewController {
         colorView?.colorBtn.layer?.backgroundColor = color.cgColor
         self.itemClick?(.color, color)
     }
+    
+    override func interfaceThemeDidChanged(_ appearance: NSAppearance.Name) {
+        super.interfaceThemeDidChanged(appearance)
+        
+        self.view.wantsLayer = true
+        if appearance == .darkAqua {
+            self.view.layer?.backgroundColor = NSColor(red: 37/255.0, green: 37/255.0, blue: 38/255.0, alpha: 1.0).cgColor
+        } else {
+            self.view.layer?.backgroundColor = .white
+        }
+        
+        Task { @MainActor in
+            self.toolbarView?.reloadData()
+        }
+    }
 }
 
 extension KMEditPDFPopToolBarController: KMEditPDFToolbarViewDelegate {
@@ -170,6 +184,20 @@ extension KMEditPDFPopToolBarController: KMEditPDFToolbarViewDelegate {
             viewC.isScrollPop = true
             fontStyleView.view = viewC.view
             fontStyleView.obj = viewC
+//            if KMAppearance.isDarkMode() {
+//                viewC.background = NSColor(white: 0, alpha: 0.15)
+//            }
+            viewC.borderColor = KMAppearance.Interactive.s0Color()
+            viewC.background = KMAppearance.Layout.l1Color()
+            viewC.background_hov = KMAppearance.Layout.l1Color()
+            viewC.background_focus = KMAppearance.Layout.l1Color()
+            viewC.textColor = KMAppearance.Layout.h1Color()
+            viewC.textColor_hov = KMAppearance.Layout.h1Color()
+            viewC.textColor_focus = KMAppearance.Layout.h1Color()
+            viewC.popViewControllerBackground = KMAppearance.Layout.bgColor()
+            viewC.popViewControllerTextColor = KMAppearance.Layout.h0Color()
+            viewC.popViewControllerEnterFillColor = KMAppearance.Interactive.s0Color()
+            viewC.updateUI()
             
             let familyNames = CPDFFont.familyNames
             viewC.removeAllItems()
@@ -180,7 +208,7 @@ extension KMEditPDFPopToolBarController: KMEditPDFToolbarViewDelegate {
         } else if itemKey == .separator {
             let colorView = KMEditPDFToolbarItemView()
             let view = KMSeparatorLineView()
-            view.strokeColor = NSColor(hex: "#DADBDE")
+            view.strokeColor = KMAppearance.separatorLineColor()
             colorView.view = view
             return colorView
         } else if itemKey == .textAlignment {
@@ -189,17 +217,28 @@ extension KMEditPDFPopToolBarController: KMEditPDFToolbarViewDelegate {
             colorView.view = viewC.view
             colorView.obj = viewC
             viewC.pagination()
-//            viewC.tag = index
+            if KMAppearance.isDarkMode() {
+                viewC.background_hov = NSColor(hex: "#365898")
+            } else {
+    //            viewC.background_hov = NSColor(hex: "#EDEEF0")
+            }
             viewC.target = self
             viewC.action = #selector(textAlignmentItemClick)
             viewC.image = NSImage(named: "KMImageNameEditPDFAlignCenterSelect")!
             return colorView
         }
+        
         let colorView = KMEditPDFToolbarItemView()
         let viewC = KMDesignButton(withType: .Image)
         colorView.view = viewC.view
         colorView.obj = viewC
         viewC.pagination()
+        if KMAppearance.isDarkMode() {
+            viewC.background_hov = NSColor(hex: "#365898")
+        } else {
+//            viewC.background_hov = NSColor(hex: "#EDEEF0")
+        }
+        
         viewC.tag = index
         viewC.target = self
         viewC.action = #selector(_buttonClick)
@@ -229,10 +268,10 @@ extension KMEditPDFPopToolBarController: KMEditPDFToolbarViewDelegate {
             colorView.popToolTip = NSLocalizedString("Rotate right", comment: "")
         } else if itemKey == .reverseX {
             viewC.image = NSImage(named: "KMImageNameEditPDFReverseX")!
-            colorView.popToolTip = NSLocalizedString("", comment: "")
+            colorView.popToolTip = NSLocalizedString("Flip horizontal", comment: "")
         } else if itemKey == .reverseY {
             viewC.image = NSImage(named: "KMImageNameEditPDFReverseY")!
-            colorView.popToolTip = NSLocalizedString("", comment: "")
+            colorView.popToolTip = NSLocalizedString("Flip vertical", comment: "")
         } else if itemKey == .crop {
             viewC.image = NSImage(named: "KMImageNameEditPDFCrop")!
             colorView.popToolTip = NSLocalizedString("Crop", comment: "")

+ 2 - 2
PDF Office/PDF Master/Class/PDFTools/EditPDF/View/KMEditPDFColorView.swift

@@ -15,7 +15,7 @@ class KMEditPDFColorView: NSView {
         view.contentViewMargins = .zero
         view.borderWidth = 1
         view.cornerRadius = 4
-        view.borderColor = NSColor(hex: "#DFE1E5")
+        view.borderColor = KMAppearance.controlBackgroundColor()
         return view
     }()
     
@@ -116,6 +116,6 @@ class KMEditPDFColorView: NSView {
     }
     
     override func mouseExited(with event: NSEvent) {
-        self.box.borderColor = NSColor(hex: "#DFE1E5")
+        self.box.borderColor = KMAppearance.controlBackgroundColor()
     }
 }

+ 1 - 3
PDF Office/PDF Master/Class/PDFTools/EditPDF/Window/KMEditPDFPopToolBarWindow.swift

@@ -108,9 +108,7 @@ extension KMEditPDFPopToolBarWindow: KMInterfaceThemeChangedProtocol {
     func interfaceThemeDidChanged(_ appearance: NSAppearance.Name) {
         self.appearance = .init(named: appearance)
         
-//        if appearance == .darkAqua {
-//
-//        }
+        self.contentViewController?.interfaceThemeDidChanged(appearance)
     }
 }
 

+ 2 - 0
PDF Office/PDF Master/Strings/de.lproj/Localizable.strings

@@ -2870,3 +2870,5 @@
 "Flip" = "umdrehen";
 "Align" = "Ausrichtung";
 "Show quick entrance while editing content" = "Beim Bearbeiten von Inhalten Schnellzugriffseingabe anzeigen";
+"Flip horizontal" = "horizontaler Flip";
+"Flip vertical" = "vertikal umdrehen";

+ 2 - 0
PDF Office/PDF Master/Strings/en.lproj/Localizable.strings

@@ -4049,3 +4049,5 @@
 "Flip" = "Flip";
 "Align" = "Align";
 "Show quick entrance while editing content" = "Show quick entrance while editing content";
+"Flip horizontal" = "Flip horizontal";
+"Flip vertical" = "Flip vertical";

+ 2 - 0
PDF Office/PDF Master/Strings/es.lproj/Localizable.strings

@@ -2962,3 +2962,5 @@
 "Flip" = "voltear";
 "Align" = "Alineación";
 "Show quick entrance while editing content" = "Mostrar entrada de operación rápida al editar contenido";
+"Flip horizontal" = "giro horizontal";
+"Flip vertical" = "voltear verticalmente";

+ 2 - 0
PDF Office/PDF Master/Strings/fr.lproj/Localizable.strings

@@ -2833,3 +2833,5 @@
 "Flip" = "retourner";
 "Align" = "Alignement";
 "Show quick entrance while editing content" = "Afficher l'entrée d'opération rapide lors de la modification du contenu";
+"Flip horizontal" = "retournement horizontal";
+"Flip vertical" = "retourner verticalement";

+ 2 - 0
PDF Office/PDF Master/Strings/it.lproj/Localizable.strings

@@ -2758,3 +2758,5 @@
 "Flip" = "Flip";
 "Align" = "Allineamento";
 "Show quick entrance while editing content" = "Visualizza l'immissione delle operazioni rapide durante la modifica del contenuto";
+"Flip horizontal" = "ribaltamento orizzontale";
+"Flip vertical" = "capovolgere verticalmente";

+ 2 - 0
PDF Office/PDF Master/Strings/ja.lproj/Localizable.strings

@@ -3025,3 +3025,5 @@
 "Flip" = "フリップ";
 "Align" = "位置合わせ";
 "Show quick entrance while editing content" = "コンテンツ編集時にクイック操作エントリを表示する";
+"Flip horizontal" = "水平反転";
+"Flip vertical" = "垂直方向に反転";

+ 2 - 0
PDF Office/PDF Master/Strings/nl.lproj/Localizable.strings

@@ -3035,3 +3035,5 @@
 "Flip" = "omdraaien";
 "Align" = "Uitlijning";
 "Show quick entrance while editing content" = "Geef snelle bedieningsinvoer weer bij het bewerken van inhoud";
+"Flip horizontal" = "horizontale draai";
+"Flip vertical" = "verticaal omdraaien";

+ 2 - 0
PDF Office/PDF Master/Strings/pl.lproj/Localizable.strings

@@ -2974,3 +2974,5 @@
 "Flip" = "trzepnięcie";
 "Align" = "Wyrównanie";
 "Show quick entrance while editing content" = "Wyświetl wpis szybkiej operacji podczas edycji treści";
+"Flip horizontal" = "przewrót poziomy";
+"Flip vertical" = "obrócić w pionie";

+ 2 - 0
PDF Office/PDF Master/Strings/ru.lproj/Localizable.strings

@@ -2898,3 +2898,5 @@
 "Flip" = "подбросить";
 "Align" = "Выравнивание";
 "Show quick entrance while editing content" = "Отображение быстрого ввода операций при редактировании контента";
+"Flip horizontal" = "горизонтальный флип";
+"Flip vertical" = "перевернуть вертикально";

+ 2 - 0
PDF Office/PDF Master/Strings/zh-Hans.lproj/Localizable.strings

@@ -3935,3 +3935,5 @@
 "Flip" = "翻转";
 "Align" = "对齐";
 "Show quick entrance while editing content" = "编辑内容时显示快捷操作入口";
+"Flip horizontal" = "水平翻转";
+"Flip vertical" = "垂直翻转";

+ 2 - 0
PDF Office/PDF Master/Strings/zh-Hant.lproj/Localizable.strings

@@ -4065,3 +4065,5 @@
 "Flip" = "翻轉";
 "Align" = "對齊";
 "Show quick entrance while editing content" = "編輯內容時顯示快捷操作入口";
+"Flip horizontal" = "水平翻轉";
+"Flip vertical" = "垂直翻轉";

+ 129 - 85
PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -194,38 +194,6 @@
             endingLineNumber = "260"
             landmarkName = "pagesArrayIntersect(with:)"
             landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "C095F8C8-C72A-460F-B423-ACFD6D067223 - 8bdb6c9fdf991588"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMBatchOperateFile.pagesArrayIntersect(with: Swift.Array&lt;Any&gt;) -&gt; Swift.Array&lt;Any&gt;"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/Batch/Data/KMBatchOperateFile.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "260"
-                  endingLineNumber = "260"
-                  offsetFromSymbolStart = "376">
-               </Location>
-               <Location
-                  uuid = "C095F8C8-C72A-460F-B423-ACFD6D067223 - 8bdb6c9fdf991588"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMBatchOperateFile.pagesArrayIntersect(with: Swift.Array&lt;Any&gt;) -&gt; Swift.Array&lt;Any&gt;"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/Batch/Data/KMBatchOperateFile.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "260"
-                  endingLineNumber = "260"
-                  offsetFromSymbolStart = "434">
-               </Location>
-            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -260,22 +228,6 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "F8BF49BD-FBD4-42C9-B116-E14C4F724CFF"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditPDFTextPropertyViewController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "352"
-            endingLineNumber = "352"
-            landmarkName = "reloadData()"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -400,7 +352,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1937"
             endingLineNumber = "1937"
-            landmarkName = "-doRedactWithEvent:"
+            landmarkName = "-doResizeLinkWithEvent:fromPoint:originalBounds:page:resizeHandle:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -578,38 +530,6 @@
             endingLineNumber = "1272"
             landmarkName = "menuItemAction_closeWindow(_:)"
             landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "3E052C89-3F4C-40FA-923D-63F022EB6991 - ffcc8cb942745a0f"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMBrowserWindowController.menuItemAction_closeWindow(Any) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "1273"
-                  endingLineNumber = "1273"
-                  offsetFromSymbolStart = "419">
-               </Location>
-               <Location
-                  uuid = "3E052C89-3F4C-40FA-923D-63F022EB6991 - ffcc8cb942745a0f"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMBrowserWindowController.menuItemAction_closeWindow(Any) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "1273"
-                  endingLineNumber = "1273"
-                  offsetFromSymbolStart = "759">
-               </Location>
-            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -628,11 +548,11 @@
             landmarkType = "7">
             <Locations>
                <Location
-                  uuid = "D3C0D123-8D29-4E14-89D9-CCA4A773FEF9 - e48e313e58be9030"
+                  uuid = "D3C0D123-8D29-4E14-89D9-CCA4A773FEF9 - ffcc8cb942745ba0"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMBrowserWindowController.menuItemAction_closeAllWindows(Any) -&gt; ()"
+                  symbolName = "PDF_Reader_Pro.KMBrowserWindowController.menuItemAction_closeWindow(Any) -&gt; ()"
                   moduleName = "PDF Reader Pro"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
@@ -643,11 +563,11 @@
                   offsetFromSymbolStart = "419">
                </Location>
                <Location
-                  uuid = "D3C0D123-8D29-4E14-89D9-CCA4A773FEF9 - e48e313e58be9030"
+                  uuid = "D3C0D123-8D29-4E14-89D9-CCA4A773FEF9 - ffcc8cb942745ba0"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMBrowserWindowController.menuItemAction_closeAllWindows(Any) -&gt; ()"
+                  symbolName = "PDF_Reader_Pro.KMBrowserWindowController.menuItemAction_closeWindow(Any) -&gt; ()"
                   moduleName = "PDF Reader Pro"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
@@ -770,6 +690,38 @@
             endingLineNumber = "3036"
             landmarkName = "imageAnnotation(_:)"
             landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "1A1E0BBC-9AE5-4D72-9FAF-703369A96CD7 - 1a3bbf6f81cb17d9"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #1 (__C.NSModalResponse) -&gt; () in PDF_Reader_Pro.KMMainViewController.imageAnnotation(Any) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "3036"
+                  endingLineNumber = "3036"
+                  offsetFromSymbolStart = "433">
+               </Location>
+               <Location
+                  uuid = "1A1E0BBC-9AE5-4D72-9FAF-703369A96CD7 - 1a3bbf6f81cb17d9"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #1 (__C.NSModalResponse) -&gt; () in PDF_Reader_Pro.KMMainViewController.imageAnnotation(Any) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "3036"
+                  endingLineNumber = "3036"
+                  offsetFromSymbolStart = "521">
+               </Location>
+            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -850,6 +802,98 @@
             endingLineNumber = "22"
             landmarkName = "viewDidLoad()"
             landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "B59D7463-96C2-4676-AFBF-453AF1488588 - b2774cd18f38449d"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMToolbarConfigViewController.model.getter : PDF_Reader_Pro.KMToolbarConfigModel"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/PDFWindowController/Toolbar/Controller/KMToolbarConfigViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "23"
+                  endingLineNumber = "23"
+                  offsetFromSymbolStart = "94">
+               </Location>
+               <Location
+                  uuid = "B59D7463-96C2-4676-AFBF-453AF1488588 - 1e99a38836ee40a9"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMToolbarConfigViewController.model.setter : PDF_Reader_Pro.KMToolbarConfigModel"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/PDFWindowController/Toolbar/Controller/KMToolbarConfigViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "23"
+                  endingLineNumber = "23"
+                  offsetFromSymbolStart = "132">
+               </Location>
+               <Location
+                  uuid = "B59D7463-96C2-4676-AFBF-453AF1488588 - 7a077567cddef59e"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMToolbarConfigViewController.model.modify : PDF_Reader_Pro.KMToolbarConfigModel"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/PDFWindowController/Toolbar/Controller/KMToolbarConfigViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "23"
+                  endingLineNumber = "23"
+                  offsetFromSymbolStart = "0">
+               </Location>
+               <Location
+                  uuid = "B59D7463-96C2-4676-AFBF-453AF1488588 - 661ad147ec507028"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMToolbarConfigViewController.model.modify : PDF_Reader_Pro.KMToolbarConfigModel with unmangled suffix &quot;.resume.0&quot;"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/PDFWindowController/Toolbar/Controller/KMToolbarConfigViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "23"
+                  endingLineNumber = "23"
+                  offsetFromSymbolStart = "15">
+               </Location>
+               <Location
+                  uuid = "B59D7463-96C2-4676-AFBF-453AF1488588 - a905863a867d351"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMToolbarConfigViewController.init(nibName: Swift.Optional&lt;Swift.String&gt;, bundle: Swift.Optional&lt;__C.NSBundle&gt;) -&gt; PDF_Reader_Pro.KMToolbarConfigViewController"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/PDFWindowController/Toolbar/Controller/KMToolbarConfigViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "23"
+                  endingLineNumber = "23"
+                  offsetFromSymbolStart = "657">
+               </Location>
+               <Location
+                  uuid = "B59D7463-96C2-4676-AFBF-453AF1488588 - f3f87afa5548691a"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMToolbarConfigViewController.init(coder: __C.NSCoder) -&gt; Swift.Optional&lt;PDF_Reader_Pro.KMToolbarConfigViewController&gt;"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/work/tangchao/git/PDFOffice/PDF%20Office/PDF%20Master/Class/PDFWindowController/Toolbar/Controller/KMToolbarConfigViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "23"
+                  endingLineNumber = "23"
+                  offsetFromSymbolStart = "608">
+               </Location>
+            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy