【2025】【Form】

1、偏好设置重复数据处理
2、Textfield数据处理

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/Form/CPDFTextWidgetAnnotation+PDFListView.swift

@@ -194,6 +194,9 @@ extension CPDFTextWidgetAnnotation {
             }
         }
         pdfView.setNeedsDisplayMultiAnnotations(annotations)
+        
+        CPDFAnnotationConfig.setDefaultColor(resultColor, toKey: CAnnotationTextWidgetFontColorKey)
+        
     }
     
     class func update(_ annotations: [CPDFTextWidgetAnnotation], borderColor color: NSColor?, PDFView pdfView: CPDFListView?) {
@@ -212,6 +215,8 @@ extension CPDFTextWidgetAnnotation {
             }
         }
         pdfView.setNeedsDisplayMultiAnnotations(annotations)
+        
+        CPDFAnnotationConfig.setDefaultColor(resultColor, toKey: CAnnotationTextWidgetBorderColorKey)
     }
     
     class func update(_ annotations: [CPDFTextWidgetAnnotation], fillColor color: NSColor?, PDFView pdfView: CPDFListView?) {
@@ -230,6 +235,8 @@ extension CPDFTextWidgetAnnotation {
             }
         }
         pdfView.setNeedsDisplayMultiAnnotations(annotations)
+        
+        CPDFAnnotationConfig.setDefaultColor(resultColor, toKey: CAnnotationTextWidgetBackgroundColorKey)
     }
     
     class func update(_ annotations: [CPDFTextWidgetAnnotation], isMultiLine multi: Bool, PDFView pdfView: CPDFListView?) {
@@ -241,6 +248,9 @@ extension CPDFTextWidgetAnnotation {
             annotation.isMultiline = multi
         }
         pdfView.setNeedsDisplayMultiAnnotations(annotations)
+        
+        CPDFAnnotationConfig.setDefaultBoolValue(multi, toKey: CAnnotationTextWidgetMultilineKey)
+        
     }
     
     class func updateFontAlignment(_ annotations: [CPDFTextWidgetAnnotation], _ alignment: NSTextAlignment, withPDFView pdfView: CPDFListView?) {
@@ -252,7 +262,7 @@ extension CPDFTextWidgetAnnotation {
         }
         pdfView.setNeedsDisplayMultiAnnotations(annotations)
         
-        CPDFAnnotationConfig.setDefaultIntValue(alignment.rawValue, toKey: CFreeTextNoteAlignmentKey)
+        CPDFAnnotationConfig.setDefaultIntValue(alignment.rawValue, toKey: CAnnotationTextWidgetAlignmenKey)
         
     }
     
@@ -265,10 +275,10 @@ extension CPDFTextWidgetAnnotation {
         }
         pdfView.setNeedsDisplayMultiAnnotations(annotations)
         
-        CPDFAnnotationConfig.setDefaultStringValue(cfont.familyName, toKey: CFreeTextNoteFontNameKey)
+        CPDFAnnotationConfig.setDefaultStringValue(cfont.familyName, toKey: SKAnnotationTextWidgetFontNameKey)
         
         if let styleName = cfont.styleName {
-            CPDFAnnotationConfig.setDefaultStringValue(styleName, toKey: CFreeTextNoteFontStyleKey)
+            CPDFAnnotationConfig.setDefaultStringValue(styleName, toKey: SKAnnotationTextWidgetFontStyleKey)
         }
     }
     
@@ -281,6 +291,6 @@ extension CPDFTextWidgetAnnotation {
         }
         pdfView.setNeedsDisplayMultiAnnotations(annotations)
         
-        CPDFAnnotationConfig.setDefaultFloatValue(size, toKey: CFreeTextNoteFontSizeKey)
+        CPDFAnnotationConfig.setDefaultFloatValue(size, toKey: SKAnnotationTextWidgetFontSizeKey)
     }
 }

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

