【综合】数据整理

PDF Office/PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift

@@ -327,12 +327,12 @@ import Cocoa
                 menuItemAction_newTagPageToNewWindow("")
             } else {
                 let window = NSWindow.currentWindow()
-                if !KMTools.defaultManager.isTabbingWin{
-                    KMTools.defaultManager.isTabbingWin = true
+                if !KMDataManager.default.isTabbingWin{
+                    KMDataManager.default.isTabbingWin = true
                     let tabbingWin: KMTabbingHintWindowController = KMTabbingHintWindowController()
                     tabbingWin.selectCallBack = { continueOrNot in
                         window.km_quick_endSheet()
-                        KMTools.defaultManager.isTabbingWin = false
+                        KMDataManager.default.isTabbingWin = false
                         if continueOrNot {
                             self.reopenDocument(forPaths: [])
                         } else {

PDF Office/PDF Master/Class/Common/DataManager/KMDataManager.swift

@@ -12,6 +12,8 @@ import Cocoa
 class KMDataManager: NSObject {
     // 单例
     static let `default` = KMDataManager()
+    
+    var isTabbingWin = false  //多页签提示页是否展示中
 }
 
 // MARK: - UserDefault

PDF Office/PDF Master/Class/Common/Tools/KMTools.swift

@@ -10,13 +10,6 @@ import Cocoa
 @objc class KMTools: NSObject {
     // MARK: - 获取已打开的文件
     
-    static let defaultManager: KMTools = {
-        let manager = KMTools()
-        return manager
-    }()
-    
-    var isTabbingWin = false  //多页签提示页是否展示中
-    
     @objc class func getOpenDocumentURLs() -> [URL] {
         var files:[URL] = []
         for window in NSApp.windows {

PDF Office/PDF Master/Class/Document/KMMainDocument.swift

@@ -214,12 +214,12 @@ typealias KMMainDocumentCloudUploadHanddler = (@escaping(Bool, String)->()) -> (
             } else {
                 if currentWindowController?.browser.tabCount() ?? 0 > 1{
                     let window = NSWindow.currentWindow()
-                    if !KMTools.defaultManager.isTabbingWin{
-                        KMTools.defaultManager.isTabbingWin = true
+                    if !KMDataManager.default.isTabbingWin{
+                        KMDataManager.default.isTabbingWin = true
                         let tabbingWin: KMTabbingHintWindowController = KMTabbingHintWindowController()
                         tabbingWin.selectCallBack = { continueOrNot in
                             window.km_quick_endSheet()
-                            KMTools.defaultManager.isTabbingWin = false
+                            KMDataManager.default.isTabbingWin = false
                             if continueOrNot {
                                 self.reopenDocument(forPaths: [])
                             } else {

PDF Office/PDF Master/Class/Home/ViewController/KMHomeViewController+Action.swift

@@ -322,12 +322,12 @@ extension KMHomeViewController {
             menuItemAction_newTagPageToNewWindow("")
         } else {
             let window = NSWindow.currentWindow()
-            if !KMTools.defaultManager.isTabbingWin{
-                KMTools.defaultManager.isTabbingWin = true
+            if !KMDataManager.default.isTabbingWin{
+                KMDataManager.default.isTabbingWin = true
                 let tabbingWin: KMTabbingHintWindowController = KMTabbingHintWindowController()
                 tabbingWin.selectCallBack = { continueOrNot in
                     window.km_quick_endSheet()
-                    KMTools.defaultManager.isTabbingWin = false
+                    KMDataManager.default.isTabbingWin = false
                     if continueOrNot {
                         self.reopenDocument(forPaths: [])
                     } else {

PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift

@@ -4594,12 +4594,12 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
                 menuItemAction_newTagPageToNewWindow("")
             } else {
                 let window = NSWindow.currentWindow()
-                if !KMTools.defaultManager.isTabbingWin{
-                    KMTools.defaultManager.isTabbingWin = true
+                if !KMDataManager.default.isTabbingWin{
+                    KMDataManager.default.isTabbingWin = true
                     let tabbingWin: KMTabbingHintWindowController = KMTabbingHintWindowController()
                     tabbingWin.selectCallBack = { continueOrNot in
                         window.km_quick_endSheet()
-                        KMTools.defaultManager.isTabbingWin = false
+                        KMDataManager.default.isTabbingWin = false
                         if continueOrNot {
                             self.reopenDocument(forPaths: [])
                         } else {

PDF Office/PDF Master/Class/Preference/Tools/KMPreferenceManager.swift

@@ -844,9 +844,8 @@ extension KMPreferenceManager {
 //            return self.getData(forKey: KMGeneralAuthorNameKey) as! String
         }
         set {
-            let _ = self.setData(data: newValue, forKey: KMGeneralAuthorNameKey)
-            
             self._syncDataToUserDefault(newValue, forKey: KMGeneralAuthorNameKey)
+            let _ = self.setData(data: newValue, forKey: KMGeneralAuthorNameKey)
         }
     }
     
@@ -886,8 +885,6 @@ extension KMPreferenceManager {
         }
         set {
             if (newValue == .always || newValue == .never || newValue == .ask) {
-                let _ = self.setData(data: newValue.rawValue, forKey: KMSavePasswordTypeKey)
-                
                 var data: Int = 0
                 if newValue == .always {
                     data = 1
@@ -895,6 +892,7 @@ extension KMPreferenceManager {
                     data = -1
                 }
                 self._syncDataToUserDefault(data, forKey: KMSavePasswordTypeKey)
+                let _ = self.setData(data: newValue.rawValue, forKey: KMSavePasswordTypeKey)
             }
         }
     }
@@ -912,8 +910,8 @@ extension KMPreferenceManager {
         set {
             if (newValue == .inSameWindow || newValue == .newWindow) {
                 let pKey = KMOpenDocumentTypeKey
-                _ = self.setData(data: newValue.rawValue, forKey: pKey)
                 self._syncDataToUserDefault(NSNumber(value: newValue.rawValue), forKey: pKey)
+                _ = self.setData(data: newValue.rawValue, forKey: pKey)
             }
         }
     }
@@ -948,10 +946,9 @@ extension KMPreferenceManager {
         }
         set {
             if (newValue == .default || newValue == .maxim || newValue == .fit) {
-                let _ = self.setData(data: newValue.rawValue, forKey: KMOpenFileTypeKey)
-                
                 // 数据兼容
                 self._syncDataToUserDefault(newValue.rawValue, forKey: KMOpenFileTypeKey)
+                let _ = self.setData(data: newValue.rawValue, forKey: KMOpenFileTypeKey)
             }
         }
     }
@@ -962,9 +959,8 @@ extension KMPreferenceManager {
 //            return self.getData(forKey: KMShowLeftSideBarKey) as? Bool ?? self.showLeftSideBarDefaultValue
         }
         set {
-            _ = self.setData(data: newValue, forKey: KMShowLeftSideBarKey)
-            
             self._syncDataToUserDefault(newValue, forKey: KMShowLeftSideBarKey)
+            _ = self.setData(data: newValue, forKey: KMShowLeftSideBarKey)
         }
     }
     
@@ -974,9 +970,9 @@ extension KMPreferenceManager {
 //            return self.getData(forKey: KMRememberSnapshotKey) as? Bool ?? self.rememberSnapshotDefaultValue
         }
         set {
-            _ = self.setData(data: newValue, forKey: KMRememberSnapshotKey)
             // 数据兼容
             self._syncDataToUserDefault(newValue, forKey: KMRememberSnapshotKey)
+            _ = self.setData(data: newValue, forKey: KMRememberSnapshotKey)
         }
     }
     
@@ -1004,9 +1000,8 @@ extension KMPreferenceManager {
 //            return self.getData(forKey: KMAutoSaveNoteBackupKey) as? Bool ?? self.autoSaveNoteBackupDefaultValue
         }
         set {
-            _ = self.setData(data: newValue, forKey: KMAutoSaveNoteBackupKey)
-            
             self._syncDataToUserDefault(newValue, forKey: KMAutoSaveNoteBackupKey)
+            _ = self.setData(data: newValue, forKey: KMAutoSaveNoteBackupKey)
         }
     }
     
@@ -1016,10 +1011,9 @@ extension KMPreferenceManager {
 //            return self.getData(forKey: KMKeepSnapshotWindowToTopKey) as? Bool ?? self.keepSnapshotWindowToTopDefaultValue()
         }
         set {
-            _ = self.setData(data: newValue, forKey: KMKeepSnapshotWindowToTopKey)
-            
             // 数据兼容
             self._syncDataToUserDefault(newValue, forKey: KMKeepSnapshotWindowToTopKey)
+            _ = self.setData(data: newValue, forKey: KMKeepSnapshotWindowToTopKey)
         }
     }
 }
@@ -1172,9 +1166,8 @@ extension KMPreferenceManager {
             return self.getColor(forKey: KMDisplayBackgroundNormalColorKey)
         }
         set {
-            let _ = self.setColor(newValue, forKey: KMDisplayBackgroundNormalColorKey)
-            
             self._syncDataToUserDefault(newValue, forKey: KMDisplayBackgroundNormalColorKey)
+            let _ = self.setColor(newValue, forKey: KMDisplayBackgroundNormalColorKey)
         }
     }
     
@@ -1186,9 +1179,8 @@ extension KMPreferenceManager {
             return self.getColor(forKey: KMDisplayBackgroundFullScreenColorKey)
         }
         set {
-            let _ = self.setColor(newValue, forKey: KMDisplayBackgroundFullScreenColorKey)
-            
             self._syncDataToUserDefault(newValue, forKey: KMDisplayBackgroundFullScreenColorKey)
+            let _ = self.setColor(newValue, forKey: KMDisplayBackgroundFullScreenColorKey)
         }
     }
     
@@ -1230,9 +1222,8 @@ extension KMPreferenceManager {
             return num?.floatValue ?? self.thumbSnapshotSizeDefaultValue()
         }
         set {
-            let _ = self.setData(data: newValue, forKey: KMThumbSnapshotSizeKey)
-            
             self._syncDataToUserDefault(NSNumber(value: newValue), forKey: KMThumbSnapshotSizeKey)
+            let _ = self.setData(data: newValue, forKey: KMThumbSnapshotSizeKey)
         }
     }
     
@@ -1252,9 +1243,8 @@ extension KMPreferenceManager {
 //            return self.getData(forKey: KMOutlineFontSizeKey) as? Float ?? self.outlineFontSizeDefaultValue()
         }
         set {
-            let _ = self.setData(data: newValue, forKey: KMOutlineFontSizeKey)
-            
             self._syncDataToUserDefault(NSNumber(value: newValue), forKey: KMOutlineFontSizeKey)
+            let _ = self.setData(data: newValue, forKey: KMOutlineFontSizeKey)
         }
     }
     
@@ -1265,9 +1255,8 @@ extension KMPreferenceManager {
 //            return self.getData(forKey: KMGreekThresholdKey) as? Float ?? self.greekThresholdDefaultValue()
         }
         set {
-            let _ = self.setData(data: newValue, forKey: KMGreekThresholdKey)
-            
             self._syncDataToUserDefault(NSNumber(value: newValue), forKey: KMGreekThresholdKey)
+            let _ = self.setData(data: newValue, forKey: KMGreekThresholdKey)
         }
     }
     
@@ -1277,9 +1266,8 @@ extension KMPreferenceManager {
             return KMDataManager.ud_bool(forKey: KMShouldAntiAliasKey)
         }
         set {
-            let _ = self.setData(data: newValue, forKey: KMAntiAliasTextKey)
-            
             self._syncDataToUserDefault(newValue, forKey: KMAntiAliasTextKey)
+            let _ = self.setData(data: newValue, forKey: KMAntiAliasTextKey)
         }
     }
     
@@ -1291,9 +1279,8 @@ extension KMPreferenceManager {
             return self.getColor(forKey: KMReadBarColorKey)
         }
         set {
-            let _ = self.setColor(newValue, forKey: KMReadBarColorKey)
-            
             self._syncDataToUserDefault(newValue, forKey: KMReadBarColorKey)
+            let _ = self.setColor(newValue, forKey: KMReadBarColorKey)
         }
     }
     
@@ -1303,9 +1290,8 @@ extension KMPreferenceManager {
 //            return self.getData(forKey: KMInvertBarKey) as? Bool ?? self.invertBarDefaultValue()
         }
         set {
-            let _ = self.setData(data: newValue, forKey: KMInvertBarKey)
-            
             self._syncDataToUserDefault(newValue, forKey: KMInvertBarKey)
+            let _ = self.setData(data: newValue, forKey: KMInvertBarKey)
         }
     }
 }
@@ -1323,9 +1309,8 @@ extension KMPreferenceManager {
         }
         set {
             self.syncDataToPDFView(newValue, forKey: KMPreference.markupColorHighlightKey)
-            
-            let _ = self.setColor(newValue, forKey: KMPreference.markupColorHighlightKey)
             self._syncDataToUserDefault(newValue, forKey: KMPreference.markupColorHighlightKey)
+            let _ = self.setColor(newValue, forKey: KMPreference.markupColorHighlightKey)
         }
     }
     var markupStrikthroughColor: NSColor {
@@ -1355,9 +1340,8 @@ extension KMPreferenceManager {
         }
         set {
             self.syncDataToPDFView(newValue, forKey: KMPreference.markupColorUnderlineKey)
-            
-            let _ = self.setColor(newValue, forKey: KMPreference.markupColorUnderlineKey)
             self._syncDataToUserDefault(newValue, forKey: KMPreference.markupColorUnderlineKey)
+            let _ = self.setColor(newValue, forKey: KMPreference.markupColorUnderlineKey)
         }
     }
     var markupPenColor: NSColor {
@@ -1371,9 +1355,8 @@ extension KMPreferenceManager {
         }
         set {
             self.syncDataToPDFView(newValue, forKey: KMPreference.markupColorPenKey)
-            
-            let _ = self.setColor(newValue, forKey: KMPreference.markupColorPenKey)
             self._syncDataToUserDefault(newValue, forKey: KMPreference.markupColorPenKey)
+            let _ = self.setColor(newValue, forKey: KMPreference.markupColorPenKey)
         }
     }
     var markupTextColor: NSColor {
@@ -1387,9 +1370,8 @@ extension KMPreferenceManager {
         }
         set {
             self.syncDataToPDFView(newValue, forKey: KMPreference.markupColorTextKey)
-            
-            let _ = self.setColor(newValue, forKey: KMPreference.markupColorTextKey)
             self._syncDataToUserDefault(newValue, forKey: KMPreference.markupColorTextKey)
+            let _ = self.setColor(newValue, forKey: KMPreference.markupColorTextKey)
         }
     }
     var markupNoteColor: NSColor {
@@ -1403,9 +1385,8 @@ extension KMPreferenceManager {
         }
         set {
             self.syncDataToPDFView(newValue, forKey: KMPreference.markupColorNoteKey)
-            
-            let _ = self.setColor(newValue, forKey: KMPreference.markupColorNoteKey)
             self._syncDataToUserDefault(newValue, forKey: KMPreference.markupColorNoteKey)
+            let _ = self.setColor(newValue, forKey: KMPreference.markupColorNoteKey)
         }
     }
     var markupRectangleFillColor: NSColor {
@@ -1419,9 +1400,8 @@ extension KMPreferenceManager {
         }
         set {
             self.syncDataToPDFView(newValue, forKey: KMPreference.markupColorRectangleFillKey)
-            
-            let _ = self.setColor(newValue, forKey: KMPreference.markupColorRectangleFillKey)
             self._syncDataToUserDefault(newValue, forKey: KMPreference.markupColorRectangleFillKey)
+            let _ = self.setColor(newValue, forKey: KMPreference.markupColorRectangleFillKey)
         }
     }
     var markupRectangleBorderColor: NSColor {
@@ -1435,9 +1415,8 @@ extension KMPreferenceManager {
         }
         set {
             self.syncDataToPDFView(newValue, forKey: KMPreference.markupColorRectangleBorderKey)
-            
-            let _ = self.setColor(newValue, forKey: KMPreference.markupColorRectangleBorderKey)
             self._syncDataToUserDefault(newValue, forKey: KMPreference.markupColorRectangleBorderKey)
+            let _ = self.setColor(newValue, forKey: KMPreference.markupColorRectangleBorderKey)
         }
     }
     var markupCircleFillColor: NSColor {
@@ -1451,9 +1430,8 @@ extension KMPreferenceManager {
         }
         set {
             self.syncDataToPDFView(newValue, forKey: KMPreference.markupColorCircleFillKey)
-            
-            let _ = self.setColor(newValue, forKey: KMPreference.markupColorCircleFillKey)
             self._syncDataToUserDefault(newValue, forKey: KMPreference.markupColorCircleFillKey)
+            let _ = self.setColor(newValue, forKey: KMPreference.markupColorCircleFillKey)
         }
     }
     var markupCircleBorderColor: NSColor {
@@ -1467,9 +1445,8 @@ extension KMPreferenceManager {
         }
         set {
             self.syncDataToPDFView(newValue, forKey: KMPreference.markupColorCircleBorderKey)
-            
-            let _ = self.setColor(newValue, forKey: KMPreference.markupColorCircleBorderKey)
             self._syncDataToUserDefault(newValue, forKey: KMPreference.markupColorCircleBorderKey)
+            let _ = self.setColor(newValue, forKey: KMPreference.markupColorCircleBorderKey)
         }
     }
     var markupLineColor: NSColor {
@@ -1483,9 +1460,8 @@ extension KMPreferenceManager {
         }
         set {
             self.syncDataToPDFView(newValue, forKey: KMPreference.markupColorLineKey)
-            
-            let _ = self.setColor(newValue, forKey: KMPreference.markupColorLineKey)
             self._syncDataToUserDefault(newValue, forKey: KMPreference.markupColorLineKey)
+            let _ = self.setColor(newValue, forKey: KMPreference.markupColorLineKey)
         }
     }
     var markupArrowColor: NSColor {
@@ -1499,9 +1475,8 @@ extension KMPreferenceManager {
         }
         set {
             self.syncDataToPDFView(newValue, forKey: KMPreference.markupColorArrowKey)
-            
-            let _ = self.setColor(newValue, forKey: KMPreference.markupColorArrowKey)
             self._syncDataToUserDefault(newValue, forKey: KMPreference.markupColorArrowKey)
+            let _ = self.setColor(newValue, forKey: KMPreference.markupColorArrowKey)
         }
     }
     
@@ -1516,9 +1491,8 @@ extension KMPreferenceManager {
         set {
             let pKey = KMPreference.markupTextFontSizeKey
             self.syncDataToPDFView(newValue, forKey: pKey)
-            
-            _ = self.setData(data: newValue, forKey: pKey)
             self._syncDataToUserDefault(NSNumber(value: newValue), forKey: pKey)
+            _ = self.setData(data: newValue, forKey: pKey)
         }
     }
     
@@ -1533,9 +1507,8 @@ extension KMPreferenceManager {
         set {
             let pKey = KMPreference.markupNoteFontSizeKey
             self.syncDataToPDFView(newValue, forKey: pKey)
-            
-            _ = self.setData(data: newValue, forKey: pKey)
             self._syncDataToUserDefault(NSNumber(value: newValue), forKey: pKey)
+            _ = self.setData(data: newValue, forKey: pKey)
         }
     }
     
@@ -1550,9 +1523,8 @@ extension KMPreferenceManager {
         set {
             let pKey = KMPreference.freeTextNoteLineWidthKey
             self.syncDataToPDFView(newValue, forKey: pKey)
-            
-            _ = self.setData(data: newValue, forKey: pKey)
             self._syncDataToUserDefault(NSNumber(value: newValue), forKey: pKey)
+            _ = self.setData(data: newValue, forKey: pKey)
         }
     }
     
@@ -1567,9 +1539,8 @@ extension KMPreferenceManager {
         set {
             let pKey = KMPreference.freeTextNoteLineStyleKey
             self.syncDataToPDFView(newValue, forKey: pKey)
-            
-            _ = self.setData(data: newValue, forKey: pKey)
             self._syncDataToUserDefault(NSNumber(value: newValue), forKey: pKey)
+            _ = self.setData(data: newValue, forKey: pKey)
         }
     }
     
@@ -1583,9 +1554,8 @@ extension KMPreferenceManager {
         set {
             let pKey = KMPreference.freeTextNoteDashPatternKey
             self.syncDataToPDFView(newValue, forKey: pKey)
-            
-            _ = self.setData(data: newValue, forKey: pKey)
             self._syncDataToUserDefault(newValue, forKey: pKey)
+            _ = self.setData(data: newValue, forKey: pKey)
         }
     }
     
@@ -1600,9 +1570,8 @@ extension KMPreferenceManager {
         set {
             let pKey = KMPreference.circleNoteLineWidthKey
             self.syncDataToPDFView(newValue, forKey: pKey)
-            
-            _ = self.setData(data: newValue, forKey: pKey)
             self._syncDataToUserDefault(NSNumber(value: newValue), forKey: pKey)
+            _ = self.setData(data: newValue, forKey: pKey)
         }
     }
     
@@ -1617,9 +1586,8 @@ extension KMPreferenceManager {
         set {
             let pKey = KMPreference.circleNoteLineStyleKey
             self.syncDataToPDFView(newValue, forKey: pKey)
-            
-            _ = self.setData(data: newValue, forKey: pKey)
             self._syncDataToUserDefault(NSNumber(value: newValue), forKey: pKey)
+            _ = self.setData(data: newValue, forKey: pKey)
         }
     }
     
@@ -1633,9 +1601,8 @@ extension KMPreferenceManager {
         set {
             let pKey = KMPreference.circleNoteDashPatternKey
             self.syncDataToPDFView(newValue, forKey: pKey)
-            
-            _ = self.setData(data: newValue, forKey: pKey)
             self._syncDataToUserDefault(newValue, forKey: pKey)
+            _ = self.setData(data: newValue, forKey: pKey)
         }
     }
     
@@ -1650,9 +1617,8 @@ extension KMPreferenceManager {
         set {
             let pKey = KMPreference.squareNoteLineWidthKey
             self.syncDataToPDFView(newValue, forKey: pKey)
-            
-            _ = self.setData(data: newValue, forKey: pKey)
             self._syncDataToUserDefault(NSNumber(value: newValue), forKey: pKey)
+            _ = self.setData(data: newValue, forKey: pKey)
         }
     }
     
@@ -1667,9 +1633,8 @@ extension KMPreferenceManager {
         set {
             let pKey = KMPreference.squareNoteLineStyleKey
             self.syncDataToPDFView(newValue, forKey: pKey)
-            
-            _ = self.setData(data: newValue, forKey: pKey)
             self._syncDataToUserDefault(NSNumber(value: newValue), forKey: pKey)
+            _ = self.setData(data: newValue, forKey: pKey)
         }
     }
     
@@ -1683,9 +1648,8 @@ extension KMPreferenceManager {
         set {
             let pKey = KMPreference.squareNoteDashPatternKey
             self.syncDataToPDFView(newValue, forKey: pKey)
-            
-            _ = self.setData(data: newValue, forKey: pKey)
             self._syncDataToUserDefault(newValue, forKey: pKey)
+            _ = self.setData(data: newValue, forKey: pKey)
         }
     }
     
@@ -1700,9 +1664,8 @@ extension KMPreferenceManager {
         set {
             let pKey = KMPreference.lineNoteLineWidthKey
             self.syncDataToPDFView(newValue, forKey: pKey)
-            
-            _ = self.setData(data: newValue, forKey: pKey)
             self._syncDataToUserDefault(NSNumber(value: newValue), forKey: pKey)
+            _ = self.setData(data: newValue, forKey: pKey)
         }
     }
     
@@ -1717,9 +1680,8 @@ extension KMPreferenceManager {
         set {
             let pKey = KMPreference.lineNoteLineStyleKey
             self.syncDataToPDFView(newValue, forKey: pKey)
-            
-            _ = self.setData(data: newValue, forKey: pKey)
             self._syncDataToUserDefault(NSNumber(value: newValue), forKey: pKey)
+            _ = self.setData(data: newValue, forKey: pKey)
         }
     }
     
@@ -1733,9 +1695,8 @@ extension KMPreferenceManager {
         set {
             let pKey = KMPreference.lineNoteDashPatternKey
             self.syncDataToPDFView(newValue, forKey: pKey)
-            
-            _ = self.setData(data: newValue, forKey: pKey)
             self._syncDataToUserDefault(newValue, forKey: pKey)
+            _ = self.setData(data: newValue, forKey: pKey)
         }
     }
     
@@ -1750,9 +1711,8 @@ extension KMPreferenceManager {
         set {
             let pKey = KMPreference.lineNoteStartLineStyleKey
             self.syncDataToPDFView(newValue, forKey: pKey)
-            
-            _ = self.setData(data: newValue, forKey: pKey)
             self._syncDataToUserDefault(NSNumber(value: newValue), forKey: pKey)
+            _ = self.setData(data: newValue, forKey: pKey)
         }
     }
     
@@ -1767,9 +1727,8 @@ extension KMPreferenceManager {
         set {
             let pKey = KMPreference.lineNoteEndLineStyleKey
             self.syncDataToPDFView(newValue, forKey: pKey)
-            
-            _ = self.setData(data: newValue, forKey: pKey)
             self._syncDataToUserDefault(NSNumber(value: newValue), forKey: pKey)
+            _ = self.setData(data: newValue, forKey: pKey)
         }
     }
     
@@ -1784,9 +1743,8 @@ extension KMPreferenceManager {
         set {
             let pKey = KMPreference.inkNoteLineWidthKey
             self.syncDataToPDFView(newValue, forKey: pKey)
-            
-            _ = self.setData(data: newValue, forKey: pKey)
             self._syncDataToUserDefault(NSNumber(value: newValue), forKey: pKey)
+            _ = self.setData(data: newValue, forKey: pKey)
         }
     }
     
@@ -1801,9 +1759,8 @@ extension KMPreferenceManager {
         set {
             let pKey = KMPreference.inkNoteLineStyleKey
             self.syncDataToPDFView(newValue, forKey: pKey)
-            
-            _ = self.setData(data: newValue, forKey: pKey)
             self._syncDataToUserDefault(NSNumber(value: newValue), forKey: pKey)
+            _ = self.setData(data: newValue, forKey: pKey)
         }
     }
     
@@ -1817,9 +1774,8 @@ extension KMPreferenceManager {
         set {
             let pKey = KMPreference.inkNoteDashPatternKey
             self.syncDataToPDFView(newValue, forKey: pKey)
-            
-            _ = self.setData(data: newValue, forKey: pKey)
             self._syncDataToUserDefault(newValue, forKey: pKey)
+            _ = self.setData(data: newValue, forKey: pKey)
         }
     }
 }

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

@@ -678,32 +678,48 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "6D4BD3E7-505F-404D-A95E-5BBCE933EED9"
+            uuid = "67804CA5-D2E4-4EAE-B7B7-6478E95C27B2"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/Document/KMMainDocument.swift"
+            filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "174"
-            endingLineNumber = "174"
-            landmarkName = "makeWindowControllers()"
+            startingLineNumber = "601"
+            endingLineNumber = "601"
+            landmarkName = "updateannotationMode()"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "BA22CC20-2FA1-42FF-9032-1F35A99317E4"
+            uuid = "399B1989-2FCA-4408-9A0E-4EEC63D41879"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/Document/KMMainDocument.swift"
+            filePath = "PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFAnnotationModel.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "183"
-            endingLineNumber = "183"
-            landmarkName = "makeWindowControllers()"
+            startingLineNumber = "1380"
+            endingLineNumber = "1380"
+            landmarkName = "-setFontSize:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "3523360C-AD89-4FEF-AF8C-A8AA3FB85F26"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFAnnotationModel.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1337"
+            endingLineNumber = "1337"
+            landmarkName = "-fontSize"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>