【OCToSwift】KMBatchTableRowView替换为Swift

PDF Office/PDF Master.xcodeproj/project.pbxproj

@@ -1012,6 +1012,9 @@
 		9FCFECA02AD17B8A00EAD2CB /* SKProgressController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FCFEC9F2AD17B8A00EAD2CB /* SKProgressController.swift */; };
 		9FCFECA12AD17B8A00EAD2CB /* SKProgressController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FCFEC9F2AD17B8A00EAD2CB /* SKProgressController.swift */; };
 		9FCFECA22AD17B8A00EAD2CB /* SKProgressController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FCFEC9F2AD17B8A00EAD2CB /* SKProgressController.swift */; };
+		9FCFECA42AD237B500EAD2CB /* KMBatchTableRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FCFECA32AD237B500EAD2CB /* KMBatchTableRowView.swift */; };
+		9FCFECA52AD237B500EAD2CB /* KMBatchTableRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FCFECA32AD237B500EAD2CB /* KMBatchTableRowView.swift */; };
+		9FCFECA62AD237B500EAD2CB /* KMBatchTableRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FCFECA32AD237B500EAD2CB /* KMBatchTableRowView.swift */; };
 		9FD0FA2929CD3ED400F2AB0D /* KMRightSideEmptyVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FD0FA2729CD3ED400F2AB0D /* KMRightSideEmptyVC.swift */; };
 		9FD0FA2A29CD3ED400F2AB0D /* KMRightSideEmptyVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FD0FA2729CD3ED400F2AB0D /* KMRightSideEmptyVC.swift */; };
 		9FD0FA2B29CD3ED400F2AB0D /* KMRightSideEmptyVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FD0FA2729CD3ED400F2AB0D /* KMRightSideEmptyVC.swift */; };
@@ -2848,9 +2851,6 @@
 		BBAFC84D298519F700D0648E /* KMSavePanelAccessoryController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BBAFC849298519F600D0648E /* KMSavePanelAccessoryController.xib */; };
 		BBAFC84E298519F700D0648E /* KMSavePanelAccessoryController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BBAFC849298519F600D0648E /* KMSavePanelAccessoryController.xib */; };
 		BBAFC84F298519F700D0648E /* KMSavePanelAccessoryController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BBAFC849298519F600D0648E /* KMSavePanelAccessoryController.xib */; };
-		BBAFC85229851A9800D0648E /* KMBatchTableRowView.m in Sources */ = {isa = PBXBuildFile; fileRef = BBAFC85129851A9800D0648E /* KMBatchTableRowView.m */; };
-		BBAFC85329851A9800D0648E /* KMBatchTableRowView.m in Sources */ = {isa = PBXBuildFile; fileRef = BBAFC85129851A9800D0648E /* KMBatchTableRowView.m */; };
-		BBAFC85429851A9800D0648E /* KMBatchTableRowView.m in Sources */ = {isa = PBXBuildFile; fileRef = BBAFC85129851A9800D0648E /* KMBatchTableRowView.m */; };
 		BBAFC85829851AF200D0648E /* KMBlankView.m in Sources */ = {isa = PBXBuildFile; fileRef = BBAFC85529851AF200D0648E /* KMBlankView.m */; };
 		BBAFC85929851AF200D0648E /* KMBlankView.m in Sources */ = {isa = PBXBuildFile; fileRef = BBAFC85529851AF200D0648E /* KMBlankView.m */; };
 		BBAFC85A29851AF200D0648E /* KMBlankView.m in Sources */ = {isa = PBXBuildFile; fileRef = BBAFC85529851AF200D0648E /* KMBlankView.m */; };
