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,15 @@
 		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 */; };
+		9FD0D2A72AD4EFB000DA3FF8 /* KMSavePanelAccessoryController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FD0D2A62AD4EFB000DA3FF8 /* KMSavePanelAccessoryController.swift */; };
+		9FD0D2A82AD4EFB000DA3FF8 /* KMSavePanelAccessoryController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FD0D2A62AD4EFB000DA3FF8 /* KMSavePanelAccessoryController.swift */; };
+		9FD0D2A92AD4EFB000DA3FF8 /* KMSavePanelAccessoryController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FD0D2A62AD4EFB000DA3FF8 /* KMSavePanelAccessoryController.swift */; };
+		9FD0D2AB2AD5143D00DA3FF8 /* KMTableRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FD0D2AA2AD5143D00DA3FF8 /* KMTableRowView.swift */; };
+		9FD0D2AC2AD5143D00DA3FF8 /* KMTableRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FD0D2AA2AD5143D00DA3FF8 /* KMTableRowView.swift */; };
+		9FD0D2AD2AD5143D00DA3FF8 /* KMTableRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FD0D2AA2AD5143D00DA3FF8 /* KMTableRowView.swift */; };
+		9FD0D2AF2AD51BCC00DA3FF8 /* CPDFListEditAnnotationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FD0D2AE2AD51BCC00DA3FF8 /* CPDFListEditAnnotationViewController.swift */; };
+		9FD0D2B02AD51BCC00DA3FF8 /* CPDFListEditAnnotationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FD0D2AE2AD51BCC00DA3FF8 /* CPDFListEditAnnotationViewController.swift */; };
+		9FD0D2B12AD51BCC00DA3FF8 /* CPDFListEditAnnotationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FD0D2AE2AD51BCC00DA3FF8 /* CPDFListEditAnnotationViewController.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 */; };
@@ -2884,15 +2893,9 @@
 		BBAFC844298519A500D0648E /* KMFileAttribute.m in Sources */ = {isa = PBXBuildFile; fileRef = BBAFC842298519A400D0648E /* KMFileAttribute.m */; };
 		BBAFC845298519A500D0648E /* KMFileAttribute.m in Sources */ = {isa = PBXBuildFile; fileRef = BBAFC842298519A400D0648E /* KMFileAttribute.m */; };
 		BBAFC846298519A500D0648E /* KMFileAttribute.m in Sources */ = {isa = PBXBuildFile; fileRef = BBAFC842298519A400D0648E /* KMFileAttribute.m */; };
-		BBAFC84A298519F700D0648E /* KMSavePanelAccessoryController.m in Sources */ = {isa = PBXBuildFile; fileRef = BBAFC847298519F600D0648E /* KMSavePanelAccessoryController.m */; };
-		BBAFC84B298519F700D0648E /* KMSavePanelAccessoryController.m in Sources */ = {isa = PBXBuildFile; fileRef = BBAFC847298519F600D0648E /* KMSavePanelAccessoryController.m */; };
-		BBAFC84C298519F700D0648E /* KMSavePanelAccessoryController.m in Sources */ = {isa = PBXBuildFile; fileRef = BBAFC847298519F600D0648E /* KMSavePanelAccessoryController.m */; };
 		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 */; };
-		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 */; };
 		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 */; };
@@ -3315,9 +3318,6 @@
 		F386CEFC29361E2D00C44524 /* CPDFListViewConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = F386CEFB29361E2D00C44524 /* CPDFListViewConfig.m */; };
 		F386CEFD29361E2D00C44524 /* CPDFListViewConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = F386CEFB29361E2D00C44524 /* CPDFListViewConfig.m */; };
 		F386CEFE29361E2D00C44524 /* CPDFListViewConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = F386CEFB29361E2D00C44524 /* CPDFListViewConfig.m */; };
-		F3A9DC7E294309D80074E5D2 /* CPDFListEditAnnotationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F3A9DC7C294309D80074E5D2 /* CPDFListEditAnnotationViewController.m */; };
-		F3A9DC7F294309D80074E5D2 /* CPDFListEditAnnotationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F3A9DC7C294309D80074E5D2 /* CPDFListEditAnnotationViewController.m */; };
-		F3A9DC80294309D80074E5D2 /* CPDFListEditAnnotationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F3A9DC7C294309D80074E5D2 /* CPDFListEditAnnotationViewController.m */; };
 		F3A9DC81294309D80074E5D2 /* CPDFListEditAnnotationViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F3A9DC7D294309D80074E5D2 /* CPDFListEditAnnotationViewController.xib */; };
 		F3A9DC82294309D80074E5D2 /* CPDFListEditAnnotationViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F3A9DC7D294309D80074E5D2 /* CPDFListEditAnnotationViewController.xib */; };
 		F3A9DC83294309D80074E5D2 /* CPDFListEditAnnotationViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F3A9DC7D294309D80074E5D2 /* CPDFListEditAnnotationViewController.xib */; };
@@ -3896,6 +3896,9 @@
 		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>"; };
+		9FD0D2A62AD4EFB000DA3FF8 /* KMSavePanelAccessoryController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMSavePanelAccessoryController.swift; sourceTree = "<group>"; };
+		9FD0D2AA2AD5143D00DA3FF8 /* KMTableRowView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMTableRowView.swift; sourceTree = "<group>"; };
+		9FD0D2AE2AD51BCC00DA3FF8 /* CPDFListEditAnnotationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CPDFListEditAnnotationViewController.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>"; };
@@ -4624,11 +4627,7 @@
 		BBAFC83B2985194800D0648E /* KMPDFEditAppendWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KMPDFEditAppendWindow.xib; sourceTree = "<group>"; };
 		BBAFC842298519A400D0648E /* KMFileAttribute.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMFileAttribute.m; sourceTree = "<group>"; };
 		BBAFC843298519A400D0648E /* KMFileAttribute.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMFileAttribute.h; sourceTree = "<group>"; };
-		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>"; };
-		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>"; };
 		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>"; };
@@ -4819,8 +4818,6 @@
 		F3732322292DFFFE0013862C /* CPDFListView+Extension.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "CPDFListView+Extension.m"; sourceTree = "<group>"; };
 		F386CEFA29361E2D00C44524 /* CPDFListViewConfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CPDFListViewConfig.h; sourceTree = "<group>"; };
 		F386CEFB29361E2D00C44524 /* CPDFListViewConfig.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CPDFListViewConfig.m; sourceTree = "<group>"; };
-		F3A9DC7B294309D80074E5D2 /* CPDFListEditAnnotationViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CPDFListEditAnnotationViewController.h; sourceTree = "<group>"; };
-		F3A9DC7C294309D80074E5D2 /* CPDFListEditAnnotationViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CPDFListEditAnnotationViewController.m; sourceTree = "<group>"; };
 		F3A9DC7D294309D80074E5D2 /* CPDFListEditAnnotationViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CPDFListEditAnnotationViewController.xib; sourceTree = "<group>"; };
 		F3B69893298B7F7500E0EB4D /* KMDocumentAIManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KMDocumentAIManager.h; sourceTree = "<group>"; };
 		F3B69894298B7F7500E0EB4D /* KMDocumentAIManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KMDocumentAIManager.m; sourceTree = "<group>"; };
@@ -8589,11 +8586,9 @@
 				BB7F4C8D29A79AD9008998F9 /* KMPDFMergeFileNameTabelViewCell.m */,
 				BBAFC8392985194800D0648E /* KMPDFEditAppendWindow.m */,
 				BBAFC83B2985194800D0648E /* KMPDFEditAppendWindow.xib */,
