【2025】【View】删除多余文件

PDF Office/PDF Master DMGTests/PDF_ Master_DMGTests.swift

@@ -10,7 +10,7 @@ import XCTest
 
 final class PDF_Reader_Pro_DMGTests: XCTestCase {
 
-    override func setUpWithError() throws {
+    func setupWithError() throws {
         // Put setup code here. This method is called before the invocation of each test method in the class.
     }
 

PDF Office/PDF Master DMGUITests/PDF_ Master_DMGUITests.swift

@@ -9,7 +9,7 @@ import XCTest
 
 final class PDF_Reader_Pro_DMGUITests: XCTestCase {
 
-    override func setUpWithError() throws {
+    func setupWithError() throws {
         // Put setup code here. This method is called before the invocation of each test method in the class.
 
         // In UI tests it is usually best to stop immediately when a failure occurs.

PDF Office/PDF Master DMGUITests/PDF_ Master_DMGUITestsLaunchTests.swift

@@ -13,7 +13,7 @@ final class PDF_Reader_Pro_DMGUITestsLaunchTests: XCTestCase {
         true
     }
 
-    override func setUpWithError() throws {
+    func setupWithError() throws {
         continueAfterFailure = false
     }
 

PDF Office/PDF Master ProTests/PDF_ Master_ProTests.swift

@@ -10,7 +10,7 @@ import XCTest
 
 final class PDF_Reader_Pro_ProTests: XCTestCase {
 
-    override func setUpWithError() throws {
+    func setupWithError() throws {
         // Put setup code here. This method is called before the invocation of each test method in the class.
     }
 

PDF Office/PDF Master ProUITests/PDF_ Master_ProUITests.swift

@@ -9,7 +9,7 @@ import XCTest
 
 final class PDF_Reader_Pro_ProUITests: XCTestCase {
 
-    override func setUpWithError() throws {
+    func setupWithError() throws {
         // Put setup code here. This method is called before the invocation of each test method in the class.
 
         // In UI tests it is usually best to stop immediately when a failure occurs.

PDF Office/PDF Master ProUITests/PDF_ Master_ProUITestsLaunchTests.swift

@@ -13,7 +13,7 @@ final class PDF_Reader_Pro_ProUITestsLaunchTests: XCTestCase {
         true
     }
 
-    override func setUpWithError() throws {
+    func setupWithError() throws {
         continueAfterFailure = false
     }
 

PDF Office/PDF Master/Class/Batch/View/KMConvertCollectionViewHeader.swift

@@ -9,7 +9,7 @@ import Cocoa
 
 typealias convertCollectionViewHeaderClickedCallBack = () -> ()
 
-class KMConvertCollectionViewHeader: KMBaseXibView{
+class KMConvertCollectionViewHeader: BaseXibView{
     
     @IBOutlet var layerColorView: NSView!
     
@@ -52,7 +52,7 @@ class KMConvertCollectionViewHeader: KMBaseXibView{
         NotificationCenter.default.addObserver(self, selector: #selector(IAPProductRestoreFinishedNotification(notification:)), name: NSNotification.Name(rawValue: "KMIAPProductRestoreFinishedNotification"), object: nil)
     }
     
-    override func setup() {
+    func setup() {
         indicateLabel.font = NSFont.boldSystemFont(ofSize: 14)
         indicateLabel.textColor = KMAppearance.Layout.h0Color()
         indicateLabel.stringValue = NSLocalizedString("Convert", comment: "")

PDF Office/PDF Master/Class/Common/Designs/KMDesignTextField.swift

@@ -139,7 +139,7 @@ class KMDesignTextField: KMDesignBaseView {
         return KMDesignTokenNone
     }
     
-    override func updateUI(state: KMDesignTokenState) {
+    func updateUI(state: KMDesignTokenState) {
         if self.useToken {
             super.updateUI(state: state)
         }

PDF Office/PDF Master/Class/Home/ViewController/KMHomePopViewController.swift

@@ -368,6 +368,8 @@ class KMScrollPopViewController: KMHomePopViewController {
     }
     
     override func updateUI() {
+        super.updateUI()
+        
         customBox.fillColor = background
         
         var widthMax: Float = 0

PDF Office/PDF Master/Class/Home/WindowController/HomeQuickToolsWindowController/View/KMHomeQuickToolsCollectionView.swift

@@ -9,7 +9,7 @@ import Cocoa
 
 typealias KMHomeQuickToolsCollectionViewDataDidChange = (_ view: KMHomeQuickToolsCollectionView, _ showData: [NSNumber]) ->Void
 
-class KMHomeQuickToolsCollectionView: KMBaseXibView {
+class KMHomeQuickToolsCollectionView: BaseXibView {
     @IBOutlet weak var showBox: NSBox!
     @IBOutlet weak var showLabel: NSTextField!
     @IBOutlet weak var removeBox: NSBox!
@@ -42,7 +42,7 @@ class KMHomeQuickToolsCollectionView: KMBaseXibView {
     var collectionItemWidth: CGFloat = 0
     let collectionItemHeight: CGFloat = 32
     
-    override func setup() {
+    func setup() {
         showLabel.stringValue = NSLocalizedString("Show", comment: "")
         hideLabel.stringValue = NSLocalizedString("Hide", comment: "")
         removeButton.title = NSLocalizedString("Remove", comment: "")

PDF Office/PDF Master/Class/KMLightMember/Controller/AccountException/View/KMAccountExceptionView.swift

@@ -9,7 +9,7 @@ import Cocoa
 
 typealias KMAccountExceptionViewCancelAction = (_ view: KMAccountExceptionView) -> Void
 
-class KMAccountExceptionView: KMBaseXibView {
+class KMAccountExceptionView: BaseXibView {
     @IBOutlet var textView: NSTextView!
     @IBOutlet weak var titleLabel: NSTextField!
     @IBOutlet weak var doneButton: NSButton!
@@ -26,7 +26,7 @@ class KMAccountExceptionView: KMBaseXibView {
         // Drawing code here.
     }
     
-    override func setup() {
+    func setup() {
         self.closeBox.moveCallback = { [weak self] (mouseEntered, mouseBox) in
             if mouseEntered {
                 self?.closeButton?.image = NSImage(named: "control_btn_icon_close_hov")
@@ -49,7 +49,7 @@ class KMAccountExceptionView: KMBaseXibView {
         self.doneButton.border(NSColor.clear, 0, 4)
     }
     
-    override func updateLanguage() {
+    func updateLanguage() {
         
         self.titleLabel.stringValue = NSLocalizedString("Account Blocked", comment: "")
         //singin

PDF Office/PDF Master/Class/KMLightMember/Controller/AccountInfo/View/KMAccountInfoView.swift

@@ -13,7 +13,7 @@ typealias KMAccountInfoViewLogOutAction = (_ view: KMAccountInfoView) -> Void
 typealias KMAccountInfoViewPurchaseInfoAction = (_ view: KMAccountInfoView) -> Void
 typealias KMAccountInfoViewSubcriptionAction = (_ view: KMAccountInfoView) -> Void
 
-class KMAccountInfoView: KMBaseXibView {
+class KMAccountInfoView: BaseXibView {
     @IBOutlet weak var titleLabel: NSTextField!
     @IBOutlet weak var closeButton: NSButton!
     
@@ -64,7 +64,7 @@ class KMAccountInfoView: KMBaseXibView {
         // Drawing code here.
     }
     
-    override func setup() {
+    func setup() {
         super.setup()
         
         self.closeBox.moveCallback = { [weak self] (mouseEntered, mouseBox) in
@@ -76,7 +76,7 @@ class KMAccountInfoView: KMBaseXibView {
         }
     }
     
-    override func updateUI() {
+    func updateUI() {
         super.updateUI()
         
         self.titleLabel.textColor = NSColor.km_init(hex: "#252629")
@@ -124,7 +124,7 @@ class KMAccountInfoView: KMBaseXibView {
         self.updateMoreButtonState(select: false)
     }
     
-    override func reloadData() {
+    func reloadData() {
         super.reloadData()
         
         if self.userInfo != nil {
@@ -204,7 +204,7 @@ class KMAccountInfoView: KMBaseXibView {
         self.updateLanguage()
     }
     
-    override func updateLanguage() {
+    func updateLanguage() {
         super.updateLanguage()
         
         self.purchaseInfoButton.title = NSLocalizedString("Order Information", comment: "")

PDF Office/PDF Master/Class/KMLightMember/Controller/Cancellation/View/KMCancellationSuccessView.swift

@@ -9,7 +9,7 @@ import Cocoa
 
 typealias KMCancellationSuccessViewCancelAction = (_ view: KMCancellationSuccessView) -> Void
 
-class KMCancellationSuccessView: KMBaseXibView {
+class KMCancellationSuccessView: BaseXibView {
 
     @IBOutlet weak var closeBox: KMBox!
     @IBOutlet weak var closeButton: NSButton!
@@ -25,7 +25,7 @@ class KMCancellationSuccessView: KMBaseXibView {
         // Drawing code here.
     }
     
-    override func setup() {
+    func setup() {
         super.setup()
         
         self.closeBox.moveCallback = { [weak self] (mouseEntered, mouseBox) in
@@ -54,12 +54,12 @@ class KMCancellationSuccessView: KMBaseXibView {
         self.doneButtonVC.updateUI()
     }
         
-    override func reloadData() {
+    func reloadData() {
         super.reloadData()
         
     }
     
-    override func updateLanguage() {
+    func updateLanguage() {
         super.updateLanguage()
         self.titleLabel.stringValue = NSLocalizedString("Cancellation Submitted", comment: "")
         self.subTitleLabel.stringValue = NSLocalizedString("Your account will be canceled within 3 working days and there is no need to submit the application for cancellation again", comment: "")

PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/View/ComparativeView/KMComparativeOutlineView.swift

@@ -6,7 +6,7 @@
 //
 
 import Cocoa
-class KMComparativeOutlineView: KMBaseXibView {
+class KMComparativeOutlineView: BaseXibView {
     @IBOutlet var titleTextView: NSTextView!
     @IBOutlet weak var optionTitleLabel: NSTextField!
     @IBOutlet weak var optionTitleLabel2: NSTextField!
@@ -21,7 +21,7 @@ class KMComparativeOutlineView: KMBaseXibView {
         // Drawing code here.
     }
     
-    override func setup() {
+    func setup() {
         super.setup()
         
         self.scrollView.backgroundColor(NSColor.km_init(hex: "#F2F9FF"))
@@ -31,7 +31,7 @@ class KMComparativeOutlineView: KMBaseXibView {
         self.outlineView.selectionHighlightStyle = NSTableView.SelectionHighlightStyle.none;
     }
     
-    override func reloadData() {
+    func reloadData() {
         super.reloadData()
         KMComparativeManager.manager.fetchData { [weak self] result in
             KMPrint(result)
@@ -47,7 +47,7 @@ class KMComparativeOutlineView: KMBaseXibView {
         }
     }
     
-    override func updateUI() {
+    func updateUI() {
         super.updateUI()
         
         self.optionTitleLabel.textColor = NSColor.km_init(hex: "#616469")
@@ -57,7 +57,7 @@ class KMComparativeOutlineView: KMBaseXibView {
         self.optionTitleLabel2.font = NSFont.SFProTextBoldFont(14.0)
     }
     
-    override func updateLanguage() {
+    func updateLanguage() {
         super.updateLanguage()
         
         self.optionTitleLabel.stringValue = NSLocalizedString("Unregistered", comment: "")

PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/View/KMComparativeTableView.swift

@@ -13,7 +13,7 @@ typealias KMComparativeTableViewSignUpAction = (_ view: KMComparativeTableView)
 typealias KMComparativeTableViewSubscriptionAction = (_ view: KMComparativeTableView) -> Void
 typealias KMComparativeTableViewRestoreAction = (_ view: KMComparativeTableView) -> Void
 
-class KMComparativeTableView: KMBaseXibView {
+class KMComparativeTableView: BaseXibView {
 
     @IBOutlet weak var closeBox: KMBox!
     @IBOutlet weak var closeButton: NSButton!
@@ -35,8 +35,7 @@ class KMComparativeTableView: KMBaseXibView {
         // Drawing code here.
     }
     
-    override func setup() {
-        super.setup()
+    func setup() {
         
         self.closeBox.moveCallback = { [weak self] (mouseEntered, mouseBox) in
             if mouseEntered {
@@ -47,8 +46,7 @@ class KMComparativeTableView: KMBaseXibView {
         }
     }
     
-    override func updateUI() {
-        super.updateUI()
+    func updateUI() {
         
         #if VERSION_FREE
         self.restoreButton.isHidden = false
@@ -67,12 +65,11 @@ class KMComparativeTableView: KMBaseXibView {
         self.signUpButton.contentTintColor = NSColor.km_init(hex: "#1770F4")
     }
     
-    override func reloadData() {
-        super.reloadData()
+    func reloadData() {
+        
     }
     
-    override func updateLanguage() {
-        super.updateLanguage()
+    func updateLanguage() {
         
         self.signUpButton.title = NSLocalizedString("Sign Up", comment: "")
         

PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/View/KMComparativeView/KMComparativeView.swift

@@ -12,7 +12,7 @@ typealias KMComparativeViewSignUpAction = (_ view: KMComparativeView) -> Void
 typealias KMComparativeViewSubscriptionAction = (_ view: KMComparativeView) -> Void
 typealias KMComparativeViewRestoreAction = (_ view: KMComparativeView) -> Void
 
-class KMComparativeView: KMBaseXibView {
+class KMComparativeView: BaseXibView {
     @IBOutlet weak var topView: NSView!
     @IBOutlet weak var collectionContentView: NSView!
     @IBOutlet weak var collectionView: NSCollectionView!
@@ -101,7 +101,7 @@ class KMComparativeView: KMBaseXibView {
     
     var isSubscription: Bool = false
     
-    override func setup() {
+    func setup() {
         super.setup()
         
         // 创建布局对象
@@ -152,12 +152,12 @@ class KMComparativeView: KMBaseXibView {
         self.setupPopover()
     }
     
-    override func updateLanguage() {
+    func updateLanguage() {
         self.restoreButton.title = NSLocalizedString("Restore Purchases", comment: "")
         self.titleLabel.stringValue = NSLocalizedString("Upgrade to Use All Features", comment: "")
     }
     
-    override func reloadData() {
+    func reloadData() {
         self.beginLoading(backgroundColor: NSColor.black.withAlphaComponent(0.2))
         KMInAppPurchaseManager.manager.fetchProducts { [weak self] isSuccess, products, error in
             KMPurchaseManager.manager.checkSubscriptionStatus({ [weak self] isSubscription in

PDF Office/PDF Master/Class/KMLightMember/Controller/Login&Register/View/KMLightNoNetworkView.swift

@@ -7,7 +7,7 @@
 
 import Cocoa
 
-class KMLightNoNetworkView: KMBaseXibView {
+class KMLightNoNetworkView: BaseXibView {
 
     @IBOutlet weak var titleLabel: NSTextField!
     @IBOutlet weak var subtitleLabel: NSTextField!
@@ -18,8 +18,8 @@ class KMLightNoNetworkView: KMBaseXibView {
     }
     
     
-    override func setup() {
-        super.setup()
+    func setup() {
+       
         
         self.backgroundColor(NSColor.km_init(hex: "#FFFFFF"))
         
@@ -30,9 +30,8 @@ class KMLightNoNetworkView: KMBaseXibView {
         self.subtitleLabel.textColor = NSColor.km_init(hex: "#94989C")
     }
     
-    override func updateLanguage() {
-        super.updateLanguage()
-        
+    func updateLanguage() {
+ 
         self.titleLabel.stringValue = NSLocalizedString("No network detected", comment: "")
         
         let title = NSLocalizedString("To access your files, please connect to the Internet and try again.", comment: "")
@@ -43,8 +42,8 @@ class KMLightNoNetworkView: KMBaseXibView {
         
     }
     
-    override func reloadData() {
-        super.reloadData()
+    func reloadData() {
+ 
     }
     
     

PDF Office/PDF Master/Class/KMLightMember/Controller/Login&Register/View/KMLoginInputPasswordView.swift

@@ -10,7 +10,7 @@ import Cocoa
 typealias KMLoginInputPasswordViewChangeEmailAction = (_ view: KMLoginInputPasswordView) -> Void
 typealias KMLoginInputPasswordViewLoginAction = (_ view: KMLoginInputPasswordView, _ data: KMRegisterModel, _ sender: NSButton) -> Void
 typealias KMLoginInputPasswordViewforgotPasswordAction = (_ view: KMLoginInputPasswordView, _ data: KMRegisterModel) -> Void
-class KMLoginInputPasswordView: KMBaseXibView {
+class KMLoginInputPasswordView: BaseXibView {
 
     @IBOutlet weak var titleLabel: NSTextField!
     @IBOutlet weak var describeLable: NSTextField!
@@ -47,7 +47,7 @@ class KMLoginInputPasswordView: KMBaseXibView {
         // Drawing code here.
     }
     
-    override func setup() {
+    func setup() {
         super.setup()
         
         self.titleLabel.textColor = NSColor.km_init(hex: "#252629")
@@ -90,7 +90,7 @@ class KMLoginInputPasswordView: KMBaseXibView {
         self.passwordTextField.becomeFirstResponder()
     }
     
-    override func reloadData() {
+    func reloadData() {
         super.reloadData()
         
         if self.model.secure {
@@ -115,7 +115,7 @@ class KMLoginInputPasswordView: KMBaseXibView {
         self.passwordAlertLabel.stringValue = NSLocalizedString(KMRequestServerErrorCodeType.typeOfMessage(type: self.model.passwordAlertType), comment: "")
     }
     
-    override func updateUI() {
+    func updateUI() {
         super.updateUI()
        
         //password
@@ -132,7 +132,7 @@ class KMLoginInputPasswordView: KMBaseXibView {
         self.passwordAlertLabel.font = NSFont.SFProTextRegularFont(12.0)
     }
     
-    override func updateLanguage() {
+    func updateLanguage() {
         super.updateLanguage()
         
         self.titleLabel.stringValue = NSLocalizedString("Log In", comment: "")

PDF Office/PDF Master/Class/KMLightMember/Controller/Login&Register/View/KMLoginLeftImageView.swift

@@ -9,7 +9,7 @@ import Cocoa
 
 typealias KMLoginLeftImageViewCancelAction = (_ view: KMLoginLeftImageView) -> Void
 typealias KMLoginLeftImageViewSubscriptionAction = (_ view: KMLoginLeftImageView) -> Void
-class KMLoginLeftImageView: KMBaseXibView {
+class KMLoginLeftImageView: BaseXibView {
 
     @IBOutlet weak var closeButton: NSButton!
     @IBOutlet weak var closeBox: KMBox!
@@ -27,7 +27,7 @@ class KMLoginLeftImageView: KMBaseXibView {
         // Drawing code here.
     }
     
-    override func setup() {
+    func setup() {
         super.setup()
         
 //        self.subscriptionButton.setTitleColor(NSColor.km_init(hex: "#3F8FF6"))
@@ -51,7 +51,7 @@ class KMLoginLeftImageView: KMBaseXibView {
         }
     }
     
-    override func updateLanguage() {
+    func updateLanguage() {
 //        self.subscriptionButton.title = NSLocalizedString("Subscribe Now", comment: "")
     }
     

PDF Office/PDF Master/Class/KMLightMember/Controller/Login&Register/View/KMLoginView.swift

@@ -10,7 +10,7 @@ import Cocoa
 typealias KMLoginViewRegisterAction = (_ view: KMLoginView, _ data: KMRegisterModel) -> Void
 typealias KMLoginViewNextAction = (_ view: KMLoginView, _ data: KMRegisterModel, _ sender: NSButton) -> Void
 
-class KMLoginView: KMBaseXibView {
+class KMLoginView: BaseXibView {
     @IBOutlet weak var titleLabel: NSTextField!
     @IBOutlet weak var loginDescripeLabel: NSTextField!
     @IBOutlet weak var nextButton: NSButton!
@@ -40,8 +40,7 @@ class KMLoginView: KMBaseXibView {
         // Drawing code here.
     }
     
-    override func setup() {
-        super.setup()
+    func setup() {
         self.emailTextField.delegate = self
         self.emailTextField.onFocus = {
             self.textFieldContentView.border(NSColor.km_init(hex: "#1770F4"), 1, 4)
@@ -62,8 +61,8 @@ class KMLoginView: KMBaseXibView {
         self.nextButtonVC.button.keyEquivalent = KMKeyEquivalent.enter
     }
     
-    override func updateUI() {
-        super.updateUI()
+    func updateUI() {
+
         self.backgroundColor(NSColor.km_init(hex: "#FFFFFF"))
         
         self.titleLabel.textColor = NSColor.km_init(hex: "#252629")
@@ -80,7 +79,7 @@ class KMLoginView: KMBaseXibView {
         self.alertLabel.font = NSFont.SFProTextRegularFont(12.0)
     }
     
-    override func updateLanguage() {
+    func updateLanguage() {
         self.nextButtonVC.stringValue = NSLocalizedString("Next Step", comment: "")
         self.titleLabel.stringValue = NSLocalizedString("Log In", comment: "")
         
@@ -110,8 +109,7 @@ class KMLoginView: KMBaseXibView {
         self.registerTextView.textStorage?.setAttributedString(attributedString)
     }
     
-    override func reloadData() {
-        super.reloadData()
+    func reloadData() {
         
         KMLightMemberManager.manager.updatePopupShownToday(isPop: true)
         

PDF Office/PDF Master/Class/KMLightMember/Controller/Login&Register/View/KMRegisterSuccessView.swift

@@ -9,7 +9,7 @@ import Cocoa
 
 typealias KMRegisterSuccessViewDoneAction = (_ view: KMRegisterSuccessView) -> Void
 typealias KMRegisterSuccessViewSubscribeAction = (_ view: KMRegisterSuccessView) -> Void
-class KMRegisterSuccessView: KMBaseXibView {
+class KMRegisterSuccessView: BaseXibView {
 
     @IBOutlet weak var titleLabel: NSTextField!
     @IBOutlet weak var subtitleLabel: NSTextField!
@@ -33,7 +33,7 @@ class KMRegisterSuccessView: KMBaseXibView {
         // Drawing code here.
     }
     
-    override func setup() {
+    func setup() {
         super.setup()
         
         
@@ -68,7 +68,7 @@ class KMRegisterSuccessView: KMBaseXibView {
         self.label3.textColor = NSColor.km_init(hex: "#252629")
     }
     
-    override func reloadData() {
+    func reloadData() {
         super.reloadData()
         if KMLightMemberManager.manager.purchaseState == .subscription {
             self.doneButton.isEnabled = false
@@ -83,7 +83,7 @@ class KMRegisterSuccessView: KMBaseXibView {
         }
     }
     
-    override func updateLanguage() {
+    func updateLanguage() {
         super.updateLanguage()
         self.label1.stringValue = NSLocalizedString("AI robot", comment: "")
         self.label2.stringValue = NSLocalizedString("Unlimited Conversion", comment: "")

PDF Office/PDF Master/Class/KMLightMember/Controller/Login&Register/View/KMRegisterView.swift

@@ -10,7 +10,7 @@ import Cocoa
 typealias KMRegisterViewLoginAction = (_ view: KMRegisterView, _ data: KMRegisterModel) -> Void
 typealias KMRegisterViewNextAction = (_ view: KMRegisterView, _ data: KMRegisterModel, _ sender: NSButton) -> Void
 
-class KMRegisterView: KMBaseXibView {
+class KMRegisterView: BaseXibView {
     
     @IBOutlet weak var titleLabel: NSTextField!
     
@@ -44,7 +44,7 @@ class KMRegisterView: KMBaseXibView {
     }
     
         
-    override func setup() {
+    func setup() {
         super.setup()
         //初始化数据
         self.signInTextView.delegate = self
@@ -87,7 +87,7 @@ class KMRegisterView: KMBaseXibView {
         self.presenter.initPresenter(view: self, data: self.model)
     }
     
-    override func updateLanguage() {
+    func updateLanguage() {
         super.updateLanguage()
         
         self.backgroundColor(NSColor.km_init(hex: "#FFFFFF"))
@@ -176,7 +176,7 @@ class KMRegisterView: KMBaseXibView {
         self.privacyPolicyTextView.textStorage?.setAttributedString(pAttributedString)
     }
     
-    override func reloadData() {
+    func reloadData() {
         super.reloadData()
         KMLightMemberManager.manager.updatePopupShownToday(isPop: true)
         

PDF Office/PDF Master/Class/KMLightMember/Controller/Login&Register/View/KMResetPasswordView.swift

@@ -8,7 +8,7 @@
 import Cocoa
 
 typealias KMResetPasswordViewDoneAction = (_ view: KMResetPasswordView, _ data: KMRegisterModel, _ sender: NSButton) -> Void
-class KMResetPasswordView: KMBaseXibView {
+class KMResetPasswordView: BaseXibView {
 
     @IBOutlet weak var titleLabel: NSTextField!
     
@@ -44,7 +44,7 @@ class KMResetPasswordView: KMBaseXibView {
         // Drawing code here.
     }
     
-    override func setup() {
+    func setup() {
         super.setup()
         self.model.logType = .resetPassword
         
@@ -84,7 +84,7 @@ class KMResetPasswordView: KMBaseXibView {
         self.presenter.initPresenter(view: self, data: self.model)
     }
     
-    override func updateUI() {
+    func updateUI() {
         super.updateUI()
         //password
         self.passwordContentView.border(NSColor.km_init(hex: "#DFE1E5"), 1, 4)
@@ -113,7 +113,7 @@ class KMResetPasswordView: KMBaseXibView {
         self.rePasswordAlertLabel.font = NSFont.SFProTextRegularFont(12.0)
     }
     
-    override func reloadData() {
+    func reloadData() {
         super.reloadData()
         
         self.passwordTextField.stringValue = self.model.password
@@ -171,7 +171,7 @@ class KMResetPasswordView: KMBaseXibView {
         self.reloadData()
     }
     
-    override func updateLanguage() {
+    func updateLanguage() {
         super.updateLanguage()
         
         self.titleLabel.stringValue = NSLocalizedString("Reset Password", comment: "")

PDF Office/PDF Master/Class/KMLightMember/Controller/SubscriptionView/SubscribeSuccess/View/KMSubscribeSuccessView.swift

@@ -9,7 +9,7 @@ import Cocoa
 
 typealias KMSubscribeSuccessViewDoneAction = (_ controller: KMSubscribeSuccessView) -> Void
 
-class KMSubscribeSuccessView: KMBaseXibView {
+class KMSubscribeSuccessView: BaseXibView {
     @IBOutlet weak var imageView: NSImageView!
     @IBOutlet weak var titleLabel: NSTextField!
     @IBOutlet weak var subtitleLabel: NSTextField!
@@ -24,7 +24,7 @@ class KMSubscribeSuccessView: KMBaseXibView {
         // Drawing code here.
     }
     
-    override func setup() {
+    func setup() {
         self.titleLabel.font = NSFont.SFProTextSemiboldFont(20)
         self.titleLabel.textColor = NSColor.km_init(hex: "#252629")
         
@@ -37,7 +37,7 @@ class KMSubscribeSuccessView: KMBaseXibView {
         self.doneButton.border(NSColor.clear, 0, 4)
     }
     
-    override func updateLanguage() {
+    func updateLanguage() {
         self.titleLabel.stringValue = NSLocalizedString("Subscribe Successfully!", comment: "")
         self.subtitleLabel.stringValue = NSLocalizedString("Enjoy all advanced features now", comment: "")
         self.doneButton.title = NSLocalizedString("OK", comment: "")

PDF Office/PDF Master/Class/KMLightMember/Controller/SubscriptionView/WaterMark/View/KMSubscribeWaterMarkView.swift

@@ -12,7 +12,7 @@ typealias KMSubscribeWaterMarkViewSubscribeAction = (_ view: KMSubscribeWaterMar
 typealias KMSubscribeWaterMarkViewWaterMarkExportAction = (_ view: KMSubscribeWaterMarkView) -> Void
 typealias KMSubscribeWaterMarkViewWaterMarkRestoreAction = (_ view: KMSubscribeWaterMarkView) -> Void
 
-class KMSubscribeWaterMarkView: KMBaseXibView {
+class KMSubscribeWaterMarkView: BaseXibView {
 
     @IBOutlet weak var closeBox: KMBox!
     @IBOutlet weak var closeButton: NSButton!
@@ -92,7 +92,7 @@ class KMSubscribeWaterMarkView: KMBaseXibView {
         }
     }
     
-    override func setup() {
+    func setup() {
         self.closeBox.moveCallback = { [weak self] (mouseEntered, mouseBox) in
             if mouseEntered {
                 self?.closeButton?.image = NSImage(named: "control_btn_icon_close_hov")
@@ -161,7 +161,7 @@ class KMSubscribeWaterMarkView: KMBaseXibView {
         }
     }
     
-    override func updateLanguage() {
+    func updateLanguage() {
         if KMSubscribeWaterMarkWindowController.canShowSubscripBenefits() {
             self.subTitleContentView.isHidden = true
             self.subtitleContentHeightConstraint.constant = 0
@@ -189,7 +189,7 @@ class KMSubscribeWaterMarkView: KMBaseXibView {
         self.subtitleLabel.attributedStringValue = NSMutableAttributedString(string: NSLocalizedString(subtitleString, comment: ""), attributes: [NSAttributedString.Key.paragraphStyle: paragraphStyle, NSAttributedString.Key.font : NSFont.SFProTextRegularFont(12)])
     }
 
-    override func reloadData() {
+    func reloadData() {
         if KMSubscribeWaterMarkWindowController.canShowSubscripBenefits() {
             self.dataArray = afterLoginDataArray
         } else {

PDF Office/PDF Master/Class/KMLightMember/Controller/VerificationCode/View/KMLightMemberAlertView.swift

@@ -7,7 +7,7 @@
 
 import Cocoa
 
-class KMLightMemberAlertView: KMBaseXibView {
+class KMLightMemberAlertView: BaseXibView {
 
     @IBOutlet weak var titleLabel: NSTextField!
     @IBOutlet weak var titleContentView: NSView!
@@ -26,13 +26,13 @@ class KMLightMemberAlertView: KMBaseXibView {
         // Drawing code here.
     }
     
-    override func setup() {
+    func setup() {
         super.setup()
         self.result = Result(code: 0)
 
     }
     
-    override func updateUI() {
+    func updateUI() {
         super.updateUI()
         self.contentView.backgroundColor(NSColor.km_init(hex: "#FDC7C6"))
         
@@ -40,7 +40,7 @@ class KMLightMemberAlertView: KMBaseXibView {
         self.titleLabel.textColor = NSColor.km_init(hex: "#252629")
     }
     
-    override func reloadData() {
+    func reloadData() {
         super.reloadData()
         
         if result.code == 200 || result.code == 0 {
@@ -89,7 +89,7 @@ class KMLightMemberAlertView: KMBaseXibView {
             animator().alphaValue = 0.0
         }, completionHandler: nil)
     }
-    override func updateLanguage() {
+    func updateLanguage() {
         super.updateLanguage()
     }
 }

PDF Office/PDF Master/Class/KMLightMember/Controller/VerificationCode/View/KMVerificationCodeView.swift

@@ -12,7 +12,7 @@ typealias KMVerificationCodeViewVerificationCodeAction = (_ view: KMVerification
 typealias KMVerificationCodeViewDoneAction = (_ view: KMVerificationCodeView, _ data: KMRegisterModel, _ sender: NSButton) -> Void
 typealias KMVerificationCodeViewCloseAction = (_ view: KMVerificationCodeView) -> Void
 typealias KMVerificationCodeViewReSendAction = (_ view: KMVerificationCodeView, _ sender: NSTextView) -> Void
-class KMVerificationCodeView: KMBaseXibView {
+class KMVerificationCodeView: BaseXibView {
 
     @IBOutlet weak var titleLabel: NSTextField!
     @IBOutlet weak var describeLabel: NSTextField!
@@ -107,7 +107,7 @@ class KMVerificationCodeView: KMBaseXibView {
         // Drawing code here.
     }
     
-    override func setup() {
+    func setup() {
         super.setup()
         
         self.backgroundColor(NSColor.km_init(hex: "#FFFFFF"))
@@ -208,7 +208,7 @@ class KMVerificationCodeView: KMBaseXibView {
         }
     }
     
-    override func reloadData() {
+    func reloadData() {
         super.reloadData()
         
         if inputType == .accountInfo {
@@ -236,7 +236,7 @@ class KMVerificationCodeView: KMBaseXibView {
         }
     }
     
-    override func updateLanguage() {
+    func updateLanguage() {
         super.updateLanguage()
         
         if self.verifyCodeType == .unknown {

PDF Office/PDF Master/Class/KMLightMember/Tools/Alert/KMPurchaseAlertView.swift

@@ -7,7 +7,7 @@
 
 import Cocoa
 
-class KMPurchaseAlertView: KMBaseXibView {
+class KMPurchaseAlertView: BaseXibView {
 
     @IBOutlet weak var iconImageView: NSImageView!
     @IBOutlet weak var titleLabel: NSTextField!
@@ -46,7 +46,7 @@ class KMPurchaseAlertView: KMBaseXibView {
         }
     }
     
-    override func setup() {
+    func setup() {
         self.contentBackgroundView.backgroundColor(NSColor.km_init(hex: "#000000").withAlphaComponent(1))
         self.contentBackgroundView.border(NSColor.clear, 0, 4)
         self.titleLabel.textColor = NSColor.km_init(hex: "#FFFFFF")

PDF Office/PDF Master/Class/PDFTools/AddHeaderFooter/New/View/KMHeaderFooterView.swift

@@ -90,7 +90,7 @@ func convertDateFormat(_ oldString: String) -> String {
 typealias KMHeaderFooterViewDoneAction = ( _ model: KMHeaderFooterObject) -> ()
 typealias KMHeaderFooterViewCancelAction = (_ view: KMHeaderFooterView) -> Void
 
-class KMHeaderFooterView: KMBaseXibView, NSTextViewDelegate, NSComboBoxDelegate {
+class KMHeaderFooterView: BaseXibView, NSTextViewDelegate, NSComboBoxDelegate {
     
     @IBOutlet weak var pdfView: KMWatermarkPDFView!
     @IBOutlet weak var currentPageIndexTextField: NSTextField!
@@ -238,7 +238,7 @@ class KMHeaderFooterView: KMBaseXibView, NSTextViewDelegate, NSComboBoxDelegate
         }
     }
     
-    override func setup() {
+    func setup() {
         let buttons = [
             topLeftButton, topCentButton, topRightButton,
             bottomLeftButton, bottomCenterButton, bottomRightButton
@@ -314,7 +314,7 @@ class KMHeaderFooterView: KMBaseXibView, NSTextViewDelegate, NSComboBoxDelegate
         self.fontSizeCombobox.delegate = self
     }
 
-    override func reloadData() {
+    func reloadData() {
         guard let pdfDocument = pdfDocument else { return }
         updateViewColor()
         
@@ -470,7 +470,7 @@ class KMHeaderFooterView: KMBaseXibView, NSTextViewDelegate, NSComboBoxDelegate
         }
     }
     
-    override func updateLanguage() {
+    func updateLanguage() {
         self.currentPageIndexTextField.stringValue = NSLocalizedString("1", comment: "")
         self.batesStartPageLabel.stringValue = String(format: "%@:", NSLocalizedString("Start Page Number", comment: ""))
 
@@ -538,7 +538,7 @@ class KMHeaderFooterView: KMBaseXibView, NSTextViewDelegate, NSComboBoxDelegate
 
     }
     
-    override func addNotification() {
+      func addNotification() {
         NotificationCenter.default.addObserver(self, selector: #selector(pageChangeNotification), name: NSNotification.Name.CPDFViewPageChanged, object: self.pdfView)
 //        NotificationCenter.default.addObserver(self, selector: #selector(themeChanged), name: Notification.Name("AppleInterfaceThemeChangedNotification"), object: nil)
         DistributedNotificationCenter.default().addObserver(self, selector: #selector(themeChanged), name: NSNotification.Name("AppleInterfaceThemeChangedNotification"), object: nil)

PDF Office/PDF Master/Class/PDFTools/AddHeaderFooter/New/View/LoadingView/KMLoadingView.swift

@@ -7,7 +7,7 @@
 
 import Cocoa
 
-class KMLoadingView: KMBaseXibView {
+class KMLoadingView: BaseXibView {
 
     @IBOutlet weak var progressIndicator: NSProgressIndicator!
     override func draw(_ dirtyRect: NSRect) {

PDF Office/PDF Master/Class/PDFTools/AddPassword/New/View/KMSecurityView.swift

@@ -11,7 +11,7 @@ typealias KMSecurityViewBatchAction = (_ view: KMSecurityView, _ files: [KMFileA
 typealias KMSecurityViewCancelAction = (_ view: KMSecurityView) -> Void
 typealias KMSecurityViewDoneAction = (_ view: KMSecurityView, _ model: KMSecureEncryptModel, _ files: [KMFileAttribute]) -> Void
 
-class KMSecurityView: KMBaseXibView {
+class KMSecurityView: BaseXibView {
     @IBOutlet weak var batchButton: NSButton!
     @IBOutlet weak var cancelButton: NSButton!
     @IBOutlet weak var doneButton: NSButton!
@@ -58,14 +58,14 @@ class KMSecurityView: KMBaseXibView {
         // Drawing code here.
     }
     
-    override func setup() {
+    func setup() {
         openPassword.delegate = self
         ownerPassword.delegate = self
         
         self.updateOwnerButtonState()
     }
     
-    override func updateLanguage() {
+    func updateLanguage() {
         batchButton.title = NSLocalizedString("Batch", comment: "")
 //        cancelButton.title = NSLocalizedString("Remove All", comment: "")
         doneButton.title = NSLocalizedString("Encrypt", comment: "")
@@ -85,7 +85,7 @@ class KMSecurityView: KMBaseXibView {
         keywordLabel.stringValue = NSLocalizedString("Keywords:", comment: "")
     }
     
-    override func reloadData() {
+    func reloadData() {
         
         openPassword.isEnabled = model.openPasswordOn
         ownerPassword.isEnabled = model.ownerPasswordOn

PDF Office/PDF Master/Class/PDFTools/Background/New/View/KMAddBackgroundView.swift

@@ -17,7 +17,7 @@ typealias KMAddBackgroundViewOperateCallBack = (_ background: KMBackgroundModel,
 typealias KMAddBackgroundViewBatchAction = (_ view: KMAddBackgroundView, _ files: [KMFileAttribute]) -> Void
 typealias KMAddBackgroundViewCancelAction = (_ view: KMAddBackgroundView) -> Void
 
-class KMAddBackgroundView: KMBaseXibView, NSComboBoxDelegate {
+class KMAddBackgroundView: BaseXibView, NSComboBoxDelegate {
     
     @IBOutlet weak var pdfView: KMWatermarkPDFView!
     @IBOutlet weak var previousButton: NSButton!
@@ -141,7 +141,7 @@ class KMAddBackgroundView: KMBaseXibView, NSComboBoxDelegate {
         }
     }
 
-    override func setup() {
+    func setup() {
 //        pdfView.background = background
 //        pdfView.document = pdfDocument
         pdfView.autoScales = true
@@ -267,10 +267,11 @@ class KMAddBackgroundView: KMBaseXibView, NSComboBoxDelegate {
         colorWell.action = #selector(colorWellDidChange)
     }
     
-    override func addNotification() {
+    func addNotification() {
         NotificationCenter.default.addObserver(self, selector: #selector(pageChangeNotification), name: NSNotification.Name.CPDFViewPageChanged, object: self.pdfView)
     }
-    override func updateLanguage() {
+    
+    func updateLanguage() {
         typeBox.title = NSLocalizedString("Source", comment: "")
         self.templateNameLabel.stringValue = NSLocalizedString("Name:", comment: "")
 
@@ -318,7 +319,7 @@ class KMAddBackgroundView: KMBaseXibView, NSComboBoxDelegate {
         }
     }
 
-    override func reloadData() {
+    func reloadData() {
         guard let pdfDocument = pdfDocument else { return }
         
         totalPageCountlabel.stringValue = "/ \(pdfDocument.pageCount)"

PDF Office/PDF Master/Class/PDFTools/Compare/View/KMCompareView.swift

@@ -19,7 +19,7 @@ let CPDFOldFileQKSelectedPathsKey = "CPDFOldFileQKSelectedPathsKey"
 let CPDFNewFileQKSelectedPathsKey = "CPDFNewFileQKSelectedPathsKey"
 let CPDFMaxQKSelectedPathsCount = 5
 
-class KMCompareView: KMBaseXibView {
+class KMCompareView: BaseXibView {
 
     @IBOutlet weak var cancelButton: NSButton!
     @IBOutlet weak var doneButton: NSButton!
@@ -136,7 +136,7 @@ class KMCompareView: KMBaseXibView {
         NotificationCenter.default.addObserver(self, selector: #selector(pageChangeNotification), name: NSNotification.Name.PDFViewPageChanged, object: nil)
     }
     
-    override func setup() {
+    func setup() {
         fileQKNewSelectedBox.delegate = self
         oldFileQKSelectedBox.delegate = self
         
@@ -202,7 +202,7 @@ class KMCompareView: KMBaseXibView {
         KMCompareFilesConfig.defaultConfig.fileNewAttribute.pdfDocument = nil
     }
     
-    override func updateLanguage() {
+    func updateLanguage() {
         compareTypeSegment.setLabel(NSLocalizedString("Side-by-Side View", comment: ""), forSegment: 0)
         compareTypeSegment.setLabel(NSLocalizedString("Compare by File Overlay", comment: ""), forSegment: 1)
         
@@ -251,7 +251,7 @@ class KMCompareView: KMBaseXibView {
         doneButton.title = NSLocalizedString("Compare", comment: "")
     }
     
-    override func updateUI() {
+    func updateUI() {
         if KMAppearance.isDarkMode() {
             self.compareTypeSegment.layer?.backgroundColor = NSColor(red: 50.0/255.0, green: 53.0/255.0, blue: 54.0/255.0, alpha: 1).cgColor
             self.addFileContentView.layer?.backgroundColor = NSColor.black.cgColor
@@ -261,7 +261,7 @@ class KMCompareView: KMBaseXibView {
         }
     }
     
-    override func reloadData() {
+    func reloadData() {
         if(pageRangeOldComboBox.indexOfSelectedItem == 3) {
             self.window?.makeFirstResponder(pageRangeOldComboBox)
             pageRangeOldComboBox.stringValue = ""

PDF Office/PDF Master/Class/PDFTools/Compare/ViewController/ContentComplete/View/KMCompareContentView.swift

@@ -7,7 +7,7 @@
 
 import Cocoa
 
-class KMCompareContentView: KMBaseXibView, CPDFViewDelegate, KMCompareToolbarDelegate, KMCompareThumbViewDelegate, KMCompareTextViewDelegate, NSSplitViewDelegate {
+class KMCompareContentView: BaseXibView, CPDFViewDelegate, KMCompareToolbarDelegate, KMCompareThumbViewDelegate, KMCompareTextViewDelegate, NSSplitViewDelegate {
     
     @IBOutlet weak var contendView: NSView!
     @IBOutlet weak var topToolbarBox: NSBox!
@@ -101,7 +101,7 @@ class KMCompareContentView: KMBaseXibView, CPDFViewDelegate, KMCompareToolbarDel
         self.reloadData()
     }
     
-    override func setup() {
+    func setup() {
         self.wantsLayer = true
         self.layer?.backgroundColor = NSColor.clear.cgColor
         
@@ -176,7 +176,7 @@ class KMCompareContentView: KMBaseXibView, CPDFViewDelegate, KMCompareToolbarDel
     }
     
 
-    override func updateLanguage() {
+    func updateLanguage() {
         deleteLbl.stringValue = NSLocalizedString("Delete", comment: "")
         replaceLbl.stringValue = NSLocalizedString("Replace", comment: "")
         insertLbl.stringValue = NSLocalizedString("Insert", comment: "")
@@ -189,7 +189,7 @@ class KMCompareContentView: KMBaseXibView, CPDFViewDelegate, KMCompareToolbarDel
         closeBtn.title = NSLocalizedString("Close", comment: "")
     }
     
-    override func reloadData() {
+    func reloadData() {
         guard let document = document else { return }
         guard let oldDocument = oldDocument else { return }
         

PDF Office/PDF Master/Class/PDFTools/Compare/ViewController/ContentComplete/View/KMCompareToolbar.swift

@@ -24,7 +24,7 @@ enum CPDFCompareToolbarAction {
     case Close
 }
 
-class KMCompareToolbar: KMBaseXibView {
+class KMCompareToolbar: BaseXibView {
 
     @IBOutlet weak var contendView: NSView!
     @IBOutlet weak var reduceBtn: NSButton!

PDF Office/PDF Master/Class/PDFTools/Compare/ViewController/ContentComplete/View/Text/KMCompareTextHeaderView.swift

@@ -12,7 +12,7 @@ protocol KMCompareTextHeaderViewDelegate: AnyObject {
 }
 
 
-class KMCompareTextHeaderView: KMBaseXibView {
+class KMCompareTextHeaderView: BaseXibView {
     var contendView: NSView!
     var expandBtn: NSButton!
     var pageLbl: NSTextField!
@@ -37,7 +37,7 @@ class KMCompareTextHeaderView: KMBaseXibView {
         // Additional setup if needed
     }
 
-    override func setup() {
+    func setup() {
         if expandBtn == nil {
             expandBtn = NSButton(frame: NSRect(x: 0, y: 8, width: 16, height: 16))
             expandBtn.autoresizingMask = [.maxXMargin, .minYMargin, .maxYMargin]
@@ -83,7 +83,7 @@ class KMCompareTextHeaderView: KMBaseXibView {
 
     // MARK: - Setter
 
-    override func updateUI() {
+    func updateUI() {
         if resultModel.isExpand {
             expandBtn.image = NSImage(named: "arrow_down_nor")
             expandBtn.alternateImage = NSImage(named: "arrow_down_sel")

PDF Office/PDF Master/Class/PDFTools/Compare/ViewController/ContentComplete/View/Text/KMCompareTextView.swift

@@ -11,7 +11,7 @@ protocol KMCompareTextViewDelegate: AnyObject {
     func compareTextView(_ view: KMCompareTextView, didSelectedResult compareResult: CPDFCompareResult)
 }
 
-class KMCompareTextView: KMBaseXibView, NSCollectionViewDelegateFlowLayout, NSCollectionViewDataSource, KMCompareTextViewItemDelegate, KMCompareTextHeaderViewDelegate {
+class KMCompareTextView: BaseXibView, NSCollectionViewDelegateFlowLayout, NSCollectionViewDataSource, KMCompareTextViewItemDelegate, KMCompareTextHeaderViewDelegate {
     
     @IBOutlet weak var contendView: NSView!
     @IBOutlet weak var infoLbl: NSTextField!
@@ -29,7 +29,7 @@ class KMCompareTextView: KMBaseXibView, NSCollectionViewDelegateFlowLayout, NSCo
     
     weak var delegate: KMCompareTextViewDelegate?
     
-    override func setup() {
+    func setup() {
         contendView.wantsLayer = true
         contendView.layer?.backgroundColor = NSColor(named: "KMWhiteColorDarkChanged01")?.cgColor
         
@@ -47,14 +47,14 @@ class KMCompareTextView: KMBaseXibView, NSCollectionViewDelegateFlowLayout, NSCo
         emptyBGView.isHidden = true
     }
     
-    override func updateLanguage() {
+    func updateLanguage() {
         infoLbl.stringValue = NSLocalizedString("Compare", comment: "")
         totalTitleLbl.stringValue = NSLocalizedString("Total Changes: ", comment: "")
         emptyTipLbl.stringValue = NSLocalizedString("There is no difference between two documents.", comment: "")
     }
 
 
-    override func reloadData() {
+    func reloadData() {
         var count = 0
         if let compareManager = compareManager {
             for model in compareManager.compareResultModels {

PDF Office/PDF Master/Class/PDFTools/Compare/ViewController/ContentComplete/View/Thumb/KMCompareThumbView.swift

@@ -11,7 +11,7 @@ protocol KMCompareThumbViewDelegate: AnyObject {
     func compareThumbViewDidItemClicked(_ controller: KMCompareThumbView)
 }
 
-class KMCompareThumbView: KMBaseXibView, NSCollectionViewDelegate, NSCollectionViewDataSource, NSCollectionViewDelegateFlowLayout, KMCompareThumbItemDelegate {
+class KMCompareThumbView: BaseXibView, NSCollectionViewDelegate, NSCollectionViewDataSource, NSCollectionViewDelegateFlowLayout, KMCompareThumbItemDelegate {
 
     @IBOutlet weak var contendView: NSView!
     @IBOutlet weak var headerBGView: NSView!
@@ -38,7 +38,7 @@ class KMCompareThumbView: KMBaseXibView, NSCollectionViewDelegate, NSCollectionV
         }
     }
 
-    override func setup() {
+    func setup() {
         contendView.wantsLayer = true
         contendView.layer?.backgroundColor = NSColor.clear.cgColor
 
@@ -56,13 +56,13 @@ class KMCompareThumbView: KMBaseXibView, NSCollectionViewDelegate, NSCollectionV
         collectionView.register(KMCompareThumbItem.self, forItemWithIdentifier: NSUserInterfaceItemIdentifier("KMCompareThumbItem"))
     }
     
-    override func updateLanguage() {
+    func updateLanguage() {
         infoLbl.stringValue = NSLocalizedString("Thumbnails", comment: "")
     }
 
     // MARK: - Public Methods
 
-    override func reloadData() {
+    func reloadData() {
         collectionView.reloadData()
     }
 

PDF Office/PDF Master/Class/PDFTools/Compare/ViewController/ContentSetting/View/KMCompareContentSettingView.swift

@@ -7,7 +7,7 @@
 
 import Cocoa
 
-class KMCompareContentSettingView: KMBaseXibView {
+class KMCompareContentSettingView: BaseXibView {
     @IBOutlet var replaceLabel: NSTextField!
     @IBOutlet var insertLabel: NSTextField!
     @IBOutlet var deleteLabel: NSTextField!
@@ -20,18 +20,15 @@ class KMCompareContentSettingView: KMBaseXibView {
     required init?(coder: NSCoder) {
         super.init(coder: coder)
     }
+     
     
-    override func setup() {
-        
-    }
-    
-    override func updateLanguage() {
+    func updateLanguage() {
         replaceLabel.stringValue = NSLocalizedString("Replace Color", comment: "")
         insertLabel.stringValue = NSLocalizedString("Insert Color", comment: "")
         deleteLabel.stringValue = NSLocalizedString("Delete Color", comment: "")
     }
     
-    override func reloadData() {
+    func reloadData() {
         let config = KMCompareFilesConfig.defaultConfig
         
         var insertColor = config.insertColor().usingColorSpaceName(NSColorSpaceName.calibratedRGB)

PDF Office/PDF Master/Class/PDFTools/Compare/ViewController/CoveringComplete/View/KMCompareCoveringView.swift

@@ -7,7 +7,7 @@
 
 import Cocoa
 
-class KMCompareCoveringView: KMBaseXibView {
+class KMCompareCoveringView: BaseXibView {
     
     @IBOutlet weak var contendView: NSView!
     @IBOutlet weak var topToolbarBox: NSBox!
@@ -43,7 +43,7 @@ class KMCompareCoveringView: KMBaseXibView {
     var closeHandle: ((KMCompareCoveringView) -> Void)?
     
 
-    override func setup() {
+    func setup() {
         oldPColorView.wantsLayer = true
         nPDFColorView.wantsLayer = true
         oldPColorView.layer?.cornerRadius = 4
@@ -61,11 +61,11 @@ class KMCompareCoveringView: KMBaseXibView {
         closeBtn.contentTintColor = NSColor.white
     }
 
-    override func reloadData() {
+    func reloadData() {
         pdfView.document = pdfDocument
     }
     
-    override func updateLanguage() {
+    func updateLanguage() {
         oldPLbl.stringValue = NSLocalizedString("Old Document", comment: "")
         nPDFLbl.stringValue = NSLocalizedString("New Document", comment: "")
         

PDF Office/PDF Master/Class/PDFTools/Compare/ViewController/CoveringSetting/View/KMCompareCoveringSettingView.swift

@@ -7,7 +7,7 @@
 
 import Cocoa
 
-class KMCompareCoveringSettingView: KMBaseXibView {
+class KMCompareCoveringSettingView: BaseXibView {
     @IBOutlet var coveringCompareBox: NSBox!
     @IBOutlet var opacityLabel: NSTextField!
     @IBOutlet var opacityNewLabel: NSTextField!
@@ -31,7 +31,7 @@ class KMCompareCoveringSettingView: KMBaseXibView {
         super.init(coder: coder)
     }
 
-    override func setup() {
+    func setup() {
         NSColorPanel.shared.showsAlpha = true
         separatorLine1.wantsLayer = true
         separatorLine2.wantsLayer = true
@@ -40,7 +40,7 @@ class KMCompareCoveringSettingView: KMBaseXibView {
         modelComboBox.isEditable = false
     }
     
-    override func reloadData() {
+    func reloadData() {
         let config = KMCompareFilesConfig.defaultConfig
         
         var oldStrokeColor = config.oldStrokeColor().usingColorSpaceName(NSColorSpaceName.calibratedRGB)
@@ -63,7 +63,7 @@ class KMCompareCoveringSettingView: KMBaseXibView {
         
     }
     
-    override func updateLanguage() {
+    func updateLanguage() {
         opacityLabel.stringValue = NSLocalizedString("Document Opacity", comment: "")
         opacityNewLabel.stringValue = NSLocalizedString("New File:", comment: "")
         opacityOldLabel.stringValue = NSLocalizedString("Old File:", comment: "")
@@ -84,7 +84,7 @@ class KMCompareCoveringSettingView: KMBaseXibView {
                                                   NSLocalizedString("Luminosity", comment: "")])
     }
     
-    @objc override func updateUI() {
+    @objc func updateUI() {
         if KMAppearance.isDarkMode() {
             separatorLine1.layer?.backgroundColor = NSColor(red: 0.0/255.0, green: 0.0/255.0, blue: 0.0/255.0, alpha: 0.5).cgColor
             separatorLine2.layer?.backgroundColor = NSColor(red: 0.0/255.0, green: 0.0/255.0, blue: 0.0/255.0, alpha: 0.5).cgColor

PDF Office/PDF Master/Class/PDFTools/Compare/ViewController/Save/View/KMCompareSaveView.swift

@@ -5,7 +5,7 @@
 //  Created by lizhe on 2023/11/22.
 //
 
-class KMCompareSaveView: KMBaseXibView {
+class KMCompareSaveView: BaseXibView {
 
     @IBOutlet weak var contendView: NSView!
     @IBOutlet weak var saveAsLbl: NSTextField!
@@ -36,7 +36,7 @@ class KMCompareSaveView: KMBaseXibView {
         DistributedNotificationCenter.default().removeObserver(self)
     }
     
-    override func setup() {
+    func setup() {
         let desktopPath = NSSearchPathForDirectoriesInDomains(.documentDirectory, .userDomainMask, true)[0]
         fileSaveFolderPath = desktopPath
         outputText.stringValue = fileSaveFolderPath
@@ -47,7 +47,7 @@ class KMCompareSaveView: KMBaseXibView {
         DistributedNotificationCenter.default().addObserver(self, selector:  #selector(themeChanged(_:)), name: NSNotification.Name("AppleInterfaceThemeChangedNotification"), object: nil)
     }
     
-    override func updateLanguage() {
+    func updateLanguage() {
         saveAsLbl.stringValue = NSLocalizedString("Save as", comment: "")
         oldDocTypeBtn.title = NSLocalizedString("Old File", comment: "")
         nDocTypeBtn.title = NSLocalizedString("New File", comment: "")
@@ -58,7 +58,7 @@ class KMCompareSaveView: KMBaseXibView {
         saveAsBtn.title = NSLocalizedString("Save", comment: "")
     }
 
-    override func updateUI() {
+    func updateUI() {
         oldDocTypeBtn.setTitleColor(KMAppearance.Layout.h0Color())
         nDocTypeBtn.setTitleColor(KMAppearance.Layout.h0Color())
         mergeDocTypeBtn.setTitleColor(KMAppearance.Layout.h0Color())

PDF Office/PDF Master/Class/PDFTools/Compress/View/KMCompressView.swift

@@ -11,7 +11,7 @@ typealias KMCompressViewCancelAction = (_ view: KMCompressView ) -> Void
 typealias KMCompressViewBatchAction = (_ view: KMCompressView ) -> Void
 typealias KMCompressViewCompressAction = (_ view: KMCompressView, _ compressValue: Int) -> Void
 
-class KMCompressView: KMBaseXibView {
+class KMCompressView: BaseXibView {
 
     @IBOutlet weak var previewBox: KMBox!
     @IBOutlet weak var titleLabel: NSTextField!
@@ -54,7 +54,7 @@ class KMCompressView: KMBaseXibView {
         // Drawing code here.
     }
 
-    override func setup() {
+    func setup() {
         qulityMatrix.selectCell(atRow: 2, column: 0)
         
         lowLabel.textColor = KMAppearance.Layout.h0Color()
@@ -68,7 +68,7 @@ class KMCompressView: KMBaseXibView {
         progressSizeLabel.isHidden = true
     }
     
-    override func updateLanguage() {
+    func updateLanguage() {
         selectLabel.stringValue = NSLocalizedString("Optimization Options", comment: "")
         lowLabel.stringValue = NSLocalizedString("Low Quality", comment: "")
         hightLabel.stringValue = NSLocalizedString("High Quality", comment: "")
@@ -85,7 +85,7 @@ class KMCompressView: KMBaseXibView {
         }
     }
     
-    override func reloadData() {
+    func reloadData() {
         let url = documentURL ?? URL(string: "")
         if url != nil {
             let filePath = url!.path

PDF Office/PDF Master/Class/PDFTools/FindSearch/KMSearchFindView.swift

@@ -11,7 +11,7 @@ typealias KMSearchFindViewDoneAction = (_ view: KMSearchFindView) -> Void
 typealias KMSearchFindViewSearchAction = (_ view: KMSearchFindView, _ searchString: String, _ forward: Bool) -> Bool
 typealias KMSearchFindViewShowAllAction = (_ view: KMSearchFindView, _ searchString: String, _ forward: Bool) -> Void
 
-class KMSearchFindView: KMBaseXibView {
+class KMSearchFindView: BaseXibView {
     @IBOutlet var findField: NSSearchField!
     @IBOutlet var messageField: NSTextField!
     @IBOutlet var doneButton: NSButton!
@@ -29,7 +29,7 @@ class KMSearchFindView: KMBaseXibView {
     var doneAction: KMSearchFindViewDoneAction?
     var searchAction: KMSearchFindViewSearchAction?
 
-    override func setup() {
+    func setup() {
         findField.delegate = self
         
         refreshSearchBarMenu()
@@ -90,8 +90,7 @@ class KMSearchFindView: KMBaseXibView {
         let findPboard = NSPasteboard(name: NSPasteboard.Name.find)
         if lastChangeCount < findPboard.changeCount {
             if let strings = findPboard.readObjects(forClasses: [NSString.self], options: [:]) as? [String], let firstString = strings.first {
-                setFindString(firstString)
-                lastChangeCount = findPboard.changeCount
+                 lastChangeCount = findPboard.changeCount
                 didChange = false
             }
         }
@@ -110,13 +109,7 @@ class KMSearchFindView: KMBaseXibView {
             didChange = false
         }
     }
-
-    func setFindString(_ newFindString: String?) {
-        if findString != newFindString {
-            findString = newFindString
-            didChange = true
-        }
-    }
+ 
 
     func findForward(_ forward: Bool) {
         var found = true

PDF Office/PDF Master/Class/PDFTools/KMBookmark/View/OutlineView/KMBookmarkOutlineView.swift

@@ -13,7 +13,7 @@ private let kPageIdentifier  = NSUserInterfaceItemIdentifier("Page")
 private let kSeparatorIdentifier  = NSUserInterfaceItemIdentifier("Separator")
 
 typealias KMBookmarkOutlineViewDoubleClickAction = (_ view: KMBookmarkOutlineView) -> Void
-class KMBookmarkOutlineView: KMBaseXibView {
+class KMBookmarkOutlineView: BaseXibView {
     @IBOutlet weak var labelColumn: NSTableColumn!
     @IBOutlet weak var fileColumn: NSTableColumn!
     @IBOutlet weak var pageColumn: NSTableColumn!
@@ -34,7 +34,7 @@ class KMBookmarkOutlineView: KMBaseXibView {
         // Drawing code here.
     }
     
-    override func setup() {
+    func setup() {
         outlineView.delegate = self
         outlineView.dataSource = self
         outlineView.registerForDraggedTypes([kPasteboardTypeBookmarkRows, .fileURL, .string])
@@ -45,7 +45,7 @@ class KMBookmarkOutlineView: KMBaseXibView {
         pageColumn.title = NSLocalizedString("Page", comment: "")
     }
     
-    override func reloadData() {
+    func reloadData() {
         guard let data = data else { return }
         
         self.outlineView.reloadData()

PDF Office/PDF Master/Class/PDFTools/KMBookmark/View/SheetView/KMBookmarkSheetView.swift

@@ -10,7 +10,7 @@ import Cocoa
 typealias KMBookmarkSheetViewDoneAction = (_ view: KMBookmarkSheetView, _ type: KMBookmarkType, _ label: String) -> ()
 typealias KMBookmarkSheetViewCancelAction = (_ view: KMBookmarkSheetView, _ type: KMBookmarkType) -> ()
 
-class KMBookmarkSheetView: KMBaseXibView {
+class KMBookmarkSheetView: BaseXibView {
     @IBOutlet weak var folderPopUp: NSPopUpButton!
     @IBOutlet weak var bookmarkTextField: NSTextField!
     @IBOutlet weak var bookmarkLabel: NSTextField!
@@ -29,7 +29,7 @@ class KMBookmarkSheetView: KMBaseXibView {
         // Drawing code here.
     }
     
-    override func setup() {
+    func setup() {
         let root = KMBookmarkManager.manager.rootBookmark
         self.folderPopUp.removeAllItems()
         addMenuItems(forBookmarks: [root], level: 0, toMenu: self.folderPopUp.menu!)

PDF Office/PDF Master/Class/PDFTools/Merge/MergeNew/View/KMMergeBlankView/KMMergeBlankView.swift

@@ -9,7 +9,7 @@ import Cocoa
 
 typealias KMMergeBlankViewDragAction = (_ fileNames: [URL]) -> Void
 typealias KMMergeBlankViewMouseDownAction = (_ view: KMMergeBlankView) -> Void
-class KMMergeBlankView: KMBaseXibView {
+class KMMergeBlankView: BaseXibView {
     @IBOutlet weak var selectViewBox: KMBox!
     @IBOutlet weak var iconImageView: NSImageView!
     @IBOutlet weak var titleLable: NSTextField!
@@ -25,7 +25,7 @@ class KMMergeBlankView: KMBaseXibView {
         // Drawing code here.
     }
     
-    override func setup() {
+    func setup() {
         titleLable.font = NSFont.systemFont(ofSize: 14, weight: .semibold)
         titleLable.textColor = KMAppearance.Layout.h1Color()
         subTitleLabel.font = NSFont.systemFont(ofSize: 14)
@@ -62,10 +62,10 @@ class KMMergeBlankView: KMBaseXibView {
     }
 }
 
-class KMMergeBlankDragView: KMBaseXibView {
+class KMMergeBlankDragView: BaseXibView {
     var dragAction: KMMergeBlankViewDragAction?
     
-    override func setup() {
+    func setup() {
         registerForDraggedTypes([.fileURL])
     }
 }

PDF Office/PDF Master/Class/PDFTools/Merge/MergeNew/View/KMMergeView.swift

@@ -17,7 +17,7 @@ enum KMMergeViewType: Int {
     case merge
 }
 
-class KMMergeView: KMBaseXibView {
+class KMMergeView: BaseXibView {
     @IBOutlet weak var tableview: NSTableView!
     
     @IBOutlet weak var clearButton: NSButton!
@@ -76,7 +76,7 @@ class KMMergeView: KMBaseXibView {
         // Drawing code here.
     }
     
-    override func setup() {
+    func setup() {
         self.box.cornerRadius = 4
         
         pageSizeWidthTextField.isEnabled = false
@@ -110,7 +110,7 @@ class KMMergeView: KMBaseXibView {
         }
     }
     
-    override func updateLanguage() {
+    func updateLanguage() {
             
         originalSizeButton.title = NSLocalizedString("Original Size", comment: "")
         A4SizeButton.title = "A4";
@@ -129,7 +129,7 @@ class KMMergeView: KMBaseXibView {
         boxLabel.stringValue = NSLocalizedString("Page size:", comment: "")
     }
     
-    override func reloadData() {
+    func reloadData() {
         self.updateButtonState()
         if files.count != 0 {
             self.blankView.isHidden = true

PDF Office/PDF Master/Class/PDFTools/Print/View/BottomView/KMPrintBottomView.swift

@@ -7,7 +7,7 @@
 
 import Cocoa
 
-class KMPrintBottomView: KMBaseXibView {
+class KMPrintBottomView: BaseXibView {
     @IBOutlet weak var printerButton: NSButton!
     
     @IBOutlet weak var savePDFButton: NSButton!
@@ -41,7 +41,7 @@ class KMPrintBottomView: KMBaseXibView {
         
     }
     
-    override func setup() {
+    func setup() {
         self.updateButtonState()
         
         self.printButton.title = NSLocalizedString("Printer", comment: "")
@@ -55,41 +55,8 @@ class KMPrintBottomView: KMBaseXibView {
     }
     
     //刷新界面UI 和 数据
-    override func reloadData() {
-        super.reloadData()
-//        let exporkOptions = self.data.options ?? .PDF
-//        let exportType = self.data.exportPDFType ?? .new
-//
-//        if exporkOptions.contains(.PDF) {
-//
-//        }
-//
-//        if exporkOptions.contains(.OCR) {
-//            self.selectLanguageButton.isEnabled = true
-//            self.saveTXTButton.isEnabled = true
-//        } else {
-//            self.selectLanguageButton.isEnabled = false
-//            self.saveTXTButton.isEnabled = false
-//        }
-//
-//        if exportType == .new {
-//            self.newPDFButton.state = .on
-//            self.mergePDFButton.isEnabled = true
-//
-//            self.insertPDFButton.state = .off
-//            self.exportSelectFileButton.isEnabled = false
-//        } else if exportType == .insert {
-//            self.newPDFButton.state = .off
-//            self.mergePDFButton.isEnabled = false
-//
-//            self.insertPDFButton.state = .on
-//            self.exportSelectFileButton.isEnabled = true
-//        }
-//
-//        self.selectLanguageButton.title = self.data.OCRModel.languageDic[KMGOCRLanguageStringKey] as! String
-//
-//        self.exportSelectFileButton.title = self.data.insertFilePath
-//
+    func reloadData() {
+        
     }
     
     func updateButtonState() {

PDF Office/PDF Master/Class/PDFTools/Print/View/ChooseView/KMPrintChooseView.swift

@@ -9,7 +9,7 @@ import Cocoa
 
 typealias KMPrintChooseViewDataDidChange = (_ view: KMPrintChooseView, _ data: KMPrintModel) -> Void
 
-class KMPrintChooseView: KMBaseXibView {
+class KMPrintChooseView: BaseXibView {
     @IBOutlet weak var printerLabel: NSTextField!
     @IBOutlet weak var printerButton: KMTextfieldButton!
     @IBOutlet weak var pageSetButton: NSButton!
@@ -55,7 +55,7 @@ class KMPrintChooseView: KMBaseXibView {
         
     }
     
-    override func setup() {
+    func setup() {
         super.setup()
         
         //打印机名称
@@ -163,7 +163,7 @@ class KMPrintChooseView: KMBaseXibView {
     }
     
     //刷新界面UI 和 数据
-    override func reloadData() {
+    func reloadData() {
         super.reloadData()
         
         self.printerButton.stringValue = self.outputData.printer.name

PDF Office/PDF Master/Class/PDFTools/Print/View/ChooseView/View/KMPrintChoosePageSizeView.swift

@@ -8,7 +8,7 @@
 import Cocoa
 
 typealias KMPrintChoosePageSizeViewDataDidChange = (_ view: KMPrintChoosePageSizeView, _ data: KMPrintPageOperation) -> Void
-class KMPrintChoosePageSizeView: KMBaseXibView {
+class KMPrintChoosePageSizeView: BaseXibView {
     
     @IBOutlet weak var titleLabel: NSTextField!
     @IBOutlet weak var sizeButton: NSButton!
@@ -44,7 +44,7 @@ class KMPrintChoosePageSizeView: KMBaseXibView {
         
     }
     
-    override func setup() {
+    func setup() {
         super.setup()
         
         self.sizeView.dataDidChange = { [weak self] view, data in
@@ -95,7 +95,7 @@ class KMPrintChoosePageSizeView: KMBaseXibView {
     }
     
     //刷新界面UI 和 数据
-    override func reloadData() {
+    func reloadData() {
         super.reloadData()
          
         //选中按钮状态

PDF Office/PDF Master/Class/PDFTools/Print/View/ChooseView/View/View/DealPaper/KMPrintChoosePageSizeMultipageView.swift

@@ -9,7 +9,7 @@ import Cocoa
 
 typealias KMPrintChoosePageSizeMultipageViewDataDidChange = (_ view: KMPrintChoosePageSizeMultipageView, _ data: KMPrintPageOperation.Multipage) -> Void
 
-class KMPrintChoosePageSizeMultipageView: KMBaseXibView {
+class KMPrintChoosePageSizeMultipageView: BaseXibView {
     @IBOutlet weak var pageOfPaperLabel: NSTextField!
     @IBOutlet weak var pageOfPaperXTextField: KMBaseTextField!
     @IBOutlet weak var pageOfPaperYTextField: KMBaseTextField!
@@ -34,7 +34,7 @@ class KMPrintChoosePageSizeMultipageView: KMBaseXibView {
         
     }
     
-    override func setup() {
+    func setup() {
         super.setup()
         
         self.pageOfPaperButton.removeAllItems()
@@ -53,7 +53,7 @@ class KMPrintChoosePageSizeMultipageView: KMBaseXibView {
     }
     
     //刷新界面UI 和 数据
-    override func reloadData() {
+    func reloadData() {
         super.reloadData()
         
 //        self.pageOfPaperButton.selectItem(withTitle: self.outputData.pageOfPaper.type.rawValue)

PDF Office/PDF Master/Class/PDFTools/Print/View/ChooseView/View/View/DealPaper/KMPrintChoosePageSizePamphletView.swift

@@ -9,7 +9,7 @@ import Cocoa
 
 typealias KMPrintChoosePageSizePamphletViewDataDidChange = (_ view: KMPrintChoosePageSizePamphletView, _ data: KMPrintPageOperation.Pamphlet) -> Void
 
-class KMPrintChoosePageSizePamphletView: KMBaseXibView {
+class KMPrintChoosePageSizePamphletView: BaseXibView {
     @IBOutlet weak var pamphletLabel: NSTextField!
     @IBOutlet weak var pamphletButton: NSPopUpButton!
     @IBOutlet weak var pageLabel: NSTextField!
@@ -35,9 +35,8 @@ class KMPrintChoosePageSizePamphletView: KMBaseXibView {
         
     }
     
-    override func setup() {
-        super.setup()
-        
+    func setup() {
+ 
         self.pamphletButton.removeAllItems()
         self.pamphletButton.addItems(withTitles: KMPrintPageOperation.Pamphlet.PamphletType.allValues())
         
@@ -54,9 +53,8 @@ class KMPrintChoosePageSizePamphletView: KMBaseXibView {
     }
     
     //刷新界面UI 和 数据
-    override func reloadData() {
-        super.reloadData()
-        
+    func reloadData() {
+ 
         self.pamphletButton.selectItem(withTitle: self.outputData.type.rawValue)
 
         self.bookbindingButton.selectItem(withTitle: self.outputData.bookbindingType.rawValue)

PDF Office/PDF Master/Class/PDFTools/Print/View/ChooseView/View/View/DealPaper/KMPrintChoosePageSizePosterView.swift

@@ -9,7 +9,7 @@ import Cocoa
 
 typealias KMPrintChoosePageSizePosterViewDataDidChange = (_ view: KMPrintChoosePageSizePosterView, _ data: KMPrintPageOperation.Poster) -> Void
 
-class KMPrintChoosePageSizePosterView: KMBaseXibView {
+class KMPrintChoosePageSizePosterView: BaseXibView {
     @IBOutlet weak var tileButton: NSButton!
     @IBOutlet weak var breakUpButton: NSButton!
     @IBOutlet weak var tileView: NSView!
@@ -47,7 +47,7 @@ class KMPrintChoosePageSizePosterView: KMBaseXibView {
         
     }
 
-    override func setup() {
+    func setup() {
         super.setup()
         
         self.breakUpPageButton.removeAllItems()
@@ -84,7 +84,7 @@ class KMPrintChoosePageSizePosterView: KMBaseXibView {
     }
     
     //刷新界面UI 和 数据
-    override func reloadData() {
+    func reloadData() {
         super.reloadData()
         
         self.tileButton.state = (self.outputData.type == .tile) ? .on : .off

PDF Office/PDF Master/Class/PDFTools/Print/View/ChooseView/View/View/DealPaper/Size/KMPrintChoosePageSizeSizeView.swift

@@ -9,7 +9,7 @@ import Cocoa
 
 
 typealias KMPrintChoosePageSizeSizeViewDataDidChange = (_ view: KMPrintChoosePageSizeSizeView, _ data: KMPrintPageOperation.Size) -> Void
-class KMPrintChoosePageSizeSizeView: KMBaseXibView {
+class KMPrintChoosePageSizeSizeView: BaseXibView {
     @IBOutlet weak var fitButton: KMImageTitleButton!
     @IBOutlet weak var originButton: KMImageTitleButton!
     @IBOutlet weak var customButton: KMImageTitleButton!
@@ -33,9 +33,8 @@ class KMPrintChoosePageSizeSizeView: KMBaseXibView {
         
     }
 
-    override func setup() {
-        super.setup()
-        
+    func setup() {
+ 
         self.settingContentView.backgroundColor(NSColor.km_init(hex: "#F7F8FA"))
         
         self.textFieldStepperView.minValue = 1
@@ -75,9 +74,8 @@ class KMPrintChoosePageSizeSizeView: KMBaseXibView {
     }
     
     //刷新界面UI 和 数据
-    override func reloadData() {
-        super.reloadData()
-        
+    func reloadData() {
+ 
         let array = [self.fitButton, self.originButton, self.customButton]
         for button in array {
             button?.imageName = "btn_radio_unsel_on"

PDF Office/PDF Master/Class/PDFTools/Print/View/ChooseView/View/View/DealPaper/View/KMPrintDuplexPrintingSetView.swift

@@ -9,7 +9,7 @@ import Cocoa
 
 typealias KMPrintDuplexPrintingSetViewCompletion = (_ view: KMPrintDuplexPrintingSetView, _ data: KMPrintPrinterModel) -> Void
 
-class KMPrintDuplexPrintingSetView: KMBaseXibView {
+class KMPrintDuplexPrintingSetView: BaseXibView {
     
     @IBOutlet weak var duplexPrintingButton: KMImageTitleButton!
     @IBOutlet weak var longEdgeButton: KMImageTitleButton!
@@ -29,7 +29,7 @@ class KMPrintDuplexPrintingSetView: KMBaseXibView {
         
     }
     
-    override func setup() {
+    func setup() {
         super.setup()
         self.duplexPrintingButton.title = NSLocalizedString("Duplex printing", comment: "")
         self.duplexPrintingButton.imageName = "btn_checkbox_unsel_on"
@@ -65,7 +65,7 @@ class KMPrintDuplexPrintingSetView: KMBaseXibView {
     }
     
     //刷新界面UI 和 数据
-    override func reloadData() {
+    func reloadData() {
         super.reloadData()
         if self.data.options.contains(.printOnBothSides) {
             self.duplexPrintingButton.state = .on

PDF Office/PDF Master/Class/PDFTools/Print/View/ChooseView/View/View/PaperSet/View/KMPrintPaperSetView.swift

@@ -9,7 +9,7 @@ import Cocoa
 
 
 typealias KMPrintPaperSetViewCompletion = (_ view:KMPrintPaperSetView, _ data: KMPrintPaperInfo) -> Void
-class KMPrintPaperSetView: KMBaseXibView {
+class KMPrintPaperSetView: BaseXibView {
     @IBOutlet weak var paperLabel: NSTextField!
     @IBOutlet weak var sizeButton: NSPopUpButton!
     @IBOutlet weak var sizeLabel: NSTextField!
@@ -47,7 +47,7 @@ class KMPrintPaperSetView: KMBaseXibView {
         
     }
 
-    override func setup() {
+    func setup() {
         super.setup()
         
         self.sizeButton.removeAllItems()
@@ -61,7 +61,7 @@ class KMPrintPaperSetView: KMBaseXibView {
     }
     
     //刷新界面UI 和 数据
-    override func reloadData() {
+    func reloadData() {
         super.reloadData()
         
         self.sizeButton.selectItem(withTitle: self.data.type.rawValue)

PDF Office/PDF Master/Class/PDFTools/Print/View/Preview/KMPrintPreviewView.swift

@@ -7,7 +7,7 @@
 
 import Cocoa
 
-class KMPrintPreviewView: KMBaseXibView {
+class KMPrintPreviewView: BaseXibView {
     @IBOutlet weak var previewContentView: NSView!
     @IBOutlet weak var previewView: PDFView!
     @IBOutlet weak var posterPreView: KMPrintPosterPreviewView!
@@ -103,7 +103,7 @@ class KMPrintPreviewView: KMBaseXibView {
         
     }
     
-    override func setup() {
+    func setup() {
         super.setup()
         
 //        self.previewContentView.wantsLayer = true
@@ -141,7 +141,7 @@ class KMPrintPreviewView: KMBaseXibView {
     }
     
     //刷新PDFPreview
-    override func reloadData() {
+    func reloadData() {
         super.reloadData()
 
         //UI 显示

PDF Office/PDF Master/Class/PDFTools/Print/View/PrintSettingView/KMPrintSettingView.swift

@@ -10,7 +10,7 @@ import Cocoa
 typealias KMPrintSettingViewPageSettingChange = (_ view: KMPrintSettingView, _ model: KMPrintModel) -> Void
 typealias KMPrintSettingViewPrintSettingChange = (_ view: KMPrintSettingView, _ model: KMPrintModel) -> Void
 
-class KMPrintSettingView: KMBaseXibView {
+class KMPrintSettingView: BaseXibView {
     @IBOutlet weak var defaultView: KMPrintDefaultView!
     @IBOutlet weak var posterView: KMPrintPosterView!
     @IBOutlet weak var multipageView: KMPrintMultipageView!
@@ -34,7 +34,7 @@ class KMPrintSettingView: KMBaseXibView {
         }
     }
     
-    override func setup() {
+    func setup() {
         defaultView.pageSettingChange = { [unowned self] view, model in
             self.pageSettingChange?(self, model)
         }
@@ -68,7 +68,7 @@ class KMPrintSettingView: KMBaseXibView {
         }
     }
     
-    override func reloadData() {
+    func reloadData() {
         self.defaultView.isHidden = true
         self.posterView.isHidden = true
         self.multipageView.isHidden = true

PDF Office/PDF Master/Class/PDFTools/Print/View/PrintSettingView/View/Custom/KMPrintDefaultView.swift

@@ -10,7 +10,7 @@ import Cocoa
 typealias KMPrintDefaultViewPageSettingChange = (_ view: KMPrintDefaultView, _ model: KMPrintModel) -> Void
 typealias KMPrintDefaultViewPrintSettingChange = (_ view: KMPrintDefaultView, _ model: KMPrintModel) -> Void
 
-class KMPrintDefaultView: KMBaseXibView {
+class KMPrintDefaultView: BaseXibView {
     
     @IBOutlet weak var pagesSettingLabel: NSTextField!
     @IBOutlet weak var allPageButton: NSButton!
@@ -40,11 +40,11 @@ class KMPrintDefaultView: KMBaseXibView {
     var pageSettingChange: KMPrintDefaultViewPageSettingChange?
     var printSettingChange: KMPrintDefaultViewPrintSettingChange?
     
-    override func setup() {
+    func setup() {
         viewModel.model.page.operation.type = .size
     }
     
-    override func updateLanguage() {
+    func updateLanguage() {
         pagesSettingLabel.stringValue = NSLocalizedString("Page Range:", comment: "")
         allPageButton.title = NSLocalizedString("All Pages", comment: "")
         oddPageButton.title = NSLocalizedString("Odd Pages Only", comment: "")
@@ -68,7 +68,7 @@ class KMPrintDefaultView: KMBaseXibView {
         intputPageRangeTextField.placeholderString = NSLocalizedString("e.g. 1,3-5,10", comment: "")
     }
     
-    override func reloadData() {
+    func reloadData() {
         let model = viewModel.model
         
         //page setting

PDF Office/PDF Master/Class/PDFTools/Print/View/PrintSettingView/View/Multipage/KMPrintMultipageView.swift

@@ -16,7 +16,7 @@ let KMPDFMultiplePrint_PrenViewHeight = 446.0
 let KMPDFMultiplePrint_MaxEdge = 80.0
 let KMPDFMultiplePrint_MaxSpace = 50.0
 
-class KMPrintMultipageView: KMBaseXibView, NSComboBoxDelegate {
+class KMPrintMultipageView: BaseXibView, NSComboBoxDelegate {
 
     @IBOutlet weak var unitLabel: NSTextField!
     @IBOutlet weak var unitComboBox: NSComboBox!
@@ -91,11 +91,11 @@ class KMPrintMultipageView: KMBaseXibView, NSComboBoxDelegate {
         // Drawing code here.
     }
     
-    override func setup() {
+    func setup() {
         viewModel.model.page.operation.type = .multipage
     }
     
-    override func updateLanguage() {
+    func updateLanguage() {
         pageRangeLabel.stringValue = NSLocalizedString("Page Range", comment: "")
         orientationLabel.stringValue = NSLocalizedString("Orientation:", comment: "")
         unitLabel.stringValue = NSLocalizedString("Unit:", comment: "")
@@ -180,7 +180,7 @@ class KMPrintMultipageView: KMBaseXibView, NSComboBoxDelegate {
         reverseButton.title = NSLocalizedString("Reverse pages", comment: "")
     }
     
-    override func reloadData() {
+    func reloadData() {
         let model = viewModel.model
         
         //

PDF Office/PDF Master/Class/PDFTools/Print/View/PrintSettingView/View/Pamphlet/KMPrintPamphletView.swift

@@ -11,7 +11,7 @@ typealias KMPrintPamphletViewPageSettingChange = (_ view: KMPrintPamphletView, _
 typealias KMPrintPamphletViewPrintSettingChange = (_ view: KMPrintPamphletView, _ model: KMPrintModel) -> Void
 
 
-class KMPrintPamphletView: KMBaseXibView, NSComboBoxDelegate {
+class KMPrintPamphletView: BaseXibView, NSComboBoxDelegate {
     @IBOutlet weak var bookletUnitLabel: NSTextField!
     @IBOutlet weak var bookletPageSizeLabel: NSTextField!
     @IBOutlet weak var bookletSubsetLable: NSTextField!
@@ -50,7 +50,7 @@ class KMPrintPamphletView: KMBaseXibView, NSComboBoxDelegate {
         }
     }
     
-    override func updateLanguage() {
+    func updateLanguage() {
         self.bookletUnitLabel.stringValue = NSLocalizedString("Unit:", comment: "")
         self.bookletPageSizeLabel.stringValue = NSLocalizedString("Page size:", comment: "")
         self.bookletSubsetLable.stringValue = NSLocalizedString("Booklet Subset:", comment: "")
@@ -64,7 +64,7 @@ class KMPrintPamphletView: KMBaseXibView, NSComboBoxDelegate {
         self.BookletCommentsFormsLabel.stringValue = NSLocalizedString("Comments & Forms:", comment: "")
     }
     
-    override func setup() {
+    func setup() {
         viewModel.model.page.operation.type = .pamphlet
         
         self.bookletUnitComboBox.addItems(withObjectValues: KMPrintPaperInfoUnit.allValues())
@@ -111,7 +111,7 @@ class KMPrintPamphletView: KMBaseXibView, NSComboBoxDelegate {
         self.bookletSheetEndTextField.delegate = self
     }
     
-    override func reloadData() {
+    func reloadData() {
         let model = viewModel.model
         
         self.bookletPageRangeComboBox.selectItem(withObjectValue: model.page.range.type.rawValue)

PDF Office/PDF Master/Class/PDFTools/Print/View/PrintSettingView/View/Poster/KMPrintPosterView.swift

@@ -11,7 +11,7 @@ typealias KMPrintPosterViewPageSettingChange = (_ view: KMPrintPosterView, _ mod
 typealias KMPrintPosterViewPrintSettingChange = (_ view: KMPrintPosterView, _ model: KMPrintModel) -> Void
 
 
-class KMPrintPosterView: KMBaseXibView {
+class KMPrintPosterView: BaseXibView {
 
     @IBOutlet weak var scaleTextField: NSTextField!
     @IBOutlet weak var cutMarksButton: NSButton!
@@ -65,7 +65,7 @@ class KMPrintPosterView: KMBaseXibView {
         }
     }
     
-    override func setup() {
+    func setup() {
         viewModel.model.page.operation.type = .poster
         
         scaleTextField.stringValue = "100"
@@ -126,7 +126,7 @@ class KMPrintPosterView: KMBaseXibView {
         labelTextField.placeholderString = contextString
     }
     
-    override func updateLanguage() {
+    func updateLanguage() {
         pageRangeLabel.stringValue = NSLocalizedString("Page Range", comment: "")
         orientationLabel.stringValue = NSLocalizedString("Orientation:", comment: "")
         unitLabel.stringValue = NSLocalizedString("Unit:", comment: "")
@@ -180,7 +180,7 @@ class KMPrintPosterView: KMBaseXibView {
         selectPerComboBox.addItems(withObjectValues: KMPrintPageOperation.PageOfPaper.PageType.allValues())
     }
     
-    override func reloadData() {
+    func reloadData() {
         let model = viewModel.model
         
         //pageRange

PDF Office/PDF Master/Class/PDFTools/RemovePassword/New/View/KMRemovePasswordView.swift

@@ -11,7 +11,7 @@ typealias KMRemovePasswordViewCancelAction = (_ view: KMRemovePasswordView) -> V
 typealias KMRemovePasswordViewBatchAction = (_ view: KMRemovePasswordView, _ files: [KMFileAttribute]) -> Void
 typealias KMRemovePasswordViewRemoveAction = (_ view: KMRemovePasswordView, _ files: [KMFileAttribute]) -> Void
 
-class KMRemovePasswordView: KMBaseXibView {
+class KMRemovePasswordView: BaseXibView {
 
     @IBOutlet weak var batchButton: NSButton!
     @IBOutlet weak var decryButton: NSButton!
@@ -36,11 +36,11 @@ class KMRemovePasswordView: KMBaseXibView {
         // Drawing code here.
     }
     
-    override func setup() {
+    func setup() {
         self.progressIndicator.isHidden = true
     }
     
-    override func updateLanguage() {
+    func updateLanguage() {
         self.batchButton.title = NSLocalizedString("Batch", comment: "")
         self.decryButton.title = NSLocalizedString("Remove Password", comment: "")
         self.cancelButton.title = NSLocalizedString("Cancel", comment: "")

PDF Office/PDF Master/Class/PDFTools/Secure/View/KMSecureAlertView.swift

@@ -10,7 +10,7 @@ import Cocoa
 typealias KMSecureAlertViewCloseAction = (_ view: KMSecureAlertView) -> Void
 typealias KMSecureAlertViewPasswordAction = (_ view: KMSecureAlertView) -> Void
 
-class KMSecureAlertView: KMBaseXibView {
+class KMSecureAlertView: BaseXibView {
     @IBOutlet var tipsLabel: NSTextField!
     @IBOutlet var rightBox: NSBox!
     @IBOutlet var rightBtn: NSButton!
@@ -20,7 +20,7 @@ class KMSecureAlertView: KMBaseXibView {
     
     var isClosePromptView: Bool = false
 
-    override func setup() {
+    func setup() {
         self.wantsLayer = true
         self.layer?.backgroundColor = KMAppearance.Else.tipbarColor().cgColor
 

PDF Office/PDF Master/Class/PDFTools/Tools/KMBaseXibView/KMBaseXibView.swift

@@ -1,126 +0,0 @@
-//
-//  KMBaseXibView.swift
-//  PDF Reader Pro
-//
-//  Created by lizhe on 2023/2/15.
-// xib初始化
-
-import Cocoa
-
-class KMBaseXibView: NSView {
-
-    @IBOutlet var contentView: NSView!
-    
-    deinit {
-        self.removeNotification()
-    }
-    // MARK: 初始化
-    public required init?(coder decoder: NSCoder) {
-        super.init(coder: decoder)
-        self.initContentView()
-        self.setup()
-        self.updateUI()
-        self.updateLanguage()
-        self.reloadData()
-        self.addNotification()
-        self.changeEffectiveAppearance()
-    }
-    
-    override init(frame frameRect: NSRect) {
-        super.init(frame: frameRect)
-        self.initContentView()
-        self.setup()
-        self.updateUI()
-        self.updateLanguage()
-        self.reloadData()
-        self.addNotification()
-        self.changeEffectiveAppearance()
-    }
-    
-    private func initContentView() {
-        let isExist = Bundle.main.path(forResource: String(describing:self.classForCoder.self), ofType: "nib")
-        if isExist != nil {
-            var topLevelArray: NSArray? = nil
-            //绑定xib
-            let resource = NSNib(nibNamed: String(describing: self.classForCoder.self),
-                                 bundle: nil)
-            if resource != nil {
-                if (resource!.instantiate(withOwner: self, topLevelObjects: &topLevelArray)) {
-                    for view in topLevelArray! {
-                        if view is NSView {
-                            contentView = view as? NSView
-                            break
-                        }
-                    }
-                }
-                
-                if contentView == nil {
-                    contentView = NSView()
-                }
-                addSubview(contentView)
-                contentView.translatesAutoresizingMaskIntoConstraints = false
-                NSLayoutConstraint.activate([
-                    contentView.topAnchor.constraint(equalTo: topAnchor),
-                    contentView.leftAnchor.constraint(equalTo: leftAnchor),
-                    contentView.rightAnchor.constraint(equalTo: rightAnchor),
-                    contentView.bottomAnchor.constraint(equalTo: bottomAnchor)])
-                contentView.updateConstraintsForSubtreeIfNeeded()
-            }
-        }
-    }
-    
-//    private func initContentView() {
-//        //绑定xib
-//        let resource = NSNib(nibNamed: String(describing: self.classForCoder.self),
-//                             bundle: Bundle(for: self.classForCoder.self))!
-//        resource.instantiate(withOwner: self, topLevelObjects: nil)
-//        addSubview(contentView)
-//        contentView.translatesAutoresizingMaskIntoConstraints = false
-//        NSLayoutConstraint.activate([
-//            contentView.topAnchor.constraint(equalTo: topAnchor),
-//            contentView.leftAnchor.constraint(equalTo: leftAnchor),
-//            contentView.rightAnchor.constraint(equalTo: rightAnchor),
-//            contentView.bottomAnchor.constraint(equalTo: bottomAnchor)])
-//        contentView.updateConstraintsForSubtreeIfNeeded()
-//    }
-    
-    func setup() {
-        
-    }
-    
-    //刷新界面UI 和 数据
-    func reloadData() {
-
-    }
-    
-    func updateLanguage() {
-        
-    }
-    
-    func updateUI() {
-
-    }
-    
-    func resetData() {
-        
-    }
-    
-    func addNotification() {
-        NotificationCenter.default.addObserver(self, selector: #selector(changeEffectiveAppearance), name: NSNotification.Name(rawValue: "kEffectiveAppearance"), object: nil)
-    }
-    
-    func removeNotification() {
-        NotificationCenter.default.removeObserver(self)
-        DistributedNotificationCenter.default().removeObserver(self)
-    }
-    
-    @objc func changeEffectiveAppearance() {
-        let isDarkModel = KMAdvertisementConfig.isDarkModel()
-        if isDarkModel {
-            self.appearance = NSAppearance(named: .darkAqua)
-        } else {
-            self.appearance = NSAppearance(named: .aqua)
-        }
-        self.updateUI()
-    }
-}

PDF Office/PDF Master/Class/PDFTools/Tools/KMImageTitleButton/KMImageTitleButton.swift

@@ -9,7 +9,7 @@ import Cocoa
 
 typealias KMImageTitleButtonAction = (_ view: KMImageTitleButton, _ button: NSButton) -> ()
 
-@objcMembers class KMImageTitleButton: KMBaseXibView {
+@objcMembers class KMImageTitleButton: BaseXibView {
     @IBOutlet weak var iconImage: NSImageView!
     @IBOutlet weak var titleLabel: NSTextField!
     @IBOutlet weak var contentButton: NSButton!
@@ -72,12 +72,12 @@ typealias KMImageTitleButtonAction = (_ view: KMImageTitleButton, _ button: NSBu
         // Drawing code here.
     }
     
-    override func setup() {
+    func setup() {
         super.setup()
 //        self.titleLabel.font = NSFont(name: "SFProText-Regular", size: 14)
     }
     
-    override func reloadData() {
+    func reloadData() {
         super.reloadData()
         
         self.titleLabel.stringValue = NSLocalizedString(self.title, comment: "")

PDF Office/PDF Master/Class/PDFTools/Tools/KMTextFieldStepperView/KMTextFieldStepperView.swift

@@ -9,7 +9,7 @@ import Cocoa
 
 typealias KMTextFieldStepperViewValueDidChange = (_ view: KMTextFieldStepperView, _ value: String) -> Void
 
-class KMTextFieldStepperView: KMBaseXibView, NSTextFieldDelegate {
+class KMTextFieldStepperView: BaseXibView, NSTextFieldDelegate {
     @IBOutlet weak var inputTextField: KMBaseTextField!
     @IBOutlet weak var downButton: NSButton!
     @IBOutlet weak var upButton: NSButton!
@@ -80,7 +80,7 @@ class KMTextFieldStepperView: KMBaseXibView, NSTextFieldDelegate {
         
     }
     
-    override func setup() {
+    func setup() {
         super.setup()
         
         self.presenter.initPresenter(delegate: self, model: self.model)
@@ -97,7 +97,7 @@ class KMTextFieldStepperView: KMBaseXibView, NSTextFieldDelegate {
     }
     
     //刷新界面UI 和 数据
-    override func reloadData() {
+    func reloadData() {
         super.reloadData()
         
         self.inputTextField.stringValue = self.model.stringValue

PDF Office/PDF Master/Class/PDFTools/Tools/KMTextfieldButton/KMTextfieldButton.swift

@@ -8,7 +8,7 @@
 import Cocoa
 
 typealias MouseDownAction = (_ button: NSButton, _ itemString: String) -> ()
-class KMTextfieldButton: KMBaseXibView {
+class KMTextfieldButton: BaseXibView {
 
     @IBOutlet weak var titleLabel: NSTextField!
     @IBOutlet weak var imageView: NSImageView!
@@ -64,14 +64,7 @@ class KMTextfieldButton: KMBaseXibView {
 
         // Drawing code here.
     }
-    
-    override func setup() {
-        super.setup()
-    }
-    
-    override func reloadData() {
-        super.reloadData()
-    }
+     
     
     @IBAction func buttonAction(_ sender: NSButton) {
         if self.data.count != 0 {

PDF Office/PDF Master/Class/PDFTools/Watermark/New/View/KMWatermarkView.swift

@@ -17,7 +17,7 @@ enum KMWatermarkManagerType {
 typealias KMWatermarkViewOperateCallBack = (_ watermark: KMWatermarkModel, _ countType: Int) -> ()
 typealias KMWatermarkViewCancelAction = (_ view: KMWatermarkView) -> Void
 
-class KMWatermarkView: KMBaseXibView, NSTextFieldDelegate, NSComboBoxDelegate, NSTextViewDelegate, CPDFViewDelegate {
+class KMWatermarkView: BaseXibView, NSTextFieldDelegate, NSComboBoxDelegate, NSTextViewDelegate, CPDFViewDelegate {
     //顶部box
     @IBOutlet var typeBox: NSBox!
     @IBOutlet var txtButton: NSButton!
@@ -147,7 +147,7 @@ class KMWatermarkView: KMBaseXibView, NSTextFieldDelegate, NSComboBoxDelegate, N
         }
     }
     
-    override func setup() {
+    func setup() {
         pdfView.setDisplay(.singlePage)
         
 //        if (pdfView.documentView() != nil) {
@@ -294,7 +294,7 @@ class KMWatermarkView: KMBaseXibView, NSTextFieldDelegate, NSComboBoxDelegate, N
     }
 
     
-    override func updateLanguage() {
+    func updateLanguage() {
         typeBox.title = NSLocalizedString("Source", comment: "")
         typeBox.titleFont = NSFont.systemFont(ofSize: 13)
         txtButton.title = NSLocalizedString("Text", comment: "")
@@ -333,7 +333,7 @@ class KMWatermarkView: KMBaseXibView, NSTextFieldDelegate, NSComboBoxDelegate, N
         cancelButton.title = NSLocalizedString("Cancel", comment: "")
     }
     
-    override func reloadData() {
+    func reloadData() {
         guard let pdfDocument = pdfDocument else { return }
         let opacity = round(watermark.opacity * 100) / 100
         
@@ -418,7 +418,7 @@ class KMWatermarkView: KMBaseXibView, NSTextFieldDelegate, NSComboBoxDelegate, N
         checkAngle()
     }
     
-    override func addNotification() {
+      func addNotification() {
         NotificationCenter.default.addObserver(self, selector: #selector(pageChangeNotification), name: NSNotification.Name.CPDFViewPageChanged, object: self.pdfView)
     }
     func updatePDFView() {

PDF Office/PDF Master/Class/PDFWindowController/Form/AlertView/KMFormAlertView.swift

@@ -13,7 +13,7 @@ enum KMPromptType: UInt {
     case ocr
 }
 
-class KMFormAlertView: KMBaseXibView {
+class KMFormAlertView: BaseXibView {
     
     @IBOutlet weak var textLabel: NSTextField!
     @IBOutlet weak var button: NSButton!
@@ -24,7 +24,7 @@ class KMFormAlertView: KMBaseXibView {
     var isCloseSecureView = false
     var type: KMPromptType = .none
     
-    override func setup() {
+    func setup() {
         self.wantsLayer = true
         self.layer?.backgroundColor = KMAppearance.Else.tipbarColor().cgColor
         

PDF Office/PDF Master/Class/PDFWindowController/MainWindowController/SKPresentationOptionsSheetController.swift

@@ -475,7 +475,7 @@ class SKPresentationOptionsSheetController: KMBaseWindowController {
        
         self.changePageTransitionType(sep: self.separate)
         Task { @MainActor in
-            self.tableView.reloadData()
+ 
         }
     }
     

PDF Office/PDF Master/Class/PDFWindowController/ReadModelView/KMReadModelView.swift

@@ -62,7 +62,7 @@ protocol KMReadModelViewDelegate: NSObject {
     func readModelViewWidthChange(view: KMReadModelView, width: CGFloat)
 }
 
-class KMReadModelView: KMBaseXibView {
+class KMReadModelView: BaseXibView {
 
     @IBOutlet weak var firstPageView: NSView!
     @IBOutlet weak var beforePageView: NSView!
@@ -125,7 +125,7 @@ class KMReadModelView: KMBaseXibView {
 
     }
 
-    override func setup() {
+    func setup() {
         self.backgroundColor(NSColor.km_init(hex: "#FFFFFF"))
         self.shadow = NSShadow()
         self.wantsLayer = true
@@ -214,16 +214,16 @@ class KMReadModelView: KMBaseXibView {
     }
     
     //刷新界面UI 和 数据
-    override func reloadData() {
+    func reloadData() {
         
     }
     
-    override func updateLanguage() {
+    func updateLanguage() {
         zoomButton.removeAllItems()
         zoomButton.addItems(withObjectValues: KMReadModelViewScaleType.allValues())
     }
     
-    override func updateUI() {
+    func updateUI() {
         let width = self.fetchWidth()
 //        if self.contentViewWidthConstraint.constant != width {
             self.delegate?.readModelViewWidthChange(view: self, width: width)

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Annotation/KMAnnotationView/KMAnnotationOutlineView.swift

@@ -12,7 +12,7 @@ protocol KMAnnotationOutlineViewDelegate: NSObject {
     func annotationOutlineView(_ outlineView: KMAnnotationOutlineView, didSelectItem: [KMBOTAAnnotationItem])
     func annotationOutlineView(_ outlineView: KMAnnotationOutlineView, rightMouseDownDidSelectView: NSView, evnet: NSEvent)
 }
-class KMAnnotationOutlineView: KMBaseXibView {
+class KMAnnotationOutlineView: BaseXibView {
     
     @IBOutlet weak var scrollView: NSScrollView!
     @IBOutlet weak var outlineView: KMOutlineView!
@@ -41,8 +41,7 @@ class KMAnnotationOutlineView: KMBaseXibView {
         // Drawing code here.
     }
     
-    override func setup() {
-        super.setup()
+    func setup() { 
         
         self.outlineView.delegate = self
         self.outlineView.dataSource = self
@@ -62,17 +61,7 @@ class KMAnnotationOutlineView: KMBaseXibView {
         self.outlineView.reloadData()
         self.outlineView.expandItem(nil, expandChildren: true)
     }
-    
-    override func updateUI() {
-        super.updateUI()
-        
-
-    }
-    
-    override func updateLanguage() {
-        super.updateLanguage()
-        
-    }
+     
 }
 
 //MARK: NSOutlineViewDataSource,NSOutlineViewDelegate

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Annotation/KMAnnotationViewController.swift

@@ -127,8 +127,7 @@ class KMAnnotationViewController: KMSideViewController {
     
     public func clear() {
         self.annotations.removeAll()
-        self.annotationOutlineView.reloadData()
-    }
+     }
 }
 
 //MARK: Data

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Annotation/KMScreenViewController/ScreenCollectionView/KMAnnotationScreenCollectionView.swift

@@ -35,7 +35,7 @@ class KMAnnotationScreenItem: NSObject {
 typealias KMAnnotationScreenCollectionViewCancel = (_ view: KMAnnotationScreenCollectionView) -> ()
 typealias KMAnnotationScreenCollectionViewApply = (_ view: KMAnnotationScreenCollectionView, _ typeArray: Array<Any>, _ colorArray: Array<Any>, _ authorArray: Array<Any>) -> ()
 
-class KMAnnotationScreenCollectionView: KMBaseXibView {
+class KMAnnotationScreenCollectionView: BaseXibView {
     @IBOutlet weak var collectionView: NSCollectionView!
     @IBOutlet weak var clearView: NSView!
     @IBOutlet weak var doneView: NSView!
@@ -57,7 +57,7 @@ class KMAnnotationScreenCollectionView: KMBaseXibView {
     
     var screenArray: [KMAnnotationScreenSection] = []
     
-    override func setup() {
+    func setup() {
         self.backgroundColor(NSColor.km_init(hex: "#FFFFFF"))
         //设置代理
         self.collectionView.delegate = self
@@ -93,7 +93,7 @@ class KMAnnotationScreenCollectionView: KMBaseXibView {
         self.doneButton!.button(type: .Brand, size: .m)
     }
     
-    override func reloadData() {
+    func reloadData() {
         if annotations.count > 0 {
             var typeSaveArray: [String] = []
             var colorSaveArray: [NSColor] = []
@@ -240,11 +240,11 @@ class KMAnnotationScreenCollectionView: KMBaseXibView {
         self.collectionView.reloadData()
     }
     
-    override func updateUI() {
+    func updateUI() {
         
     }
     
-    override func updateLanguage() {
+    func updateLanguage() {
         self.clearButton!.stringValue = NSLocalizedString("Clear", comment: "");
         self.cancelButton!.stringValue = NSLocalizedString("Cancel", comment: "");
         self.doneButton!.stringValue = NSLocalizedString("Apply", comment: "");

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/KMLeftSideViewController+Action.swift

@@ -86,7 +86,7 @@ extension KMLeftSideViewController {
             self.resetThumbnails(ks: false)
         } else if self.type.methodType == .Outline {
             Task { @MainActor in
-                self.tocOutlineView.reloadData()
+
             }
         } else if self.type.methodType == .Annotation {
             self.note_reloadDataIfNeed()
@@ -156,7 +156,7 @@ extension KMLeftSideViewController {
             
             if self.type.methodType == .Search {
                 if self.findPaneState == .singular {
-                    self.findTableView.reloadData()
+
                 }
             }
         }
@@ -495,7 +495,7 @@ extension KMLeftSideViewController: NSSearchFieldDelegate {
             }
             Task { @MainActor in
                 self.updataLeftSideSnapView()
-                self.snapshotTableView.reloadData()
+
             }
             if (snapshots.count > 0) {
                 self.leftSideEmptyVC.outlineSearchView.removeFromSuperview()
@@ -597,7 +597,7 @@ extension KMLeftSideViewController {
 
         Task { @MainActor in
             self.updataLeftSideSnapView()
-            self.snapshotTableView.reloadData()
+
         }
     }
     

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/KMLeftSideViewController+Outline.swift

@@ -233,8 +233,7 @@ extension KMLeftSideViewController {
             return
         }
         self.tocType = .unfold
-        self.tocOutlineView.reloadData()
-        self.tocOutlineView.expandItem(nil, expandChildren: true)
+         self.tocOutlineView.expandItem(nil, expandChildren: true)
     }
     
     @IBAction func toc_foldAllComments(_ sender: AnyObject?) {
@@ -242,8 +241,7 @@ extension KMLeftSideViewController {
             return
         }
         self.tocType = .fold
-        self.tocOutlineView.reloadData()
-        self.tocOutlineView.collapseItem(nil, collapseChildren: true)
+         self.tocOutlineView.collapseItem(nil, collapseChildren: true)
     }
     
     @objc func leftSideEmptyAnnotationClick_DeleteOutline(_ sender: AnyObject?) {
@@ -282,8 +280,7 @@ extension KMLeftSideViewController {
         }
         self.layoutDocumentView()
         DispatchQueue.main.async {
-            self.tocOutlineView.reloadData()
-        }
+         }
     }
     
     func updateSelectRowHeight() {
@@ -309,7 +306,7 @@ extension KMLeftSideViewController {
         let view = self.tocOutlineView.view(atColumn: 0, row: row, makeIfNecessary: true)
         let frame = view?.frame ?? .zero
         view?.frame = NSMakeRect(frame.origin.x, frame.origin.y, frame.size.width, rowH)
-        self.tocOutlineView.reloadData()
+        
     }
     
     func getNum(_ ol: CPDFOutline?) -> Int {
@@ -332,7 +329,7 @@ extension KMLeftSideViewController {
         }
         
         Task { @MainActor in
-            self.tocOutlineView.reloadData()
+            
             let idx = self.tocOutlineView.row(forItem: ol)
             self.updatingOutlineSelection = true
             self.tocOutlineView.km_selectItem(ol, byExtendingSelection: false)
@@ -347,13 +344,13 @@ extension KMLeftSideViewController {
     
     func removeOutlineAfter(_ ol: CPDFOutline) {
         Task { @MainActor in
-            self.tocOutlineView.reloadData()
+            
         }
     }
     
     func demoteOutlineAfter(_ ol: CPDFOutline) {
         Task { @MainActor in
-            self.tocOutlineView.reloadData()
+            
             self.tocOutlineView.expandItem(ol.parent)
             self.tocOutlineView.km_selectItem(ol, byExtendingSelection: false)
         }
@@ -361,7 +358,7 @@ extension KMLeftSideViewController {
     
     func promoteOutlineAfter(_ ol: CPDFOutline) {
         Task { @MainActor in
-            self.tocOutlineView.reloadData()
+            
             self.tocOutlineView.km_selectItem(ol, byExtendingSelection: false)
         }
     }
@@ -421,7 +418,7 @@ extension KMLeftSideViewController {
             return
         }
         Task { @MainActor in
-            self.tocOutlineView.reloadData()
+            
         }
     }
 }
@@ -456,7 +453,7 @@ extension KMLeftSideViewController {
         } else {
             (self.listView?.undoManager?.prepare(withInvocationTarget: self) as AnyObject).renamePDFOutline(outline, label: outline.label)
             outline.label = label
-            self.tocOutlineView.reloadData()
+            
             self.tocOutlineView.km_selectItem(outline, byExtendingSelection: false)
         }
     }
@@ -478,7 +475,7 @@ extension KMLeftSideViewController {
         self.view.window?.makeFirstResponder(nil)
 
         Task { @MainActor in
-            self.tocOutlineView.reloadData()
+            
             
             if (needExpand) {
                 self.tocOutlineView.expandItem(parentOutline)
@@ -501,7 +498,7 @@ extension KMLeftSideViewController {
             self.tocOutlineView.expandItem(parentOutline)
         }
         Task { @MainActor in
-            self.tocOutlineView.reloadData()
+            
         }
     }
     
@@ -517,7 +514,7 @@ extension KMLeftSideViewController {
         (doc.undoManager?.prepare(withInvocationTarget: self) as AnyObject).dragPDFOutline(outline, toIndex: Int(outline!.index), newParentOutline: outline?.parent)
         outline?.removeFromParent()
         newParentOutline?.insertChild(outline, at: UInt(index))
-        self.tocOutlineView.reloadData()
+        
         self.tocOutlineView.expandItem(newParentOutline)
         self.tocOutlineView.selectRowIndexes(IndexSet(integer: self.tocOutlineView.row(forItem: outline)), byExtendingSelection: false)
     }
@@ -763,7 +760,7 @@ extension KMLeftSideViewController {
             self.outlineIgnoreCaseFlag = true
         }
         if (self.outlineSearchField.stringValue.isEmpty == false) {
-            self.tocOutlineView.reloadData()
+            
             self.tocOutlineView.expandItem(nil, expandChildren: true)
         }
     }

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Outline/OutlineView/KMBOTAOutlineView.swift

@@ -16,7 +16,7 @@ protocol KMBOTAOutlineViewDelegate {
     func BOTAOutlineView(_ outlineView: KMBOTAOutlineView, acceptDrop info: NSDraggingInfo, item: Any?, childIndex index: Int) -> Bool
 }
 
-class KMBOTAOutlineView: KMBaseXibView {
+class KMBOTAOutlineView: BaseXibView {
     @IBOutlet weak var outlineView: KMOutlineView!
     @IBOutlet weak var scrollView: NSScrollView!
     
@@ -39,7 +39,7 @@ class KMBOTAOutlineView: KMBaseXibView {
         // Drawing code here.
     }
     
-    override func setup() {
+    func setup() {
         super.setup()
         
         self.scrollView.backgroundColor(NSColor.km_init(hex: "#F2F9FF"))
@@ -96,12 +96,12 @@ class KMBOTAOutlineView: KMBaseXibView {
         return item
     }
     
-    override func updateUI() {
+    func updateUI() {
         super.updateUI()
         
     }
     
-    override func updateLanguage() {
+    func updateLanguage() {
         super.updateLanguage()
         
     }

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Outline/OutlineView/View/KMTocOutlineView.swift

@@ -124,12 +124,7 @@ class KMTocOutlineView: KMCustomOutlineView {
         }
         return false
     }
-    
-    override func reloadData() {
-        super.reloadData()
-        
-        self._rebuildTrackingAreas()
-    }
+     
     
     override func updateTrackingAreas() {
         super.updateTrackingAreas()

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/EditPDF/View/AlignmentView/KMEditPropertyAlignmentView.swift

@@ -10,7 +10,7 @@ import Cocoa
 
 typealias KMEditPropertyAlignmentViewDidChange = (_ view: KMEditPropertyAlignmentView, _ areasArray: [Any], _ newBoundsArray: [String]) -> ()
 
-class KMEditPropertyAlignmentView: KMBaseXibView {
+class KMEditPropertyAlignmentView: BaseXibView {
     @IBOutlet weak var alignmentLabel: NSTextField!
     @IBOutlet weak var leftAreasBox: NSBox!
     @IBOutlet weak var verticalCenterAreasBox: NSBox!
@@ -47,7 +47,7 @@ class KMEditPropertyAlignmentView: KMBaseXibView {
         
     }
     
-    override func setup() {
+    func setup() {
         self.alignmentLabel.stringValue = NSLocalizedString("Align", comment: "")
         alignmentLabel.font = NSFont.SFProTextRegularFont(12.0)
         alignmentLabel.textColor = NSColor.km_init(hex: "#616469")
@@ -152,13 +152,13 @@ class KMEditPropertyAlignmentView: KMBaseXibView {
         verticalAreasVC?.updateUI()
     }
     
-    override func reloadData() {
+    func reloadData() {
         self.updateFormAearsAlignmentState()
         
         self.updateUI()
     }
     
-    override func changeEffectiveAppearance() {
+      func changeEffectiveAppearance() {
         let isDarkModel = KMAdvertisementConfig.isDarkModel()
         if isDarkModel {
             self.appearance = NSAppearance(named: .darkAqua)
@@ -168,9 +168,8 @@ class KMEditPropertyAlignmentView: KMBaseXibView {
         self.updateUI()
     }
     
-    override func updateUI() {
-        super.updateUI()
-        
+    func updateUI() {
+ 
         let isDarkModel = KMAdvertisementConfig.isDarkModel()
         if isDarkModel {
             for vcItem in [leftAreasVC, verticalCenterAreasVC, rightButtonAreasVC, horzontalAreasVC,

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/Freehand/Controller/KMFreehandAnnotationController.swift

@@ -65,7 +65,7 @@ import Cocoa
         self.lineAndBorderItemView?.dashImageButton.image = self.borderStyleDashed(false)
     }
     
-    override func reloadData() {
+    func reloadData() {
         super.reloadData()
         
         let style = self.annotationModel?.style() ?? .solid

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/KMLinkAnnotationPropertyEmptyController.swift

@@ -23,7 +23,7 @@ class KMLinkAnnotationPropertyEmptyController: KMRightSideEmptyVC {
         // Do view setup here.
     }
     
-    override func updateUI() {
+    func updateUI() {
         super.updateUI()
         
         self.view.addSubview(self.titleLabel)

PDF Office/PDF Master/Class/PDFWindowController/ViewController/Views/KMPageNumberDisplayView/KMPageNumberDisplayView.swift

@@ -13,7 +13,7 @@ protocol KMPageNumberDisplayViewDelegate: NSObject {
 }
 
 
-class KMPageNumberDisplayView: KMBaseXibView {
+class KMPageNumberDisplayView: BaseXibView {
 
     @IBOutlet weak var totalPageCountLabel: NSTextField!
     @IBOutlet weak var pageWidthConstraint: NSLayoutConstraint!
@@ -74,7 +74,7 @@ class KMPageNumberDisplayView: KMBaseXibView {
 
     }
 
-    override func setup() {
+    func setup() {
         self.backgroundColor(NSColor.km_init(hex: "#36383B"))
         self.shadow = NSShadow()
         self.wantsLayer = true
@@ -88,15 +88,15 @@ class KMPageNumberDisplayView: KMBaseXibView {
     }
     
     //刷新界面UI 和 数据
-    override func reloadData() {
+    func reloadData() {
         
     }
     
-    override func updateLanguage() {
+    func updateLanguage() {
 
     }
     
-    override func updateUI() {
+    func updateUI() {
 //        NSString(string: self.currentPageLabel.stringValue).boundingRect(with: NSSize(width: 1000, height: 1000)).size.width + 8
         self.totalPageCountLabel.textColor = NSColor.km_init(hex: "#FFFFFF")
         self.totalPageCountLabel.font = NSFont.SFProTextRegularFont(12.0)
@@ -121,18 +121,7 @@ class KMPageNumberDisplayView: KMBaseXibView {
 
         self.delegate?.updateWidth(view: self, width: self.fetchWith(edit: self.isEdit))
     }
-    
-    override func resetData() {
-        
-    }
-    
-    override func addNotification() {
-        
-    }
-    
-    override func removeNotification() {
-        
-    }
+     
     
     func fetchWith(edit: Bool = false) -> CGFloat {
         let currentIndexString: NSString = self.currentPageIndexLabel.stringValue as NSString

PDF Office/PDF Master/KMClass/KMPDFViewController/KMNDisplayViewController/KMSplitPDFViewController/Toolbar/KMSplitToolbar.swift

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

PDF Office/PDF Master/KMClass/KMPDFViewController/KMNDisplayViewController/KMSplitPDFViewController/Toolbar/KMSplitToolbar.xib

@@ -0,0 +1,18 @@
+<?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"/>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customView id="c22-O7-iKe">
+            <rect key="frame" x="0.0" y="0.0" width="425" height="52"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+            <point key="canvasLocation" x="111.5" y="224"/>
+        </customView>
+    </objects>
+</document>

PDF Office/PDF MasterTests/PDF_MasterTests.swift

@@ -10,7 +10,7 @@ import XCTest
 
 final class PDF_Reader_ProTests: XCTestCase {
 
-    override func setUpWithError() throws {
+    func setupWithError() throws {
         // Put setup code here. This method is called before the invocation of each test method in the class.
     }
 

PDF Office/PDF MasterUITests/PDF_MasterUITests.swift

@@ -9,7 +9,7 @@ import XCTest
 
 final class PDF_Reader_ProUITests: XCTestCase {
 
-    override func setUpWithError() throws {
+    func setupWithError() throws {
         // Put setup code here. This method is called before the invocation of each test method in the class.
 
         // In UI tests it is usually best to stop immediately when a failure occurs.

PDF Office/PDF MasterUITests/PDF_MasterUITestsLaunchTests.swift

@@ -13,7 +13,7 @@ final class PDF_Reader_ProUITestsLaunchTests: XCTestCase {
         true
     }
 
-    override func setUpWithError() throws {
+    func setupWithError() throws {
         continueAfterFailure = false
     }
 

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

@@ -2072,9 +2072,6 @@
 		ADBC2CFE299CA6C7006280C8 /* KMPrintDuplexPrintingSetView.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADBC2CFD299CA6C7006280C8 /* KMPrintDuplexPrintingSetView.xib */; };
 		ADBC2CFF299CA6C7006280C8 /* KMPrintDuplexPrintingSetView.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADBC2CFD299CA6C7006280C8 /* KMPrintDuplexPrintingSetView.xib */; };
 		ADBC2D00299CA6C7006280C8 /* KMPrintDuplexPrintingSetView.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADBC2CFD299CA6C7006280C8 /* KMPrintDuplexPrintingSetView.xib */; };
-		ADBC2D0C299CAA65006280C8 /* KMBaseXibView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADBC2D0B299CAA65006280C8 /* KMBaseXibView.swift */; };
-		ADBC2D0D299CAA65006280C8 /* KMBaseXibView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADBC2D0B299CAA65006280C8 /* KMBaseXibView.swift */; };
-		ADBC2D0E299CAA65006280C8 /* KMBaseXibView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADBC2D0B299CAA65006280C8 /* KMBaseXibView.swift */; };
 		ADBC2D11299CCD05006280C8 /* KMTextfieldButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADBC2D10299CCD05006280C8 /* KMTextfieldButton.swift */; };
 		ADBC2D12299CCD05006280C8 /* KMTextfieldButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADBC2D10299CCD05006280C8 /* KMTextfieldButton.swift */; };
 		ADBC2D13299CCD05006280C8 /* KMTextfieldButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADBC2D10299CCD05006280C8 /* KMTextfieldButton.swift */; };
@@ -2824,6 +2821,12 @@
 		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 */; };
+		BB0782F82CD0BDCA00101C81 /* KMSplitToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB0782F72CD0BDCA00101C81 /* KMSplitToolbar.swift */; };
+		BB0782F92CD0BDCA00101C81 /* KMSplitToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB0782F72CD0BDCA00101C81 /* KMSplitToolbar.swift */; };
+		BB0782FA2CD0BDCA00101C81 /* KMSplitToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB0782F72CD0BDCA00101C81 /* KMSplitToolbar.swift */; };
+		BB0782FC2CD0BDD400101C81 /* KMSplitToolbar.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB0782FB2CD0BDD400101C81 /* KMSplitToolbar.xib */; };
+		BB0782FD2CD0BDD400101C81 /* KMSplitToolbar.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB0782FB2CD0BDD400101C81 /* KMSplitToolbar.xib */; };
+		BB0782FE2CD0BDD400101C81 /* KMSplitToolbar.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB0782FB2CD0BDD400101C81 /* KMSplitToolbar.xib */; };
 		BB09477E2C1A9E50005C4DEE /* KMPDFThumbBaseModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB09477D2C1A9E50005C4DEE /* KMPDFThumbBaseModel.swift */; };
 		BB09477F2C1A9E50005C4DEE /* KMPDFThumbBaseModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB09477D2C1A9E50005C4DEE /* KMPDFThumbBaseModel.swift */; };
 		BB0947802C1A9E51005C4DEE /* KMPDFThumbBaseModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB09477D2C1A9E50005C4DEE /* KMPDFThumbBaseModel.swift */; };
@@ -6728,7 +6731,6 @@
 		ADBC2CF4299C7B3E006280C8 /* Print.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Print.xcassets; sourceTree = "<group>"; };
 		ADBC2CF9299CA6B9006280C8 /* KMPrintDuplexPrintingSetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMPrintDuplexPrintingSetView.swift; sourceTree = "<group>"; };
 		ADBC2CFD299CA6C7006280C8 /* KMPrintDuplexPrintingSetView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMPrintDuplexPrintingSetView.xib; sourceTree = "<group>"; };
-		ADBC2D0B299CAA65006280C8 /* KMBaseXibView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMBaseXibView.swift; sourceTree = "<group>"; };
 		ADBC2D10299CCD05006280C8 /* KMTextfieldButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMTextfieldButton.swift; sourceTree = "<group>"; };
 		ADBC2D14299CCD10006280C8 /* KMTextfieldButton.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMTextfieldButton.xib; sourceTree = "<group>"; };
 		ADBC2D1E299CDA29006280C8 /* NSView+Layer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSView+Layer.swift"; sourceTree = "<group>"; };
@@ -6996,6 +6998,8 @@
 		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 /* KMSplitToolbar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMSplitToolbar.swift; sourceTree = "<group>"; };
+		BB0782FB2CD0BDD400101C81 /* KMSplitToolbar.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMSplitToolbar.xib; sourceTree = "<group>"; };
 		BB09477D2C1A9E50005C4DEE /* KMPDFThumbBaseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMPDFThumbBaseModel.swift; sourceTree = "<group>"; };
 		BB0A550F2A302DB700B6E84B /* KMTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMTextField.swift; sourceTree = "<group>"; };
 		BB0A55132A3052F800B6E84B /* KMCustomTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMCustomTextField.swift; sourceTree = "<group>"; };
@@ -10848,7 +10852,6 @@
 			isa = PBXGroup;
 			children = (
 				BB5A9D6E2CB6525C00F64C1F /* BaseXibView.swift */,
-				ADBC2D0B299CAA65006280C8 /* KMBaseXibView.swift */,
 			);
 			path = KMBaseXibView;
 			sourceTree = "<group>";
@@ -11849,6 +11852,15 @@
 			path = Model;
 			sourceTree = "<group>";
 		};
+		BB0782F52CD0BD2000101C81 /* Toolbar */ = {
+			isa = PBXGroup;
+			children = (
+				BB0782F72CD0BDCA00101C81 /* KMSplitToolbar.swift */,
+				BB0782FB2CD0BDD400101C81 /* KMSplitToolbar.xib */,
+			);
+			path = Toolbar;
+			sourceTree = "<group>";
+		};
 		BB0A551B2A3078EB00B6E84B /* Designs */ = {
 			isa = PBXGroup;
 			children = (
@@ -12824,6 +12836,7 @@
 				BBC8DC6F2B57854800270C98 /* KMSecondaryPDFView.swift */,
 				BB3D07672CD08FDB00EB94DF /* KMSplitPDFViewController.swift */,
 				BB3D07682CD08FDB00EB94DF /* KMSplitPDFViewController.xib */,
+				BB0782F52CD0BD2000101C81 /* Toolbar */,
 			);
 			path = KMSplitPDFViewController;
 			sourceTree = "<group>";
@@ -16089,6 +16102,7 @@
 				BB0B2CD82B04AE560088FFD8 /* LeftSideView.xib in Resources */,
 				BBADCF642AF3CB92004ECE0C /* KMWatermarkCollectionViewItem.xib in Resources */,
 				ADC31FAC2A0E0C3900ED44A2 /* KMEditPropertyAlignmentView.xib in Resources */,
+				BB0782FC2CD0BDD400101C81 /* KMSplitToolbar.xib in Resources */,
 				BB6BA4C82B0B4A4200462CAE /* KMLeftSideEmptyFileViewController.xib in Resources */,
 				ADFA8F152B60E02B002595A4 /* KMSecureAlertView.xib in Resources */,
 				ADD1B6F82946C0CA00C3FFF7 /* KMPrintChoosePageSizeMultipageView.xib in Resources */,
@@ -16697,6 +16711,7 @@
 				BB73F28C2C63147E00131EE7 /* KMUnbindAlertViewController.xib in Resources */,
 				AD3AAD4E2B0B7B9300DE5FE7 /* KMCompareTextView.xib in Resources */,
 				9F853A062947137500DF644E /* newtab_h.pdf in Resources */,
+				BB0782FD2CD0BDD400101C81 /* KMSplitToolbar.xib in Resources */,
 				ADDF83722B391A5D00A81A4E /* DSignatureCreateViewController.xib in Resources */,
 				ADE86A7C2B0221E100414DFA /* KMSecurityWindowController.xib in Resources */,
 				BB52F5692CC22FE8007418DB /* KMPDFViewController.xib in Resources */,
@@ -17411,6 +17426,7 @@
 				BB8F4554295A9FA50037EA22 /* KMCreateHeaderFooterController.xib in Resources */,
 				ADBC376329CC637900D93208 /* KMReadModelView.xib in Resources */,
 				BB52F5622CC1FC03007418DB /* KMLinkPageView.xib in Resources */,
+				BB0782FE2CD0BDD400101C81 /* KMSplitToolbar.xib in Resources */,
 				9FF94F1E29A770B500B1EF69 /* KMFillSignShapePanel.xib in Resources */,
 				BB52F59C2CC245C8007418DB /* KMLinkPopupWebView.xib in Resources */,
 				ADE614B329779C6D00F62ED7 /* KMImageTitleButton.xib in Resources */,
@@ -17532,7 +17548,6 @@
 				BB147029299DC0D100784A6A /* OIDAuthorizationService.m in Sources */,
 				BBE01DC12BF60D9200304FA4 /* KMTabStripController.swift in Sources */,
 				9FF94F1129A7476000B1EF69 /* KMDesignPropertySelector.swift in Sources */,
-				ADBC2D0C299CAA65006280C8 /* KMBaseXibView.swift in Sources */,
 				BB65A0782AF8E2F2003A27A0 /* KMSyncPreferences.swift in Sources */,
 				ADDEEA7E2AD3FB1D00EF675D /* KMImageAccessoryController.swift in Sources */,
 				BB60138C2AD3A94200A76FB2 /* CPDFSignatureAnnotation+PDFListView.swift in Sources */,
@@ -18665,6 +18680,7 @@
 				AD055E1F2B70B3840035F824 /* KMBookmark.swift in Sources */,
 				ADE8BC2F29F8CD7200570F89 /* KMPDFThumbnailModel.swift in Sources */,
 				BBBAECFC2B57713F00266BD3 /* KMTransitionInfo.swift in Sources */,
+				BB0782F82CD0BDCA00101C81 /* KMSplitToolbar.swift in Sources */,
 				BB4EEF4029764FCC003A3537 /* KMWatermarkColorView.swift in Sources */,
 				BBBBB49F2B6F743700C7205E /* SKAttachmentEmailer.m in Sources */,
 				BB52F55C2CC1FBF6007418DB /* KMLinkPageView.swift in Sources */,
@@ -18873,7 +18889,6 @@
 				BB4D02AA2C22D17B0001474A /* KMEditPDFPopGuideView.swift in Sources */,
 				9FF94F1229A7476000B1EF69 /* KMDesignPropertySelector.swift in Sources */,
 				BBB789882BE8BF2300F7E09C /* AINewConfigWindowController.swift in Sources */,
-				ADBC2D0D299CAA65006280C8 /* KMBaseXibView.swift in Sources */,
 				BB003022298CEBED002DD1A0 /* KMPreferenceStepper.swift in Sources */,
 				BB89725F294C5DDA0045787C /* KMWatermarkPropertyInfoController.swift in Sources */,
 				AD1CA4312A0640F20070541F /* KMAnnotationScreenHeadView.swift in Sources */,
@@ -19897,6 +19912,7 @@
 				AD8810A129A8459000178CA1 /* KMComparativeTableViewController.swift in Sources */,
 				BBBB6CD32AD14A5F0035AA66 /* CPDFChoiceWidgetAnnotation+PDFListView.swift in Sources */,
 				9F1FE4DC29406E4700E952CA /* NSURL+Utils.m in Sources */,
+				BB0782F92CD0BDCA00101C81 /* KMSplitToolbar.swift in Sources */,
 				BB2C847C2BAE71E400AF6142 /* KMThumbnailTableView.swift in Sources */,
 				F35B484C29A4903300756255 /* NSPointerArray+PDFListView.m in Sources */,
 				BBB14A542978DD5400936EDB /* KMRedactTools.swift in Sources */,
@@ -20313,7 +20329,6 @@
 				BB2C847A2BAE71E400AF6142 /* KMBotaTableView.swift in Sources */,
 				BB146FE0299DC0D100784A6A /* GTLRDriveObjects.m in Sources */,
 				89D9896E28FD50EF003A3E87 /* KMAnnotationCollectionViewItem.swift in Sources */,
-				ADBC2D0E299CAA65006280C8 /* KMBaseXibView.swift in Sources */,
 				BB86C1EF28F544F4005AD968 /* CPDFListView+Event.m in Sources */,
 				AD867FA329DEB4B000F00440 /* KMBOTAAnnotationTool.swift in Sources */,
 				9F1F82F429373D6E0092C4B4 /* String+KMExtensions.swift in Sources */,
@@ -20778,6 +20793,7 @@
 				655445102C88483C00BD9010 /* KMDiscountToSaveWindowController.m in Sources */,
 				9F0390082B426F3300302D1D /* KMPageDisplayPropertiesViewController.swift in Sources */,
 				BB5F8A1029BB04F000365ADB /* GBDeviceInfo_OSX.m in Sources */,
+				BB0782FA2CD0BDCA00101C81 /* KMSplitToolbar.swift in Sources */,
 				BBEDC2292B98205200970C54 /* Bundle+KMExtension.swift in Sources */,
 				AD02573C2A8601AA00EAD5D5 /* KMLoginManager.swift in Sources */,
 				BBFE6E89293210AB00142C01 /* KMCompressCellView.swift in Sources */,

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

@@ -1390,10 +1390,42 @@
             filePath = "PDF Master/Class/PDFWindowController/ViewController/Views/KMPageNumberDisplayView/KMPageNumberDisplayView.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "162"
-            endingLineNumber = "162"
-            landmarkName = "mouseDown(with:)"
+            startingLineNumber = "151"
+            endingLineNumber = "151"
+            landmarkName = "fetchWith(edit:)"
             landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "48800835-97EA-4B9C-89BE-C0F878586D11 - 9c4f71a10b70b9a8"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMPageNumberDisplayView.mouseDown(with: __C.NSEvent) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/Views/KMPageNumberDisplayView/KMPageNumberDisplayView.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "162"
+                  endingLineNumber = "162"
+                  offsetFromSymbolStart = "136">
+               </Location>
+               <Location
+                  uuid = "48800835-97EA-4B9C-89BE-C0F878586D11 - 2307e146f79e1709"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMPageNumberDisplayView.fetchWith(edit: Swift.Bool) -&gt; CoreGraphics.CGFloat"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/Views/KMPageNumberDisplayView/KMPageNumberDisplayView.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "151"
+                  endingLineNumber = "151"
+                  offsetFromSymbolStart = "2156">
+               </Location>
+            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy