【2025】【综合】代码整理

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/Controller/KMToolbarConfigViewController.swift

@@ -1,279 +0,0 @@
-//
-//  KMToolbarConfigViewController.swift
-//  PDF Reader Pro
-//
-//  Created by tangchao on 2024/5/23.
-//
-
-import Cocoa
-
-typealias KMToolbarConfigViewControllerCallback = (NSApplication.ModalResponse) -> Void
-class KMToolbarConfigViewController: NSViewController {
-    
-    @IBOutlet weak var showLabel: NSTextField!
-    @IBOutlet weak var collectionView: NSCollectionView!
-    @IBOutlet weak var removedLabel: NSTextField!
-    @IBOutlet weak var removedCollectionView: NSCollectionView!
-    @IBOutlet weak var tipLabel: NSTextField!
-    @IBOutlet weak var cancelButton: NSButton!
-    @IBOutlet weak var confirmButton: NSButton!
-    
-    private let cellIdentifier_ = NSUserInterfaceItemIdentifier(rawValue: "ToolbarConfigCellIdentifier")
-    
-    var model = KMToolbarConfigModel()
-    
-    var callback: KMToolbarConfigViewControllerCallback?
-    
-    deinit {
-        Swift.debugPrint("KMToolbarConfigViewController deinit.")
-    }
-    
-    convenience init() {
-        self.init(nibName: "KMToolbarConfigViewController", bundle: nil)
-    }
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        
-        self.initDefalutValue()
-    }
-    
-    func initDefalutValue() {
-        self.showLabel.stringValue = NSLocalizedString("Show", comment: "")
-        self.collectionView.delegate = self
-        self.collectionView.dataSource = self
-        
-        self.collectionView.register(KMToolbarConfigViewItem.self, forItemWithIdentifier: self.cellIdentifier_)
-        (self.collectionView.collectionViewLayout as? NSCollectionViewFlowLayout)?.scrollDirection = .horizontal
-        self.collectionView.registerForDraggedTypes([NSPasteboard.PasteboardType.string])
-        
-        self.collectionView.allowsMultipleSelection = false
-        self.collectionView.enclosingScrollView?.backgroundColor = .gridColor
-        
-        self.removedLabel.stringValue = NSLocalizedString("Hide", comment: "")
-        self.removedCollectionView.delegate = self
-        self.removedCollectionView.dataSource = self
-        
-        self.removedCollectionView.register(KMToolbarConfigViewItem.self, forItemWithIdentifier: self.cellIdentifier_)
-        (self.removedCollectionView.collectionViewLayout as? NSCollectionViewFlowLayout)?.scrollDirection = .horizontal
-        
-        self.removedCollectionView.registerForDraggedTypes([NSPasteboard.PasteboardType.string])
-        self.removedCollectionView.isSelectable = true
-        
-        self.tipLabel.stringValue = NSLocalizedString("Drag and drop to add, remove and reorder the tools.", comment: "")
-        
-        self.cancelButton.title = NSLocalizedString("Cancel", comment: "")
-        self.cancelButton.target = self
-        self.cancelButton.action = #selector(buttonClick)
-        self.confirmButton.title = NSLocalizedString("Confirm", comment: "")
-        self.confirmButton.target = self
-        self.confirmButton.action = #selector(buttonClick)
-    }
-    
-    @objc func buttonClick(_ sender: NSButton) {
-        var resp: NSApplication.ModalResponse = .cancel
-        if self.confirmButton.isEqual(to: sender) {
-            resp = .OK
-        }
-        
-        guard let block = self.callback else {
-            return
-        }
-        block(resp)
-    }
-}
-
-extension KMToolbarConfigViewController: NSCollectionViewDelegate, NSCollectionViewDataSource, NSCollectionViewDelegateFlowLayout {
-    func numberOfSections(in collectionView: NSCollectionView) -> Int {
-        return 1
-    }
-    
-    func collectionView(_ collectionView: NSCollectionView, numberOfItemsInSection section: Int) -> Int {
-        if self.removedCollectionView.isEqual(to: collectionView) {
-            return self.model.removedCellIdentifiers?.count ?? 0
-        }
-        
-        if let cnt = self.model.allowedCellIdentifiers?.count {
-            return cnt + 2
-        }
-        return 0
-    }
-    
-    func collectionView(_ collectionView: NSCollectionView, itemForRepresentedObjectAt indexPath: IndexPath) -> NSCollectionViewItem {
-        if self.removedCollectionView.isEqual(to: collectionView) {
-            let cell = collectionView.makeItem(withIdentifier: self.cellIdentifier_, for: indexPath) as! KMToolbarConfigViewItem
-            let itemId = self.model.removedCellIdentifiers?[indexPath.item] ?? ""
-            let item = KMToolbarConfigTBItemView(itemIdentifier: itemId)
-            self.model.setupMainItem(item)
-            cell.itemView = item
-            return cell
-        }
-        
-        let cell = collectionView.makeItem(withIdentifier: self.cellIdentifier_, for: indexPath) as! KMToolbarConfigViewItem
-        if self.model.isFirstSegI(at: indexPath.item) {
-            cell.itemView = nil
-        } else if self.model.isSecondSegI(at: indexPath.item) {
-            cell.itemView = nil
-        } else {
-            var idx = indexPath.item
-            if self.model.isRight(at: idx) {
-                idx = idx - 2
-            } else if self.model.isCenter(at: idx) {
-                idx = idx - 1
-            }
-            
-            let itemId = self.model.allowedCellIdentifiers?[idx] ?? ""
-            let item = KMToolbarConfigTBItemView(itemIdentifier: itemId)
-            self.model.setupMainItem(item)
-            cell.itemView = item
-        }
-        
-        return cell
-    }
-    
-    // Layout
-    
-    func collectionView(_ collectionView: NSCollectionView, layout collectionViewLayout: NSCollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> NSSize {
-        if self.removedCollectionView.isEqual(to: collectionView) {
-            let itemId = self.model.removedCellIdentifiers?[indexPath.item] ?? ""
-            let item = KMToolbarItemView(itemIdentifier: itemId)
-            self.model.setupMainItem(item)
-            return NSSize(width: item.itemWidth, height: 48)
-        }
-        
-        if self.model.isFirstSegI(at: indexPath.item) {
-            return NSSize(width: self.model.segItemWidth, height: 48)
-        } else if self.model.isSecondSegI(at: indexPath.item) {
-            return NSSize(width: self.model.segItemWidth, height: 48)
-        }
-        
-        var idx = indexPath.item
-        if self.model.isRight(at: idx) {
-            idx = idx - 2
-        } else if self.model.isCenter(at: idx) {
-            idx = idx - 1
-        }
-        let itemId = self.model.allowedCellIdentifiers?[idx] ?? ""
-        let item = KMToolbarItemView(itemIdentifier: itemId)
-        self.model.setupMainItem(item)
-        return NSSize(width: item.itemWidth, height: 48)
-    }
-    
-    // 纵向间距
-    func collectionView(_ collectionView: NSCollectionView, layout collectionViewLayout: NSCollectionViewLayout, minimumLineSpacingForSectionAt section: Int) -> CGFloat {
-        return 5
-    }
-    
-    // 横向间距
-    func collectionView(_ collectionView: NSCollectionView, layout collectionViewLayout: NSCollectionViewLayout, minimumInteritemSpacingForSectionAt section: Int) -> CGFloat {
-        if self.removedCollectionView.isEqual(to: collectionView) {
-            return 12
-        }
-        return 5
-    }
-    
-    func collectionView(_ collectionView: NSCollectionView, layout collectionViewLayout: NSCollectionViewLayout, insetForSectionAt section: Int) -> NSEdgeInsets {
-        return .init(top: 6, left: 10, bottom: 6, right: 10)
-    }
-    
-    func collectionView(_ collectionView: NSCollectionView, shouldSelectItemsAt indexPaths: Set<IndexPath>) -> Set<IndexPath> {
-        return indexPaths
-    }
-    
-    // Drag & Drop
-    
-    func collectionView(_ collectionView: NSCollectionView, canDragItemsAt indexPaths: Set<IndexPath>, with event: NSEvent) -> Bool {
-        if self.removedCollectionView.isEqual(to: collectionView) {
-            return true
-        }
-        guard let ip = indexPaths.first else {
-            return false
-        }
-        if self.model.isSeg(at: ip.item) {
-            return false
-        }
-        return true
-    }
-    
-    func collectionView(_ collectionView: NSCollectionView, pasteboardWriterForItemAt indexPath: IndexPath) -> NSPasteboardWriting? {
-        return String(indexPath.item) as NSPasteboardWriting
-    }
-    
-    func collectionView(_ collectionView: NSCollectionView, validateDrop draggingInfo: NSDraggingInfo, proposedIndexPath proposedDropIndexPath: AutoreleasingUnsafeMutablePointer<NSIndexPath>, dropOperation proposedDropOperation: UnsafeMutablePointer<NSCollectionView.DropOperation>) -> NSDragOperation {
-        let draggingSource = draggingInfo.draggingSource as? NSCollectionView
-        if collectionView.isEqual(self.removedCollectionView) {
-            if self.collectionView.isEqual(to: draggingSource) {
-                return .copy
-            } else {
-                return .move
-            }
-        }
-        
-        if collectionView.isEqual(self.collectionView) {
-            if self.removedCollectionView.isEqual(to: draggingSource) {
-                return .copy
-            } else {
-                return .move
-            }
-        }
-        return []
-    }
-    
-    func collectionView(_ collectionView: NSCollectionView, acceptDrop draggingInfo: NSDraggingInfo, indexPath: IndexPath, dropOperation: NSCollectionView.DropOperation) -> Bool {
-        guard let draggingSource = draggingInfo.draggingSource as? NSCollectionView else {
-            return false
-        }
-        
-        if collectionView.isEqual(self.removedCollectionView) {
-            let isIn = self.removedCollectionView.isEqual(to: draggingSource)
-            if isIn { // 暂不支持内部拖拽排序
-                return false
-            }
-                
-            // 外部拖拽
-            if let data = draggingInfo.draggingPasteboard.pasteboardItems?.first?.string(forType: .string) {
-                if let itemIdx = Int(data) {
-                    if self.model.removeItem(at: itemIdx) {
-                        self.collectionView.reloadData()
-                        self.removedCollectionView.reloadData()
-                        return true
-                    }
-                }
-            }
-            return false
-        }
-        
-        // 显示区域
-        let isIn = self.collectionView.isEqual(to: draggingSource)
-        if isIn { // 内部拖拽
-            if let data = draggingInfo.draggingPasteboard.pasteboardItems?.first?.string(forType: .string) {
-                if let itemIdx = Int(data) {
-                    if itemIdx == indexPath.item { // 无效拖拽
-                        return false
-                    }
-                    if self.model.moveItem(itemIdx: itemIdx, to: indexPath.item) {
-                        self.collectionView.reloadData()
-                        return true
-                    }
-                }
-            }
-            return false
-        }
-        
-        // 外部拖拽
-        if let data = draggingInfo.draggingPasteboard.pasteboardItems?.first?.string(forType: .string) {
-            if let itemIdx = Int(data) {
-                if let itemId = self.model.removedCellIdentifiers?.safe_element(for: itemIdx) as? String {
-                    if self.model.addItem(itemId: itemId, at: indexPath.item) {
-                        self.collectionView.reloadData()
-                        self.removedCollectionView.reloadData()
-                        return true
-                    }
-                }
-            }
-        }
-        return false
-    }
-
-    
-}

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/Controller/KMToolbarConfigViewController.xib

@@ -1,152 +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="KMToolbarConfigViewController" customModule="PDF_Reader_Pro" customModuleProvider="target">
-            <connections>
-                <outlet property="cancelButton" destination="Jrq-XK-HyQ" id="a5v-rh-B8T"/>
-                <outlet property="collectionView" destination="C4M-vA-SRV" id="hm4-3W-khn"/>
-                <outlet property="confirmButton" destination="5tz-eV-Ytt" id="VHK-be-N1N"/>
-                <outlet property="removedCollectionView" destination="rXf-Pu-nKA" id="HNv-2K-uW0"/>
-                <outlet property="removedLabel" destination="HMG-Nh-uYe" id="hDR-dF-V0G"/>
-                <outlet property="showLabel" destination="DrL-JR-pL6" id="mt6-YN-BDc"/>
-                <outlet property="tipLabel" destination="WdD-cf-Oez" id="rT6-G5-o2g"/>
-                <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="1480" height="360"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-            <subviews>
-                <scrollView wantsLayer="YES" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pVa-qa-L5j">
-                    <rect key="frame" x="26" y="230" width="1428" height="90"/>
-                    <clipView key="contentView" id="hQo-vN-bfQ">
-                        <rect key="frame" x="1" y="1" width="1426" height="88"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <collectionView selectable="YES" allowsMultipleSelection="YES" id="C4M-vA-SRV">
-                                <rect key="frame" x="0.0" y="0.0" width="1426" height="88"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES"/>
-                                <collectionViewFlowLayout key="collectionViewLayout" minimumInteritemSpacing="10" minimumLineSpacing="10" id="Ut1-FD-oCR">
-                                    <size key="itemSize" width="50" height="50"/>
-                                </collectionViewFlowLayout>
-                                <color key="primaryBackgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
-                            </collectionView>
-                        </subviews>
-                    </clipView>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="90" id="GDp-1c-eHI"/>
-                    </constraints>
-                    <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="4yz-zP-zak">
-                        <rect key="frame" x="-100" y="-100" width="233" height="15"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                    </scroller>
-                    <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="vbr-Re-CHy">
-                        <rect key="frame" x="1411" y="1" width="16" height="88"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                    </scroller>
-                </scrollView>
-                <scrollView wantsLayer="YES" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="y3L-cT-yu5">
-                    <rect key="frame" x="26" y="100" width="1428" height="90"/>
-                    <clipView key="contentView" drawsBackground="NO" id="rRg-x2-XJs">
-                        <rect key="frame" x="1" y="1" width="1426" height="88"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <collectionView id="rXf-Pu-nKA">
-                                <rect key="frame" x="0.0" y="0.0" width="1426" height="88"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES"/>
-                                <collectionViewFlowLayout key="collectionViewLayout" minimumInteritemSpacing="10" minimumLineSpacing="10" id="QkZ-GP-Y7n">
-                                    <size key="itemSize" width="50" height="50"/>
-                                </collectionViewFlowLayout>
-                                <color key="primaryBackgroundColor" name="KM_EDECED_Color"/>
-                            </collectionView>
-                        </subviews>
-                    </clipView>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="90" id="kAQ-n6-yZN"/>
-                    </constraints>
-                    <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="kmJ-Fg-BXZ">
-                        <rect key="frame" x="-100" y="-100" width="233" height="15"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                    </scroller>
-                    <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="pNf-CQ-3JS">
-                        <rect key="frame" x="1463" y="1" width="16" height="88"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                    </scroller>
-                </scrollView>
-                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Jrq-XK-HyQ">
-                    <rect key="frame" x="1282" y="19" width="75" height="32"/>
-                    <buttonCell key="cell" type="push" title="Button" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="sML-0i-cGp">
-                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
-                </button>
-                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5tz-eV-Ytt">
-                    <rect key="frame" x="1372" y="19" width="75" height="32"/>
-                    <buttonCell key="cell" type="push" title="Button" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="9Xw-Po-Hxe">
-                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="system"/>
-                        <string key="keyEquivalent" base64-UTF8="YES">
-DQ
-</string>
-                    </buttonCell>
-                </button>
-                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DrL-JR-pL6">
-                    <rect key="frame" x="24" y="324" width="37" height="16"/>
-                    <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="YE2-rQ-Luf">
-                        <font key="font" metaFont="system"/>
-                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                </textField>
-                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="HMG-Nh-uYe">
-                    <rect key="frame" x="24" y="194" width="37" height="16"/>
-                    <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="Bb7-lA-01B">
-                        <font key="font" metaFont="system"/>
-                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                </textField>
-                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WdD-cf-Oez">
-                    <rect key="frame" x="24" y="40" width="37" height="16"/>
-                    <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="7P9-RR-cRl">
-                        <font key="font" metaFont="system"/>
-                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                </textField>
-            </subviews>
-            <constraints>
-                <constraint firstItem="pVa-qa-L5j" firstAttribute="top" secondItem="DrL-JR-pL6" secondAttribute="bottom" constant="4" id="7Q6-wg-elB"/>
-                <constraint firstItem="HMG-Nh-uYe" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="26" id="9Do-Er-hG7"/>
-                <constraint firstAttribute="trailing" secondItem="5tz-eV-Ytt" secondAttribute="trailing" constant="40" id="Ago-US-e8k"/>
-                <constraint firstItem="DrL-JR-pL6" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="26" id="CmI-7Z-7Ge"/>
-                <constraint firstItem="y3L-cT-yu5" firstAttribute="top" secondItem="HMG-Nh-uYe" secondAttribute="bottom" constant="4" id="JLJ-pA-RgP"/>
-                <constraint firstAttribute="trailing" secondItem="pVa-qa-L5j" secondAttribute="trailing" constant="26" id="PQD-Wn-jYz"/>
-                <constraint firstItem="y3L-cT-yu5" firstAttribute="top" secondItem="pVa-qa-L5j" secondAttribute="bottom" constant="40" id="QCF-ho-vh9"/>
-                <constraint firstItem="WdD-cf-Oez" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="26" id="SUv-FS-xin"/>
-                <constraint firstAttribute="bottom" secondItem="Jrq-XK-HyQ" secondAttribute="bottom" constant="26" id="a6L-Qa-wSh"/>
-                <constraint firstAttribute="bottom" secondItem="WdD-cf-Oez" secondAttribute="bottom" constant="40" id="b9w-qB-piR"/>
-                <constraint firstItem="pVa-qa-L5j" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="40" id="i2X-DD-H49"/>
-                <constraint firstItem="y3L-cT-yu5" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="26" id="l3e-Dt-Y32"/>
-                <constraint firstItem="pVa-qa-L5j" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="26" id="r1p-CD-TUo"/>
-                <constraint firstAttribute="trailing" secondItem="y3L-cT-yu5" secondAttribute="trailing" constant="26" id="tes-fY-UP2"/>
-                <constraint firstAttribute="bottom" secondItem="5tz-eV-Ytt" secondAttribute="bottom" constant="26" id="xfN-Ys-ZAb"/>
-                <constraint firstItem="5tz-eV-Ytt" firstAttribute="leading" secondItem="Jrq-XK-HyQ" secondAttribute="trailing" constant="29" id="zfT-aO-rPp"/>
-            </constraints>
-            <point key="canvasLocation" x="44" y="154"/>
-        </customView>
-    </objects>
-    <resources>
-        <namedColor name="KM_EDECED_Color">
-            <color red="0.92900002002716064" green="0.92500001192092896" blue="0.92900002002716064" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-        </namedColor>
-    </resources>
-</document>

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarCustomWindowController.swift

@@ -1,49 +0,0 @@
-//
-//  KMToolbarCustomWindowController.swift
-//  PDF Reader Pro
-//
-//  Created by tangchao on 2023/10/26.
-//
-
-import Cocoa
-
-class KMToolbarCustomWindowController: NSWindowController {
-
-    weak var toolbar: KMToolbarView?
-    var toolbarCustomViewController: KMToolbarCustomViewController?
-    
-    var resetCallback: KMEmptyBlock?
-    
-    deinit {
-        Swift.debugPrint("KMToolbarCustomWindowController deinit")
-    }
-    
-    convenience init() {
-        self.init(windowNibName: "KMToolbarCustomWindowController")
-    }
-    
-    override func windowDidLoad() {
-        super.windowDidLoad()
-    
-        self.toolbarCustomViewController = KMToolbarCustomViewController()
-        self.toolbarCustomViewController?.toolbar = self.toolbar
-        if self.responds(to: NSSelectorFromString("setContentViewController:")) {
-            self.contentViewController = self.toolbarCustomViewController
-        } else {
-            self.toolbarCustomViewController?.view.frame = self.window?.contentView?.bounds ?? .zero
-            if let sview = self.toolbarCustomViewController?.view {
-                self.window?.contentView?.addSubview(sview)
-            }
-        }
-        
-        self.toolbarCustomViewController?.itemClick = { [weak self] idx, _ in
-            if idx == 0 { // cancel
-                self?.km_quick_endSheet(.cancel)
-            } else if idx == 1 { // ok
-                self?.km_quick_endSheet(.OK)
-            } else if idx == 2 { // reset
-                self?.resetCallback?()
-            }
-        }
-    }
-}

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarCustomWindowController.xib

@@ -1,33 +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="KMToolbarCustomWindowController">
-            <connections>
-                <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" visibleAtLaunch="NO" animationBehavior="default" id="F0z-JX-Cv5">
-            <windowStyleMask key="styleMask" titled="YES" 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="574" height="570"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
-            <value key="minSize" type="size" width="574" height="480"/>
-            <value key="maxSize" type="size" width="574" height="1000"/>
-            <view key="contentView" wantsLayer="YES" id="se5-gp-TjO">
-                <rect key="frame" x="0.0" y="0.0" width="574" height="570"/>
-                <autoresizingMask key="autoresizingMask"/>
-            </view>
-            <connections>
-                <outlet property="delegate" destination="-2" id="0bl-1N-AYu"/>
-            </connections>
-            <point key="canvasLocation" x="122" y="-138"/>
-        </window>
-    </objects>
-</document>

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarMainItemView.swift

@@ -1,45 +0,0 @@
-//
-//  KMToolbarMainItemView.swift
-//  PDF Reader Pro
-//
-//  Created by tangchao on 2023/12/14.
-//
-
-import Cocoa
-
-class KMToolbarMainItemView: KMToolbarItemView {
-
-    override class var textFont: NSFont {
-        get {
-            .systemFont(ofSize: 11)
-        }
-    }
-    
-    override class func fetchTextNormalColor() -> NSColor {
-        return KMAppearance.subtitleColor()
-    }
-    
-    override class func fetchTextSelectedColor() -> NSColor {
-        return KMAppearance.subtitleColor()
-    }
-    
-    override func draw(_ dirtyRect: NSRect) {
-        super.draw(dirtyRect)
-
-        // Drawing code here.
-    }
-    
-    override func layout() {
-        super.layout()
-        
-        if let view = self.promptView, view.superview != nil {
-            let wh: CGFloat = 6
-            let y: CGFloat = 1
-            let centenX: CGFloat = NSWidth(self.bounds) * 0.5
-//            let imgW = NS /Width(self.imageViewBtn.frame)
-            let imgW: CGFloat = 24
-            view.frame = NSMakeRect(centenX+imgW*0.5-wh-1, NSHeight(self.bounds)-wh-y, wh, wh)
-        }
-    }
-    
-}

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarView.swift

@@ -90,8 +90,7 @@ private let KMToolbarItemSpace = 8.0
     private var _rightWidth: CGFloat = 0
     
     var allowsUserCustomization = false
-    private var configWindowC_: KMToolbarConfigWindowController?
-    
+ 
     deinit {
         KMPrint("KMToolbarView deinit")
     }
@@ -117,29 +116,7 @@ private let KMToolbarItemSpace = 8.0
     // MARK: - Private Methods
 
     @objc private func _customToolbarItemAction(_ sender: NSMenuItem?) {
-        if self.configWindowC_ == nil {
-            self.configWindowC_ = KMToolbarConfigWindowController()
-        }
-        var leftCellIdentifiers = self.delegate?.toolbarLeftDefaultItemIdentifiers?(self) ?? []
-        if leftCellIdentifiers.contains(KMDocumentHomeToolbarItemIdentifier) {
-            leftCellIdentifiers.removeObject(KMDocumentHomeToolbarItemIdentifier)
-        }
-        self.configWindowC_?.leftCellIdentifiers = leftCellIdentifiers
-        self.configWindowC_?.centerCellIdentifiers = (self.delegate?.toolbarDefaultItemIdentifiers?(self) ?? [])
-        self.configWindowC_?.rightCellIdentifiers = (self.delegate?.toolbarRightDefaultItemIdentifiers?(self) ?? [])
         
-        self.configWindowC_?.defaultCellIdentifiers = self.delegate?.toolbarAllowedItemIdentifiers?(self) ?? []
-        self.window?.beginSheet((self.configWindowC_?.window)!, completionHandler: { [weak self] resp in
-            self?.configWindowC_ = nil
-            
-            if resp == .OK {
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
-                    KMDataManager.default.toolbarConfigDataUpdated = true
-                    self?.reloadData()
-                    KMDataManager.default.toolbarConfigDataUpdated = false
-                }
-            }
-        })
     }
     
     private func _addTrackingArea() {

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/Model/KMToolbarConfigModel.swift

@@ -19,8 +19,7 @@ class KMToolbarConfigModel: NSObject {
             
             for itemId in ids {
                 let item = KMToolbarItemView(itemIdentifier: itemId)
-                self.setupMainItem(item)
-                self.leftWidth += (item.itemWidth + 5)
+                 self.leftWidth += (item.itemWidth + 5)
             }
         }
     }
