【2025】【综合】快捷键调整

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

@@ -26,19 +26,15 @@
     if (self.interactionMode == KMInteractionModePresentation) {
         // Presentation mode
         unichar ec = [theEvent firstCharacter];
-//        NSLog(@"%u-%u", ec, NSRightArrowFunctionKey);
-        // [[self scrollView] hasHorizontalScroller] == NO &&
         if ((ec == NSRightArrowFunctionKey) &&  (modifiers == 0)) {
             [self goToNextPage:self];
         }
-        // [[self scrollView] hasHorizontalScroller] == NO &&
         else if ((ec == NSLeftArrowFunctionKey) &&  (modifiers == 0)) {
             [self goToPreviousPage:self];
         } else if ((ec == 'p') && (modifiers == 0)) {
-//            if ([[self delegate] respondsToSelector:@selector(PDFViewToggleContents:)])
-//                [[self delegate] PDFViewToggleContents:self];
+            
         } else if ((ec == 'a') && (modifiers == 0)) {
-//            [self toggleAutoActualSize:self];
+ 
         } else if ((ec == 'b') && (modifiers == 0)) {
             NSView *documentView = [self documentView];
             [documentView setHidden:[documentView isHidden] == NO];
@@ -63,7 +59,7 @@
             }
         }
     }
-        
+    
     BOOL isContinue = YES;
     if([self.pdfListViewDelegate respondsToSelector:@selector(PDFListViewKeyDownIsContinue:theEvent:)]) {
         isContinue = [self.pdfListViewDelegate PDFListViewKeyDownIsContinue:self theEvent:theEvent];
@@ -107,7 +103,6 @@
         [self doResizeActiveAnnotationForKey:eventChar byAmount:(modifiers & NSEventModifierFlagShift) ? 10.0 : 1.0];
     } else if (isFreeText  && eventChar == CPDFListEscapeCharacter && [self isEditWithCurrentFreeText:self.activeAnnotation]) {
         [self commitEditAnnotationFreeText:(CPDFFreeTextAnnotation *)self.activeAnnotation];
-//        [self becomeFirstResponder];
         [self.window makeFirstResponder:self];
         if(self.activeAnnotation.contents.length < 1) {
             CPDFPage *page = self.activeAnnotation.page;
@@ -115,6 +110,9 @@
             [self updateActiveAnnotations:@[]];
             [self setNeedsDisplayAnnotationViewForPage:page];
         }
+    } else if(self.activeAnnotations.count > 0 && eventChar == CPDFListEscapeCharacter) {
+        [self updateActiveAnnotations:@[]];
+        [self setNeedsDisplayAnnotationViewForVisiblePages];
     } else if ((self.clickPolylineAnnotation ||
                 self.clickPolygonAnnotation ||
                 self.clickSquareFronPolygonAnnotation ||
@@ -127,13 +125,10 @@
         }
     } else if (CAnnotationTypeUnkown != [self annotationType] && eventChar == CPDFListEscapeCharacter) {
         if (self.toolMode == CEditPDFToolMode) {
-//            [[NSNotificationCenter defaultCenter] postNotificationName:@"CEditPDFToolModeChangeStateUnkown" object:self];
+
         } else {
             [self setAnnotationType:CAnnotationTypeUnkown];
         }
-    } else if(self.activeAnnotations.count > 0 && eventChar == CPDFListEscapeCharacter){
-        [self updateActiveAnnotations:@[]];
-        [self setNeedsDisplayAnnotationViewForVisiblePages];
     } else if (([theEvent modifierFlags] & NSEventModifierFlagShift) && (theEvent.keyCode == 118)) {
         if([[self pdfListViewDelegate] respondsToSelector:@selector(PDFListViewKeyDowClosePanel:event:)]) {
             [[self pdfListViewDelegate] PDFListViewKeyDowClosePanel:CPDFViewSidebarSpeedModeRight event:theEvent];

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

@@ -186,7 +186,6 @@ struct KMNMWCFlags {
     private var _documentFirstLoad: Bool = true
     
     var eventMonitor: Any?
-    var keyEventMonitor: Any?
     var mouseRightMenuEvent: NSEvent?
     
     lazy private var homeVC: KMNHomeViewController? = {
@@ -267,7 +266,6 @@ struct KMNMWCFlags {
         self.listView.document?.delegate = nil
         
         self.removeEventMonitor()
-        self.removeKeyEventMonitor()
     }
     
     override func viewDidLoad() {
@@ -7271,94 +7269,6 @@ extension KMMainViewController {
         }
     }
     
-    func addKeyEventMonitor() {
-        if (self.keyEventMonitor != nil) {
-            self.removeKeyEventMonitor()
-        }
-        keyEventMonitor = NSEvent.addLocalMonitorForEvents(matching: .keyDown) { [weak self] event in
-            if event.keyCode == 53 {
-                if let data = self?.interactionMode, data == .presentation { // 幻灯片模式下
-                    self?.exitFullScreen()
-                    return event
-                }
-                if self?.listView.toolMode == .CEditPDFToolMode {
-                    if self != nil {
-                        //使用editingSelectionString获取内容文字
-                        if self!.listView.editingAreas() != nil {
-                            if self!.listView.editingAreas().count > 0 && self!.listView.isEditable() {
-                                self!.listView.clearEditingSelectCharItem()
-                            } else if self!.listView.editingAreas().count > 0 {
-                                if self?.listView.shouAddEditAreaType() == .image ||
-                                    self?.listView.shouAddEditAreaType() == .text {
-                                }
-                                self?.listView.endEditIsRemoveBlock(with: self!.listView.editingAreas().first as? CPDFEditArea)
-                                self?.listView.updateEditing([])
-                                self?.listView.isEditImage = false
-                                self?.listView.setNeedsDisplayPageViewFor(self!.listView.currentPage())
-                                if self?.listView.shouAddEditAreaType() == .image {
-                                    self?.listView.change([.text, .image])
-                                }
-                                self?.toggleCloseRightSide()
-                            } else if(self?.listView.shouAddEditAreaType() == .image || self!.listView.shouAddEditAreaType() == .text) {
-                                if self?.listView.shouAddEditAreaType() == .image ||
-                                    self?.listView.shouAddEditAreaType() == .text {
-                                }
-                                self?.listView.setShouAddEdit([])
-                                self?.listView.change([.text, .image])
-                                self?.toggleCloseRightSide()
-                            }
-                            
-                        } else {
-                            if self?.listView.shouAddEditAreaType() == .image ||
-                                self?.listView.shouAddEditAreaType() == .text {
-                            }
-                        }
-                    }
-                }
-            } else {
-                if let data = self?.interactionMode, data == .presentation { // 幻灯片模式下
-                    self?.listView.keyDown(with: event)
-                    return event
-                } else {
-                    let cmd = event.modifierFlags.contains(.command)
-                    let shift = event.modifierFlags.contains(.shift)
-                    if event.keyCode == 6 { // z
-                        let editPDFIng = self?.listView.isEditing() ?? false
-                        if cmd && shift { // 恢复
-                            let can = self?.listView.canEditTextRedo() ?? false
-                            if can == false {
-                                return event
-                            }
-                            if editPDFIng {
-                                _ = CustomAlertView.alertView(message: NSLocalizedString("Redo", comment: ""), fromView: self!.view, withStyle: .black)
-                                
-                            }
-                        } else if cmd { // 撤回
-                            let can = self?.listView.canEditTextUndo() ?? false
-                            if can == false {
-                                return event
-                            }
-                            if editPDFIng {
-                                _ = CustomAlertView.alertView(message: NSLocalizedString("Undo", comment: ""), fromView: self!.view, withStyle: .black)
-                                
-                            }
-                        }
-                    }
-                }
-            }
-            return event
-        }
-    }
-    
-    func removeKeyEventMonitor() {
-        if (self.keyEventMonitor != nil) {
-            KMPrint("removeKeyEventMonitor 已移除事件监听")
-            
-            NSEvent.removeMonitor(self.keyEventMonitor as Any)
-            self.keyEventMonitor = nil
-        }
-    }
-    
     private func removeEventMonitor() {
         if (self.eventMonitor != nil) {
             KMPrint("已移除事件监听")