@@ -1597,13 +1597,7 @@ extension KMMainViewController {
             var blue: CGFloat = 0.0
             var alpha: CGFloat = 0.0
             (listView.activeAnnotation as! CPDFMarkupAnnotation).color.usingColorSpaceName(.calibratedRGB)?.getRed(&red, green: &green, blue: &blue, alpha: &alpha)
-            if sender.tag == CAnnotationType.highlight.rawValue {
-                KMPreferenceManager.shared.setData(data: [red, green, blue, (listView.activeAnnotation as! CPDFMarkupAnnotation).opacity], forKey: KMPreference.markupColorHighlightKey)
-            } else if sender.tag == CAnnotationType.underline.rawValue {
-                KMPreferenceManager.shared.setData(data: [red, green, blue, (listView.activeAnnotation as! CPDFMarkupAnnotation).opacity], forKey: KMPreference.markupColorUnderlineKey)
-            } else if sender.tag == CAnnotationType.strikeOut.rawValue {
-                KMPreferenceManager.shared.setData(data: [red, green, blue, (listView.activeAnnotation as! CPDFMarkupAnnotation).opacity], forKey: KMPreference.markupColorStrikthroughKey)
-            }
+            
         case CAnnotationType.ink.rawValue:
             model.setColor((listView.activeAnnotation as! CPDFInkAnnotation).color)
             model.setOpacity((listView.activeAnnotation as! CPDFInkAnnotation).opacity)
@@ -1615,7 +1609,7 @@ extension KMMainViewController {
             var blue: CGFloat = 0.0
             var alpha: CGFloat = 0.0
             (listView.activeAnnotation as! CPDFInkAnnotation).color.usingColorSpaceName(.calibratedRGB)?.getRed(&red, green: &green, blue: &blue, alpha: &alpha)
-            KMPreferenceManager.shared.setData(data: [red, green, blue, (listView.activeAnnotation as! CPDFInkAnnotation).opacity], forKey: KMPreference.markupColorPenKey)
+            
         case CAnnotationType.freeText.rawValue:
             model.setColor((listView.activeAnnotation as! CPDFFreeTextAnnotation).color)
             model.setOpacity((listView.activeAnnotation as! CPDFFreeTextAnnotation).opacity)
@@ -1629,16 +1623,13 @@ extension KMMainViewController {
             var blue: CGFloat = 0.0
             var alpha: CGFloat = 0.0
             (listView.activeAnnotation as! CPDFFreeTextAnnotation).fontColor.usingColorSpaceName(.calibratedRGB)?.getRed(&red, green: &green, blue: &blue, alpha: &alpha)
-            KMPreferenceManager.shared.setData(data: [red, green, blue, (listView.activeAnnotation as! CPDFFreeTextAnnotation).opacity], forKey: KMPreference.markupColorTextKey)
-            
+           
             if (KMPreferenceManager.supportFonts.contains((listView.activeAnnotation as! CPDFFreeTextAnnotation).font.fontName)) {
-                UserDefaults.standard.set((listView.activeAnnotation as! CPDFFreeTextAnnotation).font.fontName, forKey: KMPreference.markupFontTextStringKey)
-                UserDefaults.standard.synchronize()
+                
             }
             let alignment = (listView.activeAnnotation as! CPDFFreeTextAnnotation).alignment
             if (alignment == .left || alignment == .center || alignment == .right) {
-                UserDefaults.standard.set(alignment.rawValue, forKey: KMPreference.markupFontTextAligmentKey)
-                UserDefaults.standard.synchronize()
+                
             }
         case CAnnotationType.anchored.rawValue:
             model.setColor((listView.activeAnnotation as! CPDFTextAnnotation).color)
@@ -1649,8 +1640,7 @@ extension KMMainViewController {
             var blue: CGFloat = 0.0
             var alpha: CGFloat = 0.0
             (listView.activeAnnotation as! CPDFTextAnnotation).color.usingColorSpaceName(.calibratedRGB)?.getRed(&red, green: &green, blue: &blue, alpha: &alpha)
-            KMPreferenceManager.shared.setData(data: [red, green, blue, alpha], forKey: KMPreference.markupColorNoteKey)
-        case CAnnotationType.square.rawValue:
+         case CAnnotationType.square.rawValue:
             model.setInteriorColor((listView.activeAnnotation as! CPDFSquareAnnotation).interiorColor)
             model.setColor((listView.activeAnnotation as! CPDFSquareAnnotation).color)
             model.setOpacity((listView.activeAnnotation as! CPDFSquareAnnotation).opacity)
@@ -1661,10 +1651,8 @@ extension KMMainViewController {
             var blue: CGFloat = 0.0
             var alpha: CGFloat = 0.0
             (listView.activeAnnotation as! CPDFSquareAnnotation).interiorColor.usingColorSpaceName(.calibratedRGB)?.getRed(&red, green: &green, blue: &blue, alpha: &alpha)
-            KMPreferenceManager.shared.setData(data: [red, green, blue, (listView.activeAnnotation as! CPDFSquareAnnotation).interiorOpacity], forKey: KMPreference.markupColorRectangleFillKey)
-            (listView.activeAnnotation as! CPDFSquareAnnotation).color.usingColorSpaceName(.calibratedRGB)?.getRed(&red, green: &green, blue: &blue, alpha: &alpha)
-            KMPreferenceManager.shared.setData(data: [red, green, blue, (listView.activeAnnotation as! CPDFSquareAnnotation).opacity], forKey: KMPreference.markupColorRectangleBorderKey)
-        case CAnnotationType.circle.rawValue:
+             (listView.activeAnnotation as! CPDFSquareAnnotation).color.usingColorSpaceName(.calibratedRGB)?.getRed(&red, green: &green, blue: &blue, alpha: &alpha)
+         case CAnnotationType.circle.rawValue:
             model.setInteriorColor((listView.activeAnnotation as! CPDFCircleAnnotation).interiorColor)
             model.setColor((listView.activeAnnotation as! CPDFCircleAnnotation).color)
             model.setOpacity((listView.activeAnnotation as! CPDFCircleAnnotation).opacity)
@@ -1675,10 +1663,8 @@ extension KMMainViewController {
             var blue: CGFloat = 0.0
             var alpha: CGFloat = 0.0
             (listView.activeAnnotation as! CPDFCircleAnnotation).interiorColor.usingColorSpaceName(.calibratedRGB)?.getRed(&red, green: &green, blue: &blue, alpha: &alpha)
-            KMPreferenceManager.shared.setData(data: [red, green, blue, (listView.activeAnnotation as! CPDFCircleAnnotation).interiorOpacity], forKey: KMPreference.markupColorCircleFillKey)
-            (listView.activeAnnotation as! CPDFCircleAnnotation).color.usingColorSpaceName(.calibratedRGB)?.getRed(&red, green: &green, blue: &blue, alpha: &alpha)
-            KMPreferenceManager.shared.setData(data: [red, green, blue, (listView.activeAnnotation as! CPDFCircleAnnotation).opacity], forKey: KMPreference.markupColorCircleBorderKey)
-        default:
+             (listView.activeAnnotation as! CPDFCircleAnnotation).color.usingColorSpaceName(.calibratedRGB)?.getRed(&red, green: &green, blue: &blue, alpha: &alpha)
+         default:
             break
         }
     }

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

@@ -70,18 +70,7 @@ extension KMMainViewController {
             self.listView.setShouldAntiAlias(KMPreference.shared.antiAliasText)
             self.listView.applyDefaultInterpolationQuality()
         }
-        if info.keys.contains(KMPreference.markupColorHighlightKey) {
-             
-        }
-        if info.keys.contains(KMPreference.markupColorUnderlineKey) {
-             
-        }
-        if info.keys.contains(KMPreference.markupColorStrikthroughKey) {
-             
-        }
-        if info.keys.contains(KMPreference.markupColorPenKey) {
-             
-        }
+         
         if info.keys.contains(KMPreference.editPDFPopWindowShowKey) {
             let show = KMPreference.shared.editPDFPopWindowIsShow
              

PDF Office/PDF Master/Class/Preference/Controller/KMNotesPreferences.swift

@@ -204,61 +204,7 @@ class KMNotesPreferences: NSViewController {
     }
     
     private func _initValues() {
-        self.textColorWell.color = KMPreference.shared.markupTextColor
-        self.anchoredColorWell.color = KMPreference.shared.markupNoteColor
-        self.lineColorWell.color = KMPreference.shared.markupLineColor
-//        self.lineInteriorColorWell.color = KMPreference.shared.markupLineColor
-        
-        self.circleColorWell.color = KMPreference.shared.markupCircleBorderColor
-        self.circleInteriorColorWell.color = KMPreference.shared.markupCircleFillColor
-        self.rectColorWell.color = KMPreference.shared.markupRectangleBorderColor
-        self.rectInteriorColorWell.color = KMPreference.shared.markupRectangleFillColor
-        
-        self.highlightColorWell.color = KMPreference.shared.markupHighlightColor
-        self.underlineColorWell.color = KMPreference.shared.markupUnderlineColor
-        self.strikeThroughColorWell.color = KMPreference.shared.markupStrikthroughColor
-        self.freehandColorWell.color = KMPreference.shared.markupPenColor
-        
-        let textFontName = KMPreference.shared.markupFontTextString
-        let textFontSize = KMPreference.shared.markupTextFontSize
-        let textFont = NSFont(name: textFontName, size: textFontSize.cgFloat)
-        self.fontWell1.font = textFont
-        
-        let noteFontName = KMPreference.shared.markupFontNoteString
-        let noteFontSize = KMPreference.shared.markupNoteFontSize
-        let noteFont = NSFont(name: noteFontName, size: noteFontSize.cgFloat)
-        self.fontWell2.font = noteFont
-        let alignment = KMPreference.shared.markupFontTextAligment
-        if alignment == .left {
-            self.alignmentSegmentControl.selectedSegment = 0
-        } else if alignment == .center {
-            self.alignmentSegmentControl.selectedSegment = 1
-        } else if alignment == .right {
-            self.alignmentSegmentControl.selectedSegment = 2
-        }
-        
-        self.textLineWell.displayStyle = .rectangle
-        self.textLineWell.lineWidth = KMPreference.shared.freeTextNoteLineWidth.cgFloat
-        self.textLineWell.style = CPDFBorderStyle(rawValue: KMPreference.shared.freeTextNoteLineStyle) ?? .solid
-        self.textLineWell.dashPattern = KMPreference.shared.freeTextNoteDashPattern as NSArray
-        self.lineLineWell.displayStyle = .line
-        self.lineLineWell.lineWidth = KMPreference.shared.lineNoteLineWidth.cgFloat
-        self.lineLineWell.style = CPDFBorderStyle(rawValue: KMPreference.shared.lineNoteLineStyle) ?? .solid
-        self.lineLineWell.dashPattern = KMPreference.shared.lineNoteDashPattern as NSArray
-        self.lineLineWell.startLineStyle = CPDFLineStyle(rawValue: KMPreference.shared.lineNoteStartLineStyle) ?? .none
-        self.lineLineWell.endLineStyle = CPDFLineStyle(rawValue: KMPreference.shared.lineNoteEndLineStyle) ?? .none
-        self.freehandLineWell.displayStyle = .simpleLine
-        self.freehandLineWell.lineWidth = KMPreference.shared.inkNoteLineWidth.cgFloat
-        self.freehandLineWell.style = CPDFBorderStyle(rawValue: KMPreference.shared.inkNoteLineStyle) ?? .solid
-        self.freehandLineWell.dashPattern = KMPreference.shared.inkNoteDashPattern as NSArray
-        self.circleLineWell.displayStyle = .oval
-        self.circleLineWell.lineWidth = KMPreference.shared.circleNoteLineWidth.cgFloat
-        self.circleLineWell.style = CPDFBorderStyle(rawValue: KMPreference.shared.circleNoteLineStyle) ?? .solid
-        self.circleLineWell.dashPattern = KMPreference.shared.circleNoteDashPattern as NSArray
-        self.rectLineWell.displayStyle = .rectangle
-        self.rectLineWell.lineWidth = KMPreference.shared.squareNoteLineWidth.cgFloat
-        self.rectLineWell.style = CPDFBorderStyle(rawValue: KMPreference.shared.squareNoteLineStyle) ?? .solid
-        self.rectLineWell.dashPattern = KMPreference.shared.squareNoteDashPattern as NSArray
+       
     }
     
     private func _initActions() {
@@ -309,160 +255,85 @@ class KMNotesPreferences: NSViewController {
     }
     
     @objc func textColorWellAction(_ sender: NSColorWell) {
-        KMPreference.shared.markupTextColor = sender.color
+        
     }
     
     @objc func anchoredColorWellAction(_ sender: NSColorWell) {
-        if let color = sender.color.usingColorSpaceName(NSColorSpaceName.calibratedRGB) {
-            KMPreference.shared.markupNoteColor = color
-        }
+        
     }
     
     @objc func lineColorWellAction(_ sender: NSColorWell) {
-        if let color = sender.color.usingColorSpaceName(NSColorSpaceName.calibratedRGB) {
-            KMPreference.shared.markupLineColor = color
-        }
+        
     }
     
     @objc func lineInteriorColorWellAction(_ sender: NSColorWell) {
-//        KMPreference.shared.markupLineColor = sender.color
-    }
+     }
     
     @objc func circleColorWellAction(_ sender: NSColorWell) {
-        if let color = sender.color.usingColorSpaceName(NSColorSpaceName.calibratedRGB) {
-            KMPreference.shared.markupCircleBorderColor = color
-        }
+         
     }
     
     @objc func circleInteriorColorWellAction(_ sender: NSColorWell) {
-        if let color = sender.color.usingColorSpaceName(NSColorSpaceName.calibratedRGB) {
-            KMPreference.shared.markupCircleFillColor = color
-        }
+        
     }
     
     @objc func rectColorWellAction(_ sender: NSColorWell) {
-        if let color = sender.color.usingColorSpaceName(NSColorSpaceName.calibratedRGB) {
-            KMPreference.shared.markupRectangleBorderColor = color
-        }
+         
     }
     
     @objc func rectInteriorColorWellAction(_ sender: NSColorWell) {
-        if let color = sender.color.usingColorSpaceName(NSColorSpaceName.calibratedRGB) {
-            KMPreference.shared.markupRectangleFillColor = color
-        }
+         
     }
     
     @objc func highlightColorWellAction(_ sender: NSColorWell) {
-        if let color = sender.color.usingColorSpaceName(NSColorSpaceName.calibratedRGB) {
-            KMPreference.shared.markupHighlightColor = color
-        }
+         
     }
     
     @objc func underlineColorWellAction(_ sender: NSColorWell) {
-        if let color = sender.color.usingColorSpaceName(NSColorSpaceName.calibratedRGB) {
-            KMPreference.shared.markupUnderlineColor = color
-        }
+        
     }
     
     @objc func strikeThroughColorWellAction(_ sender: NSColorWell) {
-        if let color = sender.color.usingColorSpaceName(NSColorSpaceName.calibratedRGB) {
-            KMPreference.shared.markupStrikthroughColor = color
-        }
+        
     }
     
     @objc func freehandColorWellAction(_ sender: NSColorWell) {
-        if let color = sender.color.usingColorSpaceName(NSColorSpaceName.calibratedRGB) {
-            KMPreference.shared.markupPenColor = color
-        }
+         
     }
     
     // MARK: - Font
     
     @objc func textFontWellAction(_ sender: KMFontWell) {
-//        KMPrint("\(sender.fontName),\(sender.fontSize)")
-        KMPreference.shared.markupFontTextString = sender.fontName ?? ""
-        KMPreference.shared.markupTextFontSize = Float(sender.fontSize)
+         
     }
     
     @objc func anchoredFontWellAction(_ sender: KMFontWell) {
-        KMPreference.shared.markupFontNoteString = sender.fontName ?? ""
-        KMPreference.shared.markupNoteFontSize = Float(sender.fontSize)
     }
     
     @objc func alignmentSegmentAction(_ sender: NSSegmentedControl) {
-        if sender.selectedSegment == 0 {
-            KMPreference.shared.markupFontTextAligment = .left
-        } else if sender.selectedSegment == 1 {
-            KMPreference.shared.markupFontTextAligment = .center
-        } else if sender.selectedSegment == 2 {
-            KMPreference.shared.markupFontTextAligment = .right
-        }
+        
     }
     
     // MARK: - LineWell
     
     @objc func textLineWellAction(_ sender: KMLineWell) {
-        let action = KMLineInspector.shared.currentLineChangeAction
-        if action == .lineWidth {
-            KMPreference.shared.freeTextNoteLineWidth = Float(sender.lineWidth)
-        } else if action == .style {
-            KMPreference.shared.freeTextNoteLineStyle = sender.style.rawValue
-        } else if action == .dashPattern {
-            KMPreference.shared.freeTextNoteDashPattern = sender.dashPattern as? [CGFloat] ?? []
-        }
+       
     }
     
     @objc func lineLineWellAction(_ sender: KMLineWell) {
-        let action = KMLineInspector.shared.currentLineChangeAction
-        if action == .lineWidth {
-            KMPreference.shared.lineNoteLineWidth = Float(sender.lineWidth)
-        } else if action == .style {
-            KMPreference.shared.lineNoteLineStyle = sender.style.rawValue
-        } else if action == .dashPattern {
-            KMPreference.shared.lineNoteDashPattern = sender.dashPattern as? [CGFloat] ?? []
-        } else if action == .startLineStyle {
-            KMPreference.shared.lineNoteStartLineStyle = sender.startLineStyle.rawValue
-        } else if action == .endLineStyle {
-            KMPreference.shared.lineNoteEndLineStyle = sender.endLineStyle.rawValue
-        }
+        
     }
     
     @objc func freehandLineWellAction(_ sender: KMLineWell) {
-        let action = KMLineInspector.shared.currentLineChangeAction
-        if action == .lineWidth {
-            KMPreference.shared.inkNoteLineWidth = Float(sender.lineWidth)
-        } else if action == .style {
-            KMPreference.shared.inkNoteLineStyle = sender.style.rawValue
-        } else if action == .dashPattern {
-            KMPreference.shared.inkNoteDashPattern = sender.dashPattern as? [CGFloat] ?? []
-        }
+        
     }
     
     @objc func circleLineWellAction(_ sender: KMLineWell) {
-//        KMPreference.shared.beginGrouping()
-//        KMPreference.shared.circleNoteLineWidth = Float(sender.lineWidth)
-//        KMPreference.shared.circleNoteLineStyle = sender.style.rawValue
-//        KMPreference.shared.circleNoteDashPattern = sender.dashPattern as? [CGFloat] ?? []
-//        KMPreference.shared.endGrouping()
-        let action = KMLineInspector.shared.currentLineChangeAction
-        if action == .lineWidth {
-            KMPreference.shared.circleNoteLineWidth = Float(sender.lineWidth)
-        } else if action == .style {
-            KMPreference.shared.circleNoteLineStyle = sender.style.rawValue
-        } else if action == .dashPattern {
-            KMPreference.shared.circleNoteDashPattern = sender.dashPattern as? [CGFloat] ?? []
-        }
+ 
     }
     
     @objc func rectLineWellAction(_ sender: KMLineWell) {
-        let action = KMLineInspector.shared.currentLineChangeAction
-        if action == .lineWidth {
-            KMPreference.shared.squareNoteLineWidth = Float(sender.lineWidth)
-        } else if action == .style {
-            KMPreference.shared.squareNoteLineStyle = sender.style.rawValue
-        } else if action == .dashPattern {
-            KMPreference.shared.squareNoteDashPattern = sender.dashPattern as? [CGFloat] ?? []
-        }
+      
     }
 }
 

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

@@ -31,87 +31,8 @@ public let KMFullScreenBackgroundColorKey                       = "SKFullScreenB
 public let KMReadingBarColorKey                                 = "SKReadingBarColor"
 public let KMReadingBarInvertKey                                = "SKReadingBarInvert"
 
-// note
-public let KMAnchoredNoteColorKey                               = "SKAnchoredNoteColor"
-public let KMLineNoteColorKey                                   = "SKLineNoteColor"
-public let KMLineNoteInteriorColorKey                           = "SKLineNoteInteriorColor"
-public let KMCircleNoteColorKey                                 = "SKCircleNoteColor"
-public let KMCircleNoteInteriorColorKey                         = "SKCircleNoteInteriorColor"
-public let KMSquareNoteInteriorColorKey                         = "SKSquareNoteInteriorColor"
-public let KMHighlightNoteColorKey                              = "SKHighlightNoteColor"
-public let KMUnderlineNoteColorKey                              = "SKUnderlineNoteColor"
-public let KMStrikeOutNoteColorKey                              = "SKStrikeOutNoteColor"
-
-// font
-public let KMFreeTextNoteFontNameKey                            = "SKFreeTextNoteFontName"
-public let KMFreeTextNoteFontSizeKey                            = "SKFreeTextNoteFontSize"
-public let KMFreeTextNoteAlignmentKey                           = "SKFreeTextNoteAlignment"
-public let KMAnchoredNoteFontNameKey                            = "SKAnchoredNoteFontName"
-public let KMAnchoredNoteFontSizeKey                            = "SKAnchoredNoteFontSize"
-// line style
-public let KMFreeTextNoteLineStyleKey                           = "SKFreeTextNoteLineStyle"
-public let KMFreeTextNoteLineWidthKey                           = "SKFreeTextNoteLineWidth"
-public let KMFreeTextNoteDashPatternKey                         = "SKFreeTextNoteDashPattern"
-public let KMCircleNoteLineStyleKey                             = "SKCircleNoteLineStyle"
-public let KMCircleNoteLineWidthKey                             = "SKCircleNoteLineWidth"
-public let KMCircleNoteDashPatternhKey                          = "SKCircleNoteDashPattern"
-public let KMSquareNoteLineStyleKey                             = "SKSquareNoteLineStyle"
-public let KMSquareNoteLineWidthKey                             = "SKSquareNoteLineWidth"
-public let KMSquareNoteDashPatternKey                           = "SKSquareNoteDashPattern"
-public let KMLineNoteLineStyleKey                               = "SKLineNoteLineStyle"
-public let KMLineNoteLineWidthKey                               = "SKLineNoteLineWidth"
-public let KMLineNoteDashPatternKey                             = "SKLineNoteDashPattern"
-public let KMLineNoteStartLineStyleKey                          = "SKLineNoteStartLineStyle"
-public let KMLineNoteEndLineStyleKey                            = "SKLineNoteEndLineStyle"
-public let KMInkNoteLineStyleKey                                = "SKInkNoteLineStyle"
-public let KMInkNoteLineWidthKey                                = "SKInkNoteLineWidth"
-public let KMInkNoteDashPatternKey                              = "SKInkNoteDashPattern"
-
 func KMPreferenceKeyToCKey(pKey: KMPreferenceKey) -> String? {
-    // freeText
-    if pKey == KMPreference.freeTextNoteLineWidthKey {
-        return CFreeTextNoteLineWidthKey
-    } else if pKey == KMPreference.freeTextNoteLineStyleKey {
-        return CFreeTextNoteLineStyleKey
-    } else if pKey == KMPreference.freeTextNoteDashPatternKey {
-        return CFreeTextNoteDashPatternKey
-    }
-    // Line
-    else if pKey == KMPreference.lineNoteLineWidthKey {
-        return CLineNoteLineWidthKey
-    } else if pKey == KMPreference.lineNoteLineStyleKey {
-        return CLineNoteLineStyleKey
-    } else if pKey == KMPreference.lineNoteDashPatternKey {
-        return CLineNoteDashPatternKey
-    } else if pKey == KMPreference.lineNoteStartLineStyleKey {
-        return CLineNoteStartLineStyleKey
-    } else if pKey == KMPreference.lineNoteEndLineStyleKey {
-        return CLineNoteEndLineStyleKey
-    }
-    // freehand
-    else if pKey == KMPreference.inkNoteLineWidthKey {
-        return CInkNoteLineWidthKey
-    } else if pKey == KMPreference.inkNoteLineStyleKey {
-        return CInkNoteLineStyleKey
-    } else if pKey == KMPreference.inkNoteDashPatternKey {
-        return CInkNoteDashPatternKey
-    }
-    // circle
-    else if pKey == KMPreference.circleNoteLineWidthKey {
-        return CCircleNoteLineWidthKey
-    } else if pKey == KMPreference.circleNoteLineStyleKey {
-        return CCircleNoteLineStyleKey
-    } else if pKey == KMPreference.circleNoteDashPatternKey {
-        return CCircleNoteDashPatternKey
-    }
-    // rect
-    else if pKey == KMPreference.squareNoteLineWidthKey {
-        return CSquareNoteLineWidthKey
-    } else if pKey == KMPreference.squareNoteLineStyleKey {
-        return CSquareNoteLineStyleKey
-    } else if pKey == KMPreference.squareNoteDashPatternKey {
-        return CSquareNoteDashPatternKey
-    }
+    
     return nil
 }
 
@@ -158,89 +79,10 @@ func KMPreferenceKeyToUDKey(pKey: KMPreferenceKey) -> String? {
     } else if pKey == KMPreference.invertBarKey {
         return KMReadingBarInvertKey
     }
-    // note
-    else if pKey == KMPreference.markupColorTextKey {
-        return ""
-    } else if pKey == KMPreference.markupColorNoteKey {
-        return KMAnchoredNoteColorKey
-    } else if pKey == KMPreference.markupColorLineKey {
-        return KMLineNoteColorKey
-    }
-//    else if pKey == KMPreference.markup
-    else if pKey == KMPreference.markupColorCircleBorderKey {
-        return KMCircleNoteColorKey
-    } else if pKey == KMPreference.markupColorCircleFillKey {
-        return KMCircleNoteInteriorColorKey
-    } else if pKey == KMPreference.markupColorRectangleBorderKey {
-
-    } else if pKey == KMPreference.markupColorRectangleFillKey {
-        return KMSquareNoteInteriorColorKey
-    } else if pKey == KMPreference.markupColorHighlightKey {
-        return KMHighlightNoteColorKey
-    } else if pKey == KMPreference.markupColorUnderlineKey {
-        return KMUnderlineNoteColorKey
-    } else if pKey == KMPreference.markupColorStrikthroughKey {
-        return KMStrikeOutNoteColorKey
-    } else if pKey == KMPreference.markupColorPenKey {
-
-    }
-    // font
-    else if pKey == KMPreference.markupFontTextStringKey {
-        return KMFreeTextNoteFontNameKey
-    } else if pKey == KMPreference.markupTextFontSizeKey {
-        return KMFreeTextNoteFontSizeKey
-    } else if pKey == KMPreference.markupFontTextAligmentKey {
-        return KMFreeTextNoteAlignmentKey
-    } else if pKey == KMPreference.markupFontNoteStringKey {
-        return KMAnchoredNoteFontNameKey
-    } else if pKey == KMPreference.markupNoteFontSizeKey {
-        return KMAnchoredNoteFontSizeKey
-    }
-    // line style
-    else if pKey == KMPreference.freeTextNoteLineStyleKey {
-        return KMFreeTextNoteLineStyleKey
-    } else if pKey == KMPreference.freeTextNoteLineWidthKey {
-        return KMFreeTextNoteLineWidthKey
-    } else if pKey == KMPreference.freeTextNoteDashPatternKey {
-        return KMFreeTextNoteDashPatternKey
-    }
-    else if pKey == KMPreference.circleNoteLineStyleKey {
-        return KMCircleNoteLineStyleKey
-    } else if pKey == KMPreference.circleNoteLineWidthKey {
-        return KMCircleNoteLineWidthKey
-    } else if pKey == KMPreference.circleNoteDashPatternKey {
-        return KMCircleNoteDashPatternhKey
-    }
-    else if pKey == KMPreference.squareNoteLineStyleKey {
-        return KMSquareNoteLineStyleKey
-    } else if pKey == KMPreference.squareNoteLineWidthKey {
-        return KMSquareNoteLineWidthKey
-    } else if pKey == KMPreference.squareNoteDashPatternKey {
-        return KMSquareNoteDashPatternKey
-    }
-    else if pKey == KMPreference.lineNoteLineStyleKey {
-        return KMLineNoteLineStyleKey
-    } else if pKey == KMPreference.lineNoteLineWidthKey {
-        return KMLineNoteLineWidthKey
-    } else if pKey == KMPreference.lineNoteDashPatternKey {
-        return KMLineNoteDashPatternKey
-    } else if pKey == KMPreference.lineNoteStartLineStyleKey {
-        return KMLineNoteStartLineStyleKey
-    } else if pKey == KMPreference.lineNoteEndLineStyleKey {
-        return KMLineNoteEndLineStyleKey
-    }
-    else if pKey == KMPreference.inkNoteLineStyleKey {
-        return KMInkNoteLineStyleKey
-    } else if pKey == KMPreference.inkNoteLineWidthKey {
-        return KMInkNoteLineWidthKey
-    } else if pKey == KMPreference.inkNoteDashPatternKey {
-        return KMInkNoteDashPatternKey
-    }
+     
     return nil
 }
 
-//public let KMLineNoteInteriorColorKey                           = "SKLineNoteInteriorColor"
-
 func KMPreferenceKeyFromUDKey(udKey: String) -> KMPreferenceKey? {
     // general
     if udKey == KMUserNameKey {
@@ -282,77 +124,7 @@ func KMPreferenceKeyFromUDKey(udKey: String) -> KMPreferenceKey? {
     } else if udKey == KMReadingBarInvertKey {
         return KMPreference.invertBarKey
     }
-    // note
-    else if udKey == KMAnchoredNoteColorKey {
-        return KMPreference.markupColorNoteKey
-    } else if udKey == KMLineNoteColorKey {
-        return KMPreference.markupColorLineKey
-    } else if udKey == KMCircleNoteColorKey {
-        return KMPreference.markupColorCircleBorderKey
-    } else if udKey == KMCircleNoteInteriorColorKey {
-        return KMPreference.markupColorCircleFillKey
-
-    } else if udKey == KMSquareNoteInteriorColorKey {
-        return KMPreference.markupColorRectangleFillKey
-    } else if udKey == KMHighlightNoteColorKey {
-        return KMPreference.markupColorHighlightKey
-    } else if udKey == KMUnderlineNoteColorKey {
-        return KMPreference.markupColorUnderlineKey
-    } else if udKey == KMStrikeOutNoteColorKey {
-        return KMPreference.markupColorStrikthroughKey
-    }
-    // font
-    else if udKey == KMFreeTextNoteFontNameKey {
-        return KMPreference.markupFontTextStringKey
-    } else if udKey == KMFreeTextNoteFontSizeKey {
-        return KMPreference.markupTextFontSizeKey
-    } else if udKey == KMFreeTextNoteAlignmentKey {
-        return KMPreference.markupFontTextAligmentKey
-    } else if udKey == KMAnchoredNoteFontNameKey {
-        return KMPreference.markupFontNoteStringKey
-    } else if udKey == KMAnchoredNoteFontSizeKey {
-        return KMPreference.markupNoteFontSizeKey
-    }
-    // line style
-    else if udKey == KMFreeTextNoteLineStyleKey {
-        return KMPreference.freeTextNoteLineStyleKey
-    } else if udKey == KMFreeTextNoteLineWidthKey {
-        return KMPreference.freeTextNoteLineWidthKey
-    } else if udKey == KMFreeTextNoteDashPatternKey {
-        return KMPreference.freeTextNoteDashPatternKey
-    }
-    else if udKey == KMCircleNoteLineStyleKey {
-        return KMPreference.circleNoteLineStyleKey
-    } else if udKey == KMCircleNoteLineWidthKey {
-        return KMPreference.circleNoteLineWidthKey
-    } else if udKey == KMCircleNoteDashPatternhKey {
-        return KMPreference.circleNoteDashPatternKey
-    }
-    else if udKey == KMSquareNoteLineStyleKey {
-        return KMPreference.squareNoteLineStyleKey
-    } else if udKey == KMSquareNoteLineWidthKey {
-        return KMPreference.squareNoteLineWidthKey
-    } else if udKey == KMSquareNoteDashPatternKey {
-        return KMPreference.squareNoteDashPatternKey
-    }
-    else if udKey == KMLineNoteLineStyleKey {
-        return KMPreference.lineNoteLineStyleKey
-    } else if udKey == KMLineNoteLineWidthKey {
-        return KMPreference.lineNoteLineWidthKey
-    } else if udKey == KMLineNoteDashPatternKey {
-        return KMPreference.lineNoteDashPatternKey
-    } else if udKey == KMLineNoteStartLineStyleKey {
-        return KMPreference.lineNoteStartLineStyleKey
-    } else if udKey == KMLineNoteEndLineStyleKey {
-        return KMPreference.lineNoteEndLineStyleKey
-    }
-    else if udKey == KMInkNoteLineStyleKey {
-        return KMPreference.inkNoteLineStyleKey
-    } else if udKey == KMInkNoteLineWidthKey {
-        return KMPreference.inkNoteLineWidthKey
-    } else if udKey == KMInkNoteDashPatternKey {
-        return KMPreference.inkNoteDashPatternKey
-    }
+    
     return nil
 }
 

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/AnnotationProperty/KMGeneralAnnotationViewController.swift

@@ -1713,22 +1713,7 @@ let KMColorPickerViewHeight: CGFloat = 64
                         if (model.annotation == nil || CPDFListViewConfig.defaultManager.isSaveDefault) && self.isannotationMode {
                             if self.annotationType.isMarkup() {
                                 let type = self.annotationType
-                                if type == .highlight {
-                                    KMPreferenceManager.shared.markupHighlightColor = textColor.withAlphaComponent(opacity)
-                                } else if type == .underline {
-                                    KMPreferenceManager.shared.markupUnderlineColor = textColor.withAlphaComponent(opacity)
-                                } else if type == .strikeOut {
-                                    KMPreferenceManager.shared.markupStrikthroughColor = textColor.withAlphaComponent(opacity)
-                                } else if type == .squiggly {
-                                    UserDefaults.standard.setPDFListViewColor(textColor.withAlphaComponent(opacity), forKey: CSquigglyNoteColorKey)
-                                    UserDefaults.standard.synchronize()
-                                    
-                                    // 发通知
-                                    let theColor = KMPreferenceManager.shared.markupHighlightColor
-                                    KMPreferenceManager.shared.markupHighlightColor = theColor
-                                } else if type == .ink {
-                                    KMPreferenceManager.shared.markupPenColor = textColor.withAlphaComponent(opacity)
-                                }
+                                 
                             }
                         }
                     }
@@ -1869,15 +1854,7 @@ let KMColorPickerViewHeight: CGFloat = 64
                 if (model.annotation == nil || CPDFListViewConfig.defaultManager.isSaveDefault) && self.isannotationMode {
                     if self.annotationType.isMarkup() {
                         let type = self.annotationType
-                        if type == .highlight {
-                            KMPreferenceManager.shared.markupHighlightColor = textColor.withAlphaComponent(opacity)
-                        } else if type == .underline {
-                            KMPreferenceManager.shared.markupUnderlineColor = textColor.withAlphaComponent(opacity)
-                        } else if type == .strikeOut {
-                            KMPreferenceManager.shared.markupStrikthroughColor = textColor.withAlphaComponent(opacity)
-                        } else if type == .ink {
-                            KMPreferenceManager.shared.markupPenColor = textColor.withAlphaComponent(opacity)
-                        }
+                        
                     }
                 }
             }

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Forms/Forms_TextField/FormsTextFieldController.swift

@@ -257,8 +257,7 @@ class FormsTextFieldController: NSViewController {
                 fillColorGroup.setUpWithColorPropertys([colorAProperty, colorBProperty, colorCProperty, colorDProperty], customItemProperty: colorEProperty)
             }
         }
-        
-        print("1")
+         
         
         var name: String?
         var formFieldIndex: Int = -1
@@ -333,7 +332,20 @@ class FormsTextFieldController: NSViewController {
         } else {
             fillColorGroup.currentColor = nil
         }
-         
+        
+        if let familyName = fontName {
+            var styleNames = CPDFFont.fontNames(forFamilyName: familyName)
+            var menuItemArr: [ComponentMenuitemProperty] = []
+            if styleNames.count == 0 {
+                styleNames.append("Regular")
+            }
+            for string in styleNames {
+                let item = ComponentMenuitemProperty(type: .normal, text: string, identifier: string)
+                menuItemArr.append(item)
+            }
+            fontStyleSelect.updateMenuItemsArr(menuItemArr)
+        }
+        
         fontNameSelect.properties.text = fontName ?? "-"
         fontStyleSelect.properties.text = fontStyle ?? "-"
         if let value = fontSize {
@@ -341,8 +353,17 @@ class FormsTextFieldController: NSViewController {
         } else {
             fontSizeSelect.properties.text = "-"
         }
-      
         
+        if let value = alignment {
+            fontAlign_leftItem.state = value == .left ? .pressed : .normal
+            fontAlign_centerItem.state = value == .center ? .pressed : .normal
+            fontAlign_rightItem.state = value == .right ? .pressed : .normal
+        } else {
+            fontAlign_leftItem.state = .normal
+            fontAlign_centerItem.state = .normal
+            fontAlign_rightItem.state = .normal
+        }
+       
         nameInput.reloadData()
         formFieldSelect.reloadData()
         defaultValueTextarea.reloadData()
@@ -356,6 +377,7 @@ class FormsTextFieldController: NSViewController {
         fontStyleSelect.reloadData()
         fontSizeSelect.reloadData()
     
+        fontAlignmentGroup.reloadData()
     }
     
     @objc func multilineCheckboxClicked(_ box: ComponentCheckBox) {
@@ -445,8 +467,8 @@ extension FormsTextFieldController: ComponentSelectDelegate {
                 }
                 CPDFTextWidgetAnnotation.updateFont(annotations, CPDFFont(familyName: result, fontStyle: styleName), withPDFView: pdfView)
             } else if view == fontStyleSelect {
-                let styleName = fontNameSelect.properties.text ?? "Helvetica"
-                CPDFTextWidgetAnnotation.updateFont(annotations, CPDFFont(familyName: result, fontStyle: styleName), withPDFView: pdfView)
+                let familyName = fontNameSelect.properties.text ?? "Helvetica"
+                CPDFTextWidgetAnnotation.updateFont(annotations, CPDFFont(familyName: familyName, fontStyle: result), withPDFView: pdfView)
             } else if view == fontSizeSelect {
                 let size = result.stringToCGFloat()
                 CPDFTextWidgetAnnotation.updateFontSize(annotations, size, withPDFView: pdfView)
@@ -470,21 +492,15 @@ extension FormsTextFieldController: ComponentSelectDelegate {
 //MARK: - ComponentCSelectorGroupDelegate
 extension FormsTextFieldController: ComponentCSelectorGroupDelegate {
     func componentCSelectorGroupDidChoose(_ view: ComponentCSelectorGroup, _ item: ComponentCSelectorItem) {
-        //        if view == fontAlignmentGroup {
-        //            if item.properties == fontAlign_leftItem {
-        //                CPDFFreeTextAnnotation.updateFontAlignment(annotations, .left, withPDFView: pdfView)
-        //            } else if item.properties == fontAlign_centerItem {
-        //                CPDFFreeTextAnnotation.updateFontAlignment(annotations, .center, withPDFView: pdfView)
-        //            } else if item.properties == fontAlign_rightItem {
-        //                CPDFFreeTextAnnotation.updateFontAlignment(annotations, .right, withPDFView: pdfView)
-        //            }
-        //        } else if view == lineTypeSelector {
-        //            if item.properties == solidProperty {
-        //                CPDFFreeTextAnnotation.updateBorderStyle(annotations, .solid, withPDFView: pdfView)
-        //            } else if item.properties == dashProperty {
-        //                CPDFFreeTextAnnotation.updateBorderStyle(annotations, .dashed, withPDFView: pdfView)
-        //            }
-        //        }
+        if view == fontAlignmentGroup {
+            if item.properties == fontAlign_leftItem {
+                CPDFTextWidgetAnnotation.updateFontAlignment(annotations, .left, withPDFView: pdfView)
+            } else if item.properties == fontAlign_centerItem {
+                CPDFTextWidgetAnnotation.updateFontAlignment(annotations, .center, withPDFView: pdfView)
+            } else if item.properties == fontAlign_rightItem {
+                CPDFTextWidgetAnnotation.updateFontAlignment(annotations, .right, withPDFView: pdfView)
+            }
+        }
         reloadData()
     }
 }

PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/Forms/Forms_TextField/FormsTextFieldController.xib

@@ -65,6 +65,146 @@
                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="TBi-FI-wPP">
                             <rect key="frame" x="0.0" y="0.0" width="257" height="502"/>
                             <subviews>
+                                <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="fsP-09-SRQ">
+                                    <rect key="frame" x="0.0" y="0.0" width="257" height="502"/>
+                                    <view key="contentView" id="1ep-Jl-P9G">
+                                        <rect key="frame" x="0.0" y="0.0" width="257" height="502"/>
+                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                        <subviews>
+                                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="Wgr-mH-KZV">
+                                                <rect key="frame" x="13" y="430" width="232" height="72"/>
+                                                <subviews>
+                                                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="Bd3-Iz-QIH">
+                                                        <rect key="frame" x="0.0" y="32" width="232" height="40"/>
+                                                        <subviews>
+                                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aTE-R0-G14">
+                                                                <rect key="frame" x="-2" y="12" width="40" height="16"/>
+                                                                <textFieldCell key="cell" lineBreakMode="clipping" title="Name" id="ll3-jw-7Zc">
+                                                                    <font key="font" usesAppearanceFont="YES"/>
+                                                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                                </textFieldCell>
+                                                            </textField>
+                                                        </subviews>
+                                                        <constraints>
+                                                            <constraint firstAttribute="height" constant="40" id="Xwl-O4-dZG"/>
+                                                            <constraint firstItem="aTE-R0-G14" firstAttribute="centerY" secondItem="Bd3-Iz-QIH" secondAttribute="centerY" id="esS-5N-r3k"/>
+                                                            <constraint firstItem="aTE-R0-G14" firstAttribute="leading" secondItem="Bd3-Iz-QIH" secondAttribute="leading" id="rRl-Fw-gUG"/>
+                                                        </constraints>
+                                                    </customView>
+                                                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="AyD-oJ-XbF" customClass="ComponentInput" customModule="KMComponentLibrary">
+                                                        <rect key="frame" x="0.0" y="0.0" width="232" height="32"/>
+                                                    </customView>
+                                                </subviews>
+                                                <constraints>
+                                                    <constraint firstAttribute="trailing" secondItem="Bd3-Iz-QIH" secondAttribute="trailing" id="2d8-Fc-z7y"/>
+                                                    <constraint firstAttribute="width" constant="232" id="2i6-uD-Rdo"/>
+                                                    <constraint firstItem="AyD-oJ-XbF" firstAttribute="top" secondItem="Bd3-Iz-QIH" secondAttribute="bottom" id="4jz-6K-55V"/>
+                                                    <constraint firstItem="Bd3-Iz-QIH" firstAttribute="leading" secondItem="Wgr-mH-KZV" secondAttribute="leading" id="Fht-v3-jzx"/>
+                                                    <constraint firstAttribute="trailing" secondItem="AyD-oJ-XbF" secondAttribute="trailing" id="GNm-CN-Jnb"/>
+                                                    <constraint firstItem="Bd3-Iz-QIH" firstAttribute="top" secondItem="Wgr-mH-KZV" secondAttribute="top" id="MIx-a7-RfG"/>
+                                                    <constraint firstItem="AyD-oJ-XbF" firstAttribute="leading" secondItem="Wgr-mH-KZV" secondAttribute="leading" id="Qre-RG-wa1"/>
+                                                    <constraint firstAttribute="bottom" secondItem="AyD-oJ-XbF" secondAttribute="bottom" id="gPx-9Q-gVx"/>
+                                                    <constraint firstAttribute="height" constant="72" id="lgf-SZ-sdE"/>
+                                                </constraints>
+                                            </customView>
+                                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="YDu-Ci-GTJ">
+                                                <rect key="frame" x="13" y="342" width="232" height="72"/>
+                                                <subviews>
+                                                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="w30-Xk-bbp">
+                                                        <rect key="frame" x="0.0" y="32" width="232" height="40"/>
+                                                        <subviews>
+                                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="FFX-ee-qS9">
+                                                                <rect key="frame" x="-2" y="12" width="68" height="16"/>
+                                                                <textFieldCell key="cell" lineBreakMode="clipping" title="Form Field" id="fta-Un-Xvs">
+                                                                    <font key="font" usesAppearanceFont="YES"/>
+                                                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                                </textFieldCell>
+                                                            </textField>
+                                                        </subviews>
+                                                        <constraints>
+                                                            <constraint firstAttribute="height" constant="40" id="FjY-Ud-ruJ"/>
+                                                            <constraint firstItem="FFX-ee-qS9" firstAttribute="centerY" secondItem="w30-Xk-bbp" secondAttribute="centerY" id="UOG-QE-jar"/>
+                                                            <constraint firstItem="FFX-ee-qS9" firstAttribute="leading" secondItem="w30-Xk-bbp" secondAttribute="leading" id="lMf-Xg-08e"/>
+                                                        </constraints>
+                                                    </customView>
+                                                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="sLd-Gb-pRb" customClass="ComponentSelect" customModule="KMComponentLibrary">
+                                                        <rect key="frame" x="0.0" y="0.0" width="232" height="32"/>
+                                                    </customView>
+                                                </subviews>
+                                                <constraints>
+                                                    <constraint firstItem="sLd-Gb-pRb" firstAttribute="top" secondItem="w30-Xk-bbp" secondAttribute="bottom" id="AB6-jA-aue"/>
+                                                    <constraint firstAttribute="trailing" secondItem="sLd-Gb-pRb" secondAttribute="trailing" id="Bt1-PR-9Kh"/>
+                                                    <constraint firstAttribute="bottom" secondItem="sLd-Gb-pRb" secondAttribute="bottom" id="Odh-JG-Msk"/>
+                                                    <constraint firstItem="sLd-Gb-pRb" firstAttribute="leading" secondItem="YDu-Ci-GTJ" secondAttribute="leading" id="Z9f-pg-qLB"/>
+                                                    <constraint firstAttribute="height" constant="72" id="aKJ-DV-Dcq"/>
+                                                    <constraint firstItem="w30-Xk-bbp" firstAttribute="top" secondItem="YDu-Ci-GTJ" secondAttribute="top" id="cBw-Wp-CMn"/>
+                                                    <constraint firstAttribute="trailing" secondItem="w30-Xk-bbp" secondAttribute="trailing" id="egf-G0-kVz"/>
+                                                    <constraint firstAttribute="width" constant="232" id="k9s-NA-drf"/>
+                                                    <constraint firstItem="w30-Xk-bbp" firstAttribute="leading" secondItem="YDu-Ci-GTJ" secondAttribute="leading" id="tMk-10-qgj"/>
+                                                </constraints>
+                                            </customView>
+                                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="DOF-Kg-cVb">
+                                                <rect key="frame" x="13" y="166" width="232" height="160"/>
+                                                <subviews>
+                                                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="GUq-sh-TdV">
+                                                        <rect key="frame" x="0.0" y="120" width="232" height="40"/>
+                                                        <subviews>
+                                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0wl-kv-RVi">
+                                                                <rect key="frame" x="-2" y="12" width="85" height="16"/>
+                                                                <textFieldCell key="cell" lineBreakMode="clipping" title="Default Value" id="69f-1P-luj">
+                                                                    <font key="font" usesAppearanceFont="YES"/>
+                                                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                                </textFieldCell>
+                                                            </textField>
+                                                        </subviews>
+                                                        <constraints>
+                                                            <constraint firstItem="0wl-kv-RVi" firstAttribute="centerY" secondItem="GUq-sh-TdV" secondAttribute="centerY" id="CXm-ji-bMd"/>
+                                                            <constraint firstAttribute="height" constant="40" id="aZL-fb-Mpb"/>
+                                                            <constraint firstItem="0wl-kv-RVi" firstAttribute="leading" secondItem="GUq-sh-TdV" secondAttribute="leading" id="kxK-RN-3r7"/>
+                                                        </constraints>
+                                                    </customView>
+                                                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="hBY-wE-55i" customClass="ComponentTextarea" customModule="KMComponentLibrary">
+                                                        <rect key="frame" x="0.0" y="40" width="232" height="80"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="height" constant="80" id="JUI-eW-FdQ"/>
+                                                        </constraints>
+                                                    </customView>
+                                                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="3Bu-ZR-7cu" customClass="ComponentCheckBox" customModule="KMComponentLibrary">
+                                                        <rect key="frame" x="0.0" y="0.0" width="232" height="40"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="width" constant="232" id="qhp-JY-2z3"/>
+                                                        </constraints>
+                                                    </customView>
+                                                </subviews>
+                                                <constraints>
+                                                    <constraint firstAttribute="bottom" secondItem="3Bu-ZR-7cu" secondAttribute="bottom" id="4v5-j5-nJF"/>
+                                                    <constraint firstAttribute="trailing" secondItem="hBY-wE-55i" secondAttribute="trailing" id="COt-bf-qob"/>
+                                                    <constraint firstItem="GUq-sh-TdV" firstAttribute="leading" secondItem="DOF-Kg-cVb" secondAttribute="leading" id="ExL-uR-byJ"/>
+                                                    <constraint firstItem="3Bu-ZR-7cu" firstAttribute="leading" secondItem="DOF-Kg-cVb" secondAttribute="leading" id="FQ8-Wu-K5S"/>
+                                                    <constraint firstItem="3Bu-ZR-7cu" firstAttribute="top" secondItem="hBY-wE-55i" secondAttribute="bottom" id="HXM-N0-fxf"/>
+                                                    <constraint firstAttribute="trailing" secondItem="GUq-sh-TdV" secondAttribute="trailing" id="PhO-FL-tR6"/>
+                                                    <constraint firstAttribute="width" constant="232" id="hDH-zU-DoH"/>
+                                                    <constraint firstItem="hBY-wE-55i" firstAttribute="leading" secondItem="DOF-Kg-cVb" secondAttribute="leading" id="kAH-G0-6Iv"/>
+                                                    <constraint firstItem="hBY-wE-55i" firstAttribute="top" secondItem="GUq-sh-TdV" secondAttribute="bottom" id="tnH-3o-5st"/>
+                                                    <constraint firstAttribute="height" constant="160" id="uX1-He-DEF"/>
+                                                    <constraint firstItem="GUq-sh-TdV" firstAttribute="top" secondItem="DOF-Kg-cVb" secondAttribute="top" id="xsd-o5-rcO"/>
+                                                </constraints>
+                                            </customView>
+                                        </subviews>
+                                        <constraints>
+                                            <constraint firstItem="YDu-Ci-GTJ" firstAttribute="centerX" secondItem="1ep-Jl-P9G" secondAttribute="centerX" id="5aJ-cy-5Gg"/>
+                                            <constraint firstItem="Wgr-mH-KZV" firstAttribute="centerX" secondItem="1ep-Jl-P9G" secondAttribute="centerX" id="DVb-23-Tz6"/>
+                                            <constraint firstItem="DOF-Kg-cVb" firstAttribute="top" secondItem="YDu-Ci-GTJ" secondAttribute="bottom" constant="16" id="Wq1-TK-Dw9"/>
+                                            <constraint firstItem="YDu-Ci-GTJ" firstAttribute="top" secondItem="Wgr-mH-KZV" secondAttribute="bottom" constant="16" id="s4P-8G-NjN"/>
+                                            <constraint firstItem="Wgr-mH-KZV" firstAttribute="top" secondItem="1ep-Jl-P9G" secondAttribute="top" id="sCc-v3-eMo"/>
+                                            <constraint firstItem="DOF-Kg-cVb" firstAttribute="centerX" secondItem="1ep-Jl-P9G" secondAttribute="centerX" id="vhp-Ut-jMo"/>
+                                        </constraints>
+                                    </view>
+                                    <color key="fillColor" name="Color"/>
+                                </box>
                                 <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="aUt-xp-G0e">
                                     <rect key="frame" x="0.0" y="0.0" width="257" height="502"/>
                                     <view key="contentView" id="gpp-yD-xHa">
@@ -245,146 +385,6 @@
                                     </view>
                                     <color key="fillColor" name="Color"/>
                                 </box>
-                                <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="fsP-09-SRQ">
-                                    <rect key="frame" x="0.0" y="0.0" width="257" height="502"/>
-                                    <view key="contentView" id="1ep-Jl-P9G">
-                                        <rect key="frame" x="0.0" y="0.0" width="257" height="502"/>
-                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                        <subviews>
-                                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="Wgr-mH-KZV">
-                                                <rect key="frame" x="13" y="430" width="232" height="72"/>
-                                                <subviews>
-                                                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="Bd3-Iz-QIH">
-                                                        <rect key="frame" x="0.0" y="32" width="232" height="40"/>
-                                                        <subviews>
-                                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aTE-R0-G14">
-                                                                <rect key="frame" x="-2" y="12" width="40" height="16"/>
-                                                                <textFieldCell key="cell" lineBreakMode="clipping" title="Name" id="ll3-jw-7Zc">
-                                                                    <font key="font" usesAppearanceFont="YES"/>
-                                                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                                                </textFieldCell>
-                                                            </textField>
-                                                        </subviews>
-                                                        <constraints>
-                                                            <constraint firstAttribute="height" constant="40" id="Xwl-O4-dZG"/>
-                                                            <constraint firstItem="aTE-R0-G14" firstAttribute="centerY" secondItem="Bd3-Iz-QIH" secondAttribute="centerY" id="esS-5N-r3k"/>
-                                                            <constraint firstItem="aTE-R0-G14" firstAttribute="leading" secondItem="Bd3-Iz-QIH" secondAttribute="leading" id="rRl-Fw-gUG"/>
-                                                        </constraints>
-                                                    </customView>
-                                                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="AyD-oJ-XbF" customClass="ComponentInput" customModule="KMComponentLibrary">
-                                                        <rect key="frame" x="0.0" y="0.0" width="232" height="32"/>
-                                                    </customView>
-                                                </subviews>
-                                                <constraints>
-                                                    <constraint firstAttribute="trailing" secondItem="Bd3-Iz-QIH" secondAttribute="trailing" id="2d8-Fc-z7y"/>
-                                                    <constraint firstAttribute="width" constant="232" id="2i6-uD-Rdo"/>
-                                                    <constraint firstItem="AyD-oJ-XbF" firstAttribute="top" secondItem="Bd3-Iz-QIH" secondAttribute="bottom" id="4jz-6K-55V"/>
-                                                    <constraint firstItem="Bd3-Iz-QIH" firstAttribute="leading" secondItem="Wgr-mH-KZV" secondAttribute="leading" id="Fht-v3-jzx"/>
-                                                    <constraint firstAttribute="trailing" secondItem="AyD-oJ-XbF" secondAttribute="trailing" id="GNm-CN-Jnb"/>
-                                                    <constraint firstItem="Bd3-Iz-QIH" firstAttribute="top" secondItem="Wgr-mH-KZV" secondAttribute="top" id="MIx-a7-RfG"/>
-                                                    <constraint firstItem="AyD-oJ-XbF" firstAttribute="leading" secondItem="Wgr-mH-KZV" secondAttribute="leading" id="Qre-RG-wa1"/>
-                                                    <constraint firstAttribute="bottom" secondItem="AyD-oJ-XbF" secondAttribute="bottom" id="gPx-9Q-gVx"/>
-                                                    <constraint firstAttribute="height" constant="72" id="lgf-SZ-sdE"/>
-                                                </constraints>
-                                            </customView>
-                                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="YDu-Ci-GTJ">
-                                                <rect key="frame" x="13" y="342" width="232" height="72"/>
-                                                <subviews>
-                                                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="w30-Xk-bbp">
-                                                        <rect key="frame" x="0.0" y="32" width="232" height="40"/>
-                                                        <subviews>
-                                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="FFX-ee-qS9">
-                                                                <rect key="frame" x="-2" y="12" width="68" height="16"/>
-                                                                <textFieldCell key="cell" lineBreakMode="clipping" title="Form Field" id="fta-Un-Xvs">
-                                                                    <font key="font" usesAppearanceFont="YES"/>
-                                                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                                                </textFieldCell>
-                                                            </textField>
-                                                        </subviews>
-                                                        <constraints>
-                                                            <constraint firstAttribute="height" constant="40" id="FjY-Ud-ruJ"/>
-                                                            <constraint firstItem="FFX-ee-qS9" firstAttribute="centerY" secondItem="w30-Xk-bbp" secondAttribute="centerY" id="UOG-QE-jar"/>
-                                                            <constraint firstItem="FFX-ee-qS9" firstAttribute="leading" secondItem="w30-Xk-bbp" secondAttribute="leading" id="lMf-Xg-08e"/>
-                                                        </constraints>
-                                                    </customView>
-                                                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="sLd-Gb-pRb" customClass="ComponentSelect" customModule="KMComponentLibrary">
-                                                        <rect key="frame" x="0.0" y="0.0" width="232" height="32"/>
-                                                    </customView>
-                                                </subviews>
-                                                <constraints>
-                                                    <constraint firstItem="sLd-Gb-pRb" firstAttribute="top" secondItem="w30-Xk-bbp" secondAttribute="bottom" id="AB6-jA-aue"/>
-                                                    <constraint firstAttribute="trailing" secondItem="sLd-Gb-pRb" secondAttribute="trailing" id="Bt1-PR-9Kh"/>
-                                                    <constraint firstAttribute="bottom" secondItem="sLd-Gb-pRb" secondAttribute="bottom" id="Odh-JG-Msk"/>
-                                                    <constraint firstItem="sLd-Gb-pRb" firstAttribute="leading" secondItem="YDu-Ci-GTJ" secondAttribute="leading" id="Z9f-pg-qLB"/>
-                                                    <constraint firstAttribute="height" constant="72" id="aKJ-DV-Dcq"/>
-                                                    <constraint firstItem="w30-Xk-bbp" firstAttribute="top" secondItem="YDu-Ci-GTJ" secondAttribute="top" id="cBw-Wp-CMn"/>
-                                                    <constraint firstAttribute="trailing" secondItem="w30-Xk-bbp" secondAttribute="trailing" id="egf-G0-kVz"/>
-                                                    <constraint firstAttribute="width" constant="232" id="k9s-NA-drf"/>
-                                                    <constraint firstItem="w30-Xk-bbp" firstAttribute="leading" secondItem="YDu-Ci-GTJ" secondAttribute="leading" id="tMk-10-qgj"/>
-                                                </constraints>
-                                            </customView>
-                                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="DOF-Kg-cVb">
-                                                <rect key="frame" x="13" y="166" width="232" height="160"/>
-                                                <subviews>
-                                                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="GUq-sh-TdV">
-                                                        <rect key="frame" x="0.0" y="120" width="232" height="40"/>
-                                                        <subviews>
-                                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0wl-kv-RVi">
-                                                                <rect key="frame" x="-2" y="12" width="85" height="16"/>
-                                                                <textFieldCell key="cell" lineBreakMode="clipping" title="Default Value" id="69f-1P-luj">
-                                                                    <font key="font" usesAppearanceFont="YES"/>
-                                                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                                                </textFieldCell>
-                                                            </textField>
-                                                        </subviews>
-                                                        <constraints>
-                                                            <constraint firstItem="0wl-kv-RVi" firstAttribute="centerY" secondItem="GUq-sh-TdV" secondAttribute="centerY" id="CXm-ji-bMd"/>
-                                                            <constraint firstAttribute="height" constant="40" id="aZL-fb-Mpb"/>
-                                                            <constraint firstItem="0wl-kv-RVi" firstAttribute="leading" secondItem="GUq-sh-TdV" secondAttribute="leading" id="kxK-RN-3r7"/>
-                                                        </constraints>
-                                                    </customView>
-                                                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="hBY-wE-55i" customClass="ComponentTextarea" customModule="KMComponentLibrary">
-                                                        <rect key="frame" x="0.0" y="40" width="232" height="80"/>
-                                                        <constraints>
-                                                            <constraint firstAttribute="height" constant="80" id="JUI-eW-FdQ"/>
-                                                        </constraints>
-                                                    </customView>
-                                                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="3Bu-ZR-7cu" customClass="ComponentCheckBox" customModule="KMComponentLibrary">
-                                                        <rect key="frame" x="0.0" y="0.0" width="232" height="40"/>
-                                                        <constraints>
-                                                            <constraint firstAttribute="width" constant="232" id="qhp-JY-2z3"/>
-                                                        </constraints>
-                                                    </customView>
-                                                </subviews>
-                                                <constraints>
-                                                    <constraint firstAttribute="bottom" secondItem="3Bu-ZR-7cu" secondAttribute="bottom" id="4v5-j5-nJF"/>
-                                                    <constraint firstAttribute="trailing" secondItem="hBY-wE-55i" secondAttribute="trailing" id="COt-bf-qob"/>
-                                                    <constraint firstItem="GUq-sh-TdV" firstAttribute="leading" secondItem="DOF-Kg-cVb" secondAttribute="leading" id="ExL-uR-byJ"/>
-                                                    <constraint firstItem="3Bu-ZR-7cu" firstAttribute="leading" secondItem="DOF-Kg-cVb" secondAttribute="leading" id="FQ8-Wu-K5S"/>
-                                                    <constraint firstItem="3Bu-ZR-7cu" firstAttribute="top" secondItem="hBY-wE-55i" secondAttribute="bottom" id="HXM-N0-fxf"/>
-                                                    <constraint firstAttribute="trailing" secondItem="GUq-sh-TdV" secondAttribute="trailing" id="PhO-FL-tR6"/>
-                                                    <constraint firstAttribute="width" constant="232" id="hDH-zU-DoH"/>
-                                                    <constraint firstItem="hBY-wE-55i" firstAttribute="leading" secondItem="DOF-Kg-cVb" secondAttribute="leading" id="kAH-G0-6Iv"/>
-                                                    <constraint firstItem="hBY-wE-55i" firstAttribute="top" secondItem="GUq-sh-TdV" secondAttribute="bottom" id="tnH-3o-5st"/>
-                                                    <constraint firstAttribute="height" constant="160" id="uX1-He-DEF"/>
-                                                    <constraint firstItem="GUq-sh-TdV" firstAttribute="top" secondItem="DOF-Kg-cVb" secondAttribute="top" id="xsd-o5-rcO"/>
-                                                </constraints>
-                                            </customView>
-                                        </subviews>
-                                        <constraints>
-                                            <constraint firstItem="YDu-Ci-GTJ" firstAttribute="centerX" secondItem="1ep-Jl-P9G" secondAttribute="centerX" id="5aJ-cy-5Gg"/>
-                                            <constraint firstItem="Wgr-mH-KZV" firstAttribute="centerX" secondItem="1ep-Jl-P9G" secondAttribute="centerX" id="DVb-23-Tz6"/>
-                                            <constraint firstItem="DOF-Kg-cVb" firstAttribute="top" secondItem="YDu-Ci-GTJ" secondAttribute="bottom" constant="16" id="Wq1-TK-Dw9"/>
-                                            <constraint firstItem="YDu-Ci-GTJ" firstAttribute="top" secondItem="Wgr-mH-KZV" secondAttribute="bottom" constant="16" id="s4P-8G-NjN"/>
-                                            <constraint firstItem="Wgr-mH-KZV" firstAttribute="top" secondItem="1ep-Jl-P9G" secondAttribute="top" id="sCc-v3-eMo"/>
-                                            <constraint firstItem="DOF-Kg-cVb" firstAttribute="centerX" secondItem="1ep-Jl-P9G" secondAttribute="centerX" id="vhp-Ut-jMo"/>
-                                        </constraints>
-                                    </view>
-                                    <color key="fillColor" name="Color"/>
-                                </box>
                             </subviews>
                             <constraints>
                                 <constraint firstAttribute="trailing" secondItem="fsP-09-SRQ" secondAttribute="trailing" id="3yI-Gx-6lp"/>

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

@@ -2306,8 +2306,8 @@
             filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+UI.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "292"
-            endingLineNumber = "292"
+            startingLineNumber = "281"
+            endingLineNumber = "281"
             landmarkName = "changeAnnotationModeAction(item:)"
             landmarkType = "7">
             <Locations>
@@ -2386,6 +2386,21 @@
                   endingLineNumber = "292"
                   offsetFromSymbolStart = "8980">
                </Location>
+               <Location
+                  uuid = "8E901A1F-2E46-45A2-8AAA-ABB5D9E11491 - da5f8849423c28d1"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMMainViewController.changeAnnotationModeAction(item: PDF_Reader_Pro.KMToolbarClickButton) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/KMMainViewController+UI.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "281"
+                  endingLineNumber = "281"
+                  offsetFromSymbolStart = "8980">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -4533,22 +4548,6 @@
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "805D4BE0-E987-4EE2-A273-5647C46C1322"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/Preference/Tools/KMPreferenceManager.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1874"
-            endingLineNumber = "1874"
-            landmarkName = "syncDataToPDFView(_:forKey:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -4597,54 +4596,6 @@
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "B2940102-E0B8-4295-A550-70C56B95B4F6"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/Preference/Tools/KMPreferenceCommon.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "163"
-            endingLineNumber = "163"
-            landmarkName = "KMPreferenceKeyToUDKey(pKey:)"
-            landmarkType = "9">
-            <Locations>
-               <Location
-                  uuid = "B2940102-E0B8-4295-A550-70C56B95B4F6 - 301658d5aee3a09c"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMPreferenceKeyToUDKey(pKey: Swift.String) -&gt; Swift.Optional&lt;Swift.String&gt;"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/Preference/Tools/KMPreferenceCommon.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "163"
-                  endingLineNumber = "163"
-                  offsetFromSymbolStart = "2444">
-               </Location>
-               <Location
-                  uuid = "B2940102-E0B8-4295-A550-70C56B95B4F6 - 301658d5aee3a09c"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMPreferenceKeyToUDKey(pKey: Swift.String) -&gt; Swift.Optional&lt;Swift.String&gt;"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/Preference/Tools/KMPreferenceCommon.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "163"
-                  endingLineNumber = "163"
-                  offsetFromSymbolStart = "2548">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -4848,22 +4799,38 @@
             endingLineNumber = "136"
             landmarkName = "tableView(_:viewFor:row:)"
             landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "B0B73963-CED9-4E2A-8FD3-28AD457E1550"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KMComponentLibrary/KMComponentLibrary/View/CheckBox/ComponentCheckBox.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "169"
-            endingLineNumber = "169"
-            landmarkName = "mouseUp(with:)"
-            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "F256CB27-1702-4799-9CF1-7DD47688DEA2 - 1003961635060d8d"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #1 (PDF_Reader_Pro.KMBaseCompressTableCellView, PDF_Reader_Pro.KMCompressSettingModel) -&gt; () in PDF_Reader_Pro.KMCompressSettingTableView.tableView(_: __C.NSTableView, viewFor: Swift.Optional&lt;__C.NSTableColumn&gt;, row: Swift.Int) -&gt; Swift.Optional&lt;__C.NSView&gt;"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFTools/Compress/View/SettingView/View/Tableview/KMCompressSettingTableView.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "136"
+                  endingLineNumber = "136"
+                  offsetFromSymbolStart = "104">
+               </Location>
+               <Location
+                  uuid = "F256CB27-1702-4799-9CF1-7DD47688DEA2 - 4e2af8095809ac16"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMCompressSettingTableView.tableView(_: __C.NSTableView, viewFor: Swift.Optional&lt;__C.NSTableColumn&gt;, row: Swift.Int) -&gt; Swift.Optional&lt;__C.NSView&gt;"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFTools/Compress/View/SettingView/View/Tableview/KMCompressSettingTableView.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "136"
+                  endingLineNumber = "136"
+                  offsetFromSymbolStart = "4092">
+               </Location>
+            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -5394,22 +5361,6 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "E9155D4F-BCA4-4ADB-9AE6-B924B3B1B08A"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KMComponentLibrary/KMComponentLibrary/View/Controller/ComponentCSelectorItem.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "201"
-            endingLineNumber = "201"
-            landmarkName = "mouseDown(with:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -5694,6 +5645,21 @@
                   endingLineNumber = "128"
                   offsetFromSymbolStart = "196">
                </Location>
+               <Location
+                  uuid = "7A962DB7-8A84-4687-AA9F-C7757C85FD0C - 67fc68ffd1135e2e"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMCompressSettingViewController.rearrangeToasts() -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFTools/Compress/Controller/KMCompressSettingViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "128"
+                  endingLineNumber = "128"
+                  offsetFromSymbolStart = "628">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -5742,6 +5708,21 @@
                   endingLineNumber = "134"
                   offsetFromSymbolStart = "76">
                </Location>
+               <Location
+                  uuid = "F3891C25-2771-4C22-8511-486F81817738 - 80a7718507c5c73c"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMCompressSettingViewController.cancelButtonAction(Any) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFTools/Compress/Controller/KMCompressSettingViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "135"
+                  endingLineNumber = "135"
+                  offsetFromSymbolStart = "64">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>