@@ -3933,6 +3933,7 @@
 		9FCFEC972AD14EEF00EAD2CB /* KMMailHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMMailHelper.swift; sourceTree = "<group>"; };
 		9FCFEC9B2AD152FA00EAD2CB /* CustomAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomAlertView.swift; sourceTree = "<group>"; };
 		9FCFEC9F2AD17B8A00EAD2CB /* SKProgressController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SKProgressController.swift; sourceTree = "<group>"; };
+		9FCFECA32AD237B500EAD2CB /* KMBatchTableRowView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMBatchTableRowView.swift; sourceTree = "<group>"; };
 		9FD0FA2729CD3ED400F2AB0D /* KMRightSideEmptyVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMRightSideEmptyVC.swift; sourceTree = "<group>"; };
 		9FD0FA2829CD3ED400F2AB0D /* KMRightSideEmptyVC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMRightSideEmptyVC.xib; sourceTree = "<group>"; };
 		9FD0FA2F29CD947000F2AB0D /* KMOpacityPanel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMOpacityPanel.swift; sourceTree = "<group>"; };
@@ -4648,8 +4649,6 @@
 		BBAFC847298519F600D0648E /* KMSavePanelAccessoryController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMSavePanelAccessoryController.m; sourceTree = "<group>"; };
 		BBAFC848298519F600D0648E /* KMSavePanelAccessoryController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMSavePanelAccessoryController.h; sourceTree = "<group>"; };
 		BBAFC849298519F600D0648E /* KMSavePanelAccessoryController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KMSavePanelAccessoryController.xib; sourceTree = "<group>"; };
-		BBAFC85029851A9700D0648E /* KMBatchTableRowView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMBatchTableRowView.h; sourceTree = "<group>"; };
-		BBAFC85129851A9800D0648E /* KMBatchTableRowView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMBatchTableRowView.m; sourceTree = "<group>"; };
 		BBAFC85529851AF200D0648E /* KMBlankView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMBlankView.m; sourceTree = "<group>"; };
 		BBAFC85629851AF200D0648E /* KMTableRowView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMTableRowView.m; sourceTree = "<group>"; };
 		BBAFC85729851AF200D0648E /* KMTableRowView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMTableRowView.h; sourceTree = "<group>"; };
@@ -8673,8 +8672,7 @@
 				BB7507E829861C37002DBDB1 /* PasswordWindowController.h */,
 				BB7507E629861C37002DBDB1 /* PasswordWindowController.m */,
 				BB7507E729861C37002DBDB1 /* PasswordWindowController.xib */,
-				BBAFC85029851A9700D0648E /* KMBatchTableRowView.h */,
-				BBAFC85129851A9800D0648E /* KMBatchTableRowView.m */,
+				9FCFECA32AD237B500EAD2CB /* KMBatchTableRowView.swift */,
 				BBAFC86329851B5900D0648E /* KMBlankView.h */,
 				BBAFC85529851AF200D0648E /* KMBlankView.m */,
 				BBAFC843298519A400D0648E /* KMFileAttribute.h */,
@@ -10664,6 +10662,7 @@
 				9F8539BE2943085A00DF644E /* KMBrowser.swift in Sources */,
 				89D9896C28FD50EF003A3E87 /* KMAnnotationCollectionViewItem.swift in Sources */,
 				9FCFEC742AC56ECE00EAD2CB /* CPDFListStampAnnotation.swift in Sources */,
+				9FCFECA42AD237B500EAD2CB /* KMBatchTableRowView.swift in Sources */,
 				BB86C1ED28F544F4005AD968 /* CPDFListView+Event.m in Sources */,
 				BB88E454294045B4002B3655 /* KMPDFConvertManager.swift in Sources */,
 				ADC075EA2987A38C006C752F /* KMBatchConverPDFCSVView.swift in Sources */,
@@ -11109,7 +11108,6 @@
 				89D2D2C5294972B900BFF5FE /* KMFormCellView.swift in Sources */,
 				BB897224294B07960045787C /* KMWatermarkAdjectiveTopBarItemView.swift in Sources */,
 				9F1F82BC292E01860092C4B4 /* KMCloudEmptyCollectionViewItem.swift in Sources */,
-				BBAFC85229851A9800D0648E /* KMBatchTableRowView.m in Sources */,
 				ADB1FE4329700DAD00ED072D /* KMBatchCollectionViewModel.swift in Sources */,
 				F34BF93F29530D02002C25A2 /* NSBezierPath+PDFListView.m in Sources */,
 				AD9527EA2955520C0039D2BC /* KMBaseTextFieldModel.swift in Sources */,
@@ -11913,7 +11911,6 @@
 				9F1FE50329406E4700E952CA /* CTTabStripModelOrderController.m in Sources */,
 				F34BF93629530708002C25A2 /* NSImage+PDFListView.m in Sources */,
 				BB49ECFF293F459500C82CA2 /* KMConvertPPTsWindowController.swift in Sources */,
-				BBAFC85329851A9800D0648E /* KMBatchTableRowView.m in Sources */,
 				ADB1FE4429700DAD00ED072D /* KMBatchCollectionViewModel.swift in Sources */,
 				9F1F82EB2935D02E0092C4B4 /* KMComboBox.swift in Sources */,
 				AD9527EB2955520C0039D2BC /* KMBaseTextFieldModel.swift in Sources */,
@@ -11997,6 +11994,7 @@
 				9F1FE50029406E4700E952CA /* CTTabStripModel.m in Sources */,
 				BB147042299DC0D200784A6A /* OIDClientMetadataParameters.m in Sources */,
 				9F1FE4CA29406E4700E952CA /* CTTabContents.m in Sources */,
+				9FCFECA52AD237B500EAD2CB /* KMBatchTableRowView.swift in Sources */,
 				BB1A34A9295EA30100B80B3E /* NSBitmapImageRep_SKExtensions.m in Sources */,
 				9F0CB4FE298655F600007028 /* KMDesignToken+BorderColor.swift in Sources */,
 				BBB1A3A729F6B66400E54E47 /* NSPanel+KMExtension.swift in Sources */,
@@ -12128,11 +12126,11 @@
 				9F0201882A1DA28B00C9B673 /* KMAILanguagePopVC.swift in Sources */,
 				F37322EC292DF9410013862C /* CPDFStampAnnotation+PDFListView.m in Sources */,
 				BB8F4562295AA39F0037EA22 /* KMHeaderFooterModel.swift in Sources */,
-				BBAFC85429851A9800D0648E /* KMBatchTableRowView.m in Sources */,
 				BB89723C294B3C840045787C /* KMWatermarkPropertyController.swift in Sources */,
 				9FBA0F0029015A82001117AF /* KMFastToolCollectionViewItem.swift in Sources */,
 				BB146FD1299DC0D100784A6A /* GTMMIMEDocument.m in Sources */,
 				BBAFC85A29851AF200D0648E /* KMBlankView.m in Sources */,
+				9FCFECA62AD237B500EAD2CB /* KMBatchTableRowView.swift in Sources */,
 				BB1EC8002967B26700EC0BC3 /* KMPDFEditViewController.swift in Sources */,
 				AD015FB929AB484400A57062 /* KMLightMemberConfig.swift in Sources */,
 				ADBC2D13299CCD05006280C8 /* KMTextfieldButton.swift in Sources */,

PDF Office/PDF Master/Class/Merge/OCPart/KMBatchTableRowView.h

@@ -1,18 +0,0 @@
-//
-//  KMBatchTableRowView.h
-//  PDF Reader Pro Edition
-//
-//  Created by zhipeng jiang on 2020/11/2.
-//
-
-#import "KMTableRowView.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface KMBatchTableRowView : KMTableRowView
-
-@property (nonatomic, strong, readonly) NSView *backgroundView;
-
-@end
-
-NS_ASSUME_NONNULL_END

PDF Office/PDF Master/Class/Merge/OCPart/KMBatchTableRowView.m

