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

PDF Office/PDF Master.xcodeproj/project.pbxproj

@@ -22,9 +22,6 @@
 		8931684C296E436B0073EA59 /* KMSignatureWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 89316836296E436B0073EA59 /* KMSignatureWindowController.xib */; };
 		8931684D296E436B0073EA59 /* KMSignatureWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 89316836296E436B0073EA59 /* KMSignatureWindowController.xib */; };
 		8931684E296E436B0073EA59 /* KMSignatureWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 89316836296E436B0073EA59 /* KMSignatureWindowController.xib */; };
-		89316852296E45CA0073EA59 /* KMImageAccessoryController.m in Sources */ = {isa = PBXBuildFile; fileRef = 89316850296E45CA0073EA59 /* KMImageAccessoryController.m */; };
-		89316853296E45CA0073EA59 /* KMImageAccessoryController.m in Sources */ = {isa = PBXBuildFile; fileRef = 89316850296E45CA0073EA59 /* KMImageAccessoryController.m */; };
-		89316854296E45CA0073EA59 /* KMImageAccessoryController.m in Sources */ = {isa = PBXBuildFile; fileRef = 89316850296E45CA0073EA59 /* KMImageAccessoryController.m */; };
 		89316855296E45CA0073EA59 /* KMImageAccessoryController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 89316851296E45CA0073EA59 /* KMImageAccessoryController.xib */; };
 		89316856296E45CA0073EA59 /* KMImageAccessoryController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 89316851296E45CA0073EA59 /* KMImageAccessoryController.xib */; };
 		89316857296E45CA0073EA59 /* KMImageAccessoryController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 89316851296E45CA0073EA59 /* KMImageAccessoryController.xib */; };
@@ -214,9 +211,6 @@
 		89E4E6F52963D1E9002DBA6F /* KMAnnotationPropertiesColorManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 89E4E6F42963D1E9002DBA6F /* KMAnnotationPropertiesColorManager.m */; };
 		89E4E6F62963D1E9002DBA6F /* KMAnnotationPropertiesColorManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 89E4E6F42963D1E9002DBA6F /* KMAnnotationPropertiesColorManager.m */; };
 		89E4E6F72963D1E9002DBA6F /* KMAnnotationPropertiesColorManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 89E4E6F42963D1E9002DBA6F /* KMAnnotationPropertiesColorManager.m */; };
-		89E4E6FB2963D341002DBA6F /* KMPopUpButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 89E4E6F92963D341002DBA6F /* KMPopUpButton.m */; };
-		89E4E6FC2963D341002DBA6F /* KMPopUpButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 89E4E6F92963D341002DBA6F /* KMPopUpButton.m */; };
-		89E4E6FD2963D341002DBA6F /* KMPopUpButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 89E4E6F92963D341002DBA6F /* KMPopUpButton.m */; };
 		89E4E70B2963D62B002DBA6F /* KMAnnotationFontWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 89E4E7092963D62B002DBA6F /* KMAnnotationFontWindowController.xib */; };
 		89E4E70C2963D62B002DBA6F /* KMAnnotationFontWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 89E4E7092963D62B002DBA6F /* KMAnnotationFontWindowController.xib */; };
 		89E4E70D2963D62C002DBA6F /* KMAnnotationFontWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 89E4E7092963D62B002DBA6F /* KMAnnotationFontWindowController.xib */; };
@@ -1861,6 +1855,12 @@
 		ADDEEA722AD3EFE200EF675D /* KMButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADDEEA712AD3EFE200EF675D /* KMButton.swift */; };
 		ADDEEA732AD3EFE200EF675D /* KMButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADDEEA712AD3EFE200EF675D /* KMButton.swift */; };
 		ADDEEA742AD3EFE200EF675D /* KMButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADDEEA712AD3EFE200EF675D /* KMButton.swift */; };
+		ADDEEA7A2AD3F4C800EF675D /* KMPopUpButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADDEEA792AD3F4C800EF675D /* KMPopUpButton.swift */; };
+		ADDEEA7B2AD3F4C800EF675D /* KMPopUpButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADDEEA792AD3F4C800EF675D /* KMPopUpButton.swift */; };
+		ADDEEA7C2AD3F4C800EF675D /* KMPopUpButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADDEEA792AD3F4C800EF675D /* KMPopUpButton.swift */; };
+		ADDEEA7E2AD3FB1D00EF675D /* KMImageAccessoryController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADDEEA7D2AD3FB1D00EF675D /* KMImageAccessoryController.swift */; };
+		ADDEEA7F2AD3FB1D00EF675D /* KMImageAccessoryController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADDEEA7D2AD3FB1D00EF675D /* KMImageAccessoryController.swift */; };
+		ADDEEA802AD3FB1D00EF675D /* KMImageAccessoryController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADDEEA7D2AD3FB1D00EF675D /* KMImageAccessoryController.swift */; };
 		ADE3C19F29A3894900793B13 /* KMSearchTableRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADE3C19E29A3894900793B13 /* KMSearchTableRowView.swift */; };
 		ADE3C1A029A3894900793B13 /* KMSearchTableRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADE3C19E29A3894900793B13 /* KMSearchTableRowView.swift */; };
 		ADE3C1A129A3894900793B13 /* KMSearchTableRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADE3C19E29A3894900793B13 /* KMSearchTableRowView.swift */; };