-				BBAFC848298519F600D0648E /* KMSavePanelAccessoryController.h */,
-				BBAFC847298519F600D0648E /* KMSavePanelAccessoryController.m */,
+				9FD0D2A62AD4EFB000DA3FF8 /* KMSavePanelAccessoryController.swift */,
 				BBAFC849298519F600D0648E /* KMSavePanelAccessoryController.xib */,
-				BBAFC85729851AF200D0648E /* KMTableRowView.h */,
-				BBAFC85629851AF200D0648E /* KMTableRowView.m */,
+				9FD0D2AA2AD5143D00DA3FF8 /* KMTableRowView.swift */,
 			);
 			path = OCPart;
 			sourceTree = "<group>";
@@ -9015,8 +9010,7 @@
 				F3599217292CA27A000D25DE /* CPDFListViewRuntime.m */,
 				F34BF9512953DA91002C25A2 /* NSGeometry+PDFListView.h */,
 				F34BF9522953DA91002C25A2 /* NSGeometry+PDFListView.m */,
-				F3A9DC7B294309D80074E5D2 /* CPDFListEditAnnotationViewController.h */,
-				F3A9DC7C294309D80074E5D2 /* CPDFListEditAnnotationViewController.m */,
+				9FD0D2AE2AD51BCC00DA3FF8 /* CPDFListEditAnnotationViewController.swift */,
 				F3A9DC7D294309D80074E5D2 /* CPDFListEditAnnotationViewController.xib */,
 				F356720229AF184A00740FF3 /* CPDFListAnnotationNoteWindowController.h */,
 				F356720329AF184A00740FF3 /* CPDFListAnnotationNoteWindowController.m */,
@@ -10417,6 +10411,7 @@
 				ADF1569329A62D1D001D1018 /* KMLoginLeftImageView.swift in Sources */,
 				BBA762D229D2D98D00844513 /* KMCommonDefine.swift in Sources */,
 				AD867F9C29D9853200F00440 /* KMBOTAOutlineRowView.swift in Sources */,
+				9FD0D2AB2AD5143D00DA3FF8 /* KMTableRowView.swift in Sources */,
 				BB146FDB299DC0D100784A6A /* GTLRDriveService.m in Sources */,
 				F37322E7292DF9410013862C /* CPDFAnnotationModel.m in Sources */,
 				9FBA0EF92900188F001117AF /* KMFastToolCollectionView.swift in Sources */,
@@ -10549,7 +10544,6 @@
 				ADD1B6AB2941E97F00C3FFF7 /* KMPrintWindowController.swift in Sources */,
 				BB8F454F295A9FA50037EA22 /* KMCreateHeaderFooterController.swift in Sources */,
 				9FA693A82987C0590055488A /* KMStepperView.swift in Sources */,
-				BBAFC84A298519F700D0648E /* KMSavePanelAccessoryController.m in Sources */,
 				BBC745F2295F0DD00072C2ED /* KMCropSettingPageSizeView.swift in Sources */,
 				ADCB98E12924776F00B51A03 /* KMBatchProcessingSizeTableCell.swift in Sources */,
 				F3599222292CA27B000D25DE /* CPDFListViewRuntime.m in Sources */,
@@ -10610,7 +10604,6 @@
 				9FA607D928F8227500B46586 /* KMBox.swift in Sources */,
 				BB003026298CF7EC002DD1A0 /* KMPreferenceDisplayController.swift in Sources */,
 				F36AD77729642FE80015AD53 /* CPDFListView+UndoManager.m in Sources */,
-				F3A9DC7E294309D80074E5D2 /* CPDFListEditAnnotationViewController.m in Sources */,
 				ADDEEA492AD38BDB00EF675D /* KMSignatureHelpViewController.swift in Sources */,
 				BB146FBA299DC0D100784A6A /* GTLRBase64.m in Sources */,
 				BB981E522AD4F638001988CA /* KMCoverButton.swift in Sources */,
@@ -10657,7 +10650,6 @@
 				BB897229294B08720045787C /* KMWatermarkAdjectiveTopBarItemModel.swift in Sources */,
 				BB00301D298CB799002DD1A0 /* KMPreferenceManager.swift in Sources */,
 				89E93EFA299CB4C200F10F66 /* KMOCRBox.m in Sources */,
-				BBAFC85B29851AF200D0648E /* KMTableRowView.m in Sources */,
 				ADBC2D28299DCA76006280C8 /* NSTextField+Layer.swift in Sources */,
 				89E4E7222963FB23002DBA6F /* KMGeneralButton.m in Sources */,
 				ADF6B8762A48155E0090CB78 /* KMComparativeViewCollectionItem.swift in Sources */,
@@ -10725,6 +10717,7 @@
 				9F1FE4C629406E4700E952CA /* CTUtil.m in Sources */,
 				BB147035299DC0D200784A6A /* OIDRegistrationResponse.m in Sources */,
 				9FDD0F7C2952F2D8000C4DAD /* KMBaseParser.swift in Sources */,
+				9FD0D2A72AD4EFB000DA3FF8 /* KMSavePanelAccessoryController.swift in Sources */,
 				BB2C6AC928F4085200478A33 /* CPDFListView.m in Sources */,
 				BBFBE6C028DD7B97008B2335 /* ViewController.swift in Sources */,
 				BB4EEF3429764166003A3537 /* KMRedactPropertyWindowController.swift in Sources */,
@@ -10760,6 +10753,7 @@
 				BBC3481C295593F0008D2CD1 /* KMBackgroundListController.swift in Sources */,
 				9F5664872988B16F00020985 /* KMTextfieldVC.swift in Sources */,
 				9F1F82DA292F84D60092C4B4 /* KMHomeInsertActionViewController.swift in Sources */,
+				9FD0D2AF2AD51BCC00DA3FF8 /* CPDFListEditAnnotationViewController.swift in Sources */,
 				9F0CB4E92986559400007028 /* KMDesignToken+PaddingBottom.swift in Sources */,
 				ADD1B6E82946C02600C3FFF7 /* KMPrintChoosePageSizeMultipageView.swift in Sources */,
 				9F1FE4ED29406E4700E952CA /* ThrobberView.m in Sources */,
@@ -11351,7 +11345,6 @@
 				89D9897528FE743E003A3E87 /* KMOutlineView.swift in Sources */,
 				BB8F4550295A9FA50037EA22 /* KMCreateHeaderFooterController.swift in Sources */,
 				9FA693A92987C0590055488A /* KMStepperView.swift in Sources */,