@@ -38,8 +37,7 @@ class KMToolbarConfigModel: NSObject {
             self.centerWidth = 0
             for itemId in ids {
                 let item = KMToolbarItemView(itemIdentifier: itemId)
-                self.setupMainItem(item)
-                self.centerWidth += (item.itemWidth + 5)
+                 self.centerWidth += (item.itemWidth + 5)
             }
         }
     }
@@ -60,8 +58,7 @@ class KMToolbarConfigModel: NSObject {
             }
             for itemId in ids {
                 let item = KMToolbarItemView(itemIdentifier: itemId)
-                self.setupMainItem(item)
-                self.rightWidth += (item.itemWidth + 5)
+                 self.rightWidth += (item.itemWidth + 5)
             }
         }
     }
@@ -297,201 +294,6 @@ class KMToolbarConfigModel: NSObject {
 }
 
 extension KMToolbarConfigModel {
-    func setupMainItem(_ item: KMToolbarItemView?) {
-        let identifier = item?.itemIdentifier
-        if identifier == KMLeftControlToolbarItemIdentifier {
-            item?.image = NSImage(named: "KMImageNameUXIconBtnTriLeftNor")
-            item?.titleName = NSLocalizedString("Panel", comment: "")
-//            item?.toolTip = NSLocalizedString("View Settings", comment: "")
-            item?.boxImagePosition = .imageAbove
-            item?.selectBackgroundType = .imageBox
-        } else if identifier == KMDocumentZoomViewToolbarItemIdentifier{
-            item?.titleName = NSLocalizedString("Zoom", comment: "")
-
-            let view = KMToolbarZoomItemView(zoomView: nil)
-            item?.customizeView = view
-        } else if identifier == KMDocumentPreviousPageToolbarItemIdentifier {
-            item?.titleName = NSLocalizedString("Zoom", comment: "")
-            let view = KMToolbarPreviousNextItemView()
-            item?.customizeView = view
-        } else if identifier == KMDocumentHomeToolbarItemIdentifier {
-            item?.image = NSImage(named: "KMImageNameToolbarHomeNor")
-            item?.titleName = NSLocalizedString("Home", comment: "")
-//            item?.toolTip = NSLocalizedString("A Welcome Gift from Us", comment: "")
-            item?.boxImagePosition = .imageAbove
-            item?.selectBackgroundType = .imageBox
-        } else if identifier == KMDocumentAnnotationToolbarItemIdentifier {
-            item?.titleName = NSLocalizedString("Tools", comment: "")
-            item?.image = NSImage(named: "KMImageNameUXIconToolbarMytoolsNor")
-//            item?.toolTip = String(format: "%@: %@, %@, %@, %@",  KMLocalizedString("Tool Mode"),KMLocalizedString("Annotate"),KMLocalizedString("Scroll"),KMLocalizedString("Magnify"),KMLocalizedString("Select"))
-            item?.boxImagePosition = .imageAbove
-            item?.selectBackgroundType = .imageBox
-        } else if identifier == KMDocumentPageToolbarItemIdentifier {
-            item?.titleName = NSLocalizedString("Page Edit", comment: "")
-            item?.image = NSImage(named: "KMImageNameUXIconToolbarPageeditNor")
-//            item?.toolTip = NSLocalizedString("PDF page editor: insert, delete, extract, rotate, reposition, and replace pages in a PDF", comment: "")
-            item?.boxImagePosition = .imageAbove
-            item?.selectBackgroundType = .imageBox
-        } else if identifier == KMDocumentConversonToolbarItemIdentifier {
-            item?.titleName = NSLocalizedString("Converter", comment: "")
-            item?.image = NSImage(named: "KMImageNameUXIconToolbarConvertNor")
-//            item?.toolTip = NSLocalizedString("Convert PDFs to Microsoft Word, PowerPoint, Excel, RTF, Text, Image, CSV, and more Offline", comment: "")
-            item?.boxImagePosition = .imageAbove
-            item?.selectBackgroundType = .imageBox
-        } else if identifier == KMDocumentScanOCRToolbarItemIdentifier {
-            item?.titleName = NSLocalizedString("OCR", comment: "")
-            item?.image = NSImage(named: "KMImageNameToolbarOCRNor")
-            item?.boxImagePosition = .imageAbove
-//            item?.toolTip = NSLocalizedString("Recognize text from Image-based or Scanned PDF with OCR", comment: "")
-            item?.selectBackgroundType = .imageBox
-        } else if identifier == KMToolbarToolEnhancedScanIdentifier {
-            item?.image = NSImage(named: "KMImageNameMainToolEnhancedScan")
-//            item?.toolTip = NSLocalizedString("Enhanced Scan", comment: "")
-            item?.titleName = NSLocalizedString("Enhanced Scan", comment: "")
-            item?.boxImagePosition = .imageLeft
-            item?.selectBackgroundType = .imageBox
-        } else if identifier == KMToolbarToolOCRTextIdentifier {
-            item?.image = NSImage(named: "KMImageNameMainToolOCRText")
-//            item?.toolTip = NSLocalizedString("OCR Text Recognition", comment: "")
-            item?.titleName = NSLocalizedString("OCR Text Recognition", comment: "")
-            item?.boxImagePosition = .imageLeft
-            item?.selectBackgroundType = .imageBox
-        } else if identifier == KMDocumentEditToolbarItemIdentifier {
-            item?.titleName = NSLocalizedString("Edit PDF", comment: "")
-            item?.image = NSImage(named: "KMImageNameUXIconToolbarEditNor")
-            item?.boxImagePosition = .imageAbove
-//            item?.toolTip = NSLocalizedString("Edit text and image in PDF ", comment: "")
-            item?.selectBackgroundType = .imageBox
-        } else if identifier == KMDocumentFormToolbarItemIdentifier {
-            item?.titleName = NSLocalizedString("Forms", comment: "")
-            item?.image = NSImage(named: "KMImageNameUXIconToolbarFormNor")
-            item?.boxImagePosition = .imageAbove
-//            item?.toolTip = NSLocalizedString("Edit PDF Form", comment: "")
-            item?.selectBackgroundType = .imageBox
-        } else if identifier == KMDocumentFillSginToolbarItemIdentifier {
-            item?.titleName = NSLocalizedString("Fill & Sign", comment: "")
-            item?.image = NSImage(named: "KMImageNameUXIconToolbarFillsignNor")
-            item?.boxImagePosition = .imageAbove
-//            item?.toolTip = NSLocalizedString("Fill and sign forms", comment: "")
-            item?.selectBackgroundType = .imageBox
-        } else if identifier == KMDocumentToolToolbarItemIdentifier {
-            item?.titleName = NSLocalizedString("Editor", comment: "")
-            item?.image = NSImage(named: "KMImageNameUXIconToolbarEdittoolNor")
-            item?.boxImagePosition = .imageAbove
-//            item?.toolTip = NSLocalizedString("Edit, delete, cut, copy, paste, and insert text in PDFs", comment: "")
-            item?.selectBackgroundType = .imageBox
-        } else if identifier == KMDocumentRedactToolbarItemIdentifier {
-            item?.titleName = NSLocalizedString("Redact Text", comment: "")
-            item?.image = NSImage(named: "KMImageNameUXIconToolbarRedactNor")
-            item?.boxImagePosition = .imageAbove
-//            item?.toolTip = NSLocalizedString("Mark for redaction", comment: "")
-            item?.selectBackgroundType = .imageBox
-        } else if identifier == KMDocumentAITranslationToolbarItemIdentifier {
-            item?.image = NSImage(named: "ic_function_other_AITranslation")
-            item?.titleName = "AI Translation"
-//            item?.toolTip = NSLocalizedString("AI Translation", comment: "")
-            item?.boxImagePosition = .imageOnly
-        } else if identifier == KMDocumentPrintToolbarItemIdentifier {
-            item?.image = NSImage(named: "KMImageNameToolbarPrintNor")
-            item?.titleName = "Print"
-//            item?.toolTip = NSLocalizedString("Print", comment: "")
-            item?.boxImagePosition = .imageOnly
-        } else if identifier == KMDocumentViewDisplayToolbarItemIdentifier {
-            item?.image = NSImage(named: "KMImageNameUXIconToolbarPageviewNor")
-            item?.titleName = NSLocalizedString("Page Display", comment: "")
-//            item?.toolTip = NSLocalizedString("Page Display", comment: "")
-            item?.boxImagePosition = .imageAbove
-            item?.selectBackgroundType = .imageBox
-        } else if identifier == KMDocumentAIToolsToolbarItemIdentifier {
-            item?.image = NSImage(named: "KMImageNameUXIconAINor")
-            item?.titleName = NSLocalizedString("AI Tools", comment: "")
-//            item?.toolTip = NSLocalizedString("AI Tools", comment: "")
-            item?.boxImagePosition = .imageAbove
-            item?.selectBackgroundType = .imageBox
-        } else if identifier == KMDocumentShareToolbarItemIdentifier {
-            item?.image = NSImage(named: "KMImageNameUXIconToolbarShareNor")
-            item?.titleName = NSLocalizedString("Share", comment: "")
-//            item?.toolTip = NSLocalizedString("Share the file with others", comment: "")
-            item?.boxImagePosition = .imageAbove
-            item?.selectBackgroundType = .imageBox
-        } else if identifier == KMDocumentSearchToolbarItemIdentifier {
-            item?.titleName = NSLocalizedString("Search", comment: "")
-            let view = NSView()
-            view.frame = NSMakeRect(0, 0, 150, 40)
-            let boxView = NSView()
-            boxView.frame = NSMakeRect(0, 16, 150, 22)
-            view.addSubview(boxView)
-            let searchView = NSSearchField()
-            searchView.frame = NSMakeRect(0, 0, 150, 22)
-            searchView.placeholderString = NSLocalizedString("Search", comment: "")
-            searchView.sendsWholeSearchString = true
-            searchView.sendsSearchStringImmediately = true
-            searchView.drawsBackground = false
-
-            boxView.addSubview(searchView)
-            let titleLabel = NSTextField(labelWithString: NSLocalizedString("Search", comment: ""))
-            view.addSubview(titleLabel)
-            titleLabel.frame = NSMakeRect(0, 0, 130, 14)
-            titleLabel.alignment = .center
-            titleLabel.textColor = KMAppearance.subtitleColor()
-            titleLabel.font = KMToolbarMainItemView.textFont
-
-            item?.customizeView = view
-        } else if identifier == KMDocumentPageInputToolbarItemIdentifier {
-            item?.titleName = NSLocalizedString("Page", comment: "")
-            
-            let view = KMToolbarPageInputItemView()
-            item?.customizeView = view
-            view.totalNumber = 0
-        } else if identifier == KMRightControlToolbarItemIdentifier {
-            item?.image = NSImage(named: "KMImageNameUXIconBtnTriRightNor")
-            item?.titleName = NSLocalizedString("Properties", comment: "")
-//            item?.toolTip = NSLocalizedString("Show/Hide Annotation Properties Panel", comment: "")
-            item?.boxImagePosition = .imageAbove
-            item?.selectBackgroundType = .imageBox
-        } else if identifier == KMToolbarToolRedactItemIdentifier {
-            item?.image = NSImage(named: "KMImageNameMainToolsRedact")
-//            item?.toolTip = NSLocalizedString("Redact", comment: "")
-            item?.titleName = NSLocalizedString("Redact", comment: "")
-            item?.selectBackgroundType = .imageBox
-        }
-//        else if identifier == KMDocumentDigitalSignToolbarItemIdentifier {
-//            item?.image = NSImage(named: "DigitalSign_icon")
-////            item?.toolTip = NSLocalizedString("Digital signature ensures the authenticity and integrity of digital files. Click and drag the cursor to create a signature field on the page.", comment: "")
-//            item?.titleName = NSLocalizedString("Digital Sign", comment: "")
-//            item?.selectBackgroundType = .imageBox
-//            item?.boxImagePosition = .imageAbove
-//        }
-        else if identifier == KMDocumentSignToolbarItemIdentifier {
-            item?.image = NSImage(named: "DigitalSign_icon")
-//            item?.toolTip = NSLocalizedString("Digital signature ensures the authenticity and integrity of digital files. Click and drag the cursor to create a signature field on the page.", comment: "")
-            item?.titleName = NSLocalizedString("Signature", comment: "")
-            item?.selectBackgroundType = .imageBox
-            item?.boxImagePosition = .imageAbove
-        } else if identifier == KMDocumentPreviousBackToolbarItemIdentifier {
-            item?.titleName = NSLocalizedString("Zoom", comment: "")
-            let view = KMToolbarPreviousBackItemView()
-            item?.customizeView = view
-        } else if identifier == KMDocumentFirstLastToolbarItemIdentifier {
-            item?.titleName = NSLocalizedString("Zoom", comment: "")
-            let view = KMToolbarFirstLastItemView()
-            item?.customizeView = view
-        } else if identifier == KMDocumentPageIndicatorToolbarItemIdentifier {
-            item?.titleName = NSLocalizedString("Zoom", comment: "")
-            let view = KMToolbarPageIndicatorItemView(zoomView: nil)
-            item?.customizeView = view
-        } else if identifier == KMDocumentPresentationToolbarItemIdentifier {
-            item?.image = NSImage(named: "KMImageNameToolbarSlideshowNor")
-            item?.titleName = NSLocalizedString("Presentation", comment: "")
-            item?.selectBackgroundType = .imageBox
-            item?.boxImagePosition = .imageAbove
-        } else if identifier == KMToolbarFixedSpaceItemIdentifier {
-            let view = NSView()
-            view.frame = NSMakeRect(0, 0, 36, 36)
-            view.wantsLayer = true
-            view.layer?.borderWidth = 1
-            item?.customizeView = view
-        }
-    }
+    
     
 }

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/View/KMToolbarConfigTBItemView.swift