@@ -1,97 +0,0 @@
-//
-//  KMBatchTableRowView.m
-//  PDF Reader Pro Edition
-//
-//  Created by zhipeng jiang on 2020/11/2.
-//
-
-#import "KMBatchTableRowView.h"
-
-@interface KMBatchTableRowView ()
-
-@property (nonatomic, strong) NSView *backgroundView;
-
-@end
-
-@implementation KMBatchTableRowView
-
-- (instancetype)initWithFrame:(NSRect)frameRect {
-    if (self = [super initWithFrame:frameRect]) {
-        [self addSubview:self.backgroundView];
-        
-        self.backgroundView.hidden = YES;
-    }
-    return self;
-}
-
-- (void)layout {
-    [super layout];
-    
-    self.backgroundView.frame = NSMakeRect(self.selectionInset.left, self.selectionInset.top, NSWidth(self.bounds)-self.selectionInset.left-self.selectionInset.right, NSHeight(self.bounds)-self.selectionInset.top-self.selectionInset.bottom);
-}
-
-- (void)setSelectionInset:(NSEdgeInsets)selectionInset {
-    [super setSelectionInset:selectionInset];
-    
-    [self setNeedsLayout:YES];
-}
-
-- (void)setSelected:(BOOL)selected {
-    [super setSelected:selected];
-    
-    if (selected) {
-        self.backgroundView.hidden = YES;
-    }
-}
-
-#pragma mark - Mouse Event
-
-- (void)mouseExited:(NSEvent *)event {
-    [super mouseExited:event];
-    
-    self.backgroundView.hidden = YES;
-    for (NSUInteger i = 0; i < self.subviews.count; i++) {
-        NSView *v = [self.subviews objectAtIndex:i];
-        for (NSUInteger j = 0; j < v.subviews.count; j++) {
-            NSView *sub = [v.subviews objectAtIndex:j];
-            if ([sub isKindOfClass:[NSButton class]]) {
-                sub.hidden = YES;
-            }
-        }
-    }
-}
-
-- (void)mouseEntered:(NSEvent *)event {
-    [super mouseEntered:event];
-    
-    if (self.isSelected) {
-        self.backgroundView.hidden = YES;
-    } else {
-        self.backgroundView.hidden = NO;
-    }
-    
-    for (NSUInteger i = 0; i < self.subviews.count; i++) {
-        NSView *v = [self.subviews objectAtIndex:i];
-        for (NSUInteger j = 0; j < v.subviews.count; j++) {
-            NSView *sub = [v.subviews objectAtIndex:j];
-            if ([sub isKindOfClass:[NSButton class]]) {
-                sub.hidden = NO;
-            }
-        }
-    }
-}
-
-
-#pragma mark -
-#pragma mark - Getting
-
-- (NSView *)backgroundView {
-    if (!_backgroundView) {
-        _backgroundView = [[NSView alloc] init];
-        _backgroundView.wantsLayer = YES;
-        _backgroundView.layer.backgroundColor = [NSColor clearColor].CGColor;
-    }
-    return _backgroundView;
-}
-
-@end

PDF Office/PDF Master/Class/Merge/OCPart/KMBatchTableRowView.swift