-				BBAFC84B298519F700D0648E /* KMSavePanelAccessoryController.m in Sources */,
 				BBC745F3295F0DD00072C2ED /* KMCropSettingPageSizeView.swift in Sources */,
 				9F8DDF2E2924B855006CDC73 /* KMPDFToolsViewController.swift in Sources */,
 				9F0CB4C5298625F400007028 /* NSColor+KMExtensions.swift in Sources */,
@@ -11428,7 +11421,6 @@
 				BB4EEF3D29764578003A3537 /* KMRedactPropertyContentView.swift in Sources */,
 				BB147024299DC0D100784A6A /* OIDResponseTypes.m in Sources */,
 				BB162E93294FFE020088E9D1 /* KMWatermarkModel.swift in Sources */,
-				F3A9DC7F294309D80074E5D2 /* CPDFListEditAnnotationViewController.m in Sources */,
 				AD9527CB295297B70039D2BC /* KMPrintModel.swift in Sources */,
 				AD867FA229DEB4B000F00440 /* KMBOTAAnnotationTool.swift in Sources */,
 				9F1FE4B829406E4700E952CA /* CTBrowserFrameView.m in Sources */,
@@ -11459,7 +11451,6 @@
 				BB00301E298CB799002DD1A0 /* KMPreferenceManager.swift in Sources */,
 				89E93EFB299CB4C200F10F66 /* KMOCRBox.m in Sources */,
 				ADA9102F2A272CEA003352F0 /* KMImageOptimization.swift in Sources */,
-				BBAFC85C29851AF200D0648E /* KMTableRowView.m in Sources */,
 				AD9527DC2952EE700039D2BC /* KMPrintPage_C.swift in Sources */,
 				ADBC2D29299DCA76006280C8 /* NSTextField+Layer.swift in Sources */,
 				89E4E7232963FB23002DBA6F /* KMGeneralButton.m in Sources */,
@@ -11483,6 +11474,7 @@
 				ADB1FE3C29700D3400ED072D /* KMBatchCollectionViewItem.swift in Sources */,
 				ADC25DFA2923BA710080A3F6 /* KMImageToPDFWindowController.swift in Sources */,
 				BB4EEF4529764FEF003A3537 /* KMWatermarkAligementView.swift in Sources */,
+				9FD0D2B02AD51BCC00DA3FF8 /* CPDFListEditAnnotationViewController.swift in Sources */,
 				BBEC00B0295C2AF300A26C98 /* KMBatesPreviewController.swift in Sources */,
 				BB0A551E2A30793F00B6E84B /* KMDesignTextField.swift in Sources */,
 				9F0CB50E2986564500007028 /* KMDesignToken+BorderLeft.swift in Sources */,
@@ -11516,6 +11508,7 @@
 				9F1FE49429406E4700E952CA /* common.m in Sources */,
 				AD0FA51329A9FA8600EDEB50 /* KMResetPasswordView.swift in Sources */,
 				9F0201732A1B488C00C9B673 /* KMAITranslationVC.swift in Sources */,
+				9FD0D2AC2AD5143D00DA3FF8 /* KMTableRowView.swift in Sources */,
 				BBFBE74728DD7DB7008B2335 /* ViewController.swift in Sources */,
 				9FDD0F812952FC36000C4DAD /* KMDesignToken.swift in Sources */,
 				ADF6B8772A48155E0090CB78 /* KMComparativeViewCollectionItem.swift in Sources */,
@@ -11938,6 +11931,7 @@
 				BBD7FE032A13218E00F96075 /* KMWatermarkAdjectivePropertyBaseController.swift in Sources */,
 				BB2EDF4D296E63E5003BCF58 /* KMPageEditInsertCustomPageWindowController.swift in Sources */,
 				9F0CB522298656AA00007028 /* KMDesignToken+BorderRadiusBottomLeft.swift in Sources */,
+				9FD0D2A82AD4EFB000DA3FF8 /* KMSavePanelAccessoryController.swift in Sources */,
 				BBE0BDF429A22EF300440583 /* KMMainViewController+MenuAction.swift in Sources */,
 				BB4EEF392976451E003A3537 /* KMRedactContentBaseView.swift in Sources */,
 				BB24D4A82977BE6700041659 /* KMRedactConfirmWindowController.swift in Sources */,
@@ -12017,7 +12011,6 @@
 				AD1CA4232A061D190070541F /* KMAnnotationScreenAuthorViewItem.swift in Sources */,
 				BB897243294C028A0045787C /* KMWatermarkAdjectiveSegementControl.swift in Sources */,
 				ADE3C1EF29A5AFB100793B13 /* KMRequestServerManager.swift in Sources */,
-				BBAFC84C298519F700D0648E /* KMSavePanelAccessoryController.m in Sources */,
 				9F1FE4B629406E4700E952CA /* CTBrowser.m in Sources */,
 				ADC63E412A49816900854E02 /* KMSubscribeSuccessView.swift in Sources */,
 				BBA19F4529ADE6A3001A285A /* KMBookMarkRowView.swift in Sources */,
@@ -12129,6 +12122,7 @@
 				9F1FE50729406E4700E952CA /* CTTabStripDragController.m in Sources */,
 				BB146FEC299DC0D100784A6A /* GTLRDuration.m in Sources */,
 				9FCFEC762AC56ECE00EAD2CB /* CPDFListStampAnnotation.swift in Sources */,
+				9FD0D2A92AD4EFB000DA3FF8 /* KMSavePanelAccessoryController.swift in Sources */,
 				9F1FE4D129406E4700E952CA /* CTTabController.m in Sources */,
 				9F8539E029470A0700DF644E /* KMTabStripView.swift in Sources */,
 				BBA8B7AC2935DC120097D183 /* KMRemovePasswordResultTipView.swift in Sources */,
@@ -12154,6 +12148,7 @@
 				BBBB6CD42AD14A5F0035AA66 /* CPDFChoiceWidgetAnnotation+PDFListView.swift in Sources */,
 				9F8539D82943180000DF644E /* KMTabAppearance.swift in Sources */,
 				9FDD0F6D294AD12C000C4DAD /* KMMainViewController+UI.swift in Sources */,
+				9FD0D2B12AD51BCC00DA3FF8 /* CPDFListEditAnnotationViewController.swift in Sources */,
 				BBCE571A2A72723600508EFC /* NSResponder+KMExtension.swift in Sources */,
 				BB146FDA299DC0D100784A6A /* GTLRFramework.m in Sources */,
 				9FF94F0B29A62B5000B1EF69 /* KMDesignSelect.swift in Sources */,
@@ -12207,7 +12202,6 @@
 				BB8F4559295AA1270037EA22 /* KMHeaderFooterPropertyInfoController.swift in Sources */,
 				ADE787A42AA5A833002EC85A /* KMAccountExceptionWindowController.swift in Sources */,
 				BB162E94294FFE020088E9D1 /* KMWatermarkModel.swift in Sources */,