@@ -1,26 +0,0 @@
-//
-//  KMToolbarConfigTBItemView.swift
-//  PDF Reader Pro
-//
-//  Created by tangchao on 2024/5/29.
-//
-
-import Cocoa
-
-class KMToolbarConfigTBItemView: KMToolbarItemView {
-
-    override func draw(_ dirtyRect: NSRect) {
-        super.draw(dirtyRect)
-
-        // Drawing code here.
-    }
-    
-    override func hitTest(_ point: NSPoint) -> NSView? {
-        return self
-    }
-    
-    override func updateTrackingAreas() {
-        /// ...
-    }
-    
-}

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/View/KMToolbarConfigViewItem.swift

@@ -1,26 +0,0 @@
-//
-//  KMToolbarConfigViewItem.swift
-//  PDF Reader Pro
-//
-//  Created by tangchao on 2024/5/28.
-//
-
-import Cocoa
-
-class KMToolbarConfigViewItem: NSCollectionViewItem {
-    
-    @IBOutlet weak var contentBox: NSBox!
-    
-    var itemView: KMToolbarItemView? {
-        didSet {
-            self.contentBox.contentView = self.itemView
-        }
-    }
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        
-        self.contentBox.isTransparent = true
-    }
-    
-}

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/View/KMToolbarConfigViewItem.xib

@@ -1,38 +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="KMToolbarConfigViewItem" customModule="PDF_Reader_Pro" customModuleProvider="target">
-            <connections>
-                <outlet property="contentBox" destination="qd7-dJ-S7n" id="gRx-AA-Jc9"/>
-                <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="272"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-            <subviews>
-                <box boxType="custom" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="qd7-dJ-S7n">
-                    <rect key="frame" x="0.0" y="0.0" width="480" height="272"/>
-                    <view key="contentView" id="sXo-ib-JEz">
-                        <rect key="frame" x="1" y="1" width="478" height="270"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                    </view>
-                </box>
-            </subviews>
-            <constraints>
-                <constraint firstAttribute="bottom" secondItem="qd7-dJ-S7n" secondAttribute="bottom" id="D8f-hD-Yt5"/>
-                <constraint firstItem="qd7-dJ-S7n" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" id="Lsf-oV-NLj"/>
-                <constraint firstItem="qd7-dJ-S7n" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="UsH-t5-ARh"/>
-                <constraint firstAttribute="trailing" secondItem="qd7-dJ-S7n" secondAttribute="trailing" id="aor-09-Hd9"/>
-            </constraints>
-            <point key="canvasLocation" x="139" y="154"/>
-        </customView>
-    </objects>
-</document>

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/View/KMToolbarPageInputItemView.swift

@@ -1,125 +0,0 @@
-//
-//  KMToolbarPageInputItemView.swift
-//  PDF Reader Pro
-//
-//  Created by User-Tangchao on 2024/10/12.
-//
-
-import Cocoa
-
-class KMToolbarPageInputItemView: NSView {
-    private lazy var contentView_: NSView = {
-        let view = NSView()
-        return view
-    }()
-    
-    private lazy var inputBox_: NSBox = {
-        let box = NSBox()
-        box.boxType = .custom
-        return box
-    }()
-    
-    private lazy var inputTF_: NSTextField = {
-        let view = NSTextField()
-        view.formatter = NumberFormatter()
-        view.drawsBackground = false
-        view.isBordered = false
-        view.focusRingType = .none
-        view.delegate = self
-        return view
-    }()
-    
-    private lazy var numberLabel_: NSTextField = {
-        let view = NSTextField(labelWithString: "")
-        view.font = KMToolbarMainItemView.textFont
-        view.textColor = KMAppearance.subtitleColor()
-        return view
-    }()
-    
-    private lazy var titleLabel_: NSTextField = {
-        let view = NSTextField(labelWithString: NSLocalizedString("Page", comment: ""))
-        view.font = KMToolbarMainItemView.textFont
-        view.textColor = KMAppearance.subtitleColor()
-        return view
-    }()
-    
-    var totalNumber: Int = 0 {
-        didSet {
-            self.numberLabel_.stringValue = "/" + "\(self.totalNumber)"
-        }
-    }
-    
-    var currentPageIndex: Int = 0 {
-        didSet {
-            self.inputTF_.stringValue = "\(self.currentPageIndex)"
-        }
-    }
-    
-    var enterAction: ((String)->Void)?
-    
-    convenience init() {
-        self.init(frame: NSMakeRect(0, 0, 80, 40))
-    }
-    
-    override init(frame frameRect: NSRect) {
-        super.init(frame: frameRect)
-        
-        self.initSubviews()
-    }
-    
-    required init?(coder: NSCoder) {
-        super.init(coder: coder)
-        
-        self.initSubviews()
-    }
-    
-    override func draw(_ dirtyRect: NSRect) {
-        super.draw(dirtyRect)
-
-        // Drawing code here.
-    }
-    
-    func initSubviews() {
-        self.addSubview(self.contentView_)
-                
-        self.contentView_.addSubview(self.inputBox_)
-        self.contentView_.addSubview(self.numberLabel_)
-        self.contentView_.addSubview(self.titleLabel_)
-        
-        self.inputBox_.contentView?.addSubview(self.inputTF_)
-        
-        self.contentView_.km_add_inset_constraint()
-        self.inputBox_.km_add_leading_constraint(constant: 2)
-        self.inputBox_.km_add_top_constraint(constant: 2)
-        self.inputBox_.km_add_width_constraint(constant: 45)
-        self.inputBox_.km_add_height_constraint(constant: 22)
-        self.numberLabel_.km_add_leading_constraint(equalTo: self.inputBox_, attribute: .trailing, constant: 2)
-        self.numberLabel_.km_add_centerY_constraint(equalTo: self.inputBox_)
-        self.titleLabel_.km_add_top_constraint(equalTo: self.inputBox_, attribute: .bottom, constant: 2)
-        self.titleLabel_.km_add_centerX_constraint()
-        
-        self.inputTF_.km_add_leading_constraint()
-        self.inputTF_.km_add_centerX_constraint()
-        self.inputTF_.km_add_centerY_constraint()
-    }
-}
-
-extension KMToolbarPageInputItemView: NSTextFieldDelegate {
-//    func controlTextDidEndEditing(_ obj: Notification) {
-//
-//    }
-    
-    func control(_ control: NSControl, textView: NSTextView, doCommandBy commandSelector: Selector) -> Bool {
-        switch commandSelector {
-        case #selector(NSResponder.insertNewline(_:)):
-            if let inputView = control as? NSTextField {
-                if inputView == self.inputTF_ {
-                    self.enterAction?(self.inputTF_.stringValue)
-                }
-            }
-            return true
-        default:
-            return false
-        }
-    }
-}

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/View/KMToolbarPreviousNextItemView.swift

