【2025】【综合】代码整理

PDF Office/PDF Master/Class/PDFTools/Snapshot/Window/KMSnapshotWindowController.swift

@@ -36,13 +36,7 @@ class KMSnapshotWindowController: KMBaseWindowController {
     var windowImage: NSImage?
     
     var EM_DASH_CHARACTER = 0x2014
-    
-    /*
-     #define EM_DASH_CHARACTER (unichar)0x2014
-     NSString *SKSnapshotCurrentSetupKey = @"currentSetup";
-     static char SKSnaphotWindowDefaultsObservationContext;
-     */
-    
+ 
     private let SMALL_DELAY =  0.1
     private let RESIZE_TIME_FACTOR = 0.6
     
@@ -231,15 +225,6 @@ class KMSnapshotWindowController: KMBaseWindowController {
             self._updateWindowLevel()
         }
     }
-/*
-
-     - (NSDictionary *)currentSetup {
-         NSView *clipView = [[[pdfView documentView] enclosingScrollView] contentView];
-         NSRect rect = [pdfView convertRect:[pdfView convertRect:[clipView bounds] fromView:clipView] toPage:[pdfView currentPage]];
-         BOOL autoFits = [pdfView autoFits];
-         return [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithUnsignedInteger:[self pageIndex]], PAGE_KEY, NSStringFromRect(rect), RECT_KEY, [NSNumber numberWithDouble:[pdfView scaleFactor]], SCALEFACTOR_KEY, [NSNumber numberWithBool:autoFits], AUTOFITS_KEY, [NSNumber numberWithBool:[[self window] isVisible]], HASWINDOW_KEY, NSStringFromRect([[self window] frame]), WINDOWFRAME_KEY, nil];
-     }
- */
     
     // MARK: - Actions
 

PDF Office/PDF Master/Class/PDFWindowController/ViewController/Model/KMMainModel.swift

@@ -8,9 +8,6 @@
 import Cocoa
 
 extension KMMainModel.Key {
-    static let kLeftSidePaneWidth            = "leftSidePaneWidth"
-    static let kRightSidePaneWidth           = "rightSidePaneWidth"
-    static let kSnapshots                    = "snapshots"
     
     static let kDisplaysPageBreaks           = "displaysPageBreaks"
     static let kDisplaysAsBook               = "displaysAsBook"
@@ -32,31 +29,10 @@ extension KMMainModel.Key {
     
     // 标识 pdf 已编辑
     var isPDFDocumentEdited = false
-    // 标识 pdf文字图片已编辑
-    var isPDFTextImageEdited = false
     
     var password: String?
     var isShowQuickTour = false
-    var isSaveKeyChain = true
-    var rightMouseEventing = false
-    
-    var hasAddRedact: Bool = false
-    var isShowBOTA: Bool = false
-    
-    let panelWidth = 212.0
-    let defaultRightWidth = 260.0
-    var lastLeftPanWidth = 0.0
-    var lastRightPanWidth = 0.0
-    var leftPanelOpen: Bool = false
-    var rightPanelIsOpen = false
-    
-    var beforeMarkedPageIndex = NSNotFound
-    var markedPageIndex = NSNotFound
-    var beforeMarkedPagePoint = NSPoint.zero
-    var markedPagePoint = NSPoint.zero
-    
-    var needConvertNotes = true
-    
-    var addAnnotations: [CPDFAnnotation] = []
-    var removeAnnotations: [CPDFAnnotation] = []
+    var isSaveKeyChain = true 
+     
+      
 }

PDF Office/PDF Master/KMClass/KMPDFViewController/KMMainViewController+Action.swift

@@ -37,9 +37,7 @@ extension KMMainViewController {
             }
         }
     }
-    
-      
-    
+     
     func numberOfChars(_ str: String) -> (num: Int, indexN: Int) {
         var number = 0
         var indexN = 0
@@ -84,14 +82,7 @@ extension KMMainViewController {
         }
         return isFull
     }