-				F3A9DC80294309D80074E5D2 /* CPDFListEditAnnotationViewController.m in Sources */,
 				AD867F9629D955BF00F00440 /* KMBOTAOutlineCellView.swift in Sources */,
 				ADE3C1FB29A5C42300793B13 /* KMLightMemberUserInfo.swift in Sources */,
 				ADCB98EB2924778C00B51A03 /* KMBatchProcessingStateTableCell.swift in Sources */,
@@ -12546,7 +12540,6 @@
 				AD9527D92952ED970039D2BC /* KMPrintPresenter_C.swift in Sources */,
 				9F0CB4E32986556400007028 /* KMDesignToken+PaddingTop.swift in Sources */,
 				BB2EDF6F296ECE17003BCF58 /* KMPageEditInsertDirectionItemView.swift in Sources */,
-				BBAFC85D29851AF200D0648E /* KMTableRowView.m in Sources */,
 				8942F80529262B2E00389627 /* KMSideViewController.swift in Sources */,
 				BB74DA812AC42959006EDFE7 /* NSButton+KMExtension.swift in Sources */,
 				9F0CB4F3298655BC00007028 /* KMDesignToken+ItemSpacing.swift in Sources */,
@@ -12646,6 +12639,7 @@
 				AD0E8ABB2A31BDDD00DBFD3C /* KMProduct.swift in Sources */,
 				BBC2BCC8295DA8F30036B983 /* KMCropPreviewController.swift in Sources */,
 				9F1FE50F29407B2B00E952CA /* KMUploadFilePanel.swift in Sources */,
+				9FD0D2AD2AD5143D00DA3FF8 /* KMTableRowView.swift in Sources */,
 				ADC0761C298A2E67006C752F /* KMBatchSecurityViewPresenter.swift in Sources */,
 				BB146FCB299DC0D100784A6A /* GTMSessionFetcher.m in Sources */,
 				9F0CB4CF298654FA00007028 /* KMDesignToken+Height.swift in Sources */,

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

@@ -483,5 +483,21 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "5E7DBFF6-97BA-4011-B25E-2674C8DF0CD5"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/Merge/OCPart/KMPDFEditAppendWindow.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1381"
+            endingLineNumber = "1381"
+            landmarkName = "-buttonItemClick_Append:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

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

@@ -10,7 +10,6 @@
 #import "PasswordWindowController.h"
 #import "KMFileAttribute.h"
 #import <Quartz/Quartz.h>
-#import "KMSavePanelAccessoryController.h"
 #import <Masonry/Masonry.h>
 #import <PDF_Master-Swift.h>
 #import "CTBrowserWindowController.h"

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

@@ -1,17 +0,0 @@
-//
-//  KMSavePanelAccessoryController.h
-//  PDF Reader
-//
-//  Created by 蒋志鹏 on 2018/9/26.
-//  Copyright © 2018年 Kdan Mobile. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-
-@interface KMSavePanelAccessoryController : NSViewController
-
-@property (assign) IBOutlet NSButton *openAutomaticButton;
-
-@property (nonatomic, assign, readonly) BOOL needOpen;
-
-@end

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

@@ -1,40 +0,0 @@
-//
-//  KMSavePanelAccessoryController.m
-//  PDF Reader
-//
-//  Created by 蒋志鹏 on 2018/9/26.
-//  Copyright © 2018年 Kdan Mobile. All rights reserved.
-//
-
-#import "KMSavePanelAccessoryController.h"
-
-@interface KMSavePanelAccessoryController ()
-
-@property (nonatomic, assign) BOOL needOpen;
-
-@end
-
-@implementation KMSavePanelAccessoryController
-
--  (instancetype)init
-{
-    self = [super initWithNibName:@"KMSavePanelAccessoryController" bundle:nil];
-    if (self) {
-        
-    }
-    return self;
-    
-}
-
-- (void)awakeFromNib
-{
-    [super awakeFromNib];
-    self.openAutomaticButton.title = NSLocalizedString(@"Open the document after saving", nil);
-    self.openAutomaticButton.state = NSControlStateValueOff;
-}
-
-- (IBAction)buttonClicked_OpenAutomatic:(NSButton *)sender
-{
-    _needOpen = sender.state == NSControlStateValueOn;
-}
-@end

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

@@ -0,0 +1,40 @@
+//
+//  KMSavePanelAccessoryController.swift
+//  PDF Master
+//
+//  Created by wanjun on 2023/10/10.
+//
+
+import Cocoa
+
+@objcMembers
+class KMSavePanelAccessoryController: NSViewController {
+
+    @IBOutlet weak var openAutomaticButton: NSButton!
+    var _needOpen: Bool = false
+    
+    override init(nibName nibNameOrNil: NSNib.Name?, bundle nibBundleOrNil: Bundle?) {
+        super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
+    }
+
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        
+        openAutomaticButton.title = NSLocalizedString("Open the document after saving", comment: "")
+        openAutomaticButton.state = NSControl.StateValue.off
+    }
+
+    @IBAction func buttonClickedOpenAutomatic(_ sender: NSButton) {
+        _needOpen = sender.state == NSControl.StateValue.on
+    }
+    
+    //MARK: Get、Set
+    
+    var needOpen: Bool {
+        return _needOpen
+    }
+}

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

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14113" 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="14113"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22154"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMSavePanelAccessoryController">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMSavePanelAccessoryController" customModule="PDF_Master" customModuleProvider="target">
             <connections>
                 <outlet property="openAutomaticButton" destination="NPu-wD-FJY" id="sB2-tM-cdd"/>
                 <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
@@ -15,17 +15,17 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView id="Hz6-mo-xeY">
-            <rect key="frame" x="0.0" y="0.0" width="362" height="54"/>
+            <rect key="frame" x="0.0" y="0.0" width="362" height="56"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="NPu-wD-FJY">
-                    <rect key="frame" x="122" y="18" width="119" height="18"/>
+                    <rect key="frame" x="119" y="19" width="123" height="18"/>
                     <buttonCell key="cell" type="check" title="Open automatic" bezelStyle="regularSquare" imagePosition="left" inset="2" id="gER-AG-REK">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
                     <connections>
-                        <action selector="buttonClicked_OpenAutomatic:" target="-2" id="cKP-VT-hpX"/>
+                        <action selector="buttonClickedOpenAutomatic:" target="-2" id="tSx-K7-wdw"/>
                     </connections>
                 </button>
             </subviews>

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

@@ -1,23 +0,0 @@
-//
-//  KMTableRowView.h
-//  PDF Reader Pro Edition
-//
-//  Created by zhipeng jiang on 2020/11/25.
-//
-
-#import <Cocoa/Cocoa.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface KMTableRowView : NSTableRowView
-
-@property (nonatomic, assign) BOOL hasBottomLine;
-@property (nonatomic, strong) NSColor *bottomLineColor;
-
-@property (nonatomic, assign) NSEdgeInsets selectionInset;
-@property (nonatomic, assign) CGFloat selectionRadius;
-@property (nonatomic, copy) NSColor *(^selectionBackgroundColorBlock)(void);
-
-@end
-
-NS_ASSUME_NONNULL_END

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