@@ -1,394 +0,0 @@
-//
-//  KMToolbarPreviousNextItemView.swift
-//  PDF Reader Pro
-//
-//  Created by tangchao on 2023/12/15.
-//
-
-import Cocoa
-
-private func _KMPreviousNextString() -> String {
-    return "\(NSLocalizedString("Previous", comment: ""))/\(NSLocalizedString("Next", comment: ""))"
-}
-
-private let _minWidth: CGFloat = 24 * 2
-
-class KMToolbarPreviousNextItemView: NSView {
-    
-    var callback: KMCommonClickBlock?
-    
-    lazy var previousButton: KMCoverButton = {
-        let button = KMCoverButton()
-        button.wantsLayer = true
-        button.isBordered = false
-        button.layer?.cornerRadius = 6
-        button.image = NSImage(named: "KMImageNameToolbarPagepreviousNor")
-        button.toolTip = NSLocalizedString("Go To Previous Page", comment: "")
-        button.imagePosition = .imageOnly
-        button.target = self
-        button.action = #selector(buttonClicked)
-        button.coverAction = { cbtn, caction in
-            if caction == .enter {
-                cbtn.layer?.backgroundColor = KMToolbarItemView.selectedBackgroundColor.cgColor
-            } else if caction == .exit {
-                cbtn.layer?.backgroundColor = KMToolbarItemView.normalBackgroundColor.cgColor
-            }
-        }
-        return button
-    }()
-    
-    lazy var nextButton: KMCoverButton = {
-        let button = KMCoverButton()
-        button.wantsLayer = true
-        button.isBordered = false
-        button.layer?.cornerRadius = 6
-        button.image = NSImage(named: "KMImageNameToolbarPagenextNor")
-        button.toolTip = NSLocalizedString("Go To Next Page", comment: "")
-        button.imagePosition = .imageOnly
-        button.target = self
-        button.action = #selector(buttonClicked)
-        
-        button.coverAction = { cbtn, caction in
-            if caction == .enter {
-                cbtn.layer?.backgroundColor = KMToolbarItemView.selectedBackgroundColor.cgColor
-            } else if caction == .exit {
-                cbtn.layer?.backgroundColor = KMToolbarItemView.normalBackgroundColor.cgColor
-            }
-        }
-        
-        return button
-    }()
-    
-    lazy var titleLabel: NSTextField = {
-        let label = NSTextField(labelWithString: _KMPreviousNextString())
-        label.font = KMToolbarMainItemView.textFont
-        label.textColor = KMToolbarMainItemView.fetchTextNormalColor()
-        return label
-    }()
-    
-    convenience init() {
-        self.init(frame: NSMakeRect(0, 0, Self.itemWidth, 40))
-    }
-
-    override init(frame frameRect: NSRect) {
-        super.init(frame: frameRect)
-        
-        self.initSubview()
-    }
-    
-    required init?(coder: NSCoder) {
-        super.init(coder: coder)
-        
-        self.initSubview()
-    }
-    
-    func initSubview() {
-        self.addSubview(self.previousButton)
-        self.addSubview(self.nextButton)
-        self.addSubview(self.titleLabel)
-        
-        self.previousButton.km_add_left_constraint()
-        self.previousButton.km_add_right_constraint(equalTo: self.nextButton, attribute: .left)
-        self.previousButton.km_add_top_constraint()
-        self.previousButton.km_add_height_constraint(constant: 24)
-        
-        self.nextButton.km_add_right_constraint()
-        self.nextButton.km_add_width_constraint(equalTo: self.previousButton, attribute: .width)
-        self.nextButton.km_add_top_constraint()
-        self.nextButton.km_add_height_constraint(constant: 24)
-        
-        
-        self.titleLabel.km_add_bottom_constraint()
-        self.titleLabel.km_add_height_constraint(constant: 14)
-        self.titleLabel.km_add_left_constraint()
-        self.titleLabel.km_add_right_constraint()
-        self.titleLabel.km_add_width_constraint(constant: Self.itemWidth)
-//        self.titleLabel.km_add_top_constraint(equalTo: self.previousButton, attribute: .bottom)
-    }
-    
-    class var itemWidth: CGFloat {
-        get {
-            let string = _KMPreviousNextString()
-            let width = string.boundingRect(with: NSSize(width: CGFloat.greatestFiniteMagnitude, height: 20), options: [.usesLineFragmentOrigin, .truncatesLastVisibleLine], attributes: [.font : KMToolbarMainItemView.textFont]).size.width + 5 * 2
-            if width < _minWidth {
-                return _minWidth
-            }
-            return width
-        }
-    }
-    
-    override func draw(_ dirtyRect: NSRect) {
-        super.draw(dirtyRect)
-
-        // Drawing code here.
-    }
-    
-    @objc func buttonClicked(_ sender: NSButton) {
-        guard let block = self.callback else {
-            return
-        }
-        if self.previousButton.isEqual(to: sender) {
-            block(1)
-        } else if self.nextButton.isEqual(to: sender) {
-            block(2)
-        }
-    }
-}
-
-
-private func _KMPreviousBackString() -> String {
-    return "\(NSLocalizedString("Forward", comment: ""))/\(NSLocalizedString("Back", comment: ""))"
-}
-
-//private let _minWidth: CGFloat = 24 * 2
-
-class KMToolbarPreviousBackItemView: NSView {
-    
-    var callback: KMCommonClickBlock?
-    
-    lazy var previousButton: KMCoverButton = {
-        let button = KMCoverButton()
-        button.wantsLayer = true
-        button.isBordered = false
-        button.layer?.cornerRadius = 6
-        button.image = NSImage(named: "KMImageNameToolbarForwardNor")
-        button.toolTip = NSLocalizedString("Go To Previous Page", comment: "")
-        button.imagePosition = .imageOnly
-        button.target = self
-        button.action = #selector(buttonClicked)
-        button.coverAction = { cbtn, caction in
-            if caction == .enter {
-                cbtn.layer?.backgroundColor = KMToolbarItemView.selectedBackgroundColor.cgColor
-            } else if caction == .exit {
-                cbtn.layer?.backgroundColor = KMToolbarItemView.normalBackgroundColor.cgColor
-            }
-        }
-        return button
-    }()
-    
-    lazy var nextButton: KMCoverButton = {
-        let button = KMCoverButton()
-        button.wantsLayer = true
-        button.isBordered = false
-        button.layer?.cornerRadius = 6
-        button.image = NSImage(named: "KMImageNameToolbarBackwardNor")
-        button.toolTip = NSLocalizedString("Go To Next Page", comment: "")
-        button.imagePosition = .imageOnly
-        button.target = self
-        button.action = #selector(buttonClicked)
-        
-        button.coverAction = { cbtn, caction in
-            if caction == .enter {
-                cbtn.layer?.backgroundColor = KMToolbarItemView.selectedBackgroundColor.cgColor
-            } else if caction == .exit {
-                cbtn.layer?.backgroundColor = KMToolbarItemView.normalBackgroundColor.cgColor
-            }
-        }
-        
-        return button
-    }()
-    
-    lazy var titleLabel: NSTextField = {
-        let label = NSTextField(labelWithString: _KMPreviousBackString())
-        label.font = KMToolbarMainItemView.textFont
-        label.textColor = KMToolbarMainItemView.fetchTextNormalColor()
-        return label
-    }()
-    
-    convenience init() {
-        self.init(frame: NSMakeRect(0, 0, Self.itemWidth, 40))
-    }
-
-    override init(frame frameRect: NSRect) {
-        super.init(frame: frameRect)
-        
-        self.initSubview()
-    }
-    
-    required init?(coder: NSCoder) {
-        super.init(coder: coder)
-        
-        self.initSubview()
-    }
-    
-    func initSubview() {
-        self.addSubview(self.previousButton)
-        self.addSubview(self.nextButton)
-        self.addSubview(self.titleLabel)
-        
-        self.previousButton.km_add_left_constraint()
-        self.previousButton.km_add_right_constraint(equalTo: self.nextButton, attribute: .left)
-        self.previousButton.km_add_top_constraint()
-        self.previousButton.km_add_height_constraint(constant: 24)
-        
-        self.nextButton.km_add_right_constraint()
-        self.nextButton.km_add_width_constraint(equalTo: self.previousButton, attribute: .width)
-        self.nextButton.km_add_top_constraint()
-        self.nextButton.km_add_height_constraint(constant: 24)
-        
-        
-        self.titleLabel.km_add_bottom_constraint()
-        self.titleLabel.km_add_height_constraint(constant: 14)
-        self.titleLabel.km_add_left_constraint()
-        self.titleLabel.km_add_right_constraint()
-        self.titleLabel.km_add_width_constraint(constant: Self.itemWidth)
-//        self.titleLabel.km_add_top_constraint(equalTo: self.previousButton, attribute: .bottom)
-    }
-    
-    class var itemWidth: CGFloat {
-        get {
-            let string = _KMPreviousBackString()
-            let width = string.boundingRect(with: NSSize(width: CGFloat.greatestFiniteMagnitude, height: 20), options: [.usesLineFragmentOrigin, .truncatesLastVisibleLine], attributes: [.font : KMToolbarMainItemView.textFont]).size.width + 5 * 2
-            if width < _minWidth {
-                return _minWidth
-            }
-            return width
-        }
-    }
-    
-    override func draw(_ dirtyRect: NSRect) {
-        super.draw(dirtyRect)
-
-        // Drawing code here.
-    }
-    
-    @objc func buttonClicked(_ sender: NSButton) {
-        guard let block = self.callback else {
-            return
-        }
-        if self.previousButton.isEqual(to: sender) {
-            block(1)
-        } else if self.nextButton.isEqual(to: sender) {
-            block(2)
-        }
-    }
-}
-
-private func _KMFirstLastString() -> String {
-    return "\(NSLocalizedString("First", comment: ""))/\(NSLocalizedString("Last", comment: ""))"
-}
-
-//private let _minWidth: CGFloat = 24 * 2
-
-class KMToolbarFirstLastItemView: NSView {
-    
-    var callback: KMCommonClickBlock?
-    
-    lazy var previousButton: KMCoverButton = {
-        let button = KMCoverButton()
-        button.wantsLayer = true
-        button.isBordered = false
-        button.layer?.cornerRadius = 6
-        button.image = NSImage(named: "KMImageNameToolbarFirstpageNor")
-        button.toolTip = NSLocalizedString("Go To Previous Page", comment: "")
-        button.imagePosition = .imageOnly
-        button.target = self
-        button.action = #selector(buttonClicked)
-        button.coverAction = { cbtn, caction in
-            if caction == .enter {
-                cbtn.layer?.backgroundColor = KMToolbarItemView.selectedBackgroundColor.cgColor
-            } else if caction == .exit {
-                cbtn.layer?.backgroundColor = KMToolbarItemView.normalBackgroundColor.cgColor
-            }
-        }
-        return button
-    }()
-    
-    lazy var nextButton: KMCoverButton = {
-        let button = KMCoverButton()
-        button.wantsLayer = true
-        button.isBordered = false
-        button.layer?.cornerRadius = 6
-        button.image = NSImage(named: "KMImageNameToolbarLastpageNor")
-        button.toolTip = NSLocalizedString("Go To Next Page", comment: "")
-        button.imagePosition = .imageOnly
-        button.target = self
-        button.action = #selector(buttonClicked)
-        
-        button.coverAction = { cbtn, caction in
-            if caction == .enter {
-                cbtn.layer?.backgroundColor = KMToolbarItemView.selectedBackgroundColor.cgColor
-            } else if caction == .exit {
-                cbtn.layer?.backgroundColor = KMToolbarItemView.normalBackgroundColor.cgColor
-            }
-        }
-        
-        return button
-    }()
-    
-    lazy var titleLabel: NSTextField = {
-        let label = NSTextField(labelWithString: _KMFirstLastString())
-        label.font = KMToolbarMainItemView.textFont
-        label.textColor = KMToolbarMainItemView.fetchTextNormalColor()
-        return label
-    }()
-    
-    convenience init() {
-        self.init(frame: NSMakeRect(0, 0, Self.itemWidth, 40))
-    }
-
-    override init(frame frameRect: NSRect) {
-        super.init(frame: frameRect)
-        
-        self.initSubview()
-    }
-    
-    required init?(coder: NSCoder) {
-        super.init(coder: coder)
-        
-        self.initSubview()
-    }
-    
-    func initSubview() {
-        self.addSubview(self.previousButton)
-        self.addSubview(self.nextButton)
-        self.addSubview(self.titleLabel)
-        
-        self.previousButton.km_add_left_constraint()
-        self.previousButton.km_add_right_constraint(equalTo: self.nextButton, attribute: .left)
-        self.previousButton.km_add_top_constraint()
-        self.previousButton.km_add_height_constraint(constant: 24)
-        
-        self.nextButton.km_add_right_constraint()
-        self.nextButton.km_add_width_constraint(equalTo: self.previousButton, attribute: .width)
-        self.nextButton.km_add_top_constraint()
-        self.nextButton.km_add_height_constraint(constant: 24)
-        
-        
-        self.titleLabel.km_add_bottom_constraint()
-        self.titleLabel.km_add_height_constraint(constant: 14)
-        self.titleLabel.km_add_left_constraint()
-        self.titleLabel.km_add_right_constraint()
-        self.titleLabel.km_add_width_constraint(constant: Self.itemWidth)
-//        self.titleLabel.km_add_top_constraint(equalTo: self.previousButton, attribute: .bottom)
-    }
-    
-    class var itemWidth: CGFloat {
-        get {
-            let string = _KMFirstLastString()
-            let width = string.boundingRect(with: NSSize(width: CGFloat.greatestFiniteMagnitude, height: 20), options: [.usesLineFragmentOrigin, .truncatesLastVisibleLine], attributes: [.font : KMToolbarMainItemView.textFont]).size.width + 5 * 2
-            if width < _minWidth {
-                return _minWidth
-            }
-            return width
-        }
-    }
-    
-    override func draw(_ dirtyRect: NSRect) {
-        super.draw(dirtyRect)
-
-        // Drawing code here.
-    }
-    
-    @objc func buttonClicked(_ sender: NSButton) {
-        guard let block = self.callback else {
-            return
-        }
-        if self.previousButton.isEqual(to: sender) {
-            block(1)
-        } else if self.nextButton.isEqual(to: sender) {
-            block(2)
-        }
-    }
-}
-

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/View/KMToolbarZoomItemView.swift

@@ -1,186 +0,0 @@
-//
-//  KMToolbarZoomItemView.swift
-//  PDF Reader Pro
-//
-//  Created by tangchao on 2023/11/28.
-//
-
-import Cocoa
-
-class KMToolbarZoomItemView: NSView {
-    lazy var boxView: NSView = {
-        let view = NSView()
-        view.frame = NSMakeRect(0, 16, 70, 22)
-        return view
-    }()
-    
-    weak var zoomView: NSView?
-    
-    lazy var titleLabel: NSTextField = {
-        let label = NSTextField(labelWithString: NSLocalizedString("Zoom", comment: ""))
-        label.frame = NSMakeRect(0, 0, 70, 14)
-        label.alignment = .right
-        label.font = KMToolbarMainItemView.textFont
-        label.textColor = KMAppearance.subtitleColor()
-        return label
-    }()
-    
-    lazy var zoomInButton: NSButton = {
-        let button = KMCoverButton()
-        button.wantsLayer = true
-        button.layer?.cornerRadius = 4
-        button.isBordered = false
-        button.title = ""
-        button.image = NSImage(named: "KMImageNameUXIconToolbarZoominNor")
-        button.target = self
-        button.action = #selector(_buttonClicked)
-        button.coverAction = { cbtn, caction in
-            if caction == .enter {
-                cbtn.layer?.backgroundColor = KMToolbarItemView.selectedBackgroundColor.cgColor
-            } else if caction == .exit {
-                cbtn.layer?.backgroundColor = KMToolbarItemView.normalBackgroundColor.cgColor
-            }
-        }
-        return button
-    }()
-    
-    lazy var zoomOutButton: NSButton = {
-        let button = KMCoverButton()
-        button.isBordered = false
-        button.wantsLayer = true
-        button.layer?.cornerRadius = 4
-        button.title = ""
-        button.image = NSImage(named: "KMImageNameUXIconToolbarZoomoutNor")
-        button.target = self
-        button.action = #selector(_buttonClicked)
-        button.coverAction = { cbtn, caction in
-            if caction == .enter {
-                cbtn.layer?.backgroundColor = KMToolbarItemView.selectedBackgroundColor.cgColor
-            } else if caction == .exit {
-                cbtn.layer?.backgroundColor = KMToolbarItemView.normalBackgroundColor.cgColor
-            }
-        }
-        return button
-    }()
-    
-    var callback: KMCommonClickBlock?
-    
-    convenience init(zoomView: NSView?) {
-        let vspace: CGFloat = 2
-        let zoomButtonW: CGFloat = 20
-        self.init(frame: NSMakeRect(0, 0, 70+2*zoomButtonW+vspace, 40))
-        
-        self.zoomView = zoomView
-        
-        self.addSubview(self.boxView)
-        if let zview = self.zoomView {
-            self.boxView.addSubview(zview)
-            self.zoomView?.frame = NSMakeRect(10, 3, NSWidth(zview.frame), NSHeight(zview.frame))
-        }
-        
-        self.addSubview(self.titleLabel)
-        
-        self.addSubview(self.zoomInButton)
-        self.addSubview(self.zoomOutButton)
-        self.zoomOutButton.frame = NSMakeRect(NSMaxX(self.boxView.frame)+vspace, 17, zoomButtonW, zoomButtonW)
-        self.zoomInButton.frame = NSMakeRect(NSMaxX(self.zoomOutButton.frame), 17, zoomButtonW, zoomButtonW)
-        
-        self.boxView.wantsLayer = true
-        self.boxView.layer?.borderWidth = 1
-        self.boxView.layer?.borderColor = NSColor.lightGray.cgColor
-    }
-
-    override func draw(_ dirtyRect: NSRect) {
-        super.draw(dirtyRect)
-    }
-}
-
-// MARK: - Private Methods
-
-extension KMToolbarZoomItemView {
-    @objc private func _buttonClicked(_ sender: NSButton) {
-        var idx = 1
-        if self.zoomInButton.isEqual(to: sender) {
-            idx = 2
-        }
-        
-        guard let block = self.callback else {
-            return
-        }
-        block(idx)
-    }
-}
-
-class KMToolbarPageIndicatorItemView: NSView {
-    lazy var boxView: NSView = {
-        let view = NSView()
-        view.frame = NSMakeRect(0, 16, 50, 22)
-        return view
-    }()
-    
-    weak var zoomView: NSView?
-    
-    lazy var titleLabel: NSTextField = {
-        let label = NSTextField(labelWithString: NSLocalizedString("Page", comment: ""))
-        label.frame = NSMakeRect(0, 0, 50, 14)
-        label.alignment = .right
-        label.font = KMToolbarMainItemView.textFont
-        label.textColor = KMAppearance.subtitleColor()
-        return label
-    }()
-    
-    lazy var numLabel: NSTextField = {
-        let label = NSTextField(labelWithString: NSLocalizedString("/ 29", comment: ""))
-        label.frame = NSMakeRect(0, 0, 40, 14)
-        label.alignment = .right
-        label.font = KMToolbarMainItemView.textFont
-        label.textColor = KMAppearance.subtitleColor()
-        return label
-    }()
-    
-    var callback: KMCommonClickBlock?
-    
-    convenience init(zoomView: NSView?) {
-        let vspace: CGFloat = 2
-        let zoomButtonW: CGFloat = 40
-        self.init(frame: NSMakeRect(0, 0, 50+zoomButtonW+vspace, 40))
-        
-        self.zoomView = zoomView
-        
-        self.addSubview(self.boxView)
-        if let zview = self.zoomView {
-            self.boxView.addSubview(zview)
-            self.zoomView?.frame = NSMakeRect(10, 3, NSWidth(zview.frame), NSHeight(zview.frame))
-        }
-        
-        self.addSubview(self.titleLabel)
-        
-        self.addSubview(self.numLabel)
-        self.numLabel.frame = NSMakeRect(NSMaxX(self.boxView.frame)+vspace, 13, zoomButtonW, 20)
-        
-        self.boxView.wantsLayer = true
-        self.boxView.layer?.borderWidth = 1
-        self.boxView.layer?.borderColor = NSColor.lightGray.cgColor
-    }
-
-    override func draw(_ dirtyRect: NSRect) {
-        super.draw(dirtyRect)
-    }
-}
-
-// MARK: - Private Methods
-
-extension KMToolbarPageIndicatorItemView {
-//    @objc private func _buttonClicked(_ sender: NSButton) {
-//        var idx = 1
-//        if self.zoomInButton.isEqual(to: sender) {
-//            idx = 2
-//        }
-//
-//        guard let block = self.callback else {
-//            return
-//        }
-//        block(idx)
-//    }
-}
-

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/Window/KMToolbarConfigWindowController.swift