@@ -3507,8 +3507,6 @@
 		8931682B296E436A0073EA59 /* NSImage+CustomImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSImage+CustomImage.h"; sourceTree = "<group>"; };
 		8931682F296E436B0073EA59 /* KMSignatureWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMSignatureWindowController.h; sourceTree = "<group>"; };
 		89316836296E436B0073EA59 /* KMSignatureWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KMSignatureWindowController.xib; sourceTree = "<group>"; };
-		8931684F296E45CA0073EA59 /* KMImageAccessoryController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMImageAccessoryController.h; sourceTree = "<group>"; };
-		89316850296E45CA0073EA59 /* KMImageAccessoryController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMImageAccessoryController.m; sourceTree = "<group>"; };
 		89316851296E45CA0073EA59 /* KMImageAccessoryController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KMImageAccessoryController.xib; sourceTree = "<group>"; };
 		8942F7BA29222C7E00389627 /* KMBookCellView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMBookCellView.swift; sourceTree = "<group>"; };
 		8942F7BE2923670F00389627 /* KMBOTAManagerClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMBOTAManagerClass.swift; sourceTree = "<group>"; };
@@ -3579,8 +3577,6 @@
 		89E4E6EB2963D1B7002DBA6F /* KMColorPickerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMColorPickerViewController.h; sourceTree = "<group>"; };
 		89E4E6F32963D1E9002DBA6F /* KMAnnotationPropertiesColorManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMAnnotationPropertiesColorManager.h; sourceTree = "<group>"; };
 		89E4E6F42963D1E9002DBA6F /* KMAnnotationPropertiesColorManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMAnnotationPropertiesColorManager.m; sourceTree = "<group>"; };
-		89E4E6F92963D341002DBA6F /* KMPopUpButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMPopUpButton.m; sourceTree = "<group>"; };
-		89E4E6FA2963D341002DBA6F /* KMPopUpButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMPopUpButton.h; sourceTree = "<group>"; };
 		89E4E7082963D62B002DBA6F /* KMAnnotationFontWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMAnnotationFontWindowController.h; sourceTree = "<group>"; };
 		89E4E7092963D62B002DBA6F /* KMAnnotationFontWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KMAnnotationFontWindowController.xib; sourceTree = "<group>"; };
 		89E4E70A2963D62B002DBA6F /* KMAnnotationFontWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMAnnotationFontWindowController.m; sourceTree = "<group>"; };
@@ -4202,6 +4198,8 @@
 		ADDEEA692AD3CF3A00EF675D /* KMDrawView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMDrawView.swift; sourceTree = "<group>"; };
 		ADDEEA6D2AD3E16100EF675D /* KMSigntureViewItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMSigntureViewItem.swift; sourceTree = "<group>"; };
 		ADDEEA712AD3EFE200EF675D /* KMButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMButton.swift; sourceTree = "<group>"; };
+		ADDEEA792AD3F4C800EF675D /* KMPopUpButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMPopUpButton.swift; sourceTree = "<group>"; };
+		ADDEEA7D2AD3FB1D00EF675D /* KMImageAccessoryController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMImageAccessoryController.swift; sourceTree = "<group>"; };
 		ADE3C19E29A3894900793B13 /* KMSearchTableRowView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMSearchTableRowView.swift; sourceTree = "<group>"; };
 		ADE3C1A929A4779E00793B13 /* KMPrintAccessoryController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMPrintAccessoryController.swift; sourceTree = "<group>"; };
 		ADE3C1AA29A4779E00793B13 /* KMPrintAccessoryController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMPrintAccessoryController.xib; sourceTree = "<group>"; };
@@ -5024,8 +5022,7 @@
 				8931682B296E436A0073EA59 /* NSImage+CustomImage.h */,
 				89316828296E436A0073EA59 /* NSImage+CustomImage.m */,
 				BB2E665E29C885550000FEBC /* KMSignatureHelpViewController.xib */,
-				8931684F296E45CA0073EA59 /* KMImageAccessoryController.h */,
-				89316850296E45CA0073EA59 /* KMImageAccessoryController.m */,
+				ADDEEA7D2AD3FB1D00EF675D /* KMImageAccessoryController.swift */,
 				89316851296E45CA0073EA59 /* KMImageAccessoryController.xib */,
 				ADDEEA482AD38BDB00EF675D /* KMSignatureHelpViewController.swift */,
 			);
