ソースを参照

【编辑工具】压缩设置界面数据填充

lizhe 6 日 前
コミット
abb476d256
26 ファイル変更354 行追加690 行削除
  1. 3 3
      PDF Office/PDF Master/Class/Batch/WindowController/KMAlertWindowController.xib
  2. 2 2
      PDF Office/PDF Master/Class/Batch/WindowController/KMBatchOperateLeftViewController.xib
  3. 2 2
      PDF Office/PDF Master/Class/Batch/WindowController/KMBatchOperateRightViewController.xib
  4. 2 2
      PDF Office/PDF Master/Class/Batch/WindowController/KMBatchOperateSplitViewController.xib
  5. 3 3
      PDF Office/PDF Master/Class/Batch/WindowController/KMBatchOperateWindowController.xib
  6. 3 3
      PDF Office/PDF Master/Class/Batch/WindowController/KMTextHintWindowController.xib
  7. 12 0
      PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/KMBatchOperateCompressSettingViewController.swift
  8. 11 7
      PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/KMBatchOperateCompressSettingViewController.xib
  9. 34 1
      PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/SettingView/KMCompressSettingTableView.swift
  10. 1 1
      PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/SettingView/KMCompressSettingTableView.xib
  11. 1 1
      PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/SettingView/Model/KMCompressSettingModel.swift
  12. 76 3
      PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/SettingView/View/Base/KMBaseCompressTableCellView.swift
  13. 29 5
      PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/SettingView/View/KMCompressDiscardPanelTableCellView.swift
  14. 5 4
      PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/SettingView/View/KMCompressDiscardPanelTableCellView.xib
  15. 8 1
      PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/SettingView/View/KMCompressFontsPanelTableCellView.swift
  16. 8 6
      PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/SettingView/View/KMCompressFontsPanelTableCellView.xib
  17. 5 1
      PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/SettingView/View/KMCompressImagesPanelTableCellView.swift
  18. 22 21
      PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/SettingView/View/KMCompressImagesPanelTableCellView.xib
  19. 6 1
      PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/SettingView/View/KMCompressModesTableCellView.swift
  20. 21 18
      PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/SettingView/View/KMCompressModesTableCellView.xib
  21. 5 0
      PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/View/KMBatchOperateCompressView.swift
  22. 14 13
      PDF Office/PDF Master/Class/Home/ViewController/customViewController/KMDesignButton.xib
  23. 5 5
      PDF Office/PDF Master/Class/Home/ViewController/customViewController/KMDesignDropdown.xib
  24. 7 6
      PDF Office/PDF Master/Class/Home/ViewController/customViewController/KMDesignSelect.xib
  25. 11 11
      PDF Office/PDF Master/Class/Home/ViewController/customViewController/KMNotificationVC.xib
  26. 58 570
      PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/lizhe.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

+ 3 - 3
PDF Office/PDF Master/Class/Batch/WindowController/KMAlertWindowController.xib

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22154" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22154"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="NSAlertWindowController" customModule="PDF_Master" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="NSAlertWindowController" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="actionButton" destination="ysS-2k-HPo" id="qaJ-km-j4F"/>
                 <outlet property="alertCheckButton" destination="Ss5-2o-1Dn" id="QAq-RC-Zd2"/>

+ 2 - 2
PDF Office/PDF Master/Class/Batch/WindowController/KMBatchOperateLeftViewController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>

+ 2 - 2
PDF Office/PDF Master/Class/Batch/WindowController/KMBatchOperateRightViewController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22154" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22154"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>

+ 2 - 2
PDF Office/PDF Master/Class/Batch/WindowController/KMBatchOperateSplitViewController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>

+ 3 - 3
PDF Office/PDF Master/Class/Batch/WindowController/KMBatchOperateWindowController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -13,7 +13,7 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5" customClass="KMBatchWindow" customModule="PDF_Master" customModuleProvider="target">
+        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5" customClass="KMBatchWindow" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <rect key="contentRect" x="463" y="248" width="480" height="270"/>
             <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>

+ 3 - 3
PDF Office/PDF Master/Class/Batch/WindowController/KMTextHintWindowController.xib

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22154" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22154"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMTextHintWindowController" customModule="PDF_Master" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMTextHintWindowController" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="actionButton" destination="x5y-RO-Lmv" id="rq1-LN-0Xl"/>
                 <outlet property="detailTextfield" destination="ry0-kd-mg3" id="hOn-CU-p3h"/>

+ 12 - 0
PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/KMBatchOperateCompressSettingViewController.swift

@@ -13,6 +13,7 @@ typealias KMBatchOperateCompressSettingViewDoneAction = (_ controller: KMBatchOp
 class KMBatchOperateCompressSettingViewController: KMBaseViewController {
     @IBOutlet weak var doneButton: KMButton!
     @IBOutlet weak var cancelButton: KMButton!
+    @IBOutlet weak var settingView: KMCompressSettingTableView!
     
     var cancelAction: KMBatchOperateCompressSettingViewCancelAction?
     var doneAction: KMBatchOperateCompressSettingViewDoneAction?
@@ -21,6 +22,17 @@ class KMBatchOperateCompressSettingViewController: KMBaseViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         // Do view setup here.
+        
+        // 将按钮设置为第一响应者
+        if let window = view.window {
+            
+            window.makeFirstResponder(doneButton.nextResponder)
+            window.defaultButtonCell = doneButton.cell as? NSButtonCell
+            
+            window.contentMinSize = CGSizeMake(624, 513)
+            window.contentMaxSize = CGSizeMake(624, 513)
+        }
+        
     }
 }
 

+ 11 - 7
PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/KMBatchOperateCompressSettingViewController.xib

@@ -10,6 +10,7 @@
             <connections>
                 <outlet property="cancelButton" destination="sVB-3V-Y0k" id="WuD-aB-uY1"/>
                 <outlet property="doneButton" destination="eVt-ve-VmB" id="6fM-1p-W9A"/>
+                <outlet property="settingView" destination="fbx-YC-qHs" id="vb6-gh-2ej"/>
                 <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
             </connections>
         </customObject>
@@ -20,10 +21,10 @@
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="fbx-YC-qHs" customClass="KMCompressSettingTableView" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                    <rect key="frame" x="20" y="64" width="584" height="429"/>
+                    <rect key="frame" x="0.0" y="64" width="624" height="429"/>
                 </customView>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sVB-3V-Y0k" customClass="KMButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                    <rect key="frame" x="484" y="13" width="76" height="32"/>
+                    <rect key="frame" x="386" y="13" width="76" height="32"/>
                     <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="EYu-9c-4mc">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
@@ -36,10 +37,13 @@ Gw
                     </connections>
                 </button>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="eVt-ve-VmB" customClass="KMButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                    <rect key="frame" x="554" y="13" width="57" height="32"/>
-                    <buttonCell key="cell" type="push" title=" OK" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="pnh-3j-SVd">
+                    <rect key="frame" x="456" y="13" width="155" height="32"/>
+                    <buttonCell key="cell" type="push" title="Save and Compress" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="pnh-3j-SVd">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
+                        <string key="keyEquivalent" base64-UTF8="YES">
+DQ
+</string>
                         <connections>
                             <action selector="doneButtonAction:" target="-2" id="f06-fj-C04"/>
                         </connections>
@@ -47,16 +51,16 @@ Gw
                 </button>
             </subviews>
             <constraints>
-                <constraint firstAttribute="trailing" secondItem="fbx-YC-qHs" secondAttribute="trailing" constant="20" id="A1Z-3W-rxf"/>
+                <constraint firstAttribute="trailing" secondItem="fbx-YC-qHs" secondAttribute="trailing" id="A1Z-3W-rxf"/>
                 <constraint firstAttribute="bottom" secondItem="fbx-YC-qHs" secondAttribute="bottom" constant="64" id="J3x-rf-L9f"/>
                 <constraint firstAttribute="bottom" secondItem="eVt-ve-VmB" secondAttribute="bottom" constant="20" id="KCi-BI-FJQ"/>
                 <constraint firstAttribute="trailing" secondItem="eVt-ve-VmB" secondAttribute="trailing" constant="20" id="L0M-fU-M18"/>
                 <constraint firstItem="eVt-ve-VmB" firstAttribute="leading" secondItem="sVB-3V-Y0k" secondAttribute="trailing" constant="8" id="Okp-Tv-xiQ"/>
                 <constraint firstItem="fbx-YC-qHs" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="20" id="ckJ-fE-0nn"/>