@@ -1,56 +0,0 @@
-//
-//  KMToolbarConfigWindowController.swift
-//  PDF Reader Pro
-//
-//  Created by tangchao on 2024/5/28.
-//
-
-import Cocoa
-
-class KMToolbarConfigWindowController: NSWindowController {
-    deinit {
-        KMPrint("KMToolbarConfigWindowController deinit.")
-    }
-    
-    var leftCellIdentifiers: [String]? {
-        didSet {
-            self.viewC_.model.leftCellIdentifiers = self.leftCellIdentifiers
-        }
-    }
-    var centerCellIdentifiers: [String]? {
-        didSet {
-            self.viewC_.model.centerCellIdentifiers = self.centerCellIdentifiers
-        }
-    }
-    var rightCellIdentifiers: [String]? {
-        didSet {
-            self.viewC_.model.rightCellIdentifiers = self.rightCellIdentifiers
-        }
-    }
-    
-    var defaultCellIdentifiers: [String]? {
-        didSet {
-            self.viewC_.model.defaultCellIdentifiers = self.defaultCellIdentifiers
-        }
-    }
-    
-    private let viewC_ = KMToolbarConfigViewController()
-    
-    override var windowNibName: NSNib.Name? {
-        return "KMToolbarConfigWindowController"
-    }
-    
-    override func windowDidLoad() {
-        super.windowDidLoad()
-        
-        self.window?.styleMask.insert(.fullSizeContentView)
-        self.window?.contentViewController = self.viewC_
-        
-        self.viewC_.callback = { [unowned self] resp in
-            if resp == .OK {
-                KMDataManager.toolbar_saveData(self.viewC_.model)
-            }
-            self.window?.sheetParent?.endSheet(self.window!, returnCode: resp)
-        }
-    }
-}

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/Window/KMToolbarConfigWindowController.xib

@@ -1,31 +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="KMToolbarConfigWindowController" customModule="PDF_Reader_Pro" customModuleProvider="target">
-            <connections>
-                <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" titled="YES" 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="480" height="270"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
-            <view key="contentView" id="se5-gp-TjO">
-                <rect key="frame" x="0.0" y="0.0" width="480" height="270"/>
-                <autoresizingMask key="autoresizingMask"/>
-            </view>
-            <connections>
-                <outlet property="delegate" destination="-2" id="0bl-1N-AYu"/>
-            </connections>
-            <point key="canvasLocation" x="120" y="-82"/>
-        </window>
-    </objects>
-</document>

PDF Office/PDF Master/Class/README.md

@@ -181,9 +181,7 @@
 
 * 笔记 CPDFListAnnotationNoteWindowController
 * 便签 CPDFListEditAnnotationViewController
-
-* 自定义注释工具 KMToolbarCustomWindowController
-
+ 
 ## 填写与签名
 
 * ✅、叉、矩形、线段、圆点注释 CSelfSignAnnotation

PDF Office/PDF Reader Pro.xcodeproj/project.pbxproj

@@ -296,9 +296,6 @@
 		658FDBB52C9D90CE00EFA72E /* KMNoteFilterStateCollevtionViewItem.xib in Resources */ = {isa = PBXBuildFile; fileRef = 658FDBB12C9D90CE00EFA72E /* KMNoteFilterStateCollevtionViewItem.xib */; };
 		658FDBB62C9D90CE00EFA72E /* KMNoteFilterStateCollevtionViewItem.xib in Resources */ = {isa = PBXBuildFile; fileRef = 658FDBB12C9D90CE00EFA72E /* KMNoteFilterStateCollevtionViewItem.xib */; };
 		658FDBB72C9D90CE00EFA72E /* KMNoteFilterStateCollevtionViewItem.xib in Resources */ = {isa = PBXBuildFile; fileRef = 658FDBB12C9D90CE00EFA72E /* KMNoteFilterStateCollevtionViewItem.xib */; };
-		65A971282CBA1792008DB0F9 /* KMToolbarPageInputItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A971272CBA1792008DB0F9 /* KMToolbarPageInputItemView.swift */; };
-		65A971292CBA1792008DB0F9 /* KMToolbarPageInputItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A971272CBA1792008DB0F9 /* KMToolbarPageInputItemView.swift */; };
-		65A9712A2CBA1792008DB0F9 /* KMToolbarPageInputItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A971272CBA1792008DB0F9 /* KMToolbarPageInputItemView.swift */; };
 		65AD98892CB615F000927779 /* KMNoteFilterStateViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AD98882CB615F000927779 /* KMNoteFilterStateViewModel.swift */; };
 		65AD988A2CB615F000927779 /* KMNoteFilterStateViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AD98882CB615F000927779 /* KMNoteFilterStateViewModel.swift */; };
 		65AD988B2CB615F000927779 /* KMNoteFilterStateViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65AD98882CB615F000927779 /* KMNoteFilterStateViewModel.swift */; };
@@ -2561,18 +2558,6 @@
 		BB04FD102B206F4000D80F7B /* KMPlanViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB04FD0F2B206F4000D80F7B /* KMPlanViewController.xib */; };
 		BB04FD112B206F4000D80F7B /* KMPlanViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB04FD0F2B206F4000D80F7B /* KMPlanViewController.xib */; };
 		BB04FD122B206F4000D80F7B /* KMPlanViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB04FD0F2B206F4000D80F7B /* KMPlanViewController.xib */; };
-		BB072D562C057BD600779B45 /* KMToolbarConfigWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB072D542C057BD600779B45 /* KMToolbarConfigWindowController.swift */; };
-		BB072D572C057BD600779B45 /* KMToolbarConfigWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB072D542C057BD600779B45 /* KMToolbarConfigWindowController.swift */; };
-		BB072D582C057BD600779B45 /* KMToolbarConfigWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB072D542C057BD600779B45 /* KMToolbarConfigWindowController.swift */; };
-		BB072D592C057BD600779B45 /* KMToolbarConfigWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB072D552C057BD600779B45 /* KMToolbarConfigWindowController.xib */; };
-		BB072D5A2C057BD600779B45 /* KMToolbarConfigWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB072D552C057BD600779B45 /* KMToolbarConfigWindowController.xib */; };
-		BB072D5B2C057BD600779B45 /* KMToolbarConfigWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB072D552C057BD600779B45 /* KMToolbarConfigWindowController.xib */; };
-		BB072D5E2C05AC8F00779B45 /* KMToolbarConfigViewItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB072D5C2C05AC8F00779B45 /* KMToolbarConfigViewItem.swift */; };
-		BB072D5F2C05AC8F00779B45 /* KMToolbarConfigViewItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB072D5C2C05AC8F00779B45 /* KMToolbarConfigViewItem.swift */; };
-		BB072D602C05AC8F00779B45 /* KMToolbarConfigViewItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB072D5C2C05AC8F00779B45 /* KMToolbarConfigViewItem.swift */; };
-		BB072D612C05AC8F00779B45 /* KMToolbarConfigViewItem.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB072D5D2C05AC8F00779B45 /* KMToolbarConfigViewItem.xib */; };
-		BB072D622C05AC8F00779B45 /* KMToolbarConfigViewItem.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB072D5D2C05AC8F00779B45 /* KMToolbarConfigViewItem.xib */; };
-		BB072D632C05AC8F00779B45 /* KMToolbarConfigViewItem.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB072D5D2C05AC8F00779B45 /* KMToolbarConfigViewItem.xib */; };
 		BB072D662C05B44300779B45 /* KMToolbarConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB072D652C05B44300779B45 /* KMToolbarConfigModel.swift */; };
 		BB072D672C05B44300779B45 /* KMToolbarConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB072D652C05B44300779B45 /* KMToolbarConfigModel.swift */; };
 		BB072D682C05B44300779B45 /* KMToolbarConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB072D652C05B44300779B45 /* KMToolbarConfigModel.swift */; };
@@ -3623,9 +3608,6 @@
 		BB65A07D2AF8E5A4003A27A0 /* KMLineWell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB65A07B2AF8E5A4003A27A0 /* KMLineWell.swift */; };
 		BB65A07E2AF8E5A4003A27A0 /* KMLineWell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB65A07B2AF8E5A4003A27A0 /* KMLineWell.swift */; };
 		BB65A0802AF8FE7A003A27A0 /* KMBatchOperateRemoveHeaderFooterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB65A07F2AF8FE7A003A27A0 /* KMBatchOperateRemoveHeaderFooterViewController.swift */; };
-		BB66472B2C06DD9C00924EE0 /* KMToolbarConfigTBItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB66472A2C06DD9C00924EE0 /* KMToolbarConfigTBItemView.swift */; };
-		BB66472C2C06DD9C00924EE0 /* KMToolbarConfigTBItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB66472A2C06DD9C00924EE0 /* KMToolbarConfigTBItemView.swift */; };
-		BB66472D2C06DD9C00924EE0 /* KMToolbarConfigTBItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB66472A2C06DD9C00924EE0 /* KMToolbarConfigTBItemView.swift */; };
 		BB6719E52AD28527003D44D5 /* CPDFLineAnnotation+PDFListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB6719E42AD28527003D44D5 /* CPDFLineAnnotation+PDFListView.swift */; };
 		BB6719E62AD28527003D44D5 /* CPDFLineAnnotation+PDFListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB6719E42AD28527003D44D5 /* CPDFLineAnnotation+PDFListView.swift */; };
 		BB6719E72AD28527003D44D5 /* CPDFLineAnnotation+PDFListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB6719E42AD28527003D44D5 /* CPDFLineAnnotation+PDFListView.swift */; };
@@ -4052,12 +4034,6 @@
 		BB93CDE92AE7B6E100B29C57 /* KMToolbarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB93CDE82AE7B6E100B29C57 /* KMToolbarView.swift */; };
 		BB93CDEA2AE7B6E100B29C57 /* KMToolbarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB93CDE82AE7B6E100B29C57 /* KMToolbarView.swift */; };
 		BB93CDEB2AE7B6E100B29C57 /* KMToolbarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB93CDE82AE7B6E100B29C57 /* KMToolbarView.swift */; };
-		BB948CFE2BFF63C9000FBA01 /* KMToolbarConfigViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB948CFC2BFF63C9000FBA01 /* KMToolbarConfigViewController.swift */; };
-		BB948CFF2BFF63C9000FBA01 /* KMToolbarConfigViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB948CFC2BFF63C9000FBA01 /* KMToolbarConfigViewController.swift */; };
-		BB948D002BFF63C9000FBA01 /* KMToolbarConfigViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB948CFC2BFF63C9000FBA01 /* KMToolbarConfigViewController.swift */; };
-		BB948D012BFF63C9000FBA01 /* KMToolbarConfigViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB948CFD2BFF63C9000FBA01 /* KMToolbarConfigViewController.xib */; };
-		BB948D022BFF63C9000FBA01 /* KMToolbarConfigViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB948CFD2BFF63C9000FBA01 /* KMToolbarConfigViewController.xib */; };
-		BB948D032BFF63C9000FBA01 /* KMToolbarConfigViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB948CFD2BFF63C9000FBA01 /* KMToolbarConfigViewController.xib */; };
 		BB955EBC2CD8E4600042FDE1 /* KMNWatermarkTemplateController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB955EBA2CD8E4600042FDE1 /* KMNWatermarkTemplateController.swift */; };
 		BB955EBD2CD8E4600042FDE1 /* KMNWatermarkTemplateController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB955EBA2CD8E4600042FDE1 /* KMNWatermarkTemplateController.swift */; };
 		BB955EBE2CD8E4600042FDE1 /* KMNWatermarkTemplateController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB955EBA2CD8E4600042FDE1 /* KMNWatermarkTemplateController.swift */; };
@@ -4141,9 +4117,6 @@
 		BB9EA1572B1EEAAC00EAFD9B /* KMImageModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB9EA1562B1EEAAC00EAFD9B /* KMImageModel.swift */; };
 		BB9EA1582B1EEAAC00EAFD9B /* KMImageModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB9EA1562B1EEAAC00EAFD9B /* KMImageModel.swift */; };
 		BB9EA1592B1EEAAC00EAFD9B /* KMImageModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB9EA1562B1EEAAC00EAFD9B /* KMImageModel.swift */; };
-		BBA00AC42B157C880043D903 /* KMToolbarZoomItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBA00AC32B157C880043D903 /* KMToolbarZoomItemView.swift */; };
-		BBA00AC52B157C880043D903 /* KMToolbarZoomItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBA00AC32B157C880043D903 /* KMToolbarZoomItemView.swift */; };
-		BBA00AC62B157C880043D903 /* KMToolbarZoomItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBA00AC32B157C880043D903 /* KMToolbarZoomItemView.swift */; };
 		BBA19F3229ADAC81001A285A /* signPicture_hover.pdf in Resources */ = {isa = PBXBuildFile; fileRef = BBA19F3129ADAC81001A285A /* signPicture_hover.pdf */; };
 		BBA19F3329ADAC81001A285A /* signPicture_hover.pdf in Resources */ = {isa = PBXBuildFile; fileRef = BBA19F3129ADAC81001A285A /* signPicture_hover.pdf */; };
 		BBA19F3429ADAC81001A285A /* signPicture_hover.pdf in Resources */ = {isa = PBXBuildFile; fileRef = BBA19F3129ADAC81001A285A /* signPicture_hover.pdf */; };
