Merge branch 'develop_ocToSwift' of git.kdan.cc:Mac_PDF/PDF_Office into develop_ocToSwift

PDF Office/PDF Master.xcodeproj/project.pbxproj

@@ -991,6 +991,9 @@
 		9FCFECA82AD243C900EAD2CB /* KMBlankView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FCFECA72AD243C800EAD2CB /* KMBlankView.swift */; };
 		9FCFECA92AD243C900EAD2CB /* KMBlankView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FCFECA72AD243C800EAD2CB /* KMBlankView.swift */; };
 		9FCFECAA2AD243C900EAD2CB /* KMBlankView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FCFECA72AD243C800EAD2CB /* KMBlankView.swift */; };
+		9FD0D2A32AD4ECA800DA3FF8 /* KMPDFEditAppendCustomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FD0D2A22AD4ECA800DA3FF8 /* KMPDFEditAppendCustomView.swift */; };
+		9FD0D2A42AD4ECA900DA3FF8 /* KMPDFEditAppendCustomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FD0D2A22AD4ECA800DA3FF8 /* KMPDFEditAppendCustomView.swift */; };
+		9FD0D2A52AD4ECA900DA3FF8 /* KMPDFEditAppendCustomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FD0D2A22AD4ECA800DA3FF8 /* KMPDFEditAppendCustomView.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 */; };
@@ -2890,9 +2893,6 @@
 		BBAFC85B29851AF200D0648E /* KMTableRowView.m in Sources */ = {isa = PBXBuildFile; fileRef = BBAFC85629851AF200D0648E /* KMTableRowView.m */; };
 		BBAFC85C29851AF200D0648E /* KMTableRowView.m in Sources */ = {isa = PBXBuildFile; fileRef = BBAFC85629851AF200D0648E /* KMTableRowView.m */; };
 		BBAFC85D29851AF200D0648E /* KMTableRowView.m in Sources */ = {isa = PBXBuildFile; fileRef = BBAFC85629851AF200D0648E /* KMTableRowView.m */; };
-		BBAFC86029851B2D00D0648E /* KMPDFEditAppendCustomView.m in Sources */ = {isa = PBXBuildFile; fileRef = BBAFC85F29851B2D00D0648E /* KMPDFEditAppendCustomView.m */; };
-		BBAFC86129851B2D00D0648E /* KMPDFEditAppendCustomView.m in Sources */ = {isa = PBXBuildFile; fileRef = BBAFC85F29851B2D00D0648E /* KMPDFEditAppendCustomView.m */; };
-		BBAFC86229851B2D00D0648E /* KMPDFEditAppendCustomView.m in Sources */ = {isa = PBXBuildFile; fileRef = BBAFC85F29851B2D00D0648E /* KMPDFEditAppendCustomView.m */; };
 		BBAFFB1B29CDD19C00C56112 /* KMMergeSelect.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBAFFB1A29CDD19C00C56112 /* KMMergeSelect.swift */; };
 		BBAFFB1C29CDD19C00C56112 /* KMMergeSelect.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBAFFB1A29CDD19C00C56112 /* KMMergeSelect.swift */; };
 		BBAFFB1D29CDD19C00C56112 /* KMMergeSelect.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBAFFB1A29CDD19C00C56112 /* KMMergeSelect.swift */; };
@@ -3896,6 +3896,7 @@
 		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>"; };
 		9FCFECA72AD243C800EAD2CB /* KMBlankView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMBlankView.swift; sourceTree = "<group>"; };
+		9FD0D2A22AD4ECA800DA3FF8 /* KMPDFEditAppendCustomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMPDFEditAppendCustomView.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>"; };
@@ -4629,8 +4630,6 @@
 		BBAFC849298519F600D0648E /* KMSavePanelAccessoryController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KMSavePanelAccessoryController.xib; 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>"; };
-		BBAFC85E29851B2D00D0648E /* KMPDFEditAppendCustomView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMPDFEditAppendCustomView.h; sourceTree = "<group>"; };
-		BBAFC85F29851B2D00D0648E /* KMPDFEditAppendCustomView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMPDFEditAppendCustomView.m; sourceTree = "<group>"; };
 		BBAFFB1A29CDD19C00C56112 /* KMMergeSelect.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMMergeSelect.swift; sourceTree = "<group>"; };
 		BBB14A522978DD5400936EDB /* KMRedactTools.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMRedactTools.swift; sourceTree = "<group>"; };
 		BBB14A562978E75D00936EDB /* KMRedactMutilPageFlagWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMRedactMutilPageFlagWindowController.swift; sourceTree = "<group>"; };
@@ -8594,8 +8593,7 @@
 				9FCFECA72AD243C800EAD2CB /* KMBlankView.swift */,
 				BBAFC843298519A400D0648E /* KMFileAttribute.h */,
 				BBAFC842298519A400D0648E /* KMFileAttribute.m */,