-                <constraint firstItem="fbx-YC-qHs" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="20" id="mLG-xd-Co3"/>
+                <constraint firstItem="fbx-YC-qHs" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="mLG-xd-Co3"/>
                 <constraint firstItem="sVB-3V-Y0k" firstAttribute="centerY" secondItem="eVt-ve-VmB" secondAttribute="centerY" id="t0w-fU-UlE"/>
             </constraints>
-            <point key="canvasLocation" x="63" y="134.5"/>
+            <point key="canvasLocation" x="122" y="122"/>
         </customView>
     </objects>
 </document>

+ 34 - 1
PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/SettingView/KMCompressSettingTableView.swift

@@ -28,26 +28,52 @@ class KMCompressSettingTableView: KMBaseXibView {
     override func reloadData() {
         var model = KMCompressSettingModel()
         model.title = NSLocalizedString("Models", comment: "")
+        model.heightOfRow = 48
         self.datas.append(model)
         
         model = KMCompressSettingModel()
+        model.type = .images
         model.title = NSLocalizedString("Image Panel", comment: "")
+        model.heightOfRow = 90
         self.datas.append(model)
         
         model = KMCompressSettingModel()
+        model.type = .fonts
         model.title = NSLocalizedString("Fonts Panel", comment: "")
+        model.heightOfRow = 90
+        model.content = "Unembed Any Font"
         self.datas.append(model)
         
         model = KMCompressSettingModel()
+        model.type = .discardObject
         model.title = NSLocalizedString("Discard Objects Panel", comment: "")
+        model.heightOfRow = 205
+        model.content = ["Discard all form submission, import and reset actions",
+                         "Discard all JavaScript actions",
+                         "Discard embedded page thumbnails",
+                         "Discard document tags",
+                         "Discard bookmarks"]
         self.datas.append(model)
         
         model = KMCompressSettingModel()
+        model.type = .discardUserData
         model.title = NSLocalizedString("Discard User Data Panel", comment: "")
+        model.heightOfRow = 205
+        model.content = ["Discard all comments, forms and multimedia",
+                         "Discard document information and metadata",
+                         "Discard all object data",
+                         "Discard file attachments",
+                         "Discard hidden layer content and flatten visible layers"]
         self.datas.append(model)
         
         model = KMCompressSettingModel()
+        model.type = .discardOtherData
         model.title = NSLocalizedString("Discard Other Data", comment: "")
+        model.heightOfRow = 173
+        model.content = ["Discard invalid bookmarks",
+                         "Discard invalid links",
+                         "Discard unreferenced named destinations",
+                         "Optimize page content"]
         self.datas.append(model)
         
         self.tableView.reloadData()
@@ -100,12 +126,19 @@ extension KMCompressSettingTableView: NSTableViewDelegate, NSTableViewDataSource
             }
             
             cell?.model = model
+            cell?.actionBlock = { view, tModel in
+                
+            }
             
         }
         return cell
     }
     
     func tableView(_ tableView: NSTableView, heightOfRow row: Int) -> CGFloat {
-        return 200.0 // 自定义行高
+        if self.datas.count > row {
+            let model: KMCompressSettingModel = self.datas[row]
+            return model.heightOfRow
+        }
+        return 20.0
     }
 }

+ 1 - 1
PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/SettingView/KMCompressSettingTableView.xib

@@ -48,7 +48,7 @@
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
                                                     <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="aCn-mc-Jea">
-                                                        <rect key="frame" x="0.0" y="4" width="443" height="16"/>
+                                                        <rect key="frame" x="-18" y="4" width="479" height="16"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="Xf3-Ha-75D">
                                                             <font key="font" usesAppearanceFont="YES"/>

+ 1 - 1
PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/SettingView/Model/KMCompressSettingModel.swift

@@ -56,5 +56,5 @@ class KMCompressSettingModel: NSObject {
     var type: KMCompressSettingPanelType = .modes
     var selectIndexSet: NSIndexSet = .init(index: 0)
     var content: Any? = nil
-    var heightOfRow = 30
+    var heightOfRow: CGFloat = 20
 }

+ 76 - 3
PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/SettingView/View/Base/KMBaseCompressTableCellView.swift

@@ -7,13 +7,86 @@
 
 import Cocoa
 
+typealias KMBaseCompressTableCellViewActionBlock = (_ view: KMBaseCompressTableCellView, _ model: KMCompressSettingModel) -> Void
 class KMBaseCompressTableCellView: NSTableCellView {
     var model: KMCompressSettingModel?
+    var actionBlock: KMBaseCompressTableCellViewActionBlock?
     
-    override func draw(_ dirtyRect: NSRect) {
-        super.draw(dirtyRect)
+    @IBOutlet weak var buttonConetntView: NSView!
+    
+    override func awakeFromNib() {
+        self.setup()
+        self.updateUI()
+        self.updateLanguage()
+        self.reloadData()
+        self.addNotification()
+        self.changeEffectiveAppearance()
+    }
+
+    public required init?(coder decoder: NSCoder) {
+        super.init(coder: decoder)
+        self.setup()
+        self.updateUI()
+        self.updateLanguage()
+        self.reloadData()
+        self.addNotification()
+        self.changeEffectiveAppearance()
+    }
+    
+    override init(frame frameRect: NSRect) {
+        super.init(frame: frameRect)
+        self.setup()
+        self.updateUI()
+        self.updateLanguage()
+        self.reloadData()
+        self.addNotification()
+        self.changeEffectiveAppearance()
+    }
 
-        // Drawing code here.
+    func setup() {
+        
+    }
+    
+    //刷新界面UI 和 数据
+    func reloadData() {
+
+    }
+    
+    func updateLanguage() {
+        
+    }
+    
+    func updateUI() {
+        guard let buttonConetntView = self.buttonConetntView else { return }
+        buttonConetntView.wantsLayer = true
+        buttonConetntView.layer?.cornerRadius = 6
+        if KMAppearance.isDarkMode() {
+            buttonConetntView.layer?.backgroundColor = NSColor(hex: "#424345").cgColor
+        } else {
+            buttonConetntView.layer?.backgroundColor = NSColor(hex: "#EAECF2").cgColor
+        }
+    }
+    
+    func resetData() {
+        
     }
     
+    func addNotification() {
+        NotificationCenter.default.addObserver(self, selector: #selector(changeEffectiveAppearance), name: NSNotification.Name(rawValue: "kEffectiveAppearance"), object: nil)
+    }
+    
+    func removeNotification() {
+        NotificationCenter.default.removeObserver(self)
+        DistributedNotificationCenter.default().removeObserver(self)
+    }
+    
+    @objc func changeEffectiveAppearance() {
+        let isDarkModel = KMAdvertisementConfig.isDarkModel()
+        if isDarkModel {
+            self.appearance = NSAppearance(named: .darkAqua)
+        } else {
+            self.appearance = NSAppearance(named: .aqua)
+        }
+        self.updateUI()
+    }
 }

+ 29 - 5
PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/SettingView/View/KMCompressDiscardPanelTableCellView.swift

@@ -17,15 +17,39 @@ class KMCompressDiscardPanelTableCellView: KMBaseCompressTableCellView, NibLoada
         }
     }
     
