Merge branch 'develop_PDFReaderProV4.6.1' of git.kdan.cc:Mac_PDF/PDF_Office into develop_PDFReaderProV4.6.1

PDF Office/PDF Master/Class/PDFWindowController/MainWindowController/MainWindowController.xib

@@ -1,26 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="MainWindowController" customModule="PDF_Master" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="MainWindowController" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="PDFContendView" destination="Jh3-gZ-0xB" id="3wr-A9-S9T"/>
                 <outlet property="childToolbarController" destination="LGo-eS-kH9" id="1OE-wT-t4D"/>
-                <outlet property="toolbarController" destination="nx9-fp-KNE" id="0Sx-4Z-Npy"/>
                 <outlet property="toplayoutConstraint" destination="2qe-2G-Qjm" id="21Y-Qj-ZxA"/>
                 <outlet property="window" destination="F0z-JX-Cv5" id="gIp-Ho-8D9"/>
             </connections>
         </customObject>
-        <viewController id="nx9-fp-KNE" customClass="KMMainToolbarController" customModule="PDF_Master" customModuleProvider="target">
-            <connections>
-                <outlet property="mainWindowController" destination="-2" id="tJb-kJ-4Rn"/>
-            </connections>
-        </viewController>
-        <viewController id="LGo-eS-kH9" customClass="KMToolbarViewController" customModule="PDF_Master" customModuleProvider="target">
+        <viewController id="LGo-eS-kH9" customClass="KMToolbarViewController" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="mainWindowController" destination="-2" id="s4s-qR-3td"/>
             </connections>

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/AppKitCategories/NSCursor+PDFListView.m