-				BBAFC85E29851B2D00D0648E /* KMPDFEditAppendCustomView.h */,
-				BBAFC85F29851B2D00D0648E /* KMPDFEditAppendCustomView.m */,
+				9FD0D2A22AD4ECA800DA3FF8 /* KMPDFEditAppendCustomView.swift */,
 				BBAFC83A2985194800D0648E /* KMPDFEditAppendWindow.h */,
 				BB7F4C8C29A79AD9008998F9 /* KMPDFMergeFileNameTabelViewCell.h */,
 				BB7F4C8D29A79AD9008998F9 /* KMPDFMergeFileNameTabelViewCell.m */,
@@ -10587,6 +10585,7 @@
 				BBD1F78B296FACA300343885 /* KMPageEditExtractSettingView.swift in Sources */,
 				ADBC375029CAE27900D93208 /* KMComparativeOutlineRowView.swift in Sources */,
 				9FCFEC9C2AD152FA00EAD2CB /* CustomAlertView.swift in Sources */,
+				9FD0D2A32AD4ECA800DA3FF8 /* KMPDFEditAppendCustomView.swift in Sources */,
 				ADB1FE8E29752F7000ED072D /* KMBatchBackgroundView.swift in Sources */,
 				9FCFEC842AD0EF6700EAD2CB /* KMCustomButtonPopMenuViewController.swift in Sources */,
 				9FDD0F77294FEF64000C4DAD /* KMConvertPDFManager.swift in Sources */,
@@ -10767,7 +10766,6 @@
 				89E4E746296418ED002DBA6F /* TextFieldFormatter.m in Sources */,
 				BB7507E929861C37002DBDB1 /* PasswordWindowController.m in Sources */,
 				89E4E7182963F5D4002DBA6F /* KMSelfSignAnnotation.m in Sources */,
-				BBAFC86029851B2D00D0648E /* KMPDFEditAppendCustomView.m in Sources */,
 				BBC3481C295593F0008D2CD1 /* KMBackgroundListController.swift in Sources */,
 				9F5664872988B16F00020985 /* KMTextfieldVC.swift in Sources */,
 				9F1F82DA292F84D60092C4B4 /* KMHomeInsertActionViewController.swift in Sources */,
@@ -11562,7 +11560,6 @@
 				89E4E747296418ED002DBA6F /* TextFieldFormatter.m in Sources */,
 				BB7507EA29861C37002DBDB1 /* PasswordWindowController.m in Sources */,
 				89E4E7192963F5D4002DBA6F /* KMSelfSignAnnotation.m in Sources */,
-				BBAFC86129851B2D00D0648E /* KMPDFEditAppendCustomView.m in Sources */,
 				BB3A81B62AC2C0F4006FC66C /* NSObject+KMExtension.swift in Sources */,
 				BBC3481D295593F0008D2CD1 /* KMBackgroundListController.swift in Sources */,
 				9F5664882988B16F00020985 /* KMTextfieldVC.swift in Sources */,
@@ -11822,6 +11819,7 @@
 				BB1CA5C7298E20820059E31C /* KMPreferenceAligementView.swift in Sources */,
 				9F8539D32943121100DF644E /* KMSegmentedBox.swift in Sources */,
 				AD9527C3295294EF0039D2BC /* KMPrintPaperModel.swift in Sources */,
+				9FD0D2A42AD4ECA900DA3FF8 /* KMPDFEditAppendCustomView.swift in Sources */,
 				ADBC2D4529A0D09A006280C8 /* ImageToPDFTools.swift in Sources */,
 				BBBF68852A3C3AF10058E14E /* NSDocumentController+KMExtension.swift in Sources */,
 				AD8810A129A8459000178CA1 /* KMComparativeTableViewController.swift in Sources */,