@@ -1,84 +0,0 @@
-//
-//  KMTableRowView.m
-//  PDF Reader Pro Edition
-//
-//  Created by zhipeng jiang on 2020/11/25.
-//
-
-#import "KMTableRowView.h"
-
-@implementation KMTableRowView
-
-- (instancetype)init {
-    self = [super init];
-    if (self) {
-        [self addTrackingArea];
-        
-        self.selectionInset = NSEdgeInsetsZero;
-        self.selectionRadius = 0.f;
-    }
-    return self;
-}
-
-- (void)setHasBottomLine:(BOOL)hasBottomLine {
-    _hasBottomLine = hasBottomLine;
-    
-    [self setNeedsDisplay:YES];
-}
-
-- (void)setBottomLineColor:(NSColor *)bottomLineColor {
-    _bottomLineColor = bottomLineColor;
-    
-    [self setNeedsDisplay:YES];
-}
-
-#pragma mark - Private Methods
-
-- (void)addTrackingArea {
-    NSTrackingArea *trackingArea = [[NSTrackingArea alloc] initWithRect:self.bounds options:NSTrackingMouseEnteredAndExited | NSTrackingInVisibleRect | NSTrackingActiveAlways |NSTrackingMouseMoved owner:self userInfo:nil];
-    [self addTrackingArea:trackingArea];
-}
-
-- (void)drawRect:(NSRect)dirtyRect {
-    [super drawRect:dirtyRect];
-    
-    if (self.hasBottomLine) {
-        NSColor *color = self.bottomLineColor;
-        if (color == nil) {
-            color = [NSColor lightGrayColor];
-        }
-        [color setStroke];
-        [color setFill];
-        NSRect lineRect = NSMakeRect(0, NSHeight(self.bounds)-1, NSWidth(self.bounds), 1);
-        NSBezierPath *linePath = [NSBezierPath bezierPathWithRoundedRect:lineRect xRadius:0 yRadius:0];
-        [linePath fill];
-        [linePath stroke];
-    }
-}
-
-- (void)drawSelectionInRect:(NSRect)dirtyRect {
-    if (!self.selectionBackgroundColorBlock) {
-//        [super drawSelectionInRect:dirtyRect];
-        NSRect selectionRect = self.bounds;
-        [[NSColor lightGrayColor] setFill];
-        NSBezierPath *selectionPath = [NSBezierPath bezierPathWithRoundedRect:selectionRect xRadius:0 yRadius:0];
-        [selectionPath fill];
-        return;
-    }
-
-//    NSRect selectionRect = NSInsetRect(self.bounds, 0, 0);
-    NSRect selectionRect = 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);
-    NSColor *color = self.selectionBackgroundColorBlock();
-    [color setStroke];
-    [color setFill];
-    
-    NSBezierPath *selectionPath = [NSBezierPath bezierPathWithRoundedRect:selectionRect xRadius:self.selectionRadius yRadius:self.selectionRadius];
-    [selectionPath fill];
-    [selectionPath stroke];
-}
-
-- (void)mouseEntered:(NSEvent *)event {
-    [super mouseEntered:event];
-}
-
-@end

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

@@ -0,0 +1,98 @@
+//
+//  KMTableRowView.swift
+//  PDF Master
+//
+//  Created by wanjun on 2023/10/10.
+//
+
+import Cocoa
+
+class KMTableRowView: NSTableRowView {
+    
+    var _hasBottomLine: Bool = false
+    var _bottomLineColor: NSColor?
+
+    var selectionInset: NSEdgeInsets = NSEdgeInsets()
+    @objc var selectionRadius: CGFloat = 0.0
+    @objc var selectionBackgroundColorBlock: (() -> NSColor)?
+
+    override init(frame frameRect: NSRect) {
+        super.init(frame: frameRect)
+        addTrackingArea()
+        selectionInset = NSEdgeInsetsZero
+        selectionRadius = 0.0
+    }
+    
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+    
+    var hasBottomLine: Bool {
+        get {
+            return _hasBottomLine
+        }
+        set {
+            _hasBottomLine = newValue
+            self.needsDisplay = true
+        }
+    }
+    
+    var bottomLineColor: NSColor? {
+        get {
+            return _bottomLineColor
+        }
+        set {
+            _bottomLineColor = newValue
+            self.needsDisplay = true
+        }
+    }
+    
+    //MARK: Private Methods
+    
+    func addTrackingArea() {
+        let trackingArea = NSTrackingArea.init(rect: self.bounds, options: [.mouseEnteredAndExited, .inVisibleRect, .activeAlways, .mouseMoved], owner: self)
+        self.addTrackingArea(trackingArea)
+    }
+
+    override func draw(_ dirtyRect: NSRect) {
+        super.draw(dirtyRect)
+        
+        if self.hasBottomLine {
+            var color = self.bottomLineColor
+            if color == nil {
+                color = NSColor.lightGray
+            }
+            color!.setStroke()
+            color!.setFill()
+            
+            let lineRect = NSRect(x: 0, y: NSHeight(bounds) - 1, width: NSWidth(bounds), height: 1)
+            let linePath = NSBezierPath(roundedRect: lineRect, xRadius: 0, yRadius: 0)
+            linePath.fill()
+            linePath.stroke()
+        }
+    }
+
+    override func drawSelection(in dirtyRect: NSRect) {
+        if selectionBackgroundColorBlock == nil {
+            let selectionRect = NSRect(x: selectionInset.left, y: selectionInset.top, width: NSWidth(bounds) - selectionInset.left - selectionInset.right, height: NSHeight(bounds) - selectionInset.top - selectionInset.bottom)
+            NSColor.lightGray.setFill()
+            let selectionPath = NSBezierPath(roundedRect: selectionRect, xRadius: selectionRadius, yRadius: selectionRadius)
+            selectionPath.fill()
+            return
+        }
+
+        let selectionRect = NSRect(x: selectionInset.left, y: selectionInset.top, width: NSWidth(bounds) - selectionInset.left - selectionInset.right, height: NSHeight(bounds) - selectionInset.top - selectionInset.bottom)
+        let color = selectionBackgroundColorBlock!()
+        color.setStroke()
+        color.setFill()
+
+        let selectionPath = NSBezierPath(roundedRect: selectionRect, xRadius: selectionRadius, yRadius: selectionRadius)
+        selectionPath.fill()
+        selectionPath.stroke()
+    }
+
+    override func mouseEntered(with event: NSEvent) {
+        super.mouseEntered(with: event)
+    }
+
+}

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/AppKitCategories/CPDFListEditAnnotationViewController.h

