【2025】【综合】

1、合并界面修正
2、批量界面处理
3、多语调整

PDF Office/PDF Master/Class/PDFTools/Merge/MergeNew/KMMergeWindowController.swift

@@ -357,6 +357,8 @@ extension KMMergeWindowController {
         if mergeView.originalSizeButton.state == .on {
             
         } else {
+            self.window?.makeFirstResponder(nil)
+            
             let size = self.mergeView.newPageSize
             if size.width < 0 {
                 return

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

@@ -195,6 +195,18 @@ extension KMMergeView: NSTableViewDataSource {
     }
 }
 
+extension KMMergeView: NSTextFieldDelegate {
+    
+    func controlTextDidEndEditing(_ obj: Notification) {
+        if self.pageSizeWidthTextField.isEqual(to: obj.object) {
+            self.newPageSize.width = CGFloat(self.pageSizeWidthTextField.floatValue)
+        } else if self.pageSizeHeightTextField.isEqual(to: obj.object) {
+            self.newPageSize.height = CGFloat(self.pageSizeHeightTextField.floatValue)
+        }
+    }
+
+}
+
 extension KMMergeView: NSTableViewDelegate {
     func tableView(_ tableView: NSTableView, writeRowsWith rowIndexes: IndexSet, to pboard: NSPasteboard) -> Bool {
         let indexSetData = try? NSKeyedArchiver.archivedData(withRootObject: rowIndexes, requiringSecureCoding: true)

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" 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>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -225,6 +225,9 @@ Gw
                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
+                                        <connections>
+                                            <outlet property="delegate" destination="-2" id="9d7-Fn-frb"/>
+                                        </connections>
                                     </textField>
                                     <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jxI-cc-QWo">
                                         <rect key="frame" x="102" y="295" width="11" height="16"/>
@@ -245,6 +248,9 @@ Gw
                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
+                                        <connections>
+                                            <outlet property="delegate" destination="-2" id="8MR-ZP-mVA"/>
+                                        </connections>
                                     </textField>
                                     <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yGv-Dg-skg">
                                         <rect key="frame" x="182" y="295" width="27" height="16"/>

PDF Office/PDF Master/KMClass/NewBatch/KMBatchWindowController.swift

@@ -242,7 +242,7 @@ extension KMBatchWindowController: KMBatchProcessingViewDelegate {
 extension KMBatchWindowController: KMBatchCollectionViewDelegate {
     func didSelect(index: IndexPath, data: KMBatchCollectionViewModel) {
         KMPrint(data.type.rawValue)
-        KMBatchManager.manager.batchUnkown()
+    
         let dataType: KMBatchCollectionViewType = data.type
         self.settingView.type = dataType
         self.batchPrecessingView.inputType = dataType

PDF Office/PDF Master/KMClass/NewBatch/View/Setting/BatchRemove/KMBatchRemoveView.swift

@@ -92,10 +92,11 @@ class KMBatchRemoveView: KMBatchSettingItemView {
     
     override func reloadData() {
         if (self.filesData.count != 0 && self.data.options != .none) {
-            self.removeButton.properties.isDisabled = false
+            self.removeButton.properties.isDisabled = self.isDisable
         } else {
             self.removeButton.properties.isDisabled = true
         }
+        self.removeButton.reloadData()
         
         if self.data.options.contains(.watermark) {
             self.watermarkButton.properties.checkboxType = .selected
@@ -136,7 +137,12 @@ class KMBatchRemoveView: KMBatchSettingItemView {
         self.headerAndFooterButton.reloadData()
         self.batesButton.properties.isDisabled = self.isDisable
         self.batesButton.reloadData()
-        self.removeButton.properties.isDisabled = self.isDisable
+        
+        if (self.filesData.count != 0 && self.data.options != .none) {
+            self.removeButton.properties.isDisabled = self.isDisable
+        } else {
+            self.removeButton.properties.isDisabled = true
+        }
         self.removeButton.reloadData()
     }
     

PDF Office/PDF Master/Strings/ja.lproj/Localizable.strings

@@ -2239,6 +2239,7 @@
 "Next" = "次へ";
 "Previous" = "前へ";
 "Back" = "戻る";
+"Backward" = "戻る";
 "Forward" = "進む";
 "Full Screen" = "フルスクリーン";
 "Presentation" = "プレゼンテーション";

PDF Office/PDF Master/Strings/zh-Hans.lproj/Localizable.strings

@@ -115,7 +115,8 @@
 
 /* Menu item title */
 "Back" = "向后";
-"Forward" = "向后";
+"Forward" = "向前";
+"Backward" = "向后";
 
 /* Tool tip message
    Toolbar item label */

PDF Office/PDF Master/Strings/zh-Hant.lproj/Localizable.strings

@@ -3294,6 +3294,7 @@
 "Previous" = "上一頁";
 "Back" = "向後";
 "Forward" = "向前";
+"Backward" = "向後";
 "Full Screen" = "全螢幕";
 "Presentation" = "簡報";
 "Go To Page…" = "前往頁面…";