@@ -4454,9 +4427,6 @@
 		BBBBB49F2B6F743700C7205E /* SKAttachmentEmailer.m in Sources */ = {isa = PBXBuildFile; fileRef = BBBBB49E2B6F743700C7205E /* SKAttachmentEmailer.m */; };
 		BBBBB4A02B6F743700C7205E /* SKAttachmentEmailer.m in Sources */ = {isa = PBXBuildFile; fileRef = BBBBB49E2B6F743700C7205E /* SKAttachmentEmailer.m */; };
 		BBBBB4A12B6F743700C7205E /* SKAttachmentEmailer.m in Sources */ = {isa = PBXBuildFile; fileRef = BBBBB49E2B6F743700C7205E /* SKAttachmentEmailer.m */; };
-		BBBC087E2B2A93DB009B237F /* KMToolbarMainItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBBC087D2B2A93DB009B237F /* KMToolbarMainItemView.swift */; };
-		BBBC087F2B2A93DB009B237F /* KMToolbarMainItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBBC087D2B2A93DB009B237F /* KMToolbarMainItemView.swift */; };
-		BBBC08802B2A93DB009B237F /* KMToolbarMainItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBBC087D2B2A93DB009B237F /* KMToolbarMainItemView.swift */; };
 		BBBC08832B2AC863009B237F /* KMSnapshotModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBBC08822B2AC863009B237F /* KMSnapshotModel.swift */; };
 		BBBC08842B2AC863009B237F /* KMSnapshotModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBBC08822B2AC863009B237F /* KMSnapshotModel.swift */; };
 		BBBC08852B2AC863009B237F /* KMSnapshotModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBBC08822B2AC863009B237F /* KMSnapshotModel.swift */; };
@@ -4523,12 +4493,6 @@
 		BBC5ABE22D01C950008BA0CB /* KMSignatureController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BBC5ABDE2D01C950008BA0CB /* KMSignatureController.xib */; };
 		BBC5ABE32D01C950008BA0CB /* KMSignatureController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BBC5ABDE2D01C950008BA0CB /* KMSignatureController.xib */; };
 		BBC5ABE42D01C950008BA0CB /* KMSignatureController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BBC5ABDE2D01C950008BA0CB /* KMSignatureController.xib */; };
-		BBC70EA92AEA6EF800AC1585 /* KMToolbarCustomWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BBC70EA62AEA6EF700AC1585 /* KMToolbarCustomWindowController.xib */; };
-		BBC70EAA2AEA6EF800AC1585 /* KMToolbarCustomWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BBC70EA62AEA6EF700AC1585 /* KMToolbarCustomWindowController.xib */; };
-		BBC70EAB2AEA6EF800AC1585 /* KMToolbarCustomWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BBC70EA62AEA6EF700AC1585 /* KMToolbarCustomWindowController.xib */; };
-		BBC70EB02AEA80EC00AC1585 /* KMToolbarCustomWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBC70EAF2AEA80EC00AC1585 /* KMToolbarCustomWindowController.swift */; };
-		BBC70EB12AEA80EC00AC1585 /* KMToolbarCustomWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBC70EAF2AEA80EC00AC1585 /* KMToolbarCustomWindowController.swift */; };
-		BBC70EB22AEA80EC00AC1585 /* KMToolbarCustomWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBC70EAF2AEA80EC00AC1585 /* KMToolbarCustomWindowController.swift */; };
 		BBC70EB42AEA847500AC1585 /* KMToolbarCustomViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBC70EB32AEA847500AC1585 /* KMToolbarCustomViewController.swift */; };
 		BBC70EB52AEA847500AC1585 /* KMToolbarCustomViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBC70EB32AEA847500AC1585 /* KMToolbarCustomViewController.swift */; };
 		BBC70EB62AEA847500AC1585 /* KMToolbarCustomViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBC70EB32AEA847500AC1585 /* KMToolbarCustomViewController.swift */; };
@@ -4592,9 +4556,6 @@
 		BBD25BF12B18768600EB85D4 /* KMCompressOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBD25BF02B18768600EB85D4 /* KMCompressOperation.swift */; };
 		BBD25BF22B18768600EB85D4 /* KMCompressOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBD25BF02B18768600EB85D4 /* KMCompressOperation.swift */; };
 		BBD25BF32B18768600EB85D4 /* KMCompressOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBD25BF02B18768600EB85D4 /* KMCompressOperation.swift */; };
-		BBD3C8B62B2C438F00EB0867 /* KMToolbarPreviousNextItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBD3C8B52B2C438F00EB0867 /* KMToolbarPreviousNextItemView.swift */; };
-		BBD3C8B72B2C438F00EB0867 /* KMToolbarPreviousNextItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBD3C8B52B2C438F00EB0867 /* KMToolbarPreviousNextItemView.swift */; };
-		BBD3C8B82B2C438F00EB0867 /* KMToolbarPreviousNextItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBD3C8B52B2C438F00EB0867 /* KMToolbarPreviousNextItemView.swift */; };
 		BBD4267F2B4FCF1500AC8660 /* KMTextFieldCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBD4267E2B4FCF1500AC8660 /* KMTextFieldCell.swift */; };
 		BBD426802B4FCF1500AC8660 /* KMTextFieldCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBD4267E2B4FCF1500AC8660 /* KMTextFieldCell.swift */; };
 		BBD426812B4FCF1500AC8660 /* KMTextFieldCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBD4267E2B4FCF1500AC8660 /* KMTextFieldCell.swift */; };
@@ -5569,7 +5530,6 @@
 		658FDBAC2C9D4B9600EFA72E /* KMNoteReplyCellView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMNoteReplyCellView.xib; sourceTree = "<group>"; };
 		658FDBB02C9D90CE00EFA72E /* KMNoteFilterStateCollevtionViewItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMNoteFilterStateCollevtionViewItem.swift; sourceTree = "<group>"; };
 		658FDBB12C9D90CE00EFA72E /* KMNoteFilterStateCollevtionViewItem.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMNoteFilterStateCollevtionViewItem.xib; sourceTree = "<group>"; };
-		65A971272CBA1792008DB0F9 /* KMToolbarPageInputItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMToolbarPageInputItemView.swift; sourceTree = "<group>"; };
 		65AD98882CB615F000927779 /* KMNoteFilterStateViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMNoteFilterStateViewModel.swift; sourceTree = "<group>"; };
 		65AED4B22CAA55A8005C44B3 /* KMMergeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMMergeViewModel.swift; sourceTree = "<group>"; };
 		65B1438B2CF06B96001B5A69 /* NSButton+DesignToken.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSButton+DesignToken.swift"; sourceTree = "<group>"; };
@@ -6439,10 +6399,6 @@
 		BB043F4A2D018487000244A2 /* KMStampListItem.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMStampListItem.xib; sourceTree = "<group>"; };
 		BB04FD0B2B206F3600D80F7B /* KMPlanViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMPlanViewController.swift; sourceTree = "<group>"; };
 		BB04FD0F2B206F4000D80F7B /* KMPlanViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KMPlanViewController.xib; sourceTree = "<group>"; };
-		BB072D542C057BD600779B45 /* KMToolbarConfigWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMToolbarConfigWindowController.swift; sourceTree = "<group>"; };
-		BB072D552C057BD600779B45 /* KMToolbarConfigWindowController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMToolbarConfigWindowController.xib; sourceTree = "<group>"; };
-		BB072D5C2C05AC8F00779B45 /* KMToolbarConfigViewItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMToolbarConfigViewItem.swift; sourceTree = "<group>"; };
-		BB072D5D2C05AC8F00779B45 /* KMToolbarConfigViewItem.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMToolbarConfigViewItem.xib; sourceTree = "<group>"; };
 		BB072D652C05B44300779B45 /* KMToolbarConfigModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMToolbarConfigModel.swift; sourceTree = "<group>"; };
 		BB0782F72CD0BDCA00101C81 /* KMPageNumberPromptView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMPageNumberPromptView.swift; sourceTree = "<group>"; };
 		BB0782FB2CD0BDD400101C81 /* KMPageNumberPromptView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMPageNumberPromptView.xib; sourceTree = "<group>"; };
@@ -6889,7 +6845,6 @@
 		BB65A0772AF8E2F2003A27A0 /* KMSyncPreferences.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMSyncPreferences.swift; sourceTree = "<group>"; };
 		BB65A07B2AF8E5A4003A27A0 /* KMLineWell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMLineWell.swift; sourceTree = "<group>"; };
 		BB65A07F2AF8FE7A003A27A0 /* KMBatchOperateRemoveHeaderFooterViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMBatchOperateRemoveHeaderFooterViewController.swift; sourceTree = "<group>"; };
-		BB66472A2C06DD9C00924EE0 /* KMToolbarConfigTBItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMToolbarConfigTBItemView.swift; sourceTree = "<group>"; };
 		BB6719E42AD28527003D44D5 /* CPDFLineAnnotation+PDFListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CPDFLineAnnotation+PDFListView.swift"; sourceTree = "<group>"; };
 		BB6719E82AD2A57C003D44D5 /* CPDFLinkAnnotation+PDFListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CPDFLinkAnnotation+PDFListView.swift"; sourceTree = "<group>"; };
 		BB6719F42AD2C949003D44D5 /* CPDFRedactAnnotation+PDFListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CPDFRedactAnnotation+PDFListView.swift"; sourceTree = "<group>"; };
@@ -7084,8 +7039,6 @@
 		BB93C3152B9EFC9800A926E6 /* AITranslateTipWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AITranslateTipWindowController.xib; sourceTree = "<group>"; };
 		BB93CDE42AE757A000B29C57 /* KMToolbarItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMToolbarItemView.swift; sourceTree = "<group>"; };
 		BB93CDE82AE7B6E100B29C57 /* KMToolbarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMToolbarView.swift; sourceTree = "<group>"; };
-		BB948CFC2BFF63C9000FBA01 /* KMToolbarConfigViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMToolbarConfigViewController.swift; sourceTree = "<group>"; };
-		BB948CFD2BFF63C9000FBA01 /* KMToolbarConfigViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMToolbarConfigViewController.xib; sourceTree = "<group>"; };
 		BB955EBA2CD8E4600042FDE1 /* KMNWatermarkTemplateController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMNWatermarkTemplateController.swift; sourceTree = "<group>"; };
 		BB955EBB2CD8E4600042FDE1 /* KMNWatermarkTemplateController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMNWatermarkTemplateController.xib; sourceTree = "<group>"; };
 		BB955EC32CD8ED0F0042FDE1 /* KMNWatermarkTemplateItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMNWatermarkTemplateItem.swift; sourceTree = "<group>"; };
@@ -7115,7 +7068,6 @@
 		BB99ACCE292E2AEF0048AFD9 /* KMMergeCollectionViewItem.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMMergeCollectionViewItem.xib; sourceTree = "<group>"; };
 		BB9DCC7D2A09FC740024A6F1 /* libopencv_world.4.2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libopencv_world.4.2.dylib; sourceTree = "<group>"; };
 		BB9EA1562B1EEAAC00EAFD9B /* KMImageModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMImageModel.swift; sourceTree = "<group>"; };
-		BBA00AC32B157C880043D903 /* KMToolbarZoomItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMToolbarZoomItemView.swift; sourceTree = "<group>"; };
 		BBA19F3129ADAC81001A285A /* signPicture_hover.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = signPicture_hover.pdf; sourceTree = "<group>"; };
 		BBA19F3529ADACC5001A285A /* signPicture_nor.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = signPicture_nor.pdf; sourceTree = "<group>"; };
 		BBA19F4629AE27DA001A285A /* KMAnnotationTableRowView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMAnnotationTableRowView.swift; sourceTree = "<group>"; };
@@ -7243,7 +7195,6 @@
 		BBBBB4982B6F713F00C7205E /* NSObject+OCExtensions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSObject+OCExtensions.m"; sourceTree = "<group>"; };
 		BBBBB49D2B6F743700C7205E /* SKAttachmentEmailer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SKAttachmentEmailer.h; sourceTree = "<group>"; };
 		BBBBB49E2B6F743700C7205E /* SKAttachmentEmailer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SKAttachmentEmailer.m; sourceTree = "<group>"; };
-		BBBC087D2B2A93DB009B237F /* KMToolbarMainItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMToolbarMainItemView.swift; sourceTree = "<group>"; };
 		BBBC08822B2AC863009B237F /* KMSnapshotModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMSnapshotModel.swift; sourceTree = "<group>"; };
 		BBBE208A2B21649100509C4E /* KMPDFEditWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMPDFEditWindowController.swift; sourceTree = "<group>"; };
 		BBBE208E2B2164CD00509C4E /* KMPDFEditWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KMPDFEditWindowController.xib; sourceTree = "<group>"; };
@@ -7266,8 +7217,6 @@
 		BBC5ABD62D01C411008BA0CB /* KMSignatureListController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMSignatureListController.xib; sourceTree = "<group>"; };
 		BBC5ABDD2D01C950008BA0CB /* KMSignatureController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMSignatureController.swift; sourceTree = "<group>"; };
 		BBC5ABDE2D01C950008BA0CB /* KMSignatureController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMSignatureController.xib; sourceTree = "<group>"; };
-		BBC70EA62AEA6EF700AC1585 /* KMToolbarCustomWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KMToolbarCustomWindowController.xib; sourceTree = "<group>"; };
-		BBC70EAF2AEA80EC00AC1585 /* KMToolbarCustomWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMToolbarCustomWindowController.swift; sourceTree = "<group>"; };
 		BBC70EB32AEA847500AC1585 /* KMToolbarCustomViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMToolbarCustomViewController.swift; sourceTree = "<group>"; };
 		BBC745F6296178BD0072C2ED /* KMCropTools.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMCropTools.swift; sourceTree = "<group>"; };
 		BBC8A76C2B05EDDE00FA9377 /* KMThumbnail.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMThumbnail.swift; sourceTree = "<group>"; };
@@ -7289,7 +7238,6 @@
 		BBD1F797296FF78C00343885 /* KMPageEditSettingBaseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMPageEditSettingBaseModel.swift; sourceTree = "<group>"; };
 		BBD1F79B296FF7A600343885 /* KMPageEditSplitSettingModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMPageEditSplitSettingModel.swift; sourceTree = "<group>"; };
 		BBD25BF02B18768600EB85D4 /* KMCompressOperation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMCompressOperation.swift; sourceTree = "<group>"; };
-		BBD3C8B52B2C438F00EB0867 /* KMToolbarPreviousNextItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMToolbarPreviousNextItemView.swift; sourceTree = "<group>"; };
 		BBD4267E2B4FCF1500AC8660 /* KMTextFieldCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMTextFieldCell.swift; sourceTree = "<group>"; };
 		BBD6D4832B881E2100369F7D /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Main.strings"; sourceTree = "<group>"; };
 		BBD6D4842B881E2200369F7D /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Main.strings"; sourceTree = "<group>"; };
@@ -8202,23 +8150,18 @@
 			isa = PBXGroup;
 			children = (
 				BB072D642C05B41600779B45 /* Model */,
-				BB072D532C057B7F00779B45 /* Window */,
-				BB948CFB2BFF6393000FBA01 /* Controller */,
 				BBA00AC22B157BE90043D903 /* View */,
 				89752DF52938A236003FF08E /* PublicKey.swift */,
 				89752DF129389F82003FF08E /* KMToolbarItem.h */,
 				89752DF029389F81003FF08E /* KMToolbarItem.m */,
 				BB93CDE82AE7B6E100B29C57 /* KMToolbarView.swift */,
 				BB93CDE42AE757A000B29C57 /* KMToolbarItemView.swift */,