@@ -1,32 +0,0 @@
-//
-//  CPDFListEditAnnotationViewController.h
-//  ComPDFKit
-//
-//  Copyright © 2014-2022 PDF Technologies, Inc. All Rights Reserved.
-//
-//  THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
-//  AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE ComPDFKit LICENSE AGREEMENT.
-//  UNAUTHORIZED REPRODUCTION OR DISTRIBUTION IS SUBJECT TO CIVIL AND CRIMINAL PENALTIES.
-//  This notice may not be removed from this file.
-//
-
-#import <Cocoa/Cocoa.h>
-#import <ComPDFKit/ComPDFKit.h>
-
-@class CPDFListView;
-
-@interface CPDFListEditAnnotationViewController : NSViewController
-
-@property(nonatomic,readonly) CPDFAnnotation * annotation;
-
-@property(nonatomic,readonly) NSString * contentString;
-
-@property(nonatomic,weak) CPDFListView *pdflistView;
-
-@property (nonatomic, copy) void(^closeCallBack)(void);
-
-@property (nonatomic, copy) void(^changeColorCallBack)(void);
-
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil annotation:(CPDFAnnotation *)annotation;
-
-@end

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/AppKitCategories/CPDFListEditAnnotationViewController.m

@@ -1,231 +0,0 @@
-//
-//  CPDFListEditAnnotationViewController.m
-///  ComPDFKit
-//
-//  Copyright © 2014-2022 PDF Technologies, Inc. All Rights Reserved.
-//
-//  THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
-//  AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE ComPDFKit LICENSE AGREEMENT.
-//  UNAUTHORIZED REPRODUCTION OR DISTRIBUTION IS SUBJECT TO CIVIL AND CRIMINAL PENALTIES.
-//  This notice may not be removed from this file.
-//
-
-#import "CPDFListEditAnnotationViewController.h"
-
-#import "CPDFAnnotationModel.h"
-#import "CPDFListView.h"
-#if VERSION_DMG
-#import <PDF_Master-Swift.h>
-#else
-#import <PDF_Master-Swift.h>
-#endif
-
-@interface CPDFListEditAnnotationViewController ()
-
-@property (nonatomic,assign)IBOutlet NSBox *borderBox;
-
-@property(nonatomic,retain) CPDFAnnotation * annotation;
-
-@property (nonatomic,assign)IBOutlet NSTextView *contentTextView;
-
-@property (nonatomic,assign)IBOutlet NSButton *closeButton;
-
-@property (nonatomic,assign)IBOutlet NSButton *clearButton;
-
-@property (nonatomic,assign)IBOutlet NSButton *colorButton1;
-
-@property (nonatomic,assign)IBOutlet NSButton *colorButton2;
-
-@property (nonatomic,assign)IBOutlet NSButton *colorButton3;
-
-@property (nonatomic,assign)IBOutlet NSButton *colorButton4;
-
-@property (nonatomic,assign)IBOutlet NSBox *colorBox1;
-
-@property (nonatomic,assign)IBOutlet NSBox *colorBox2;
-
-@property (nonatomic,assign)IBOutlet NSBox *colorBox3;
-
-@property (nonatomic,assign)IBOutlet NSBox *colorBox4;
-
-@property (nonatomic,assign)IBOutlet NSBox *colorSubBox1;
-
-@property (nonatomic,assign)IBOutlet NSBox *colorSubBox2;
-
-@property (nonatomic,assign)IBOutlet NSBox *colorSubBox3;
-
-@property (nonatomic,assign)IBOutlet NSBox *colorSubBox4;
-
-@property (nonatomic,assign)IBOutlet NSTextField *contentLabel;
-
-@property(nonatomic,retain) NSMutableArray * buttons;
-
-@property(nonatomic,retain) NSMutableArray * colors;
-
-@property (nonatomic, strong) NSUndoManager *textViewUndoManager;
-
-@end
-
-@implementation CPDFListEditAnnotationViewController
-
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil annotation:(CPDFAnnotation *)annotation {
-    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
-    if (self) {
-        self.colors = [NSMutableArray array];
-        self.annotation = annotation;
-    }
-    return self;
-}
-
-- (void)viewDidAppear {
-    [super viewDidAppear];
-    
-    dispatch_async(dispatch_get_main_queue(), ^{
-        [self.view.window makeFirstResponder:self.contentTextView];
-    });
-}
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    
-    NSBox * box = self.borderBox;
-    if (self.annotation.color) {
-        box.borderColor = self.annotation.color;
-        self.contentTextView.insertionPointColor = self.annotation.color;
-    } else {
-        box.borderColor = [NSColor whiteColor];
-        self.contentTextView.insertionPointColor = [NSColor blackColor];
-
-    }
-    box.fillColor = [NSColor whiteColor];
-    [self.colors removeAllObjects];
-    int i = 0;
-    for (NSColor *color in [[KMAnnotationPropertiesColorManager defaultManager] anchoredNoteColors]) {
-        if (i >= 4) {
-            break;
-        }
-        [self.colors addObject:color];
-        i += 1;
-    }
-    
-    self.buttons = [NSMutableArray arrayWithArray:@[self.colorSubBox1,self.colorSubBox2,self.colorSubBox3,self.colorSubBox4]];
-    
-    for(NSInteger i = 0;i<self.colors.count;i++) {
-        NSBox *box = self.buttons[i];
-        box.fillColor = self.colors[i];
-    }
-    
-    if([self.annotation isKindOfClass:[CPDFMarkupAnnotation class]] ||
-       [self.annotation isKindOfClass:[CPDFLineAnnotation class]] ||
-       [self.annotation isKindOfClass:[CPDFSquareAnnotation class]] ||
-       [self.annotation isKindOfClass:[CPDFCircleAnnotation class]] ||
-       [self.annotation isKindOfClass:[CPDFTextAnnotation class]]) {
-        for(NSInteger i = 0;i<self.colors.count;i++) {
-            NSBox *box = self.buttons[i];
-            box.hidden = NO;
-        }
-        self.colorButton1.hidden =
-        self.colorButton2.hidden =
-        self.colorButton3.hidden =
-        self.colorButton4.hidden = NO;
-    } else {
-        for(NSInteger i = 0;i<self.colors.count;i++) {
-            NSBox *box = self.buttons[i];
-            box.hidden = YES;
-        }
-        self.colorButton1.hidden =
-        self.colorButton2.hidden =
-        self.colorButton3.hidden =
-        self.colorButton4.hidden = NO;
-    }
-    
-    self.colorBox1.borderColor =
-    self.colorBox2.borderColor =
-    self.colorBox3.borderColor =
-    self.colorBox4.borderColor  = [NSColor clearColor];
-    
-    self.contentTextView.string = self.annotation.contents?:@"";
-    NSString *userName = [self.annotation userName];
-    NSDate *modificationDate = [self.annotation modificationDate];
-
-    NSString *content = userName;
-    NSString *string = nil;
-    if (modificationDate) {
-        string = [CPDFAnnotationModel timeStringWithTimeDate:modificationDate];
-    }
-    
-    if(string && string.length > 0) {
-        if (content && content.length >0)
-            content = [NSString stringWithFormat:@"%@ %@",content,string];
-        else
-            content = string;
-    }
-    
-    if([self.annotation isKindOfClass:[CPDFTextAnnotation class]]) {
-        NSString *value = KMPreferenceManager.shared.markupFontNoteString;
-        self.contentTextView.font = [NSFont fontWithName:value size:12.0] ?:[NSFont systemFontOfSize:12.0];
-    } else {
-        self.contentTextView.font = [NSFont systemFontOfSize:12.0];
-
-    }
-    
-    self.contentLabel.stringValue = content?:@"";
-    self.contentTextView.delegate = self;
-}
-
-- (NSUndoManager *)undoManagerForTextView:(NSTextView *)aTextView {
-    if (self.textViewUndoManager == nil)
-        self.textViewUndoManager = [[NSUndoManager alloc] init];
-    return self.textViewUndoManager;
-}
-
-- (NSString *)contentString {
-    return self.contentTextView.string;
-}
-
-#pragma mark - Action
-
-- (IBAction)buttonItemClick_Color:(NSButton *)sender {
-    self.colorBox1.borderColor =
-    self.colorBox2.borderColor =
-    self.colorBox3.borderColor =
-    self.colorBox4.borderColor  = [NSColor clearColor];
-    switch (sender.tag) {
-        case 0:
-            self.colorBox1.borderColor = [NSColor blackColor];
-            break;
-        case 1:
-            self.colorBox2.borderColor = [NSColor blackColor];
-            break;
-        case 2:
-            self.colorBox3.borderColor = [NSColor blackColor];
-            break;
-        default:
-        case 3:
-            self.colorBox4.borderColor = [NSColor blackColor];
-            break;
-    }
-    
-    CPDFAnnotationModel *model = [[CPDFAnnotationModel alloc]initWithPDFAnnotations:@[self.annotation]];
-    model.color = self.colors[sender.tag];
-    model.opacity = 1.0;
-    
-    if (self.annotation.color) {
-        self.borderBox.borderColor = self.annotation.color;
-        self.contentTextView.insertionPointColor = self.annotation.color;
-    } else {
-        self.borderBox.borderColor = [NSColor whiteColor];
-        self.contentTextView.insertionPointColor = [NSColor blackColor];
-    }
-    if(self.changeColorCallBack)
-        self.changeColorCallBack();
-}
-
-- (IBAction)buttonItemClick_Clear:(NSButton *)sender {
-    [self.pdflistView removeAnnotation:self.annotation];
-    if(self.closeCallBack)
-        self.closeCallBack();
-
-}
-
-@end

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/AppKitCategories/CPDFListEditAnnotationViewController.swift