-    
-   
-    
-    func forceSubwindowsOnTop(_ flag: Bool) {
-        
-    }
-    
-    
+         
     //MARK: menuItem Action
     
     @objc func menuItemEditingClick_FontColor(sender: NSMenuItem) {
@@ -132,10 +123,10 @@ extension KMMainViewController {
     }
     
     @objc func menuItemEditingClick_CropImage(sender: NSMenuItem) {
- 
-            if self.listView.cropAreas != nil && self.listView.selectImageAreas != nil{
-                self.listView.cropEditImageArea(self.listView.selectImageAreas, withBounds: self.listView.cropAreas.cropRect)
-            }
+        
+        if self.listView.cropAreas != nil && self.listView.selectImageAreas != nil{
+            self.listView.cropEditImageArea(self.listView.selectImageAreas, withBounds: self.listView.cropAreas.cropRect)
+        }
     }
     
     @objc func menuItemAnnotationClick_toolModel(sender: NSMenuItem) {
@@ -536,21 +527,7 @@ extension KMMainViewController {
     }
      
     //MARK: - action
-      
-    // 开启左边栏
-    @objc func openLeftPane() -> Void {
-        self.model.leftPanelOpen = true
-        applyLeftSideWidth(self.model.panelWidth+functionWidth, rightSideWidth: self.model.lastRightPanWidth)
-        
-     }
-    
-    // 关闭左边栏
-    @objc func closeLeftPane() -> Void {
-        self.model.leftPanelOpen = false
-        applyLeftSideWidth(functionWidth, rightSideWidth: self.model.lastRightPanWidth)
-        
-     }
-    
+  
     func rename(_ sender: NSNotification) -> Void {
         if (self.view.window == nil || self.view.window!.isVisible == false) {
             return
@@ -663,9 +640,7 @@ extension KMMainViewController {
             }
         }
     }
-    
-    
-    
+     
     func closeTab(_ sender: NSNotification) -> Void {
         
     }
@@ -797,8 +772,7 @@ extension KMMainViewController {
         }
     }
     func aiTranslationPDFFileAction() {
-  
-        self._aiTranslationPDFFileAction()
+         self._aiTranslationPDFFileAction()
     }
     
     private func _aiTranslationPDFFileAction() {
@@ -930,9 +904,7 @@ extension KMMainViewController {
         }
         let pageIndex = listView.currentPageIndexAndPoint(&point, rotated: nil)
         
-        setup[kWindowFrameKey] = NSStringFromRect(mainWindow?.frame ?? NSZeroRect)
-        setup[KMMainModel.Key.kLeftSidePaneWidth] = self.model.lastLeftPanWidth
-        setup[KMMainModel.Key.kRightSidePaneWidth] = self.model.lastRightPanWidth
+        setup[kWindowFrameKey] = NSStringFromRect(mainWindow?.frame ?? NSZeroRect) 
         setup[KMMainModel.Key.pageIndex] = pageIndex
          
         return setup

PDF Office/PDF Master/KMClass/KMPDFViewController/KMMainViewController.swift

@@ -168,18 +168,7 @@ struct KMNMWCFlags {
     let CPDFOfficeRightSidePaneWidthKey = "CPDFOfficeRightSidePaneWidthKey"
     
     var extract: KMExtractImageWindowController?
-    
-    var functionWidth: Double {
-        get {
-            if self.viewManager.isPDFReadMode {
-                if !self.model.isShowBOTA {
-                    return 0
-                }
-            }
-            return 48-4
-        }
-    }
-    
+     
     var pageNumber: UInt?
     
     var autoSaveTimer: Timer?
@@ -4322,9 +4311,7 @@ extension KMMainViewController: KMInteractionProviderProtocol {
                 self.view.window?.level = level
                 self.listView.layoutDocumentView()
                 self.listView.requiresDisplay()
-                
-                self.forceSubwindowsOnTop(false)
-                
+               
             }
         } else {
             KMPrint("2")
@@ -6124,7 +6111,7 @@ extension KMMainViewController: KMNLeftSideViewControllerDelegate {
     
     func switchSearchPopWindow(controller: KMNLeftSideViewController) {
         if(viewManager.pdfSideBarType == .search) {
-            closeLeftPane()
+            toggleCloseLeftSide()
         }
         
         let handdler = controller.searchViewC.handdler

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

@@ -8596,8 +8596,8 @@
 		AD8B59242D2B777700150EA6 /* View */ = {
 			isa = PBXGroup;
 			children = (
-				AD8B59252D2B777700150EA6 /* KMBatchCollectionViewItem.xib */,
 				AD8B59262D2B777700150EA6 /* KMBatchCollectionViewItem.swift */,
+				AD8B59252D2B777700150EA6 /* KMBatchCollectionViewItem.xib */,
 			);
 			path = View;
 			sourceTree = "<group>";