-				BBBC087D2B2A93DB009B237F /* KMToolbarMainItemView.swift */,
 				9FCFEC832AD0EF6700EAD2CB /* KMCustomButtonPopMenuViewController.swift */,
 				89752DAD2936F505003FF08E /* KMCustomButtonPopMenuViewController.xib */,
 				9FCFEC7F2AD0E74C00EAD2CB /* KMPopMenuButtonCell.swift */,
 				9FCFEC872AD0EF9900EAD2CB /* KMPopMenuButton.swift */,
 				BBC70EB32AEA847500AC1585 /* KMToolbarCustomViewController.swift */,
 				BBB29BCB2AEA190D005F1B6B /* KMToolbarCustomViewController.xib */,
-				BBC70EAF2AEA80EC00AC1585 /* KMToolbarCustomWindowController.swift */,
-				BBC70EA62AEA6EF700AC1585 /* KMToolbarCustomWindowController.xib */,
 			);
 			path = Toolbar;
 			sourceTree = "<group>";
@@ -10871,15 +10814,6 @@
 			path = Views;
 			sourceTree = "<group>";
 		};
-		BB072D532C057B7F00779B45 /* Window */ = {
-			isa = PBXGroup;
-			children = (
-				BB072D542C057BD600779B45 /* KMToolbarConfigWindowController.swift */,
-				BB072D552C057BD600779B45 /* KMToolbarConfigWindowController.xib */,
-			);
-			path = Window;
-			sourceTree = "<group>";
-		};
 		BB072D642C05B41600779B45 /* Model */ = {
 			isa = PBXGroup;
 			children = (
@@ -12940,15 +12874,6 @@
 			path = AITranslateTipWindowController;
 			sourceTree = "<group>";
 		};
-		BB948CFB2BFF6393000FBA01 /* Controller */ = {
-			isa = PBXGroup;
-			children = (
-				BB948CFC2BFF63C9000FBA01 /* KMToolbarConfigViewController.swift */,
-				BB948CFD2BFF63C9000FBA01 /* KMToolbarConfigViewController.xib */,
-			);
-			path = Controller;
-			sourceTree = "<group>";
-		};
 		BB955EC22CD8ECE20042FDE1 /* Templates */ = {
 			isa = PBXGroup;
 			children = (
@@ -13039,13 +12964,7 @@
 			isa = PBXGroup;
 			children = (
 				BBF98C332C0EE46100436CC7 /* KMToolbarCustomItemView.swift */,
-				BBA00AC32B157C880043D903 /* KMToolbarZoomItemView.swift */,
-				BBD3C8B52B2C438F00EB0867 /* KMToolbarPreviousNextItemView.swift */,
-				65A971272CBA1792008DB0F9 /* KMToolbarPageInputItemView.swift */,
 				BBDE52BA2BF3676C000545B2 /* KMPresentTableViewCell.swift */,
-				BB072D5C2C05AC8F00779B45 /* KMToolbarConfigViewItem.swift */,
-				BB66472A2C06DD9C00924EE0 /* KMToolbarConfigTBItemView.swift */,
-				BB072D5D2C05AC8F00779B45 /* KMToolbarConfigViewItem.xib */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -14709,7 +14628,6 @@
 				AD07BCE22D02CBB30075054B /* KMCompressContentView.xib in Resources */,
 				ADDF83982B391A5D00A81A4E /* PDFCertExportAccessoryView.xib in Resources */,
 				9FF371BC2C69A6BB005F9CC5 /* CDistanceSettingWindowController.xib in Resources */,
-				BB072D592C057BD600779B45 /* KMToolbarConfigWindowController.xib in Resources */,
 				AD867FBB29DFBB3B00F00440 /* KMAnnotationOutlineSectionView.xib in Resources */,
 				653647BF2CDCA5DE00CDB13E /* KMBatchOperateSplitViewController.xib in Resources */,
 				ADCFFC0629C04617007D3657 /* BOTA.xcassets in Resources */,
@@ -14840,7 +14758,6 @@
 				BB79E71C2CE617CB0052CAD5 /* KMEditImageController.xib in Resources */,
 				BB6347B82AF224E200F5438E /* KMConvertCollectionViewHeader.xib in Resources */,
 				8942F7F32926087200389627 /* KMSearchViewController.xib in Resources */,
-				BB072D612C05AC8F00779B45 /* KMToolbarConfigViewItem.xib in Resources */,
 				BB1C97042D01704600F1EFAD /* KMStampSettingWindowController.xib in Resources */,
 				ADAAC1672BD645DB001F2DA6 /* KMRecommondPopWindow.xib in Resources */,
 				BB46CF482AFB7E5C00281EDF /* InitialUserDefaults.plist in Resources */,
@@ -15069,7 +14986,6 @@
 				AD3AAD492B0B7B8900DE5FE7 /* KMCompareToolbar.xib in Resources */,
 				AD055E4E2B7234810035F824 /* KMBookmarkSheetView.xib in Resources */,
 				9F0CB4C02977C06300007028 /* KMPropertiesPanelColorSubVC.xib in Resources */,
-				BB948D012BFF63C9000FBA01 /* KMToolbarConfigViewController.xib in Resources */,
 				ADD1B6F42946C07800C3FFF7 /* KMPrintChoosePageSizePosterView.xib in Resources */,
 				65698B832D00BD4A009CA1CA /* KMNAnnotationListController.xib in Resources */,
 				BB183DD12B4EAD5400F99C7E /* Ubuntu-Medium.ttf in Resources */,
@@ -15092,7 +15008,6 @@
 				BB1969DB2B2842D700922736 /* SnapshotWindow.xib in Resources */,
 				BBB29BCE2AEA190D005F1B6B /* KMToolbarCustomViewController.xib in Resources */,
 				BB276A5C2B038D3A00AB5578 /* KMOCRPDFWindowController.xib in Resources */,
-				BBC70EA92AEA6EF800AC1585 /* KMToolbarCustomWindowController.xib in Resources */,
 				BBFA1CE62B60DDC50053AD4A /* KMScreenShotEditViewController.xib in Resources */,
 				65202DFC2CE4827900A204B5 /* KMNBotaHeaderSearchView.xib in Resources */,
 				BB328B6D2B565BEC00B382C6 /* iVersion.bundle in Resources */,
@@ -15260,12 +15175,10 @@
 				BBA19F3729ADACC5001A285A /* signPicture_nor.pdf in Resources */,
 				BB8AA5402CC66E490084F183 /* PDFImages.xcassets in Resources */,
 				AD3AAD312B0B700500DE5FE7 /* KMCompareCoveringView.xib in Resources */,
-				BB072D622C05AC8F00779B45 /* KMToolbarConfigViewItem.xib in Resources */,
 				BBE788CA2CBD2463008086E2 /* ListVC.xib in Resources */,
 				AD2BF2322B5620110029F03F /* SF-Pro-Text-Regular.otf in Resources */,
 				BBE068A62CDDF149000512BC /* KMBatesTemplateItem.xib in Resources */,
 				BB031B792C47BB090099F7AD /* KMUserListItemView.xib in Resources */,
-				BBC70EAA2AEA6EF800AC1585 /* KMToolbarCustomWindowController.xib in Resources */,
 				F3A9DC82294309D80074E5D2 /* CPDFListEditAnnotationViewController.xib in Resources */,
 				8942F7F42926087200389627 /* KMSearchViewController.xib in Resources */,
 				BBAFC8402985194800D0648E /* KMPDFEditAppendWindow.xib in Resources */,
@@ -15279,7 +15192,6 @@
 				F328C0BE2CA177DD00BFDD23 /* PresentImage.xcassets in Resources */,
 				BB10FAEA2AFE03CD00F18D65 /* KMPDFEditPageRangeWindowController.xib in Resources */,
 				AD07BCF12D02D6A60075054B /* KMBatchOperateRemoveHeaderFooterViewController.xib in Resources */,
-				BB948D022BFF63C9000FBA01 /* KMToolbarConfigViewController.xib in Resources */,
 				BB1B0AE12B4FC6E900889528 /* KMOpenFileGuidePanel.xib in Resources */,
 				BBAFC84E298519F700D0648E /* KMSavePanelAccessoryController.xib in Resources */,
 				ADBC2CF6299C7B3E006280C8 /* Print.xcassets in Resources */,
@@ -15446,7 +15358,6 @@
 				9FA607E228FD4C9F00B46586 /* KMHomePopViewController.xib in Resources */,
 				AD7D5C992B8F20FE006562CD /* synctex_parser_readme.txt in Resources */,
 				BB5A9D622CB6521400F64C1F /* KMPDFToolbarController.xib in Resources */,
-				BB072D5A2C057BD600779B45 /* KMToolbarConfigWindowController.xib in Resources */,
 				ADD1B6DC2946BE1700C3FFF7 /* KMPrintChoosePageSizeView.xib in Resources */,
 				656C1E632CD0DFF400295F82 /* KMConvertJsonSettingView.xib in Resources */,
 				BBD922412B50D6D600DB9585 /* rate_pic_free.pdf in Resources */,
@@ -15837,7 +15748,6 @@
 				89E4E7312963FBA2002DBA6F /* KMPropertiesViewPopController.xib in Resources */,
 				BBEB0DE52CE36B47004C67BF /* KMRightSideController.xib in Resources */,
 				ADDF839A2B391A5D00A81A4E /* PDFCertExportAccessoryView.xib in Resources */,
-				BB072D5B2C057BD600779B45 /* KMToolbarConfigWindowController.xib in Resources */,
 				ADD1B6B02941E97F00C3FFF7 /* KMPrintWindowController.xib in Resources */,
 				AD3AAD612B0DA3D400DE5FE7 /* KMCompareTextViewItem.xib in Resources */,
 				ADDF837C2B391A5D00A81A4E /* CDSignatureTextViewController.xib in Resources */,
@@ -15944,7 +15854,6 @@
 				AD1D48152AFB1912007AC1F0 /* KMCompressView.xib in Resources */,
 				65FABB372C9AFB1F00AA92E5 /* KMSectionCellView.xib in Resources */,
 				BBD8EE922B8EC86900EB05FE /* AutoSavePopController.xib in Resources */,
-				BB072D632C05AC8F00779B45 /* KMToolbarConfigViewItem.xib in Resources */,
 				BBBE20912B2164CD00509C4E /* KMPDFEditWindowController.xib in Resources */,
 				BB38D2D62D047A920039F106 /* KMMeasureController.xib in Resources */,
 				BBE788DA2CBD2464008086E2 /* CardVC.xib in Resources */,
@@ -16188,7 +16097,6 @@
 				AD055E502B7234810035F824 /* KMBookmarkSheetView.xib in Resources */,
 				AD07BCCF2D02CBB20075054B /* KMCompressModesTableCellView.xib in Resources */,
 				AD3AAD4B2B0B7B8900DE5FE7 /* KMCompareToolbar.xib in Resources */,
-				BB948D032BFF63C9000FBA01 /* KMToolbarConfigViewController.xib in Resources */,
 				BB183DD32B4EAD5400F99C7E /* Ubuntu-Medium.ttf in Resources */,
 				ADE3C1B029A4779E00793B13 /* KMPrintAccessoryController.xib in Resources */,
 				89D2D300294C806000BFF5FE /* KMPDFThumbnailItem.xib in Resources */,
@@ -16216,7 +16124,6 @@
 				9F221EDC29A9EC0900978A59 /* KMFillSignTextPanel.xib in Resources */,
 				BBB29BD02AEA190E005F1B6B /* KMToolbarCustomViewController.xib in Resources */,
 				BBB789A42BE8BF2400F7E09C /* AIChatFileInfoItem.xib in Resources */,
-				BBC70EAB2AEA6EF800AC1585 /* KMToolbarCustomWindowController.xib in Resources */,
 				BB1969DD2B2842D700922736 /* SnapshotWindow.xib in Resources */,
 				BB69C95E299116FD0001A9B1 /* five_line_score.pdf in Resources */,
 				BBFA1CE82B60DDC50053AD4A /* KMScreenShotEditViewController.xib in Resources */,
@@ -16433,7 +16340,6 @@
 				BB99ACCF292E2AEF0048AFD9 /* KMMergeCollectionViewItem.swift in Sources */,
 				BB8B99FD2B355E7600A066EC /* KMLeftSideViewController+Action.swift in Sources */,
 				BBF729AF2B1962C900576AC5 /* KMRemoveHeaderFooterQueue.swift in Sources */,
-				65A971282CBA1792008DB0F9 /* KMToolbarPageInputItemView.swift in Sources */,
 				BB3A42962B4BC72C006D0642 /* KMNotesPanelController.swift in Sources */,
 				BB7648EC29ECEEF400931039 /* KMAppearance.swift in Sources */,
 				BBA8B7AA2935DC120097D183 /* KMRemovePasswordResultTipView.swift in Sources */,
@@ -16447,16 +16353,13 @@
 				AD015FB729AB484400A57062 /* KMLightMemberConfig.swift in Sources */,
 				BBD1F77C296F9BE000343885 /* KMPageEditSettingBaseWindowController.swift in Sources */,
 				BB2F184A2A0C911B0003F65E /* KMBaseWindowController.swift in Sources */,
-				BBC70EB02AEA80EC00AC1585 /* KMToolbarCustomWindowController.swift in Sources */,
 				BBB3FF982B567D0300145C4A /* KMApplication.swift in Sources */,
 				BB0353C82B2987C40048A16C /* KMSnapshotWindow.swift in Sources */,
 				BBB7B4912A03AD2A00B58A5A /* KMPDFEditToolbar.swift in Sources */,
 				ADAFDA252AE8DE1B00F084BC /* KMAdvertisementModel.swift in Sources */,
 				9FDD0FAE29534FDC000C4DAD /* KMCompLight.swift in Sources */,
 				AD055EC42B8846EB0035F824 /* SKOutlineView.m in Sources */,
-				BB072D5E2C05AC8F00779B45 /* KMToolbarConfigViewItem.swift in Sources */,
 				AD7D5CA52B8F35D1006562CD /* SKPDFSyncRecord.m in Sources */,
-				BB072D562C057BD600779B45 /* KMToolbarConfigWindowController.swift in Sources */,
 				AD85D19E2AEF927D000F4D28 /* KMQucikToolsModel.swift in Sources */,
 				BB10FAF62AFE2C2900F18D65 /* KMNumberArrayFormatter.swift in Sources */,
 				ADFCEB362B4F78220001EBAF /* KMFile.swift in Sources */,
@@ -16832,7 +16735,6 @@
 				BB0FE0522B734DD1001E0F88 /* AIUserInfoController.swift in Sources */,
 				ADE86AEE2B0AF56200414DFA /* KMCompareCoveringSettingView.swift in Sources */,
 				BB2C6AC928F4085200478A33 /* CPDFListView.m in Sources */,
-				BBBC087E2B2A93DB009B237F /* KMToolbarMainItemView.swift in Sources */,
 				AD1D480F2AFB1907007AC1F0 /* KMCompressView.swift in Sources */,
 				656C1E312CD0745200295F82 /* KMConvertImageSettingView.swift in Sources */,
 				BBFBE6C028DD7B97008B2335 /* ViewController.swift in Sources */,
@@ -17153,7 +17055,6 @@
 				ADDF83352B391A5C00A81A4E /* CPDFListViewConfig.m in Sources */,
 				BBB9B32B299A5D6D004F3235 /* GTMOAuth2KeychainCompatibility.m in Sources */,
 				AD3AAD752B0DCEAA00DE5FE7 /* KMCompareSaveView.swift in Sources */,
-				BB66472B2C06DD9C00924EE0 /* KMToolbarConfigTBItemView.swift in Sources */,
 				65F9F4852CFC16A100F187A8 /* KMNSearchHanddler.swift in Sources */,
 				BB146FB7299DC0D100784A6A /* GTLRRuntimeCommon.m in Sources */,
 				BB3A429E2B4BF03A006D0642 /* KMSystemPDFMenu.swift in Sources */,
@@ -17254,7 +17155,6 @@
 				AD3AAD6D2B0DCC6800DE5FE7 /* KMCompareSaveWindow.swift in Sources */,
 				9F8539D22943121100DF644E /* KMSegmentedBox.swift in Sources */,
 				9F1FE4DB29406E4700E952CA /* NSURL+Utils.m in Sources */,
-				BBD3C8B62B2C438F00EB0867 /* KMToolbarPreviousNextItemView.swift in Sources */,
 				BBFEF71F2B3A787900C28AC0 /* KMSystemAnnotationMenu.swift in Sources */,
 				8942F817292B678100389627 /* KMAnnotationTableCellView.swift in Sources */,
 				9FE0BBF02B0F2FB000CD1CAC /* KMAnnotationLineWindowController.swift in Sources */,
@@ -17286,7 +17186,6 @@
 				9F1FE49C29406E4700E952CA /* HoverCloseButton.m in Sources */,
 				BB90E4F22AF37F9F00B04B9F /* KMCustomViewButton.swift in Sources */,
 				AD9527D72952ED970039D2BC /* KMPrintPresenter_C.swift in Sources */,
-				BBA00AC42B157C880043D903 /* KMToolbarZoomItemView.swift in Sources */,
 				BB853C992AF8E39D009C20C1 /* KMRemovePasswordOperationQueue.swift in Sources */,
 				BB31981A2AC567B500107371 /* CPDFSelection+PDFListView.swift in Sources */,
 				ADDF83B02B391A5D00A81A4E /* KMDSignatureManager.m in Sources */,
@@ -17426,7 +17325,6 @@
 				ADAAC1642BD645DB001F2DA6 /* KMRecommondPopWindow.m in Sources */,
 				BB67EE1A2B54FFEF00573BF0 /* ASIHTTPRequest.m in Sources */,
 				BB1B0AFB2B4FC6E900889528 /* KMCustomColorGuideView.swift in Sources */,
-				BB948CFE2BFF63C9000FBA01 /* KMToolbarConfigViewController.swift in Sources */,
 				BBB789872BE8BF2300F7E09C /* AINewConfigWindowController.swift in Sources */,
 				9F0CB4D92986553600007028 /* KMDesignToken+VerticalPadding.swift in Sources */,
 				BBF19E992B0B3218007154C8 /* KMAnnotationStamp.swift in Sources */,
@@ -17536,7 +17434,6 @@
 				ADE86A9E2B031FDB00414DFA /* KMCompareWindowController.swift in Sources */,
 				BB99ACC3292DE22E0048AFD9 /* KMMergeViewController.swift in Sources */,
 				F3C7984F2CD0F62A008A18E2 /* CPDFDocument+PageEditManager.swift in Sources */,
-				BB072D572C057BD600779B45 /* KMToolbarConfigWindowController.swift in Sources */,
 				9F5752EA2B58FF73005DC303 /* KMAnnotationFromViewController.swift in Sources */,
 				9F8810962B56877C00F69815 /* KMAnnotationChoiceWidgetOptionsViewController.swift in Sources */,
 				BB031B732C47BB080099F7AD /* KMUserFbEmailItemView.swift in Sources */,
@@ -17546,7 +17443,6 @@
 				9FBA0EFF29015A82001117AF /* KMFastToolCollectionViewItem.swift in Sources */,
 				BB003036298D356E002DD1A0 /* KMPreferenceMarkupColorView.swift in Sources */,
 				ADDF838A2B391A5D00A81A4E /* DSignatureFileListCellView.swift in Sources */,
-				BB66472C2C06DD9C00924EE0 /* KMToolbarConfigTBItemView.swift in Sources */,
 				BB8810BF2B4F872500AFA63E /* KMVerificationWindowController.m in Sources */,
 				ADE614AD29779C5200F62ED7 /* KMImageTitleButton.swift in Sources */,
 				9FF94F0A29A62B5000B1EF69 /* KMDesignSelect.swift in Sources */,
@@ -17569,7 +17465,6 @@
 				F30B22862CB8D9630041002E /* KMNQuickToolCollectionViewItem.swift in Sources */,
 				654E63322CF5993C00F6323F /* KMNOutlineModel.swift in Sources */,
 				BBD426802B4FCF1500AC8660 /* KMTextFieldCell.swift in Sources */,
-				BBA00AC52B157C880043D903 /* KMToolbarZoomItemView.swift in Sources */,
 				BB1B0AC62B4FC6E900889528 /* KMGuideInfoWindow.swift in Sources */,
 				9F69DBBB2B55014F003D4C45 /* KMAnnotationButtonWidgetAppearanceViewController.swift in Sources */,
 				AD1D48222AFB6BBA007AC1F0 /* KMMergeView.swift in Sources */,
@@ -17899,7 +17794,6 @@
 				651961AF2D07DD4A007A4324 /* KMBookMarkViewController.swift in Sources */,
 				BB072D672C05B44300779B45 /* KMToolbarConfigModel.swift in Sources */,
 				BB147024299DC0D100784A6A /* OIDResponseTypes.m in Sources */,
-				65A971292CBA1792008DB0F9 /* KMToolbarPageInputItemView.swift in Sources */,
 				ADE86AE72B0AF50B00414DFA /* KMCompareCoveringSettingWindowController.swift in Sources */,
 				AD9527CB295297B70039D2BC /* KMPrintModel.swift in Sources */,
 				AD867FA229DEB4B000F00440 /* KMBOTAAnnotationTool.swift in Sources */,
@@ -17973,7 +17867,6 @@
 				BB146FE2299DC0D100784A6A /* GTLRDriveQuery.m in Sources */,
 				BB4583C02CC8C53C005737F3 /* KMPDFToolbarConfig.swift in Sources */,
 				BBD1F794296FE92500343885 /* KMPageEditSplitSettingView.swift in Sources */,
-				BB072D5F2C05AC8F00779B45 /* KMToolbarConfigViewItem.swift in Sources */,
 				F38FB9402CBA535C00F0DBA5 /* KMNHomeQuickToolManager.swift in Sources */,
 				89E4E756296427E5002DBA6F /* NSImage_SKExtensions.m in Sources */,
 				AD1D481A2AFB6B96007AC1F0 /* KMMergeWindowController.swift in Sources */,
@@ -17992,7 +17885,6 @@
 				BBE01DC22BF60D9200304FA4 /* KMTabStripController.swift in Sources */,
 				9F1FE4BB29406E4700E952CA /* NSImage+CTAdditions.m in Sources */,
 				8997012028F41AB8009AF911 /* KMLeftSideViewController.swift in Sources */,
-				BBC70EB12AEA80EC00AC1585 /* KMToolbarCustomWindowController.swift in Sources */,
 				ADBC2D12299CCD05006280C8 /* KMTextfieldButton.swift in Sources */,
 				653647EB2CDCA85400CDB13E /* KMBatchOperateFile.swift in Sources */,
 				BBEFD0252AFA065F003FABD8 /* KMBatchAddHeaderFooterOperation.swift in Sources */,
@@ -18321,7 +18213,6 @@
 				9F53D5542AD683A700CCF9D8 /* KMAnnotationPropertyBaseController.swift in Sources */,
 				AD07BC982D02CBA90075054B /* KMCompressSettingViewController.swift in Sources */,
 				BB2EDF47296E4618003BCF58 /* KMPageEditTools.swift in Sources */,
-				BBBC087F2B2A93DB009B237F /* KMToolbarMainItemView.swift in Sources */,
 				ADDF833C2B391A5C00A81A4E /* CPDFSignatureWidgetAnnotation+PDFListView.m in Sources */,
 				9FF371CC2C69B8AE005F9CC5 /* KMMeasureSideVC.swift in Sources */,
 				651675D42CE3312000019A20 /* KMBOTAOutlineRowView.swift in Sources */,
@@ -18373,7 +18264,6 @@
 				BB147003299DC0D100784A6A /* OIDScopeUtilities.m in Sources */,
 				BBE788CD2CBD2463008086E2 /* NavigationDemoVC.swift in Sources */,
 				BB1B0AF62B4FC6E900889528 /* KMConvertGuideView.swift in Sources */,
-				BB948CFF2BFF63C9000FBA01 /* KMToolbarConfigViewController.swift in Sources */,
 				AD867FA729DFB77500F00440 /* KMAnnotationOutlineView.swift in Sources */,
 				BBB9B32C299A5D6D004F3235 /* GTMOAuth2KeychainCompatibility.m in Sources */,
 				AD9527D82952ED970039D2BC /* KMPrintPresenter_C.swift in Sources */,
@@ -18492,7 +18382,6 @@
 				9F8539D32943121100DF644E /* KMSegmentedBox.swift in Sources */,
 				9FB221082B19BD8B00A5B208 /* KMGeneralAnnotationViewController.swift in Sources */,
 				AD9527C3295294EF0039D2BC /* KMPrintPaperModel.swift in Sources */,
-				BBD3C8B72B2C438F00EB0867 /* KMToolbarPreviousNextItemView.swift in Sources */,
 				9FD0D2A42AD4ECA900DA3FF8 /* KMPDFEditAppendCustomView.swift in Sources */,
 				ADDF835A2B391A5C00A81A4E /* CDSignatureCertificateStateViewController.swift in Sources */,
 				656C1E5B2CD0DF1B00295F82 /* KMConvertJsonWindowController.swift in Sources */,
@@ -18802,7 +18691,6 @@
 				AD1CA4232A061D190070541F /* KMAnnotationScreenAuthorViewItem.swift in Sources */,
 				BB031B712C47BB080099F7AD /* KMUserFbTypeItemView.swift in Sources */,
 				ADE3C1EF29A5AFB100793B13 /* KMRequestServerManager.swift in Sources */,
-				BBC70EB22AEA80EC00AC1585 /* KMToolbarCustomWindowController.swift in Sources */,
 				9F1FE4B629406E4700E952CA /* CTBrowser.m in Sources */,
 				AD055E272B70B3C10035F824 /* KMBookmarkController.swift in Sources */,
 				651675DE2CE3312000019A20 /* KMBOTAOutlineItem.swift in Sources */,
@@ -18902,11 +18790,9 @@
 				BB6DD823293497B6001F0544 /* KMSecureEncryptModel.swift in Sources */,
 				ADE86AF02B0AF56200414DFA /* KMCompareCoveringSettingView.swift in Sources */,
 				BB35732F2AF50068004CDA92 /* KMBatchOperateConvertViewController.swift in Sources */,
-				BB072D602C05AC8F00779B45 /* KMToolbarConfigViewItem.swift in Sources */,
 				89D2D2E0294C451400BFF5FE /* KMThumbnailViewController.swift in Sources */,
 				BB0FE0622B7351AA001E0F88 /* AIInfoManager.m in Sources */,
 				ADDEEA642AD3A6E700EF675D /* KMTextSignatureView.swift in Sources */,
-				BB072D582C057BD600779B45 /* KMToolbarConfigWindowController.swift in Sources */,
 				89752DF82938A236003FF08E /* PublicKey.swift in Sources */,
 				BB67EE282B54FFEF00573BF0 /* ASINetworkQueue.m in Sources */,
 				9F1FE4D429406E4700E952CA /* CTTabView.m in Sources */,
@@ -19223,7 +19109,6 @@
 				BBA9221A2B4E783F0061057A /* KMPurchaseCompareDMGWindowController.m in Sources */,
 				BB031B902C47CEFA0099F7AD /* KMUserFeekbackHanddler.swift in Sources */,
 				9F1FE4DA29406E4700E952CA /* NSString+Utils.m in Sources */,
-				BBA00AC62B157C880043D903 /* KMToolbarZoomItemView.swift in Sources */,
 				BB4EEF4E2976544F003A3537 /* KMRedactAligementView.swift in Sources */,
 				F37322E9292DF9410013862C /* CPDFAnnotationModel.m in Sources */,
 				BB99ACCC292DEE6E0048AFD9 /* KMMergeTitleBar.swift in Sources */,
@@ -19264,7 +19149,6 @@
 				BB0A551F2A30793F00B6E84B /* KMDesignTextField.swift in Sources */,
 				BB146FCE299DC0D100784A6A /* GTMSessionUploadFetcher.m in Sources */,
 				BB10FAF82AFE2C2900F18D65 /* KMNumberArrayFormatter.swift in Sources */,
-				65A9712A2CBA1792008DB0F9 /* KMToolbarPageInputItemView.swift in Sources */,
 				BB3198142AC5142900107371 /* NSMenu+KMExtension.swift in Sources */,
 				9F5752EB2B58FF73005DC303 /* KMAnnotationFromViewController.swift in Sources */,
 				ADD1B6E62946C00800C3FFF7 /* KMPrintChoosePageSizePosterView.swift in Sources */,
@@ -19598,7 +19482,6 @@
 				9F72D20A2994BDAF00DCACF1 /* KMNotificationVC.swift in Sources */,
 				BB2F78A82D01F9EF00F6B636 /* KMCreateSignWindowController.swift in Sources */,
 				BB3D970C2B2FEAC8007094C8 /* KMPDFRedactViewController.swift in Sources */,
-				BB66472D2C06DD9C00924EE0 /* KMToolbarConfigTBItemView.swift in Sources */,
 				BBB7B48F2A0384E100B58A5A /* NSCollectionViewItem+KMExtension.swift in Sources */,
 				BB0B30612D098AD8003F54D3 /* CPDFEditArea_Extension.swift in Sources */,
 				BB146FFE299DC0D100784A6A /* OIDAuthState+Mac.m in Sources */,
@@ -19793,7 +19676,6 @@
 				BB3A81B22AC2B82A006FC66C /* KMPageSizeTool.swift in Sources */,
 				9FD0D2A52AD4ECA900DA3FF8 /* KMPDFEditAppendCustomView.swift in Sources */,
 				BB043F4D2D018487000244A2 /* KMStampListItem.swift in Sources */,
-				BBBC08802B2A93DB009B237F /* KMToolbarMainItemView.swift in Sources */,
 				ADAFDA4A2AEA7F1300F084BC /* KMAdvertisementShowView.swift in Sources */,
 				BB031B682C47BB080099F7AD /* KMUserFbListModel.swift in Sources */,
 				AD8F06192999DB5900D93CBC /* KMPrintDrawPage.swift in Sources */,
@@ -19855,7 +19737,6 @@
 				65B143A32CF06B97001B5A69 /* Date+KMExtensions.swift in Sources */,
 				656C1E3F2CD0745200295F82 /* KMConvertExcelSettingView.swift in Sources */,
 				9F1F82D4292F6D510092C4B4 /* KMPDFInsertPreviewViewController.swift in Sources */,
-				BBD3C8B82B2C438F00EB0867 /* KMToolbarPreviousNextItemView.swift in Sources */,
 				ADDEEA7C2AD3F4C800EF675D /* KMPopUpButton.swift in Sources */,
 				BB93CDE72AE757A000B29C57 /* KMToolbarItemView.swift in Sources */,
 				BB24FFDF2B28578C00A59054 /* KMTTSWindowController.swift in Sources */,
@@ -19868,7 +19749,6 @@
 				9F0201672A176AF200C9B673 /* KMDottedLineView.swift in Sources */,
 				ADAAC1662BD645DB001F2DA6 /* KMRecommondPopWindow.m in Sources */,
 				9F02017B2A1B5C0300C9B673 /* KMAIServerConfig.swift in Sources */,
-				BB948D002BFF63C9000FBA01 /* KMToolbarConfigViewController.swift in Sources */,
 				F39603E92CC641D2003C6F71 /* KMNThumbnailManager.swift in Sources */,
 				BBB789892BE8BF2300F7E09C /* AINewConfigWindowController.swift in Sources */,
 				9FCFEC722AC40F9B00EAD2CB /* CStampSignatureObject.swift in Sources */,

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

@@ -2993,7 +2993,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "4111"
             endingLineNumber = "4111"
-            landmarkName = "exitRedact()"
+            landmarkName = "enterRedact()"
             landmarkType = "7">
             <Locations>
                <Location
@@ -3071,8 +3071,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "4443"
             endingLineNumber = "4443"
-            landmarkName = "enterPageEdit(_:)"
-            landmarkType = "7">
+            landmarkName = "KMMainViewController"
+            landmarkType = "21">
             <Locations>
                <Location
                   uuid = "4E0E8246-D746-4D5F-A4A2-89C78AEA0880 - 4236ac58ecce8af8"