@@ -0,0 +1,193 @@
+//
+//  CPDFListEditAnnotationViewController.swift
+//  PDF Master
+//
+//  Created by wanjun on 2023/10/10.
+//
+
+import Cocoa
+import ComPDFKit
+
+@objcMembers
+class CPDFListEditAnnotationViewController: NSViewController, NSTextViewDelegate {
+
+    private(set) var annotation: CPDFAnnotation = CPDFAnnotation()
+//    private(set) var contentString: String = ""
+    var contentString: String {
+        get {
+            return self.contentTextView.string
+        }
+    }
+    weak var pdflistView: CPDFListView?
+    
+    var closeCallBack: (() -> Void)?
+    var changeColorCallBack: (() -> Void)?
+    
+    @IBOutlet var borderBox: NSBox!
+    @IBOutlet var contentTextView: NSTextView!
+    @IBOutlet var closeButton: NSButton!
+    @IBOutlet var clearButton: NSButton!
+    @IBOutlet var colorButton1: NSButton!
+    @IBOutlet var colorButton2: NSButton!
+    @IBOutlet var colorButton3: NSButton!
+    @IBOutlet var colorButton4: NSButton!
+    @IBOutlet var colorBox1: NSBox!
+    @IBOutlet var colorBox2: NSBox!
+    @IBOutlet var colorBox3: NSBox!
+    @IBOutlet var colorBox4: NSBox!
+    @IBOutlet var colorSubBox1: NSBox!
+    @IBOutlet var colorSubBox2: NSBox!
+    @IBOutlet var colorSubBox3: NSBox!
+    @IBOutlet var colorSubBox4: NSBox!
+    @IBOutlet var contentLabel: NSTextField!
+    var buttons: [NSBox] = []
+    var colors: [NSColor] = []
+    var textViewUndoManager = UndoManager()
+
+    
+    init(nibName nibNameOrNil: NSNib.Name?, bundle nibBundleOrNil: Bundle?, annotation: CPDFAnnotation?) {
+        super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
+        self.colors = []
+        self.annotation = annotation!
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        // Do view setup here.
+        
+        let box = self.borderBox
+        if self.annotation.color != nil {
+            box?.borderColor = self.annotation.color
+            self.contentTextView.insertionPointColor = self.annotation.color
+        } else {
+            box?.borderColor = NSColor.white
+            self.contentTextView.insertionPointColor = NSColor.black
+        }
+        box?.fillColor = NSColor.white
+        self.colors.removeAll()
+        var i = 0
+        for color in KMAnnotationPropertiesColorManager.default().anchoredNoteColors {
+            if i >= 4 {
+                break
+            }
+            self.colors.append(color)
+            i += 1
+        }
+        
+        self.buttons = [self.colorSubBox1, self.colorSubBox2, self.colorSubBox3, self.colorSubBox4]
+        
+        for i in 0..<self.colors.count {
+            let box = self.buttons[i]
+            box.fillColor = self.colors[i]
+        }
+        
+        if self.annotation is CPDFMarkupAnnotation ||
+            self.annotation is CPDFLineAnnotation ||
+            self.annotation is CPDFSquareAnnotation ||
+            self.annotation is CPDFCircleAnnotation ||
+            self.annotation is CPDFTextAnnotation {
+            for i in 0..<self.colors.count {
+                let box = self.buttons[i]
+                box.isHidden = false
+            }
+            self.colorButton1.isHidden = false
+            self.colorButton2.isHidden = false
+            self.colorButton3.isHidden = false
+            self.colorButton4.isHidden = false
+        } else {
+            for i in 0..<self.colors.count {
+                let box = self.buttons[i]
+                box.isHidden = true
+            }
+            self.colorButton1.isHidden = false
+            self.colorButton2.isHidden = false
+            self.colorButton3.isHidden = false
+            self.colorButton4.isHidden = false
+        }
+        
+        self.colorBox1.borderColor = NSColor.clear
+        self.colorBox2.borderColor = NSColor.clear
+        self.colorBox3.borderColor = NSColor.clear
+        self.colorBox4.borderColor = NSColor.clear
+        
+        self.contentTextView?.string = self.annotation.contents ?? ""
+        
+        var content = self.annotation.userName() ?? ""
+        var string: String = ""
+        if let modificationDate = self.annotation.modificationDate() {
+            string = CPDFAnnotationModel.timeString(withTime: modificationDate)
+            if let string1 = CPDFAnnotationModel.timeString(withTime: modificationDate) {
+                if !string1.isEmpty {
+                    if !content.isEmpty {
+                        content = "\(content) \(string1)"
+                    } else {
+                        content = string
+                    }
+                }
+            }
+        }
+
+        if self.annotation is CPDFTextAnnotation {
+            let value = KMPreferenceManager.shared.markupFontNoteString
+            self.contentTextView?.font = NSFont(name: value, size: 12.0) ?? NSFont.systemFont(ofSize: 12.0)
+        } else {
+            self.contentTextView?.font = NSFont.systemFont(ofSize: 12.0)
+        }
+        
+        self.contentLabel?.stringValue = content
+        self.contentTextView?.delegate = self
+    }
+    
+    func undoManager(for view: NSTextView) -> UndoManager? {
+        return self.textViewUndoManager
+    }
+    
+    //MARK: Action
+    
+    @IBAction func buttonItemClickColor(_ sender: NSButton) {
+        colorBox1.borderColor = .clear
+        colorBox2.borderColor = .clear
+        colorBox3.borderColor = .clear
+        colorBox4.borderColor = .clear
+        
+        switch sender.tag {
+        case 0:
+            colorBox1.borderColor = .black
+        case 1:
+            colorBox2.borderColor = .black
+        case 2:
+            colorBox3.borderColor = .black
+        case 3:
+            colorBox4.borderColor = .black
+        default:
+            colorBox4.borderColor = .black
+        }
+        
+        let model = CPDFAnnotationModel(pdfAnnotations: [annotation])
+        model?.setColor(self.colors[sender.tag])
+        model?.setOpacity(1.0)
+        
+        if let annotationColor = annotation.color {
+            borderBox.borderColor = annotationColor
+            contentTextView.insertionPointColor = annotationColor
+        } else {
+            borderBox.borderColor = .white
+            contentTextView.insertionPointColor = .black
+        }
+        
+        if let changeColorCallBack1 = self.changeColorCallBack {
+            changeColorCallBack1()
+        }
+    }
+
+    @IBAction func buttonItemClickClear(_ sender: NSButton) {
+        self.pdflistView!.remove(self.annotation)
+        if let closeCallBack1 = self.closeCallBack {
+            closeCallBack1()
+        }
+    }
+}

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/AppKitCategories/CPDFListEditAnnotationViewController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21701" 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="21701"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22154"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -82,7 +82,7 @@
                             <font key="font" metaFont="system"/>
                         </buttonCell>
                         <connections>
