|
|
@@ -88,25 +88,25 @@ private let KMMarkupFontNoteStringKey: KMPreferenceKey = "KMMarkupFontNoteString
|
|
|
private let KMMarkupTextFontSizeKey: KMPreferenceKey = "KMMarkupTextFontSizeKey"
|
|
|
private let KMMarkupNoteFontSizeKey: KMPreferenceKey = "KMMarkupNoteFontSizeKey"
|
|
|
|
|
|
-private let KMFreeTextNoteLineWidthKey: KMPreferenceKey = "KMFreeTextNoteLineWidthKey"
|
|
|
-private let KMFreeTextNoteLineStyleKey: KMPreferenceKey = "KMFreeTextNoteLineStyleKey"
|
|
|
-private let KMFreeTextNoteDashPatternKey: KMPreferenceKey = "KMFreeTextNoteDashPatternKey"
|
|
|
-private let KMCircleNoteLineWidthKey: KMPreferenceKey = "KMCircleNoteLineWidthKey"
|
|
|
-private let KMCircleNoteLineStyleKey: KMPreferenceKey = "KMCircleNoteLineStyleKey"
|
|
|
+//private let KMFreeTextNoteLineWidthKey: KMPreferenceKey = "KMFreeTextNoteLineWidthKey"
|
|
|
+//private let KMFreeTextNoteLineStyleKey: KMPreferenceKey = "KMFreeTextNoteLineStyleKey"
|
|
|
+//private let KMFreeTextNoteDashPatternKey: KMPreferenceKey = "KMFreeTextNoteDashPatternKey"
|
|
|
+//private let KMCircleNoteLineWidthKey: KMPreferenceKey = "KMCircleNoteLineWidthKey"
|
|
|
+//private let KMCircleNoteLineStyleKey: KMPreferenceKey = "KMCircleNoteLineStyleKey"
|
|
|
private let KMCircleNoteDashPatternKey: KMPreferenceKey = "KMCircleNoteDashPatternKey"
|
|
|
-
|
|
|
-private let KMSquareNoteLineWidthKey: KMPreferenceKey = "KMSquareNoteLineWidthKey"
|
|
|
-private let KMSquareNoteLineStyleKey: KMPreferenceKey = "KMSquareNoteLineStyleKey"
|
|
|
-private let KMSquareNoteDashPatternKey: KMPreferenceKey = "KMSquareNoteDashPatternKey"
|
|
|
-private let KMLineNoteLineWidthKey: KMPreferenceKey = "KMLineNoteLineWidthKey"
|
|
|
-private let KMLineNoteLineStyleKey: KMPreferenceKey = "KMLineNoteLineStyleKey"
|
|
|
-private let KMLineNoteDashPatternKey: KMPreferenceKey = "KMLineNoteDashPatternKey"
|
|
|
-private let KMLineNoteStartLineStyleKey: KMPreferenceKey = "KMLineNoteStartLineStyleKey"
|
|
|
-private let KMLineNoteEndLineStyleKey: KMPreferenceKey = "KMLineNoteEndLineStyleKey"
|
|
|
-
|
|
|
-private let KMInkNoteLineWidthKey: KMPreferenceKey = "KMInkNoteLineWidthKey"
|
|
|
-private let KMInkNoteLineStyleKey: KMPreferenceKey = "KMInkNoteLineStyleKey"
|
|
|
-private let KMInkNoteDashPatternKey: KMPreferenceKey = "KMInkNoteDashPatternKey"
|
|
|
+//
|
|
|
+//private let KMSquareNoteLineWidthKey: KMPreferenceKey = "KMSquareNoteLineWidthKey"
|
|
|
+//private let KMSquareNoteLineStyleKey: KMPreferenceKey = "KMSquareNoteLineStyleKey"
|
|
|
+//private let KMSquareNoteDashPatternKey: KMPreferenceKey = "KMSquareNoteDashPatternKey"
|
|
|
+//private let KMLineNoteLineWidthKey: KMPreferenceKey = "KMLineNoteLineWidthKey"
|
|
|
+//private let KMLineNoteLineStyleKey: KMPreferenceKey = "KMLineNoteLineStyleKey"
|
|
|
+//private let KMLineNoteDashPatternKey: KMPreferenceKey = "KMLineNoteDashPatternKey"
|
|
|
+//private let KMLineNoteStartLineStyleKey: KMPreferenceKey = "KMLineNoteStartLineStyleKey"
|
|
|
+//private let KMLineNoteEndLineStyleKey: KMPreferenceKey = "KMLineNoteEndLineStyleKey"
|
|
|
+//
|
|
|
+//private let KMInkNoteLineWidthKey: KMPreferenceKey = "KMInkNoteLineWidthKey"
|
|
|
+//private let KMInkNoteLineStyleKey: KMPreferenceKey = "KMInkNoteLineStyleKey"
|
|
|
+//private let KMInkNoteDashPatternKey: KMPreferenceKey = "KMInkNoteDashPatternKey"
|
|
|
|
|
|
/// 偏好设置已改变
|
|
|
private let KMPreferenceDidChangeNotificationName = "KMPreferenceDidChangeNotificationName"
|
|
|
@@ -306,6 +306,7 @@ typealias KMPreference = KMPreferenceManager
|
|
|
self.resetDataToPDFView()
|
|
|
self._resetDataToUserDefault(group: .general)
|
|
|
self._resetDataToUserDefault(group: .display)
|
|
|
+ self._resetDataToUserDefault(group: .markup)
|
|
|
|
|
|
DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
|
|
|
var groppInfos: [KMPreferenceKey : Any] = [:]
|
|
|
@@ -1322,331 +1323,512 @@ extension KMPreferenceManager {
|
|
|
extension KMPreferenceManager {
|
|
|
var markupHighlightColor: NSColor {
|
|
|
get {
|
|
|
+ let pKey = KMPreference.markupColorHighlightKey
|
|
|
+ let udKey = KMPreferenceKeyToUDKey(pKey: pKey) ?? ""
|
|
|
+ if let color = UserDefaults.standard.color(forKey: udKey) {
|
|
|
+ return color
|
|
|
+ }
|
|
|
return self.getColor(forKey: KMPreference.markupColorHighlightKey)
|
|
|
}
|
|
|
set {
|
|
|
self.syncDataToPDFView(newValue, forKey: KMPreference.markupColorHighlightKey)
|
|
|
|
|
|
let _ = self.setColor(newValue, forKey: KMPreference.markupColorHighlightKey)
|
|
|
+ self._syncDataToUserDefault(newValue, forKey: KMPreference.markupColorHighlightKey)
|
|
|
}
|
|
|
}
|
|
|
var markupStrikthroughColor: NSColor {
|
|
|
get {
|
|
|
+ let pKey = KMPreference.markupColorStrikthroughKey
|
|
|
+ let udKey = KMPreferenceKeyToUDKey(pKey: pKey) ?? ""
|
|
|
+ if let color = UserDefaults.standard.color(forKey: udKey) {
|
|
|
+ return color
|
|
|
+ }
|
|
|
return self.getColor(forKey: KMPreference.markupColorStrikthroughKey)
|
|
|
}
|
|
|
set {
|
|
|
self.syncDataToPDFView(newValue, forKey: KMPreference.markupColorStrikthroughKey)
|
|
|
|
|
|
let _ = self.setColor(newValue, forKey: KMPreference.markupColorStrikthroughKey)
|
|
|
+ self._syncDataToUserDefault(newValue, forKey: KMPreference.markupColorStrikthroughKey)
|
|
|
}
|
|
|
}
|
|
|
var markupUnderlineColor: NSColor {
|
|
|
get {
|
|
|
+ let pKey = KMPreference.markupColorUnderlineKey
|
|
|
+ let udKey = KMPreferenceKeyToUDKey(pKey: pKey) ?? ""
|
|
|
+ if let color = UserDefaults.standard.color(forKey: udKey) {
|
|
|
+ return color
|
|
|
+ }
|
|
|
return self.getColor(forKey: KMPreference.markupColorUnderlineKey)
|
|
|
}
|
|
|
set {
|
|
|
self.syncDataToPDFView(newValue, forKey: KMPreference.markupColorUnderlineKey)
|
|
|
|
|
|
let _ = self.setColor(newValue, forKey: KMPreference.markupColorUnderlineKey)
|
|
|
+ self._syncDataToUserDefault(newValue, forKey: KMPreference.markupColorUnderlineKey)
|
|
|
}
|
|
|
}
|
|
|
var markupPenColor: NSColor {
|
|
|
get {
|
|
|
+ let pKey = KMPreference.markupColorPenKey
|
|
|
+ let udKey = KMPreferenceKeyToUDKey(pKey: pKey) ?? ""
|
|
|
+ if let color = UserDefaults.standard.color(forKey: udKey) {
|
|
|
+ return color
|
|
|
+ }
|
|
|
return self.getColor(forKey: KMPreference.markupColorPenKey)
|
|
|
}
|
|
|
set {
|
|
|
self.syncDataToPDFView(newValue, forKey: KMPreference.markupColorPenKey)
|
|
|
|
|
|
let _ = self.setColor(newValue, forKey: KMPreference.markupColorPenKey)
|
|
|
+ self._syncDataToUserDefault(newValue, forKey: KMPreference.markupColorPenKey)
|
|
|
}
|
|
|
}
|
|
|
var markupTextColor: NSColor {
|
|
|
get {
|
|
|
+ let pKey = KMPreference.markupColorTextKey
|
|
|
+ let udKey = KMPreferenceKeyToUDKey(pKey: pKey) ?? ""
|
|
|
+ if let color = UserDefaults.standard.color(forKey: udKey) {
|
|
|
+ return color
|
|
|
+ }
|
|
|
return self.getColor(forKey: KMPreference.markupColorTextKey)
|
|
|
}
|
|
|
set {
|
|
|
self.syncDataToPDFView(newValue, forKey: KMPreference.markupColorTextKey)
|
|
|
|
|
|
let _ = self.setColor(newValue, forKey: KMPreference.markupColorTextKey)
|
|
|
+ self._syncDataToUserDefault(newValue, forKey: KMPreference.markupColorTextKey)
|
|
|
}
|
|
|
}
|
|
|
var markupNoteColor: NSColor {
|
|
|
get {
|
|
|
+ let pKey = KMPreference.markupColorNoteKey
|
|
|
+ let udKey = KMPreferenceKeyToUDKey(pKey: pKey) ?? ""
|
|
|
+ if let color = UserDefaults.standard.color(forKey: udKey) {
|
|
|
+ return color
|
|
|
+ }
|
|
|
return self.getColor(forKey: KMPreference.markupColorNoteKey)
|
|
|
}
|
|
|
set {
|
|
|
self.syncDataToPDFView(newValue, forKey: KMPreference.markupColorNoteKey)
|
|
|
|
|
|
let _ = self.setColor(newValue, forKey: KMPreference.markupColorNoteKey)
|
|
|
+ self._syncDataToUserDefault(newValue, forKey: KMPreference.markupColorNoteKey)
|
|
|
}
|
|
|
}
|
|
|
var markupRectangleFillColor: NSColor {
|
|
|
get {
|
|
|
+ let pKey = KMPreference.markupColorRectangleFillKey
|
|
|
+ let udKey = KMPreferenceKeyToUDKey(pKey: pKey) ?? ""
|
|
|
+ if let color = UserDefaults.standard.color(forKey: udKey) {
|
|
|
+ return color
|
|
|
+ }
|
|
|
return self.getColor(forKey: KMPreference.markupColorRectangleFillKey)
|
|
|
}
|
|
|
set {
|
|
|
self.syncDataToPDFView(newValue, forKey: KMPreference.markupColorRectangleFillKey)
|
|
|
|
|
|
let _ = self.setColor(newValue, forKey: KMPreference.markupColorRectangleFillKey)
|
|
|
+ self._syncDataToUserDefault(newValue, forKey: KMPreference.markupColorRectangleFillKey)
|
|
|
}
|
|
|
}
|
|
|
var markupRectangleBorderColor: NSColor {
|
|
|
get {
|
|
|
+ let pKey = KMPreference.markupColorRectangleBorderKey
|
|
|
+ let udKey = KMPreferenceKeyToUDKey(pKey: pKey) ?? ""
|
|
|
+ if let color = UserDefaults.standard.color(forKey: udKey) {
|
|
|
+ return color
|
|
|
+ }
|
|
|
return self.getColor(forKey: KMPreference.markupColorRectangleBorderKey)
|
|
|
}
|
|
|
set {
|
|
|
self.syncDataToPDFView(newValue, forKey: KMPreference.markupColorRectangleBorderKey)
|
|
|
|
|
|
let _ = self.setColor(newValue, forKey: KMPreference.markupColorRectangleBorderKey)
|
|
|
+ self._syncDataToUserDefault(newValue, forKey: KMPreference.markupColorRectangleBorderKey)
|
|
|
}
|
|
|
}
|
|
|
var markupCircleFillColor: NSColor {
|
|
|
get {
|
|
|
+ let pKey = KMPreference.markupColorCircleFillKey
|
|
|
+ let udKey = KMPreferenceKeyToUDKey(pKey: pKey) ?? ""
|
|
|
+ if let color = UserDefaults.standard.color(forKey: udKey) {
|
|
|
+ return color
|
|
|
+ }
|
|
|
return self.getColor(forKey: KMPreference.markupColorCircleFillKey)
|
|
|
}
|
|
|
set {
|
|
|
self.syncDataToPDFView(newValue, forKey: KMPreference.markupColorCircleFillKey)
|
|
|
|
|
|
let _ = self.setColor(newValue, forKey: KMPreference.markupColorCircleFillKey)
|
|
|
+ self._syncDataToUserDefault(newValue, forKey: KMPreference.markupColorCircleFillKey)
|
|
|
}
|
|
|
}
|
|
|
var markupCircleBorderColor: NSColor {
|
|
|
get {
|
|
|
+ let pKey = KMPreference.markupColorCircleBorderKey
|
|
|
+ let udKey = KMPreferenceKeyToUDKey(pKey: pKey) ?? ""
|
|
|
+ if let color = UserDefaults.standard.color(forKey: udKey) {
|
|
|
+ return color
|
|
|
+ }
|
|
|
return self.getColor(forKey: KMPreference.markupColorCircleBorderKey)
|
|
|
}
|
|
|
set {
|
|
|
self.syncDataToPDFView(newValue, forKey: KMPreference.markupColorCircleBorderKey)
|
|
|
|
|
|
let _ = self.setColor(newValue, forKey: KMPreference.markupColorCircleBorderKey)
|
|
|
+ self._syncDataToUserDefault(newValue, forKey: KMPreference.markupColorCircleBorderKey)
|
|
|
}
|
|
|
}
|
|
|
var markupLineColor: NSColor {
|
|
|
get {
|
|
|
+ let pKey = KMPreference.markupColorLineKey
|
|
|
+ let udKey = KMPreferenceKeyToUDKey(pKey: pKey) ?? ""
|
|
|
+ if let color = UserDefaults.standard.color(forKey: udKey) {
|
|
|
+ return color
|
|
|
+ }
|
|
|
return self.getColor(forKey: KMPreference.markupColorLineKey)
|
|
|
}
|
|
|
set {
|
|
|
self.syncDataToPDFView(newValue, forKey: KMPreference.markupColorLineKey)
|
|
|
|
|
|
let _ = self.setColor(newValue, forKey: KMPreference.markupColorLineKey)
|
|
|
+ self._syncDataToUserDefault(newValue, forKey: KMPreference.markupColorLineKey)
|
|
|
}
|
|
|
}
|
|
|
var markupArrowColor: NSColor {
|
|
|
get {
|
|
|
+ let pKey = KMPreference.markupColorArrowKey
|
|
|
+ let udKey = KMPreferenceKeyToUDKey(pKey: pKey) ?? ""
|
|
|
+ if let color = UserDefaults.standard.color(forKey: udKey) {
|
|
|
+ return color
|
|
|
+ }
|
|
|
return self.getColor(forKey: KMPreference.markupColorArrowKey)
|
|
|
}
|
|
|
set {
|
|
|
self.syncDataToPDFView(newValue, forKey: KMPreference.markupColorArrowKey)
|
|
|
|
|
|
let _ = self.setColor(newValue, forKey: KMPreference.markupColorArrowKey)
|
|
|
+ self._syncDataToUserDefault(newValue, forKey: KMPreference.markupColorArrowKey)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
var markupTextFontSize: Float {
|
|
|
get {
|
|
|
- return self.getData(forKey: KMPreference.markupTextFontSizeKey) as? Float ?? self.textFontSizeDefaultValue()
|
|
|
+ let pKey = KMPreference.markupTextFontSizeKey
|
|
|
+ let udKey = KMPreferenceKeyToUDKey(pKey: pKey) ?? ""
|
|
|
+ let num = KMDataManager.ud_object(forKey: udKey) as? NSNumber
|
|
|
+ return num?.floatValue ?? self.textFontSizeDefaultValue()
|
|
|
+// return self.getData(forKey: pKey) as? Float ?? self.textFontSizeDefaultValue()
|
|
|
}
|
|
|
set {
|
|
|
- self.syncDataToPDFView(newValue, forKey: KMPreference.markupTextFontSizeKey)
|
|
|
+ let pKey = KMPreference.markupTextFontSizeKey
|
|
|
+ self.syncDataToPDFView(newValue, forKey: pKey)
|
|
|
|
|
|
- _ = self.setData(data: newValue, forKey: KMPreference.markupTextFontSizeKey)
|
|
|
+ _ = self.setData(data: newValue, forKey: pKey)
|
|
|
+ self._syncDataToUserDefault(NSNumber(value: newValue), forKey: pKey)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
var markupNoteFontSize: Float {
|
|
|
get {
|
|
|
- return self.getData(forKey: KMPreference.markupNoteFontSizeKey) as? Float ?? self.noteFontSizeDefaultValue()
|
|
|
+ let pKey = KMPreference.markupNoteFontSizeKey
|
|
|
+ let udKey = KMPreferenceKeyToUDKey(pKey: pKey) ?? ""
|
|
|
+ let num = KMDataManager.ud_object(forKey: udKey) as? NSNumber
|
|
|
+ return num?.floatValue ?? self.noteFontSizeDefaultValue()
|
|
|
+// return self.getData(forKey: KMPreference.markupNoteFontSizeKey) as? Float ?? self.noteFontSizeDefaultValue()
|
|
|
}
|
|
|
set {
|
|
|
- self.syncDataToPDFView(newValue, forKey: KMPreference.markupNoteFontSizeKey)
|
|
|
+ let pKey = KMPreference.markupNoteFontSizeKey
|
|
|
+ self.syncDataToPDFView(newValue, forKey: pKey)
|
|
|
|
|
|
- _ = self.setData(data: newValue, forKey: KMPreference.markupNoteFontSizeKey)
|
|
|
+ _ = self.setData(data: newValue, forKey: pKey)
|
|
|
+ self._syncDataToUserDefault(NSNumber(value: newValue), forKey: pKey)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
var freeTextNoteLineWidth: Float {
|
|
|
get {
|
|
|
- return self.getData(forKey: KMPreference.freeTextNoteLineWidthKey) as? Float ?? self.freeTextNoteLineWidthDefaultValue()
|
|
|
+ let pKey = KMPreference.freeTextNoteLineWidthKey
|
|
|
+ let udKey = KMPreferenceKeyToUDKey(pKey: pKey) ?? ""
|
|
|
+ let num = KMDataManager.ud_object(forKey: udKey) as? NSNumber
|
|
|
+ return num?.floatValue ?? self.freeTextNoteLineWidthDefaultValue()
|
|
|
+// return self.getData(forKey: KMPreference.freeTextNoteLineWidthKey) as? Float ?? self.freeTextNoteLineWidthDefaultValue()
|
|
|
}
|
|
|
set {
|
|
|
- self.syncDataToPDFView(newValue, forKey: KMPreference.freeTextNoteLineWidthKey)
|
|
|
+ let pKey = KMPreference.freeTextNoteLineWidthKey
|
|
|
+ self.syncDataToPDFView(newValue, forKey: pKey)
|
|
|
|
|
|
- _ = self.setData(data: newValue, forKey: KMPreference.freeTextNoteLineWidthKey)
|
|
|
+ _ = self.setData(data: newValue, forKey: pKey)
|
|
|
+ self._syncDataToUserDefault(NSNumber(value: newValue), forKey: pKey)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
var freeTextNoteLineStyle: Int {
|
|
|
get {
|
|
|
- return self.getData(forKey: KMPreference.freeTextNoteLineStyleKey) as? Int ?? self.freeTextNoteLineStyleDefaultValue()
|
|
|
+ let pKey = KMPreference.freeTextNoteLineStyleKey
|
|
|
+ let udKey = KMPreferenceKeyToUDKey(pKey: pKey) ?? ""
|
|
|
+ let num = KMDataManager.ud_object(forKey: udKey) as? NSNumber
|
|
|
+ return num?.intValue ?? self.freeTextNoteLineStyleDefaultValue()
|
|
|
+// return self.getData(forKey: KMPreference.freeTextNoteLineStyleKey) as? Int ?? self.freeTextNoteLineStyleDefaultValue()
|
|
|
}
|
|
|
set {
|
|
|
- self.syncDataToPDFView(newValue, forKey: KMPreference.freeTextNoteLineStyleKey)
|
|
|
+ let pKey = KMPreference.freeTextNoteLineStyleKey
|
|
|
+ self.syncDataToPDFView(newValue, forKey: pKey)
|
|
|
|
|
|
- _ = self.setData(data: newValue, forKey: KMPreference.freeTextNoteLineStyleKey)
|
|
|
+ _ = self.setData(data: newValue, forKey: pKey)
|
|
|
+ self._syncDataToUserDefault(NSNumber(value: newValue), forKey: pKey)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
var freeTextNoteDashPattern: [CGFloat] {
|
|
|
get {
|
|
|
- return self.getData(forKey: KMPreference.freeTextNoteDashPatternKey) as? [CGFloat] ?? self.freeTextNoteDashPatternDefaultValue()
|
|
|
+ let pKey = KMPreference.freeTextNoteDashPatternKey
|
|
|
+ let udKey = KMPreferenceKeyToUDKey(pKey: pKey) ?? ""
|
|
|
+ return KMDataManager.ud_array(forKey: udKey) as? [CGFloat] ?? self.freeTextNoteDashPatternDefaultValue()
|
|
|
+// return self.getData(forKey: KMPreference.freeTextNoteDashPatternKey) as? [CGFloat] ?? self.freeTextNoteDashPatternDefaultValue()
|
|
|
}
|
|
|
set {
|
|
|
- self.syncDataToPDFView(newValue, forKey: KMPreference.freeTextNoteDashPatternKey)
|
|
|
+ let pKey = KMPreference.freeTextNoteDashPatternKey
|
|
|
+ self.syncDataToPDFView(newValue, forKey: pKey)
|
|
|
|
|
|
- _ = self.setData(data: newValue, forKey: KMPreference.freeTextNoteDashPatternKey)
|
|
|
+ _ = self.setData(data: newValue, forKey: pKey)
|
|
|
+ self._syncDataToUserDefault(newValue, forKey: pKey)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
var circleNoteLineWidth: Float {
|
|
|
get {
|
|
|
- return self.getData(forKey: KMPreference.circleNoteLineWidthKey) as? Float ?? self.circleNoteLineWidthDefaultValue()
|
|
|
+ let pKey = KMPreference.circleNoteLineWidthKey
|
|
|
+ let udKey = KMPreferenceKeyToUDKey(pKey: pKey) ?? ""
|
|
|
+ let num = KMDataManager.ud_object(forKey: udKey) as? NSNumber
|
|
|
+ return num?.floatValue ?? self.circleNoteLineWidthDefaultValue()
|
|
|
+// return self.getData(forKey: KMPreference.circleNoteLineWidthKey) as? Float ?? self.circleNoteLineWidthDefaultValue()
|
|
|
}
|
|
|
set {
|
|
|
- self.syncDataToPDFView(newValue, forKey: KMPreference.circleNoteLineWidthKey)
|
|
|
+ let pKey = KMPreference.circleNoteLineWidthKey
|
|
|
+ self.syncDataToPDFView(newValue, forKey: pKey)
|
|
|
|
|
|
- _ = self.setData(data: newValue, forKey: KMPreference.circleNoteLineWidthKey)
|
|
|
+ _ = self.setData(data: newValue, forKey: pKey)
|
|
|
+ self._syncDataToUserDefault(NSNumber(value: newValue), forKey: pKey)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
var circleNoteLineStyle: Int {
|
|
|
get {
|
|
|
- return self.getData(forKey: KMPreference.circleNoteLineStyleKey) as? Int ?? self.circleNoteLineStyleDefaultValue()
|
|
|
+ let pKey = KMPreference.circleNoteLineStyleKey
|
|
|
+ let udKey = KMPreferenceKeyToUDKey(pKey: pKey) ?? ""
|
|
|
+ let num = KMDataManager.ud_object(forKey: udKey) as? NSNumber
|
|
|
+ return num?.intValue ?? self.circleNoteLineStyleDefaultValue()
|
|
|
+// return self.getData(forKey: KMPreference.circleNoteLineStyleKey) as? Int ?? self.circleNoteLineStyleDefaultValue()
|
|
|
}
|
|
|
set {
|
|
|
- self.syncDataToPDFView(newValue, forKey: KMPreference.circleNoteLineStyleKey)
|
|
|
+ let pKey = KMPreference.circleNoteLineStyleKey
|
|
|
+ self.syncDataToPDFView(newValue, forKey: pKey)
|
|
|
|
|
|
- _ = self.setData(data: newValue, forKey: KMPreference.circleNoteLineStyleKey)
|
|
|
+ _ = self.setData(data: newValue, forKey: pKey)
|
|
|
+ self._syncDataToUserDefault(NSNumber(value: newValue), forKey: pKey)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
var circleNoteDashPattern: [CGFloat] {
|
|
|
get {
|
|
|
- return self.getData(forKey: KMPreference.circleNoteDashPatternKey) as? [CGFloat] ?? self.circleNoteDashPatternDefaultValue()
|
|
|
+ let pKey = KMPreference.circleNoteDashPatternKey
|
|
|
+ let udKey = KMPreferenceKeyToUDKey(pKey: pKey) ?? ""
|
|
|
+ return KMDataManager.ud_array(forKey: udKey) as? [CGFloat] ?? self.circleNoteDashPatternDefaultValue()
|
|
|
+// return self.getData(forKey: KMPreference.circleNoteDashPatternKey) as? [CGFloat] ?? self.circleNoteDashPatternDefaultValue()
|
|
|
}
|
|
|
set {
|
|
|
- self.syncDataToPDFView(newValue, forKey: KMPreference.circleNoteDashPatternKey)
|
|
|
+ let pKey = KMPreference.circleNoteDashPatternKey
|
|
|
+ self.syncDataToPDFView(newValue, forKey: pKey)
|
|
|
|
|
|
- _ = self.setData(data: newValue, forKey: KMPreference.circleNoteDashPatternKey)
|
|
|
+ _ = self.setData(data: newValue, forKey: pKey)
|
|
|
+ self._syncDataToUserDefault(newValue, forKey: pKey)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
var squareNoteLineWidth: Float {
|
|
|
get {
|
|
|
- return self.getData(forKey: KMPreference.squareNoteLineWidthKey) as? Float ?? self.squareNoteLineWidthDefaultValue()
|
|
|
+ let pKey = KMPreference.squareNoteLineWidthKey
|
|
|
+ let udKey = KMPreferenceKeyToUDKey(pKey: pKey) ?? ""
|
|
|
+ let num = KMDataManager.ud_object(forKey: udKey) as? NSNumber
|
|
|
+ return num?.floatValue ?? self.squareNoteLineWidthDefaultValue()
|
|
|
+// return self.getData(forKey: KMPreference.squareNoteLineWidthKey) as? Float ?? self.squareNoteLineWidthDefaultValue()
|
|
|
}
|
|
|
set {
|
|
|
- self.syncDataToPDFView(newValue, forKey: KMPreference.squareNoteLineWidthKey)
|
|
|
+ let pKey = KMPreference.squareNoteLineWidthKey
|
|
|
+ self.syncDataToPDFView(newValue, forKey: pKey)
|
|
|
|
|
|
- _ = self.setData(data: newValue, forKey: KMPreference.squareNoteLineWidthKey)
|
|
|
+ _ = self.setData(data: newValue, forKey: pKey)
|
|
|
+ self._syncDataToUserDefault(NSNumber(value: newValue), forKey: pKey)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
var squareNoteLineStyle: Int {
|
|
|
get {
|
|
|
- return self.getData(forKey: KMPreference.squareNoteLineStyleKey) as? Int ?? self.squareNoteLineStyleDefaultValue()
|
|
|
+ let pKey = KMPreference.squareNoteLineStyleKey
|
|
|
+ let udKey = KMPreferenceKeyToUDKey(pKey: pKey) ?? ""
|
|
|
+ let num = KMDataManager.ud_object(forKey: udKey) as? NSNumber
|
|
|
+ return num?.intValue ?? self.squareNoteLineStyleDefaultValue()
|
|
|
+// return self.getData(forKey: KMPreference.squareNoteLineStyleKey) as? Int ?? self.squareNoteLineStyleDefaultValue()
|
|
|
}
|
|
|
set {
|
|
|
- self.syncDataToPDFView(newValue, forKey: KMPreference.squareNoteLineStyleKey)
|
|
|
+ let pKey = KMPreference.squareNoteLineStyleKey
|
|
|
+ self.syncDataToPDFView(newValue, forKey: pKey)
|
|
|
|
|
|
- _ = self.setData(data: newValue, forKey: KMPreference.squareNoteLineStyleKey)
|
|
|
+ _ = self.setData(data: newValue, forKey: pKey)
|
|
|
+ self._syncDataToUserDefault(NSNumber(value: newValue), forKey: pKey)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
var squareNoteDashPattern: [CGFloat] {
|
|
|
get {
|
|
|
- return self.getData(forKey: KMPreference.squareNoteDashPatternKey) as? [CGFloat] ?? self.squareNoteDashPatternDefaultValue()
|
|
|
+ let pKey = KMPreference.squareNoteDashPatternKey
|
|
|
+ let udKey = KMPreferenceKeyToUDKey(pKey: pKey) ?? ""
|
|
|
+ return KMDataManager.ud_array(forKey: udKey) as? [CGFloat] ?? self.squareNoteDashPatternDefaultValue()
|
|
|
+// return self.getData(forKey: KMPreference.squareNoteDashPatternKey) as? [CGFloat] ?? self.squareNoteDashPatternDefaultValue()
|
|
|
}
|
|
|
set {
|
|
|
- self.syncDataToPDFView(newValue, forKey: KMPreference.squareNoteDashPatternKey)
|
|
|
+ let pKey = KMPreference.squareNoteDashPatternKey
|
|
|
+ self.syncDataToPDFView(newValue, forKey: pKey)
|
|
|
|
|
|
- _ = self.setData(data: newValue, forKey: KMPreference.squareNoteDashPatternKey)
|
|
|
+ _ = self.setData(data: newValue, forKey: pKey)
|
|
|
+ self._syncDataToUserDefault(newValue, forKey: pKey)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
var lineNoteLineWidth: Float {
|
|
|
get {
|
|
|
- return self.getData(forKey: KMPreference.lineNoteLineWidthKey) as? Float ?? self.lineNoteLineWidthDefaultValue()
|
|
|
+ let pKey = KMPreference.lineNoteLineWidthKey
|
|
|
+ let udKey = KMPreferenceKeyToUDKey(pKey: pKey) ?? ""
|
|
|
+ let num = KMDataManager.ud_object(forKey: udKey) as? NSNumber
|
|
|
+ return num?.floatValue ?? self.lineNoteLineWidthDefaultValue()
|
|
|
+// return self.getData(forKey: KMPreference.lineNoteLineWidthKey) as? Float ?? self.lineNoteLineWidthDefaultValue()
|
|
|
}
|
|
|
set {
|
|
|
- self.syncDataToPDFView(newValue, forKey: KMPreference.lineNoteLineWidthKey)
|
|
|
+ let pKey = KMPreference.lineNoteLineWidthKey
|
|
|
+ self.syncDataToPDFView(newValue, forKey: pKey)
|
|
|
|
|
|
- _ = self.setData(data: newValue, forKey: KMPreference.lineNoteLineWidthKey)
|
|
|
+ _ = self.setData(data: newValue, forKey: pKey)
|
|
|
+ self._syncDataToUserDefault(NSNumber(value: newValue), forKey: pKey)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
var lineNoteLineStyle: Int {
|
|
|
get {
|
|
|
- return self.getData(forKey: KMPreference.lineNoteLineStyleKey) as? Int ?? self.lineNoteLineStyleDefaultValue()
|
|
|
+ let pKey = KMPreference.lineNoteLineStyleKey
|
|
|
+ let udKey = KMPreferenceKeyToUDKey(pKey: pKey) ?? ""
|
|
|
+ let num = KMDataManager.ud_object(forKey: udKey) as? NSNumber
|
|
|
+ return num?.intValue ?? self.lineNoteLineStyleDefaultValue()
|
|
|
+// return self.getData(forKey: KMPreference.lineNoteLineStyleKey) as? Int ?? self.lineNoteLineStyleDefaultValue()
|
|
|
}
|
|
|
set {
|
|
|
- self.syncDataToPDFView(newValue, forKey: KMPreference.lineNoteLineStyleKey)
|
|
|
+ let pKey = KMPreference.lineNoteLineStyleKey
|
|
|
+ self.syncDataToPDFView(newValue, forKey: pKey)
|
|
|
|
|
|
- _ = self.setData(data: newValue, forKey: KMPreference.lineNoteLineStyleKey)
|
|
|
+ _ = self.setData(data: newValue, forKey: pKey)
|
|
|
+ self._syncDataToUserDefault(NSNumber(value: newValue), forKey: pKey)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
var lineNoteDashPattern: [CGFloat] {
|
|
|
get {
|
|
|
- return self.getData(forKey: KMPreference.lineNoteDashPatternKey) as? [CGFloat] ?? self.lineNoteDashPatternDefaultValue()
|
|
|
+ let pKey = KMPreference.lineNoteDashPatternKey
|
|
|
+ let udKey = KMPreferenceKeyToUDKey(pKey: pKey) ?? ""
|
|
|
+ return KMDataManager.ud_array(forKey: udKey) as? [CGFloat] ?? self.lineNoteDashPatternDefaultValue()
|
|
|
+// return self.getData(forKey: KMPreference.lineNoteDashPatternKey) as? [CGFloat] ?? self.lineNoteDashPatternDefaultValue()
|
|
|
}
|
|
|
set {
|
|
|
- self.syncDataToPDFView(newValue, forKey: KMPreference.lineNoteDashPatternKey)
|
|
|
+ let pKey = KMPreference.lineNoteDashPatternKey
|
|
|
+ self.syncDataToPDFView(newValue, forKey: pKey)
|
|
|
|
|
|
- _ = self.setData(data: newValue, forKey: KMPreference.lineNoteDashPatternKey)
|
|
|
+ _ = self.setData(data: newValue, forKey: pKey)
|
|
|
+ self._syncDataToUserDefault(newValue, forKey: pKey)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
var lineNoteStartLineStyle: Int {
|
|
|
get {
|
|
|
- return self.getData(forKey: KMPreference.lineNoteStartLineStyleKey) as? Int ?? self.lineNoteStartLineStyleDefaultValue()
|
|
|
+ let pKey = KMPreference.lineNoteStartLineStyleKey
|
|
|
+ let udKey = KMPreferenceKeyToUDKey(pKey: pKey) ?? ""
|
|
|
+ let num = KMDataManager.ud_object(forKey: udKey) as? NSNumber
|
|
|
+ return num?.intValue ?? self.lineNoteStartLineStyleDefaultValue()
|
|
|
+// return self.getData(forKey: KMPreference.lineNoteStartLineStyleKey) as? Int ?? self.lineNoteStartLineStyleDefaultValue()
|
|
|
}
|
|
|
set {
|
|
|
- self.syncDataToPDFView(newValue, forKey: KMPreference.lineNoteStartLineStyleKey)
|
|
|
+ let pKey = KMPreference.lineNoteStartLineStyleKey
|
|
|
+ self.syncDataToPDFView(newValue, forKey: pKey)
|
|
|
|
|
|
- _ = self.setData(data: newValue, forKey: KMPreference.lineNoteStartLineStyleKey)
|
|
|
+ _ = self.setData(data: newValue, forKey: pKey)
|
|
|
+ self._syncDataToUserDefault(NSNumber(value: newValue), forKey: pKey)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
var lineNoteEndLineStyle: Int {
|
|
|
get {
|
|
|
- return self.getData(forKey: KMPreference.lineNoteEndLineStyleKey) as? Int ?? self.lineNoteEndLineStyleDefaultValue()
|
|
|
+ let pKey = KMPreference.lineNoteEndLineStyleKey
|
|
|
+ let udKey = KMPreferenceKeyToUDKey(pKey: pKey) ?? ""
|
|
|
+ let num = KMDataManager.ud_object(forKey: udKey) as? NSNumber
|
|
|
+ return num?.intValue ?? self.lineNoteEndLineStyleDefaultValue()
|
|
|
+// return self.getData(forKey: KMPreference.lineNoteEndLineStyleKey) as? Int ?? self.lineNoteEndLineStyleDefaultValue()
|
|
|
}
|
|
|
set {
|
|
|
- self.syncDataToPDFView(newValue, forKey: KMPreference.lineNoteEndLineStyleKey)
|
|
|
+ let pKey = KMPreference.lineNoteEndLineStyleKey
|
|
|
+ self.syncDataToPDFView(newValue, forKey: pKey)
|
|
|
|
|
|
- _ = self.setData(data: newValue, forKey: KMPreference.lineNoteEndLineStyleKey)
|
|
|
+ _ = self.setData(data: newValue, forKey: pKey)
|
|
|
+ self._syncDataToUserDefault(NSNumber(value: newValue), forKey: pKey)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
var inkNoteLineWidth: Float {
|
|
|
get {
|
|
|
- return self.getData(forKey: KMPreference.inkNoteLineWidthKey) as? Float ?? self.inkNoteLineWidthDefaultValue()
|
|
|
+ let pKey = KMPreference.inkNoteLineWidthKey
|
|
|
+ let udKey = KMPreferenceKeyToUDKey(pKey: pKey) ?? ""
|
|
|
+ let num = KMDataManager.ud_object(forKey: udKey) as? NSNumber
|
|
|
+ return num?.floatValue ?? self.inkNoteLineWidthDefaultValue()
|
|
|
+// return self.getData(forKey: KMPreference.inkNoteLineWidthKey) as? Float ?? self.inkNoteLineWidthDefaultValue()
|
|
|
}
|
|
|
set {
|
|
|
- self.syncDataToPDFView(newValue, forKey: KMPreference.inkNoteLineWidthKey)
|
|
|
+ let pKey = KMPreference.inkNoteLineWidthKey
|
|
|
+ self.syncDataToPDFView(newValue, forKey: pKey)
|
|
|
|
|
|
- _ = self.setData(data: newValue, forKey: KMPreference.inkNoteLineWidthKey)
|
|
|
+ _ = self.setData(data: newValue, forKey: pKey)
|
|
|
+ self._syncDataToUserDefault(NSNumber(value: newValue), forKey: pKey)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
var inkNoteLineStyle: Int {
|
|
|
get {
|
|
|
- return self.getData(forKey: KMPreference.inkNoteLineStyleKey) as? Int ?? self.inkNoteLineStyleDefaultValue()
|
|
|
+ let pKey = KMPreference.inkNoteLineStyleKey
|
|
|
+ let udKey = KMPreferenceKeyToUDKey(pKey: pKey) ?? ""
|
|
|
+ let num = KMDataManager.ud_object(forKey: udKey) as? NSNumber
|
|
|
+ return num?.intValue ?? self.inkNoteLineStyleDefaultValue()
|
|
|
+// return self.getData(forKey: KMPreference.inkNoteLineStyleKey) as? Int ?? self.inkNoteLineStyleDefaultValue()
|
|
|
}
|
|
|
set {
|
|
|
- self.syncDataToPDFView(newValue, forKey: KMPreference.inkNoteLineStyleKey)
|
|
|
+ let pKey = KMPreference.inkNoteLineStyleKey
|
|
|
+ self.syncDataToPDFView(newValue, forKey: pKey)
|
|
|
|
|
|
- _ = self.setData(data: newValue, forKey: KMPreference.inkNoteLineStyleKey)
|
|
|
+ _ = self.setData(data: newValue, forKey: pKey)
|
|
|
+ self._syncDataToUserDefault(NSNumber(value: newValue), forKey: pKey)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
var inkNoteDashPattern: [CGFloat] {
|
|
|
get {
|
|
|
- return self.getData(forKey: KMPreference.inkNoteDashPatternKey) as? [CGFloat] ?? self.inkNoteDashPatternDefaultValue()
|
|
|
+ let pKey = KMPreference.inkNoteDashPatternKey
|
|
|
+ let udKey = KMPreferenceKeyToUDKey(pKey: pKey) ?? ""
|
|
|
+ return KMDataManager.ud_array(forKey: udKey) as? [CGFloat] ?? self.inkNoteDashPatternDefaultValue()
|
|
|
+// return self.getData(forKey: KMPreference.inkNoteDashPatternKey) as? [CGFloat] ?? self.inkNoteDashPatternDefaultValue()
|
|
|
}
|
|
|
set {
|
|
|
- self.syncDataToPDFView(newValue, forKey: KMPreference.inkNoteDashPatternKey)
|
|
|
+ let pKey = KMPreference.inkNoteDashPatternKey
|
|
|
+ self.syncDataToPDFView(newValue, forKey: pKey)
|
|
|
|
|
|
- _ = self.setData(data: newValue, forKey: KMPreference.inkNoteDashPatternKey)
|
|
|
+ _ = self.setData(data: newValue, forKey: pKey)
|
|
|
+ self._syncDataToUserDefault(newValue, forKey: pKey)
|
|
|
}
|
|
|
}
|
|
|
}
|