@@ -5334,8 +5331,7 @@
 			isa = PBXGroup;
 			children = (
 				ADDEEA712AD3EFE200EF675D /* KMButton.swift */,
-				89E4E6FA2963D341002DBA6F /* KMPopUpButton.h */,
-				89E4E6F92963D341002DBA6F /* KMPopUpButton.m */,
+				ADDEEA792AD3F4C800EF675D /* KMPopUpButton.swift */,
 				89E4E7202963FB23002DBA6F /* KMGeneralButton.h */,
 				89E4E7212963FB23002DBA6F /* KMGeneralButton.m */,
 				89E4E7172963F5D3002DBA6F /* KMSelfSignAnnotation.h */,
@@ -10446,6 +10442,7 @@
 				BB147029299DC0D100784A6A /* OIDAuthorizationService.m in Sources */,
 				9FF94F1129A7476000B1EF69 /* KMDesignPropertySelector.swift in Sources */,
 				ADBC2D0C299CAA65006280C8 /* KMBaseXibView.swift in Sources */,
+				ADDEEA7E2AD3FB1D00EF675D /* KMImageAccessoryController.swift in Sources */,
 				BB60138C2AD3A94200A76FB2 /* CPDFSignatureAnnotation+PDFListView.swift in Sources */,
 				BB003021298CEBED002DD1A0 /* KMPreferenceStepper.swift in Sources */,
 				9FDD0FA629533494000C4DAD /* KMJSONParser.swift in Sources */,
@@ -10638,6 +10635,7 @@
 				9FCFECA02AD17B8A00EAD2CB /* SKProgressController.swift in Sources */,
 				89D9897428FE743E003A3E87 /* KMOutlineView.swift in Sources */,
 				BB6719F92AD2CC05003D44D5 /* CPDFSignatureWidgetAnnotation+PDFListView.swift in Sources */,
+				ADDEEA7A2AD3F4C800EF675D /* KMPopUpButton.swift in Sources */,
 				ADC63E482A49BEDD00854E02 /* KMSubscribeWaterMarkCollectionItem.swift in Sources */,
 				89752E1D2942CB03003FF08E /* KMSearchMode.swift in Sources */,
 				AD3A3587294C11ED00D72802 /* KMPrintPreviewPresenter.swift in Sources */,
@@ -10962,7 +10960,6 @@
 				ADBC375D29CC61E100D93208 /* KMReadModelView.swift in Sources */,
 				BB6013902AD3AFF000A76FB2 /* NSPopover+KMExtension.swift in Sources */,
 				BB2EDF79296ECE17003BCF58 /* KMPageEditThumbnailItem.swift in Sources */,
-				89E4E6FB2963D341002DBA6F /* KMPopUpButton.m in Sources */,
 				899700E828F3E4D3009AF911 /* MainWindowController.swift in Sources */,
 				BB6DD81C29348F31001F0544 /* KMSecureTextFiled.swift in Sources */,
 				BB8F4572295ACE380037EA22 /* KMHeaderFooterAdjectiveListCell.swift in Sources */,
@@ -11006,7 +11003,6 @@
 				9FDD0FB7295D5230000C4DAD /* KMToolbarController.swift in Sources */,
 				9F1FE4F929406E4700E952CA /* CTTabStripView.m in Sources */,
 				AD8810B229A846B100178CA1 /* KMVerficationCodeWindowController.swift in Sources */,
-				89316852296E45CA0073EA59 /* KMImageAccessoryController.m in Sources */,
 				BB5F8A0E29BB04F000365ADB /* GBDeviceInfo_OSX.m in Sources */,
 				ADB1FE962975300B00ED072D /* KMBatchHeaderAndFooterView.swift in Sources */,
 				ADE614B529861CCC00F62ED7 /* KMBatchSelectedFilesView.swift in Sources */,
@@ -11374,6 +11370,7 @@
 				BBC745EB295F067B0072C2ED /* KMCropSettingWindowController.swift in Sources */,
 				ADCB98C62924730000B51A03 /* KMBatchProcessingTableViewModel.swift in Sources */,
 				89E4E73F2964160F002DBA6F /* KMAnnotationLinkViewController.m in Sources */,
+				ADDEEA7B2AD3F4C800EF675D /* KMPopUpButton.swift in Sources */,
 				BBC3480D29558DC1008D2CD1 /* KMBackgroundController.swift in Sources */,
 				BB6DD8262934D056001F0544 /* KMSecureEncryptSuccessTipView.swift in Sources */,
 				89E4E77A2967B370002DBA6F /* KMDynamicStampViewController.m in Sources */,
@@ -11763,7 +11760,6 @@
 				BB49ED16293F489500C82CA2 /* KMConvertImageSettingView.swift in Sources */,
 				ADBC375E29CC61E100D93208 /* KMReadModelView.swift in Sources */,
 				BB2EDF7A296ECE17003BCF58 /* KMPageEditThumbnailItem.swift in Sources */,
-				89E4E6FC2963D341002DBA6F /* KMPopUpButton.m in Sources */,
 				9FBA0EF628FFC8A0001117AF /* KMCollectionView.swift in Sources */,
 				ADD1B7072946CBB600C3FFF7 /* KMBaseTextFormatter.swift in Sources */,
 				BB8F4573295ACE380037EA22 /* KMHeaderFooterAdjectiveListCell.swift in Sources */,
@@ -11807,7 +11803,6 @@
 				9FDD0FB8295D5230000C4DAD /* KMToolbarController.swift in Sources */,
 				BB162E98295062CD0088E9D1 /* KMPageRangeTools.swift in Sources */,
 				AD8810B329A846B100178CA1 /* KMVerficationCodeWindowController.swift in Sources */,
-				89316853296E45CA0073EA59 /* KMImageAccessoryController.m in Sources */,
 				BB5F8A0F29BB04F000365ADB /* GBDeviceInfo_OSX.m in Sources */,
 				ADB1FE972975300B00ED072D /* KMBatchHeaderAndFooterView.swift in Sources */,
 				ADE614B629861CCC00F62ED7 /* KMBatchSelectedFilesView.swift in Sources */,
@@ -11932,6 +11927,7 @@
 				ADB1FEAF297543C000ED072D /* KMBatchSettingView.swift in Sources */,
 				8942F7EA2925E1C400389627 /* KMLiftSideCellView.swift in Sources */,
 				ADE8BC3029F8CD7200570F89 /* KMPDFThumbnailModel.swift in Sources */,
+				ADDEEA7F2AD3FB1D00EF675D /* KMImageAccessoryController.swift in Sources */,
 				BB4EEF4129764FCC003A3537 /* KMWatermarkColorView.swift in Sources */,
 				AD4B455729408CB00076FA14 /* KMOCRChooseView.swift in Sources */,
 				BB146FCA299DC0D100784A6A /* GTMSessionFetcher.m in Sources */,
@@ -12225,7 +12221,6 @@
 				BB147049299DC0D200784A6A /* OIDServiceConfiguration.m in Sources */,
 				ADE3C1C329A4C13700793B13 /* KMPrintAccessoryController_OC.m in Sources */,
 				BB5DF1EB2959C5CB0025CDA1 /* KMHeaderFooterPreviewController.swift in Sources */,
-				89316854296E45CA0073EA59 /* KMImageAccessoryController.m in Sources */,
 				AD8DD2A52A9C35B2007CC9D0 /* KMThumbnailManager.swift in Sources */,
 				BB6719FF2AD2CE1B003D44D5 /* CPDFSquareAnnotation+PDFListView.swift in Sources */,
 				BB146FBF299DC0D100784A6A /* GTMGatherInputStream.m in Sources */,
@@ -12740,7 +12735,6 @@
 				9F8DDF2829237910006CDC73 /* Array+KMExtensions.swift in Sources */,
 				9F0CB5172986566D00007028 /* KMDesignToken+BorderRadiusTopLeft.swift in Sources */,
 				BBBB6CCC2AD109F30035AA66 /* CPDFAnnotation+PDFListView.swift in Sources */,
-				89E4E6FD2963D341002DBA6F /* KMPopUpButton.m in Sources */,
 				BB49ECDF293EED6100C82CA2 /* KMConvertWordWindowController.swift in Sources */,
 				BBE0BDF529A22EF300440583 /* KMMainViewController+MenuAction.swift in Sources */,
 				8942F7EB2925E1C400389627 /* KMLiftSideCellView.swift in Sources */,
@@ -12748,6 +12742,7 @@
 				9F02016C2A1B088700C9B673 /* KMAIOpenPDFFilesVC.swift in Sources */,
 				9F1F82D4292F6D510092C4B4 /* KMPDFInsertPreviewViewController.swift in Sources */,
 				ADB1FE7029752BB700ED072D /* KMBatchConvertPDFView.swift in Sources */,
+				ADDEEA7C2AD3F4C800EF675D /* KMPopUpButton.swift in Sources */,
 				9F705F8F291E579F005199AD /* KMHistoryFileTableView.swift in Sources */,
 				9F0CB4812967F64D00007028 /* KMPropertiesPanelReadOnlySubVC.swift in Sources */,
 				9F0CB53B2986570600007028 /* KMDesignToken+BoxShadow.swift in Sources */,
@@ -12797,6 +12792,7 @@
 				BB6DD8272934D056001F0544 /* KMSecureEncryptSuccessTipView.swift in Sources */,
 				9FCFECAA2AD243C900EAD2CB /* KMBlankView.swift in Sources */,
 				9F0201902A1DDAA500C9B673 /* KMAITranslationWindowController.swift in Sources */,
+				ADDEEA802AD3FB1D00EF675D /* KMImageAccessoryController.swift in Sources */,
 				BBEC00C1295C306400A26C98 /* KMBatesPropertyController.swift in Sources */,
 				89E4E7242963FB23002DBA6F /* KMGeneralButton.m in Sources */,
 				BB003023298CEBED002DD1A0 /* KMPreferenceStepper.swift in Sources */,

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

@@ -5503,6 +5503,21 @@
                   endingLineNumber = "750"
                   offsetFromSymbolStart = "1496">
                </Location>
+               <Location
+                  uuid = "18B2AE70-9733-466E-83BA-36FD4726B700 - fcbaf7727200cc87"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[CPDFListView(Event) validateMenuItem:]"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Event.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "750"
+                  endingLineNumber = "750"
+                  offsetFromSymbolStart = "1520">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -7504,6 +7519,21 @@
                   endingLineNumber = "2161"
                   offsetFromSymbolStart = "6048">
                </Location>
+               <Location
+                  uuid = "E6C993FB-0842-4F52-AE53-E75F3AD220CC - a1d4d1cb41d7210"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[CPDFListView(Event) doDragAddAnnotationWithEvent:]"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Event.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "2160"
+                  endingLineNumber = "2160"
+                  offsetFromSymbolStart = "6580">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -7612,6 +7642,21 @@
                   endingLineNumber = "2246"
                   offsetFromSymbolStart = "776">
                </Location>
+               <Location
+                  uuid = "8DF43700-9AFC-4D93-AA00-E6A6AF35DC2E - b8845c68496e6d2c"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[CPDFListView(Event) doResizeLineAnnotationWithEvent:fromPoint:originalStartPoint:originalEndPoint:resizeHandle:]"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Event.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "2247"
+                  endingLineNumber = "2247"
+                  offsetFromSymbolStart = "1172">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -7750,6 +7795,36 @@
                   endingLineNumber = "2333"
                   offsetFromSymbolStart = "1844">
                </Location>
+               <Location
+                  uuid = "31E2802F-4470-4A8B-AA9C-72955A42BC77 - 8dc592bd4f8b95ad"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[CPDFListView(Event) doResizeAnnotationWithEvent:fromPoint:originalBounds:resizeHandle:]"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Event.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "2333"
+                  endingLineNumber = "2333"
+                  offsetFromSymbolStart = "2408">
+               </Location>
+               <Location
+                  uuid = "31E2802F-4470-4A8B-AA9C-72955A42BC77 - 8dc592bd4f8b95ad"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[CPDFListView(Event) doResizeAnnotationWithEvent:fromPoint:originalBounds:resizeHandle:]"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Event.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "2333"
+                  endingLineNumber = "2333"
+                  offsetFromSymbolStart = "2412">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -7843,6 +7918,21 @@
                   endingLineNumber = "2342"
                   offsetFromSymbolStart = "2160">
                </Location>
+               <Location
+                  uuid = "45AC1B80-85C6-4653-8A68-F7B5D967D61C - 8dc592bd4f8b94f4"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[CPDFListView(Event) doResizeAnnotationWithEvent:fromPoint:originalBounds:resizeHandle:]"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Event.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "2342"
+                  endingLineNumber = "2342"
+                  offsetFromSymbolStart = "2820">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -8303,10 +8393,10 @@
             filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2036"
-            endingLineNumber = "2036"
-            landmarkName = "KMGeneralAnnotationViewController"
-            landmarkType = "3">
+            startingLineNumber = "2035"
+            endingLineNumber = "2035"
+            landmarkName = "-annotationChangeNotification:"
+            landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -8319,8 +8409,8 @@
             filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2049"
-            endingLineNumber = "2049"
+            startingLineNumber = "2048"
+            endingLineNumber = "2048"
             landmarkName = "-popoverWillShow:"
             landmarkType = "7">
             <Locations>
@@ -8399,6 +8489,21 @@
                   endingLineNumber = "2049"
                   offsetFromSymbolStart = "416">
                </Location>
+               <Location
+                  uuid = "C2F9CDF2-6FCD-4878-80AB-6E2E62BE92D7 - db1647727e39a8af"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[KMGeneralAnnotationViewController popoverWillShow:]"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "2048"
+                  endingLineNumber = "2048"
+                  offsetFromSymbolStart = "416">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -8412,8 +8517,8 @@
             filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2093"
-            endingLineNumber = "2093"
+            startingLineNumber = "2092"
+            endingLineNumber = "2092"
             landmarkName = "-km_comboBoxSelectionDidChange:"
             landmarkType = "7">
             <Locations>
@@ -8492,6 +8597,21 @@
                   endingLineNumber = "2093"
                   offsetFromSymbolStart = "788">
                </Location>
+               <Location
+                  uuid = "85DBBD1F-DB40-41C9-86D9-D25837D9D523 - f25ab134c5581684"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[KMGeneralAnnotationViewController km_comboBoxSelectionDidChange:]"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "2092"
+                  endingLineNumber = "2092"
+                  offsetFromSymbolStart = "788">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -8505,8 +8625,8 @@
             filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2084"
-            endingLineNumber = "2084"
+            startingLineNumber = "2083"
+            endingLineNumber = "2083"
             landmarkName = "-km_comboBoxSelectionDidChange:"
             landmarkType = "7">
             <Locations>
@@ -8585,6 +8705,21 @@
                   endingLineNumber = "2085"
                   offsetFromSymbolStart = "528">
                </Location>
+               <Location
+                  uuid = "D71D5CCF-8276-4394-AC67-178F2125B025 - f25ab134c55815bc"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[KMGeneralAnnotationViewController km_comboBoxSelectionDidChange:]"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "2084"
+                  endingLineNumber = "2084"
+                  offsetFromSymbolStart = "528">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -8598,8 +8733,8 @@
             filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2069"
-            endingLineNumber = "2069"
+            startingLineNumber = "2068"
+            endingLineNumber = "2068"
             landmarkName = "-km_comboBoxSelectionDidChange:"
             landmarkType = "7">
             <Locations>
@@ -8678,6 +8813,21 @@
                   endingLineNumber = "2070"
                   offsetFromSymbolStart = "48">
                </Location>
+               <Location
+                  uuid = "7BCD5388-EEE6-4A68-BB10-3BA6F7E8164B - f25ab134c5581b8b"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[KMGeneralAnnotationViewController km_comboBoxSelectionDidChange:]"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "2069"
+                  endingLineNumber = "2069"
+                  offsetFromSymbolStart = "48">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -8691,8 +8841,8 @@
             filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2110"
-            endingLineNumber = "2110"
+            startingLineNumber = "2109"
+            endingLineNumber = "2109"
             landmarkName = "-km_comboBoxSelectionDidChange:"
             landmarkType = "7">
             <Locations>
@@ -8771,6 +8921,21 @@
                   endingLineNumber = "2110"
                   offsetFromSymbolStart = "1448">
                </Location>
+               <Location
+                  uuid = "7BBAC299-3E54-49A1-8522-052FDCE61EF2 - f25ab134c5581173"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[KMGeneralAnnotationViewController km_comboBoxSelectionDidChange:]"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "2109"
+                  endingLineNumber = "2109"
+                  offsetFromSymbolStart = "1448">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -8784,9 +8949,9 @@
             filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2232"
-            endingLineNumber = "2232"
-            landmarkName = "-resetTextPresuppositionData"
+            startingLineNumber = "2231"
+            endingLineNumber = "2231"
+            landmarkName = "-updateTextPresupposition:size:needChangeListView:"
             landmarkType = "7">
             <Locations>
                <Location
@@ -8864,6 +9029,21 @@
                   endingLineNumber = "2232"
                   offsetFromSymbolStart = "380">
                </Location>
+               <Location
+                  uuid = "D365958A-3F39-439A-8BDE-F8AAB0F2B2C3 - 6d1165eedc462aa9"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[KMGeneralAnnotationViewController(Font) updateTextPresupposition:size:needChangeListView:]"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "2231"
+                  endingLineNumber = "2231"
+                  offsetFromSymbolStart = "380">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -8877,8 +9057,8 @@
             filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2225"
-            endingLineNumber = "2225"
+            startingLineNumber = "2224"
+            endingLineNumber = "2224"
             landmarkName = "-updateTextPresupposition:size:needChangeListView:"
             landmarkType = "7">
             <Locations>
@@ -8957,6 +9137,21 @@
                   endingLineNumber = "2225"
                   offsetFromSymbolStart = "232">
                </Location>
+               <Location
+                  uuid = "7F32AF1E-FF10-43BC-BE2D-81F079DFA105 - 6d1165eedc462d80"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[KMGeneralAnnotationViewController(Font) updateTextPresupposition:size:needChangeListView:]"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "2224"
+                  endingLineNumber = "2224"
+                  offsetFromSymbolStart = "232">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -8970,10 +9165,10 @@
             filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2205"
-            endingLineNumber = "2205"
-            landmarkName = "-updateTextPresupposition:needChangeListView:"
-            landmarkType = "7">
+            startingLineNumber = "2204"
+            endingLineNumber = "2204"
+            landmarkName = "KMGeneralAnnotationViewController(Font)"
+            landmarkType = "3">
             <Locations>
                <Location
                   uuid = "6587786D-9FE4-4185-8EBF-43F8E1553692 - a54da4d559a2405"
@@ -9050,6 +9245,21 @@
                   endingLineNumber = "2207"
                   offsetFromSymbolStart = "80">
                </Location>
+               <Location
+                  uuid = "6587786D-9FE4-4185-8EBF-43F8E1553692 - 1feafb81414e92f8"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[KMGeneralAnnotationViewController(Font) updateTextPresupposition:needChangeListView:]"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "2206"
+                  endingLineNumber = "2206"
+                  offsetFromSymbolStart = "80">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -9063,8 +9273,8 @@
             filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2196"
-            endingLineNumber = "2196"
+            startingLineNumber = "2195"
+            endingLineNumber = "2195"
             landmarkName = "-updateTextTextPresuppositionState:size:"
             landmarkType = "7">
             <Locations>
@@ -9173,6 +9383,21 @@
                   endingLineNumber = "2196"
                   offsetFromSymbolStart = "448">
                </Location>
+               <Location
+                  uuid = "DF7AD405-5534-4718-B54C-30482373DF26 - de67518e8685b23a"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[KMGeneralAnnotationViewController(Font) updateTextTextPresuppositionState:size:]"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "2195"
+                  endingLineNumber = "2195"
+                  offsetFromSymbolStart = "448">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -9264,8 +9489,8 @@
             filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1016"
-            endingLineNumber = "1016"
+            startingLineNumber = "1015"
+            endingLineNumber = "1015"
             landmarkName = "-updateAnnotation"
             landmarkType = "7">
             <Locations>
@@ -9314,6 +9539,21 @@
                   endingLineNumber = "1016"
                   offsetFromSymbolStart = "292">
                </Location>
+               <Location
+                  uuid = "5396941D-1509-4F62-B9B0-C1548BBC77A9 - 6171a2580e766976"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[KMGeneralAnnotationViewController updateAnnotation]"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "1015"
+                  endingLineNumber = "1015"
+                  offsetFromSymbolStart = "292">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -9327,10 +9567,10 @@
             filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1970"
-            endingLineNumber = "1970"
-            landmarkName = "-textAnnotationStyleAction:"
-            landmarkType = "7">
+            startingLineNumber = "1969"
+            endingLineNumber = "1969"
+            landmarkName = "KMGeneralAnnotationViewController"
+            landmarkType = "3">
             <Locations>
                <Location
                   uuid = "E125D63F-7F74-4267-ACFC-5DCE91770F6E - 4048455193cadab8"
@@ -9405,8 +9645,8 @@
             filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2320"
-            endingLineNumber = "2320"
+            startingLineNumber = "2319"
+            endingLineNumber = "2319"
             landmarkName = "-updateFontSize:needChangeListView:needSave:"
             landmarkType = "7">
             <Locations>
@@ -9485,6 +9725,21 @@
                   endingLineNumber = "2320"
                   offsetFromSymbolStart = "460">
                </Location>
+               <Location
+                  uuid = "2DE73B57-6EFC-4BE0-8A79-01EEB1AC4A4B - cd6c7d87e1f31f4c"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[KMGeneralAnnotationViewController(Font) updateFontSize:needChangeListView:needSave:]"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "2319"
+                  endingLineNumber = "2319"
+                  offsetFromSymbolStart = "460">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -9498,8 +9753,8 @@
             filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2264"
-            endingLineNumber = "2264"
+            startingLineNumber = "2263"
+            endingLineNumber = "2263"
             landmarkName = "-updateFontNameAndStyle:style:needChangeListView:needSave:"
             landmarkType = "7">
             <Locations>
@@ -9578,6 +9833,21 @@
                   endingLineNumber = "2264"
                   offsetFromSymbolStart = "104">
                </Location>
+               <Location
+                  uuid = "5B07943B-F0C6-4533-ADEB-37FBEEABB7E5 - 877f493b5d452351"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[KMGeneralAnnotationViewController(Font) updateFontNameAndStyle:style:needChangeListView:needSave:]"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "2263"
+                  endingLineNumber = "2263"
+                  offsetFromSymbolStart = "104">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -9996,8 +10266,8 @@
             filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "534"
-            endingLineNumber = "534"
+            startingLineNumber = "533"
+            endingLineNumber = "533"
             landmarkName = "-configureUIView"
             landmarkType = "7">
             <Locations>
@@ -10046,6 +10316,21 @@
                   endingLineNumber = "534"
                   offsetFromSymbolStart = "352">
                </Location>
+               <Location
+                  uuid = "202F95A6-A734-48FC-92C4-37AE27746E20 - 5845c500b5b9faf8"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[KMGeneralAnnotationViewController configureUIView]"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "533"
+                  endingLineNumber = "533"
+                  offsetFromSymbolStart = "352">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -12756,8 +13041,8 @@
             filePath = "PDF Master/Class/Merge/OCPart/KMPDFEditAppendWindow.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1090"
-            endingLineNumber = "1090"
+            startingLineNumber = "1089"
+            endingLineNumber = "1089"
             landmarkName = "-tableView:acceptDrop:row:dropOperation:"
             landmarkType = "7">
          </BreakpointContent>
@@ -13163,10 +13448,10 @@
             filePath = "PDF Master/Class/Merge/OCPart/KMPDFEditAppendWindow.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1157"
-            endingLineNumber = "1157"
-            landmarkName = "-_clearData"
-            landmarkType = "7">
+            startingLineNumber = "1156"
+            endingLineNumber = "1156"
+            landmarkName = "KMPDFEditAppendWindow"
+            landmarkType = "3">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -13227,8 +13512,8 @@
             filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureWindowController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "317"
-            endingLineNumber = "317"
+            startingLineNumber = "316"
+            endingLineNumber = "316"
             landmarkName = "-windowDidLoad"
             landmarkType = "7">
             <Locations>
@@ -13262,6 +13547,36 @@
                   endingLineNumber = "318"
                   offsetFromSymbolStart = "36">
                </Location>
+               <Location
+                  uuid = "7684B4DC-F5F8-4C71-AF7B-FA5331EDC8CC - baf3c7d6970038b8"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[KMSignatureWindowController windowDidLoad]"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureWindowController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "316"
+                  endingLineNumber = "316"
+                  offsetFromSymbolStart = "3364">
+               </Location>
+               <Location
+                  uuid = "7684B4DC-F5F8-4C71-AF7B-FA5331EDC8CC - f93ca081df8e3815"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "__44-[KMSignatureWindowController windowDidLoad]_block_invoke"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureWindowController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "317"
+                  endingLineNumber = "317"
+                  offsetFromSymbolStart = "36">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -13275,11 +13590,43 @@
             filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureWindowController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "326"
-            endingLineNumber = "326"
+            startingLineNumber = "325"
+            endingLineNumber = "325"
             landmarkName = "-windowDidLoad"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "847CA71D-74DD-46B3-B1AF-2D78D74193BB"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "443"
+            endingLineNumber = "443"
+            landmarkName = "-loadingUIAndLocalization"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "2DE16599-5EEE-4BB7-AF37-951AD3B90B25"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/View/KMPopUpButton.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "20"
+            endingLineNumber = "20"
+            landmarkName = "type"
+            landmarkType = "24">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

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

@@ -12,7 +12,6 @@
 #import <Quartz/Quartz.h>
 #import "KMSavePanelAccessoryController.h"
 #import <Masonry/Masonry.h>
-#import "KMImageAccessoryController.h"
 #import <PDF_Master-Swift.h>
 #import "CTBrowserWindowController.h"
 #import "KMPDFMergeFileNameTabelViewCell.h"

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

@@ -84,7 +84,7 @@ import Foundation
     }
     
     func borderStyle() -> CPDFBorderStyle {
-        return self.border.style
+        return self.border?.style ?? .solid
     }
     
     func setBorderStyle(_ style: CPDFBorderStyle) {

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m

@@ -7,7 +7,6 @@
 
 #import "KMGeneralAnnotationViewController.h"
 #import "KMColorPickerViewController.h"
-#import "KMPopUpButton.h"
 #import "KMAnnotationFontWindowController.h"
 #import "KMSelfSignAnnotation.h"
 #import "KMSelfSignAnnotationFreeText.h"
@@ -441,7 +440,7 @@
         self.fillColorPickerVC.isFreeText = NO;
     }
     