-                            <action selector="buttonItemClick_Color:" target="-2" id="NzO-Ll-6lS"/>
+                            <action selector="buttonItemClickColor:" target="-2" id="2F3-me-9bS"/>
                         </connections>
                     </button>
                     <box boxType="custom" cornerRadius="9" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="JgF-Mz-Ybg">
@@ -106,14 +106,14 @@
                             </constraints>
                         </view>
                     </box>
-                    <button verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="eeB-tB-qlu">
+                    <button tag="1" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="eeB-tB-qlu">
                         <rect key="frame" x="43" y="15" width="18" height="18"/>
                         <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="Wgg-r1-5CV">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
                         </buttonCell>
                         <connections>
-                            <action selector="buttonItemClick_Color:" target="-2" id="LND-8D-dHY"/>
+                            <action selector="buttonItemClickColor:" target="-2" id="lqg-fi-mSr"/>
                         </connections>
                     </button>
                     <box boxType="custom" cornerRadius="9" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="O7Z-Fw-ng7">
@@ -137,14 +137,14 @@
                             </constraints>
                         </view>
                     </box>
-                    <button verticalHuggingPriority="750" tag="2" translatesAutoresizingMaskIntoConstraints="NO" id="VZV-gj-XS1">
+                    <button tag="2" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VZV-gj-XS1">
                         <rect key="frame" x="76" y="15" width="18" height="18"/>
                         <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="wvq-f9-dd5">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
                         </buttonCell>
                         <connections>
-                            <action selector="buttonItemClick_Color:" target="-2" id="gHi-2A-XV7"/>
+                            <action selector="buttonItemClickColor:" target="-2" id="lMe-Mk-N2D"/>
                         </connections>
                     </button>
                     <box boxType="custom" cornerRadius="9" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="qE7-so-hkW">
@@ -168,17 +168,17 @@
                             </constraints>
                         </view>
                     </box>
-                    <button verticalHuggingPriority="750" tag="3" translatesAutoresizingMaskIntoConstraints="NO" id="Oge-ae-g5S">
+                    <button tag="3" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Oge-ae-g5S">
                         <rect key="frame" x="109" y="15" width="18" height="18"/>
                         <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="bB9-Y3-LI0">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
                         </buttonCell>
                         <connections>
-                            <action selector="buttonItemClick_Color:" target="-2" id="CLG-9a-PhW"/>
+                            <action selector="buttonItemClickColor:" target="-2" id="Bs7-2s-Qe3"/>
                         </connections>
                     </button>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="X5x-V4-60I">
+                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="X5x-V4-60I">
                         <rect key="frame" x="8" y="190" width="262" height="16"/>
                         <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="XiP-KT-Q25">
                             <font key="font" metaFont="system"/>
@@ -188,16 +188,16 @@
                     </textField>
                     <button translatesAutoresizingMaskIntoConstraints="NO" id="U33-Yn-gGE">
                         <rect key="frame" x="250" y="15" width="18" height="18"/>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="18" id="ZBm-CF-dOn"/>
-                            <constraint firstAttribute="height" constant="18" id="wiT-xn-pmy"/>
-                        </constraints>
                         <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="CPDFListViewImageNameNoteDelete" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="pTg-aq-t2K">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
                         </buttonCell>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="18" id="ZBm-CF-dOn"/>
+                            <constraint firstAttribute="height" constant="18" id="wiT-xn-pmy"/>
+                        </constraints>
                         <connections>
-                            <action selector="buttonItemClick_Clear:" target="-2" id="eOn-Or-eE2"/>
+                            <action selector="buttonItemClickClear:" target="-2" id="wXk-2z-OGa"/>
                         </connections>
                     </button>
                     <scrollView borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jfc-6X-x5d">

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFListView.m

@@ -16,7 +16,6 @@
 #import "CSelfSignAnnotation.h"
 #import "CSelfSignAnnotationFreeText.h"
 #import "CPDFListViewConfig.h"
-#import "CPDFListEditAnnotationViewController.h"
 #import "CPDFListAnnotationNoteWindowController.h"
 
 #import "CPDFListView+Private.h"

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

@@ -19,7 +19,6 @@
 #import "NSCursor+PDFListView.h"
 
 #import "CPDFListHoverAnnotationViewController.h"
-#import "CPDFListEditAnnotationViewController.h"
 
 #import "CPDFListView+Extension.h"
 #import "CPDFMarkupAnnotation+PDFListView.h"

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

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

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

@@ -42,4 +42,3 @@
 //广告
 #import "KMRecommondManager.h"
 #import "CPDFListView+Extension.h"
-#import "KMTableRowView.h"

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

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