@@ -0,0 +1,95 @@
+//
+//  KMBatchTableRowView.swift
+//  PDF Master
+//
+//  Created by wanjun on 2023/10/8.
+//
+
+import Cocoa
+
+@objcMembers
+class KMBatchTableRowView: KMTableRowView {
+
+    private var _backgroundView: NSView?
+    
+    override init(frame frameRect: NSRect) {
+        super.init(frame: frameRect)
+        
+        self.addSubview(self.backgroundView ?? NSView())
+        self.backgroundView?.isHidden = true
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func layout() {
+        super.layout()
+        
+        self.backgroundView?.frame = NSMakeRect(selectionInset.left, selectionInset.top, bounds.width - selectionInset.left - selectionInset.right, bounds.height - selectionInset.top - selectionInset.bottom)
+    }
+    
+    override var selectionInset: NSEdgeInsets {
+        didSet {
+            needsLayout = true
+        }
+    }
+    
+    override var isSelected: Bool {
+        didSet {
+            if isSelected {
+                backgroundView!.isHidden = true
+            }
+        }
+    }
+    
+    //MARK: Mouse Event
+    
+    override func mouseExited(with event: NSEvent) {
+        super.mouseExited(with: event)
+        
+        self.backgroundView?.isHidden = true
+        for view in subviews {
+            if let v = view as? NSView {
+                for subview in v.subviews {
+                    if let button = subview as? NSButton {
+                        button.isHidden = true
+                    }
+                }
+            }
+        }
+    }
+    
+    override func mouseEntered(with event: NSEvent) {
+        super.mouseEntered(with: event)
+        
+        if isSelected {
+            backgroundView!.isHidden = true
+        } else {
+            backgroundView!.isHidden = false
+        }
+        
+        for view in subviews {
+            if let v = view as? NSView {
+                for subview in v.subviews {
+                    if let button = subview as? NSButton {
+                        button.isHidden = false
+                    }
+                }
+            }
+        }
+    }
+    
+    //MARK: Get、Set
+    
+    var backgroundView: NSView? {
+        get {
+            if _backgroundView == nil {
+                _backgroundView = NSView()
+                _backgroundView?.wantsLayer = true
+                _backgroundView?.layer?.backgroundColor = NSColor.clear.cgColor
+            }
+            return _backgroundView
+        }
+    }
+}

PDF Office/PDF Master/Class/Merge/OCPart/KMPDFEditAppendWindow.m

@@ -11,7 +11,6 @@
 #import "KMFileAttribute.h"
 #import <Quartz/Quartz.h>
 #import "KMSavePanelAccessoryController.h"
-#import "KMBatchTableRowView.h"
 #import "KMBlankView.h"
 #import <Masonry/Masonry.h>
 #import "KMImageAccessoryController.h"

PDF Office/PDF Master/Class/Merge/OCPart/KMPDFEditAppendWindow.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22154" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22154"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -50,11 +50,11 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="818" height="600"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="875"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1800" height="1125"/>
             <value key="minSize" type="size" width="818" height="600"/>
             <value key="maxSize" type="size" width="818" height="600"/>
-            <view key="contentView" wantsLayer="YES" id="se5-gp-TjO">
-                <rect key="frame" x="0.0" y="0.0" width="804" height="600"/>
+            <view key="contentView" wantsLayer="YES" misplaced="YES" id="se5-gp-TjO">
+                <rect key="frame" x="0.0" y="0.0" width="818" height="600"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="122" horizontalPageScroll="10" verticalLineScroll="122" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ggk-eO-LzC">
@@ -86,7 +86,7 @@
                                                     <rect key="frame" x="1" y="1" width="437" height="120"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
-                                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="PgT-U2-qfU">
+                                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="PgT-U2-qfU">
                                                             <rect key="frame" x="18" y="52" width="24" height="16"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" constant="20" id="Hwf-fT-ly0"/>
@@ -104,7 +104,7 @@
                                                             </constraints>
                                                             <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="NSAdvanced" id="Sd3-jX-Ogs"/>
                                                         </imageView>
-                                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="eNU-Sm-LND">
+                                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="eNU-Sm-LND">
                                                             <rect key="frame" x="138" y="84" width="85" height="16"/>
                                                             <textFieldCell key="cell" lineBreakMode="truncatingMiddle" sendsActionOnEndEditing="YES" title="FileName.pdf" id="Ylr-ds-9Tk">
                                                                 <font key="font" metaFont="system"/>
@@ -112,7 +112,7 @@
                                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
                                                         </textField>
-                                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="398-sK-K5V">
+                                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="398-sK-K5V">
                                                             <rect key="frame" x="138" y="64" width="39" height="16"/>
                                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="2.0M" id="oVW-8o-Cnt">
                                                                 <font key="font" metaFont="system"/>
@@ -120,8 +120,8 @@
                                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
                                                         </textField>
-                                                        <comboBox verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8V9-7o-ppF">
-                                                            <rect key="frame" x="140" y="10" width="280" height="25"/>
+                                                        <comboBox focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8V9-7o-ppF">
+                                                            <rect key="frame" x="139" y="11" width="281" height="23"/>
                                                             <comboBoxCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" completes="NO" numberOfVisibleItems="5" id="7AZ-7i-5XC">
                                                                 <font key="font" metaFont="system"/>
                                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -136,7 +136,7 @@
                                                         <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="RnQ-bh-CRD">
                                                             <rect key="frame" x="0.0" y="-2" width="437" height="5"/>
                                                         </box>
-                                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Xwh-TX-M2m">
+                                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Xwh-TX-M2m">
                                                             <rect key="frame" x="203" y="64" width="61" height="16"/>
                                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="23 Pages" id="5dj-sT-DqB">
                                                                 <font key="font" metaFont="system"/>
@@ -146,19 +146,19 @@
                                                         </textField>
                                                         <button translatesAutoresizingMaskIntoConstraints="NO" id="uvu-07-lWB">
                                                             <rect key="frame" x="409" y="84" width="16" height="16"/>
-                                                            <constraints>
-                                                                <constraint firstAttribute="width" constant="16" id="5d9-Mx-d6v"/>
-                                                                <constraint firstAttribute="height" constant="16" id="7hC-bG-sOG"/>
-                                                            </constraints>
                                                             <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="KMImageNameUXIconBtnCloseNor" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="NIS-J9-zD9">
                                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                 <font key="font" metaFont="system"/>
                                                             </buttonCell>
+                                                            <constraints>
+                                                                <constraint firstAttribute="width" constant="16" id="5d9-Mx-d6v"/>
+                                                                <constraint firstAttribute="height" constant="16" id="7hC-bG-sOG"/>
+                                                            </constraints>
                                                             <connections>
                                                                 <action selector="buttonClicked_Remove:" target="kJM-8r-UtU" id="baP-ig-Qb8"/>
                                                             </connections>
                                                         </button>
-                                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="u5l-4V-ll2">
+                                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="u5l-4V-ll2">
                                                             <rect key="frame" x="138" y="38" width="77" height="16"/>
                                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Page Range" id="3Io-PJ-v5k">
                                                                 <font key="font" metaFont="system"/>
@@ -227,7 +227,7 @@
                             <rect key="frame" x="0.0" y="0.0" width="803" height="32"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
-                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="MiB-cx-nmS">
+                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="MiB-cx-nmS">
                                     <rect key="frame" x="48" y="8" width="414" height="16"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="410" id="xE4-A5-LKS"/>
@@ -241,7 +241,7 @@
                                 <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="eiO-1W-3yk">
                                     <rect key="frame" x="0.0" y="-2" width="803" height="5"/>
                                 </box>
-                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="P5F-ew-xgE">
+                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="P5F-ew-xgE">
                                     <rect key="frame" x="474" y="8" width="164" height="16"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="160" id="o5v-Uf-L60"/>
@@ -252,7 +252,7 @@
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
-                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4NV-bt-MWP">
+                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4NV-bt-MWP">
                                     <rect key="frame" x="650" y="8" width="101" height="16"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="97" id="G5d-Mn-ipQ"/>
@@ -286,19 +286,19 @@
                     <box title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="SNg-B0-ys5">
                         <rect key="frame" x="800" y="-4" width="7" height="606"/>
                         <view key="contentView" id="0Wa-d4-jxC">
-                            <rect key="frame" x="3" y="3" width="1" height="600"/>
+                            <rect key="frame" x="4" y="5" width="0.0" height="598"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
-                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ypq-Dp-66v">
-                                    <rect key="frame" x="14" y="571" width="37" height="16"/>
+                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ypq-Dp-66v">
+                                    <rect key="frame" x="14" y="569" width="37" height="16"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="peH-6j-hGv">
                                         <font key="font" metaFont="system"/>
                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
-                                <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="h32-rZ-jac">
-                                    <rect key="frame" x="28" y="354" width="64" height="24"/>
+                                <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="h32-rZ-jac">
+                                    <rect key="frame" x="28" y="352" width="64" height="24"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="64" id="Hww-Pm-Z4F"/>
                                         <constraint firstAttribute="height" constant="24" id="lXW-K7-g2y"/>
@@ -309,16 +309,16 @@
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
-                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="buB-SK-8mO">
-                                    <rect key="frame" x="98" y="358" width="11" height="16"/>
+                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="buB-SK-8mO">
+                                    <rect key="frame" x="98" y="356" width="11" height="16"/>
                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="x" id="4gU-Us-N60">
                                         <font key="font" metaFont="system"/>
                                         <color key="textColor" name="KM_242424_Color40"/>
                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
-                                <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1M5-tW-MRF">
-                                    <rect key="frame" x="115" y="354" width="64" height="24"/>
+                                <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1M5-tW-MRF">
+                                    <rect key="frame" x="115" y="352" width="64" height="24"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="64" id="NNi-a8-ugp"/>
                                         <constraint firstAttribute="height" constant="24" id="UIu-wF-ft6"/>
@@ -330,69 +330,69 @@
                                     </textFieldCell>
                                 </textField>
                                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="cQk-Jd-o6w">
-                                    <rect key="frame" x="16" y="536" width="45" height="22"/>
+                                    <rect key="frame" x="16" y="534" width="45" height="22"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="22" id="5bY-aF-fW3"/>
                                     </constraints>
                                 </customView>
                                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="5nS-LC-t5H" customClass="KMImageTitleButton" customModule="PDF_Master" customModuleProvider="target">
-                                    <rect key="frame" x="16" y="506" width="45" height="22"/>
+                                    <rect key="frame" x="16" y="504" width="45" height="22"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="22" id="iSV-P3-W8x"/>
                                     </constraints>
                                 </customView>
                                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="85P-Ad-bEf" customClass="KMImageTitleButton" customModule="PDF_Master" customModuleProvider="target">
-                                    <rect key="frame" x="16" y="476" width="45" height="22"/>
+                                    <rect key="frame" x="16" y="474" width="45" height="22"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="22" id="Ubd-is-gcz"/>
                                     </constraints>
                                 </customView>
                                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="PNC-MR-g6W" customClass="KMImageTitleButton" customModule="PDF_Master" customModuleProvider="target">
-                                    <rect key="frame" x="16" y="446" width="45" height="22"/>
+                                    <rect key="frame" x="16" y="444" width="45" height="22"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="22" id="cMH-MX-phe"/>
                                     </constraints>
                                 </customView>
                                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="ZDa-uQ-GtJ" customClass="KMImageTitleButton" customModule="PDF_Master" customModuleProvider="target">
-                                    <rect key="frame" x="16" y="416" width="45" height="22"/>
+                                    <rect key="frame" x="16" y="414" width="45" height="22"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="22" id="o0Q-lr-IX5"/>
                                     </constraints>
                                 </customView>
                                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="QI0-GW-5Ii" customClass="KMImageTitleButton">
-                                    <rect key="frame" x="16" y="386" width="45" height="22"/>
+                                    <rect key="frame" x="16" y="384" width="45" height="22"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="22" id="dL3-LB-For"/>
                                     </constraints>
                                 </customView>
                                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="K0f-tn-KEz">
                                     <rect key="frame" x="16" y="58" width="45" height="32"/>
-                                    <constraints>
-                                        <constraint firstAttribute="height" constant="32" id="V6d-tr-cK9"/>
-                                    </constraints>
                                     <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="Add-ub-2Ib">
                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                         <font key="font" metaFont="system"/>
                                     </buttonCell>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="32" id="V6d-tr-cK9"/>
+                                    </constraints>
                                     <connections>
                                         <action selector="buttonItemClicked_Append:" target="-2" id="cyh-kP-B0a"/>
                                     </connections>
                                 </button>
                                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="y69-3G-4ES">
                                     <rect key="frame" x="16" y="16" width="45" height="32"/>
-                                    <constraints>
-                                        <constraint firstAttribute="height" constant="32" id="q50-vx-VcS"/>
-                                    </constraints>
                                     <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="Z1A-FV-RXN">
                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                         <font key="font" metaFont="system"/>
                                     </buttonCell>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="32" id="q50-vx-VcS"/>
+                                    </constraints>
                                     <connections>
                                         <action selector="buttonItemClicked_Cancel:" target="-2" id="KQ9-E2-dFz"/>
                                     </connections>
                                 </button>
-                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="m7b-I1-lQz">
-                                    <rect key="frame" x="185" y="358" width="27" height="16"/>
+                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="m7b-I1-lQz">
+                                    <rect key="frame" x="185" y="356" width="27" height="16"/>
                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="mm" id="xDF-xV-HvN">
                                         <font key="font" metaFont="system"/>
                                         <color key="textColor" name="KM_242424_Color40"/>
@@ -500,7 +500,7 @@
                                 </constraints>
                                 <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="KMImageNameTipNormal" id="nPY-oN-wLt"/>
                             </imageView>
-                            <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0bJ-0I-xhY">
+                            <textField hidden="YES" focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0bJ-0I-xhY">
                                 <rect key="frame" x="18" y="22" width="135" height="16"/>
                                 <textFieldCell key="cell" alignment="left" title="Merge 2 files for free." id="MSL-nN-D7Q">
                                     <font key="font" usesAppearanceFont="YES"/>
@@ -560,7 +560,7 @@
                     </constraints>
                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="KMImageNameEmptyFile" id="pVm-Ye-CAM"/>
                 </imageView>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1dO-kv-PuF">
+                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1dO-kv-PuF">
                     <rect key="frame" x="-2" y="0.0" width="304" height="16"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="300" id="DGQ-Lx-g1U"/>
@@ -597,7 +597,7 @@
                             </constraints>
                             <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="KMImageNameEmptyListNor" id="EWq-IE-D3x"/>
                         </imageView>
-                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="YH7-eM-Mb2">
+                        <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="YH7-eM-Mb2">
                             <rect key="frame" x="163" y="32" width="92" height="16"/>
                             <textFieldCell key="cell" title="Multiline Label" id="KRo-Gz-2n3">
                                 <font key="font" metaFont="system"/>
@@ -605,7 +605,7 @@
                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                             </textFieldCell>
                         </textField>
-                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="loI-T9-Pz8">
+                        <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="loI-T9-Pz8">
                             <rect key="frame" x="161" y="8" width="96" height="16"/>
                             <textFieldCell key="cell" alignment="center" title="Multiline Label" id="PzF-HN-Jsi">
                                 <font key="font" metaFont="system"/>

PDF Office/PDF Master/PDF_Master DMG-Bridging-Header.h

@@ -64,3 +64,4 @@
 #import "CPDFListView+Extension.h"
 #import "KMSignatureHelpViewController.h"
 #import <Sparkle/Sparkle.h>
+#import "KMTableRowView.h"

PDF Office/PDF Master/PDF_Master Pro-Bridging-Header.h

@@ -43,3 +43,4 @@
 #import "KMRecommondManager.h"
 #import "CPDFListView+Extension.h"
 #import "KMSignatureHelpViewController.h"
+#import "KMTableRowView.h"

PDF Office/PDF Master/PDF_Master-Bridging-Header.h

@@ -67,3 +67,4 @@
 #import "NSShadow+PDFListView.h"
 #import "NSGeometry+PDFListView.h"
 #import "CPDFAnnotationHeader.h"
+#import "KMTableRowView.h"

PDF Office/PDF Master/Strings/InfoPlist.strings

@@ -2,7 +2,7 @@
   InfoPlist.strings
   PDF Master
 
-  Created by KdanWJ on 2023/4/27.
+  Created by wanjun on 2023/4/27.
   
 */
 NSHumanReadableCopyright = "© 2014-2023 PDF Technologies, Inc. All Rights Reserved.";