-    _datePopupButton.type = KMPopUpButtonType_ArrowUpDown;
+    _datePopupButton.type = KMPopUpButtonTypeArrowUpDown;
     
     self.generalImageView.image = [self.annotationModel annotationImage];
     if (CAnnotationTypeSignFalse != _annotationType &&

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.xib

@@ -681,7 +681,7 @@
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
                                     </textField>
-                                    <popUpButton translatesAutoresizingMaskIntoConstraints="NO" id="ec5-v7-tz1" customClass="KMPopUpButton">
+                                    <popUpButton translatesAutoresizingMaskIntoConstraints="NO" id="ec5-v7-tz1" customClass="KMPopUpButton" customModule="PDF_Master" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="29" width="434" height="24"/>
                                         <popUpButtonCell key="cell" type="square" title="Item 1" bezelStyle="shadowlessSquare" alignment="left" lineBreakMode="truncatingTail" state="on" imageScaling="proportionallyDown" inset="2" arrowPosition="noArrow" selectedItem="2nL-Iw-EJZ" id="0vD-XE-dnt">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -1228,7 +1228,7 @@
                         <constraint firstAttribute="width" constant="64" id="j9h-NL-EdZ"/>
                         <constraint firstAttribute="height" constant="18" id="w0H-nd-2fv"/>
                     </constraints>
-                    <comboBoxCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" focusRingType="none" alignment="left" completes="NO" numberOfVisibleItems="4" id="XER-P5-OEr" customClass="KMComboBoxCell">
+                    <comboBoxCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" focusRingType="none" alignment="left" completes="NO" numberOfVisibleItems="4" id="XER-P5-OEr" customClass="KMComboBoxCell" customModule="PDF_Master" customModuleProvider="target">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -1271,7 +1271,7 @@
                         <constraint firstAttribute="height" constant="18" id="YZg-Pe-hGb"/>
                         <constraint firstAttribute="width" constant="64" id="x1L-W5-ON2"/>
                     </constraints>
-                    <comboBoxCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" focusRingType="none" alignment="left" completes="NO" numberOfVisibleItems="4" id="HGr-p5-anz" customClass="KMComboBoxCell">
+                    <comboBoxCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" focusRingType="none" alignment="left" completes="NO" numberOfVisibleItems="4" id="HGr-p5-anz" customClass="KMComboBoxCell" customModule="PDF_Master" customModuleProvider="target">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/View/KMPopUpButton.h

@@ -1,25 +0,0 @@
-//
-//  KMPopUpButton.h
-//  SignFlow
-//
-//  Created by wanjun on 2021/1/14.
-//
-
-#import <Cocoa/Cocoa.h>
-
-typedef NS_ENUM(NSUInteger, KMPopUpButtonType) {
-    KMPopUpButtonType_Table = 0,
-    KMPopUpButtonType_ArrowDown,
-    KMPopUpButtonType_ArrowUpDown,
-    KMPopUpButtonType_NoArrow
-};
-
-@interface KMPopUpButton : NSPopUpButton
-
-@property (nonatomic, assign) KMPopUpButtonType type;
-
-@end
-
-@interface KMPopUpButtonCell : NSPopUpButtonCell
-
-@end

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/View/KMPopUpButton.m

@@ -1,90 +0,0 @@
-//
-//  KMPopUpButton.m
-//  SignFlow
-//
-//  Created by wanjun on 2021/1/14.
-//
-
-#import "KMPopUpButton.h"
-
-@implementation KMPopUpButton
-
-- (id)initWithFrame:(NSRect)frame
-{
-   self = [super initWithFrame:frame];
-   if (self) {
-       // Initialization code here.
-   }
-   return self;
-}
--(BOOL) isFlipped
-{
-   return YES;
-}
-
-- (void)drawRect:(NSRect)dirtyRect {
-    [super drawRect:dirtyRect];
-    
-    NSImage *image = [NSImage imageNamed:@"KMImageNameUXIconBtnArrowDown"];;
-    if (_type == KMPopUpButtonType_ArrowUpDown) {
-        image = [NSImage imageNamed:@"KMImageNameUXIconBtnArrowUpdown"];
-    }
-    NSRect rect =NSZeroRect;
-    rect.size = image.size;
-    NSPoint p = dirtyRect.origin;
-    p.x +=dirtyRect.size.width - rect.size.width - 1;
-    p.y +=(dirtyRect.size.height-rect.size.height)/2;
-    if(_type == KMPopUpButtonType_NoArrow) {
-        p.x =(dirtyRect.size.width - rect.size.width)/2;
-    }
-    [image drawInRect:NSMakeRect(p.x , p.y, image.size.width, image.size.width) fromRect:rect operation:NSCompositeSourceOver fraction:1.0 respectFlipped:YES hints:nil];
-}
-
-#pragma mark - Private Methods
-
-- (void)setType:(KMPopUpButtonType)type {
-    _type = type;
-    switch (type) {
-        case KMPopUpButtonType_Table:
-        case KMPopUpButtonType_ArrowDown:
-        case KMPopUpButtonType_ArrowUpDown:
-        {
-            self.wantsLayer = YES;
-            self.layer.borderWidth = 1.0;
-            self.layer.cornerRadius = 4.0;
-            self.layer.borderColor = [NSColor colorWithRed:223.0/255.0 green:225.0/255.0 blue:229.0/255.0 alpha:1].CGColor;
-            self.layer.backgroundColor = [NSColor whiteColor].CGColor;
-            self.bezelStyle = NSBezelStyleShadowlessSquare;
-            self.bordered = NO;
-        }
-            break;
-            
-        default:
-            break;
-    }
-}
-
-@end
-
-@implementation KMPopUpButtonCell
-
-- (NSRect)adjustedFrameToVerticallyCenterText:(NSRect)frame
-{
-    NSInteger offset = floor((NSHeight(frame)/2 - ([[self font] ascender] + [[self font] descender])));
-    return NSInsetRect(frame, 0.0, offset);
-}
-- (void)editWithFrame:(NSRect)aRect inView:(NSView *)controlView editor:(NSText *)editor delegate:(id)delegate event:(NSEvent *)event
-{
-    [super editWithFrame:[self adjustedFrameToVerticallyCenterText:aRect] inView:controlView editor:editor delegate:delegate event:event];
-}
-- (void)selectWithFrame:(NSRect)aRect inView:(NSView *)controlView editor:(NSText *)editor delegate:(id)delegate start:(NSInteger)start length:(NSInteger)length
-{
-    [super selectWithFrame:[self adjustedFrameToVerticallyCenterText:aRect] inView:controlView editor:editor delegate:delegate start:start length:length];
-}
-- (void)drawInteriorWithFrame:(NSRect)frame inView:(NSView *)view
-{
-    [super drawInteriorWithFrame:
-    [self adjustedFrameToVerticallyCenterText:frame] inView:view];
-}
-
-@end

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/View/KMPopUpButton.swift

@@ -0,0 +1,76 @@
+//
+//  KMPopUpButton.swift
+//  PDF Master
+//
+//  Created by lizhe on 2023/10/9.
+//
+
+import Cocoa
+
+@objc enum KMPopUpButtonType: Int {
+    case table = 0
+    case arrowDown = 1
+    case arrowUpDown = 2
+    case noArrow = 3
+}
+
+@objcMembers class KMPopUpButton: NSPopUpButton {
+    var type: KMPopUpButtonType = .arrowUpDown {
+        didSet {
+            switch type {
+            case .table, .arrowDown, .arrowUpDown:
+                wantsLayer = true
+                layer?.borderWidth = 1.0
+                layer?.cornerRadius = 4.0
+                layer?.borderColor = NSColor(red: 223.0/255.0, green: 225.0/255.0, blue: 229.0/255.0, alpha: 1).cgColor
+                layer?.backgroundColor = NSColor.white.cgColor
+                bezelStyle = .shadowlessSquare
+            case .noArrow:
+                break
+            }
+        }
+    }
+    
+    override func draw(_ dirtyRect: NSRect) {
+        super.draw(dirtyRect)
+        
+        var imageName = "KMImageNameUXIconBtnArrowDown"
+        if type == .arrowUpDown {
+            imageName = "KMImageNameUXIconBtnArrowUpdown"
+        }
+        
+        if type != .noArrow {
+            if let image = NSImage(named: imageName) {
+                let rect = NSZeroRect
+                var p = dirtyRect.origin
+                p.x += dirtyRect.size.width - image.size.width - 1
+                p.y += (dirtyRect.size.height - image.size.height) / 2
+                
+                if type == .noArrow {
+                    p.x = (dirtyRect.size.width - image.size.width) / 2
+                }
+                
+                image.draw(in: NSRect(origin: NSMakePoint(p.x, p.y), size: image.size), from: rect, operation: .sourceOver, fraction: 1.0, respectFlipped: true, hints: nil)
+            }
+        }
+    }
+}
+
+class KMPopUpButtonCell: NSPopUpButtonCell {
+    override func edit(withFrame cellFrame: NSRect, in controlView: NSView, editor textObj: NSText, delegate: Any?, event: NSEvent?) {
+        super.edit(withFrame: adjustedFrameToVerticallyCenterText(cellFrame), in: controlView, editor: textObj, delegate: delegate, event: event)
+    }
+    
+    override func select(withFrame cellFrame: NSRect, in controlView: NSView, editor textObj: NSText, delegate: Any?, start selStart: Int, length selLength: Int) {
+        super.select(withFrame: adjustedFrameToVerticallyCenterText(cellFrame), in: controlView, editor: textObj, delegate: delegate, start: selStart, length: selLength)
+    }
+    
+    override func drawInterior(withFrame cellFrame: NSRect, in controlView: NSView) {
+        super.drawInterior(withFrame: adjustedFrameToVerticallyCenterText(cellFrame), in: controlView)
+    }
+    
+    private func adjustedFrameToVerticallyCenterText(_ frame: NSRect) -> NSRect {
+        let offset = floor((frame.size.height / 2 - (font!.ascender + font!.descender)))
+        return frame.insetBy(dx: 0.0, dy: offset)
+    }
+}

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/Signature/KMImageAccessoryController.h

@@ -1,15 +0,0 @@
-//
-//  KMImageAccessoryController.h
-//  PDF Reader Pro Edition
-//
-//  Created by 王帅 on 2017/10/13.
-//
-
-#import <Cocoa/Cocoa.h>
-
-@interface KMImageAccessoryController : NSViewController
-
-@property (nonatomic,assign) IBOutlet NSButton *selectedButton;
-
-+ (NSArray *)supportedImageTypes;
-@end

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/Signature/KMImageAccessoryController.m

@@ -1,33 +0,0 @@
-//
-//  KMImageAccessoryController.m
-//  PDF Reader Pro Edition
-//
-//  Created by 王帅 on 2017/10/13.
-//
-
-#import "KMImageAccessoryController.h"
-
-@interface KMImageAccessoryController ()
-
-@end
-
-@implementation KMImageAccessoryController
-#pragma mark Public Methods
-+ (NSArray *)supportedImageTypes{
-    return [NSArray arrayWithObjects:@"jpg",@"cur",@"bmp",@"jpeg",@"gif",@"png",@"tiff",@"tif",/*@"pic",*/@"ico",@"icns",@"tga",@"psd",@"eps",@"hdr",@"jp2",@"jpc",@"pict",@"sgi",@"pdf", nil];
-}
-
-- (instancetype)init {
-    if (self = [super initWithNibName:@"KMImageAccessoryController" bundle:nil]) {
-        
-    }
-    return self;
-}
-
-- (void)awakeFromNib {
-    [super awakeFromNib];
-    // Do view setup here.
-    self.selectedButton.title = NSLocalizedString(@"Remove white background from image", nil);
-}
-
-@end

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/Signature/KMImageAccessoryController.swift

@@ -0,0 +1,30 @@
+//
+//  KMImageAccessoryController.swift
+//  PDF Master
+//
+//  Created by lizhe on 2023/10/9.
+//
+
+import Cocoa
+
+@objcMembers class KMImageAccessoryController: NSViewController {
+    @IBOutlet weak var selectedButton: NSButton!
+
+    static func supportedImageTypes() -> [String] {
+        return ["jpg", "cur", "bmp", "jpeg", "gif", "png", "tiff", "tif", /* "pic", */ "ico", "icns", "tga", "psd", "eps", "hdr", "jp2", "jpc", "pict", "sgi", "pdf"]
+    }
+
+    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()
+        // Do view setup here.
+        selectedButton.title = NSLocalizedString("Remove white background from image", comment: "")
+    }
+}

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/Signature/KMImageAccessoryController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13196" 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="13196"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22154"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -15,11 +15,11 @@
         <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 translatesAutoresizingMaskIntoConstraints="NO" id="qSM-rO-5YK">