-    override func draw(_ dirtyRect: NSRect) {
-        super.draw(dirtyRect)
+    override func updateUI() {
+        super.updateUI()
+    }
 
-        // Drawing code here.
+    override func reloadData() {
+        guard let model = model else { return }
+        
+        self.titleLabel.stringValue = NSLocalizedString(model.title, comment: "")
+        DispatchQueue.main.async {
+            self.updateButtonUI()
+        }
     }
     
-    func reloadData() {
+    func updateButtonUI() {
         guard let model = model else { return }
         
-        self.titleLabel.stringValue = NSLocalizedString(model.title, comment: "")
+        
+        let array = model.content as? Array<String>
+        if array?.count != 0 {
+            for (index, string) in array!.enumerated() {
+                let radioButton = NSButton(checkboxWithTitle: NSLocalizedString(string, comment: ""), target: self, action: #selector(buttonAction))
+                radioButton.frame = CGRectMake(16,
+                                               self.buttonConetntView.bounds.height - (CGFloat(index * (12 + 16)) + 12) - 16,
+                                               self.bounds.width,
+                                               16)
+                radioButton.tag = index
+                radioButton.translatesAutoresizingMaskIntoConstraints = false
+                self.buttonConetntView.addSubview(radioButton)
+            }
+        }
+    }
+    
+    @objc func buttonAction(sender: NSButton) {
+        
     }
 }

+ 5 - 4
PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/SettingView/View/KMCompressDiscardPanelTableCellView.xib

@@ -10,11 +10,11 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView id="c22-O7-iKe" customClass="KMCompressDiscardPanelTableCellView" customModule="PDF_Reader_Pro" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="480" height="272"/>
+            <rect key="frame" x="0.0" y="0.0" width="480" height="176"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0bg-Yr-4UM">
-                    <rect key="frame" x="-2" y="252" width="142" height="16"/>
+                    <rect key="frame" x="-2" y="156" width="142" height="16"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" title="Discard Objects Panel:" id="5l1-4d-VTL">
                         <font key="font" usesAppearanceFont="YES"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -22,7 +22,7 @@
                     </textFieldCell>
                 </textField>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="lI3-GQ-szS">
-                    <rect key="frame" x="0.0" y="24" width="480" height="222"/>
+                    <rect key="frame" x="0.0" y="24" width="480" height="126"/>
                 </customView>
             </subviews>
             <constraints>
@@ -34,9 +34,10 @@
                 <constraint firstAttribute="bottom" secondItem="lI3-GQ-szS" secondAttribute="bottom" constant="24" id="ops-h8-UXT"/>
             </constraints>
             <connections>
+                <outlet property="buttonConetntView" destination="lI3-GQ-szS" id="C7z-yi-0Gv"/>
                 <outlet property="titleLabel" destination="0bg-Yr-4UM" id="Av7-bk-Bgg"/>
             </connections>
-            <point key="canvasLocation" x="132" y="-72"/>
+            <point key="canvasLocation" x="132" y="-120"/>
         </customView>
     </objects>
 </document>

+ 8 - 1
PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/SettingView/View/KMCompressFontsPanelTableCellView.swift

@@ -10,6 +10,7 @@ import Cocoa
 class KMCompressFontsPanelTableCellView: KMBaseCompressTableCellView, NibLoadable {
 
     @IBOutlet weak var titleLabel: NSTextField!
+    @IBOutlet weak var fontButton: NSButton!
     
     override var model: KMCompressSettingModel? {
         didSet {
@@ -23,10 +24,16 @@ class KMCompressFontsPanelTableCellView: KMBaseCompressTableCellView, NibLoadabl
         // Drawing code here.
     }
     
-    func reloadData() {
+    override func updateUI() {
+        super.updateUI()
+    }
+    
+    override func reloadData() {
         guard let model = model else { return }
         
         self.titleLabel.stringValue = NSLocalizedString(model.title, comment: "")
+        
+        self.fontButton.stringValue = NSLocalizedString(model.content as? String ?? "", comment: "")
     }
     
 }

+ 8 - 6
PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/SettingView/View/KMCompressFontsPanelTableCellView.xib

@@ -10,11 +10,11 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView id="c22-O7-iKe" customClass="KMCompressFontsPanelTableCellView" customModule="PDF_Reader_Pro" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="480" height="111"/>
+            <rect key="frame" x="0.0" y="0.0" width="480" height="100"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="fpb-rb-lmX">
-                    <rect key="frame" x="-2" y="91" width="82" height="16"/>
+                    <rect key="frame" x="-2" y="80" width="82" height="16"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" title="Fonts Panel:" id="LzU-xF-YBf">
                         <font key="font" usesAppearanceFont="YES"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -22,11 +22,11 @@
                     </textFieldCell>
                 </textField>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="sqs-WM-2DO">
-                    <rect key="frame" x="0.0" y="24" width="480" height="61"/>
+                    <rect key="frame" x="0.0" y="24" width="480" height="50"/>
                     <subviews>
                         <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yAw-Tu-dup">
-                            <rect key="frame" x="14" y="21.5" width="163" height="18"/>
-                            <buttonCell key="cell" type="radio" title="Standard(Recommend)" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="KTe-0S-w7D">
+                            <rect key="frame" x="14" y="16.5" width="135" height="18"/>
+                            <buttonCell key="cell" type="radio" title="Unembed Any Font" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="KTe-0S-w7D">
                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                 <font key="font" metaFont="cellTitle"/>
                             </buttonCell>
@@ -38,18 +38,20 @@
                     <constraints>
                         <constraint firstItem="yAw-Tu-dup" firstAttribute="centerY" secondItem="sqs-WM-2DO" secondAttribute="centerY" id="0Ow-RC-MPG"/>
                         <constraint firstItem="yAw-Tu-dup" firstAttribute="leading" secondItem="sqs-WM-2DO" secondAttribute="leading" constant="16" id="Omy-bP-1bS"/>
+                        <constraint firstAttribute="height" constant="50" id="YyV-rq-IJe"/>
                     </constraints>
                 </customView>
             </subviews>
             <constraints>
                 <constraint firstItem="fpb-rb-lmX" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" constant="4" id="0Vb-Hk-hgC"/>
-                <constraint firstAttribute="bottom" secondItem="sqs-WM-2DO" secondAttribute="bottom" constant="24" id="19E-yW-5ut"/>
                 <constraint firstItem="sqs-WM-2DO" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" constant="26" id="I7i-Ro-u3i"/>
                 <constraint firstAttribute="trailing" secondItem="sqs-WM-2DO" secondAttribute="trailing" id="LzV-GD-5nC"/>
                 <constraint firstItem="sqs-WM-2DO" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" id="c7r-g0-6QK"/>
                 <constraint firstItem="fpb-rb-lmX" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" id="om6-KN-al7"/>
             </constraints>
             <connections>
+                <outlet property="buttonConetntView" destination="sqs-WM-2DO" id="x3z-oV-IHf"/>
+                <outlet property="fontButton" destination="yAw-Tu-dup" id="yRa-vY-Dv6"/>
                 <outlet property="titleLabel" destination="fpb-rb-lmX" id="zSp-ex-yDG"/>
             </connections>
             <point key="canvasLocation" x="132" y="-152.5"/>

+ 5 - 1
PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/SettingView/View/KMCompressImagesPanelTableCellView.swift

@@ -22,7 +22,11 @@ class KMCompressImagesPanelTableCellView: KMBaseCompressTableCellView, NibLoadab
         // Drawing code here.
     }
     
-    func reloadData() {
+    override func updateUI() {
+        super.updateUI()
+    }
+    
+    override func reloadData() {
         guard let model = model else { return }
         
         self.titleLabel.stringValue = NSLocalizedString(model.title, comment: "")

+ 22 - 21
PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/SettingView/View/KMCompressImagesPanelTableCellView.xib

@@ -11,14 +11,14 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView id="c22-O7-iKe" customClass="KMCompressImagesPanelTableCellView" customModule="PDF_Reader_Pro" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="646" height="131"/>
+            <rect key="frame" x="0.0" y="0.0" width="584" height="100"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="Znx-Wg-LS4">
-                    <rect key="frame" x="0.0" y="24" width="646" height="107"/>
+                    <rect key="frame" x="0.0" y="24" width="584" height="76"/>
                     <subviews>
                         <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ht4-BQ-Ga8">
-                            <rect key="frame" x="-2" y="87" width="81" height="16"/>
+                            <rect key="frame" x="-2" y="56" width="81" height="16"/>
                             <textFieldCell key="cell" lineBreakMode="clipping" title="ImagePanel:" id="Xy5-1R-n9e">
                                 <font key="font" usesAppearanceFont="YES"/>
                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -26,18 +26,18 @@
                             </textFieldCell>
                         </textField>
                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="Yqh-YR-NAF">
-                            <rect key="frame" x="0.0" y="0.0" width="646" height="81"/>
+                            <rect key="frame" x="0.0" y="0.0" width="584" height="50"/>
                             <subviews>
                                 <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="92j-6E-enx">
-                                    <rect key="frame" x="-2" y="33" width="92" height="16"/>
-                                    <textFieldCell key="cell" lineBreakMode="clipping" title="PPI For Image:" id="6hD-5C-hjn">
+                                    <rect key="frame" x="2" y="17" width="89" height="16"/>
+                                    <textFieldCell key="cell" lineBreakMode="clipping" title="PPI for Image:" id="6hD-5C-hjn">
                                         <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>
                                 <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="rRb-W1-BeU">
-                                    <rect key="frame" x="92" y="31" width="50" height="20"/>
+                                    <rect key="frame" x="95" y="15" width="50" height="20"/>
                                     <view key="contentView" id="ADh-6q-unE">
                                         <rect key="frame" x="0.0" y="0.0" width="50" height="20"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -49,7 +49,7 @@
                                     <color key="fillColor" name="findHighlightColor" catalog="System" colorSpace="catalog"/>
                                 </box>
                                 <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="taM-CD-cQz">
-                                    <rect key="frame" x="144" y="33" width="24" height="16"/>
+                                    <rect key="frame" x="147" y="17" width="24" height="16"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" title="PPI" id="DYQ-so-WNA">
                                         <font key="font" metaFont="system"/>
                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -57,15 +57,15 @@
                                     </textFieldCell>
                                 </textField>
                                 <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nPY-8Y-8dL">
-                                    <rect key="frame" x="184" y="33" width="134" height="16"/>
-                                    <textFieldCell key="cell" lineBreakMode="clipping" title="PPI For Image Above:" id="YvU-Bd-LdU">
+                                    <rect key="frame" x="187" y="17" width="137" height="16"/>
+                                    <textFieldCell key="cell" lineBreakMode="clipping" title="PPI For Image Above" id="YvU-Bd-LdU">
                                         <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>
                                 <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="T1Q-4g-yfg">
-                                    <rect key="frame" x="320" y="31" width="50" height="20"/>
+                                    <rect key="frame" x="328" y="15" width="50" height="20"/>
                                     <view key="contentView" id="yLL-Y6-iJB">
                                         <rect key="frame" x="0.0" y="0.0" width="50" height="20"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -77,7 +77,7 @@
                                     <color key="fillColor" name="findHighlightColor" catalog="System" colorSpace="catalog"/>
                                 </box>
                                 <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vte-w4-cRw">
-                                    <rect key="frame" x="372" y="33" width="24" height="16"/>
+                                    <rect key="frame" x="380" y="17" width="24" height="16"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" title="PPI" id="BP0-6O-ISf">
                                         <font key="font" metaFont="system"/>
                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -85,15 +85,15 @@
                                     </textFieldCell>
                                 </textField>
                                 <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lD6-Gr-28s">
-                                    <rect key="frame" x="412" y="33" width="134" height="16"/>
-                                    <textFieldCell key="cell" lineBreakMode="clipping" title="PPI For Image Above:" id="uTB-CU-JNM">
+                                    <rect key="frame" x="420" y="17" width="54" height="16"/>
+                                    <textFieldCell key="cell" lineBreakMode="clipping" title="Quality:" id="uTB-CU-JNM">
                                         <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>
                                 <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="XUj-mR-Ka0">
-                                    <rect key="frame" x="548" y="31" width="76" height="20"/>
+                                    <rect key="frame" x="478" y="15" width="76" height="20"/>
                                     <view key="contentView" id="xbz-NL-sTL">
                                         <rect key="frame" x="0.0" y="0.0" width="76" height="20"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -107,20 +107,21 @@
                             </subviews>
                             <constraints>
                                 <constraint firstItem="rRb-W1-BeU" firstAttribute="centerY" secondItem="92j-6E-enx" secondAttribute="centerY" id="0Kh-iM-7yU"/>
-                                <constraint firstItem="rRb-W1-BeU" firstAttribute="leading" secondItem="92j-6E-enx" secondAttribute="trailing" constant="4" id="0LY-Tq-yaR"/>
+                                <constraint firstItem="rRb-W1-BeU" firstAttribute="leading" secondItem="92j-6E-enx" secondAttribute="trailing" constant="6" id="0LY-Tq-yaR"/>
                                 <constraint firstItem="nPY-8Y-8dL" firstAttribute="leading" secondItem="taM-CD-cQz" secondAttribute="trailing" constant="20" id="1ON-Qs-o55"/>
                                 <constraint firstItem="T1Q-4g-yfg" firstAttribute="centerY" secondItem="nPY-8Y-8dL" secondAttribute="centerY" id="38W-YI-Fcx"/>
                                 <constraint firstItem="taM-CD-cQz" firstAttribute="leading" secondItem="rRb-W1-BeU" secondAttribute="trailing" constant="4" id="8kn-nb-9Qk"/>
                                 <constraint firstItem="XUj-mR-Ka0" firstAttribute="centerY" secondItem="lD6-Gr-28s" secondAttribute="centerY" id="Isv-dU-i1U"/>
+                                <constraint firstAttribute="height" constant="50" id="JuA-Pt-tsa"/>
                                 <constraint firstItem="lD6-Gr-28s" firstAttribute="centerY" secondItem="nPY-8Y-8dL" secondAttribute="centerY" id="K1h-vk-sqB"/>
-                                <constraint firstItem="T1Q-4g-yfg" firstAttribute="leading" secondItem="nPY-8Y-8dL" secondAttribute="trailing" constant="4" id="L3z-gh-VTs"/>
+                                <constraint firstItem="T1Q-4g-yfg" firstAttribute="leading" secondItem="nPY-8Y-8dL" secondAttribute="trailing" constant="6" id="L3z-gh-VTs"/>
                                 <constraint firstItem="vte-w4-cRw" firstAttribute="centerY" secondItem="yLL-Y6-iJB" secondAttribute="centerY" id="LVA-JK-tKF"/>
                                 <constraint firstItem="vte-w4-cRw" firstAttribute="leading" secondItem="T1Q-4g-yfg" secondAttribute="trailing" constant="4" id="TtN-pV-9N3"/>
-                                <constraint firstItem="XUj-mR-Ka0" firstAttribute="leading" secondItem="lD6-Gr-28s" secondAttribute="trailing" constant="4" id="aIk-QQ-rRS"/>
+                                <constraint firstItem="XUj-mR-Ka0" firstAttribute="leading" secondItem="lD6-Gr-28s" secondAttribute="trailing" constant="6" id="aIk-QQ-rRS"/>
                                 <constraint firstItem="lD6-Gr-28s" firstAttribute="leading" secondItem="vte-w4-cRw" secondAttribute="trailing" constant="20" id="bLS-M9-Pkx"/>
                                 <constraint firstItem="92j-6E-enx" firstAttribute="centerY" secondItem="Yqh-YR-NAF" secondAttribute="centerY" id="bLw-t6-z4J"/>
                                 <constraint firstItem="taM-CD-cQz" firstAttribute="centerY" secondItem="ADh-6q-unE" secondAttribute="centerY" id="j8x-tn-IrT"/>
-                                <constraint firstItem="92j-6E-enx" firstAttribute="leading" secondItem="Yqh-YR-NAF" secondAttribute="leading" id="qc9-ig-RLY"/>
+                                <constraint firstItem="92j-6E-enx" firstAttribute="leading" secondItem="Yqh-YR-NAF" secondAttribute="leading" constant="4" id="qc9-ig-RLY"/>
                                 <constraint firstItem="nPY-8Y-8dL" firstAttribute="centerY" secondItem="92j-6E-enx" secondAttribute="centerY" id="tRw-yA-9wX"/>
                             </constraints>
                         </customView>
@@ -131,7 +132,6 @@
                         <constraint firstItem="Yqh-YR-NAF" firstAttribute="top" secondItem="Znx-Wg-LS4" secondAttribute="top" constant="26" id="2i2-LS-fTz"/>
                         <constraint firstAttribute="trailing" secondItem="Yqh-YR-NAF" secondAttribute="trailing" id="4AL-Eb-1TM"/>
                         <constraint firstItem="Yqh-YR-NAF" firstAttribute="leading" secondItem="Znx-Wg-LS4" secondAttribute="leading" id="jil-nP-La5"/>
-                        <constraint firstAttribute="bottom" secondItem="Yqh-YR-NAF" secondAttribute="bottom" id="qaj-nI-6In"/>
                     </constraints>
                 </customView>
             </subviews>
@@ -142,9 +142,10 @@
                 <constraint firstItem="Znx-Wg-LS4" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" id="sm8-Ad-wck"/>
             </constraints>
             <connections>
+                <outlet property="buttonConetntView" destination="Yqh-YR-NAF" id="UP5-Yj-8FY"/>
                 <outlet property="titleLabel" destination="Ht4-BQ-Ga8" id="qMg-MO-MFT"/>
             </connections>
-            <point key="canvasLocation" x="100" y="17.5"/>
+            <point key="canvasLocation" x="100" y="5"/>
         </customView>
     </objects>
 </document>

+ 6 - 1
PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/SettingView/View/KMCompressModesTableCellView.swift

@@ -10,6 +10,7 @@ import Cocoa
 class KMCompressModesTableCellView: KMBaseCompressTableCellView, NibLoadable {
 
     @IBOutlet weak var titleLabel: NSTextField!
+    @IBOutlet weak var comboBox: KMComboBox!
     
     override var model: KMCompressSettingModel? {
         didSet {
@@ -23,7 +24,11 @@ class KMCompressModesTableCellView: KMBaseCompressTableCellView, NibLoadable {
         // Drawing code here.
     }
     
-    func reloadData() {
+    override func updateUI() {
+        super.updateUI()
+    }
+    
+    override func reloadData() {
         guard let model = model else { return }
         
         self.titleLabel.stringValue = NSLocalizedString(model.title, comment: "")

+ 21 - 18
PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/SettingView/View/KMCompressModesTableCellView.xib

@@ -3,7 +3,6 @@
     <dependencies>
         <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
-        <capability name="System colors introduced in macOS 10.13" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -11,39 +10,42 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView id="c22-O7-iKe" customClass="KMCompressModesTableCellView" customModule="PDF_Reader_Pro" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="480" height="69"/>
+            <rect key="frame" x="0.0" y="0.0" width="480" height="48"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="yHv-cb-JkX">
-                    <rect key="frame" x="0.0" y="24" width="480" height="45"/>
+                    <rect key="frame" x="0.0" y="24" width="480" height="24"/>
                     <subviews>
                         <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Odo-EZ-jmE">
-                            <rect key="frame" x="-2" y="15" width="52" height="16"/>
+                            <rect key="frame" x="-2" y="4" width="52" height="16"/>
                             <textFieldCell key="cell" lineBreakMode="clipping" title="Modes:" id="AoX-wh-vIK">
                                 <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>
-                        <box boxType="custom" borderType="none" borderWidth="0.0" cornerRadius="2" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="mlf-dm-Y5U">
-                            <rect key="frame" x="52" y="11" width="92" height="24"/>
-                            <view key="contentView" id="TLY-f0-6YP">
-                                <rect key="frame" x="0.0" y="0.0" width="92" height="24"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                            </view>
+                        <comboBox focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cuA-kr-lmT" customClass="KMComboBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
+                            <rect key="frame" x="61" y="0.0" width="116" height="23"/>
                             <constraints>
-                                <constraint firstAttribute="width" constant="92" id="Rcz-CK-ogC"/>
-                                <constraint firstAttribute="height" constant="24" id="gY9-as-uJP"/>
+                                <constraint firstAttribute="width" constant="112" id="QC1-ot-AoB"/>
                             </constraints>
-                            <color key="borderColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
-                            <color key="fillColor" name="findHighlightColor" catalog="System" colorSpace="catalog"/>
-                        </box>
+                            <comboBoxCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" completes="NO" numberOfVisibleItems="5" id="mKD-ja-P6j" customClass="KMComboBoxCell" customModule="PDF_Reader_Pro" customModuleProvider="target">
+                                <font key="font" metaFont="system"/>
+                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                <objectValues>
+                                    <string>Item 1</string>
+                                    <string>Item 2</string>
+                                    <string>Item 3</string>
+                                </objectValues>
+                            </comboBoxCell>
+                        </comboBox>
                     </subviews>
                     <constraints>
-                        <constraint firstItem="mlf-dm-Y5U" firstAttribute="leading" secondItem="Odo-EZ-jmE" secondAttribute="trailing" constant="4" id="2CZ-A3-ncm"/>
+                        <constraint firstItem="cuA-kr-lmT" firstAttribute="centerY" secondItem="yHv-cb-JkX" secondAttribute="centerY" id="L6e-QW-nf9"/>
                         <constraint firstItem="Odo-EZ-jmE" firstAttribute="centerY" secondItem="yHv-cb-JkX" secondAttribute="centerY" id="PEO-jC-dg2"/>
-                        <constraint firstItem="mlf-dm-Y5U" firstAttribute="centerY" secondItem="Odo-EZ-jmE" secondAttribute="centerY" id="ccx-U6-008"/>
                         <constraint firstItem="Odo-EZ-jmE" firstAttribute="leading" secondItem="yHv-cb-JkX" secondAttribute="leading" id="i8X-Du-PXY"/>
+                        <constraint firstItem="cuA-kr-lmT" firstAttribute="leading" secondItem="Odo-EZ-jmE" secondAttribute="trailing" constant="14" id="msR-4e-U0d"/>
                     </constraints>
                 </customView>
             </subviews>
@@ -54,9 +56,10 @@
                 <constraint firstAttribute="bottom" secondItem="yHv-cb-JkX" secondAttribute="bottom" constant="24" id="vjT-XX-HY8"/>
             </constraints>
             <connections>
+                <outlet property="comboBox" destination="cuA-kr-lmT" id="4vO-FB-KGp"/>
                 <outlet property="titleLabel" destination="Odo-EZ-jmE" id="3Ko-Zp-cC5"/>
             </connections>
-            <point key="canvasLocation" x="132" y="29.5"/>
+            <point key="canvasLocation" x="132" y="29"/>
         </customView>
     </objects>
 </document>

+ 5 - 0
PDF Office/PDF Master/Class/Batch/WindowController/VC/Compress/View/KMBatchOperateCompressView.swift

@@ -121,6 +121,11 @@ extension KMBatchOperateCompressView {
     @IBAction func settingButtonAction(_ sender: Any) {
         let controller: KMBatchOperateCompressSettingViewController = KMBatchOperateCompressSettingViewController(nibName: "KMBatchOperateCompressSettingViewController", bundle: nil)
         let window = NSWindow(contentViewController: controller)
+        
+        window.minSize = CGSizeMake(624, 513)
+        window.maxSize = CGSizeMake(624, 513)
+        window.styleMask.remove(.resizable)
+        
         let currentWindow = NSWindow.currentWindow()
         currentWindow.beginSheet(window)
         

+ 14 - 13
PDF Office/PDF Master/Class/Home/ViewController/customViewController/KMDesignButton.xib

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMDesignButton" customModule="PDF_Master" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMDesignButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="button" destination="Zns-K7-6eD" id="VMf-U0-mvN"/>
                 <outlet property="imageButtonBox" destination="cvM-Bd-5JV" id="jfg-8m-FSC"/>
@@ -84,14 +85,14 @@
             </constraints>
             <point key="canvasLocation" x="68" y="67.5"/>
         </customView>
-        <box boxType="custom" borderWidth="0.0" title="Box" id="Y8j-9c-Qz0" customClass="KMMoveBox" customModule="PDF_Master" customModuleProvider="target">
+        <box boxType="custom" borderWidth="0.0" title="Box" id="Y8j-9c-Qz0" customClass="KMMoveBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="80" height="32"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <view key="contentView" id="V2P-Be-4EP">
                 <rect key="frame" x="0.0" y="0.0" width="80" height="32"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6nN-bR-GkZ">
+                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6nN-bR-GkZ">
                         <rect key="frame" x="22" y="8" width="37" height="16"/>
                         <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="td8-Mq-qY9">
                             <font key="font" metaFont="system"/>
@@ -107,7 +108,7 @@
             </constraints>
             <point key="canvasLocation" x="-114" y="158"/>
         </box>
-        <box boxType="custom" borderWidth="0.0" title="Box" id="cvM-Bd-5JV" customClass="KMMoveBox" customModule="PDF_Master" customModuleProvider="target">
+        <box boxType="custom" borderWidth="0.0" title="Box" id="cvM-Bd-5JV" customClass="KMMoveBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
             <autoresizingMask key="autoresizingMask"/>
             <view key="contentView" id="MNI-fR-ZxO">
@@ -128,7 +129,7 @@
             </view>
             <point key="canvasLocation" x="-114" y="264"/>
         </box>
-        <box boxType="custom" cornerRadius="4" title="Box" id="Xrh-vh-9yg" customClass="KMMoveBox" customModule="PDF_Master" customModuleProvider="target">
+        <box boxType="custom" cornerRadius="4" title="Box" id="Xrh-vh-9yg" customClass="KMMoveBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="412" height="2"/>
             <autoresizingMask key="autoresizingMask"/>
             <view key="contentView" id="JIa-kj-5wJ">
@@ -149,7 +150,7 @@
                     </constraints>
                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="btn_radio_sel_on" id="WaL-nA-4aZ"/>
                 </imageView>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7iI-P1-LQl">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7iI-P1-LQl">
                     <rect key="frame" x="14" y="28" width="37" height="16"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="T46-2A-MTS">
                         <font key="font" metaFont="system"/>
@@ -179,7 +180,7 @@
                     </constraints>
                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="btn_radio_sel_on" id="TeJ-Rb-Oeq"/>
                 </imageView>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xOY-wx-EuE">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xOY-wx-EuE">
                     <rect key="frame" x="42" y="27" width="37" height="16"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="vVz-sh-jqf">
                         <font key="font" metaFont="system"/>
@@ -208,7 +209,7 @@
                     </constraints>
                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="btn_radio_sel_on" id="ZBq-r6-PRf"/>
                 </imageView>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rYG-AJ-viM">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rYG-AJ-viM">
                     <rect key="frame" x="141" y="16" width="37" height="16"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="flh-Ms-wGl">
                         <font key="font" metaFont="system"/>
@@ -237,7 +238,7 @@
                     </constraints>
                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="btn_radio_sel_on" id="dxm-Kd-sDS"/>
                 </imageView>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3L5-Tt-c0P">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3L5-Tt-c0P">
                     <rect key="frame" x="141" y="44" width="37" height="16"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="pdi-kB-OUk">
                         <font key="font" metaFont="system"/>
@@ -254,7 +255,7 @@
             </constraints>
             <point key="canvasLocation" x="554" y="439"/>
         </customView>
-        <box boxType="custom" borderWidth="0.0" title="Box" id="Dan-L1-vKC" customClass="KMMoveBox" customModule="PDF_Master" customModuleProvider="target">
+        <box boxType="custom" borderWidth="0.0" title="Box" id="Dan-L1-vKC" customClass="KMMoveBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="65" height="22"/>
             <autoresizingMask key="autoresizingMask"/>
             <view key="contentView" id="tPq-1S-9CW">
@@ -269,7 +270,7 @@
                         </constraints>
                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="KMRadioButtonUnSelect" id="b2G-WY-aoL"/>
                     </imageView>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Rcq-Ab-TwC">
+                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Rcq-Ab-TwC">
                         <rect key="frame" x="22" y="3" width="37" height="16"/>
                         <textFieldCell key="cell" lineBreakMode="truncatingTail" title="Label" id="laz-qX-1sa">
                             <font key="font" metaFont="system"/>

+ 5 - 5
PDF Office/PDF Master/Class/Home/ViewController/customViewController/KMDesignDropdown.xib

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMDesignDropdown" customModule="PDF_Office" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMDesignDropdown" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="button" destination="BXC-dZ-9yX" id="jXs-tC-AF9"/>
                 <outlet property="dropdownView" destination="eXj-Sw-zps" id="7cP-az-Fa2"/>
@@ -22,7 +22,7 @@
             <rect key="frame" x="0.0" y="0.0" width="480" height="0.0"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="CmV-Us-mcD" customClass="KMMoveBox" customModule="PDF_Office" customModuleProvider="target">
+                <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="CmV-Us-mcD" customClass="KMMoveBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
                     <rect key="frame" x="0.0" y="0.0" width="480" height="0.0"/>
                     <view key="contentView" id="JP3-RS-EzL">
                         <rect key="frame" x="0.0" y="0.0" width="480" height="0.0"/>
@@ -53,7 +53,7 @@
             <rect key="frame" x="0.0" y="0.0" width="170" height="52"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="FW6-Dg-1uM">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="FW6-Dg-1uM">
                     <rect key="frame" x="6" y="18" width="158" height="16"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="42D-th-UnC">
                         <font key="font" usesAppearanceFont="YES"/>

+ 7 - 6
PDF Office/PDF Master/Class/Home/ViewController/customViewController/KMDesignSelect.xib

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMDesignSelect" customModule="PDF_Master" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMDesignSelect" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="horizontalPadding_spacing" destination="zXq-bs-uyE" id="lj0-Ik-ovU"/>
                 <outlet property="imageView" destination="pY7-Ye-k9N" id="gmc-pp-NfK"/>
@@ -24,7 +25,7 @@
             <rect key="frame" x="0.0" y="0.0" width="480" height="272"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="Xk1-7q-unw" customClass="KMBox" customModule="PDF_Master" customModuleProvider="target">
+                <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="Xk1-7q-unw" customClass="KMBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
                     <rect key="frame" x="0.0" y="0.0" width="480" height="272"/>
                     <view key="contentView" id="WPX-6N-vCM">
                         <rect key="frame" x="0.0" y="0.0" width="480" height="272"/>
@@ -47,9 +48,9 @@
                 <rect key="frame" x="0.0" y="0.0" width="317" height="21"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
-                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aHg-43-XTf">
+                    <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aHg-43-XTf">
                         <rect key="frame" x="0.0" y="0.0" width="287" height="21"/>
-                        <textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="c66-BA-jKX" customClass="KMSelectCell" customModule="PDF_Master" customModuleProvider="target">
+                        <textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="c66-BA-jKX" customClass="KMSelectCell" customModule="PDF_Reader_Pro" customModuleProvider="target">
                             <font key="font" usesAppearanceFont="YES"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>

+ 11 - 11
PDF Office/PDF Master/Class/Home/ViewController/customViewController/KMNotificationVC.xib

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMNotificationVC" customModule="PDF_Office" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMNotificationVC" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
             </connections>
@@ -45,7 +45,7 @@
                     </constraints>
                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="btn_radio_sel_on" id="J0f-JC-Rma"/>
                 </imageView>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="BSC-SG-7Cc">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="BSC-SG-7Cc">
                     <rect key="frame" x="44" y="94" width="400" height="22"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="22" id="FjH-h2-yVS"/>
@@ -56,7 +56,7 @@
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="GKT-DI-8NL">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="GKT-DI-8NL">
                     <rect key="frame" x="44" y="64" width="400" height="22"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="22" id="rbB-nM-v17"/>
@@ -73,7 +73,7 @@
                         <rect key="frame" x="1" y="1" width="106" height="30"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZFF-hU-3bu">
+                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZFF-hU-3bu">
                                 <rect key="frame" x="35" y="7" width="37" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="aGZ-XF-Uxg">
                                     <font key="font" metaFont="system"/>
@@ -101,14 +101,14 @@
                 </button>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ke3-BJ-QX4">
                     <rect key="frame" x="450" y="104" width="12" height="12"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="12" id="aWl-1B-fbj"/>
-                        <constraint firstAttribute="width" constant="12" id="chu-V3-i7R"/>
-                    </constraints>
                     <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" image="CPDFListViewImageNameCursorsFork" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="TmO-bM-5sp">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="12" id="aWl-1B-fbj"/>
+                        <constraint firstAttribute="width" constant="12" id="chu-V3-i7R"/>
+                    </constraints>
                 </button>
             </subviews>
             <constraints>
@@ -144,7 +144,7 @@
                     </constraints>
                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="jeb-WD-pEH"/>
                 </imageView>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="RuW-9Q-A9X">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="RuW-9Q-A9X">
                     <rect key="frame" x="38" y="52" width="324" height="22"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="22" id="K6P-uR-Qog"/>

+ 58 - 570
PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/lizhe.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -17732,6 +17732,21 @@
                   endingLineNumber = "3100"
                   offsetFromSymbolStart = "3520">
                </Location>
+               <Location
+                  uuid = "E6B1CDBF-AE0C-4A94-ACB5-2A41B09EAD97 - 6dd82cf55f61a364"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMMainViewController.extractImageAction(num: Swift.Int) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "3100"
+                  endingLineNumber = "3100"
+                  offsetFromSymbolStart = "1568">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -19367,99 +19382,6 @@
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "DD0FB332-6DED-4A78-B517-B43A6CC38B81"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/Document/KMMainDocument.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "96"
-            endingLineNumber = "96"
-            landmarkName = "save(to:ofType:for:delegate:didSave:contextInfo:)"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "DD0FB332-6DED-4A78-B517-B43A6CC38B81 - a4e6c9d5af09c63d"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMMainDocument.save(to: Foundation.URL, ofType: Swift.String, for: __C.NSSaveOperationType, delegate: Swift.Optional&lt;Any&gt;, didSave: Swift.Optional&lt;ObjectiveC.Selector&gt;, contextInfo: Swift.Optional&lt;Swift.UnsafeMutableRawPointer&gt;) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/Document/KMMainDocument.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "96"
-                  endingLineNumber = "96"
-                  offsetFromSymbolStart = "724">
-               </Location>
-               <Location
-                  uuid = "DD0FB332-6DED-4A78-B517-B43A6CC38B81 - a4e6c9d5af09c63d"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMMainDocument.save(to: Foundation.URL, ofType: Swift.String, for: __C.NSSaveOperationType, delegate: Swift.Optional&lt;Any&gt;, didSave: Swift.Optional&lt;ObjectiveC.Selector&gt;, contextInfo: Swift.Optional&lt;Swift.UnsafeMutableRawPointer&gt;) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/Document/KMMainDocument.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "96"
-                  endingLineNumber = "96"
-                  offsetFromSymbolStart = "1020">
-               </Location>
-               <Location
-                  uuid = "DD0FB332-6DED-4A78-B517-B43A6CC38B81 - a4e6c9d5af09c6f3"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMMainDocument.save(to: Foundation.URL, ofType: Swift.String, for: __C.NSSaveOperationType, delegate: Swift.Optional&lt;Any&gt;, didSave: Swift.Optional&lt;ObjectiveC.Selector&gt;, contextInfo: Swift.Optional&lt;Swift.UnsafeMutableRawPointer&gt;) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/Document/KMMainDocument.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "98"
-                  endingLineNumber = "98"
-                  offsetFromSymbolStart = "532">
-               </Location>
-               <Location
-                  uuid = "DD0FB332-6DED-4A78-B517-B43A6CC38B81 - a4e6c9d5af09c612"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMMainDocument.save(to: Foundation.URL, ofType: Swift.String, for: __C.NSSaveOperationType, delegate: Swift.Optional&lt;Any&gt;, didSave: Swift.Optional&lt;ObjectiveC.Selector&gt;, contextInfo: Swift.Optional&lt;Swift.UnsafeMutableRawPointer&gt;) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/Document/KMMainDocument.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "97"
-                  endingLineNumber = "97"
-                  offsetFromSymbolStart = "428">
-               </Location>
-               <Location
-                  uuid = "DD0FB332-6DED-4A78-B517-B43A6CC38B81 - a4e6c9d5af09c612"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMMainDocument.save(to: Foundation.URL, ofType: Swift.String, for: __C.NSSaveOperationType, delegate: Swift.Optional&lt;Any&gt;, didSave: Swift.Optional&lt;ObjectiveC.Selector&gt;, contextInfo: Swift.Optional&lt;Swift.UnsafeMutableRawPointer&gt;) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/Document/KMMainDocument.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "97"
-                  endingLineNumber = "97"
-                  offsetFromSymbolStart = "384">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -28802,7 +28724,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "514"
             endingLineNumber = "514"
-            landmarkName = "-addImageAnnotation:center:isRemoveBGColor:"
+            landmarkName = "-setCurrentSelection:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -28882,7 +28804,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1144"
             endingLineNumber = "1144"
-            landmarkName = "-rotateSignatureAnnotation:rotateAngle:"
+            landmarkName = "-editAnnotation:"
             landmarkType = "7">
             <Locations>
                <Location
@@ -29403,8 +29325,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "134"
             endingLineNumber = "134"
-            landmarkName = "+IBeamCursorImage:"
-            landmarkType = "7">
+            landmarkName = "NSCursor(PDFListView)"
+            landmarkType = "3">
             <Locations>
                <Location
                   uuid = "50BC553F-0464-4BF7-8D49-BCAE59F59F16 - 43ff3b7c0b1275ac"
@@ -29439,54 +29361,6 @@
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "F3F7C8DC-A5EA-48CB-BAD4-BBE6375E7A83"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/PDFWindowController/PDFListView/AppKitCategories/NSCursor+PDFListView.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "165"
-            endingLineNumber = "165"
-            landmarkName = "+arrowCursorImage:"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "F3F7C8DC-A5EA-48CB-BAD4-BBE6375E7A83 - 62ab7effb13bc4de"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "+[NSCursor(PDFListView) arrowCursorImage:]"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/AppKitCategories/NSCursor+PDFListView.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "166"
-                  endingLineNumber = "166"
-                  offsetFromSymbolStart = "24">
-               </Location>
-               <Location
-                  uuid = "F3F7C8DC-A5EA-48CB-BAD4-BBE6375E7A83 - 62ab7effb13bc4de"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "+[NSCursor(PDFListView) arrowCursorImage:]"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/AppKitCategories/NSCursor+PDFListView.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "166"
-                  endingLineNumber = "166"
-                  offsetFromSymbolStart = "56">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -29498,9 +29372,7 @@
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "889"
-            endingLineNumber = "889"
-            landmarkName = "+circelSelfSignCursor:"
-            landmarkType = "7">
+            endingLineNumber = "889">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -29515,7 +29387,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "875"
             endingLineNumber = "875"
-            landmarkName = "+dotSelfSignCursor:"
+            landmarkName = "+clearStampCursor"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -30930,6 +30802,21 @@
                   endingLineNumber = "4581"
                   offsetFromSymbolStart = "49104">
                </Location>
+               <Location
+                  uuid = "C5243CC7-A1A2-4358-86A9-63A8110B427B - 671f9f5a9fe17860"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "(1) suspend resume partial function for closure #1 @Sendable () async -&gt; () in PDF_Reader_Pro.KMMainViewController.clickChildTool(type: PDF_Reader_Pro.KMToolbarType, index: Swift.Int) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "4581"
+                  endingLineNumber = "4581"
+                  offsetFromSymbolStart = "18192">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -32643,6 +32530,21 @@
                   endingLineNumber = "4604"
                   offsetFromSymbolStart = "52772">
                </Location>
+               <Location
+                  uuid = "6C075581-DD64-44D1-BBAB-B7E9168DDC87 - 671f9f5a9fe1676b"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "(1) suspend resume partial function for closure #1 @Sendable () async -&gt; () in PDF_Reader_Pro.KMMainViewController.clickChildTool(type: PDF_Reader_Pro.KMToolbarType, index: Swift.Int) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "4604"
+                  endingLineNumber = "4604"
+                  offsetFromSymbolStart = "10128">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -32694,54 +32596,6 @@
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "72BA5232-6E5D-48BA-B7E3-67E0636F7BF7"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/ViewController/FormProperties/KMAnnotationGeneralViewController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "160"
-            endingLineNumber = "160"
-            landmarkName = "reloadData()"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "72BA5232-6E5D-48BA-B7E3-67E0636F7BF7 - 1d2d96511237ff0"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMAnnotationGeneralViewController.reloadData() -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/ViewController/FormProperties/KMAnnotationGeneralViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "160"
-                  endingLineNumber = "160"
-                  offsetFromSymbolStart = "1884">
-               </Location>
-               <Location
-                  uuid = "72BA5232-6E5D-48BA-B7E3-67E0636F7BF7 - 1d2d96511237ff0"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMAnnotationGeneralViewController.reloadData() -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/ViewController/FormProperties/KMAnnotationGeneralViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "160"
-                  endingLineNumber = "160"
-                  offsetFromSymbolStart = "2388">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -32790,54 +32644,6 @@
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "6D1169F9-7B09-45B5-BBC3-98D04AC5C2DB"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/ViewController/FormProperties/KMAnnotationGeneralViewController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "150"
-            endingLineNumber = "150"
-            landmarkName = "reloadData()"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "6D1169F9-7B09-45B5-BBC3-98D04AC5C2DB - 1d2d9651123413e"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMAnnotationGeneralViewController.reloadData() -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/ViewController/FormProperties/KMAnnotationGeneralViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "150"
-                  endingLineNumber = "150"
-                  offsetFromSymbolStart = "352">
-               </Location>
-               <Location
-                  uuid = "6D1169F9-7B09-45B5-BBC3-98D04AC5C2DB - 1d2d9651123413e"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMAnnotationGeneralViewController.reloadData() -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/ViewController/FormProperties/KMAnnotationGeneralViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "150"
-                  endingLineNumber = "150"
-                  offsetFromSymbolStart = "792">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -33321,8 +33127,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "643"
             endingLineNumber = "643"
-            landmarkName = "CPDFListView"
-            landmarkType = "3">
+            landmarkName = "-addAnnotationWithImage:center:"
+            landmarkType = "7">
             <Locations>
                <Location
                   uuid = "3C0E030B-51BD-41A4-8C06-E8B274CAB778 - 67d704e5b4d36e35"
@@ -33469,54 +33275,6 @@
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "E2670BF2-6BF0-4127-BD22-C930CB1648EC"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/PDFWindowController/PDFListView/AppKitCategories/NSCursor+PDFListView.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "104"
-            endingLineNumber = "104"
-            landmarkName = "+chairCursorImage:"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "E2670BF2-6BF0-4127-BD22-C930CB1648EC - 71bb3ba4b28e2ad5"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "+[NSCursor(PDFListView) chairCursorImage:]"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/AppKitCategories/NSCursor+PDFListView.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "105"
-                  endingLineNumber = "105"
-                  offsetFromSymbolStart = "24">
-               </Location>
-               <Location
-                  uuid = "E2670BF2-6BF0-4127-BD22-C930CB1648EC - 71bb3ba4b28e2ad5"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "+[NSCursor(PDFListView) chairCursorImage:]"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/AppKitCategories/NSCursor+PDFListView.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "105"
-                  endingLineNumber = "105"
-                  offsetFromSymbolStart = "56">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -33529,8 +33287,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "195"
             endingLineNumber = "195"
-            landmarkName = "+scaleImage:scaleFactor:"
-            landmarkType = "7">
+            landmarkName = "NSCursor(PDFListView)"
+            landmarkType = "3">
             <Locations>
                <Location
                   uuid = "808A9E08-9100-4A45-93F7-BED3C63502DE - 1004038effbe2932"
@@ -33577,7 +33335,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "408"
             endingLineNumber = "408"
-            landmarkName = "colorPanelAction(_:)"
+            landmarkName = "colorButtonAction(_:)"
             landmarkType = "7">
             <Locations>
                <Location
@@ -33613,54 +33371,6 @@
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "6F55B0A0-FD12-4C40-AF3B-4BF1CA55F8E3"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMColorPickerView.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "360"
-            endingLineNumber = "360"
-            landmarkName = "buttonAction(_:)"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "6F55B0A0-FD12-4C40-AF3B-4BF1CA55F8E3 - 599c7287419f56a4"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "function signature specialization &lt;Arg[2] = Dead&gt; of PDF_Reader_Pro.KMColorPickerView.isTheSameColor(_: __C.NSColor, anotherColor: __C.NSColor) -&gt; Swift.Bool"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMColorPickerView.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "361"
-                  endingLineNumber = "361"
-                  offsetFromSymbolStart = "660">
-               </Location>
-               <Location
-                  uuid = "6F55B0A0-FD12-4C40-AF3B-4BF1CA55F8E3 - 88baaa0e54e19e97"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMColorPickerView.isTheSameColor(_: __C.NSColor, anotherColor: __C.NSColor) -&gt; Swift.Bool"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMColorPickerView.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "360"
-                  endingLineNumber = "360"
-                  offsetFromSymbolStart = "1772">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -34087,180 +33797,6 @@
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "2F091EFD-1181-4FDB-9F66-4E9E1FF9DF72"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMColorPickerView.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "140"
-            endingLineNumber = "140"
-            landmarkName = "setColors(_:)"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "2F091EFD-1181-4FDB-9F66-4E9E1FF9DF72 - d6954587416fd6d1"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMColorPickerView.setColors(Swift.Array&lt;__C.NSColor&gt;) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMColorPickerView.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "140"
-                  endingLineNumber = "140"
-                  offsetFromSymbolStart = "68">
-               </Location>
-               <Location
-                  uuid = "2F091EFD-1181-4FDB-9F66-4E9E1FF9DF72 - d6954587416fd6d1"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMColorPickerView.setColors(Swift.Array&lt;__C.NSColor&gt;) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMColorPickerView.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "140"
-                  endingLineNumber = "140"
-                  offsetFromSymbolStart = "280">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "A441BE74-5598-4C90-9C00-285D030A444D"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMColorPickerView.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "369"
-            endingLineNumber = "369"
-            landmarkName = "customColorButtonAction(_:)"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "A441BE74-5598-4C90-9C00-285D030A444D - 7a68461a5a73785a"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMColorPickerView.customColorButtonAction(Any) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMColorPickerView.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "369"
-                  endingLineNumber = "369"
-                  offsetFromSymbolStart = "72">
-               </Location>
-               <Location
-                  uuid = "A441BE74-5598-4C90-9C00-285D030A444D - 7a68461a5a73785a"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMColorPickerView.customColorButtonAction(Any) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMColorPickerView.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "369"
-                  endingLineNumber = "369"
-                  offsetFromSymbolStart = "156">
-               </Location>
-               <Location
-                  uuid = "A441BE74-5598-4C90-9C00-285D030A444D - d9b13b9ac87f88b4"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "function signature specialization &lt;Arg[2] = Dead&gt; of PDF_Reader_Pro.KMColorPickerView.compareSize(CoreGraphics.CGFloat, CoreGraphics.CGFloat) -&gt; Swift.Bool"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMColorPickerView.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "372"
-                  endingLineNumber = "372"
-                  offsetFromSymbolStart = "404">
-               </Location>
-               <Location
-                  uuid = "A441BE74-5598-4C90-9C00-285D030A444D - db92a16f38498da3"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMColorPickerView.compareSize(CoreGraphics.CGFloat, CoreGraphics.CGFloat) -&gt; Swift.Bool"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMColorPickerView.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "371"
-                  endingLineNumber = "371"
-                  offsetFromSymbolStart = "532">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "3505CAD6-B625-4D7E-B643-D50A16BE6CDD"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMColorPickerView.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "376"
-            endingLineNumber = "376"
-            landmarkName = "colorButtonAction(_:)"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "3505CAD6-B625-4D7E-B643-D50A16BE6CDD - ebbddb7b745f7931"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMColorPickerView.buttonAction(__C.NSButton) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMColorPickerView.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "376"
-                  endingLineNumber = "376"
-                  offsetFromSymbolStart = "24">
-               </Location>
-               <Location
-                  uuid = "3505CAD6-B625-4D7E-B643-D50A16BE6CDD - ebbddb7b745f7931"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMColorPickerView.buttonAction(__C.NSButton) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMColorPickerView.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "376"
-                  endingLineNumber = "376"
-                  offsetFromSymbolStart = "60">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -34273,7 +33809,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "413"
             endingLineNumber = "413"
-            landmarkName = "menuItemChangeColorAction(_:)"
+            landmarkName = "colorButtonAction(_:)"
             landmarkType = "7">
             <Locations>
                <Location
@@ -34351,7 +33887,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "429"
             endingLineNumber = "429"
-            landmarkName = "menuItemPanelAction(_:)"
+            landmarkName = "colorPanelAction(_:)"
             landmarkType = "7">
             <Locations>
                <Location
@@ -34387,54 +33923,6 @@
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "BDF223E6-5956-4599-93CF-F8BC49071097"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMColorPickerView.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "122"
-            endingLineNumber = "122"
-            landmarkName = "setColor(_:)"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "BDF223E6-5956-4599-93CF-F8BC49071097 - fa209a43c55dd86b"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMColorPickerView.setColor(__C.NSColor) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMColorPickerView.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "123"
-                  endingLineNumber = "123"
-                  offsetFromSymbolStart = "1744">
-               </Location>
-               <Location
-                  uuid = "BDF223E6-5956-4599-93CF-F8BC49071097 - fa209a43c55dd86b"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMColorPickerView.setColor(__C.NSColor) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMColorPickerView.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "123"
-                  endingLineNumber = "123"
-                  offsetFromSymbolStart = "2568">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent