浏览代码

【2025】【Markup】
1、文字编辑模块自测
2、代码规范处理

niehaoyu 3 月之前
父节点
当前提交
c77ada7eb8
共有 29 个文件被更改,包括 42 次插入3150 次删除
  1. 2 30
      PDF Office/PDF Master/Class/GuideInfo/KMGuideInfoWindowController.swift
  2. 9 0
      PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFFreeTextAnnotation+PDFListView.swift
  3. 1 5
      PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+UI.swift
  4. 0 86
      PDF Office/PDF Master/KMClass/KMPDFViewController/EditTool/KMLinkViewController/Views/PopupViews/KMLinkPopupBaseView.swift
  5. 0 101
      PDF Office/PDF Master/KMClass/KMPDFViewController/EditTool/KMLinkViewController/Views/PopupViews/KMLinkPopupBaseView.xib
  6. 0 18
      PDF Office/PDF Master/KMClass/KMPDFViewController/EditTool/KMLinkViewController/Views/PopupViews/views/KMLinkPopupEmailView.swift
  7. 0 15
      PDF Office/PDF Master/KMClass/KMPDFViewController/EditTool/KMLinkViewController/Views/PopupViews/views/KMLinkPopupEmailView.xib
  8. 0 18
      PDF Office/PDF Master/KMClass/KMPDFViewController/EditTool/KMLinkViewController/Views/PopupViews/views/KMLinkPopupPageView.swift
  9. 0 15
      PDF Office/PDF Master/KMClass/KMPDFViewController/EditTool/KMLinkViewController/Views/PopupViews/views/KMLinkPopupPageView.xib
  10. 0 18
      PDF Office/PDF Master/KMClass/KMPDFViewController/EditTool/KMLinkViewController/Views/PopupViews/views/KMLinkPopupWebView.swift
  11. 0 15
      PDF Office/PDF Master/KMClass/KMPDFViewController/EditTool/KMLinkViewController/Views/PopupViews/views/KMLinkPopupWebView.xib
  12. 0 137
      PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/EditPDF/Controller/KMAlignmentController.swift
  13. 0 82
      PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/EditPDF/Controller/KMAlignmentController.xib
  14. 0 697
      PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/EditPDF/Controller/KMEditPDFPopToolBarController.swift
  15. 0 22
      PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/EditPDF/Controller/KMEditPDFPopToolBarController.xib
  16. 0 130
      PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/EditPDF/Controller/KMTextAlignmentController.swift
  17. 0 69
      PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/EditPDF/Controller/KMTextAlignmentController.xib
  18. 3 3
      PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/EditPDF/KMEditImageController.xib
  19. 2 2
      PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/EditPDF/KMEditPDFTextPropertyViewController.xib
  20. 0 217
      PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/EditPDF/Toolbar/KMEditPDFToolbarItemView.swift
  21. 0 74
      PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/EditPDF/Toolbar/KMEditPDFToolbarView.swift
  22. 0 226
      PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/EditPDF/View/AlignmentView/KMEditPropertyAlignmentView.swift
  23. 0 201
      PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/EditPDF/View/AlignmentView/KMEditPropertyAlignmentView.xib
  24. 0 133
      PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/EditPDF/View/KMEditPDFColorView.swift
  25. 0 74
      PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/EditPDF/Window/KMEditPDFCropComfirmWindowController.swift
  26. 0 67
      PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/EditPDF/Window/KMEditPDFCropComfirmWindowController.xib
  27. 0 391
      PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/EditPDF/Window/KMEditPDFPopToolBarWindow.swift
  28. 0 216
      PDF Office/PDF Reader Pro.xcodeproj/project.pbxproj
  29. 25 88
      PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

+ 2 - 30
PDF Office/PDF Master/Class/GuideInfo/KMGuideInfoWindowController.swift

@@ -259,12 +259,7 @@ class KMGuideInfoWindowController: NSWindowController {
                     } else if actionType == .next {
                         //Next
                         self.type = .openFileNormalProperty
-                        self.loadGuideInfoView()
-//                        guard let callBack = self.openFileToggleHandle else {
-//                            return
-//                        }
-//                        callBack(self, .openFileNormalProperty)
-//                        self.closeAction()
+                        self.loadGuideInfoView() 
                     }
                 }
                 self.openFileGuidePanel.circleRect = self.openPanelRect
@@ -310,20 +305,10 @@ class KMGuideInfoWindowController: NSWindowController {
                             return
                         }
                         callBack(self)
-//                        guard let callBack = self.openFileToggleHandle else {
-//                            return
-//                        }
-//                        callBack(self, .openFileNormalPanel)
-//                        self.closeAction()
                     } else if actionType == .next {
                         //Next
                         self.type = .openFileNormalToolbar
                         self.loadGuideInfoView()
-//                        guard let callBack = self.openFileToggleHandle else {
-//                            return
-//                        }
-//                        callBack(self, .openFileNormalToolbar)
-//                        self.closeAction()
                     }
                 }
                 self.openFileGuideProperty.circleRect = self.rightPanelRect
@@ -360,11 +345,6 @@ class KMGuideInfoWindowController: NSWindowController {
                         //Next
                         self.type = .openFileNormalProperty
                         self.loadGuideInfoView()
-//                        guard let callBack = self.openFileToggleHandle else {
-//                            return
-//                        }
-//                        callBack(self, .openFileNormalProperty)
-//                        self.closeAction()
                     } else if actionType == .finish {
                         guard let callBack = self.normalGuideFinishHandle else {
                             return
@@ -433,10 +413,6 @@ class KMGuideInfoWindowController: NSWindowController {
                 self.openFileFunctionView.type =  self.type
                 self.openFileFunctionView.clickHandle = {[weak self] view, actionType in
                     guard let self = self else { return }
-//                    guard let callBack = self.finishHandle else {
-//                        return
-//                    }
-//                    callBack(self, .windowDigitalFinish)
                     if actionType == .getIt {
                         self.closeAction()
                     }
@@ -500,16 +476,12 @@ class KMGuideInfoWindowController: NSWindowController {
             } else if self.type == .editPDFPopWindow {
                 self.editPDFPopGuideView = KMEditPDFPopGuideView(contentTop: self.editPDFPopWindowFlag)
                 self.editPDFPopGuideView?.frame.origin = self.digitalBoxRect.origin
-//                self.editPDFPopGuideView?.autoresizingMask = [.width, .height]
-                self.editPDFPopGuideView?.itemClick = { [weak self] idx, _ in
+                 self.editPDFPopGuideView?.itemClick = { [weak self] idx, _ in
                     self?.closeAction()
                     if idx == 0 { // 去设置
                         self?.settingCallback?()
                     }
                 }
-//                self.aiIconGuideView.updateViewColor()
-//                self.aiIconGuideView.wantsLayer = true
-                
                 self.coverView.addSubview(self.editPDFPopGuideView!)
                 KMGuideInfoWindowController.setDidShowFor(.editPDFPopWindow)//记录
             }

+ 9 - 0
PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFFreeTextAnnotation+PDFListView.swift

@@ -408,6 +408,15 @@ extension CPDFFreeTextAnnotation {
         for annotation in annotations {
             annotation.borderColor = resultColor
         }
+        let opacity = resultColor.getAlphaComponent()
+        for annotation in annotations {
+            if opacity < 0.01 {
+                annotation.borderColor = nil
+            } else {
+                annotation.borderColor = resultColor
+            }
+        }
+        
         pdfView.setNeedsDisplayMultiAnnotations(annotations)
         
         CPDFAnnotationConfig.setDefaultColor(resultColor, toKey: CFreeTextNoteBorderColorKey)

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

@@ -84,11 +84,7 @@ extension KMMainViewController {
         }
         if info.keys.contains(KMPreference.editPDFPopWindowShowKey) {
             let show = KMPreference.shared.editPDFPopWindowIsShow
-            let win = KMEditPDFPopToolBarWindow.shared
-            if !show && win.isVisible {
-                win.orderOut(nil)
-                win.setIsVisible(false)
-            }
+             
         }
     }
      

+ 0 - 86
PDF Office/PDF Master/KMClass/KMPDFViewController/EditTool/KMLinkViewController/Views/PopupViews/KMLinkPopupBaseView.swift

@@ -1,86 +0,0 @@
-//
-//  KMLinkPopupBaseView.swift
-//  PDF Reader Pro
-//
-//  Created by Niehaoyu on 2024/10/18.
-//
-
-import Cocoa
-import KMComponentLibrary
-
-class KMLinkPopupBaseView: BaseXibView {
-
-    @IBOutlet var contendBox: NSBox!
-    
-    @IBOutlet var baseView: NSView!
-    @IBOutlet var pageButton: ComponentButton!
-    @IBOutlet var webButton: ComponentButton!
-    @IBOutlet var emailButton: ComponentButton!
-    @IBOutlet var moreButton: ComponentButton!
-    
-    
-    override func draw(_ dirtyRect: NSRect) {
-        super.draw(dirtyRect)
-
-        // Drawing code here.
-    }
-    
-    
-    //MARK: - Setter
-    var linkPopupType: PDFLinkPopupType = .None {
-        didSet {
-            
-            self.refreshUI()
-            
-            self.reloadData()
-            
-        }
-    }
-    
-    func setUpProperty() {
-        pageButton.properties = ComponentButtonProperty(type: .text_gray, size: .s, state: .normal, onlyIcon: false, showLeftIcon: true, showRightIcon: false, buttonText: KMLocalizedString("Page"))
-        pageButton.properties.propertyInfo.leftIcon_nor = NSImage(named: "")
-        
-        webButton.properties = ComponentButtonProperty(type: .text_gray, size: .s, state: .normal, onlyIcon: false, showLeftIcon: true, showRightIcon: false, buttonText: KMLocalizedString("Web"))
-        webButton.properties.propertyInfo.leftIcon_nor = NSImage(named: "")
-        
-        emailButton.properties = ComponentButtonProperty(type: .text_gray, size: .s, state: .normal, onlyIcon: false, showLeftIcon: true, showRightIcon: false, buttonText: KMLocalizedString("Email"))
-        emailButton.properties.propertyInfo.leftIcon_nor = NSImage(named: "")
-        
-        moreButton.properties = ComponentButtonProperty(type: .text_gray, size: .s, onlyIcon: true)
-        moreButton.properties.propertyInfo.leftIcon_nor = NSImage(named: "")
-        
-    }
-    
-    func refreshUI() {
-        var rect = self.frame
-        if linkPopupType == .None {
-            rect.size.width = 303
-            rect.size.height = 40
-        } else if linkPopupType == .Page {
-            rect.size.width = 256
-            rect.size.height = 240
-        } else if linkPopupType == .Web {
-            rect.size.width = 328
-            rect.size.height = 40
-        } else if linkPopupType == .Email {
-            rect.size.width = 328
-            rect.size.height = 40
-        }
-        
-        NSAnimationContext.runAnimationGroup({ context in
-            
-            context.duration = 0.35
-            self.animator().frame = rect
-            
-        }, completionHandler: nil)
-        
-        
-    }
-    
-    func reloadData() {
-        
-        
-    }
-    
-}

+ 0 - 101
PDF Office/PDF Master/KMClass/KMPDFViewController/EditTool/KMLinkViewController/Views/PopupViews/KMLinkPopupBaseView.xib

@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="22505"/>
-        <capability name="Named colors" minToolsVersion="9.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMLinkPopupBaseView" customModule="PDF_Reader_Pro" customModuleProvider="target">
-            <connections>
-                <outlet property="baseView" destination="LjH-d2-mMz" id="i3M-Ia-wgc"/>
-                <outlet property="contendBox" destination="ocp-w7-gcM" id="kcc-MJ-Mab"/>
-                <outlet property="emailButton" destination="KQo-Mf-ryb" id="ixu-f2-0nT"/>
-                <outlet property="moreButton" destination="p6q-un-PKG" id="Kl2-BI-U2c"/>
-                <outlet property="pageButton" destination="ReC-gU-eYc" id="Tnq-i7-fGV"/>
-                <outlet property="webButton" destination="OBG-Rs-ect" id="w34-cS-GvJ"/>
-            </connections>
-        </customObject>
-        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customView id="c22-O7-iKe">
-            <rect key="frame" x="0.0" y="0.0" width="310" height="40"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-            <subviews>
-                <box boxType="custom" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="ocp-w7-gcM">
-                    <rect key="frame" x="0.0" y="0.0" width="310" height="40"/>
-                    <view key="contentView" id="XIN-cf-7Vi">
-                        <rect key="frame" x="1" y="1" width="308" height="38"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="LjH-d2-mMz">
-                                <rect key="frame" x="0.0" y="0.0" width="308" height="38"/>
-                                <subviews>
-                                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="ReC-gU-eYc" customClass="ComponentButton" customModule="KMComponentLibrary">
-                                        <rect key="frame" x="4" y="3" width="84" height="32"/>
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="32" id="QRa-ZN-aox"/>
-                                            <constraint firstAttribute="width" constant="84" id="eQ2-xO-qbb"/>
-                                        </constraints>
-                                    </customView>
-                                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="OBG-Rs-ect" customClass="ComponentButton" customModule="KMComponentLibrary">
-                                        <rect key="frame" x="92" y="3" width="84" height="32"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" constant="84" id="VAq-ID-o3i"/>
-                                            <constraint firstAttribute="height" constant="32" id="tcb-fv-RIK"/>
-                                        </constraints>
-                                    </customView>
-                                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="KQo-Mf-ryb" customClass="ComponentButton" customModule="KMComponentLibrary">
-                                        <rect key="frame" x="180" y="3" width="84" height="32"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" constant="84" id="ad0-bT-i67"/>
-                                            <constraint firstAttribute="height" constant="32" id="ttU-R8-evu"/>
-                                        </constraints>
-                                    </customView>
-                                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="p6q-un-PKG" customClass="ComponentButton" customModule="KMComponentLibrary">
-                                        <rect key="frame" x="268" y="3" width="32" height="32"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" constant="32" id="3kI-7r-bQg"/>
-                                            <constraint firstAttribute="height" constant="32" id="ZGJ-7D-e8n"/>
-                                        </constraints>
-                                    </customView>
-                                </subviews>
-                                <constraints>
-                                    <constraint firstItem="ReC-gU-eYc" firstAttribute="centerY" secondItem="LjH-d2-mMz" secondAttribute="centerY" id="2RL-l8-dYh"/>
-                                    <constraint firstItem="KQo-Mf-ryb" firstAttribute="leading" secondItem="OBG-Rs-ect" secondAttribute="trailing" constant="4" id="5KN-G2-VdW"/>
-                                    <constraint firstAttribute="trailing" secondItem="p6q-un-PKG" secondAttribute="trailing" constant="8" id="5vZ-lc-8Zr"/>
-                                    <constraint firstItem="OBG-Rs-ect" firstAttribute="centerY" secondItem="LjH-d2-mMz" secondAttribute="centerY" id="6MH-7L-rwY"/>
-                                    <constraint firstItem="OBG-Rs-ect" firstAttribute="leading" secondItem="ReC-gU-eYc" secondAttribute="trailing" constant="4" id="NbM-9k-MhK"/>
-                                    <constraint firstItem="p6q-un-PKG" firstAttribute="centerY" secondItem="LjH-d2-mMz" secondAttribute="centerY" id="U91-Rr-4XT"/>
-                                    <constraint firstItem="ReC-gU-eYc" firstAttribute="leading" secondItem="LjH-d2-mMz" secondAttribute="leading" constant="4" id="fjF-ah-U04"/>
-                                    <constraint firstItem="p6q-un-PKG" firstAttribute="leading" secondItem="KQo-Mf-ryb" secondAttribute="trailing" constant="4" id="m6t-DS-zcB"/>
-                                    <constraint firstItem="KQo-Mf-ryb" firstAttribute="centerY" secondItem="LjH-d2-mMz" secondAttribute="centerY" id="smr-BK-Can"/>
-                                </constraints>
-                            </customView>
-                        </subviews>
-                        <constraints>
-                            <constraint firstAttribute="trailing" secondItem="LjH-d2-mMz" secondAttribute="trailing" id="1NV-SZ-uOJ"/>
-                            <constraint firstAttribute="bottom" secondItem="LjH-d2-mMz" secondAttribute="bottom" id="4mR-cZ-l4M"/>
-                            <constraint firstItem="LjH-d2-mMz" firstAttribute="leading" secondItem="XIN-cf-7Vi" secondAttribute="leading" id="ZlA-O8-CNY"/>
-                            <constraint firstItem="LjH-d2-mMz" firstAttribute="top" secondItem="XIN-cf-7Vi" secondAttribute="top" id="e6C-FA-mF9"/>
-                        </constraints>
-                    </view>
-                    <color key="fillColor" name="KM_757780_Color"/>
-                </box>
-            </subviews>
-            <constraints>
-                <constraint firstAttribute="trailing" secondItem="ocp-w7-gcM" secondAttribute="trailing" id="R9v-bY-47p"/>
-                <constraint firstItem="ocp-w7-gcM" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" id="ddK-WD-gsh"/>
-                <constraint firstItem="ocp-w7-gcM" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" id="szK-Pq-ihR"/>
-                <constraint firstAttribute="bottom" secondItem="ocp-w7-gcM" secondAttribute="bottom" id="zO6-tI-YRB"/>
-            </constraints>
-            <point key="canvasLocation" x="40.5" y="131"/>
-        </customView>
-    </objects>
-    <resources>
-        <namedColor name="KM_757780_Color">
-            <color red="0.45882350206375122" green="0.4627450704574585" blue="0.50196081399917603" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-        </namedColor>
-    </resources>
-</document>

+ 0 - 18
PDF Office/PDF Master/KMClass/KMPDFViewController/EditTool/KMLinkViewController/Views/PopupViews/views/KMLinkPopupEmailView.swift

@@ -1,18 +0,0 @@
-//
-//  KMLinkPopupEmailView.swift
-//  PDF Reader Pro
-//
-//  Created by Niehaoyu on 2024/10/18.
-//
-
-import Cocoa
-
-class KMLinkPopupEmailView: NSView {
-
-    override func draw(_ dirtyRect: NSRect) {
-        super.draw(dirtyRect)
-
-        // Drawing code here.
-    }
-    
-}

+ 0 - 15
PDF Office/PDF Master/KMClass/KMPDFViewController/EditTool/KMLinkViewController/Views/PopupViews/views/KMLinkPopupEmailView.xib

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11134" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11134"/>
-    </dependencies>
-    <objects>
-        <customObject id="-2" userLabel="File's Owner"/>
-        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customView id="c22-O7-iKe">
-            <rect key="frame" x="0.0" y="0.0" width="480" height="272"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-        </customView>
-    </objects>
-</document>

+ 0 - 18
PDF Office/PDF Master/KMClass/KMPDFViewController/EditTool/KMLinkViewController/Views/PopupViews/views/KMLinkPopupPageView.swift

@@ -1,18 +0,0 @@
-//
-//  KMLinkPopupPageView.swift
-//  PDF Reader Pro
-//
-//  Created by Niehaoyu on 2024/10/18.
-//
-
-import Cocoa
-
-class KMLinkPopupPageView: NSView {
-
-    override func draw(_ dirtyRect: NSRect) {
-        super.draw(dirtyRect)
-
-        // Drawing code here.
-    }
-    
-}

+ 0 - 15
PDF Office/PDF Master/KMClass/KMPDFViewController/EditTool/KMLinkViewController/Views/PopupViews/views/KMLinkPopupPageView.xib

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11134" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11134"/>
-    </dependencies>
-    <objects>
-        <customObject id="-2" userLabel="File's Owner"/>
-        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customView id="c22-O7-iKe">
-            <rect key="frame" x="0.0" y="0.0" width="480" height="272"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-        </customView>
-    </objects>
-</document>

+ 0 - 18
PDF Office/PDF Master/KMClass/KMPDFViewController/EditTool/KMLinkViewController/Views/PopupViews/views/KMLinkPopupWebView.swift

@@ -1,18 +0,0 @@
-//
-//  KMLinkPopupWebView.swift
-//  PDF Reader Pro
-//
-//  Created by Niehaoyu on 2024/10/18.
-//
-
-import Cocoa
-
-class KMLinkPopupWebView: NSView {
-
-    override func draw(_ dirtyRect: NSRect) {
-        super.draw(dirtyRect)
-
-        // Drawing code here.
-    }
-    
-}

+ 0 - 15
PDF Office/PDF Master/KMClass/KMPDFViewController/EditTool/KMLinkViewController/Views/PopupViews/views/KMLinkPopupWebView.xib

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11134" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11134"/>
-    </dependencies>
-    <objects>
-        <customObject id="-2" userLabel="File's Owner"/>
-        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customView id="c22-O7-iKe">
-            <rect key="frame" x="0.0" y="0.0" width="480" height="272"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-        </customView>
-    </objects>
-</document>

+ 0 - 137
PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/EditPDF/Controller/KMAlignmentController.swift

@@ -1,137 +0,0 @@
-//
-//  KMAlignmentController.swift
-//  PDF Reader Pro
-//
-//  Created by tangchao on 2024/7/10.
-//
-
-import Cocoa
-
-class KMAlignmentController: NSViewController {
-    @IBOutlet weak var box1: NSBox!
-    @IBOutlet weak var box2: NSBox!
-    @IBOutlet weak var box3: NSBox!
-    @IBOutlet weak var box4: NSBox!
-    
-    private var vc1_: KMDesignButton?
-    private var vc2_: KMDesignButton?
-    private var vc3_: KMDesignButton?
-    private var vc4_: KMDesignButton?
-    
-    var itemAction: KMCommonClickBlock?
-    
-    private var isHor_ = false
-    var isHor: Bool {
-        get {
-            return self.isHor_
-        }
-    }
-    
-    private var areaCount_ : Int = 0
-    var areaCount: Int {
-        get {
-            return self.areaCount_
-        }
-    }
-    
-    deinit {
-        KMPrint("KMAlignmentController deinit.")
-    }
-    
-    convenience init(withIsHor isHor: Bool, areaCount: Int) {
-        self.init(nibName: "KMAlignmentController", bundle: nil)
-        
-        self.isHor_ = isHor
-        self.areaCount_ = areaCount
-    }
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        
-        self.view.wantsLayer = true
-        self.view.layer?.backgroundColor = .white
-        
-        self.vc1_ = KMDesignButton(withType: .Image)
-        self.box1.contentView = self.vc1_!.view
-        self.box1.borderWidth = 0
-        self.vc1_?.pagination()
-        self.vc1_?.target = self
-        self.vc1_?.action = #selector(_itemClick)
-        if self.isHor {
-            self.vc1_?.image = NSImage(named: "KMImageNameEditPDFImage45_1")!
-        } else {
-            self.vc1_?.image = NSImage(named: "KMImageNameEditPDFImage48_1")!
-        }
-        
-        self.vc1_?.tag = 0
-        
-        self.vc2_ = KMDesignButton(withType: .Image)
-        self.box2.contentView = self.vc2_!.view
-        self.box2.borderWidth = 0
-        self.vc2_?.pagination()
-        self.vc2_?.target = self
-        self.vc2_?.action = #selector(_itemClick)
-        if self.isHor {
-            self.vc2_?.image = NSImage(named: "KMImageNameEditPDFImage46_1")!
-        } else {
-            self.vc2_?.image = NSImage(named: "KMImageNameEditPDFImage49_1")!
-        }
-        self.vc2_?.tag = 1
-        
-        self.vc3_ = KMDesignButton(withType: .Image)
-        self.box3.contentView = self.vc3_!.view
-        self.box3.borderWidth = 0
-        self.vc3_?.pagination()
-        self.vc3_?.target = self
-        self.vc3_?.action = #selector(_itemClick)
-        if self.isHor {
-            self.vc3_?.image = NSImage(named: "KMImageNameEditPDFImage47_1")!
-        } else {
-            self.vc3_?.image = NSImage(named: "KMImageNameEditPDFImage50_1")!
-        }
-        self.vc3_?.tag = 2
-        
-        self.vc4_ = KMDesignButton(withType: .Image)
-        self.box4.contentView = self.vc4_!.view
-        self.box4.borderWidth = 0
-        self.vc4_?.pagination()
-        self.vc4_?.target = self
-        self.vc4_?.action = #selector(_itemClick)
-        if self.isHor {
-            // KMImageNameEditPDFImage21
-            self.vc4_?.image = NSImage(named: "KMImageNameEditPDFImage21_1")!
-            self.vc4_?._image_disabled = NSImage(named: "KMImageNameEditPDFImage21")!
-        } else {
-            // KMImageNameEditPDFImage20
-            self.vc4_?.image = NSImage(named: "KMImageNameEditPDFImage20_1")!
-            self.vc4_?._image_disabled = NSImage(named: "KMImageNameEditPDFImage20")!
-        }
-        self.vc4_?.tag = 3
-        
-        self.vc4_?.state = self.areaCount > 2 ? .Norm : .Disabled
-        self.vc4_?.button.isEnabled = self.areaCount > 2
-        
-        self.reloadData()
-    }
-    
-    @objc private func _itemClick(_ sender: NSButton) {
-        self.itemAction?(sender.tag)
-    }
-    
-    func reloadData() {
-        if KMAppearance.isDarkMode() {
-            self.view.layer?.backgroundColor = KMAppearance.Layout.l0Color().cgColor
-            self.vc1_?.background_hov = NSColor(red: 71/255, green: 72/255, blue: 75/255, alpha: 1)
-            self.vc2_?.background_hov = NSColor(red: 71/255, green: 72/255, blue: 75/255, alpha: 1)
-            self.vc3_?.background_hov = NSColor(red: 71/255, green: 72/255, blue: 75/255, alpha: 1)
-            self.vc4_?.background_hov = NSColor(red: 71/255, green: 72/255, blue: 75/255, alpha: 1)
-        } else {
-            self.view.layer?.backgroundColor = .white
-            self.vc1_?.background_hov = NSColor(red: 237/255, green: 238/255, blue: 240/255, alpha: 1)
-            self.vc2_?.background_hov = NSColor(red: 237/255, green: 238/255, blue: 240/255, alpha: 1)
-            self.vc3_?.background_hov = NSColor(red: 237/255, green: 238/255, blue: 240/255, alpha: 1)
-            self.vc4_?.background_hov = NSColor(red: 237/255, green: 238/255, blue: 240/255, alpha: 1)
-        }
-    }
-    
-}

+ 0 - 82
PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/EditPDF/Controller/KMAlignmentController.xib

@@ -1,82 +0,0 @@
-<?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">
-    <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMAlignmentController" customModule="PDF_Reader_Pro" customModuleProvider="target">
-            <connections>
-                <outlet property="box1" destination="Voz-bF-Xf4" id="7nB-bP-xmJ"/>
-                <outlet property="box2" destination="MtT-I0-WoV" id="ER1-om-ZQr"/>
-                <outlet property="box3" destination="kSB-sY-SRQ" id="DZO-zc-zJu"/>
-                <outlet property="box4" destination="bGd-5S-wfN" id="jEG-dl-Ki7"/>
-                <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
-            </connections>
-        </customObject>
-        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customView id="Hz6-mo-xeY">
-            <rect key="frame" x="0.0" y="0.0" width="148" height="40"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-            <subviews>
-                <box boxType="custom" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="Voz-bF-Xf4">
-                    <rect key="frame" x="4" y="4" width="32" height="32"/>
-                    <view key="contentView" id="WPR-W5-wtN">
-                        <rect key="frame" x="1" y="1" width="30" height="30"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                    </view>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="32" id="M6d-eR-zo2"/>
-                        <constraint firstAttribute="height" constant="32" id="rKg-dL-gnj"/>
-                    </constraints>
-                </box>
-                <box boxType="custom" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="MtT-I0-WoV">
-                    <rect key="frame" x="40" y="4" width="32" height="32"/>
-                    <view key="contentView" id="8ng-8f-CdH">
-                        <rect key="frame" x="1" y="1" width="30" height="30"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                    </view>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="32" id="9sy-x5-oGr"/>
-                        <constraint firstAttribute="height" constant="32" id="nz2-eX-4iS"/>
-                    </constraints>
-                </box>
-                <box boxType="custom" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="kSB-sY-SRQ">
-                    <rect key="frame" x="76" y="4" width="32" height="32"/>
-                    <view key="contentView" id="HDR-VX-FhR">
-                        <rect key="frame" x="1" y="1" width="30" height="30"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                    </view>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="32" id="Bzw-yf-huI"/>
-                        <constraint firstAttribute="height" constant="32" id="Mwl-Sl-pXu"/>
-                    </constraints>
-                </box>
-                <box boxType="custom" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="bGd-5S-wfN">
-                    <rect key="frame" x="112" y="4" width="32" height="32"/>
-                    <view key="contentView" id="yO8-uC-4oa">
-                        <rect key="frame" x="1" y="1" width="30" height="30"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                    </view>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="32" id="1vK-My-rn5"/>
-                        <constraint firstAttribute="height" constant="32" id="OEc-5s-XYG"/>
-                    </constraints>
-                </box>
-            </subviews>
-            <constraints>
-                <constraint firstItem="MtT-I0-WoV" firstAttribute="centerY" secondItem="Hz6-mo-xeY" secondAttribute="centerY" id="B1U-L7-MB4"/>
-                <constraint firstItem="bGd-5S-wfN" firstAttribute="centerY" secondItem="Hz6-mo-xeY" secondAttribute="centerY" id="KpF-aG-DFs"/>
-                <constraint firstItem="kSB-sY-SRQ" firstAttribute="centerY" secondItem="Hz6-mo-xeY" secondAttribute="centerY" id="L8X-X0-PSk"/>
-                <constraint firstItem="MtT-I0-WoV" firstAttribute="leading" secondItem="Voz-bF-Xf4" secondAttribute="trailing" constant="4" id="SHh-gW-8iS"/>
-                <constraint firstItem="Voz-bF-Xf4" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="4" id="Ym9-V9-ww1"/>
-                <constraint firstItem="Voz-bF-Xf4" firstAttribute="centerY" secondItem="Hz6-mo-xeY" secondAttribute="centerY" id="fb0-Aw-WKV"/>
-                <constraint firstItem="bGd-5S-wfN" firstAttribute="leading" secondItem="kSB-sY-SRQ" secondAttribute="trailing" constant="4" id="hdw-JE-jv0"/>
-                <constraint firstItem="kSB-sY-SRQ" firstAttribute="leading" secondItem="MtT-I0-WoV" secondAttribute="trailing" constant="4" id="tEl-bs-tyz"/>
-            </constraints>
-            <point key="canvasLocation" x="139" y="154"/>
-        </customView>
-    </objects>
-</document>

+ 0 - 697
PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/EditPDF/Controller/KMEditPDFPopToolBarController.swift

@@ -1,697 +0,0 @@
-//
-//  KMEditPDFPopToolBarController.swift
-//  PDF Reader Pro
-//
-//  Created by tangchao on 2024/6/18.
-//
-
-import Cocoa
-
-@objc enum KMEditPDFToolbarItemKey: Int {
-    case none
-    case color
-    case fontStyle
-    case fontAdd
-    case fontReduce
-    case fontBold
-    case fontItalic
-    case textAlignment
-    
-    case leftRotate
-    case rightRotate
-    case reverseX // 左右翻转
-    case reverseY // 上下翻转
-    case crop
-    case replace
-    case export
-    
-    case alignmentLeft
-    case alignmentRight
-    case alignmentCenterX
-    case alignmentjustifiedX // 左右两端对齐
-    case alignmentTop
-    case alignmentBottom
-    case alignmentCenterY
-    case alignmentjustifiedY // 上下两端对齐
-    
-    case separator // 分割线
-    
-    func isRotate() -> Bool {
-        return self == .leftRotate || self == .rightRotate
-    }
-    
-    func isReverse() -> Bool {
-        return self == .reverseX || self == .reverseY
-    }
-    
-    func isAlign() -> Bool {
-        return self.isHorAlign() || self.isVerAlign()
-    }
-    func isHorAlign() -> Bool {
-        return self == .alignmentLeft || self == .alignmentCenterX || self == .alignmentRight || self == .alignmentjustifiedX
-    }
-    
-    func isVerAlign() -> Bool {
-        return self == .alignmentTop || self == .alignmentCenterY || self == .alignmentBottom || self == .alignmentjustifiedY
-    }
-}
-
-class KMEditPDFToolbarModel: NSObject {
-    var itemKey: KMEditPDFToolbarItemKey = .none
-    var isEnabled = true
-    var isSelected = false
-    
-    var isChanged = true
-    
-    var fontName: String?
-    var state: NSControl.StateValue = .mixed
-    
-    var textAlign: NSTextAlignment = .center
-}
-
-class KMSeparatorLineView: NSView {
-    var strokeColor: NSColor = .black {
-        didSet {
-            self.needsDisplay = true
-        }
-    }
-    
-    override func draw(_ dirtyRect: NSRect) {
-        super.draw(dirtyRect)
-        
-        let rect = self.bounds
-        let ctx = NSGraphicsContext.current?.cgContext
-        ctx?.saveGState()
-        ctx?.setLineWidth(1)
-        ctx?.setStrokeColor(self.strokeColor.cgColor)
-        let startP = NSPoint(x: rect.size.width*0.5, y: 6+2)
-        ctx?.move(to: startP)
-        let endP = NSPoint(x: rect.size.width*0.5, y: rect.size.height-8)
-        ctx?.addLine(to: endP)
-        ctx?.strokePath()
-        ctx?.restoreGState()
-    }
-}
-
-struct KMEditPDFToolbarStyle: OptionSet {
-    let rawValue: Int
-    
-    static var text  = KMEditPDFToolbarStyle(rawValue: 1 << 0)
-    static var image   = KMEditPDFToolbarStyle(rawValue: 1 << 1)
-}
-
-class KMEditPDFPopToolBarController: NSViewController {
-    deinit {
-        KMPrint("KMEditPDFPopToolBarController deinit.")
-    }
-    
-    convenience init() {
-        self.init(nibName: "KMEditPDFPopToolBarController", bundle: nil)
-    }
-    
-    var toolbarView: KMEditPDFToolbarView?
-    var itemKeys: [KMEditPDFToolbarItemKey] = [] {
-        didSet {
-            //            self.toolbarView?.reloadData()
-        }
-    }
-    
-    var datas: [KMEditPDFToolbarModel] = [] {
-        didSet {
-            self.toolbarView?.reloadData()
-        }
-    }
-    
-    var fontColor: NSColor?
-    var fontName: String?
-    var areaCount: Int = 0
-    
-    var itemClick: ((KMEditPDFToolbarItemKey, Any?)->Void)?
-    
-    private weak var popover_: NSPopover?
-    
-    override func viewWillAppear() {
-        super.viewWillAppear()
-        
-        self.interfaceThemeDidChanged(NSApp.appearance?.name ?? .aqua)
-    }
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        // Do view setup here.
-        
-//        self.interfaceThemeDidChanged(NSApp.appearance?.name ?? .aqua)
-        
-        let toolbarView = KMEditPDFToolbarView()
-        self.toolbarView = toolbarView
-        toolbarView.frame = self.view.bounds
-        toolbarView.autoresizingMask = [.width, .height]
-        self.view.addSubview(toolbarView)
-        toolbarView.delegate = self
-        toolbarView.inset = .init(top: 6, left: 4, bottom: 0, right: 0)
-        
-        toolbarView.reloadData()
-    }
-    
-    override func viewDidDisappear() {
-        super.viewDidDisappear()
-        
-        let itemView = (self.toolbarView?.itemViews.safe_element(for: 1) as? KMEditPDFToolbarItemView)
-        (itemView?.obj as? KMDesignSelect)?.createFilePopover.close()
-        
-        self.popover_?.close()
-    }
-    
-    @objc func _buttonClick(_ sender: NSButton) {
-        let idx = sender.tag
-        if idx >= 0 && idx < self.itemKeys.count {
-            let key = self.itemKeys[idx]
-            self.itemClick?(key, sender)
-            
-            let itemView = (self.toolbarView?.itemViews.safe_element(for: idx) as? KMEditPDFToolbarItemView)
-            let viewC = (itemView?.obj as? KMDesignButton)
-            if key == .fontAdd || key == .fontReduce {
-                
-            } else {
-                let state = viewC?.state ?? .None
-                if state == .Act {
-                    viewC?.state = .Norm
-                } else {
-                    viewC?.state = .Act
-                }
-            }
-            
-            self._trackEvent(key: key, style: self._fetchStyle())
-        }
-    }
-    
-    @objc func alignmentItemClick(_ sender: NSButton) {
-        self._trackEvent(key: .alignmentTop, style: self._fetchStyle())
-        
-        let key = self.itemKeys.safe_element(for: sender.tag) as? KMEditPDFToolbarItemKey ?? .none
-        let isHor = (key == .alignmentLeft || key == .alignmentCenterX || key == .alignmentRight || key == .alignmentjustifiedX)
-        
-        let vc = KMAlignmentController(withIsHor: isHor, areaCount: self.areaCount)
-        let createFilePopover: NSPopover = NSPopover.init()
-        createFilePopover.contentViewController = vc
-        //        createFilePopover.delegate = self
-        createFilePopover.animates = true
-        createFilePopover.behavior = .semitransient
-        createFilePopover.setValue(true, forKey: "shouldHideAnchor")
-        createFilePopover.show(relativeTo: CGRect(x: sender.bounds.origin.x, y: 20, width: sender.bounds.size.width, height: sender.bounds.size.height), of: sender, preferredEdge: .maxY)
-        
-        self.popover_ = createFilePopover
-        
-        vc.itemAction = { [weak self] idx, _ in
-            var key: KMEditPDFToolbarItemKey = .none
-            if idx == 0 {
-                key = isHor ? .alignmentLeft : .alignmentTop
-            } else if idx == 1 {
-                key = isHor ? .alignmentCenterX : .alignmentCenterY
-            } else if idx == 2 {
-                key = isHor ? .alignmentRight : .alignmentBottom
-            } else if idx == 3 {
-                key = isHor ? .alignmentjustifiedX : .alignmentjustifiedY
-            }
-            self?.itemClick?(key, nil)
-            
-            let model = self?.datas.safe_element(for: sender.tag) as? KMEditPDFToolbarModel
-            model?.itemKey = key
-            self?.toolbarView?.reloadData()
-            self?.popover_?.close()
-        }
-    }
-    
-    @objc func textAlignmentItemClick(_ sender: NSButton) {
-        self._trackEvent(key: .textAlignment)
-        
-        let itemView = (self.toolbarView?.itemViews.safe_element(for: sender.tag) as? KMEditPDFToolbarItemView)
-        let viewC = (itemView?.obj as? KMDesignButton)
-        viewC?.state = .Act
-        
-        let vc = KMTextAlignmentController(nibName: "KMTextAlignmentController", bundle: nil)
-        vc.view.appearance = self.view.appearance
-        let createFilePopover: NSPopover = NSPopover.init()
-        createFilePopover.contentViewController = vc
-        //        createFilePopover.delegate = self
-        createFilePopover.animates = true
-        createFilePopover.behavior = .semitransient
-        createFilePopover.setValue(true, forKey: "shouldHideAnchor")
-        createFilePopover.show(relativeTo: CGRect(x: sender.bounds.origin.x, y: 20, width: sender.bounds.size.width, height: sender.bounds.size.height), of: sender, preferredEdge: .maxY)
-        
-        let model = self.datas.safe_element(for: sender.tag) as? KMEditPDFToolbarModel
-        vc.align = model?.textAlign ?? .center
-        
-        self.popover_ = createFilePopover
-        
-        vc.itemAction = { [weak self] idx, _ in
-            viewC?.state = .Norm
-            
-            var data: NSTextAlignment = .left
-            if idx == 0 {
-                data = .left
-            } else if idx == 1 {
-                data = .center
-            } else if idx == 2 {
-                data = .right
-            }
-            self?.itemClick?(.textAlignment, data)
-            self?.popover_?.close()
-            
-            let model = self?.datas.safe_element(for: sender.tag) as? KMEditPDFToolbarModel
-            model?.textAlign = data
-//            self?.toolbarView?.reloadData()
-            if data == .left {
-                viewC?.image = NSImage(named: "KMImageNameEditPDFAlignLeftSelect")!
-            } else if data == .center {
-                viewC?.image = NSImage(named: "KMImageNameEditPDFAlignCenterSelect")!
-            } else if data == .right {
-                viewC?.image = NSImage(named: "KMImageNameEditPDFAlignRightSelect")!
-            }
-        }
-    }
-    
-    @objc func colorPanelAction(_ sender: NSColorPanel) {
-        let color = sender.color
-        let colorView = (self.toolbarView?.itemViews.first as? KMEditPDFToolbarItemView)?.view as? KMEditPDFColorView
-        colorView?.colorBtn.image = nil
-        colorView?.colorBtn.layer?.backgroundColor = color.cgColor
-        self.itemClick?(.color, color)
-    }
-    
-    override func interfaceThemeDidChanged(_ appearance: NSAppearance.Name) {
-        super.interfaceThemeDidChanged(appearance)
-        
-        self.view.wantsLayer = true
-        if appearance == .darkAqua {
-            self.view.layer?.backgroundColor = NSColor(red: 37/255.0, green: 37/255.0, blue: 38/255.0, alpha: 1.0).cgColor
-        } else {
-            self.view.layer?.backgroundColor = .white
-        }
-        
-        Task { @MainActor in
-            self.toolbarView?.reloadData()
-        }
-    }
-    
-    // MARK: - Track Events
-    
-    private func _trackEvent(key: KMEditPDFToolbarItemKey, style: KMEditPDFToolbarStyle = []) {
-        let catetoryString = "SubTbr_EditPDF"
-        let label_text = "SubTbr_EditText"
-        let label_image = "SubTbr_EditImage"
-        
-        // Text
-        if key == .color {
-            let eventString = "SubTbr_EditText_FloatBar_Color"
-            kTrackEventManager.trackEvent(event: catetoryString, withProperties: [label_text : eventString])
-        } else if key == .fontStyle {
-            let eventString = "SubTbr_EditText_FloatBar_FontStyle"
-            kTrackEventManager.trackEvent(event: catetoryString, withProperties: [label_text : eventString])
-        } else if key == .fontAdd || key == .fontReduce {
-            let eventString = "SubTbr_EditText_FloatBar_FontSize"
-            kTrackEventManager.trackEvent(event: catetoryString, withProperties: [label_text : eventString])
-        } else if key == .fontBold {
-            let eventString = "SubTbr_EditText_FloatBar_Bold"
-            kTrackEventManager.trackEvent(event: catetoryString, withProperties: [label_text : eventString])
-        } else if key == .fontItalic {
-            let eventString = "SubTbr_EditText_FloatBar_Italic"
-            kTrackEventManager.trackEvent(event: catetoryString, withProperties: [label_text : eventString])
-        } else if key == .textAlignment {
-            let eventString = "SubTbr_EditText_FloatBar_AlignText"
-            kTrackEventManager.trackEvent(event: catetoryString, withProperties: [label_text : eventString])
-        }
-        // Image
-        else if key.isRotate() {
-            let eventString = "SubTbr_EditImage_FloatBar_Rotate"
-            kTrackEventManager.trackEvent(event: catetoryString, withProperties: [label_image : eventString])
-        } else if key.isReverse() {
-            let eventString = "SubTbr_EditImage_FloatBar_Flip"
-            kTrackEventManager.trackEvent(event: catetoryString, withProperties: [label_image : eventString])
-        } else if key == .crop {
-            let eventString = "SubTbr_EditImage_FloatBar_Crop"
-            kTrackEventManager.trackEvent(event: catetoryString, withProperties: [label_image : eventString])
-        } else if key == .replace {
-            let eventString = "SubTbr_EditImage_FloatBar_Replace"
-            kTrackEventManager.trackEvent(event: catetoryString, withProperties: [label_image : eventString])
-        } else if key == .export {
-            let eventString = "SubTbr_EditImage_FloatBar_Export"
-            kTrackEventManager.trackEvent(event: catetoryString, withProperties: [label_image : eventString])
-        }
-        // 对齐
-        else if key.isAlign() {
-            if style.contains(.text) && style.contains(.image) {
-                let eventString = "SubTbr_EditContent_AlignContent"
-                kTrackEventManager.trackEvent(event: catetoryString, withProperties: [label_text : eventString])
-            } else if style.contains(.text) {
-                let eventString = "SubTbr_EditText_FloatBar_AlignTextBoxes"
-                kTrackEventManager.trackEvent(event: catetoryString, withProperties: [label_text : eventString])
-            } else if style.contains(.image) {
-                let eventString = "SubTbr_EditImage_FloatBar_Align"
-                kTrackEventManager.trackEvent(event: catetoryString, withProperties: [label_image : eventString])
-            }
-        }
-    }
-    
-    private func _fetchStyle() -> KMEditPDFToolbarStyle {
-        var style: KMEditPDFToolbarStyle = []
-        if let data = self.itemKeys.first {
-            if data == .color {
-                style.insert(.text)
-            } else if data.isRotate() {
-                style.insert(.image)
-            } else if data.isAlign() {
-                style.insert(.text)
-                style.insert(.image)
-            }
-        }
-        return style
-    }
-}
-
-extension KMEditPDFPopToolBarController: KMEditPDFToolbarViewDelegate {
-    func numberOfItems(in toolbarView: KMEditPDFToolbarView) -> Int {
-        return self.datas.count
-    }
-    
-    func toolbarView(_ toolbarView: KMEditPDFToolbarView, viewFor index: Int) -> NSView? {
-        let model = self.datas[index]
-        let itemKey = model.itemKey
-        if itemKey == .color {
-            let colorView = KMEditPDFToolbarItemView()
-            let view = KMEditPDFColorView()
-//            view.isEnabled = model.isEnabled
-            if model.isEnabled {
-                view.colorBtn.layer?.backgroundColor = self.fontColor?.cgColor
-            } else {
-                view.colorBtn.layer?.backgroundColor = .clear
-                view.colorBtn.image = NSImage(named: "KMImageNameEditPDFColorDisabled")
-            }
-            
-            view.itemClick = { [weak self] idx, _ in
-                self?._trackEvent(key: .color)
-                
-                let panel = NSColorPanel.shared
-                panel.setTarget(self)
-                panel.setAction(#selector(self?.colorPanelAction))
-                panel.orderFront(nil)
-            }
-            colorView.view = view
-            return colorView
-        } else if itemKey == .fontStyle {
-            let fontStyleView = KMEditPDFToolbarItemView()
-
-            let viewC = KMDesignSelect.init(withType: .Combox)
-            viewC.isScrollPop = true
-            viewC.showVerticalScroller = true
-            fontStyleView.view = viewC.view
-            fontStyleView.obj = viewC
-            viewC.borderColor = KMAppearance.Interactive.s0Color()
-            viewC.background = KMAppearance.Layout.l1Color()
-            viewC.background_hov = KMAppearance.Layout.l1Color()
-            viewC.background_focus = KMAppearance.Layout.l1Color()
-            viewC.textColor = KMAppearance.Layout.h1Color()
-            viewC.textColor_hov = KMAppearance.Layout.h1Color()
-            viewC.textColor_focus = KMAppearance.Layout.h1Color()
-            
-            if KMAppearance.isDarkMode() {
-                let color = NSColor(hex: "#0E1114")
-                viewC.popViewControllerBackground = color
-            } else {
-                let color = NSColor(hex: "#DADBDE")
-//                viewC.popViewControllerBackground = color
-            }
-//            viewC.popViewControllerBackground = KMAppearance.Layout.bgColor()
-            viewC.popViewControllerTextColor = KMAppearance.Layout.h0Color()
-            viewC.popViewControllerEnterFillColor = KMAppearance.Interactive.s0Color()
-            viewC.updateUI()
-            
-            let familyNames = CPDFFont.familyNames
-            viewC.removeAllItems()
-            viewC.addItems(withObjectValues: familyNames)
-            
-            if let data = model.fontName {
-                viewC.stringValue = data
-            } else {
-//                viewC.selectItem(at: 0)
-                viewC.stringValue = "--"
-            }
-
-            viewC.delete = self
-            return fontStyleView
-        } else if itemKey == .separator {
-            let colorView = KMEditPDFToolbarItemView()
-            let view = KMSeparatorLineView()
-            view.strokeColor = KMAppearance.separatorLineColor()
-            colorView.view = view
-            return colorView
-        } else if itemKey == .textAlignment {
-            let colorView = KMEditPDFToolbarItemView()
-            let viewC = KMDesignButton(withType: .Image)
-            colorView.view = viewC.view
-            colorView.obj = viewC
-            viewC.pagination()
-            if KMAppearance.isDarkMode() {
-                viewC.background_hov = NSColor(red: 71/255, green: 72/255, blue: 75/255, alpha: 1)
-//                viewC.background_sel = KMAppearance.Interactive.m1Color()
-            } else {
-                viewC.background_hov = NSColor(hex: "#EDEEF0")
-            }
-            
-            viewC.tag = index
-            viewC.target = self
-            viewC.action = #selector(textAlignmentItemClick)
-            if model.textAlign == .left {
-                viewC.image = NSImage(named: "KMImageNameEditPDFAlignLeftSelect")!
-            } else if model.textAlign == .center {
-                viewC.image = NSImage(named: "KMImageNameEditPDFAlignCenterSelect")!
-            } else if model.textAlign == .right {
-                viewC.image = NSImage(named: "KMImageNameEditPDFAlignRightSelect")!
-            }
-            viewC.initDefaultValue()
-            viewC.borderWidth = 0
-            viewC.borderWidth_hov = 0
-            viewC.borderWidth_act = 0
-            if KMAppearance.isDarkMode() {
-                viewC.background = NSColor.clear
-                viewC.background_hov = NSColor(red: 71/255, green: 72/255, blue: 75/255, alpha: 1)
-                viewC.background_act = KMAppearance.Interactive.m1Color()
-            } else {
-                
-            }
-            
-            viewC.state = .Norm
-//            DispatchQueue.main.async {
-//                viewC.state = model.isSelected ? .Act : .Norm
-//            }
-            
-            return colorView
-        } else if itemKey.isAlign() {
-            let itemView = KMEditPDFToolbarItemView()
-            let viewC = KMDesignButton(withType: .Image)
-            itemView.view = viewC.view
-            itemView.obj = viewC
-            viewC.pagination()
-            if KMAppearance.isDarkMode() {
-                viewC.background_hov = NSColor(red: 71/255, green: 72/255, blue: 75/255, alpha: 1)
-                viewC.background_sel = KMAppearance.Interactive.m1Color()
-            } else {
-                viewC.background_hov = NSColor(hex: "#EDEEF0")
-            }
-            
-            viewC.tag = index
-            viewC.state = model.isEnabled ? .Norm : .Disabled
-            viewC.button.isEnabled = model.isEnabled
-            viewC.target = self
-            
-            viewC.background_disabled = .clear
-            viewC.borderColor_disabled = .clear
-            
-            let style = self._fetchStyle()
-            if style.contains(.text) && style.contains(.image) {
-                viewC.action = #selector(_buttonClick)
-            } else {
-                viewC.action = #selector(alignmentItemClick)
-            }
-            
-            let hasTip = style.contains(.text) && style.contains(.image)
-            
-            if itemKey == .alignmentLeft {
-                viewC.image = NSImage(named: "KMImageNameEditPDFImage45_1")!
-                if hasTip {
-                    itemView.popToolTip = NSLocalizedString("Align left", comment: "")
-                }
-            } else if itemKey == .alignmentCenterX {
-                viewC.image = NSImage(named: "KMImageNameEditPDFImage46_1")!
-                if hasTip {
-                    itemView.popToolTip = NSLocalizedString("Align center", comment: "")
-                }
-            } else if itemKey == .alignmentRight {
-                viewC.image = NSImage(named: "KMImageNameEditPDFImage47_1")!
-                if hasTip {
-                    itemView.popToolTip = NSLocalizedString("Align right", comment: "")
-                }
-            } else if itemKey == .alignmentjustifiedX {
-                viewC.image = NSImage(named: "KMImageNameEditPDFImage21_1")!
-                viewC._image_disabled = NSImage(named: "KMImageNameEditPDFImage21")!
-                if hasTip {
-                    itemView.popToolTip = NSLocalizedString("Align both ends", comment: "")
-                }
-            } else if itemKey == .alignmentTop {
-                viewC.image = NSImage(named: "KMImageNameEditPDFImage48_1")!
-                if hasTip {
-                    itemView.popToolTip = NSLocalizedString("Align top", comment: "")
-                }
-            } else if itemKey == .alignmentCenterY {
-                viewC.image = NSImage(named: "KMImageNameEditPDFImage49_1")!
-                if hasTip {
-                    itemView.popToolTip = NSLocalizedString("Align center in vertical", comment: "")
-                }
-            } else if itemKey == .alignmentBottom {
-                viewC.image = NSImage(named: "KMImageNameEditPDFImage50_1")!
-                if hasTip {
-                    itemView.popToolTip = NSLocalizedString("Align bottom", comment: "")
-                }
-            } else if itemKey == .alignmentjustifiedY {
-                viewC.image = NSImage(named: "KMImageNameEditPDFImage20_1")!
-                viewC._image_disabled = NSImage(named: "KMImageNameEditPDFImage20")!
-                if hasTip {
-                    itemView.popToolTip = NSLocalizedString("Align ends in vertical", comment: "")
-                }
-            }
-            viewC.updateUI()
-            return itemView
-        }
-        
-        let colorView = KMEditPDFToolbarItemView()
-        let viewC = KMDesignButton(withType: .Image)
-        colorView.view = viewC.view
-        colorView.obj = viewC
-        viewC.pagination()
-        if KMAppearance.isDarkMode() {
-            viewC.background_hov = NSColor(red: 71/255, green: 72/255, blue: 75/255, alpha: 1)
-            
-        } else {
-//            viewC.background_hov = NSColor(hex: "#365898")
-        }
-        
-        viewC.tag = index
-        viewC.state = model.isEnabled ? .Norm : .Disabled
-        viewC.button.isEnabled = model.isEnabled
-        viewC.target = self
-        viewC.action = #selector(_buttonClick)
-        viewC.background_disabled = .clear
-        viewC.borderColor_disabled = .clear
-        
-        if itemKey == .fontAdd {
-            viewC.image = NSImage(named: "KMImageNameEditPDFFontAdd")!
-            viewC.image_disabled = NSImage(named: "KMImageNameEditPDFFontAddDisabled")!
-            colorView.popToolTip = NSLocalizedString("Larger font size", comment: "")
-        } else if itemKey == .fontReduce {
-            viewC.image = NSImage(named: "KMImageNameEditPDFFontReduce")!
-            viewC.image_disabled = NSImage(named: "KMImageNameEditPDFFontReduceDisabled")!
-            colorView.popToolTip = NSLocalizedString("Reduce font size", comment: "")
-        } else if itemKey == .fontBold {
-            viewC.image = NSImage(named: "KMImageNameEditPDFFontBold")!
-            colorView.popToolTip = NSLocalizedString("Bold font", comment: "")
-//            viewC.button.keyEquivalent = "b"
-//            viewC.button.keyEquivalentModifierMask = [.control]
-            viewC.initDefaultValue()
-            viewC.borderWidth = 0
-            viewC.borderWidth_hov = 0
-            viewC.borderWidth_act = 0
-            DispatchQueue.main.async {
-                if model.isEnabled {
-                    viewC.state = model.isSelected ? .Act : .Norm
-                } else {
-                    viewC.state = .Disabled
-                }
-            }
-            if KMAppearance.isDarkMode() {
-                viewC.background = NSColor.clear
-                viewC.background_hov = NSColor(red: 71/255, green: 72/255, blue: 75/255, alpha: 1)
-                viewC.background_act = KMAppearance.Interactive.m1Color()
-            } else {
-                
-            }
-        } else if itemKey == .fontItalic {
-            viewC.image = NSImage(named: "KMImageNameEditPDFFontItalic")!
-            colorView.popToolTip = NSLocalizedString("Italic font", comment: "")
-            
-            viewC.initDefaultValue()
-            viewC.borderWidth = 0
-            viewC.borderWidth_hov = 0
-            viewC.borderWidth_act = 0
-            DispatchQueue.main.async {
-                if model.isEnabled {
-                    viewC.state = model.isSelected ? .Act : .Norm
-                } else {
-                    viewC.state = .Disabled
-                }
-            }
-            if KMAppearance.isDarkMode() {
-                viewC.background = NSColor.clear
-                viewC.background_hov = NSColor(red: 71/255, green: 72/255, blue: 75/255, alpha: 1)
-                viewC.background_act = KMAppearance.Interactive.m1Color()
-            } else {
-                
-            }
-        } else if itemKey == .textAlignment {
-            viewC.image = NSImage(named: "KMImageNameEditPDFAlignCenterSelect")!
-            colorView.popToolTip = NSLocalizedString("Center text", comment: "")
-        }
-        // 图片
-        else if itemKey == .leftRotate {
-            viewC.image = NSImage(named: "KMImageNameEditPDFLeftRotateNew")!
-            colorView.popToolTip = NSLocalizedString("Rotate left", comment: "")
-        } else if itemKey == .rightRotate {
-            viewC.image = NSImage(named: "KMImageNameEditPDFRightRotateNew")!
-            colorView.popToolTip = NSLocalizedString("Rotate right", comment: "")
-        } else if itemKey == .reverseX {
-            viewC.image = NSImage(named: "KMImageNameEditPDFReverseX")!
-            colorView.popToolTip = NSLocalizedString("Flip horizontal", comment: "")
-        } else if itemKey == .reverseY {
-            viewC.image = NSImage(named: "KMImageNameEditPDFReverseY")!
-            colorView.popToolTip = NSLocalizedString("Flip vertical", comment: "")
-        } else if itemKey == .crop {
-            viewC.image = NSImage(named: "KMImageNameEditPDFCrop")!
-            viewC.image_disabled = NSImage(named: "KMImageNameEditPDFCropDisabled")!
-            colorView.popToolTip = NSLocalizedString("Crop", comment: "")
-        } else if itemKey == .replace {
-            viewC.image = NSImage(named: "KMImageNameEditPDFReplace")!
-            viewC.image_disabled = NSImage(named: "KMImageNameEditPDFReplaceDisabled")!
-            colorView.popToolTip = NSLocalizedString("Replace", comment: "")
-        } else if itemKey == .export {
-            viewC.image = NSImage(named: "KMImageNameEditPDFExport")!
-            colorView.popToolTip = NSLocalizedString("Export file", comment: "")
-        }
-        viewC.updateUI()
-        return colorView
-    }
-    
-    func toolbarView(_ toolbarView: KMEditPDFToolbarView, sizeForItemAt index: Int) -> NSSize {
-        let itemKey = self.itemKeys[index]
-        if itemKey == .color {
-            return NSMakeSize(56, 32)
-        } else if itemKey == .fontStyle {
-            return NSMakeSize(148, 32)
-        } else if itemKey == .separator {
-            return NSMakeSize(16, 32)
-        }
-        return NSMakeSize(32, 32)
-    }
-}
-
-extension KMEditPDFPopToolBarController: KMSelectPopButtonDelegate {
-    func km_SelectPopoverWillShow(_ obj: KMDesignSelect) {
-        self._trackEvent(key: .fontStyle)
-    }
-    
-    func km_comboBoxSelectionDidChange(_ obj: KMDesignSelect) {
-        self.itemClick?(.fontStyle, obj.stringValue)
-    }
-    
-    func km_controlTextDidEndEditing(_ obj: KMDesignSelect) {
-        
-    }
-}

+ 0 - 22
PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/EditPDF/Controller/KMEditPDFPopToolBarController.xib

@@ -1,22 +0,0 @@
-<?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">
-    <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMEditPDFPopToolBarController" customModule="PDF_Reader_Pro" customModuleProvider="target">
-            <connections>
-                <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
-            </connections>
-        </customObject>
-        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customView id="Hz6-mo-xeY">
-            <rect key="frame" x="0.0" y="0.0" width="480" height="44"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-            <point key="canvasLocation" x="95" y="-36"/>
-        </customView>
-    </objects>
-</document>

+ 0 - 130
PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/EditPDF/Controller/KMTextAlignmentController.swift

@@ -1,130 +0,0 @@
-//
-//  KMTextAlignmentController.swift
-//  PDF Reader Pro
-//
-//  Created by tangchao on 2024/6/26.
-//
-
-import Cocoa
-
-class KMTextAlignmentController: NSViewController {
-    @IBOutlet weak var leftBox: NSBox!
-    @IBOutlet weak var centerBox: NSBox!
-    @IBOutlet weak var rightBox: NSBox!
-    
-    private var leftVc_: KMDesignButton?
-    private var centerVc_: KMDesignButton?
-    private var rightVc_: KMDesignButton?
-    
-    var itemAction: KMCommonClickBlock?
-    
-    var align: NSTextAlignment = .center {
-        didSet {
-            let data = self.align
-            if data == .left {
-                self.leftVc_?.state = .Act
-                self.centerVc_?.state = .Norm
-                self.rightVc_?.state = .Norm
-            } else if data == .center {
-                self.leftVc_?.state = .Norm
-                self.centerVc_?.state = .Act
-                self.rightVc_?.state = .Norm
-            } else if data == .right {
-                self.leftVc_?.state = .Norm
-                self.centerVc_?.state = .Norm
-                self.rightVc_?.state = .Act
-            }
-        }
-    }
-    
-    override func viewWillAppear() {
-        super.viewWillAppear()
-        
-        self.reloadData()
-    }
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        
-        self.view.wantsLayer = true
-        
-        self.leftVc_ = KMDesignButton(withType: .Image)
-        self.leftBox.contentView = self.leftVc_!.view
-        self.leftBox.borderWidth = 0
-        self.leftVc_?.pagination()
-        self.leftVc_?.target = self
-        self.leftVc_?.action = #selector(_itemClick)
-        self.leftVc_?.image = NSImage(named: "KMImageNameEditPDFAlignLeftSelect")!
-        self.leftVc_?.tag = 0
-        
-        self.leftVc_?.initDefaultValue()
-        self.leftVc_?.borderWidth = 0
-        self.leftVc_?.borderWidth_hov = 0
-        self.leftVc_?.borderWidth_act = 0
-        
-        self.centerVc_ = KMDesignButton(withType: .Image)
-        self.centerBox.contentView = self.centerVc_!.view
-        self.centerBox.borderWidth = 0
-        self.centerVc_?.pagination()
-        self.centerVc_?.target = self
-        self.centerVc_?.action = #selector(_itemClick)
-        self.centerVc_?.image = NSImage(named: "KMImageNameEditPDFAlignCenterSelect")!
-        self.centerVc_?.tag = 1
-        
-        self.centerVc_?.initDefaultValue()
-        self.centerVc_?.borderWidth = 0
-        self.centerVc_?.borderWidth_hov = 0
-        self.centerVc_?.borderWidth_act = 0
-        
-        self.rightVc_ = KMDesignButton(withType: .Image)
-        self.rightBox.contentView = self.rightVc_!.view
-        self.rightBox.borderWidth = 0
-        self.rightVc_?.pagination()
-        self.rightVc_?.target = self
-        self.rightVc_?.action = #selector(_itemClick)
-        self.rightVc_?.image = NSImage(named: "KMImageNameEditPDFAlignRightSelect")!
-        self.rightVc_?.tag = 2
-        
-        self.rightVc_?.initDefaultValue()
-        self.rightVc_?.borderWidth = 0
-        self.rightVc_?.borderWidth_hov = 0
-        self.rightVc_?.borderWidth_act = 0
-        
-        self.reloadData()
-    }
-    
-    @objc private func _itemClick(_ sender: NSButton) {
-        self.itemAction?(sender.tag)
-    }
-    
-    func reloadData() {
-        self.view.wantsLayer = true
-        self.leftBox.fillColor = .clear
-        self.centerBox.fillColor = .clear
-        self.rightBox.fillColor = .clear
-        if KMAppearance.isDarkMode() {
-//            self.view.layer?.backgroundColor = KMAppearance.Layout.l0Color().cgColor
-            self.view.layer?.backgroundColor = NSColor(hex: "#26282B").cgColor
-            self.leftVc_?.background_hov = NSColor(red: 71/255, green: 72/255, blue: 75/255, alpha: 1)
-            self.centerVc_?.background_hov = NSColor(red: 71/255, green: 72/255, blue: 75/255, alpha: 1)
-            self.rightVc_?.background_hov = NSColor(red: 71/255, green: 72/255, blue: 75/255, alpha: 1)
-            
-            leftVc_?.background = NSColor.clear
-            leftVc_?.background_hov = NSColor(red: 71/255, green: 72/255, blue: 75/255, alpha: 1)
-            leftVc_?.background_act = KMAppearance.Interactive.m1Color()
-            
-            centerVc_?.background = NSColor.clear
-            centerVc_?.background_hov = NSColor(red: 71/255, green: 72/255, blue: 75/255, alpha: 1)
-            centerVc_?.background_act = KMAppearance.Interactive.m1Color()
-            
-            rightVc_?.background = NSColor.clear
-            rightVc_?.background_hov = NSColor(red: 71/255, green: 72/255, blue: 75/255, alpha: 1)
-            rightVc_?.background_act = KMAppearance.Interactive.m1Color()
-        } else {
-            self.view.layer?.backgroundColor = .white
-            self.leftVc_?.background_hov = NSColor(red: 237/255, green: 238/255, blue: 240/255, alpha: 1)
-            self.centerVc_?.background_hov = NSColor(red: 237/255, green: 238/255, blue: 240/255, alpha: 1)
-            self.rightVc_?.background_hov = NSColor(red: 237/255, green: 238/255, blue: 240/255, alpha: 1)
-        }
-    }
-}

+ 0 - 69
PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/EditPDF/Controller/KMTextAlignmentController.xib

@@ -1,69 +0,0 @@
-<?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">
-    <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMTextAlignmentController" customModule="PDF_Reader_Pro" customModuleProvider="target">
-            <connections>
-                <outlet property="centerBox" destination="EDc-6v-ugO" id="vDe-hH-rBf"/>
-                <outlet property="leftBox" destination="nXC-hl-TzA" id="fa8-72-4d4"/>
-                <outlet property="rightBox" destination="fXc-UW-E0g" id="fue-B5-Ut2"/>
-                <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
-            </connections>
-        </customObject>
-        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customView id="Hz6-mo-xeY">
-            <rect key="frame" x="0.0" y="0.0" width="116" height="40"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-            <subviews>
-                <box boxType="custom" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="nXC-hl-TzA">
-                    <rect key="frame" x="4" y="4" width="32" height="32"/>
-                    <view key="contentView" id="Q78-eu-UsB">
-                        <rect key="frame" x="1" y="1" width="30" height="30"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                    </view>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="32" id="Yha-qi-GLs"/>
-                        <constraint firstAttribute="width" constant="32" id="g3X-kI-bh5"/>
-                    </constraints>
-                </box>
-                <box boxType="custom" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="EDc-6v-ugO">
-                    <rect key="frame" x="40" y="4" width="32" height="32"/>
-                    <view key="contentView" id="KuU-73-lSC">
-                        <rect key="frame" x="1" y="1" width="30" height="30"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                    </view>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="32" id="mnL-v5-ZRn"/>
-                        <constraint firstAttribute="width" constant="32" id="wOs-oS-Aky"/>
-                    </constraints>
-                </box>
-                <box boxType="custom" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="fXc-UW-E0g">
-                    <rect key="frame" x="76" y="4" width="32" height="32"/>
-                    <view key="contentView" id="aSp-aS-DP5">
-                        <rect key="frame" x="1" y="1" width="30" height="30"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                    </view>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="32" id="fWc-7e-VeW"/>
-                        <constraint firstAttribute="height" constant="32" id="zCX-Cm-OIq"/>
-                    </constraints>
-                </box>
-            </subviews>
-            <constraints>
-                <constraint firstItem="fXc-UW-E0g" firstAttribute="centerY" secondItem="EDc-6v-ugO" secondAttribute="centerY" id="12E-no-M2Q"/>
-                <constraint firstItem="nXC-hl-TzA" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="4" id="70u-p4-gjJ"/>
-                <constraint firstItem="EDc-6v-ugO" firstAttribute="centerY" secondItem="nXC-hl-TzA" secondAttribute="centerY" id="C0R-19-dL4"/>
-                <constraint firstItem="nXC-hl-TzA" firstAttribute="centerY" secondItem="Hz6-mo-xeY" secondAttribute="centerY" id="G7g-mj-5Af"/>
-                <constraint firstItem="nXC-hl-TzA" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="4" id="azS-Gg-I7W"/>
-                <constraint firstItem="EDc-6v-ugO" firstAttribute="leading" secondItem="nXC-hl-TzA" secondAttribute="trailing" constant="4" id="fxV-Bz-X2W"/>
-                <constraint firstItem="fXc-UW-E0g" firstAttribute="leading" secondItem="EDc-6v-ugO" secondAttribute="trailing" constant="4" id="vs9-WJ-0K1"/>
-            </constraints>
-            <point key="canvasLocation" x="138" y="154"/>
-        </customView>
-    </objects>
-</document>

+ 3 - 3
PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/EditPDF/KMEditImageController.xib

@@ -72,7 +72,7 @@
                                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="3Xa-fV-tFr">
                                     <rect key="frame" x="0.0" y="32" width="232" height="40"/>
                                     <subviews>
-                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4DO-V6-JUJ">
+                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4DO-V6-JUJ">
                                             <rect key="frame" x="-2" y="12" width="30" height="16"/>
                                             <textFieldCell key="cell" lineBreakMode="clipping" title="Size" id="BYF-9G-Zr2">
                                                 <font key="font" usesAppearanceFont="YES"/>
@@ -140,7 +140,7 @@
                                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="Sm5-0s-19e">
                                     <rect key="frame" x="0.0" y="32" width="232" height="40"/>
                                     <subviews>
-                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yEz-sB-7uR">
+                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yEz-sB-7uR">
                                             <rect key="frame" x="-2" y="12" width="82" height="16"/>
                                             <textFieldCell key="cell" lineBreakMode="clipping" title="Rotate &amp; Flip" id="N6G-fq-qFA">
                                                 <font key="font" usesAppearanceFont="YES"/>
@@ -226,7 +226,7 @@
                                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="XM6-r1-dTE">
                                     <rect key="frame" x="0.0" y="32" width="232" height="40"/>
                                     <subviews>
-                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nL4-oY-ZBk">
+                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nL4-oY-ZBk">
                                             <rect key="frame" x="-2" y="12" width="51" height="16"/>
                                             <textFieldCell key="cell" lineBreakMode="clipping" title="Opacity" id="ru5-az-dPn">
                                                 <font key="font" usesAppearanceFont="YES"/>

+ 2 - 2
PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/EditPDF/KMEditPDFTextPropertyViewController.xib

@@ -47,7 +47,7 @@
                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="jhn-Mk-BkX">
                                         <rect key="frame" x="0.0" y="192" width="232" height="40"/>
                                         <subviews>
-                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zK8-fV-oTX">
+                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zK8-fV-oTX">
                                                 <rect key="frame" x="-2" y="12" width="32" height="16"/>
                                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Font" id="wxZ-VW-WnU">
                                                     <font key="font" usesAppearanceFont="YES"/>
@@ -162,7 +162,7 @@
                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="vf7-gp-Lxh">
                                         <rect key="frame" x="0.0" y="72" width="232" height="40"/>
                                         <subviews>
-                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="msY-3y-OxD">
+                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="msY-3y-OxD">
                                                 <rect key="frame" x="-2" y="12" width="37" height="16"/>
                                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Color" id="qen-aV-XFk">
                                                     <font key="font" usesAppearanceFont="YES"/>

+ 0 - 217
PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/EditPDF/Toolbar/KMEditPDFToolbarItemView.swift

@@ -1,217 +0,0 @@
-//
-//  KMEditPDFToolbarItemView.swift
-//  PDF Reader Pro
-//
-//  Created by tangchao on 2024/6/25.
-//
-
-import Cocoa
-
-class KMSliderItemView: NSView {
-    var titleLabel: NSTextField {
-        get {
-            return self.titleLabel_
-        }
-    }
-    private lazy var titleLabel_: NSTextField = {
-        let view = NSTextField(labelWithString: "")
-        return view
-    }()
-    
-    var slider: NSSlider {
-        get {
-            return self.slider_
-        }
-    }
-    private lazy var slider_: NSSlider = {
-        let view = NSSlider()
-        view.minValue = 0
-        view.maxValue = 1
-        view.target = self
-        view.action = #selector(sliderValueDidChange)
-        return view
-    }()
-    
-    var box: NSBox {
-        get {
-            return self.box_
-        }
-    }
-    
-    private lazy var box_: NSBox = {
-        let view = NSBox()
-        view.boxType = .custom
-        view.titlePosition = .noTitle
-        view.contentViewMargins = .zero
-        view.borderWidth = 0
-        return view
-    }()
-    
-    var minValue: Double = 0 {
-        didSet {
-            self.slider.minValue = self.minValue
-        }
-    }
-    
-    var maxValue: Double = 1 {
-        didSet {
-            self.slider.maxValue = self.maxValue
-        }
-    }
-    
-    var doubleValue: Double = 1 {
-        didSet {
-            self.slider.doubleValue = self.doubleValue
-        }
-    }
-    
-    var valueChange: ((Double)->Void)?
-    
-    convenience init() {
-        self.init(frame: .zero)
-        self.initSubViews()
-    }
-    
-    func initSubViews() {
-        self.addSubview(self.titleLabel_)
-        self.addSubview(self.slider_)
-        self.addSubview(self.box_)
-        
-        self.titleLabel_.km_add_top_constraint(constant: 0)
-        self.titleLabel_.km_add_left_constraint(constant: 4)
-        
-        self.slider_.km_add_left_constraint(constant: 4)
-        self.slider_.km_add_top_constraint(equalTo: self.titleLabel_, attribute: .bottom, constant: 4)
-        self.slider_.km_add_height_constraint(constant: 26)
-        self.slider_.km_add_right_constraint(equalTo: self.box_, attribute: .left, constant: -8)
-        
-        self.box_.km_add_right_constraint(constant: 0)
-        self.box_.km_add_bottom_constraint(constant: -4)
-    }
-    
-    @objc func sliderValueDidChange(_ sender: NSSlider) {
-        self.valueChange?(sender.doubleValue)
-    }
-}
-
-class KMEditPDFToolbarItemView: NSView {
-    private lazy var contentBox_: NSBox = {
-        let view = NSBox()
-        view.boxType = .custom
-        view.titlePosition = .noTitle
-        view.contentViewMargins = .zero
-        view.borderWidth = 0
-        return view
-    }()
-    
-    var view: NSView? {
-        didSet {
-            if let data = self.view {
-                self.contentBox_.contentView = data
-            }
-            
-            self.needsLayout = true
-        }
-    }
-    
-    var obj: AnyObject?
-    
-    private var area_: NSTrackingArea?
-    
-    private var popOver_: NSPopover?
-    var popOver: NSPopover? {
-        get {
-            return self.popOver_
-        }
-        set {
-            if self.popOver_ == nil || self.popOver_!.isEqual(to: newValue) == false {
-                self.popOver_ = newValue
-                if (newValue != nil) {
-//                    self.layer?.backgroundColor = Self.selectedBackgroundColor.cgColor
-                } else {
-//                    self.updateSelectBackground()
-                }
-            }
-        }
-    }
-    var popToolTip: String? 
-    
-    deinit {
-        KMPrint("KMEditPDFToolbarItemView deinit.")
-        if let trackingArea = self.area_ {
-            self.removeTrackingArea(trackingArea)
-        }
-    }
-    
-    convenience init() {
-        self.init(frame: .zero)
-        self.addSubview(self.contentBox_)
-    }
-    
-    override func layout() {
-        super.layout()
-        
-        let height = NSHeight(self.bounds)
-        let width = NSWidth(self.bounds)
-//        let boxFrame = self.contentBox_.contentView?.frame ?? .zero
-//        let boxX = (width - boxFrame.size.width) * 0.5
-//        let boxY = (height - boxFrame.size.height) * 0.5
-//        self.contentBox_.frame = NSMakeRect(boxX, boxY, boxFrame.size.width, boxFrame.size.height)
-        self.contentBox_.frame = self.bounds
-        
-//        KMPrint("-------- \(boxFrame)")
-    }
-    
-    override func updateTrackingAreas() {
-        super.updateTrackingAreas()
-
-        if let existingArea = self.area_ {
-            self.removeTrackingArea(existingArea)
-            self.area_ = nil
-        }
-
-        let opts: NSTrackingArea.Options = [.mouseEnteredAndExited, .mouseMoved, .activeAlways]
-        self.area_ = NSTrackingArea(rect: bounds, options: opts, owner: self, userInfo: nil)
-
-        if let trackingArea = self.area_ {
-            self.addTrackingArea(trackingArea)
-        }
-    }
-    
-    override func mouseEntered(with event: NSEvent) {
-        if let data = self.popToolTip, data.isEmpty == false {
-            Self.cancelPreviousPerformRequests(withTarget: self, selector: #selector(_showPopTip), object: self)
-            self.perform(#selector(_showPopTip), with: self, afterDelay: 0.8)
-        }
-    }
-    
-    override func mouseExited(with event: NSEvent) {
-        if let data = self.popToolTip, data.isEmpty == false {
-            Self.cancelPreviousPerformRequests(withTarget: self, selector: #selector(_showPopTip), object: self)
-            self._closePop()
-        }
-    }
-    
-    @objc func _showPopTip(_ sender: NSView) {
-        if (self.popOver_ != nil) {
-            return
-        }
-        if self.window == nil {
-            return
-        }
-        let popViewController = KMToolbarItemPopViewController()
-        self.popOver = NSPopover()
-        self.popOver?.contentViewController = popViewController
-        self.popOver?.animates = false
-        self.popOver?.behavior = .semitransient
-        self.popOver?.contentSize = popViewController.view.frame.size
-        
-        popViewController.updateWithHelpTip(helpTip: self.popToolTip ?? "")
-        self.popOver?.show(relativeTo: KMRectInset(self.bounds, 0, 5), of: self, preferredEdge: .minY)
-    }
-    
-    private func _closePop() {
-        self.popOver?.close()
-        self.popOver = nil
-    }
-}

+ 0 - 74
PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/EditPDF/Toolbar/KMEditPDFToolbarView.swift

@@ -1,74 +0,0 @@
-//
-//  KMEditPDFToolbarView.swift
-//  PDF Reader Pro
-//
-//  Created by tangchao on 2024/6/25.
-//
-
-import Cocoa
-
-@objc protocol KMEditPDFToolbarViewDelegate: NSObjectProtocol {
-    @objc optional func numberOfItems(in toolbarView: KMEditPDFToolbarView) -> Int
-    @objc optional func toolbarView(_ toolbarView: KMEditPDFToolbarView, viewFor index: Int) -> NSView?
-    
-    @objc optional func toolbarView(_ toolbarView: KMEditPDFToolbarView, sizeForItemAt index: Int) -> NSSize
-
-//    @objc optional func toolbarView(_ toolbarView: KMEditPDFToolbarView, insetForSectionAt section: Int) -> NSEdgeInsets
-//    @objc optional func toolbarView(_ toolbarView: KMEditPDFToolbarView, minimumLineSpacingForSectionAt section: Int) -> CGFloat
-//    @objc optional func toolbarView(_ toolbarView: KMEditPDFToolbarView, minimumInteritemSpacingForSectionAt section: Int) -> CGFloat
-}
-
-class KMEditPDFToolbarView: NSView {
-    weak var delegate: KMEditPDFToolbarViewDelegate?
-    
-    var itemViews: [NSView] = []
-    
-    convenience init() {
-        self.init(frame: .zero)
-    }
-    
-    var inset: NSEdgeInsets = NSEdgeInsets(top: 0, left: 0, bottom: 0, right: 0) {
-        didSet {
-            self.needsLayout = true
-        }
-    }
-    
-    func reloadData() {
-        for sv in self.subviews {
-            sv.removeFromSuperview()
-        }
-        self.itemViews.removeAll()
-        
-        guard let num = self.delegate?.numberOfItems?(in: self) else {
-            return
-        }
-        for i in 0 ..< num {
-            if let view = self.delegate?.toolbarView?(self, viewFor: i) {
-                self.addSubview(view)
-                self.itemViews.append(view)
-            }
-        }
-        
-        self.needsLayout = true
-    }
-    
-    override func layout() {
-        super.layout()
-        
-        let height = NSHeight(self.bounds)
-        
-        let leftMargin = self.inset.left
-        let topMargin = self.inset.top
-        var x = leftMargin
-        let vSpace: CGFloat = 3
-        for (i, sv) in self.subviews.enumerated() {
-            if let size = self.delegate?.toolbarView?(self, sizeForItemAt: i) {
-                let y = topMargin
-                var frame = NSRect(x: x, y: y, width: size.width, height: size.height)
-                x += (size.width + vSpace)
-                sv.frame = frame
-            }
-        }
-    }
-}
-

+ 0 - 226
PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/EditPDF/View/AlignmentView/KMEditPropertyAlignmentView.swift

@@ -1,226 +0,0 @@
-//
-//  KMEditPropertyAlignmentView.swift
-//  PDF Reader Pro
-//
-//  Created by lizhe on 2023/5/12.
-//
-
-import Cocoa
-
-
-typealias KMEditPropertyAlignmentViewDidChange = (_ view: KMEditPropertyAlignmentView, _ areasArray: [Any], _ newBoundsArray: [String]) -> ()
-
-class KMEditPropertyAlignmentView: BaseXibView {
-    @IBOutlet weak var alignmentLabel: NSTextField!
-    @IBOutlet weak var leftAreasBox: NSBox!
-    @IBOutlet weak var verticalCenterAreasBox: NSBox!
-    @IBOutlet weak var rightButtonAreasBox: NSBox!
-    @IBOutlet weak var horzontalAreasBox: NSBox!
-    @IBOutlet weak var topAreasBox: NSBox!
-    @IBOutlet weak var horizontalCenterAreasBox: NSBox!
-    @IBOutlet weak var botoomAreasBox: NSBox!
-    @IBOutlet weak var verticalAreasBox: NSBox!
-    @IBOutlet weak var alignmentLine1: NSView!
-    @IBOutlet weak var alignmentLine2: NSView!
-    
-    var leftAreasVC: KMDesignPropertySelector?
-    var verticalCenterAreasVC: KMDesignPropertySelector?
-    var rightButtonAreasVC: KMDesignPropertySelector?
-    var horzontalAreasVC: KMDesignPropertySelector?
-    var topAreasVC: KMDesignPropertySelector?
-    var horizontalCenterAreasVC: KMDesignPropertySelector?
-    var botoomAreasVC: KMDesignPropertySelector?
-    var verticalAreasVC: KMDesignPropertySelector?
-    
-    var editingAreas: [Any] = [] {
-        didSet {
-            self.reloadData()
-        }
-    }
-    
-    var didChange: KMEditPropertyAlignmentViewDidChange?
-    
-    override func draw(_ dirtyRect: NSRect) {
-        super.draw(dirtyRect)
-
-        // Drawing code here.
-        
-    }
-    
-    override func setup() {
-        self.alignmentLabel.stringValue = NSLocalizedString("Align", comment: "")
-        alignmentLabel.font = NSFont.SFProTextRegularFont(12.0)
-        alignmentLabel.textColor = NSColor.km_init(hex: "#616469")
-        
-        alignmentLine1.backgroundColor(NSColor.km_init(hex: "#000000", alpha: 0.1))
-        alignmentLine2.backgroundColor(NSColor.km_init(hex: "#000000", alpha: 0.1))
-        
-        leftAreasVC = KMDesignPropertySelector.init(withType: .Icon_Btn)
-        leftAreasBox.contentView = leftAreasVC?.view
-        leftAreasBox.fillColor = NSColor.clear
-        leftAreasVC?.target = self
-        leftAreasVC?.button.tag = 0
-        leftAreasVC?.action = #selector(areasAlignStyleAction)
-        leftAreasVC?._image_disabled = NSImage(named: "KMImageNameEditPDFImage45")!
-        leftAreasVC?._image_sel = NSImage(named: "KMImageNameEditPDFImage45_1")!
-        leftAreasVC?._image_hov = NSImage(named: "KMImageNameEditPDFImage45_1")!
-        leftAreasVC?.image = NSImage(named: "KMImageNameEditPDFImage45_1")!
-        leftAreasVC?.updateUI()
-        
-        verticalCenterAreasVC = KMDesignPropertySelector.init(withType: .Icon_Btn)
-        verticalCenterAreasBox.contentView = verticalCenterAreasVC?.view
-        verticalCenterAreasBox.fillColor = NSColor.clear
-        verticalCenterAreasVC?.target = self
-        verticalCenterAreasVC?.button.tag = 1
-        verticalCenterAreasVC?.action = #selector(areasAlignStyleAction)
-        verticalCenterAreasVC?._image_disabled = NSImage(named: "KMImageNameEditPDFImage46")!
-        verticalCenterAreasVC?._image_sel = NSImage(named: "KMImageNameEditPDFImage46_1")!
-        verticalCenterAreasVC?._image_hov = NSImage(named: "KMImageNameEditPDFImage46_1")!
-        verticalCenterAreasVC?.image = NSImage(named: "KMImageNameEditPDFImage46_1")!
-        verticalCenterAreasVC?.updateUI()
-        
-        rightButtonAreasVC = KMDesignPropertySelector.init(withType: .Icon_Btn)
-        rightButtonAreasBox.contentView = rightButtonAreasVC?.view
-        rightButtonAreasBox.fillColor = NSColor.clear
-        rightButtonAreasVC?.target = self
-        rightButtonAreasVC?.button.tag = 2
-        rightButtonAreasVC?.action = #selector(areasAlignStyleAction)
-        rightButtonAreasVC?.image = NSImage(named: "KMImageNameEditPDFImage47_1")!
-        rightButtonAreasVC?._image_disabled = NSImage(named: "KMImageNameEditPDFImage47")!
-        rightButtonAreasVC?._image_sel = NSImage(named: "KMImageNameEditPDFImage47_1")!
-        rightButtonAreasVC?._image_hov = NSImage(named: "KMImageNameEditPDFImage47_1")!
-        rightButtonAreasVC?.updateUI()
-        
-        horzontalAreasVC = KMDesignPropertySelector.init(withType: .Icon_Btn)
-        horzontalAreasBox.contentView = horzontalAreasVC?.view
-        horzontalAreasBox.fillColor = NSColor.clear
-        horzontalAreasVC?.target = self
-        horzontalAreasVC?.button.tag = 7
-        horzontalAreasVC?.action = #selector(areasAlignStyleAction)
-        horzontalAreasVC?.image = NSImage(named: "KMImageNameEditPDFImage21_1")!
-        horzontalAreasVC?._image_disabled = NSImage(named: "KMImageNameEditPDFImage21")!
-        horzontalAreasVC?._image_sel = NSImage(named: "KMImageNameEditPDFImage21_1")!
-        horzontalAreasVC?._image_hov = NSImage(named: "KMImageNameEditPDFImage21_1")!
-        horzontalAreasVC?.updateUI()
-        
-        topAreasVC = KMDesignPropertySelector.init(withType: .Icon_Btn)
-        topAreasBox.contentView = topAreasVC?.view
-        topAreasBox.fillColor = NSColor.clear
-        topAreasVC?.button.tag = 3
-        topAreasVC?.target = self
-        topAreasVC?.action = #selector(areasAlignStyleAction)
-        topAreasVC?.image = NSImage(named: "KMImageNameEditPDFImage48_1")!
-        topAreasVC?._image_disabled = NSImage(named: "KMImageNameEditPDFImage48")!
-        topAreasVC?._image_sel = NSImage(named: "KMImageNameEditPDFImage48_1")!
-        topAreasVC?._image_hov = NSImage(named: "KMImageNameEditPDFImage48_1")!
-        topAreasVC?.updateUI()
-        
-        horizontalCenterAreasVC = KMDesignPropertySelector.init(withType: .Icon_Btn)
-        horizontalCenterAreasBox.contentView = horizontalCenterAreasVC?.view
-        horizontalCenterAreasBox.fillColor = NSColor.clear
-        horizontalCenterAreasVC?.button.tag = 4
-        horizontalCenterAreasVC?.target = self
-        horizontalCenterAreasVC?.action = #selector(areasAlignStyleAction)
-        horizontalCenterAreasVC?.image = NSImage(named: "KMImageNameEditPDFImage49_1")!
-        horizontalCenterAreasVC?._image_disabled = NSImage(named: "KMImageNameEditPDFImage49")!
-        horizontalCenterAreasVC?._image_sel = NSImage(named: "KMImageNameEditPDFImage49_1")!
-        horizontalCenterAreasVC?._image_hov = NSImage(named: "KMImageNameEditPDFImage49_1")!
-        horizontalCenterAreasVC?.updateUI()
-        
-        botoomAreasVC = KMDesignPropertySelector.init(withType: .Icon_Btn)
-        botoomAreasBox.contentView = botoomAreasVC?.view
-        botoomAreasBox.fillColor = NSColor.clear
-        botoomAreasVC?.button.tag = 5
-        botoomAreasVC?.target = self
-        botoomAreasVC?.action = #selector(areasAlignStyleAction)
-        botoomAreasVC?.image = NSImage(named: "KMImageNameEditPDFImage50_1")!
-        botoomAreasVC?._image_disabled = NSImage(named: "KMImageNameEditPDFImage50")!
-        botoomAreasVC?._image_sel = NSImage(named: "KMImageNameEditPDFImage50_1")!
-        botoomAreasVC?._image_hov = NSImage(named: "KMImageNameEditPDFImage50_1")!
-        botoomAreasVC?.updateUI()
-        
-        verticalAreasVC = KMDesignPropertySelector.init(withType: .Icon_Btn)
-        verticalAreasBox.contentView = verticalAreasVC?.view
-        verticalAreasBox.fillColor = NSColor.clear
-        verticalAreasVC?.button.tag = 6
-        verticalAreasVC?.target = self
-        verticalAreasVC?.action = #selector(areasAlignStyleAction)
-        verticalAreasVC?.image = NSImage(named: "KMImageNameEditPDFImage20_1")!
-        verticalAreasVC?._image_disabled = NSImage(named: "KMImageNameEditPDFImage20")!
-        verticalAreasVC?.image_sel = NSImage(named: "KMImageNameEditPDFImage20_1")!
-        verticalAreasVC?.image_hov = NSImage(named: "KMImageNameEditPDFImage20_1")!
-        verticalAreasVC?.updateUI()
-    }
-    
-    func reloadData() {
-        self.updateFormAearsAlignmentState()
-        
-        self.updateUI()
-    }
-    
-      func changeEffectiveAppearance() {
-        let isDarkModel = KMAdvertisementConfig.isDarkModel()
-        if isDarkModel {
-            self.appearance = NSAppearance(named: .darkAqua)
-        } else {
-            self.appearance = NSAppearance(named: .aqua)
-        }
-        self.updateUI()
-    }
-    
-    func updateUI() {
- 
-        let isDarkModel = KMAdvertisementConfig.isDarkModel()
-        if isDarkModel {
-            for vcItem in [leftAreasVC, verticalCenterAreasVC, rightButtonAreasVC, horzontalAreasVC,
-                           topAreasVC, horizontalCenterAreasVC, botoomAreasVC, verticalAreasVC] {
-                vcItem!.background_hov = NSColor(red: 71/255, green: 72/255, blue: 75/255, alpha: 1)
-            }
-            
-        } else {
-            for vcItem in [leftAreasVC, verticalCenterAreasVC, rightButtonAreasVC, horzontalAreasVC,
-                           topAreasVC, horizontalCenterAreasVC, botoomAreasVC, verticalAreasVC] {
-                vcItem!.background_hov = NSColor(red: 237/255, green: 238/255, blue: 240/255, alpha: 1)
-            }
-        }
-        
-    }
-}
-
-extension KMEditPropertyAlignmentView {
-    @objc func areasAlignStyleAction(_ sender: NSButton) {
-
-    }
-}
-
-extension KMEditPropertyAlignmentView {
-    func updateFormAearsAlignmentState() {
-        let areasArray = [leftAreasVC, verticalCenterAreasVC, rightButtonAreasVC, horzontalAreasVC, topAreasVC, horizontalCenterAreasVC, botoomAreasVC, verticalAreasVC]
-        if self.editingAreas.count < 2 {
-            for view in areasArray {
-                view?.image = (view?._image_disabled)!
-                view?.button.isEnabled = false
-                view?.image_hov = view?._image_disabled ?? NSImage()
-            }
-        } else if self.editingAreas.count == 2 {
-            for view in areasArray {
-                if view == verticalAreasVC || view == horzontalAreasVC {
-                    view?.image = (view?._image_disabled)!
-                    view?.button.isEnabled = false
-                    view?.image_hov = view?._image_disabled ?? NSImage()
-                } else {
-                    view?.image = (view?._image_sel)!
-                    view?.button.isEnabled = true
-                    view?.image_hov = view?.image_sel ?? NSImage()
-                }
-            }
-        } else if self.editingAreas.count > 2 {
-            for view in areasArray {
-                view?.image = (view?._image_sel)!
-                view?.button.isEnabled = true
-                view?.image_hov = view?.image_sel ?? NSImage()
-            }
-        }
-    }
-     
-}

+ 0 - 201
PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/EditPDF/View/AlignmentView/KMEditPropertyAlignmentView.xib

@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="22505"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMEditPropertyAlignmentView" customModule="PDF_Reader_Pro" customModuleProvider="target">
-            <connections>
-                <outlet property="alignmentLabel" destination="93h-Zp-u0e" id="tXr-BN-b42"/>
-                <outlet property="alignmentLine1" destination="lCR-he-1dp" id="GPI-5y-bM7"/>
-                <outlet property="alignmentLine2" destination="vaB-EX-shv" id="34f-P1-xes"/>
-                <outlet property="botoomAreasBox" destination="5dI-pc-D5F" id="hIW-rt-AxG"/>
-                <outlet property="horizontalCenterAreasBox" destination="54K-Mb-HzH" id="tqk-Hy-eiN"/>
-                <outlet property="horzontalAreasBox" destination="1aE-fX-KCQ" id="r63-qN-tGM"/>
-                <outlet property="leftAreasBox" destination="s1L-B4-HBJ" id="IaR-Pw-87N"/>
-                <outlet property="rightButtonAreasBox" destination="f42-Qo-K3s" id="IHw-Gb-qCe"/>
-                <outlet property="topAreasBox" destination="JMi-Bm-lSz" id="bew-27-gF1"/>
-                <outlet property="verticalAreasBox" destination="wL7-h0-dzD" id="prr-WT-0In"/>
-                <outlet property="verticalCenterAreasBox" destination="WMK-p2-3rr" id="MeP-hy-r3v"/>
-            </connections>
-        </customObject>
-        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customView id="c22-O7-iKe">
-            <rect key="frame" x="0.0" y="0.0" width="232" height="100"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-            <subviews>
-                <customView translatesAutoresizingMaskIntoConstraints="NO" id="h6e-kO-nVY">
-                    <rect key="frame" x="0.0" y="0.0" width="232" height="100"/>
-                    <subviews>
-                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="93h-Zp-u0e">
-                            <rect key="frame" x="-2" y="84" width="35" height="16"/>
-                            <textFieldCell key="cell" lineBreakMode="clipping" title="Align" id="jFd-TA-40c">
-                                <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>
-                        <customView translatesAutoresizingMaskIntoConstraints="NO" id="Z5G-FU-X0F">
-                            <rect key="frame" x="0.0" y="0.0" width="232" height="76"/>
-                            <subviews>
-                                <box boxType="custom" borderWidth="0.0" cornerRadius="4" translatesAutoresizingMaskIntoConstraints="NO" id="s1L-B4-HBJ">
-                                    <rect key="frame" x="0.0" y="44" width="32" height="32"/>
-                                    <view key="contentView" id="02G-bS-why">
-                                        <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
-                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                    </view>
-                                    <constraints>
-                                        <constraint firstAttribute="height" constant="32" id="NgT-rR-h7y"/>
-                                        <constraint firstAttribute="width" constant="32" id="STb-hs-c11"/>
-                                    </constraints>
-                                    <color key="fillColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                </box>
-                                <box boxType="custom" borderWidth="0.0" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="WMK-p2-3rr">
-                                    <rect key="frame" x="40" y="44" width="32" height="32"/>
-                                    <view key="contentView" id="sPt-xM-LQO">
-                                        <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
-                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                    </view>
-                                    <constraints>
-                                        <constraint firstAttribute="height" constant="32" id="o77-F7-Dk9"/>
-                                        <constraint firstAttribute="width" constant="32" id="sq9-i9-QNf"/>
-                                    </constraints>
-                                    <color key="fillColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                </box>
-                                <box boxType="custom" borderWidth="0.0" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="f42-Qo-K3s">
-                                    <rect key="frame" x="80" y="44" width="32" height="32"/>
-                                    <view key="contentView" id="89B-Tv-dyt">
-                                        <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
-                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                    </view>
-                                    <constraints>
-                                        <constraint firstAttribute="width" constant="32" id="GMh-oY-kUL"/>
-                                        <constraint firstAttribute="height" constant="32" id="JRA-y0-OEb"/>
-                                    </constraints>
-                                    <color key="fillColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                </box>
-                                <box boxType="custom" borderWidth="0.0" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="1aE-fX-KCQ">
-                                    <rect key="frame" x="129" y="44" width="32" height="32"/>
-                                    <view key="contentView" id="TYi-3d-o1f">
-                                        <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
-                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                    </view>
-                                    <constraints>
-                                        <constraint firstAttribute="height" constant="32" id="UEU-o9-8Lr"/>
-                                        <constraint firstAttribute="width" constant="32" id="Uz1-hq-Vlo"/>
-                                    </constraints>
-                                    <color key="fillColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                </box>
-                                <box boxType="custom" borderWidth="0.0" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="JMi-Bm-lSz">
-                                    <rect key="frame" x="0.0" y="4" width="32" height="32"/>
-                                    <view key="contentView" id="v3j-sY-Q0I">
-                                        <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
-                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                    </view>
-                                    <constraints>
-                                        <constraint firstAttribute="width" constant="32" id="4hc-0i-ekL"/>
-                                        <constraint firstAttribute="height" constant="32" id="hBQ-lX-KZj"/>
-                                    </constraints>
-                                    <color key="fillColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                </box>
-                                <box boxType="custom" borderWidth="0.0" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="54K-Mb-HzH">
-                                    <rect key="frame" x="40" y="4" width="32" height="32"/>
-                                    <view key="contentView" id="dNa-37-Rj1">
-                                        <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
-                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                    </view>
-                                    <constraints>
-                                        <constraint firstAttribute="width" constant="32" id="4wU-Q6-712"/>
-                                        <constraint firstAttribute="height" constant="32" id="k90-Ol-R1c"/>
-                                    </constraints>
-                                    <color key="fillColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                </box>
-                                <box boxType="custom" borderWidth="0.0" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="5dI-pc-D5F">
-                                    <rect key="frame" x="80" y="4" width="32" height="32"/>
-                                    <view key="contentView" id="bfP-uL-gCG">
-                                        <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
-                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                    </view>
-                                    <constraints>
-                                        <constraint firstAttribute="height" constant="32" id="6wk-hZ-sEW"/>
-                                        <constraint firstAttribute="width" constant="32" id="wPc-kt-g2N"/>
-                                    </constraints>
-                                    <color key="fillColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                </box>
-                                <customView translatesAutoresizingMaskIntoConstraints="NO" id="lCR-he-1dp">
-                                    <rect key="frame" x="120" y="52" width="1" height="16"/>
-                                    <constraints>
-                                        <constraint firstAttribute="height" constant="16" id="mra-vI-PxV"/>
-                                        <constraint firstAttribute="width" constant="1" id="qJN-kQ-8KM"/>
-                                    </constraints>
-                                </customView>
-                                <customView translatesAutoresizingMaskIntoConstraints="NO" id="vaB-EX-shv">
-                                    <rect key="frame" x="120" y="12" width="1" height="16"/>
-                                    <constraints>
-                                        <constraint firstAttribute="height" constant="16" id="IaX-re-qvW"/>
-                                        <constraint firstAttribute="width" constant="1" id="fa8-Xr-ndb"/>
-                                    </constraints>
-                                </customView>
-                                <box boxType="custom" borderWidth="0.0" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="wL7-h0-dzD">
-                                    <rect key="frame" x="129" y="4" width="32" height="32"/>
-                                    <view key="contentView" id="xqn-Rd-1cg">
-                                        <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
-                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                    </view>
-                                    <constraints>
-                                        <constraint firstAttribute="height" constant="32" id="Hub-kp-79V"/>
-                                        <constraint firstAttribute="width" constant="32" id="baU-5R-6Ho"/>
-                                    </constraints>
-                                    <color key="fillColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                </box>
-                            </subviews>
-                            <constraints>
-                                <constraint firstItem="f42-Qo-K3s" firstAttribute="top" secondItem="Z5G-FU-X0F" secondAttribute="top" id="0Kg-5N-CdA"/>
-                                <constraint firstItem="WMK-p2-3rr" firstAttribute="top" secondItem="Z5G-FU-X0F" secondAttribute="top" id="18x-tD-H8t"/>
-                                <constraint firstItem="wL7-h0-dzD" firstAttribute="top" secondItem="1aE-fX-KCQ" secondAttribute="bottom" constant="8" id="1By-sk-iHp"/>
-                                <constraint firstItem="f42-Qo-K3s" firstAttribute="top" secondItem="02G-bS-why" secondAttribute="top" id="1vw-Ks-9OA"/>
-                                <constraint firstItem="5dI-pc-D5F" firstAttribute="leading" secondItem="54K-Mb-HzH" secondAttribute="trailing" constant="8" id="9NJ-hU-HX0"/>
-                                <constraint firstItem="wL7-h0-dzD" firstAttribute="leading" secondItem="vaB-EX-shv" secondAttribute="trailing" constant="8" id="Ea1-h5-zPU"/>
-                                <constraint firstItem="1aE-fX-KCQ" firstAttribute="top" secondItem="02G-bS-why" secondAttribute="top" id="GHL-wR-1GJ"/>
-                                <constraint firstItem="1aE-fX-KCQ" firstAttribute="leading" secondItem="lCR-he-1dp" secondAttribute="trailing" constant="8" id="M2b-9O-dfY"/>
-                                <constraint firstItem="JMi-Bm-lSz" firstAttribute="leading" secondItem="Z5G-FU-X0F" secondAttribute="leading" id="O8W-jV-afg"/>
-                                <constraint firstItem="1aE-fX-KCQ" firstAttribute="top" secondItem="Z5G-FU-X0F" secondAttribute="top" id="OdM-ja-FDq"/>
-                                <constraint firstItem="vaB-EX-shv" firstAttribute="top" secondItem="JMi-Bm-lSz" secondAttribute="top" constant="8" id="Olv-9f-qls"/>
-                                <constraint firstItem="lCR-he-1dp" firstAttribute="top" secondItem="Z5G-FU-X0F" secondAttribute="top" constant="8" id="YcE-EL-lRi"/>
-                                <constraint firstItem="lCR-he-1dp" firstAttribute="leading" secondItem="f42-Qo-K3s" secondAttribute="trailing" constant="8" id="eMZ-9S-C55"/>
-                                <constraint firstItem="54K-Mb-HzH" firstAttribute="leading" secondItem="JMi-Bm-lSz" secondAttribute="trailing" constant="8" id="fg5-1c-QGb"/>
-                                <constraint firstItem="s1L-B4-HBJ" firstAttribute="leading" secondItem="Z5G-FU-X0F" secondAttribute="leading" id="hgt-B0-6X4"/>
-                                <constraint firstItem="WMK-p2-3rr" firstAttribute="leading" secondItem="s1L-B4-HBJ" secondAttribute="trailing" constant="8" id="lC0-zF-kEJ"/>
-                                <constraint firstItem="f42-Qo-K3s" firstAttribute="leading" secondItem="WMK-p2-3rr" secondAttribute="trailing" constant="8" id="s7C-vV-ghP"/>
-                                <constraint firstItem="54K-Mb-HzH" firstAttribute="top" secondItem="WMK-p2-3rr" secondAttribute="bottom" constant="8" id="uUS-G2-LHc"/>
-                                <constraint firstItem="s1L-B4-HBJ" firstAttribute="top" secondItem="Z5G-FU-X0F" secondAttribute="top" id="yci-Cv-cO4"/>
-                                <constraint firstItem="JMi-Bm-lSz" firstAttribute="top" secondItem="s1L-B4-HBJ" secondAttribute="bottom" constant="8" id="zXs-Ee-Cy4"/>
-                                <constraint firstItem="vaB-EX-shv" firstAttribute="leading" secondItem="5dI-pc-D5F" secondAttribute="trailing" constant="8" id="za9-cR-2ok"/>
-                                <constraint firstItem="5dI-pc-D5F" firstAttribute="top" secondItem="f42-Qo-K3s" secondAttribute="bottom" constant="8" id="zte-P4-bAC"/>
-                            </constraints>
-                        </customView>
-                    </subviews>
-                    <constraints>
-                        <constraint firstItem="Z5G-FU-X0F" firstAttribute="leading" secondItem="h6e-kO-nVY" secondAttribute="leading" id="63P-zI-KcU"/>
-                        <constraint firstAttribute="bottom" secondItem="Z5G-FU-X0F" secondAttribute="bottom" id="MKS-bH-NH1"/>
-                        <constraint firstAttribute="height" constant="100" id="PYy-X1-hKV"/>
-                        <constraint firstItem="93h-Zp-u0e" firstAttribute="top" secondItem="h6e-kO-nVY" secondAttribute="top" id="gUl-xt-LvF"/>
-                        <constraint firstItem="93h-Zp-u0e" firstAttribute="leading" secondItem="h6e-kO-nVY" secondAttribute="leading" id="nUG-LP-xCS"/>
-                        <constraint firstAttribute="trailing" secondItem="Z5G-FU-X0F" secondAttribute="trailing" id="qYX-Bq-stq"/>
-                        <constraint firstItem="Z5G-FU-X0F" firstAttribute="top" secondItem="93h-Zp-u0e" secondAttribute="bottom" constant="8" id="sKt-rh-6gs"/>
-                    </constraints>
-                </customView>
-            </subviews>
-            <constraints>
-                <constraint firstItem="h6e-kO-nVY" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" id="2xs-h8-uHd"/>
-                <constraint firstAttribute="trailing" secondItem="h6e-kO-nVY" secondAttribute="trailing" id="4fB-Pg-9EK"/>
-                <constraint firstAttribute="bottom" secondItem="h6e-kO-nVY" secondAttribute="bottom" id="Nqk-vX-66j"/>
-                <constraint firstItem="h6e-kO-nVY" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" id="V9J-OL-bXk"/>
-            </constraints>
-            <point key="canvasLocation" x="15" y="154"/>
-        </customView>
-    </objects>
-</document>

+ 0 - 133
PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/EditPDF/View/KMEditPDFColorView.swift

@@ -1,133 +0,0 @@
-//
-//  KMEditPDFColorView.swift
-//  PDF Reader Pro
-//
-//  Created by tangchao on 2024/6/25.
-//
-
-import Cocoa
-
-class KMEditPDFColorView: NSView {
-    lazy var box: NSBox = {
-        let view = NSBox()
-        view.boxType = .custom
-        view.titlePosition = .noTitle
-        view.contentViewMargins = .zero
-        view.borderWidth = 1
-        view.cornerRadius = 4
-        view.borderColor = KMAppearance.controlBackgroundColor()
-        return view
-    }()
-    
-    lazy var colorBtn: NSButton = {
-        let view = NSButton()
-        view.isBordered = false
-        view.title = ""
-        view.wantsLayer = true
-        view.layer?.cornerRadius = 10
-        view.layer?.borderWidth = 1
-        view.layer?.borderColor = NSColor(white: 0, alpha: 0.1).cgColor
-        
-//        view.layer?.backgroundColor = .black
-        view.target = self
-        view.action = #selector(buttonClick)
-        return view
-    }()
-    
-    lazy var plateBtn: NSButton = {
-        let view = NSButton()
-        view.isBordered = false
-        view.title = ""
-        view.wantsLayer = true
-        view.layer?.cornerRadius = 10
-        view.layer?.masksToBounds = true
-        view.image = NSImage(named: "view_color")
-        view.target = self
-        view.action = #selector(buttonClick)
-        return view
-    }()
-    
-    var isEnabled = true 
-    
-    private var area_: NSTrackingArea?
-    
-    var itemClick: KMCommonClickBlock?
-    
-    deinit {
-        KMPrint("KMEditPDFColorView deinit.")
-        if let trackingArea = self.area_ {
-            self.removeTrackingArea(trackingArea)
-        }
-    }
-    
-    override init(frame frameRect: NSRect) {
-        super.init(frame: frameRect)
-        
-        self.initSubView()
-    }
-    
-    required init?(coder: NSCoder) {
-        super.init(coder: coder)
-        
-        self.initSubView()
-    }
-    
-    convenience init() {
-        self.init(frame: .init(x: 0, y: 0, width: 56, height: 32))
-    }
-    
-    func initSubView() {
-        self.addSubview(self.box)
-        self.box.contentView?.addSubview(self.colorBtn)
-        self.box.contentView?.addSubview(self.plateBtn)
-    }
-    
-    override func layout() {
-        super.layout()
-        
-        let height = NSHeight(self.bounds)
-        self.box.frame = self.bounds
-        
-        let btnWH: CGFloat = 20
-        let btnY: CGFloat = (height - btnWH) * 0.5
-        let colorX: CGFloat = 4
-        self.colorBtn.frame = NSMakeRect(colorX, btnY, btnWH, btnWH)
-        
-        let plateX: CGFloat = NSMaxX(self.colorBtn.frame) + 8
-        self.plateBtn.frame = NSMakeRect(plateX, btnY, btnWH, btnWH)
-    }
-    
-    override func updateTrackingAreas() {
-        super.updateTrackingAreas()
-
-        if let existingArea = self.area_ {
-            self.removeTrackingArea(existingArea)
-            self.area_ = nil
-        }
-
-        let opts: NSTrackingArea.Options = [.mouseEnteredAndExited, .mouseMoved, .activeAlways]
-        self.area_ = NSTrackingArea(rect: bounds, options: opts, owner: self, userInfo: nil)
-
-        if let trackingArea = self.area_ {
-            self.addTrackingArea(trackingArea)
-        }
-    }
-    
-    @objc func buttonClick(_ sender: NSButton) {
-        if self.isEnabled == false {
-            return 
-        }
-        self.itemClick?(0)
-    }
-    
-    override func mouseEntered(with event: NSEvent) {
-        if self.isEnabled == false {
-            return
-        }
-        self.box.borderColor = KMAppearance.Interactive.a0Color()
-    }
-    
-    override func mouseExited(with event: NSEvent) {
-        self.box.borderColor = KMAppearance.controlBackgroundColor()
-    }
-}

+ 0 - 74
PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/EditPDF/Window/KMEditPDFCropComfirmWindowController.swift

@@ -1,74 +0,0 @@
-//
-//  KMEditPDFCropComfirmWindowController.swift
-//  PDF Reader Pro
-//
-//  Created by tangchao on 2024/6/26.
-//
-
-import Cocoa
-
-class KMEditPDFCropComfirmWindowController: NSWindowController {
-    @IBOutlet weak var leftBox: NSBox!
-    @IBOutlet weak var rightBox: NSBox!
-    
-    private var leftVc_: KMDesignButton?
-    private var rightVc_: KMDesignButton?
-    
-    var itemAction: KMCommonClickBlock?
-    
-    static let shared = KMEditPDFCropComfirmWindowController(windowNibName: "KMEditPDFCropComfirmWindowController")
-    
-    override func windowDidLoad() {
-        super.windowDidLoad()
-        
-//        self.window?.backgroundColor = .white
-        self.window?.contentView?.wantsLayer = true
-        self.window?.contentView?.layer?.cornerRadius = 4
-
-        self.leftVc_ = KMDesignButton(withType: .Image)
-        self.leftBox.contentView = self.leftVc_!.view
-        self.leftBox.borderWidth = 0
-        self.leftVc_?.pagination()
-        self.leftVc_?.target = self
-        self.leftVc_?.action = #selector(_itemClick)
-        self.leftVc_?.image = NSImage(named: "KMImageNameEditPDFCropComfirm")!
-        self.leftVc_?.tag = 0
-        
-        self.rightVc_ = KMDesignButton(withType: .Image)
-        self.rightBox.contentView = self.rightVc_!.view
-        self.rightBox.borderWidth = 0
-        self.rightVc_?.pagination()
-        self.rightVc_?.target = self
-        self.rightVc_?.action = #selector(_itemClick)
-        self.rightVc_?.image = NSImage(named: "KMImageNameEditPDFCropCancel")!
-        self.rightVc_?.tag = 1
-    }
-    
-    @objc private func _itemClick(_ sender: NSButton) {
-        self.itemAction?(sender.tag)
-    }
-    
-    override func showWindow(_ sender: Any?) {
-        super.showWindow(sender)
-        
-        self.interfaceThemeDidChanged(NSApp.appearance?.name ?? .aqua)
-    }
-}
-
-extension KMEditPDFCropComfirmWindowController: KMInterfaceThemeChangedProtocol {
-    func interfaceThemeDidChanged(_ appearance: NSAppearance.Name) {
-        self.window?.appearance = .init(named: appearance)
-        
-        let isDark = appearance == .darkAqua
-        if isDark {
-            self.window?.backgroundColor = NSColor(red: 37/255.0, green: 37/255.0, blue: 38/255.0, alpha: 1.0)
-            
-            self.leftVc_?.background_hov = NSColor(red: 71/255, green: 72/255, blue: 75/255, alpha: 1)
-            self.rightVc_?.background_hov = NSColor(red: 71/255, green: 72/255, blue: 75/255, alpha: 1)
-        } else {
-            self.window?.backgroundColor = .white
-            self.leftVc_?.background_hov = KMAppearance.view_bg_dis_color()
-            self.rightVc_?.background_hov = KMAppearance.view_bg_dis_color()
-        }
-    }
-}

+ 0 - 67
PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/EditPDF/Window/KMEditPDFCropComfirmWindowController.xib

@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="22505"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMEditPDFCropComfirmWindowController" customModule="PDF_Reader_Pro" customModuleProvider="target">
-            <connections>
-                <outlet property="leftBox" destination="3Kr-0B-Fdf" id="UHK-JK-lyg"/>
-                <outlet property="rightBox" destination="8sX-b4-Aey" id="OFo-v4-Ccf"/>
-                <outlet property="window" destination="F0z-JX-Cv5" id="gIp-Ho-8D9"/>
-            </connections>
-        </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">
-            <windowStyleMask key="styleMask" closable="YES" miniaturizable="YES" resizable="YES"/>
-            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="196" y="240" width="84" height="44"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
-            <value key="minSize" type="size" width="84" height="44"/>
-            <value key="maxSize" type="size" width="84" height="44"/>
-            <value key="minFullScreenContentSize" type="size" width="84" height="44"/>
-            <value key="maxFullScreenContentSize" type="size" width="84" height="44"/>
-            <view key="contentView" id="se5-gp-TjO">
-                <rect key="frame" x="0.0" y="0.0" width="84" height="44"/>
-                <autoresizingMask key="autoresizingMask"/>
-                <subviews>
-                    <box boxType="custom" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="3Kr-0B-Fdf">
-                        <rect key="frame" x="8" y="6" width="32" height="32"/>
-                        <view key="contentView" id="irg-s8-JFW">
-                            <rect key="frame" x="1" y="1" width="30" height="30"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        </view>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="32" id="EN3-Yp-dfr"/>
-                            <constraint firstAttribute="height" constant="32" id="HAG-Z8-Ume"/>
-                        </constraints>
-                    </box>
-                    <box boxType="custom" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="8sX-b4-Aey">
-                        <rect key="frame" x="44" y="6" width="32" height="32"/>
-                        <view key="contentView" id="RTk-9m-YhG">
-                            <rect key="frame" x="1" y="1" width="30" height="30"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        </view>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="32" id="9WC-Ik-xZJ"/>
-                            <constraint firstAttribute="height" constant="32" id="ihk-JP-ahC"/>
-                        </constraints>
-                    </box>
-                </subviews>
-                <constraints>
-                    <constraint firstItem="8sX-b4-Aey" firstAttribute="leading" secondItem="3Kr-0B-Fdf" secondAttribute="trailing" constant="4" id="Q3B-JQ-c9M"/>
-                    <constraint firstItem="8sX-b4-Aey" firstAttribute="centerY" secondItem="3Kr-0B-Fdf" secondAttribute="centerY" id="TZK-jI-BCI"/>
-                    <constraint firstItem="3Kr-0B-Fdf" firstAttribute="centerY" secondItem="se5-gp-TjO" secondAttribute="centerY" id="hkM-Oi-En1"/>
-                    <constraint firstItem="3Kr-0B-Fdf" firstAttribute="leading" secondItem="se5-gp-TjO" secondAttribute="leading" constant="8" id="nZW-em-3JS"/>
-                </constraints>
-            </view>
-            <connections>
-                <outlet property="delegate" destination="-2" id="0bl-1N-AYu"/>
-            </connections>
-            <point key="canvasLocation" x="138" y="144"/>
-        </window>
-    </objects>
-</document>

+ 0 - 391
PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/EditPDF/Window/KMEditPDFPopToolBarWindow.swift

@@ -1,391 +0,0 @@
-//
-//  KMEditPDFPopToolBarWindow.swift
-//  PDF Reader Pro
-//
-//  Created by tangchao on 2024/6/25.
-//
-
-import Cocoa
-
-@objcMembers class KMEditPDFPopToolBarWindow: NSWindow {
-    static let shared = KMEditPDFPopToolBarWindow()
-    
-    var style: KMEditPDFToolbarStyle = .text
-    var isMultiple: Bool = false
-    
-    let model = KMEditPDFModel()
-    
-    var itemClick: ((KMEditPDFToolbarItemKey, Any?)->Void)?
-    
-    convenience init() {
-        let rect = NSRect(x: 0, y: 0, width: 400, height: 44)
-        let styleMask: NSWindow.StyleMask = [.fullSizeContentView]
-        self.init(contentRect: rect, styleMask: styleMask, backing: .buffered, defer: false)
-    }
-    
-    override init(contentRect: NSRect, styleMask style: NSWindow.StyleMask, backing backingStoreType: NSWindow.BackingStoreType, defer flag: Bool) {
-        super.init(contentRect: contentRect, styleMask: style, backing: backingStoreType, defer: flag)
-        
-        let contentViewC = KMEditPDFPopToolBarController()
-        self.contentViewController = contentViewC
-        
-        self.titlebarAppearsTransparent = true
-        self.titleVisibility = .hidden
-//        self.level = .popUpMenu
-//        self.isMovableByWindowBackground = false
-        self.isMovable = false
-        
-        self.contentView?.wantsLayer = true
-        self.contentView?.layer?.cornerRadius = 4
-        self.contentView?.layer?.masksToBounds = true
-        
-        self.backgroundColor = .clear
-        
-        contentViewC.itemClick = { [weak self] itemKey, obj in
-            self?.itemClick?(itemKey, obj)
-        }
-    }
-    
-    func show(relativeTo positioningRect: NSRect, of positioningView: NSView, preferredEdge: NSRectEdge) {
-        let contentViewC = (self.contentViewController as? KMEditPDFPopToolBarController)
-        contentViewC?.fontColor = self.model.fontColors.last ?? .black
-        contentViewC?.areaCount = self.model.editingAreas?.count ?? 0
-//        contentViewC?.toolbarView?.reloadData()
-        
-        var width: CGFloat = 392
-        if self.style.contains(.text) {
-            if self.style.contains(.image) { // text + image
-                contentViewC?.itemKeys = [.alignmentLeft, .alignmentCenterX, .alignmentRight, .alignmentjustifiedX, .alignmentTop, .alignmentCenterY, .alignmentBottom, .alignmentjustifiedY]
-                var datas: [KMEditPDFToolbarModel] = []
-                for key in contentViewC?.itemKeys ?? [] {
-                    let model = KMEditPDFToolbarModel()
-                    model.itemKey = key
-                    if key == .alignmentjustifiedX || key == .alignmentjustifiedY {
-                        let areas = self.model.editingAreas ?? []
-                        model.isEnabled = areas.count > 2 
-                    }
-                    datas.append(model)
-                }
-                contentViewC?.datas = datas
-                width = 320-36
-            } else { // text
-                if self.isMultiple {
-                    width = 478
-                    contentViewC?.itemKeys = [.color, .fontStyle, .fontAdd, .fontReduce, .fontBold, .fontItalic, .textAlignment, .separator, .alignmentLeft, .alignmentTop]
-                    var datas: [KMEditPDFToolbarModel] = []
-                    for key in contentViewC?.itemKeys ?? [] {
-                        let model = KMEditPDFToolbarModel()
-                        model.itemKey = key
-                        if key == .color {
-                            model.isEnabled = self.model.editAreasFontColorIsEqual()
-                        } else if key == .fontStyle {
-                            if self.model.editAreasFontNameIsEqual() {
-                                model.isEnabled = true
-                                model.fontName = self.model.fontNames.first
-                            } else {
-                                model.isEnabled = false
-                                model.fontName = nil
-                            }
-                        } else if key == .fontAdd {
-                            model.isEnabled = self._fontSizeItemIsEnabled()
-                        } else if key == .fontReduce {
-                            model.isEnabled = self._fontSizeItemIsEnabled()
-                        } else if key == .fontBold {
-                            model.isEnabled = self.model.editAreasFontBoldIsEqual()
-                            if self.model.editAreasFontBoldIsEqual() {
-                                model.isSelected = self.model.fontBolds.first ?? false
-                            }
-                        } else if key == .fontItalic {
-                            model.isEnabled = self.model.editAreasFontItalicIsEqual()
-                            if self.model.editAreasFontItalicIsEqual() {
-                                model.isSelected = self.model.fontItalics.first ?? false
-                            }
-                        } else if key == .textAlignment {
-//                            model.isEnabled = self.model.editAreasTextAlignmentIsEqual()
-                            if let data = self._fetchTextAlign() {
-                                model.textAlign = data
-                            }
-//                            model.isSelected = true
-                        }
-                        datas.append(model)
-                    }
-                    contentViewC?.datas = datas
-                } else {
-                    var needUpdateData = false
-                    
-                    width = 392
-                    contentViewC?.itemKeys = [.color, .fontStyle, .fontAdd, .fontReduce, .fontBold, .fontItalic, .textAlignment]
-                    let keyCnt = contentViewC?.itemKeys.count ?? 0
-                    let dataCnt = contentViewC?.datas.count ?? 0
-                    if dataCnt == 0 || dataCnt != keyCnt {
-                        needUpdateData = true
-                    }
-                    
-                    var datas: [KMEditPDFToolbarModel] = []
-                    for key in contentViewC?.itemKeys ?? [] {
-                        let model = KMEditPDFToolbarModel()
-                        model.itemKey = key
-                        if key == .color {
-                            model.isEnabled = self.model.editAreasFontColorIsEqual()
-                        } else if key == .fontStyle {
-                            if self.model.editAreasFontNameIsEqual() {
-                                model.isEnabled = true
-                                model.fontName = self.model.fontNames.first
-                                
-                                if model.fontName != self._fetchCurrentFontName() {
-                                    needUpdateData = true
-                                }
-                            } else {
-                                model.isEnabled = false
-//                                model.fontName = "Helvetica"
-                                model.fontName = "--"
-                            }
-                        } else if key == .fontAdd {
-                            model.isEnabled = self._fontSizeItemIsEnabled()
-                        } else if key == .fontReduce {
-                            model.isEnabled = self._fontSizeItemIsEnabled()
-                        } else if key == .fontBold {
-                            model.isEnabled = self.model.editAreasFontBoldIsEqual()
-                            model.isSelected = self.model.fontBolds.first ?? false
-                            model.isChanged = model.isSelected != self._fetchCurrentBoldIsSelected()
-                            
-                            if model.isSelected != self._fetchCurrentBoldIsSelected() {
-                                needUpdateData = true
-                            }
-                        } else if key == .fontItalic {
-                            model.isEnabled = self.model.editAreasFontItalicIsEqual()
-                            model.isSelected = self.model.fontItalics.first ?? false
-                            
-                            if model.isSelected != self._fetchCurrentItalicIsSelected() {
-                                needUpdateData = true
-                            }
-                        } else if key == .textAlignment {
-//                            model.isEnabled = self.model.editAreasTextAlignmentIsEqual()
-                            if let data = self._fetchTextAlign() {
-                                model.textAlign = data
-                            }
-//                            model.isSelected = true
-                            
-                            if model.textAlign != self._fetchCurrentTextAlign() {
-                                needUpdateData = true
-                            }
-                        }
-                        datas.append(model)
-                        
-                        if key == .fontAdd || key == .fontReduce {
-                            if let item = self._fetchCurrentItem(itemKey: key) {
-                                if item.isEnabled != model.isEnabled {
-                                    needUpdateData = true
-                                }
-                            }
-                        }
-                    }
-                    
-                    if needUpdateData {
-                        contentViewC?.datas = datas
-                    }
-                }
-            }
-        } else {
-            if self.style.contains(.image) { // image
-                if self.isMultiple {
-                    width = 396-20
-                    contentViewC?.itemKeys = [.leftRotate, .rightRotate, .separator, .reverseX, .reverseY, .separator, .crop, .replace, .export, .separator, .alignmentLeft, .alignmentTop]
-                    var datas: [KMEditPDFToolbarModel] = []
-                    for key in contentViewC?.itemKeys ?? [] {
-                        let model = KMEditPDFToolbarModel()
-                        model.itemKey = key
-                        if key == .crop {
-                            model.isEnabled = !self.isMultiple
-                        } else if key == .replace {
-                            model.isEnabled = !self.isMultiple
-                        }
-                        datas.append(model)
-                    }
-                    contentViewC?.datas = datas
-                } else {
-                    width = 304-16
-                    contentViewC?.itemKeys = [.leftRotate, .rightRotate, .separator, .reverseX, .reverseY, .separator, .crop, .replace, .export]
-                    var datas: [KMEditPDFToolbarModel] = []
-                    for key in contentViewC?.itemKeys ?? [] {
-                        let model = KMEditPDFToolbarModel()
-                        model.itemKey = key
-                        if key == .crop {
-                            model.isEnabled = !self.isMultiple
-                        }
-                        datas.append(model)
-                    }
-                    contentViewC?.datas = datas
-                }
-            } else { // none
-                
-            }
-        }
-        
-        let winFrame = positioningView.window?.frame ?? .zero
-        var position = positioningView.convert(positioningRect.origin, to: nil)
-        position.x += winFrame.origin.x
-        position.y += winFrame.origin.y
-        position.y += positioningRect.size.height
-        position.y += 26
-        position.x += (positioningRect.size.width*0.5-width*0.5)
-//        var x = max(0, position.x)
-        var x = max(winFrame.origin.x, position.x)
-        let offsetX = x + width - NSMaxX(winFrame)
-        if offsetX > 0 { // 超出右编辑
-            x -= offsetX
-        }
-        var y = max(0, position.y)
-        
-        let screenFrame = NSScreen.main?.frame ?? .zero
-        if y + 44 + 40 >= screenFrame.size.height {
-            y = screenFrame.size.height - 44 - 40
-        }
-        let frame = NSMakeRect(x, y, width, 44)
-        self.setFrame(frame, display: true)
-        
-        self.contentViewController?.view.frame = NSMakeRect(0, 0, width, 44)
-        self.orderFront(nil)
-//        self.makeKeyAndOrderFront(nil)
-    }
-    
-    override var isMainWindow: Bool {
-        return true
-    }
-    
-    override var isKeyWindow: Bool {
-        return true
-    }
-    
-    func updateFontColor(fontColor: NSColor?) {
-        if self.isVisible {
-            let contentViewC = self.contentViewController as? KMEditPDFPopToolBarController
-            contentViewC?.fontColor = fontColor
-            for model in contentViewC?.datas ?? [] {
-                if model.itemKey == .color {
-                    model.isEnabled = fontColor != nil
-                    contentViewC?.toolbarView?.reloadData()
-                    break;
-                }
-            }
-        }
-    }
-    
-    func updateTextAlign(align: NSTextAlignment) {
-        if self.isVisible {
-            let contentViewC = self.contentViewController as? KMEditPDFPopToolBarController
-            for model in contentViewC?.datas ?? [] {
-                if model.itemKey == .textAlignment {
-                    if model.textAlign == align {
-                        break;
-                    }
-                    model.textAlign = align
-                    contentViewC?.toolbarView?.reloadData()
-                    break;
-                }
-            }
-        }
-    }
-    
-    func updateFontSizeButtons(enable: Bool) {
-        if self.isVisible {
-            let contentViewC = self.contentViewController as? KMEditPDFPopToolBarController
-            for model in contentViewC?.datas ?? [] {
-                if model.itemKey == .fontAdd || model.itemKey == .fontReduce {
-                    model.isEnabled = enable
-                }
-            }
-            contentViewC?.toolbarView?.reloadData()
-        }
-    }
-    
-    // MARK: - Private Methods
-    
-    private func _fetchCurrentItem(itemKey: KMEditPDFToolbarItemKey) -> KMEditPDFToolbarModel? {
-        guard let contentC = self.contentViewController as? KMEditPDFPopToolBarController else {
-            return nil
-        }
-        for model in contentC.datas {
-            if model.itemKey == itemKey {
-                return model
-            }
-        }
-        return nil
-    }
-    
-    private func _fontSizeItemIsEnabled() -> Bool {
-        if self.model.editAreasFontSizeIsEqual() {
-            if let fontSize = self.model.fontSizes.first, fontSize == -1 {
-                return false
-            } else {
-                return true
-            }
-        } else {
-            return false
-        }
-    }
-    
-    private func _fetchTextAlign() -> NSTextAlignment? {
-        if self.model.editAreasTextAlignmentIsEqual() {
-            return self.model.textAlignments.first
-        }
-        return nil
-    }
-    
-    private func _fetchCurrentBoldIsSelected() -> Bool {
-        guard let contentC = self.contentViewController as? KMEditPDFPopToolBarController else {
-            return false
-        }
-        for model in contentC.datas {
-            if model.itemKey == .fontBold {
-                return model.isSelected
-            }
-        }
-        return false
-    }
-    
-    private func _fetchCurrentItalicIsSelected() -> Bool {
-        guard let contentC = self.contentViewController as? KMEditPDFPopToolBarController else {
-            return false
-        }
-        for model in contentC.datas {
-            if model.itemKey == .fontItalic {
-                return model.isSelected
-            }
-        }
-        return false
-    }
-    
-    private func _fetchCurrentTextAlign() -> NSTextAlignment? {
-        guard let contentC = self.contentViewController as? KMEditPDFPopToolBarController else {
-            return nil
-        }
-        for model in contentC.datas {
-            if model.itemKey == .textAlignment {
-                return model.textAlign
-            }
-        }
-        return nil
-    }
-    
-    private func _fetchCurrentFontName() -> String? {
-        guard let contentC = self.contentViewController as? KMEditPDFPopToolBarController else {
-            return nil
-        }
-        for model in contentC.datas {
-            if model.itemKey == .fontStyle {
-                return model.fontName
-            }
-        }
-        return nil
-    }
-}
-
-extension KMEditPDFPopToolBarWindow: KMInterfaceThemeChangedProtocol {
-    func interfaceThemeDidChanged(_ appearance: NSAppearance.Name) {
-        self.appearance = .init(named: appearance)
-        
-        self.contentViewController?.interfaceThemeDidChanged(appearance)
-    }
-}
-

+ 0 - 216
PDF Office/PDF Reader Pro.xcodeproj/project.pbxproj

@@ -2131,12 +2131,6 @@
 		ADBC376629CD86A000D93208 /* KMReadModelView.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = ADBC376529CD86A000D93208 /* KMReadModelView.xcassets */; };
 		ADBC376729CD86A000D93208 /* KMReadModelView.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = ADBC376529CD86A000D93208 /* KMReadModelView.xcassets */; };
 		ADBC376829CD86A000D93208 /* KMReadModelView.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = ADBC376529CD86A000D93208 /* KMReadModelView.xcassets */; };
-		ADC31FA62A0E0C1A00ED44A2 /* KMEditPropertyAlignmentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADC31FA52A0E0C1A00ED44A2 /* KMEditPropertyAlignmentView.swift */; };
-		ADC31FA72A0E0C1A00ED44A2 /* KMEditPropertyAlignmentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADC31FA52A0E0C1A00ED44A2 /* KMEditPropertyAlignmentView.swift */; };
-		ADC31FA82A0E0C1A00ED44A2 /* KMEditPropertyAlignmentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADC31FA52A0E0C1A00ED44A2 /* KMEditPropertyAlignmentView.swift */; };
-		ADC31FAC2A0E0C3900ED44A2 /* KMEditPropertyAlignmentView.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADC31FAB2A0E0C3900ED44A2 /* KMEditPropertyAlignmentView.xib */; };
-		ADC31FAD2A0E0C3900ED44A2 /* KMEditPropertyAlignmentView.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADC31FAB2A0E0C3900ED44A2 /* KMEditPropertyAlignmentView.xib */; };
-		ADC31FAE2A0E0C3900ED44A2 /* KMEditPropertyAlignmentView.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADC31FAB2A0E0C3900ED44A2 /* KMEditPropertyAlignmentView.xib */; };
 		ADCFFC0629C04617007D3657 /* BOTA.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = ADCFFC0529C04617007D3657 /* BOTA.xcassets */; };
 		ADCFFC0729C04617007D3657 /* BOTA.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = ADCFFC0529C04617007D3657 /* BOTA.xcassets */; };
 		ADCFFC0829C04617007D3657 /* BOTA.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = ADCFFC0529C04617007D3657 /* BOTA.xcassets */; };
@@ -3404,12 +3398,6 @@
 		BB3D076C2CD08FDB00EB94DF /* KMSplitPDFViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB3D07682CD08FDB00EB94DF /* KMSplitPDFViewController.xib */; };
 		BB3D076D2CD08FDB00EB94DF /* KMSplitPDFViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB3D07682CD08FDB00EB94DF /* KMSplitPDFViewController.xib */; };
 		BB3D076E2CD08FDB00EB94DF /* KMSplitPDFViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB3D07682CD08FDB00EB94DF /* KMSplitPDFViewController.xib */; };
-		BB3D1EB22C3EAE5B001D1BBE /* KMAlignmentController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB3D1EB02C3EAE5B001D1BBE /* KMAlignmentController.swift */; };
-		BB3D1EB32C3EAE5B001D1BBE /* KMAlignmentController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB3D1EB02C3EAE5B001D1BBE /* KMAlignmentController.swift */; };
-		BB3D1EB42C3EAE5B001D1BBE /* KMAlignmentController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB3D1EB02C3EAE5B001D1BBE /* KMAlignmentController.swift */; };
-		BB3D1EB52C3EAE5B001D1BBE /* KMAlignmentController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB3D1EB12C3EAE5B001D1BBE /* KMAlignmentController.xib */; };
-		BB3D1EB62C3EAE5B001D1BBE /* KMAlignmentController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB3D1EB12C3EAE5B001D1BBE /* KMAlignmentController.xib */; };
-		BB3D1EB72C3EAE5B001D1BBE /* KMAlignmentController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB3D1EB12C3EAE5B001D1BBE /* KMAlignmentController.xib */; };
 		BB3D970A2B2FEAC8007094C8 /* KMPDFRedactViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB3D97092B2FEAC8007094C8 /* KMPDFRedactViewController.swift */; };
 		BB3D970B2B2FEAC8007094C8 /* KMPDFRedactViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB3D97092B2FEAC8007094C8 /* KMPDFRedactViewController.swift */; };
 		BB3D970C2B2FEAC8007094C8 /* KMPDFRedactViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB3D97092B2FEAC8007094C8 /* KMPDFRedactViewController.swift */; };
@@ -3614,30 +3602,6 @@
 		BB52F5782CC236B6007418DB /* KMLinkWebView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB52F5772CC236B6007418DB /* KMLinkWebView.xib */; };
 		BB52F5792CC236B6007418DB /* KMLinkWebView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB52F5772CC236B6007418DB /* KMLinkWebView.xib */; };
 		BB52F57A2CC236B6007418DB /* KMLinkWebView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB52F5772CC236B6007418DB /* KMLinkWebView.xib */; };
-		BB52F57D2CC24481007418DB /* KMLinkPopupBaseView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB52F57C2CC24481007418DB /* KMLinkPopupBaseView.swift */; };
-		BB52F57E2CC24481007418DB /* KMLinkPopupBaseView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB52F57C2CC24481007418DB /* KMLinkPopupBaseView.swift */; };
-		BB52F57F2CC24481007418DB /* KMLinkPopupBaseView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB52F57C2CC24481007418DB /* KMLinkPopupBaseView.swift */; };
-		BB52F5812CC2448C007418DB /* KMLinkPopupBaseView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB52F5802CC2448C007418DB /* KMLinkPopupBaseView.xib */; };
-		BB52F5822CC2448C007418DB /* KMLinkPopupBaseView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB52F5802CC2448C007418DB /* KMLinkPopupBaseView.xib */; };
-		BB52F5832CC2448C007418DB /* KMLinkPopupBaseView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB52F5802CC2448C007418DB /* KMLinkPopupBaseView.xib */; };
-		BB52F5862CC24599007418DB /* KMLinkPopupPageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB52F5852CC24599007418DB /* KMLinkPopupPageView.swift */; };
-		BB52F5872CC24599007418DB /* KMLinkPopupPageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB52F5852CC24599007418DB /* KMLinkPopupPageView.swift */; };
-		BB52F5882CC24599007418DB /* KMLinkPopupPageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB52F5852CC24599007418DB /* KMLinkPopupPageView.swift */; };
-		BB52F58A2CC245A1007418DB /* KMLinkPopupPageView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB52F5892CC245A1007418DB /* KMLinkPopupPageView.xib */; };
-		BB52F58B2CC245A1007418DB /* KMLinkPopupPageView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB52F5892CC245A1007418DB /* KMLinkPopupPageView.xib */; };
-		BB52F58C2CC245A1007418DB /* KMLinkPopupPageView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB52F5892CC245A1007418DB /* KMLinkPopupPageView.xib */; };
-		BB52F58E2CC245AD007418DB /* KMLinkPopupEmailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB52F58D2CC245AD007418DB /* KMLinkPopupEmailView.swift */; };
-		BB52F58F2CC245AD007418DB /* KMLinkPopupEmailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB52F58D2CC245AD007418DB /* KMLinkPopupEmailView.swift */; };
-		BB52F5902CC245AD007418DB /* KMLinkPopupEmailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB52F58D2CC245AD007418DB /* KMLinkPopupEmailView.swift */; };
-		BB52F5922CC245B3007418DB /* KMLinkPopupEmailView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB52F5912CC245B3007418DB /* KMLinkPopupEmailView.xib */; };
-		BB52F5932CC245B3007418DB /* KMLinkPopupEmailView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB52F5912CC245B3007418DB /* KMLinkPopupEmailView.xib */; };
-		BB52F5942CC245B3007418DB /* KMLinkPopupEmailView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB52F5912CC245B3007418DB /* KMLinkPopupEmailView.xib */; };
-		BB52F5962CC245BF007418DB /* KMLinkPopupWebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB52F5952CC245BF007418DB /* KMLinkPopupWebView.swift */; };
-		BB52F5972CC245BF007418DB /* KMLinkPopupWebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB52F5952CC245BF007418DB /* KMLinkPopupWebView.swift */; };
-		BB52F5982CC245BF007418DB /* KMLinkPopupWebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB52F5952CC245BF007418DB /* KMLinkPopupWebView.swift */; };
-		BB52F59A2CC245C8007418DB /* KMLinkPopupWebView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB52F5992CC245C8007418DB /* KMLinkPopupWebView.xib */; };
-		BB52F59B2CC245C8007418DB /* KMLinkPopupWebView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB52F5992CC245C8007418DB /* KMLinkPopupWebView.xib */; };
-		BB52F59C2CC245C8007418DB /* KMLinkPopupWebView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB52F5992CC245C8007418DB /* KMLinkPopupWebView.xib */; };
 		BB570ADB2B512C90005E7E4A /* KMLeftSideViewController+Thumbnail.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB570ADA2B512C90005E7E4A /* KMLeftSideViewController+Thumbnail.swift */; };
 		BB570ADC2B512C90005E7E4A /* KMLeftSideViewController+Thumbnail.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB570ADA2B512C90005E7E4A /* KMLeftSideViewController+Thumbnail.swift */; };
 		BB570ADD2B512C90005E7E4A /* KMLeftSideViewController+Thumbnail.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB570ADA2B512C90005E7E4A /* KMLeftSideViewController+Thumbnail.swift */; };
@@ -3709,18 +3673,6 @@
 		BB5DA54D2BCFF4B300849E86 /* KMPageEditPopViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB5DA5482BCFF4B200849E86 /* KMPageEditPopViewController.xib */; };
 		BB5DA54E2BCFF4B300849E86 /* KMPageEditPopViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB5DA5482BCFF4B200849E86 /* KMPageEditPopViewController.xib */; };
 		BB5DA54F2BCFF4B300849E86 /* KMPageEditPopViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB5DA5482BCFF4B200849E86 /* KMPageEditPopViewController.xib */; };
-		BB5E2EF92C2BF3FF00657A61 /* KMEditPDFCropComfirmWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB5E2EF72C2BF3FF00657A61 /* KMEditPDFCropComfirmWindowController.swift */; };
-		BB5E2EFA2C2BF3FF00657A61 /* KMEditPDFCropComfirmWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB5E2EF72C2BF3FF00657A61 /* KMEditPDFCropComfirmWindowController.swift */; };
-		BB5E2EFB2C2BF3FF00657A61 /* KMEditPDFCropComfirmWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB5E2EF72C2BF3FF00657A61 /* KMEditPDFCropComfirmWindowController.swift */; };
-		BB5E2EFC2C2BF3FF00657A61 /* KMEditPDFCropComfirmWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB5E2EF82C2BF3FF00657A61 /* KMEditPDFCropComfirmWindowController.xib */; };
-		BB5E2EFD2C2BF3FF00657A61 /* KMEditPDFCropComfirmWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB5E2EF82C2BF3FF00657A61 /* KMEditPDFCropComfirmWindowController.xib */; };
-		BB5E2EFE2C2BF3FF00657A61 /* KMEditPDFCropComfirmWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB5E2EF82C2BF3FF00657A61 /* KMEditPDFCropComfirmWindowController.xib */; };
-		BB5EC3622C2BDC9D0090EF27 /* KMTextAlignmentController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB5EC3602C2BDC9D0090EF27 /* KMTextAlignmentController.swift */; };
-		BB5EC3632C2BDC9D0090EF27 /* KMTextAlignmentController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB5EC3602C2BDC9D0090EF27 /* KMTextAlignmentController.swift */; };
-		BB5EC3642C2BDC9D0090EF27 /* KMTextAlignmentController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB5EC3602C2BDC9D0090EF27 /* KMTextAlignmentController.swift */; };
-		BB5EC3652C2BDC9D0090EF27 /* KMTextAlignmentController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB5EC3612C2BDC9D0090EF27 /* KMTextAlignmentController.xib */; };
-		BB5EC3662C2BDC9D0090EF27 /* KMTextAlignmentController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB5EC3612C2BDC9D0090EF27 /* KMTextAlignmentController.xib */; };
-		BB5EC3672C2BDC9D0090EF27 /* KMTextAlignmentController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB5EC3612C2BDC9D0090EF27 /* KMTextAlignmentController.xib */; };
 		BB5F8A0E29BB04F000365ADB /* GBDeviceInfo_OSX.m in Sources */ = {isa = PBXBuildFile; fileRef = BB5F8A0529BB04EF00365ADB /* GBDeviceInfo_OSX.m */; };
 		BB5F8A0F29BB04F000365ADB /* GBDeviceInfo_OSX.m in Sources */ = {isa = PBXBuildFile; fileRef = BB5F8A0529BB04EF00365ADB /* GBDeviceInfo_OSX.m */; };
 		BB5F8A1029BB04F000365ADB /* GBDeviceInfo_OSX.m in Sources */ = {isa = PBXBuildFile; fileRef = BB5F8A0529BB04EF00365ADB /* GBDeviceInfo_OSX.m */; };