@@ -196,6 +196,15 @@ static NSCursor *textSelfSignCursor = nil;
 + (NSImage *)scaleImage:(NSImage *)sourceImage scaleFactor:(CGFloat)scaleFactor {
     CGFloat width = sourceImage.size.width;
     CGFloat height = sourceImage.size.height;
+    if(width == 0)
+        width = 10.0;
+    
+    if(height == 0)
+        height = 10.0;
+    
+    if(scaleFactor == 0)
+        scaleFactor = 1.0;
+
     CGFloat scaledWidth = width * scaleFactor;
     CGFloat scaledHeight = height * scaleFactor;
     NSImage *newImage = [[NSImage alloc] initWithSize:NSMakeSize(scaledWidth, scaledHeight)];

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Event.m

@@ -5405,7 +5405,7 @@ static inline CPDFAreaOfInterest CAreaOfInterestForResizeHandle(CRectEdges mask,
         
         imageItem = [[NSPasteboardItem alloc] init];
         
-        [imageItem setData:tiffData forType:NSPasteboardTypeTIFF];
+        [imageItem setData:tiffData?:[NSData new] forType:NSPasteboardTypeTIFF];
         
         // 执行右键操作后，需要取消框选区域
         @synchronized (self) {

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

@@ -1,210 +0,0 @@
-//
-//  KMMainToolbarController.swift
-//  PDF Reader Pro
-//
-//  Created by lxy on 2022/12/1.
-//
-
-import Cocoa
-
-class SKToolbar : NSToolbar {
-    func allowsSizeMode(sizeMode:NSToolbar.SizeMode) -> Bool {
-        return true
-    }
-}
-
-@objc protocol KMMainToolbarControllerDelegate {
-    @objc optional func changeModelAction(mode : CToolMode)
-}
-
-class KMMainToolbarController: NSViewController{
-
-    @IBOutlet weak var leftControlButton: NSButton!
-    
-    @IBOutlet weak var pagebox: NSBox!
-    
-    @IBOutlet weak var beforePageButton: NSButton!
-    
-    @IBOutlet weak var nextPageButton: NSButton!
-    
-    @IBOutlet weak var annotationModelButton: NSButton!
-    
-    @IBOutlet weak var pageModelButton: NSButton!
-    
-    @IBOutlet weak var conversionModelButton: NSButton!
-    
-    @IBOutlet weak var scanORCModelButton: NSButton!
-    
-    @IBOutlet weak var editModelButton: NSButton!
-    
-    @IBOutlet weak var formModelButton: NSButton!
-    
-    @IBOutlet weak var signatureModelButton: NSButton!
-    
-    @IBOutlet weak var toolModelButton: NSButton!
-    
-    @IBOutlet weak var printModelButton: NSButton!
-    
-    @IBOutlet weak var shareModelButton: NSButton!
-    
-    @IBOutlet weak var rightControlButton: NSButton!
-    
-    @IBOutlet weak var zoomView: NSView!
-    
-    @IBOutlet weak  var mainWindowController : KMBrowserWindowController!
-    
-    open weak var delegate: KMMainToolbarControllerDelegate?
-    
-    var toolbarItems : [NSToolbarItem.Identifier : Any] = [:]
-    
-    private func nibName() -> String {
-        return "KMMainToolbarController"
-    }
-
-    func setupToolbar() {
-        
-        _ = self.view
-        
-        let toolbar : SKToolbar = SKToolbar.init(identifier: "KMDocumentToolbar")
-//        toolbar.allowsUserCustomization = true
-        toolbar.autosavesConfiguration = true
-        toolbar.displayMode = .default
-        toolbar.delegate = self
-        self.mainWindowController.window?.toolbar = toolbar
-        
-        self.mainWindowController.window?.titlebarAppearsTransparent = true
-//        self.mainWindowController.window?.backgroundColor = NSColor.red
-    }
-    
-    //MARK: Action
-    @IBAction func annotationButtonAction(item:NSMenuItem) {
-        
-    }
-    
-    @IBAction func leftControllButtonAction(item:NSMenuItem) {
-        
-    }
-    
-    @IBAction func editPDFButtonAction(item:NSMenuItem) {
-        self.delegate?.changeModelAction?(mode: .editPDFToolMode)
-    }
-}
-
-//MARK: NSToolbarDelegate
-
-extension KMMainToolbarController : NSToolbarDelegate ,NSToolbarItemValidation,NSMenuItemValidation{
-    func toolbar(_ toolbar: NSToolbar, itemForItemIdentifier itemIdentifier: NSToolbarItem.Identifier, willBeInsertedIntoToolbar flag: Bool) -> NSToolbarItem? {
-        var item = self.toolbarItems[itemIdentifier] as? KMToolbarItem
-        if item == nil {
-            item = KMToolbarItem.init(itemIdentifier: itemIdentifier)
-            self.toolbarItems[itemIdentifier] = item
-            if itemIdentifier.rawValue == KMLeftControlToolbarItemIdentifier {
-               let menuItem = NSMenuItem.init(title: "left", action: #selector(leftControllButtonAction), target: self)
-               item?.toolTip = NSLocalizedString("left", comment: "")
-               item?.setViewWithSizes(self.leftControlButton)
-               item?.menuFormRepresentation = menuItem
-           } else if itemIdentifier.rawValue == KMDocumentAnnotationToolbarItemIdentifier {
-                let menuItem = NSMenuItem.init(title: "Annotation", action: #selector(annotationButtonAction), target: self)
-                item?.toolTip = NSLocalizedString("Annotate PDF with highlight, text box and markup tools", comment: "")
-                item?.setViewWithSizes(self.annotationModelButton)
-                item?.menuFormRepresentation = menuItem
-            } else if itemIdentifier.rawValue == KMDocumentPageToolbarItemIdentifier {
-                let menuItem = NSMenuItem.init(title: "page", action: #selector(leftControllButtonAction), target: self)
-                item?.setViewWithSizes(self.pageModelButton)
-                item?.menuFormRepresentation = menuItem
-            } else if itemIdentifier.rawValue == KMDocumentConversonToolbarItemIdentifier {
-                let menuItem = NSMenuItem.init(title: "Converson", action: #selector(leftControllButtonAction), target: self)
-                item?.setViewWithSizes(self.conversionModelButton)
-                item?.menuFormRepresentation = menuItem
-            } else if itemIdentifier.rawValue == KMDocumentScanOCRToolbarItemIdentifier {
-                let menuItem = NSMenuItem.init(title: "scan", action: #selector(leftControllButtonAction), target: self)
-                item?.setViewWithSizes(self.scanORCModelButton)
-                item?.menuFormRepresentation = menuItem
-            } else if itemIdentifier.rawValue == KMDocumentAIToolsToolbarItemIdentifier {
-                let menuItem = NSMenuItem.init(title: "AI Tools", action: #selector(leftControllButtonAction), target: self)
-                item?.setViewWithSizes(self.scanORCModelButton)
-                item?.menuFormRepresentation = menuItem
-            } else if itemIdentifier.rawValue == KMDocumentEditToolbarItemIdentifier {
-                let menuItem = NSMenuItem.init(title: "edit", action: #selector(editPDFButtonAction), target: self)
-                item?.setViewWithSizes(self.editModelButton)
-                item?.menuFormRepresentation = menuItem
-            } else if itemIdentifier.rawValue == KMDocumentFillSginToolbarItemIdentifier {
-                let menuItem = NSMenuItem.init(title: "fillsign", action: #selector(leftControllButtonAction), target: self)
-                item?.setViewWithSizes(self.signatureModelButton)
-                item?.menuFormRepresentation = menuItem
-            }else if itemIdentifier.rawValue == KMDocumentFormToolbarItemIdentifier {
-                let menuItem = NSMenuItem.init(title: "form", action: #selector(leftControllButtonAction), target: self)
-                item?.setViewWithSizes(self.formModelButton)
-                item?.menuFormRepresentation = menuItem
-            } else if itemIdentifier.rawValue == KMDocumentToolToolbarItemIdentifier {
-                let menuItem = NSMenuItem.init(title: "tool", action: #selector(leftControllButtonAction), target: self)
-                item?.setViewWithSizes(self.toolModelButton)
-                item?.menuFormRepresentation = menuItem
-            } else if itemIdentifier.rawValue == KMDocumentPrintToolbarItemIdentifier {
-                let menuItem = NSMenuItem.init(title: "print", action: #selector(leftControllButtonAction), target: self)
-                item?.setViewWithSizes(self.printModelButton)
-                item?.menuFormRepresentation = menuItem
-            } else if itemIdentifier.rawValue == KMDocumentShareToolbarItemIdentifier {
-                let menuItem = NSMenuItem.init(title: "share", action: #selector(leftControllButtonAction), target: self)
-                item?.setViewWithSizes(self.shareModelButton)
-                item?.menuFormRepresentation = menuItem
-            } else if itemIdentifier.rawValue == KMRightControlToolbarItemIdentifier {
-                let menuItem = NSMenuItem.init(title: "right", action: #selector(leftControllButtonAction), target: self)
-                item?.setViewWithSizes(self.rightControlButton)
-                item?.menuFormRepresentation = menuItem
-            }
-        }
-        if flag == false {
-            item?.isEnabled = true
-        }
-        return item
-    }
-    
-    func toolbarDefaultItemIdentifiers(_ toolbar: NSToolbar) -> [NSToolbarItem.Identifier] {
-        return [NSToolbarItem.Identifier.space,
-                NSToolbarItem.Identifier(KMLeftControlToolbarItemIdentifier),
-                NSToolbarItem.Identifier.flexibleSpace,
-                NSToolbarItem.Identifier(KMDocumentAnnotationToolbarItemIdentifier),
-                NSToolbarItem.Identifier(KMDocumentPageToolbarItemIdentifier),
-                NSToolbarItem.Identifier(KMDocumentConversonToolbarItemIdentifier),
-                NSToolbarItem.Identifier(KMDocumentScanOCRToolbarItemIdentifier),
-                NSToolbarItem.Identifier(KMDocumentAIToolsToolbarItemIdentifier),
-                NSToolbarItem.Identifier(KMDocumentEditToolbarItemIdentifier),
-                NSToolbarItem.Identifier(KMDocumentFormToolbarItemIdentifier),
-                NSToolbarItem.Identifier(KMDocumentFillSginToolbarItemIdentifier),
-                NSToolbarItem.Identifier(KMDocumentToolToolbarItemIdentifier),
-                NSToolbarItem.Identifier.space,
-                NSToolbarItem.Identifier.flexibleSpace,
-                NSToolbarItem.Identifier(KMDocumentPrintToolbarItemIdentifier),
-                NSToolbarItem.Identifier(KMDocumentShareToolbarItemIdentifier),
-                NSToolbarItem.Identifier(KMRightControlToolbarItemIdentifier),
-                NSToolbarItem.Identifier.space]
-    }
-    
-    func toolbarAllowedItemIdentifiers(_ toolbar: NSToolbar) -> [NSToolbarItem.Identifier] {
-        return [NSToolbarItem.Identifier(KMLeftControlToolbarItemIdentifier),
-                NSToolbarItem.Identifier(KMDocumentAnnotationToolbarItemIdentifier),
-                NSToolbarItem.Identifier(KMDocumentPageToolbarItemIdentifier),
-                NSToolbarItem.Identifier(KMDocumentConversonToolbarItemIdentifier),
-                NSToolbarItem.Identifier(KMDocumentScanOCRToolbarItemIdentifier),
-                NSToolbarItem.Identifier(KMDocumentAIToolsToolbarItemIdentifier),
-                NSToolbarItem.Identifier(KMDocumentEditToolbarItemIdentifier),
-                NSToolbarItem.Identifier(KMDocumentFormToolbarItemIdentifier),
-                NSToolbarItem.Identifier(KMDocumentFillSginToolbarItemIdentifier),
-                NSToolbarItem.Identifier(KMDocumentToolToolbarItemIdentifier),
-                NSToolbarItem.Identifier.space,
-                NSToolbarItem.Identifier.flexibleSpace,
-                NSToolbarItem.Identifier(KMDocumentPrintToolbarItemIdentifier),
-                NSToolbarItem.Identifier(KMDocumentShareToolbarItemIdentifier),
-                NSToolbarItem.Identifier(KMRightControlToolbarItemIdentifier)]
-    }
-    
-    func validateToolbarItem(_ item: NSToolbarItem) -> Bool {
-        return true
-    }
-    
-    func validateMenuItem(_ menuItem: NSMenuItem) -> Bool {
-        return true
-    }
-    
-}

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

@@ -1,316 +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="KMMainToolbarController" customModule="PDF_Reader_Pro" customModuleProvider="target">
-            <connections>
-                <outlet property="annotationModelButton" destination="7rN-BM-QEo" id="tUC-mU-oIk"/>
-                <outlet property="beforePageButton" destination="oh6-n6-uAg" id="Z1D-OE-lZM"/>
-                <outlet property="conversionModelButton" destination="GJF-6L-NvR" id="JLA-la-ZGt"/>
-                <outlet property="editModelButton" destination="gdd-gN-kJf" id="ykZ-aT-1lY"/>
-                <outlet property="formModelButton" destination="Uh8-eR-r7c" id="NlO-PH-oLP"/>
-                <outlet property="leftControlButton" destination="UIO-jC-8nm" id="IPL-0H-Oyi"/>
-                <outlet property="nextPageButton" destination="SKm-CA-Isf" id="LS1-Th-01W"/>
-                <outlet property="pageModelButton" destination="qJG-O4-2sA" id="bGB-1n-JSs"/>
-                <outlet property="pagebox" destination="gLg-bQ-SqD" id="MVi-Yh-ul7"/>
-                <outlet property="printModelButton" destination="IHU-RO-IK0" id="2AW-3c-NZj"/>
-                <outlet property="rightControlButton" destination="8m2-5T-Bjt" id="w2T-4u-TkK"/>
-                <outlet property="scanORCModelButton" destination="rfL-1P-8Bb" id="yZT-1b-2RA"/>
-                <outlet property="shareModelButton" destination="pxZ-aP-OPP" id="8dt-tJ-Yom"/>
-                <outlet property="signatureModelButton" destination="K9I-Xa-kKJ" id="6df-yP-4ql"/>
-                <outlet property="toolModelButton" destination="rAe-Nl-9Fe" id="X6Y-Sv-jr5"/>
-                <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
-                <outlet property="zoomView" destination="qam-lw-Pnz" id="aLN-wu-b0m"/>
-            </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>
-                <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="UIO-jC-8nm">
-                    <rect key="frame" x="20" y="235" width="24" height="19"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="KMImageNameMainToolbarLeft" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="Hfi-Ei-HFb">
-                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
-                </button>
-                <box fixedFrame="YES" boxType="custom" borderType="none" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="gLg-bQ-SqD">
-                    <rect key="frame" x="64" y="229" width="29" height="31"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <view key="contentView" ambiguous="YES" id="WE9-y1-nFk">
-                        <rect key="frame" x="0.0" y="0.0" width="29" height="31"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <button translatesAutoresizingMaskIntoConstraints="NO" id="oh6-n6-uAg">
-                                <rect key="frame" x="0.0" y="-2" width="12" height="36"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="12" id="77T-Wc-KQS"/>
-                                </constraints>
-                                <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="NSGoBackTemplate" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="cQG-dO-5C4">
-                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="system"/>
-                                </buttonCell>
-                            </button>
-                            <button translatesAutoresizingMaskIntoConstraints="NO" id="SKm-CA-Isf">
-                                <rect key="frame" x="12" y="-2" width="12" height="36"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="12" id="YsY-aZ-OXn"/>
-                                </constraints>
-                                <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="NSGoForwardTemplate" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="Xaj-Ri-kkc">
-                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="system"/>
-                                </buttonCell>
-                            </button>
-                        </subviews>
-                        <constraints>
-                            <constraint firstItem="oh6-n6-uAg" firstAttribute="leading" secondItem="WE9-y1-nFk" secondAttribute="leading" id="0vJ-Ah-QdA"/>
-                            <constraint firstItem="oh6-n6-uAg" firstAttribute="top" secondItem="WE9-y1-nFk" secondAttribute="top" id="3xA-MY-QEj"/>
-                            <constraint firstAttribute="bottom" secondItem="SKm-CA-Isf" secondAttribute="bottom" id="W5O-8V-6G8"/>
-                            <constraint firstItem="SKm-CA-Isf" firstAttribute="top" secondItem="WE9-y1-nFk" secondAttribute="top" id="ZVX-qW-cfs"/>
-                            <constraint firstItem="SKm-CA-Isf" firstAttribute="leading" secondItem="oh6-n6-uAg" secondAttribute="trailing" id="pPs-Wm-Ngg"/>
-                            <constraint firstAttribute="trailing" secondItem="SKm-CA-Isf" secondAttribute="trailing" id="tyo-Xw-1nq"/>
-                            <constraint firstAttribute="bottom" secondItem="oh6-n6-uAg" secondAttribute="bottom" id="xbX-hT-prA"/>
-                        </constraints>
-                    </view>
-                </box>
-                <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7rN-BM-QEo">
-                    <rect key="frame" x="99" y="235" width="61" height="20"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <buttonCell key="cell" type="bevel" title="注释" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="PoO-gk-xam">
-                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
-                </button>
-                <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qJG-O4-2sA">
-                    <rect key="frame" x="157" y="234" width="61" height="20"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <buttonCell key="cell" type="bevel" title="页面" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="Sr1-lS-kFj">
-                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
-                </button>
-                <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="GJF-6L-NvR">
-                    <rect key="frame" x="215" y="234" width="61" height="20"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <buttonCell key="cell" type="bevel" title="转换" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="dop-fr-PIc">
-                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
-                </button>
-                <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="rfL-1P-8Bb">
-                    <rect key="frame" x="284" y="235" width="73" height="20"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <buttonCell key="cell" type="bevel" title="扫描和OCR" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="DxZ-bu-iop">
-                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
-                </button>
-                <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gdd-gN-kJf">
-                    <rect key="frame" x="372" y="235" width="73" height="20"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <buttonCell key="cell" type="bevel" title="编辑" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="m4J-0F-khD">
-                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
-                </button>
-                <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Uh8-eR-r7c">
-                    <rect key="frame" x="12" y="192" width="73" height="20"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <buttonCell key="cell" type="bevel" title="表单" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="ntu-8J-d8r">
-                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
-                </button>
-                <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="K9I-Xa-kKJ">
-                    <rect key="frame" x="93" y="192" width="73" height="20"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <buttonCell key="cell" type="bevel" title="填写和签名" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="Gad-X8-rg9">
-                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
-                </button>
-                <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="rAe-Nl-9Fe">
-                    <rect key="frame" x="174" y="192" width="73" height="20"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <buttonCell key="cell" type="bevel" title="工具" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="s3u-3R-4X5">
-                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
-                </button>
-                <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="IHU-RO-IK0">
-                    <rect key="frame" x="252" y="192" width="41" height="19"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="KMImageNameMainToolbarPrint" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="7Ga-5g-C9J">
-                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
-                </button>
-                <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="pxZ-aP-OPP">
-                    <rect key="frame" x="303" y="192" width="38" height="19"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="KMImageNameMainToolbarShare" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="F45-ft-dQL">
-                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
-                </button>
-                <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8m2-5T-Bjt">
-                    <rect key="frame" x="358" y="192" width="39" height="19"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="KMImageNameMainToolbarrRight" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="mIQ-UV-REy">
-                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
-                </button>
-                <customView translatesAutoresizingMaskIntoConstraints="NO" id="qam-lw-Pnz">
-                    <rect key="frame" x="123" y="143" width="147" height="26"/>
-                    <subviews>
-                        <button translatesAutoresizingMaskIntoConstraints="NO" id="Gho-8g-gQz" customClass="KMButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                            <rect key="frame" x="31" y="3" width="21" height="20"/>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="21" id="BDG-kM-IIw"/>
-                                <constraint firstAttribute="height" constant="20" id="Jlp-3D-Khc"/>
-                            </constraints>
-                            <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="KMImageNameMainToolbarUp" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="GEB-92-g02">
-                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                <font key="font" metaFont="system"/>
-                            </buttonCell>
-                        </button>
-                        <button translatesAutoresizingMaskIntoConstraints="NO" id="qhn-QX-WTv" customClass="KMButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                            <rect key="frame" x="10" y="3" width="21" height="20"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="20" id="4wK-rQ-jVL"/>
-                                <constraint firstAttribute="width" constant="21" id="jbN-tG-UPp"/>
-                            </constraints>
-                            <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="KMImageNameMainToolbardown" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="IDx-q4-RRL">
-                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                <font key="font" metaFont="system"/>
-                            </buttonCell>
-                        </button>
-                        <box boxType="custom" borderWidth="0.0" cornerRadius="2" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="f27-fW-uqF">
-                            <rect key="frame" x="62" y="0.0" width="75" height="26"/>
-                            <view key="contentView" id="gXA-7a-wSc">
-                                <rect key="frame" x="0.0" y="0.0" width="75" height="26"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                <subviews>
-                                    <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="b9o-1s-DWu" customClass="KMToolbarTextField">
-                                        <rect key="frame" x="0.0" y="5" width="60" height="16"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" constant="60" id="p09-7y-GoM"/>
-                                        </constraints>
-                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" focusRingType="none" alignment="left" title="100%" drawsBackground="YES" id="A2D-wy-bAc" customClass="KMTextFieldCenterCell">
-                                            <numberFormatter key="formatter" formatterBehavior="10_0" positiveFormat="0%" negativeFormat="-0%" hasThousandSeparators="NO" thousandSeparator="," id="0Hb-X4-rXs">
-                                                <attributedString key="attributedStringForZero">
-                                                    <fragment content="0%"/>
-                                                </attributedString>
-                                                <real key="minimum" value="10"/>
-                                                <real key="maximum" value="10000"/>
-                                            </numberFormatter>
-                                            <font key="font" metaFont="system"/>
-                                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
-                                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                        </textFieldCell>
-                                    </textField>
-                                    <popUpButton translatesAutoresizingMaskIntoConstraints="NO" id="RRZ-MS-sby" customClass="KMPopUpButton">
-                                        <rect key="frame" x="55" y="3" width="20" height="20"/>
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="20" id="rp5-Ev-IOe"/>
-                                            <constraint firstAttribute="width" constant="15" id="vqZ-qv-5uP"/>
-                                        </constraints>
-                                        <popUpButtonCell key="cell" type="bevel" title="Item" bezelStyle="regularSquare" alignment="left" lineBreakMode="truncatingTail" tag="10000" imageScaling="proportionallyDown" inset="2" pullsDown="YES" arrowPosition="noArrow" autoenablesItems="NO" altersStateOfSelectedItem="NO" selectedItem="IT8-x6-bkY" id="QAQ-ql-lSU" userLabel="Fit ">
-                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                            <font key="font" metaFont="menu"/>
-                                            <menu key="menu" autoenablesItems="NO" id="2v3-OI-ULU">
-                                                <items>
-                                                    <menuItem title="Item" image="KMImageNameUXIconBtnArrowDown" tag="10000" hidden="YES" id="IT8-x6-bkY">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                    </menuItem>
-                                                    <menuItem title="Automatically Resize" id="aoq-ic-Xup"/>
-                                                    <menuItem title="Actual Size" tag="1" id="BwF-6v-wYi">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                    </menuItem>
-                                                    <menuItem title="Zoom To Fit" tag="2" id="fsb-vI-dQR">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                    </menuItem>
-                                                    <menuItem isSeparatorItem="YES" tag="2" id="JzG-hN-2uq"/>
-                                                    <menuItem title="10%" tag="3" id="DjU-Ep-AIp"/>
-                                                    <menuItem title="25%" tag="4" id="STC-WF-Zu1"/>
-                                                    <menuItem title="50%" tag="5" id="xlP-Ta-5hz">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                    </menuItem>
-                                                    <menuItem title="75%" tag="6" id="Vbe-wT-JBM">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                    </menuItem>
-                                                    <menuItem title="100%" tag="7" id="J2f-rb-SNW">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                    </menuItem>
-                                                    <menuItem title="150%" tag="8" id="2Wi-3Q-TPK">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                    </menuItem>
-                                                    <menuItem title="200%" tag="9" id="0d2-pL-IWC">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                    </menuItem>
-                                                    <menuItem title="400%" tag="10" id="RvV-L2-LFq">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                    </menuItem>
-                                                    <menuItem title="600%" tag="11" id="652-vM-dwC">
-                                                        <modifierMask key="keyEquivalentModifierMask"/>
-                                                    </menuItem>
-                                                </items>
-                                            </menu>
-                                        </popUpButtonCell>
-                                    </popUpButton>
-                                </subviews>
-                                <constraints>
-                                    <constraint firstItem="b9o-1s-DWu" firstAttribute="leading" secondItem="gXA-7a-wSc" secondAttribute="leading" id="8IB-cR-Bs2"/>
-                                    <constraint firstAttribute="trailing" secondItem="RRZ-MS-sby" secondAttribute="trailing" id="FDF-74-NkC"/>
-                                    <constraint firstItem="RRZ-MS-sby" firstAttribute="centerY" secondItem="gXA-7a-wSc" secondAttribute="centerY" id="Ifl-iy-hh2"/>
-                                    <constraint firstItem="RRZ-MS-sby" firstAttribute="leading" secondItem="b9o-1s-DWu" secondAttribute="trailing" id="fN9-SD-fkm"/>
-                                    <constraint firstItem="b9o-1s-DWu" firstAttribute="centerY" secondItem="gXA-7a-wSc" secondAttribute="centerY" id="m3F-Wv-fB6"/>
-                                </constraints>
-                            </view>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="26" id="Df2-1t-eAW"/>
-                            </constraints>
-                            <color key="borderColor" red="0.85490196080000003" green="0.85490196080000003" blue="0.85490196080000003" alpha="1" colorSpace="calibratedRGB"/>
-                            <color key="fillColor" red="0.96470588239999999" green="0.96470588239999999" blue="0.96470588239999999" alpha="1" colorSpace="calibratedRGB"/>
-                        </box>
-                    </subviews>
-                    <constraints>
-                        <constraint firstItem="qhn-QX-WTv" firstAttribute="leading" secondItem="qam-lw-Pnz" secondAttribute="leading" constant="10" id="DIx-cj-cbo"/>
-                        <constraint firstAttribute="bottom" secondItem="f27-fW-uqF" secondAttribute="bottom" id="Evj-5L-pGp"/>
-                        <constraint firstItem="f27-fW-uqF" firstAttribute="leading" secondItem="Gho-8g-gQz" secondAttribute="trailing" constant="10" id="GI2-hB-R06"/>
-                        <constraint firstAttribute="trailing" secondItem="f27-fW-uqF" secondAttribute="trailing" constant="10" id="L9l-4d-z5j"/>
-                        <constraint firstItem="Gho-8g-gQz" firstAttribute="leading" secondItem="qhn-QX-WTv" secondAttribute="trailing" id="LtA-Rh-3VC"/>
-                        <constraint firstItem="Gho-8g-gQz" firstAttribute="centerY" secondItem="qam-lw-Pnz" secondAttribute="centerY" id="Yyv-jb-klg"/>
-                        <constraint firstItem="qhn-QX-WTv" firstAttribute="centerY" secondItem="qam-lw-Pnz" secondAttribute="centerY" id="Z1f-9z-vFa"/>
-                        <constraint firstItem="f27-fW-uqF" firstAttribute="top" secondItem="qam-lw-Pnz" secondAttribute="top" id="tb0-6W-9LX"/>
-                        <constraint firstItem="Gho-8g-gQz" firstAttribute="leading" secondItem="qhn-QX-WTv" secondAttribute="trailing" id="ubo-Aa-mPL"/>
-                    </constraints>
-                </customView>
-            </subviews>
-            <constraints>
-                <constraint firstItem="qam-lw-Pnz" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="103" id="Zxa-gV-BDi"/>
-                <constraint firstItem="qam-lw-Pnz" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="123" id="gd4-Tq-lSW"/>
-            </constraints>
-            <point key="canvasLocation" x="66" y="63"/>
-        </customView>
-    </objects>
-    <resources>
-        <image name="KMImageNameMainToolbarLeft" width="20" height="20"/>
-        <image name="KMImageNameMainToolbarPrint" width="20" height="20"/>
-        <image name="KMImageNameMainToolbarShare" width="20" height="20"/>
-        <image name="KMImageNameMainToolbarUp" width="20" height="20"/>
-        <image name="KMImageNameMainToolbardown" width="20" height="20"/>
-        <image name="KMImageNameMainToolbarrRight" width="20" height="16"/>
-        <image name="KMImageNameUXIconBtnArrowDown" width="17" height="16"/>
-        <image name="NSGoBackTemplate" width="10" height="14"/>
-        <image name="NSGoForwardTemplate" width="10" height="14"/>
-    </resources>
-</document>

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

@@ -3545,9 +3545,9 @@ extension KMMainViewController: KMSecondaryViewControllerDelegate {
 }
 
 // MARK: -
-// MARK: - KMMainToolbarControllerDelegate
+// MARK: - KMToolbarViewControllerDelegate
 
-extension KMMainViewController : KMMainToolbarControllerDelegate {
+extension KMMainViewController : KMToolbarViewControllerDelegate {
     func changeModelAction(mode: CToolMode) {
         self.listView.toolMode = mode
         if mode == .editPDFToolMode {
@@ -3616,6 +3616,13 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
             break
         }
        viewController.zoomTextField.stringValue =  "\(Int(self.listView.scaleFactor*100))%"
+       
+       if self.digitalSignController?.pdfView != nil {
+           self.digitalSignController?.pdfView.scaleFactor = self.listView.scaleFactor
+       }
+       if self.redactController?.redactPdfView != nil {
+           self.redactController?.redactPdfView.scaleFactor = self.listView.scaleFactor
+       }
     }
     
     func toolbarViewController(_ viewController: KMToolbarViewController, zoomSting: String) {
@@ -3629,6 +3636,13 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
             self.listView.scaleFactor = scale
         }
         
+        if self.digitalSignController?.pdfView != nil {
+            self.digitalSignController?.pdfView.scaleFactor = self.listView.scaleFactor
+        }
+        if self.redactController?.redactPdfView != nil {
+            self.redactController?.redactPdfView.scaleFactor = self.listView.scaleFactor
+        }
+        
         viewController.zoomTextField.stringValue =  "\(Int(self.listView.scaleFactor*100))%"
     }
     

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

@@ -156,12 +156,6 @@
 		89752DB02936F505003FF08E /* KMCustomButtonPopMenuViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 89752DAD2936F505003FF08E /* KMCustomButtonPopMenuViewController.xib */; };
 		89752DB12936F505003FF08E /* KMCustomButtonPopMenuViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 89752DAD2936F505003FF08E /* KMCustomButtonPopMenuViewController.xib */; };
 		89752DB22936F505003FF08E /* KMCustomButtonPopMenuViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 89752DAD2936F505003FF08E /* KMCustomButtonPopMenuViewController.xib */; };
-		89752DEA293875FC003FF08E /* KMMainToolbarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89752DE8293875FC003FF08E /* KMMainToolbarController.swift */; };
-		89752DEB293875FC003FF08E /* KMMainToolbarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89752DE8293875FC003FF08E /* KMMainToolbarController.swift */; };
-		89752DEC293875FC003FF08E /* KMMainToolbarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89752DE8293875FC003FF08E /* KMMainToolbarController.swift */; };
-		89752DED293875FC003FF08E /* KMMainToolbarController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 89752DE9293875FC003FF08E /* KMMainToolbarController.xib */; };
-		89752DEE293875FC003FF08E /* KMMainToolbarController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 89752DE9293875FC003FF08E /* KMMainToolbarController.xib */; };
-		89752DEF293875FC003FF08E /* KMMainToolbarController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 89752DE9293875FC003FF08E /* KMMainToolbarController.xib */; };
 		89752DF229389F82003FF08E /* KMToolbarItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 89752DF029389F81003FF08E /* KMToolbarItem.m */; };
 		89752DF329389F82003FF08E /* KMToolbarItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 89752DF029389F81003FF08E /* KMToolbarItem.m */; };
 		89752DF429389F82003FF08E /* KMToolbarItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 89752DF029389F81003FF08E /* KMToolbarItem.m */; };
@@ -5690,8 +5684,6 @@
 		896933D329AEEE3D0055327F /* PageSheet.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PageSheet.xib; sourceTree = "<group>"; };
 		89752DA32936ECD5003FF08E /* Masonry.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Masonry.framework; sourceTree = "<group>"; };
 		89752DAD2936F505003FF08E /* KMCustomButtonPopMenuViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KMCustomButtonPopMenuViewController.xib; sourceTree = "<group>"; };
-		89752DE8293875FC003FF08E /* KMMainToolbarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMMainToolbarController.swift; sourceTree = "<group>"; };
-		89752DE9293875FC003FF08E /* KMMainToolbarController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMMainToolbarController.xib; sourceTree = "<group>"; };
 		89752DF029389F81003FF08E /* KMToolbarItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMToolbarItem.m; sourceTree = "<group>"; };
 		89752DF129389F82003FF08E /* KMToolbarItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMToolbarItem.h; sourceTree = "<group>"; };
 		89752DF52938A236003FF08E /* PublicKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublicKey.swift; sourceTree = "<group>"; };
@@ -8214,8 +8206,6 @@
 				BB93CDE82AE7B6E100B29C57 /* KMToolbarView.swift */,
 				BB93CDE42AE757A000B29C57 /* KMToolbarItemView.swift */,
 				BBBC087D2B2A93DB009B237F /* KMToolbarMainItemView.swift */,
-				89752DE8293875FC003FF08E /* KMMainToolbarController.swift */,
-				89752DE9293875FC003FF08E /* KMMainToolbarController.xib */,
 				89752E022939DB42003FF08E /* KMToolbarViewController.swift */,
 				89752E032939DB42003FF08E /* KMToolbarViewController.xib */,
 				9FCFEC832AD0EF6700EAD2CB /* KMCustomButtonPopMenuViewController.swift */,
@@ -15182,7 +15172,6 @@
 				BB183DD42B4EAD5400F99C7E /* Ubuntu-Bold.ttf in Resources */,
 				9FB220DA2B0F4ED400A5B208 /* KMAnnotationSelectLinkViewController.xib in Resources */,
 				BB031B5A2C47BB080099F7AD /* KMUserFbHelpPopController.xib in Resources */,
-				89752DED293875FC003FF08E /* KMMainToolbarController.xib in Resources */,
 				9FAAA335290BD0A20046FFCE /* KMHistoryFileCollectionViewItem.xib in Resources */,
 				ADD1B6CB2942E85300C3FFF7 /* KMPrintBottomView.xib in Resources */,
 				89752DB02936F505003FF08E /* KMCustomButtonPopMenuViewController.xib in Resources */,
@@ -15905,7 +15894,6 @@
 				AD055E312B70B3D50035F824 /* KMBookmarkSheetController.xib in Resources */,
 				89E4E7422964160F002DBA6F /* KMAnnotationLinkViewController.xib in Resources */,
 				BB1E7F2D2B4FE2C6002D9785 /* GuideInfoImages.xcassets in Resources */,
-				89752DEE293875FC003FF08E /* KMMainToolbarController.xib in Resources */,
 				BB49ED0A293F461500C82CA2 /* KMConvertCSVWindowController.xib in Resources */,
 				BBFE14D32BFD7FC300176992 /* KMCouponDueWindowController.xib in Resources */,
 				BBEC00B3295C2AF300A26C98 /* KMBatesPreviewController.xib in Resources */,
@@ -16400,7 +16388,6 @@
 				9FDCD8132B6C904900E22166 /* KMFormListMenuPopWindowController.xib in Resources */,
 				BB2E666429C885550000FEBC /* KMSignatureHelpViewController.xib in Resources */,
 				ADF1569929A62D31001D1018 /* KMLoginLeftImageView.xib in Resources */,
-				89752DEF293875FC003FF08E /* KMMainToolbarController.xib in Resources */,
 				9FBC48BD299B44C600CA39D7 /* KMSecondaryViewController.xib in Resources */,
 				BB1B0AE52B4FC6E900889528 /* KMOpenFileGuideToolbar.xib in Resources */,
 				89752E092939DB42003FF08E /* KMToolbarViewController.xib in Resources */,
@@ -17634,7 +17621,6 @@
 				ADDF83B02B391A5D00A81A4E /* KMDSignatureManager.m in Sources */,
 				BBC4F9EA2AEB58290098A1A8 /* KMAlertWindowController.swift in Sources */,
 				BB147011299DC0D100784A6A /* OIDError.m in Sources */,
-				89752DEA293875FC003FF08E /* KMMainToolbarController.swift in Sources */,
 				BBA93D2D29BEBAA60044E0DD /* KMPreferenceEnum.swift in Sources */,
 				ADDDCE212B43A32A005B4AB5 /* AppSandboxFileAccessPersist.m in Sources */,
 				BBF729A72B19627500576AC5 /* KMRemoveBackgroundOperationQueue.swift in Sources */,
@@ -18922,7 +18908,6 @@
 				AD7D5C822B8ECD09006562CD /* KMPDFSynchronizer.swift in Sources */,
 				F3599174292B62F5000D25DE /* CStringConstants.m in Sources */,
 				BB6D2DA82B674A6300624C24 /* CPDFOutline+KMExtension.swift in Sources */,
-				89752DEB293875FC003FF08E /* KMMainToolbarController.swift in Sources */,
 				ADFA8F122B60E01C002595A4 /* KMSecureAlertView.swift in Sources */,
 				BB6AAF542C2175A3009C4CB1 /* KMEditPDFPopToolBarController.swift in Sources */,
 				BB147012299DC0D100784A6A /* OIDError.m in Sources */,
@@ -20211,7 +20196,6 @@
 				BB9EA1512B1ECD0400EAFD9B /* KMBatchOperateImageToPDFViewController.swift in Sources */,
 				9FD0D2B52AD5265A00DA3FF8 /* CPDFListAnnotationNoteWindowController.swift in Sources */,
 				F359916B29261F0E000D25DE /* CPDFListView+Tool.m in Sources */,
-				89752DEC293875FC003FF08E /* KMMainToolbarController.swift in Sources */,
 				BB8810C02B4F872500AFA63E /* KMVerificationWindowController.m in Sources */,
 				BB183DDF2B4EBE1B00F99C7E /* KMTrialSuccessController.swift in Sources */,
 				AD0E8ABB2A31BDDD00DBFD3C /* KMProduct.swift in Sources */,