【2025】【代码整理】

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

@@ -403,11 +403,6 @@ class KMScrollPopViewController: KMHomePopViewController {
             if (isSelected) { // 选中没有 hover 效果
                 return
             }
-//            if (mouseEntered) {
-//                mouseBox.fillColor = KMDesignToken.shared.fill(withToken: "dropdown.m.bg.hov")
-//            } else {
-//                mouseBox.fillColor = NSColor.clear
-//            }
             if mouseEntered {
                 mouseBox.fillColor = self.enterFillColor
             } else {

PDF Office/PDF Master/Class/KMLightMember/Tools/FocusAwareSecureTextField/FocusAwareSecureTextField.swift

@@ -1,25 +0,0 @@
-//
-//  FocusAwareSecureTextField.swift
-//  PDF Reader Pro
-//
-//  Created by lizhe on 2023/10/23.
-//
-
-import Cocoa
-
-class FocusAwareSecureTextField: NSSecureTextField {
-    var onFocus: () -> Void = {}
-    var onUnfocus: () -> Void = {}
-
-    override func becomeFirstResponder() -> Bool {
-        onFocus()
-        let textView = window?.fieldEditor(true, for: nil) as? NSTextView
-        textView?.insertionPointColor = NSColor.km_init(hex: "#252629")
-        return super.becomeFirstResponder()
-    }
-
-    override func resignFirstResponder() -> Bool {
-        onUnfocus()
-        return super.resignFirstResponder()
-    }
-}

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFListViewExtension/CPDFListView+Sync.swift

@@ -28,24 +28,7 @@ extension CPDFListView {
             if !wasPageDisplayed {
                 self.go(toPageIndex: Int(page.pageIndex()), animated: true)
             }
-            
-//            var userInfo: [AnyHashable: Any] = [SKPDFViewOldPageKey: readingBar.page ?? NSNull()]
-            
-//            if interactionMode != .presentationMode {
-//                if showReadingBar {
-//                    if !hasReadingBar {
-//                        toggleReadingBar(nil)
-//                    }
-//                    readingBar.page = page
-//                    readingBar.goToLine(for: point)
-//                    requiresDisplay()
-//                    userInfo[SKPDFViewNewPageKey] = page
-//                    NotificationCenter.default.post(name: SKPDFViewReadingBarDidChangeNotification, object: self, userInfo: userInfo)
-//                } else if sel.hasCharacters && toolMode == .textToolMode {
-//                    setCurrentSelection(sel)
-//                }
-//            }
-            
+             
             var visibleRect = convert(visibleContentRect(), to: page)
             
             if !wasPageDisplayed || !visibleRect.contains(lineRect) {
@@ -64,17 +47,6 @@ extension CPDFListView {
                 rect = convert(convert(rect, from: page), to: documentView())
                 documentView().scrollToVisible(rect)
             }
-            
-//            syncDot?.invalidate()
-//            syncDot = KMSyncDot(point: point, page: page) { [weak self] finished in
-//                guard let self = self else { return }
-//                
-//                self.setNeedsDisplayIn(self.syncDot!.bounds(), of: self.syncDot?.page)
-////                self.setNeedsDisplay(self.syncDot?.bounds ?? .zero, ofPage: self.syncDot?.page)
-//                if finished {
-//                    self.syncDot = nil
-//                }
-//            }
         }
     }
 }
@@ -82,8 +54,7 @@ extension CPDFListView {
 extension CPDFListView {
     open override var autoScales: Bool {
         didSet {
-//            let setups = NSApp.orderedDocuments.compactMap { $0.value(forKey:"currentDocumentSetup") }
-            let documentSetups = NSApp.orderedDocuments.map { $0.value(forKey: "currentDocumentSetup") }
+             let documentSetups = NSApp.orderedDocuments.map { $0.value(forKey: "currentDocumentSetup") }
             UserDefaults.standard.setValue(documentSetups, forKey: SKLastOpenFileNamesKey)
             UserDefaults.standard.synchronize()
         }

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Annotation/KMScreenViewController/ScreenCollectionView/View/KMAnnotationScreenColorViewItem.xib

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMAnnotationScreenColorViewItem" customModule="PDF_Master" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMAnnotationScreenColorViewItem" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="box" destination="Vd2-Yb-aPM" id="qkB-3X-927"/>
                 <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
@@ -17,7 +18,7 @@
             <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <box boxType="custom" borderWidth="0.0" cornerRadius="4" translatesAutoresizingMaskIntoConstraints="NO" id="Vd2-Yb-aPM" customClass="KMBox" customModule="PDF_Master" customModuleProvider="target">
+                <box boxType="custom" borderWidth="0.0" cornerRadius="4" translatesAutoresizingMaskIntoConstraints="NO" id="Vd2-Yb-aPM" customClass="KMBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
                     <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
                     <view key="contentView" id="kPC-6M-xsy">
                         <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>

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

@@ -31,10 +31,7 @@ import Masonry
 
     weak var dataSources: KMCustomButtonPopMenuViewControllerDataSources?
     weak var delegate: KMCustomButtonPopMenuViewControllerDelegate?
-    
-//    override var nibName: NSNib.Name? {
-//        return "KMCustomButtonPopMenuViewController"
-//    }
+   
 
     @objc override func viewDidLoad() {
         super.viewDidLoad()