@@ -3849,12 +3801,6 @@
 		BB69C962299116FD0001A9B1 /* horizontal_line.pdf in Resources */ = {isa = PBXBuildFile; fileRef = BB69C95B299116FD0001A9B1 /* horizontal_line.pdf */; };
 		BB69C963299116FD0001A9B1 /* horizontal_line.pdf in Resources */ = {isa = PBXBuildFile; fileRef = BB69C95B299116FD0001A9B1 /* horizontal_line.pdf */; };
 		BB69C964299116FD0001A9B1 /* horizontal_line.pdf in Resources */ = {isa = PBXBuildFile; fileRef = BB69C95B299116FD0001A9B1 /* horizontal_line.pdf */; };
-		BB6AAF532C2175A3009C4CB1 /* KMEditPDFPopToolBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB6AAF512C2175A3009C4CB1 /* KMEditPDFPopToolBarController.swift */; };
-		BB6AAF542C2175A3009C4CB1 /* KMEditPDFPopToolBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB6AAF512C2175A3009C4CB1 /* KMEditPDFPopToolBarController.swift */; };
-		BB6AAF552C2175A3009C4CB1 /* KMEditPDFPopToolBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB6AAF512C2175A3009C4CB1 /* KMEditPDFPopToolBarController.swift */; };
-		BB6AAF562C2175A3009C4CB1 /* KMEditPDFPopToolBarController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB6AAF522C2175A3009C4CB1 /* KMEditPDFPopToolBarController.xib */; };
-		BB6AAF572C2175A3009C4CB1 /* KMEditPDFPopToolBarController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB6AAF522C2175A3009C4CB1 /* KMEditPDFPopToolBarController.xib */; };
-		BB6AAF582C2175A3009C4CB1 /* KMEditPDFPopToolBarController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB6AAF522C2175A3009C4CB1 /* KMEditPDFPopToolBarController.xib */; };
 		BB6B43662A04919200E02B54 /* KMBaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB6B43652A04919200E02B54 /* KMBaseViewController.swift */; };
 		BB6B43672A04919200E02B54 /* KMBaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB6B43652A04919200E02B54 /* KMBaseViewController.swift */; };
 		BB6B43682A04919200E02B54 /* KMBaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB6B43652A04919200E02B54 /* KMBaseViewController.swift */; };
@@ -3948,18 +3894,6 @@
 		BB716D732CDDB73B009787ED /* KMHeaderFooterController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB716D6F2CDDB73B009787ED /* KMHeaderFooterController.xib */; };
 		BB716D742CDDB73B009787ED /* KMHeaderFooterController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB716D6F2CDDB73B009787ED /* KMHeaderFooterController.xib */; };
 		BB716D752CDDB73B009787ED /* KMHeaderFooterController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB716D6F2CDDB73B009787ED /* KMHeaderFooterController.xib */; };
-		BB7185382C2B0A1100C1156B /* KMEditPDFPopToolBarWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB7185372C2B0A1100C1156B /* KMEditPDFPopToolBarWindow.swift */; };
-		BB7185392C2B0A1100C1156B /* KMEditPDFPopToolBarWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB7185372C2B0A1100C1156B /* KMEditPDFPopToolBarWindow.swift */; };
-		BB71853A2C2B0A1100C1156B /* KMEditPDFPopToolBarWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB7185372C2B0A1100C1156B /* KMEditPDFPopToolBarWindow.swift */; };
-		BB71853D2C2B0A7C00C1156B /* KMEditPDFToolbarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB71853C2C2B0A7C00C1156B /* KMEditPDFToolbarView.swift */; };
-		BB71853E2C2B0A7C00C1156B /* KMEditPDFToolbarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB71853C2C2B0A7C00C1156B /* KMEditPDFToolbarView.swift */; };
-		BB71853F2C2B0A7C00C1156B /* KMEditPDFToolbarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB71853C2C2B0A7C00C1156B /* KMEditPDFToolbarView.swift */; };
-		BB7185412C2B0AAF00C1156B /* KMEditPDFToolbarItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB7185402C2B0AAF00C1156B /* KMEditPDFToolbarItemView.swift */; };
-		BB7185422C2B0AAF00C1156B /* KMEditPDFToolbarItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB7185402C2B0AAF00C1156B /* KMEditPDFToolbarItemView.swift */; };
-		BB7185432C2B0AAF00C1156B /* KMEditPDFToolbarItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB7185402C2B0AAF00C1156B /* KMEditPDFToolbarItemView.swift */; };
-		BB7185452C2B0AFD00C1156B /* KMEditPDFColorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB7185442C2B0AFC00C1156B /* KMEditPDFColorView.swift */; };
-		BB7185462C2B0AFD00C1156B /* KMEditPDFColorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB7185442C2B0AFC00C1156B /* KMEditPDFColorView.swift */; };
-		BB7185472C2B0AFD00C1156B /* KMEditPDFColorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB7185442C2B0AFC00C1156B /* KMEditPDFColorView.swift */; };
 		BB71854A2C2B0DC500C1156B /* KMEditPDFModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB7185492C2B0DC500C1156B /* KMEditPDFModel.swift */; };
 		BB71854B2C2B0DC500C1156B /* KMEditPDFModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB7185492C2B0DC500C1156B /* KMEditPDFModel.swift */; };
 		BB71854C2C2B0DC500C1156B /* KMEditPDFModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB7185492C2B0DC500C1156B /* KMEditPDFModel.swift */; };
@@ -6483,8 +6417,6 @@
 		ADBC376529CD86A000D93208 /* KMReadModelView.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = KMReadModelView.xcassets; sourceTree = "<group>"; };
 		ADC076112987F068006C752F /* PDF-Reader-Pro-Edition-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "PDF-Reader-Pro-Edition-Info.plist"; sourceTree = SOURCE_ROOT; };
 		ADC076122987F06A006C752F /* PDF-Reader-Pro-DMG-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "PDF-Reader-Pro-DMG-Info.plist"; sourceTree = SOURCE_ROOT; };
-		ADC31FA52A0E0C1A00ED44A2 /* KMEditPropertyAlignmentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMEditPropertyAlignmentView.swift; sourceTree = "<group>"; };
-		ADC31FAB2A0E0C3900ED44A2 /* KMEditPropertyAlignmentView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMEditPropertyAlignmentView.xib; sourceTree = "<group>"; };
 		ADCFFC0529C04617007D3657 /* BOTA.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = BOTA.xcassets; sourceTree = "<group>"; };
 		ADD1B6A92941E97F00C3FFF7 /* KMPrintWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMPrintWindowController.swift; sourceTree = "<group>"; };
 		ADD1B6AA2941E97F00C3FFF7 /* KMPrintWindowController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMPrintWindowController.xib; sourceTree = "<group>"; };
@@ -6994,8 +6926,6 @@
 		BB3D07622CD0821F00EB94DF /* KMPDFSplitView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMPDFSplitView.swift; sourceTree = "<group>"; };
 		BB3D07672CD08FDB00EB94DF /* KMSplitPDFViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMSplitPDFViewController.swift; sourceTree = "<group>"; };
 		BB3D07682CD08FDB00EB94DF /* KMSplitPDFViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMSplitPDFViewController.xib; sourceTree = "<group>"; };
-		BB3D1EB02C3EAE5B001D1BBE /* KMAlignmentController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMAlignmentController.swift; sourceTree = "<group>"; };
-		BB3D1EB12C3EAE5B001D1BBE /* KMAlignmentController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMAlignmentController.xib; sourceTree = "<group>"; };
 		BB3D97092B2FEAC8007094C8 /* KMPDFRedactViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMPDFRedactViewController.swift; sourceTree = "<group>"; };
 		BB3D970D2B2FEAF7007094C8 /* KMPDFRedactViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KMPDFRedactViewController.xib; sourceTree = "<group>"; };
 		BB3D97112B301CF1007094C8 /* KMRedactPDFView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMRedactPDFView.swift; sourceTree = "<group>"; };
@@ -7067,14 +6997,6 @@
 		BB52F56F2CC236A2007418DB /* KMLinkEmailView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMLinkEmailView.xib; sourceTree = "<group>"; };
 		BB52F5732CC236B1007418DB /* KMLinkWebView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMLinkWebView.swift; sourceTree = "<group>"; };
 		BB52F5772CC236B6007418DB /* KMLinkWebView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMLinkWebView.xib; sourceTree = "<group>"; };
-		BB52F57C2CC24481007418DB /* KMLinkPopupBaseView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMLinkPopupBaseView.swift; sourceTree = "<group>"; };
-		BB52F5802CC2448C007418DB /* KMLinkPopupBaseView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMLinkPopupBaseView.xib; sourceTree = "<group>"; };
-		BB52F5852CC24599007418DB /* KMLinkPopupPageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMLinkPopupPageView.swift; sourceTree = "<group>"; };
-		BB52F5892CC245A1007418DB /* KMLinkPopupPageView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMLinkPopupPageView.xib; sourceTree = "<group>"; };
-		BB52F58D2CC245AD007418DB /* KMLinkPopupEmailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMLinkPopupEmailView.swift; sourceTree = "<group>"; };
-		BB52F5912CC245B3007418DB /* KMLinkPopupEmailView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMLinkPopupEmailView.xib; sourceTree = "<group>"; };
-		BB52F5952CC245BF007418DB /* KMLinkPopupWebView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMLinkPopupWebView.swift; sourceTree = "<group>"; };
-		BB52F5992CC245C8007418DB /* KMLinkPopupWebView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMLinkPopupWebView.xib; sourceTree = "<group>"; };
 		BB56D4002BFC92EE004E4DF4 /* PDF Reader Pro DMG.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "PDF Reader Pro DMG.entitlements"; sourceTree = "<group>"; };
 		BB570ADA2B512C90005E7E4A /* KMLeftSideViewController+Thumbnail.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "KMLeftSideViewController+Thumbnail.swift"; sourceTree = "<group>"; };
 		BB570ADE2B513A66005E7E4A /* KMLeftSideViewController+Snapshot.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "KMLeftSideViewController+Snapshot.swift"; sourceTree = "<group>"; };
@@ -7101,10 +7023,6 @@
 		BB5DA5472BCFF4B200849E86 /* KMPageEditPopViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMPageEditPopViewController.m; sourceTree = "<group>"; };
 		BB5DA5482BCFF4B200849E86 /* KMPageEditPopViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KMPageEditPopViewController.xib; sourceTree = "<group>"; };
 		BB5DA5492BCFF4B200849E86 /* KMPageEditPopViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMPageEditPopViewController.h; sourceTree = "<group>"; };
-		BB5E2EF72C2BF3FF00657A61 /* KMEditPDFCropComfirmWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMEditPDFCropComfirmWindowController.swift; sourceTree = "<group>"; };
-		BB5E2EF82C2BF3FF00657A61 /* KMEditPDFCropComfirmWindowController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMEditPDFCropComfirmWindowController.xib; sourceTree = "<group>"; };
-		BB5EC3602C2BDC9D0090EF27 /* KMTextAlignmentController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMTextAlignmentController.swift; sourceTree = "<group>"; };
-		BB5EC3612C2BDC9D0090EF27 /* KMTextAlignmentController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMTextAlignmentController.xib; sourceTree = "<group>"; };
 		BB5F8A0529BB04EF00365ADB /* GBDeviceInfo_OSX.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GBDeviceInfo_OSX.m; sourceTree = "<group>"; };
 		BB5F8A0629BB04EF00365ADB /* GBDeviceInfo_Common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GBDeviceInfo_Common.h; sourceTree = "<group>"; };
 		BB5F8A0729BB04EF00365ADB /* GBDeviceInfoTypes_Common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GBDeviceInfoTypes_Common.h; sourceTree = "<group>"; };
@@ -7178,8 +7096,6 @@
 		BB69C959299116FD0001A9B1 /* five_line_score.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = five_line_score.pdf; sourceTree = "<group>"; };
 		BB69C95A299116FD0001A9B1 /* plaid.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = plaid.pdf; sourceTree = "<group>"; };
 		BB69C95B299116FD0001A9B1 /* horizontal_line.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = horizontal_line.pdf; sourceTree = "<group>"; };
-		BB6AAF512C2175A3009C4CB1 /* KMEditPDFPopToolBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMEditPDFPopToolBarController.swift; sourceTree = "<group>"; };
-		BB6AAF522C2175A3009C4CB1 /* KMEditPDFPopToolBarController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMEditPDFPopToolBarController.xib; sourceTree = "<group>"; };
 		BB6B43652A04919200E02B54 /* KMBaseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMBaseViewController.swift; sourceTree = "<group>"; };
 		BB6B436A2A04935000E02B54 /* KMPDFThumbViewBaseController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMPDFThumbViewBaseController.swift; sourceTree = "<group>"; };
 		BB6B49A42D02A072003ECD26 /* KMPDFSignatureDrawView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMPDFSignatureDrawView.swift; sourceTree = "<group>"; };
@@ -7213,10 +7129,6 @@
 		BB716D672CDDB727009787ED /* KMHeaderPropertyController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMHeaderPropertyController.xib; sourceTree = "<group>"; };
 		BB716D6E2CDDB73B009787ED /* KMHeaderFooterController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMHeaderFooterController.swift; sourceTree = "<group>"; };
 		BB716D6F2CDDB73B009787ED /* KMHeaderFooterController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMHeaderFooterController.xib; sourceTree = "<group>"; };
-		BB7185372C2B0A1100C1156B /* KMEditPDFPopToolBarWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMEditPDFPopToolBarWindow.swift; sourceTree = "<group>"; };
-		BB71853C2C2B0A7C00C1156B /* KMEditPDFToolbarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMEditPDFToolbarView.swift; sourceTree = "<group>"; };
-		BB7185402C2B0AAF00C1156B /* KMEditPDFToolbarItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMEditPDFToolbarItemView.swift; sourceTree = "<group>"; };
-		BB7185442C2B0AFC00C1156B /* KMEditPDFColorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMEditPDFColorView.swift; sourceTree = "<group>"; };
 		BB7185492C2B0DC500C1156B /* KMEditPDFModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMEditPDFModel.swift; sourceTree = "<group>"; };
 		BB7256B12CDB816100B6CE64 /* KMBackgroundPropertyController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMBackgroundPropertyController.swift; sourceTree = "<group>"; };
 		BB7256B22CDB816100B6CE64 /* KMBackgroundPropertyController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMBackgroundPropertyController.xib; sourceTree = "<group>"; };
@@ -8569,8 +8481,6 @@
 			children = (
 				AD6260712A9D9695006C6413 /* Source */,
 				BB6AAF4C2C21721B009C4CB1 /* Controller */,
-				BB6AAF592C217F94009C4CB1 /* Window */,
-				BB71853B2C2B0A6900C1156B /* Toolbar */,
 				AD58C0FB2A1F2D3C00F911A0 /* Category */,
 				AD3C6DFA2A1C48600010B1A7 /* Manager */,
 				ADC31FA92A0E0C1E00ED44A2 /* View */,
@@ -10601,21 +10511,10 @@
 			children = (
 				BB4D02A82C22D17B0001474A /* KMEditPDFPopGuideView.swift */,
 				BB6985582C2A94BD007D307D /* KMGuideTargetView.swift */,
-				BB7185442C2B0AFC00C1156B /* KMEditPDFColorView.swift */,
-				ADC31FAA2A0E0C2500ED44A2 /* AlignmentView */,
 			);
 			path = View;
 			sourceTree = "<group>";
 		};
