【2025】【快捷键】补充Edit相关快捷键

PDF Office/PDF Master/AppDelegate+MenuAction.swift

@@ -636,11 +636,13 @@ extension AppDelegate {
                 }
                 return false
             } else if action == NSSelectorFromString("menuItemAction_FontAlign:") {
-                if mainVC.viewManager.toolMode == .Edit {
-                    if mainVC.viewManager.subToolMode == .None || mainVC.viewManager.subToolMode == .Edit_text {
-                        if mainVC.listView.km_editingTextAreas().count > 0 {
-                            return true
-                        }
+                if mainVC.listView.isEditing() == true {
+                    if mainVC.listView.km_editingTextAreas().count > 0 {
+                        return true
+                    }
+                } else  {
+                    if let freeTextAnnotation = mainVC.listView.activeAnnotation as? CPDFFreeTextAnnotation {
+                        return true
                     }
                 }
                 return false

PDF Office/PDF Master/Base.lproj/Main.storyboard

@@ -503,7 +503,7 @@ CA
                                             <menu key="submenu" title="Font" systemMenu="font" id="DvI-31-TD8">
                                                 <items>
                                                     <menuItem title="Show Fonts" keyEquivalent="T" id="OZU-ao-jhE">
-                                                        <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
+                                                        <modifierMask key="keyEquivalentModifierMask" shift="YES" option="YES" command="YES"/>
                                                         <connections>
                                                             <action selector="menuItemAction_ShowFont:" target="Voe-Tx-rLC" id="OtB-jN-fhl"/>
                                                         </connections>

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFEditArea/CPDFListView+CPDFEditArea.swift

@@ -269,23 +269,6 @@ extension CPDFListView {
         }
     }
     
-    func fontAddAction() {
-        let areas = self.km_editingTextAreas()
-        for area in areas {
-            let fontSize = self.editingSelectionFontSize(byRangeEdit: area)
-            self.setEditingSelectionFontSize(fontSize+1, with: area, isAutoSize: false)
-        }
-    }
-    
-    func fontReduceAction() {
-        let areas = self.km_editingTextAreas()
-        for area in areas {
-            let fontSize = self.editingSelectionFontSize(byRangeEdit: area)
-            self.setEditingSelectionFontSize(fontSize-1, with: area, isAutoSize: false)
-            
-        }
-    }
-    
     func setEditingTextarea_Bold() {
         let areas = self.km_editingTextAreas()
         for area in areas {

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

@@ -1515,13 +1515,13 @@ struct KMNMWCFlags {
     
     func menuItemAction_FontAction(_ index: Int) {
         if index == 0 {
-            self.listView.setEditingTextarea(isBold: true)
+            self.listView.setEditingTextarea_Bold()
         } else if index == 1 {
-            self.listView.setEditingTextarea(isItalic: true)
+            self.listView.setEditingTextarea_Italic()
         } else if index == 2 {
-            self.listView.fontAddAction()
+            self.listView.zoomInEditTextFontSize()
         } else if index == 3 {
-            self.listView.fontReduceAction()
+            self.listView.zoomOutEditTextFontSize()
         } else if index == 4 {
             let colorPanel = NSColorPanel.shared
             colorPanel.setTarget(self)
@@ -1532,12 +1532,24 @@ struct KMNMWCFlags {
     }
     
     func menuItemAction_FontAlign(_ index: Int) {
+        var align: NSTextAlignment = .left
         if index == 0 {
-            self.listView.setEditingTextarea_Alignment(align: .left)
+            align = .left
         } else if index == 1 {
-            self.listView.setEditingTextarea_Alignment(align: .center)
+            align = .center
         } else if index == 2 {
-            self.listView.setEditingTextarea_Alignment(align: .right)
+            align = .right
+        }
+        if(listView.isEditing() == true) {
+            self.listView.setEditingTextarea_Alignment(align: align)
+        } else {
+            if let freeTextAnnotation = listView.activeAnnotation as? CPDFFreeTextAnnotation {
+                if listView.isEdit(withCurrentFreeText: freeTextAnnotation) == true {
+                    listView.commitEditAnnotationFreeText(freeTextAnnotation)
+                }
+                freeTextAnnotation.alignment = align
+                listView.setNeedsDisplay(freeTextAnnotation)
+            }
         }
     }
     func menuItemAction_CustomFont(_ index: Int) {
@@ -5999,6 +6011,18 @@ extension KMMainViewController: CPDFViewDelegate,CPDFListViewDelegate {
                     
                     return false
                 }
+            } else if option && command && theEvent.keyCode == 8 { // 复制样式
+                if self.listView.km_editingTextAreas().count == 1 {
+                    if listView.isSelecteditAreaNotEdit() {
+                        listView.copyEditAreaAction()
+                    }
+                    return false
+                }
+            } else if option && command && theEvent.keyCode == 9 { //粘贴样式
+                if listView.isSupportPastMatchStyle() {
+                    listView.pasteEditAreaMatchStyleActionWith(nil)
+                }
+                return false
             }
         }