@@ -12294,7 +12292,6 @@
 				BBD54ED62A1CBD720012A230 /* NSView+KMExtension.swift in Sources */,
 				BBC3485029582920008D2CD1 /* KMBackgroundColorView.swift in Sources */,
 				ADB1FE982975300B00ED072D /* KMBatchHeaderAndFooterView.swift in Sources */,
-				BBAFC86229851B2D00D0648E /* KMPDFEditAppendCustomView.m in Sources */,
 				BB4EEF3A2976451E003A3537 /* KMRedactContentBaseView.swift in Sources */,
 				ADE3C1E629A5ABC200793B13 /* KMLoginWindowController.swift in Sources */,
 				BBC3483029559E12008D2CD1 /* KMBackgroundModel.swift in Sources */,
@@ -12647,6 +12644,7 @@
 				9F1FE49E29406E4700E952CA /* HoverCloseButton.m in Sources */,
 				BB3A81B22AC2B82A006FC66C /* KMPageSizeTool.swift in Sources */,
 				ADCB98C3292472F200B51A03 /* KMBatchProcessingTableViewPresenter.swift in Sources */,
+				9FD0D2A52AD4ECA900DA3FF8 /* KMPDFEditAppendCustomView.swift in Sources */,
 				AD8F06192999DB5900D93CBC /* KMPrintDrawPage.swift in Sources */,
 				9FF94F1B29A770B500B1EF69 /* KMFillSignShapePanel.swift in Sources */,
 				BBA5429E29F13A140041BAD0 /* KMMemorandumPattern.swift in Sources */,

PDF Office/PDF Master.xcodeproj/xcuserdata/kdanwj.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -337,6 +337,21 @@
                   endingLineNumber = "141"
                   offsetFromSymbolStart = "580">
                </Location>
+               <Location
+                  uuid = "C153658E-EE27-4BB7-A793-68BA56D7700E - d9457e82a77e2388"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[KMSignatureAnnotationViewController reloadDataSignaturesIsSelectLast:]"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanwj/Git/Mac/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureAnnotationViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "142"
+                  endingLineNumber = "142"
+                  offsetFromSymbolStart = "688">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>

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

@@ -1,13 +0,0 @@
-//
-//  KMPDFEditAppendCustomView.h
-//  PDF Reader Pro Edition
-//
-//  Created by wanjun on 2021/5/13.
-//
-
-#import <Cocoa/Cocoa.h>
-
-@interface KMPDFEditAppendCustomView : NSView
-
-@end
-

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

@@ -1,12 +0,0 @@
-//
-//  KMPDFEditAppendCustomView.m
-//  PDF Reader Pro Edition
-//
-//  Created by wanjun on 2021/5/13.
-//
-
-#import "KMPDFEditAppendCustomView.h"
-
-@implementation KMPDFEditAppendCustomView
-
-@end

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

@@ -0,0 +1,18 @@
+//
+//  KMPDFEditAppendCustomView.swift
+//  PDF Master
+//
+//  Created by wanjun on 2023/10/10.
+//
+
+import Cocoa
+
+class KMPDFEditAppendCustomView: NSView {
+
+    override func draw(_ dirtyRect: NSRect) {
+        super.draw(dirtyRect)
+
+        // Drawing code here.
+    }
+    
+}

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

@@ -50,7 +50,7 @@
             <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="1800" height="1125"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
             <value key="minSize" type="size" width="818" height="600"/>
             <value key="maxSize" type="size" width="818" height="600"/>
             <view key="contentView" wantsLayer="YES" misplaced="YES" id="se5-gp-TjO">
@@ -613,7 +613,7 @@
                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                             </textFieldCell>
                         </textField>
-                        <customView translatesAutoresizingMaskIntoConstraints="NO" id="yde-fB-mTL" customClass="KMPDFEditAppendCustomView">
+                        <customView translatesAutoresizingMaskIntoConstraints="NO" id="yde-fB-mTL" customClass="KMPDFEditAppendCustomView" customModule="PDF_Master" customModuleProvider="target">
                             <rect key="frame" x="0.0" y="0.0" width="418" height="188"/>
                         </customView>
                     </subviews>

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

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

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

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

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

@@ -63,4 +63,3 @@
 #import "NSGeometry+PDFListView.h"
 #import "CPDFAnnotationHeader.h"
 #import "KMTableRowView.h"
-#import "KMPDFEditAppendCustomView.h"