-		ADC31FAA2A0E0C2500ED44A2 /* AlignmentView */ = {
-			isa = PBXGroup;
-			children = (
-				ADC31FA52A0E0C1A00ED44A2 /* KMEditPropertyAlignmentView.swift */,
-				ADC31FAB2A0E0C3900ED44A2 /* KMEditPropertyAlignmentView.xib */,
-			);
-			path = AlignmentView;
-			sourceTree = "<group>";
-		};
 		ADD1B6A82941E94D00C3FFF7 /* Print */ = {
 			isa = PBXGroup;
 			children = (
@@ -12694,7 +12593,6 @@
 				BB52F55A2CC1FB9A007418DB /* KMLinkEmailView */,
 				BB52F5592CC1FB91007418DB /* KMLinkWebView */,
 				BB52F5582CC1FB86007418DB /* KMLinkPageView */,
-				BB52F57B2CC24452007418DB /* PopupViews */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -12726,29 +12624,6 @@
 			path = KMLinkEmailView;
 			sourceTree = "<group>";
 		};
-		BB52F57B2CC24452007418DB /* PopupViews */ = {
-			isa = PBXGroup;
-			children = (
-				BB52F57C2CC24481007418DB /* KMLinkPopupBaseView.swift */,
-				BB52F5802CC2448C007418DB /* KMLinkPopupBaseView.xib */,
-				BB52F5842CC24582007418DB /* views */,
-			);
-			path = PopupViews;
-			sourceTree = "<group>";
-		};
-		BB52F5842CC24582007418DB /* views */ = {
-			isa = PBXGroup;
-			children = (
-				BB52F5852CC24599007418DB /* KMLinkPopupPageView.swift */,
-				BB52F5892CC245A1007418DB /* KMLinkPopupPageView.xib */,
-				BB52F58D2CC245AD007418DB /* KMLinkPopupEmailView.swift */,
-				BB52F5912CC245B3007418DB /* KMLinkPopupEmailView.xib */,
-				BB52F5952CC245BF007418DB /* KMLinkPopupWebView.swift */,
-				BB52F5992CC245C8007418DB /* KMLinkPopupWebView.xib */,
-			);
-			path = views;
-			sourceTree = "<group>";
-		};
 		BB5A9D1F2CB64F1D00F64C1F /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -12972,26 +12847,10 @@
 		BB6AAF4C2C21721B009C4CB1 /* Controller */ = {
 			isa = PBXGroup;
 			children = (
-				BB6AAF512C2175A3009C4CB1 /* KMEditPDFPopToolBarController.swift */,
-				BB5EC3602C2BDC9D0090EF27 /* KMTextAlignmentController.swift */,
-				BB3D1EB02C3EAE5B001D1BBE /* KMAlignmentController.swift */,
-				BB3D1EB12C3EAE5B001D1BBE /* KMAlignmentController.xib */,
-				BB5EC3612C2BDC9D0090EF27 /* KMTextAlignmentController.xib */,
-				BB6AAF522C2175A3009C4CB1 /* KMEditPDFPopToolBarController.xib */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
 		};
-		BB6AAF592C217F94009C4CB1 /* Window */ = {
-			isa = PBXGroup;
-			children = (
-				BB7185372C2B0A1100C1156B /* KMEditPDFPopToolBarWindow.swift */,
-				BB5E2EF72C2BF3FF00657A61 /* KMEditPDFCropComfirmWindowController.swift */,
-				BB5E2EF82C2BF3FF00657A61 /* KMEditPDFCropComfirmWindowController.xib */,
-			);
-			path = Window;
-			sourceTree = "<group>";
-		};
 		BB6B43642A04913200E02B54 /* Base */ = {
 			isa = PBXGroup;
 			children = (
@@ -13111,15 +12970,6 @@
 			path = Model;
 			sourceTree = "<group>";
 		};
-		BB71853B2C2B0A6900C1156B /* Toolbar */ = {
-			isa = PBXGroup;
-			children = (
-				BB71853C2C2B0A7C00C1156B /* KMEditPDFToolbarView.swift */,
-				BB7185402C2B0AAF00C1156B /* KMEditPDFToolbarItemView.swift */,
-			);
-			path = Toolbar;
-			sourceTree = "<group>";
-		};
 		BB7289DE2B8838BC004B53B5 /* DataManager */ = {
 			isa = PBXGroup;
 			children = (
@@ -15132,7 +14982,6 @@
 				BB6EA2942B70AF48000D4490 /* KMConvertCompareViewController.xib in Resources */,
 				BBC5ABE22D01C950008BA0CB /* KMSignatureController.xib in Resources */,
 				9F8810902B56614600F69815 /* KMAnnotationChoiceWidgetAppearanceViewController.xib in Resources */,
-				BB5E2EFC2C2BF3FF00657A61 /* KMEditPDFCropComfirmWindowController.xib in Resources */,
 				BB955EC82CD8ED0F0042FDE1 /* KMNWatermarkTemplateItem.xib in Resources */,
 				AD85D1A72AF09864000F4D28 /* KMHomeQuickToolsWindowController.xib in Resources */,
 				9F0CB48A29683DC400007028 /* KMPropertiesPanelPresetColorSubVC.xib in Resources */,
@@ -15418,7 +15267,6 @@
 				9FDD0F9F2952FF4D000C4DAD /* global.json in Resources */,
 				BB6EA2A32B70B8F2000D4490 /* KMConvertComparePayViewController.xib in Resources */,
 				BB8810972B4F7CD100AFA63E /* KMVerificationTrialViewController.xib in Resources */,
-				BB52F5812CC2448C007418DB /* KMLinkPopupBaseView.xib in Resources */,
 				ADE614B129779C6D00F62ED7 /* KMImageTitleButton.xib in Resources */,
 				BB6B49A92D02A07B003ECD26 /* KMPDFSignatureDrawView.xib in Resources */,
 				BBB3769B2B10A7FD009539CC /* a_2a.png in Resources */,
@@ -15431,7 +15279,6 @@
 				F367D4E22CFD62DB00B0BB4E /* KMNPopOperationWindowController.xib in Resources */,
 				BBDF18182CD4853C00ACDB15 /* KMNWatermarkPropertyController.xib in Resources */,
 				BB1B0B042B4FC6E900889528 /* KMCustomColorGuideView.xib in Resources */,
-				BB6AAF562C2175A3009C4CB1 /* KMEditPDFPopToolBarController.xib in Resources */,
 				ADE86A8D2B02269400414DFA /* KMRemovePasswordWindowController.xib in Resources */,
 				BB4293862D032FE6007ECFF2 /* KMCreateStampTextView.xib in Resources */,
 				8942F7FB2926089200389627 /* KMSignatureViewController.xib in Resources */,
@@ -15530,7 +15377,6 @@
 				BB0FE03A2B734DD1001E0F88 /* AITipIconView.xib in Resources */,
 				BB10FAF22AFE23BE00F18D65 /* LineInspector.xib in Resources */,
 				BB0B2CD82B04AE560088FFD8 /* LeftSideView.xib in Resources */,
-				ADC31FAC2A0E0C3900ED44A2 /* KMEditPropertyAlignmentView.xib in Resources */,
 				BB0782FC2CD0BDD400101C81 /* KMPageNumberPromptView.xib in Resources */,
 				BB6BA4C82B0B4A4200462CAE /* KMLeftSideEmptyFileViewController.xib in Resources */,
 				BB716D632CDDB710009787ED /* KMHFTemplateController.xib in Resources */,
@@ -15552,7 +15398,6 @@
 				ADDF83472B391A5C00A81A4E /* DSignatureCreateInfoViewController.xib in Resources */,
 				BBE0688D2CDDF116000512BC /* KMBatesController.xib in Resources */,
 				AD7D5C982B8F20FE006562CD /* synctex_parser_readme.txt in Resources */,
-				BB3D1EB52C3EAE5B001D1BBE /* KMAlignmentController.xib in Resources */,
 				F35BC6C92CA3AD710022CDE9 /* Texture.bundle in Resources */,
 				ADD56F5A2BB3F48300E87ED9 /* KMFreeTextStylesViewController.xib in Resources */,
 				9F0CB49229683DEE00007028 /* KMPropertiesPanelLineSubVC.xib in Resources */,
@@ -15623,17 +15468,14 @@
 				9FA693AB2987C0590055488A /* KMStepperView.xib in Resources */,
 				BB52F5602CC1FC03007418DB /* KMLinkPageView.xib in Resources */,
 				89E4E6EF2963D1B7002DBA6F /* KMColorPickerViewController.xib in Resources */,
-				BB52F59A2CC245C8007418DB /* KMLinkPopupWebView.xib in Resources */,
 				ADB2D6F2294741720029D2B3 /* KMPrintPaperSetView.xib in Resources */,
 				BB42937D2D030BE3007ECFF2 /* KMCreateStampWindowController.xib in Resources */,
 				BBCB9EA92CCDF65000563AC8 /* KMNDisplayViewController.xib in Resources */,
-				BB52F5922CC245B3007418DB /* KMLinkPopupEmailView.xib in Resources */,
 				9F0CB4822967F64D00007028 /* KMPropertiesPanelReadOnlySubVC.xib in Resources */,
 				BBA8B7A62935CD740097D183 /* KMRemovePasswordAlertWindowController.xib in Resources */,
 				BB51074229A61B4100978662 /* ProgressSheet.xib in Resources */,
 				BBA922382B4E97540061057A /* KMPurchaseFirstTrialWindowController.xib in Resources */,
 				BB451AE02CF5AF9A003E1565 /* KMLineController.xib in Resources */,
-				BB5EC3652C2BDC9D0090EF27 /* KMTextAlignmentController.xib in Resources */,
 				BB42A5D82B8ED7960092C524 /* KMTabbingHintWindowController.xib in Resources */,
 				ADE86AA82B031FFA00414DFA /* KMCompareView.xib in Resources */,
 				BB96A0B42AFCD56B00559E24 /* KMToolCompareWindowController.xib in Resources */,
@@ -15658,7 +15500,6 @@
 				BBFBE6C528DD7B98008B2335 /* Main.storyboard in Resources */,
 				BBB2A9A02CB65C8E0066560B /* KMURLCreatePDFWindowController.xib in Resources */,
 				BB1B0AD42B4FC6E900889528 /* KMFunctionGuideSingleController.xib in Resources */,
-				BB52F58A2CC245A1007418DB /* KMLinkPopupPageView.xib in Resources */,
 				ADDF83532B391A5C00A81A4E /* DSignatureFileListViewController.xib in Resources */,
 				651675EC2CE3313500019A20 /* KMOutlineEditViewController.xib in Resources */,
 				BB5A9D5E2CB6521400F64C1F /* SettingsGeneralView.xib in Resources */,
@@ -15721,7 +15562,6 @@
 				ADAFDA112AE8DD6600F084BC /* KMAdvertisementCollectionHeadView.xib in Resources */,
 				BB2F9AA72AFC8D5A00F9DD93 /* KMProfileInfoWindowController.xib in Resources */,
 				ADD1B6CC2942E85300C3FFF7 /* KMPrintBottomView.xib in Resources */,
-				BB3D1EB62C3EAE5B001D1BBE /* KMAlignmentController.xib in Resources */,
 				9F0CB4732967E63100007028 /* KMPropertiesPanelNameSubVC.xib in Resources */,
 				BBE789002CBD2464008086E2 /* MessageVC.xib in Resources */,
 				AD7D5CDC2B957687006562CD /* KMBookmarkOutlinePageCellView.xib in Resources */,
@@ -15791,7 +15631,6 @@
 				65C9CB022CA16B36009794E5 /* DocumentAI.bundle in Resources */,
 				ADFCEB492B4FBA440001EBAF /* RemoteConfigDefaults.plist in Resources */,
 				9F3D819729A33A290087B5AD /* KMDesignDropdown.xib in Resources */,
-				BB52F5932CC245B3007418DB /* KMLinkPopupEmailView.xib in Resources */,
 				BBC5ABE32D01C950008BA0CB /* KMSignatureController.xib in Resources */,
 				BB03D6912B01C7AB008C9976 /* KMPDFEditInsertBlankPageWindow.xib in Resources */,
 				BBE788822CBD2463008086E2 /* WCCompWindowController.xib in Resources */,
@@ -15851,7 +15690,6 @@
 				AD07BC8F2D02CBA90075054B /* KMCompressSettingViewController.xib in Resources */,
 				BB99ACD3292E2AEF0048AFD9 /* KMMergeCollectionViewItem.xib in Resources */,
 				9F94748029FA24200042F949 /* Credits.rtf in Resources */,
-				BB6AAF572C2175A3009C4CB1 /* KMEditPDFPopToolBarController.xib in Resources */,
 				AD1CA4352A0640FC0070541F /* KMAnnotationScreenHeadView.xib in Resources */,
 				F3EF17932CD5FD4B0007D364 /* KMNLeftSideViewController.xib in Resources */,
 				8997011A28F40898009AF911 /* KMThumbnailViewController.xib in Resources */,
@@ -15943,7 +15781,6 @@
 				9F0CB48B29683DC400007028 /* KMPropertiesPanelPresetColorSubVC.xib in Resources */,
 				BB716D5C2CDDB6F9009787ED /* KMHeaderTemplateItem.xib in Resources */,
 				9F8810A12B5762BD00F69815 /* KMAnnotationButtonOptionsViewController.xib in Resources */,
-				BB52F5822CC2448C007418DB /* KMLinkPopupBaseView.xib in Resources */,
 				89D2D2FF294C806000BFF5FE /* KMPDFThumbnailItem.xib in Resources */,
 				BBA9223C2B4E97540061057A /* KMPurchaseLimitWindowController.xib in Resources */,
 				BB0FE0352B734DD1001E0F88 /* AIConfigWindowController.xib in Resources */,
@@ -15982,7 +15819,6 @@
 				BBD14F5B2CDA02640077D52E /* KMEditToolbarView.xib in Resources */,
 				F3EF17A02CD5FF8D0007D364 /* KMNThumnailHeaderViewController.xib in Resources */,
 				BB955EC02CD8E4600042FDE1 /* KMNWatermarkTemplateController.xib in Resources */,
-				BB5E2EFD2C2BF3FF00657A61 /* KMEditPDFCropComfirmWindowController.xib in Resources */,
 				9FDDFDC02C93E4DD0051B6FC /* paddle.js in Resources */,
 				BB90E4EB2AF347A700B04B9F /* PreferenceWindow.xib in Resources */,
 				BBFA1CDF2B60DC0C0053AD4A /* KMScreenShotMaskViewController.xib in Resources */,
@@ -16000,7 +15836,6 @@
 				BB0FE03B2B734DD1001E0F88 /* AITipIconView.xib in Resources */,
 				BB2EDF74296ECE17003BCF58 /* KMPageEditThumbnailItem.xib in Resources */,
 				BB19A7472CB7B7A0008204DC /* KMHomeFilesHeaderView.xib in Resources */,
-				BB52F59B2CC245C8007418DB /* KMLinkPopupWebView.xib in Resources */,
 				ADFA8F012B5649AE002595A4 /* KMAutoFlowOptionsSheetController.xib in Resources */,
 				BB5BE4F22B060EB500D51BF2 /* KMLanguageViewController.xib in Resources */,
 				BBA2109129ACBFDB00E6B346 /* nosign.pdf in Resources */,
@@ -16024,7 +15859,6 @@
 				BB031B642C47BB080099F7AD /* KMUserFeekbackWindowController.xib in Resources */,
 				BB42937E2D030BE3007ECFF2 /* KMCreateStampWindowController.xib in Resources */,
 				9FDD0F68294AB645000C4DAD /* KMMainViewController.xib in Resources */,
-				BB5EC3662C2BDC9D0090EF27 /* KMTextAlignmentController.xib in Resources */,
 				BB5A9D342CB6520100F64C1F /* home.xcassets in Resources */,
 				BBB3769F2B10A7FD009539CC /* a_4a.png in Resources */,
 				BBF811E52B0717970074874F /* KMExtractImageWindowController.xib in Resources */,
@@ -16128,7 +15962,6 @@
 				BB8810802B4F7A1F00AFA63E /* KMActivityALertViewController.xib in Resources */,
 				AD7D5CD82B95767C006562CD /* KMBookmarkOutlineTitleCellView.xib in Resources */,
 				ADDF83542B391A5C00A81A4E /* DSignatureFileListViewController.xib in Resources */,
-				ADC31FAD2A0E0C3900ED44A2 /* KMEditPropertyAlignmentView.xib in Resources */,
 				9F0CB4832967F64D00007028 /* KMPropertiesPanelReadOnlySubVC.xib in Resources */,
 				BBAC26AD2AFE31F400563A08 /* KMBatchOperateAddPasswordViewController.xib in Resources */,
 				BBB376A82B10A7FD009539CC /* a_3b.png in Resources */,
@@ -16220,7 +16053,6 @@
 				BBA2109529ACC10F00E6B346 /* signlist_add.pdf in Resources */,
 				BBB2ACE12B5943F800098854 /* Quick Start Guide.pdf in Resources */,
 				AD07BCE32D02CBB30075054B /* KMCompressContentView.xib in Resources */,
-				BB52F58B2CC245A1007418DB /* KMLinkPopupPageView.xib in Resources */,
 				ADDF835D2B391A5C00A81A4E /* CDSignatureCertificateStateViewController.xib in Resources */,
 				AD1FE8212BD7C98300AA4A9B /* KMPDFBookletWindowController.xib in Resources */,
 				BB7289E52B8844BA004B53B5 /* GoogleService-Info.plist in Resources */,
@@ -16301,7 +16133,6 @@
 				9F8810922B56614600F69815 /* KMAnnotationChoiceWidgetAppearanceViewController.xib in Resources */,
 				AD07BCDB2D02CBB30075054B /* KMBatchOperateCompressSettingAlertView.xib in Resources */,
 				BBE068A72CDDF149000512BC /* KMBatesTemplateItem.xib in Resources */,
-				BB5E2EFE2C2BF3FF00657A61 /* KMEditPDFCropComfirmWindowController.xib in Resources */,
 				9F94748129FA24200042F949 /* Credits.rtf in Resources */,
 				BB8AA5412CC66E490084F183 /* PDFImages.xcassets in Resources */,
 				AD1D480D2AFB18DA007AC1F0 /* KMCompressWindowController.xib in Resources */,
@@ -16564,11 +16395,9 @@
 				BB6347B22AF1F0BB00F5438E /* KMBatchOperateConvertViewController.xib in Resources */,
 				AD3AAD322B0B700500DE5FE7 /* KMCompareCoveringView.xib in Resources */,
 				BBE7888C2CBD2463008086E2 /* SidebarDemoVC.xib in Resources */,
-				BB52F5832CC2448C007418DB /* KMLinkPopupBaseView.xib in Resources */,
 				9F1F82DF292F84D60092C4B4 /* KMHomeInsertActionViewController.xib in Resources */,
 				BB183DE82B4EC0AF00F99C7E /* KMRepeatVerifyExpireController.xib in Resources */,
 				BB6347CA2AF24F6C00F5438E /* KMBatchoperateConvertCollectionViewItem.xib in Resources */,
-				BB6AAF582C2175A3009C4CB1 /* KMEditPDFPopToolBarController.xib in Resources */,
 				BB9695B829BDB03E00FD68D3 /* InfoWindow.xib in Resources */,
 				9F1FE4E029406E4700E952CA /* .gclient in Resources */,
 				9F0CB4BA2977BC1000007028 /* KMPropertiesPanelPreviewSubVC.xib in Resources */,
@@ -16693,7 +16522,6 @@
 				9F88109A2B56877C00F69815 /* KMAnnotationChoiceWidgetOptionsViewController.xib in Resources */,
 				BB99ACD4292E2AEF0048AFD9 /* KMMergeCollectionViewItem.xib in Resources */,
 				ADDF83492B391A5C00A81A4E /* DSignatureCreateInfoViewController.xib in Resources */,
-				BB3D1EB72C3EAE5B001D1BBE /* KMAlignmentController.xib in Resources */,
 				AD7D5C9A2B8F20FE006562CD /* synctex_parser_readme.txt in Resources */,
 				BB79FAB72CDC65BA00BF7B39 /* KMBGTemplateController.xib in Resources */,
 				BB4F7E872B0C4E820077EC8C /* KMNoteFilterCollevtionViewItem.xib in Resources */,
@@ -16773,7 +16601,6 @@
 				9F1F82CF292F6CF90092C4B4 /* KMPDFInsertPageWindow.xib in Resources */,
 				653647BE2CDCA5DE00CDB13E /* KMBatchOperateWindowController.xib in Resources */,
 				AD055E502B7234810035F824 /* KMBookmarkSheetView.xib in Resources */,
-				ADC31FAE2A0E0C3900ED44A2 /* KMEditPropertyAlignmentView.xib in Resources */,
 				AD07BCCF2D02CBB20075054B /* KMCompressModesTableCellView.xib in Resources */,
 				AD3AAD4B2B0B7B8900DE5FE7 /* KMCompareToolbar.xib in Resources */,
 				BB948D032BFF63C9000FBA01 /* KMToolbarConfigViewController.xib in Resources */,
@@ -16792,12 +16619,9 @@
 				BB52F5622CC1FC03007418DB /* KMLinkPageView.xib in Resources */,
 				BB0782FE2CD0BDD400101C81 /* KMPageNumberPromptView.xib in Resources */,
 				9FF94F1E29A770B500B1EF69 /* KMFillSignShapePanel.xib in Resources */,
-				BB52F59C2CC245C8007418DB /* KMLinkPopupWebView.xib in Resources */,
 				653647B52CDCA5DE00CDB13E /* KMBatchOperateRightViewController.xib in Resources */,
 				ADE614B329779C6D00F62ED7 /* KMImageTitleButton.xib in Resources */,
 				BBA9223A2B4E97540061057A /* KMPurchaseFirstTrialWindowController.xib in Resources */,
-				BB52F5942CC245B3007418DB /* KMLinkPopupEmailView.xib in Resources */,
-				BB5EC3672C2BDC9D0090EF27 /* KMTextAlignmentController.xib in Resources */,
 				BB42A5DC2B8F0F8C0092C524 /* KMTabbingHintWindowController.xib in Resources */,
 				BB91383B2CEE089C00BAB4A7 /* KMCropController.xib in Resources */,
 				BB716D652CDDB710009787ED /* KMHFTemplateController.xib in Resources */,
@@ -16828,7 +16652,6 @@
 				BBB2A9A22CB65C8E0066560B /* KMURLCreatePDFWindowController.xib in Resources */,
 				ADE86A7D2B0221E100414DFA /* KMSecurityWindowController.xib in Resources */,
 				9F00CCBB2A2F1E0F00AC462E /* dsa_priv.pem in Resources */,
-				BB52F58C2CC245A1007418DB /* KMLinkPopupPageView.xib in Resources */,
 				BBF62C6E2B033B5B007B7E86 /* KMPDFEditExtractWindow.xib in Resources */,
 				BB5A9D602CB6521400F64C1F /* SettingsGeneralView.xib in Resources */,
 				9F0CB46C2967E5CB00007028 /* KMPropertiesPanelSubViewController.xib in Resources */,
@@ -16903,7 +16726,6 @@
 				AD1FE81D2BD7C98300AA4A9B /* KMBookletManager.m in Sources */,
 				BB146FBD299DC0D100784A6A /* GTMGatherInputStream.m in Sources */,
 				BBB789AE2BE8BF2400F7E09C /* AIChatTranslateResultItem.swift in Sources */,
-				BB7185382C2B0A1100C1156B /* KMEditPDFPopToolBarWindow.swift in Sources */,
 				BB4F7E952B0C857D0077EC8C /* KMNoteTypeCollectionViewItem.swift in Sources */,
 				BBB789C62BE8BF2400F7E09C /* AIRedoConfirmView.swift in Sources */,
 				BB8810642B4F74DD00AFA63E /* KMRepeatTrialAlertController.m in Sources */,
@@ -16923,7 +16745,6 @@
 				F3A0F8542CC8F59400E7373F /* KMNConvertTool.swift in Sources */,
 				BB031B7B2C47BB090099F7AD /* KMUserFbListHeaderItemView.swift in Sources */,
 				9FDD0FA629533494000C4DAD /* KMJSONParser.swift in Sources */,
-				BB3D1EB22C3EAE5B001D1BBE /* KMAlignmentController.swift in Sources */,
 				BB83B8EC2BA8415A00EFF584 /* KMPageEditExtractWindowController.swift in Sources */,
 				AD1CA4302A0640F20070541F /* KMAnnotationScreenHeadView.swift in Sources */,
 				BB14700B299DC0D100784A6A /* OIDAuthorizationRequest.m in Sources */,
@@ -17024,7 +16845,6 @@
 				BBC3482429559506008D2CD1 /* KMBackgroundManager.swift in Sources */,
 				AD867FC529DFFBC400F00440 /* KMAnnotationOutlineRowView.swift in Sources */,
 				BB4EEF2D29763EE7003A3537 /* KMRedactBaseWindowController.swift in Sources */,
-				ADC31FA62A0E0C1A00ED44A2 /* KMEditPropertyAlignmentView.swift in Sources */,
 				BBB789902BE8BF2300F7E09C /* AITypeItemChooseView.swift in Sources */,
 				BBD25BF12B18768600EB85D4 /* KMCompressOperation.swift in Sources */,
 				BB3A81B52AC2C0F4006FC66C /* NSObject+KMExtension.swift in Sources */,
@@ -17044,7 +16864,6 @@
 				651675D92CE3312000019A20 /* KMBOTAOutlineView.swift in Sources */,
 				AD015FB729AB484400A57062 /* KMLightMemberConfig.swift in Sources */,
 				BBD1F77C296F9BE000343885 /* KMPageEditSettingBaseWindowController.swift in Sources */,
-				BB52F58E2CC245AD007418DB /* KMLinkPopupEmailView.swift in Sources */,
 				BB2F184A2A0C911B0003F65E /* KMBaseWindowController.swift in Sources */,
 				BBC70EB02AEA80EC00AC1585 /* KMToolbarCustomWindowController.swift in Sources */,
 				BBB3FF982B567D0300145C4A /* KMApplication.swift in Sources */,
@@ -17214,7 +17033,6 @@
 				BB93CDE52AE757A000B29C57 /* KMToolbarItemView.swift in Sources */,
 				89E4E6EC2963D1B7002DBA6F /* KMColorPickerViewController.m in Sources */,
 				BB6EA2972B70AF48000D4490 /* KMConvertCompareViewController.m in Sources */,
-				BB71853D2C2B0A7C00C1156B /* KMEditPDFToolbarView.swift in Sources */,
 				ADDEEA862AD7805200EF675D /* KMGeneralButton.swift in Sources */,
 				650FF6782CC897EB0019FAE1 /* KMNPDFPreView.swift in Sources */,
 				AD9527BA295291F20039D2BC /* KMPrintPage.swift in Sources */,
@@ -17270,7 +17088,6 @@
 				BBE068A22CDDF149000512BC /* KMBatesTemplateItem.swift in Sources */,
 				9F1FE4D529406E4700E952CA /* NSPasteboard+Utils.m in Sources */,
 				9F1FE4B129406E4700E952CA /* CTTabWindowController.m in Sources */,
-				BB52F5962CC245BF007418DB /* KMLinkPopupWebView.swift in Sources */,
 				BB52F56C2CC2369C007418DB /* KMLinkEmailView.swift in Sources */,
 				AD867FA129DEB4B000F00440 /* KMBOTAAnnotationTool.swift in Sources */,
 				ADDF83232B391A5C00A81A4E /* CDSDrawView.m in Sources */,
@@ -17322,7 +17139,6 @@
 				BB09477E2C1A9E50005C4DEE /* KMPDFThumbBaseModel.swift in Sources */,
 				ADAFDA342AE8EE9300F084BC /* KMAdvertisementImage.swift in Sources */,
 				ADBC2D28299DCA76006280C8 /* NSTextField+Layer.swift in Sources */,
-				BB52F57D2CC24481007418DB /* KMLinkPopupBaseView.swift in Sources */,
 				BB6D2DA72B674A6300624C24 /* CPDFOutline+KMExtension.swift in Sources */,
 				BBBF68802A3BF17F0058E14E /* KMFilePromiseProvider.swift in Sources */,
 				ADDF832C2B391A5C00A81A4E /* NSEvent+PDFListView.m in Sources */,
@@ -17487,7 +17303,6 @@
 				651675CD2CE3312000019A20 /* KMCustomTableRowView.swift in Sources */,
 				BB31DA622AFA3088006D63CB /* KMPreferenceController.swift in Sources */,
 				9FD0D2AF2AD51BCC00DA3FF8 /* CPDFListEditAnnotationViewController.swift in Sources */,
-				BB5E2EF92C2BF3FF00657A61 /* KMEditPDFCropComfirmWindowController.swift in Sources */,
 				BB451AE42CF5BEC5003E1565 /* CPDFListView+AnnotationsCompare.swift in Sources */,
 				ADAFDA422AE8F3C400F084BC /* KMAdvertisementTimeStampConversion.swift in Sources */,
 				BB10F1E42B736F11008EAF7E /* FMTrackEventManager.swift in Sources */,
@@ -17530,7 +17345,6 @@
 				BBAFFB1B29CDD19C00C56112 /* KMMergeSelect.swift in Sources */,
 				BBE78F1B2B36F69F0071AC1A /* KMLeftSideViewController+Note.swift in Sources */,
 				BB853C7D2AF8B5D6009C20C1 /* KMBatchOperateAddPasswordViewController.swift in Sources */,
-				BB7185452C2B0AFD00C1156B /* KMEditPDFColorView.swift in Sources */,
 				ADD1B6BB29420B4A00C3FFF7 /* KMPrintPreviewView.swift in Sources */,
 				ADE8BC2529F7CCA600570F89 /* KMPageNumberDisplayView.swift in Sources */,
 				BB6347AE2AF1F0A500F5438E /* KMBatchOperateConvertViewController.swift in Sources */,
@@ -17700,7 +17514,6 @@
 				AD1FE8442BD7C98300AA4A9B /* KMPDFPosterPrintWindowController.m in Sources */,
 				BBC8A76D2B05EDDF00FA9377 /* KMThumbnail.swift in Sources */,
 				BBBE68142CC7C02800358B31 /* KMPDFViewManager.swift in Sources */,
-				BB6AAF532C2175A3009C4CB1 /* KMEditPDFPopToolBarController.swift in Sources */,
 				BBE788842CBD2463008086E2 /* WCCompWindowController.swift in Sources */,
 				BBF62C702B0347AF007B7E86 /* SplitWindowController.swift in Sources */,
 				AD1CA3F72A05FCB60070541F /* KMAnnotationScreenViewController.swift in Sources */,
@@ -17745,7 +17558,6 @@
 				BBFD225D2CBE16AB00DA4ABD /* KMHistoryEmptyView.swift in Sources */,
 				AD07BCB52D02CBB20075054B /* KMCompressSettingCellModel.swift in Sources */,
 				89D2D2C129495D2100BFF5FE /* KMFormModel.swift in Sources */,
-				BB7185412C2B0AAF00C1156B /* KMEditPDFToolbarItemView.swift in Sources */,
 				BBE7891D2CBD2464008086E2 /* SegmentedVC.swift in Sources */,
 				BBB14A6329792D6900936EDB /* KMRedactPageRangeContentView.swift in Sources */,
 				BB6B436B2A04935000E02B54 /* KMPDFThumbViewBaseController.swift in Sources */,
@@ -17767,7 +17579,6 @@
 				AD867FA629DFB77500F00440 /* KMAnnotationOutlineView.swift in Sources */,
 				AD3AAD5C2B0DA3D400DE5FE7 /* KMCompareTextViewItem.swift in Sources */,
 				ADDF83352B391A5C00A81A4E /* CPDFListViewConfig.m in Sources */,
-				BB52F5862CC24599007418DB /* KMLinkPopupPageView.swift in Sources */,
 				BBB9B32B299A5D6D004F3235 /* GTMOAuth2KeychainCompatibility.m in Sources */,
 				AD3AAD752B0DCEAA00DE5FE7 /* KMCompareSaveView.swift in Sources */,
 				BB66472B2C06DD9C00924EE0 /* KMToolbarConfigTBItemView.swift in Sources */,
@@ -17962,7 +17773,6 @@
 				F30619C02CFDF5E60047E288 /* KMNPopContentEditWindowController.swift in Sources */,
 				AD1FE8322BD7C98300AA4A9B /* NSMutableArray+KMOddEvenPartFetch.m in Sources */,
 				ADE86AD62B05A52B00414DFA /* KMCompareFilesConfig.swift in Sources */,
-				BB5EC3622C2BDC9D0090EF27 /* KMTextAlignmentController.swift in Sources */,
 				BB147047299DC0D200784A6A /* OIDServiceConfiguration.m in Sources */,
 				9FF371C82C69A9E2005F9CC5 /* CPDFPolygonAnnotation+PDFListView.swift in Sources */,
 				651675D62CE3312000019A20 /* KMTocOutlineView.swift in Sources */,
@@ -18157,7 +17967,6 @@
 				ADE86A812B02220700414DFA /* KMSecurityView.swift in Sources */,
 				BB8F4566295AA3ED0037EA22 /* KMHeaderFooterManager.swift in Sources */,
 				BB183DDE2B4EBE1B00F99C7E /* KMTrialSuccessController.swift in Sources */,
-				BB5E2EFA2C2BF3FF00657A61 /* KMEditPDFCropComfirmWindowController.swift in Sources */,
 				BB8810C52B4F95A900AFA63E /* NSObject+DeviceInfo.m in Sources */,
 				AD055E5D2B85C9A70035F824 /* KMSeparatorCell.swift in Sources */,
 				ADE86A9E2B031FDB00414DFA /* KMCompareWindowController.swift in Sources */,
@@ -18197,7 +18006,6 @@
 				F30B22862CB8D9630041002E /* KMNQuickToolCollectionViewItem.swift in Sources */,
 				654E63322CF5993C00F6323F /* KMNOutlineModel.swift in Sources */,
 				BBD426802B4FCF1500AC8660 /* KMTextFieldCell.swift in Sources */,
-				BB7185392C2B0A1100C1156B /* KMEditPDFPopToolBarWindow.swift in Sources */,
 				BBA00AC52B157C880043D903 /* KMToolbarZoomItemView.swift in Sources */,
 				BB1B0AC62B4FC6E900889528 /* KMGuideInfoWindow.swift in Sources */,
 				9F69DBBB2B55014F003D4C45 /* KMAnnotationButtonWidgetAppearanceViewController.swift in Sources */,
@@ -18271,7 +18079,6 @@
 				BBB14A582978E75D00936EDB /* KMRedactMutilPageFlagWindowController.swift in Sources */,
 				BBB9B30E299A5D6D004F3235 /* KMCloudUploadOperationQueue.m in Sources */,
 				BB146FC7299DC0D100784A6A /* GTMSessionFetcherService.m in Sources */,
-				BB52F5972CC245BF007418DB /* KMLinkPopupWebView.swift in Sources */,
 				ADDF83812B391A5D00A81A4E /* DSignatureSaveFolderViewController.swift in Sources */,
 				F3A0F85A2CC940DD00E7373F /* KMNPDFInsertBlankWindowController.swift in Sources */,
 				BB9599C42B31647B0062D346 /* KMRedactPropertiesWindowController.swift in Sources */,
@@ -18328,7 +18135,6 @@
 				BB4EEF2E29763EE7003A3537 /* KMRedactBaseWindowController.swift in Sources */,
 				AD2432D02B89DFED00A119A9 /* KMFormAlertView.swift in Sources */,
 				65F9F4802CFB5C3500F187A8 /* KMNBotaBaseViewController.swift in Sources */,
-				ADC31FA72A0E0C1A00ED44A2 /* KMEditPropertyAlignmentView.swift in Sources */,
 				BB10E1682CDC94E300471D47 /* KMBGTemplateItem.swift in Sources */,
 				ADE86A8B2B02269400414DFA /* KMRemovePasswordWindowController.swift in Sources */,
 				BB2CC5652AF123A300D7A796 /* KMBatchHeader.swift in Sources */,
@@ -18443,7 +18249,6 @@
 				BB8810A12B4F7D1000AFA63E /* KMVerificationActivateViewController.m in Sources */,
 				AD9527BF295294E20039D2BC /* KMPrintPageModel.swift in Sources */,
 				6515591D2CCA6E3100C0F0D9 /* KMConvertImageWindowController.swift in Sources */,
-				BB52F5872CC24599007418DB /* KMLinkPopupPageView.swift in Sources */,
 				ADAC0DE22AC273D600FD4F52 /* KMOCToolClass.swift in Sources */,
 				BBF62C692B033B34007B7E86 /* KMPDFEditExtractWindow.swift in Sources */,
 				9FDD0F892952FCC6000C4DAD /* KMCompLightParser.swift in Sources */,
@@ -18536,7 +18341,6 @@
 				BB147024299DC0D100784A6A /* OIDResponseTypes.m in Sources */,
 				65A971292CBA1792008DB0F9 /* KMToolbarPageInputItemView.swift in Sources */,
 				ADE86AE72B0AF50B00414DFA /* KMCompareCoveringSettingWindowController.swift in Sources */,
-				BB71853E2C2B0A7C00C1156B /* KMEditPDFToolbarView.swift in Sources */,
 				AD9527CB295297B70039D2BC /* KMPrintModel.swift in Sources */,
 				AD867FA229DEB4B000F00440 /* KMBOTAAnnotationTool.swift in Sources */,
 				9F1FE4B829406E4700E952CA /* CTBrowserFrameView.m in Sources */,
@@ -18584,7 +18388,6 @@
 				9F9461852BD644BF0076574B /* KMTableDataManager.m in Sources */,
 				9FCFEC8D2AD10A4400EAD2CB /* KMTextFieldSheetController.swift in Sources */,
 				BB52F55D2CC1FBF6007418DB /* KMLinkPageView.swift in Sources */,
-				BB3D1EB32C3EAE5B001D1BBE /* KMAlignmentController.swift in Sources */,
 				F30619C92CFDF68D0047E288 /* KMNEditContentPopMode.swift in Sources */,
 				9F1FE4F429406E4700E952CA /* FastResizeView.m in Sources */,
 				656C1E3B2CD0745200295F82 /* KMConvertWordSettingView.swift in Sources */,
@@ -18598,7 +18401,6 @@
 				9F0201662A176AF200C9B673 /* KMDottedLineView.swift in Sources */,
 				AD7D5CB42B9070AF006562CD /* KMSyncDot.swift in Sources */,
 				9F0CB4CE298654FA00007028 /* KMDesignToken+Height.swift in Sources */,
-				BB7185422C2B0AAF00C1156B /* KMEditPDFToolbarItemView.swift in Sources */,
 				9FD0D2B02AD51BCC00DA3FF8 /* CPDFListEditAnnotationViewController.swift in Sources */,
 				BB853C832AF8BAF0009C20C1 /* KMSetPasswordObject.swift in Sources */,
 				BBB3FF9D2B56852700145C4A /* NSDocument+KMExtensions.swift in Sources */,
@@ -18835,7 +18637,6 @@
 				BBFE6E5E2930809A00142C01 /* KMMergeCollectionPageViewItem.swift in Sources */,
 				BB67DA222CF08101001E77FA /* KMCropManager.swift in Sources */,
 				9F0CB4D22986550B00007028 /* KMDesignToken+Width.swift in Sources */,
-				BB52F58F2CC245AD007418DB /* KMLinkPopupEmailView.swift in Sources */,
 				9FF816F42AFB18290087EFC5 /* NSGeometry_KMExtensions.swift in Sources */,
 				BBA93D3429BF0ECE0044E0DD /* SKKeychain.m in Sources */,
 				9FCFEC752AC56ECE00EAD2CB /* CPDFListStampAnnotation.swift in Sources */,
@@ -18935,7 +18736,6 @@
 				BBDF17FD2CD47F8500ACDB15 /* KMEditDocumentController.swift in Sources */,
 				BB1B0ACF2B4FC6E900889528 /* KMFunctionGuideMultiController.swift in Sources */,
 				BBB789852BE8BF2300F7E09C /* AIChatInfoManager.swift in Sources */,
-				BB5EC3632C2BDC9D0090EF27 /* KMTextAlignmentController.swift in Sources */,
 				AD07BCDD2D02CBB30075054B /* KMBatchOperateCompressSettingAlertView.swift in Sources */,
 				656C1E2F2CD0745200295F82 /* KMConvertPageRangeSettingItemView.swift in Sources */,
 				BB0FE0472B734DD1001E0F88 /* AIInfoConfig.swift in Sources */,
@@ -19193,7 +18993,6 @@
 				F3599174292B62F5000D25DE /* CStringConstants.m in Sources */,
 				BB6D2DA82B674A6300624C24 /* CPDFOutline+KMExtension.swift in Sources */,
 				ADFA8F122B60E01C002595A4 /* KMSecureAlertView.swift in Sources */,
-				BB6AAF542C2175A3009C4CB1 /* KMEditPDFPopToolBarController.swift in Sources */,
 				BB147012299DC0D100784A6A /* OIDError.m in Sources */,
 				9F1FE50E29407B2B00E952CA /* KMUploadFilePanel.swift in Sources */,
 				BBBBB4A02B6F743700C7205E /* SKAttachmentEmailer.m in Sources */,
@@ -19297,7 +19096,6 @@
 				6578515B2CFEA3B80023D640 /* KMFindTableviewCell.swift in Sources */,
 				651675DA2CE3312000019A20 /* KMBOTAOutlineView.swift in Sources */,
 				AD02573B2A8601AA00EAD5D5 /* KMLoginManager.swift in Sources */,
-				BB52F57E2CC24481007418DB /* KMLinkPopupBaseView.swift in Sources */,
 				ADDF83A22B391A5D00A81A4E /* DSignatureFileListViewController.swift in Sources */,
 				BBE789062CBD2464008086E2 /* TooltipVC.swift in Sources */,
 				BB96A0B92AFCE45800559E24 /* WaitingView.swift in Sources */,
@@ -19356,7 +19154,6 @@
 				BB2C846A2BAE716600AF6142 /* KMSegmentedControl.swift in Sources */,
 				9F1FE3DF293EE51F00E952CA /* KMMainDocument.swift in Sources */,
 				BB451AA32CF59F5B003E1565 /* KMRectangleController.swift in Sources */,
-				BB7185462C2B0AFD00C1156B /* KMEditPDFColorView.swift in Sources */,
 				BBB9B320299A5D6D004F3235 /* KMGoogleDriveManager.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -19398,7 +19195,6 @@
 				AD7D5CEE2B96B9D6006562CD /* KMBookmarkOutlineRowView.swift in Sources */,
 				BBB789B02BE8BF2400F7E09C /* AIChatTranslateResultItem.swift in Sources */,
 				BB8810662B4F74DD00AFA63E /* KMRepeatTrialAlertController.m in Sources */,
-				BB71853A2C2B0A1100C1156B /* KMEditPDFPopToolBarWindow.swift in Sources */,
 				9F1FE51329407B4000E952CA /* KMFileSearchView.swift in Sources */,
 				BBD426812B4FCF1500AC8660 /* KMTextFieldCell.swift in Sources */,
 				BBB789C82BE8BF2400F7E09C /* AIRedoConfirmView.swift in Sources */,
@@ -19416,7 +19212,6 @@
 				BBAC26A62AFE134300563A08 /* KMToolbarItemPopViewController.swift in Sources */,
 				BB031B7D2C47BB090099F7AD /* KMUserFbListHeaderItemView.swift in Sources */,
 				BB93CDEB2AE7B6E100B29C57 /* KMToolbarView.swift in Sources */,
-				BB3D1EB42C3EAE5B001D1BBE /* KMAlignmentController.swift in Sources */,
 				BB83B8EE2BA8415A00EFF584 /* KMPageEditExtractWindowController.swift in Sources */,
 				AD1D48232AFB6BBA007AC1F0 /* KMMergeView.swift in Sources */,
 				BB403BAC2B15CA6E00B3106D /* KMBatchConvertOperation.swift in Sources */,
@@ -19716,7 +19511,6 @@
 				AD3AAD3A2B0B7B1900DE5FE7 /* KMCompareToolbar.swift in Sources */,
 				AD8DD2A52A9C35B2007CC9D0 /* KMThumbnailManager.swift in Sources */,
 				BB6719FF2AD2CE1B003D44D5 /* CPDFSquareAnnotation+PDFListView.swift in Sources */,
-				BB71853F2C2B0A7C00C1156B /* KMEditPDFToolbarView.swift in Sources */,
 				BBEDC22D2B98407000970C54 /* CPDFAction+KMExtension.swift in Sources */,
 				BBEF0F9C2B84A4C200A3E102 /* KMBrowserWindowController+PPTMode.swift in Sources */,
 				BB8B99FF2B355E7600A066EC /* KMLeftSideViewController+Action.swift in Sources */,
@@ -19774,7 +19568,6 @@
 				BB2C6ACF28F41BA000478A33 /* CPDFListView.m in Sources */,
 				BB6013822AD38E0100A76FB2 /* CPDFTextAnnotation+PDFListView.swift in Sources */,
 				BB1331502AD78DC0008F6791 /* KMPDFMergeSizeTabelViewCell.swift in Sources */,
-				BB52F5882CC24599007418DB /* KMLinkPopupPageView.swift in Sources */,
 				AD055E2F2B70B3D50035F824 /* KMBookmarkSheetController.swift in Sources */,
 				BB97BE262BC3E02D00BECEA8 /* SKExportAccessoryController.m in Sources */,
 				BB42A5DA2B8F0F860092C524 /* KMTabbingHintWindowController.swift in Sources */,
@@ -19945,7 +19738,6 @@
 				9F1FE49529406E4700E952CA /* common.m in Sources */,
 				BB90E4F82AF3B71800B04B9F /* KMPDFWatermarkData.swift in Sources */,
 				9FF371CA2C69B857005F9CC5 /* CDistanceMeasureInfoWindowController.swift in Sources */,
-				ADC31FA82A0E0C1A00ED44A2 /* KMEditPropertyAlignmentView.swift in Sources */,
 				9F53D5512AD677A000CCF9D8 /* CPDFListViewConfig.swift in Sources */,
 				9FDD0F822952FC36000C4DAD /* KMDesignToken.swift in Sources */,
 				BB4F7E8F2B0C7FE70077EC8C /* KMNoteColorCollectionViewItem.swift in Sources */,
@@ -19964,7 +19756,6 @@
 				9FE0BBE02B0E009F00CD1CAC /* KMColorPickerView.swift in Sources */,
 				ADD1B6EE2946C04C00C3FFF7 /* KMPrintChoosePageSizePamphletView.swift in Sources */,
 				9F0CB4DB2986553600007028 /* KMDesignToken+VerticalPadding.swift in Sources */,
-				BB5E2EFB2C2BF3FF00657A61 /* KMEditPDFCropComfirmWindowController.swift in Sources */,
 				BB1B0AF42B4FC6E900889528 /* KMFunctionGuideNameItemView.swift in Sources */,
 				BB6DD816293486FA001F0544 /* KMSecureEncryptPasswordCellView.swift in Sources */,
 				BBFE14D12BFD7FC300176992 /* KMCouponDueWindowController.swift in Sources */,
@@ -20013,7 +19804,6 @@
 				F35B484D29A4903300756255 /* NSPointerArray+PDFListView.m in Sources */,
 				BBC70EB62AEA847500AC1585 /* KMToolbarCustomViewController.swift in Sources */,
 				89752E062939DB42003FF08E /* KMToolbarViewController.swift in Sources */,
-				BB7185472C2B0AFD00C1156B /* KMEditPDFColorView.swift in Sources */,
 				89D2D2FD294C806000BFF5FE /* KMPDFThumbnailItem.swift in Sources */,
 				BB6F46CD2CF5E605003FCC3C /* CPDFAnnotationConfig.swift in Sources */,
 				BBFBE74928DD7DB8008B2335 /* ViewController.swift in Sources */,
@@ -20044,7 +19834,6 @@
 				AD7D5C872B8ECD83006562CD /* KMPDFSyncRecord.swift in Sources */,
 				BB4EEF2F29763EE7003A3537 /* KMRedactBaseWindowController.swift in Sources */,
 				BB00301F298CB799002DD1A0 /* KMPreferenceManager.swift in Sources */,
-				BB52F57F2CC24481007418DB /* KMLinkPopupBaseView.swift in Sources */,
 				BB981E572AD4F638001988CA /* KMPageIndicator.swift in Sources */,
 				BB716D722CDDB73B009787ED /* KMHeaderFooterController.swift in Sources */,
 				BBBF68862A3C3AF10058E14E /* NSDocumentController+KMExtension.swift in Sources */,
@@ -20104,7 +19893,6 @@
 				9FAAA33B290F72CC0046FFCE /* KMHistoryFileCollectionView.swift in Sources */,
 				ADDF833A2B391A5C00A81A4E /* CPDFSignatureAnnotation+PDFListView.m in Sources */,
 				656C1E452CD0745200295F82 /* KMConvertCSVSettingView.swift in Sources */,
-				BB52F5902CC245AD007418DB /* KMLinkPopupEmailView.swift in Sources */,
 				9F3D819529A33A290087B5AD /* KMDesignDropdown.swift in Sources */,
 				ADB2D6EF2947415E0029D2B3 /* KMPrintPaperSetView.swift in Sources */,
 				BB7FF5092A60E84400901C2D /* KMEnumExtensions.swift in Sources */,
@@ -20204,7 +19992,6 @@
 				BB4D02AB2C22D17B0001474A /* KMEditPDFPopGuideView.swift in Sources */,
 				AD1FE8462BD7C98300AA4A9B /* KMPDFPosterPrintWindowController.m in Sources */,
 				ADAFDA362AE8EE9300F084BC /* KMAdvertisementImage.swift in Sources */,
-				BB6AAF552C2175A3009C4CB1 /* KMEditPDFPopToolBarController.swift in Sources */,
 				BBE788862CBD2463008086E2 /* WCCompWindowController.swift in Sources */,
 				9F0CB4712967E63100007028 /* KMPropertiesPanelNameSubVC.swift in Sources */,
 				BB52F56E2CC2369C007418DB /* KMLinkEmailView.swift in Sources */,
@@ -20242,7 +20029,6 @@
 				ADDF83A32B391A5D00A81A4E /* DSignatureFileListViewController.swift in Sources */,
 				BBFD225F2CBE16AB00DA4ABD /* KMHistoryEmptyView.swift in Sources */,
 				AD7D5C832B8ECD09006562CD /* KMPDFSynchronizer.swift in Sources */,
-				BB7185432C2B0AAF00C1156B /* KMEditPDFToolbarItemView.swift in Sources */,
 				BBE7891F2CBD2464008086E2 /* SegmentedVC.swift in Sources */,
 				AD4C71732B9ADFE0003A6286 /* NSError_Extensions.swift in Sources */,
 				899700EA28F3E4D3009AF911 /* MainWindowController.swift in Sources */,
@@ -20486,7 +20272,6 @@
 				AD1FE8342BD7C98300AA4A9B /* NSMutableArray+KMOddEvenPartFetch.m in Sources */,
 				BB52F55E2CC1FBF6007418DB /* KMLinkPageView.swift in Sources */,
 				BBFDFA962AF328BA00E08AA2 /* KMBatchOperateManager.swift in Sources */,
-				BB5EC3642C2BDC9D0090EF27 /* KMTextAlignmentController.swift in Sources */,
 				9FF94F1B29A770B500B1EF69 /* KMFillSignShapePanel.swift in Sources */,
 				BBA5429E29F13A140041BAD0 /* KMMemorandumPattern.swift in Sources */,
 				F359916B29261F0E000D25DE /* CPDFListView+Tool.m in Sources */,
@@ -20496,7 +20281,6 @@
 				653647EF2CDCA85400CDB13E /* KMImageToPDFMethod.swift in Sources */,
 				9F1FE50F29407B2B00E952CA /* KMUploadFilePanel.swift in Sources */,
 				9FD0D2AD2AD5143D00DA3FF8 /* KMTableRowView.swift in Sources */,
-				BB52F5982CC245BF007418DB /* KMLinkPopupWebView.swift in Sources */,
 				BB1331562AD7A6A1008F6791 /* KMFileAttribute.swift in Sources */,
 				BBE789132CBD2464008086E2 /* NotiVC.swift in Sources */,
 				BBE068A42CDDF149000512BC /* KMBatesTemplateItem.swift in Sources */,

+ 25 - 88
PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -2275,13 +2275,13 @@
             filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+UI.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "301"
-            endingLineNumber = "301"
+            startingLineNumber = "297"
+            endingLineNumber = "297"
             landmarkName = "changeAnnotationModeAction(item:)"
             landmarkType = "7">
             <Locations>
                <Location
-                  uuid = "8E901A1F-2E46-45A2-8AAA-ABB5D9E11491 - da5f8849423c2d45"
+                  uuid = "8E901A1F-2E46-45A2-8AAA-ABB5D9E11491 - da5f8849423c2ac1"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -2291,12 +2291,12 @@
                   urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/KMMainViewController+UI.swift"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "301"
-                  endingLineNumber = "301"
-                  offsetFromSymbolStart = "9792">
+                  startingLineNumber = "297"
+                  endingLineNumber = "297"
+                  offsetFromSymbolStart = "8952">
                </Location>
                <Location
-                  uuid = "8E901A1F-2E46-45A2-8AAA-ABB5D9E11491 - da5f8849423c2d45"
+                  uuid = "8E901A1F-2E46-45A2-8AAA-ABB5D9E11491 - da5f8849423c2ac1"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -2306,23 +2306,8 @@
                   urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/KMMainViewController+UI.swift"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "301"
-                  endingLineNumber = "301"
-                  offsetFromSymbolStart = "9132">
-               </Location>
-               <Location
-                  uuid = "8E901A1F-2E46-45A2-8AAA-ABB5D9E11491 - da5f8849423c2d45"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMMainViewController.changeAnnotationModeAction(item: PDF_Reader_Pro.KMToolbarClickButton) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/KMMainViewController+UI.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "301"
-                  endingLineNumber = "301"
+                  startingLineNumber = "297"
+                  endingLineNumber = "297"
                   offsetFromSymbolStart = "9152">
                </Location>
             </Locations>
@@ -4051,54 +4036,6 @@
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "10A7DACA-0A34-4DC9-B7E9-299E99CE9CFC"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/KMClass/KMPDFViewController/EditTool/KMLinkViewController/Views/KMLinkWebView/KMLinkWebView.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "76"
-            endingLineNumber = "76"
-            landmarkName = "mouseDown(with:)"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "10A7DACA-0A34-4DC9-B7E9-299E99CE9CFC - 3dc5b8e10ee3d839"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMLinkWebView.mouseDown(with: __C.NSEvent) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/EditTool/KMLinkViewController/Views/KMLinkWebView/KMLinkWebView.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "77"
-                  endingLineNumber = "77"
-                  offsetFromSymbolStart = "116">
-               </Location>
-               <Location
-                  uuid = "10A7DACA-0A34-4DC9-B7E9-299E99CE9CFC - 3dc5b8e10ee3dbd8"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMLinkWebView.mouseDown(with: __C.NSEvent) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/EditTool/KMLinkViewController/Views/KMLinkWebView/KMLinkWebView.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "76"
-                  endingLineNumber = "76"
-                  offsetFromSymbolStart = "56">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -4323,22 +4260,6 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "9787D99B-D9D8-479A-8832-69CB0DE4B686"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KMComponentLibrary/KMComponentLibrary/View/Input/ComponentTextarea/ComponentTextarea.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "192"
-            endingLineNumber = "192"
-            landmarkName = "mouseDown(with:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -4801,5 +4722,21 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "6B9B2EDA-9CED-4ABA-86CD-B3710B227B3F"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFFreeTextAnnotation+PDFListView.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "33"
+            endingLineNumber = "33"
+            landmarkName = "init(PDFListViewNoteWith:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>