-                    <rect key="frame" x="54" y="18" width="255" height="18"/>
+                    <rect key="frame" x="51" y="19" width="258" height="18"/>
                     <buttonCell key="cell" type="check" title="Remove white background from image" bezelStyle="regularSquare" imagePosition="left" inset="2" id="hiE-Tr-91o">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                         <font key="font" metaFont="system"/>

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureWindowController.m

@@ -8,7 +8,6 @@
 
 #import "KMSignatureWindowController.h"
 #import "NSImage+CustomImage.h"
-#import "KMPopUpButton.h"
 #import "CPDFListView.h"
 #import <PDF_Master-Swift.h>
 

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/StampList/KMAnnotationStampViewController.m

@@ -6,7 +6,6 @@
 //
 
 #import "KMAnnotationStampViewController.h"
-#import "KMPopUpButton.h"
 #import "KMStampManager.h"
 #import "KMCustomizeStampViewController.h"
 #import "KMDynamicStampViewController.h"

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

@@ -27,7 +27,6 @@
 
 #import "CPDFListView+Tool.h"
 #import "NSBitmapImageRep_SKExtensions.h"
-#import "KMPopUpButton.h"
 #import <Masonry/Masonry.h>
 #import "TextFieldFormatter.h"
 #import "KMPDFEditAppendWindow.h"
@@ -65,4 +64,3 @@
 #import <Sparkle/Sparkle.h>
 #import "KMTableRowView.h"
 #import "KMPDFEditAppendCustomView.h"
-#import "KMImageAccessoryController.h"

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

@@ -44,4 +44,3 @@
 #import "CPDFListView+Extension.h"
 #import "KMTableRowView.h"
 #import "KMPDFEditAppendCustomView.h"
-#import "KMImageAccessoryController.h"

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

@@ -28,7 +28,6 @@
 
 #import "CPDFListView+Tool.h"
 #import "NSBitmapImageRep_SKExtensions.h"
-#import "KMPopUpButton.h"
 #import <Masonry/Masonry.h>
 #import "TextFieldFormatter.h"
 #import "KMPDFEditAppendWindow.h"
@@ -68,4 +67,3 @@
 #import "KMTableRowView.h"
 #import "NSGraphics+PDFListView.h"
 #import "KMPDFEditAppendCustomView.h"
-#import "KMImageAccessoryController.h"