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

PDF Office/PDF Master.xcodeproj/project.pbxproj

@@ -262,9 +262,6 @@
 		89E4E76429656A88002DBA6F /* KMAnnotationStampViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 89E4E75F29656A88002DBA6F /* KMAnnotationStampViewController.xib */; };
 		89E4E76529656A88002DBA6F /* KMAnnotationStampViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 89E4E75F29656A88002DBA6F /* KMAnnotationStampViewController.xib */; };
 		89E4E76629656A88002DBA6F /* KMAnnotationStampViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 89E4E75F29656A88002DBA6F /* KMAnnotationStampViewController.xib */; };
-		89E4E76929656B35002DBA6F /* KMButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 89E4E76829656B35002DBA6F /* KMButton.m */; };
-		89E4E76A29656B35002DBA6F /* KMButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 89E4E76829656B35002DBA6F /* KMButton.m */; };
-		89E4E76B29656B35002DBA6F /* KMButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 89E4E76829656B35002DBA6F /* KMButton.m */; };
 		89E4E76E29657953002DBA6F /* KMStampManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 89E4E76D29657953002DBA6F /* KMStampManager.m */; };
 		89E4E76F29657953002DBA6F /* KMStampManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 89E4E76D29657953002DBA6F /* KMStampManager.m */; };
 		89E4E77029657953002DBA6F /* KMStampManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 89E4E76D29657953002DBA6F /* KMStampManager.m */; };
@@ -1858,6 +1855,12 @@
 		ADDEEA6A2AD3CF3A00EF675D /* KMDrawView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADDEEA692AD3CF3A00EF675D /* KMDrawView.swift */; };
 		ADDEEA6B2AD3CF3A00EF675D /* KMDrawView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADDEEA692AD3CF3A00EF675D /* KMDrawView.swift */; };
 		ADDEEA6C2AD3CF3A00EF675D /* KMDrawView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADDEEA692AD3CF3A00EF675D /* KMDrawView.swift */; };
+		ADDEEA6E2AD3E16100EF675D /* KMSigntureViewItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADDEEA6D2AD3E16100EF675D /* KMSigntureViewItem.swift */; };
+		ADDEEA6F2AD3E16100EF675D /* KMSigntureViewItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADDEEA6D2AD3E16100EF675D /* KMSigntureViewItem.swift */; };
+		ADDEEA702AD3E16100EF675D /* KMSigntureViewItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADDEEA6D2AD3E16100EF675D /* KMSigntureViewItem.swift */; };
+		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 */; };
 		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 */; };
@@ -2595,9 +2598,6 @@
 		BB7F4C8E29A79AD9008998F9 /* KMPDFMergeFileNameTabelViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = BB7F4C8D29A79AD9008998F9 /* KMPDFMergeFileNameTabelViewCell.m */; };
 		BB7F4C8F29A79AD9008998F9 /* KMPDFMergeFileNameTabelViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = BB7F4C8D29A79AD9008998F9 /* KMPDFMergeFileNameTabelViewCell.m */; };
 		BB7F4C9029A79AD9008998F9 /* KMPDFMergeFileNameTabelViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = BB7F4C8D29A79AD9008998F9 /* KMPDFMergeFileNameTabelViewCell.m */; };
-		BB7F7BF729AA469F00A3E4E7 /* KMSigntureViewItem.m in Sources */ = {isa = PBXBuildFile; fileRef = BB7F7BF529AA469F00A3E4E7 /* KMSigntureViewItem.m */; };
-		BB7F7BF829AA469F00A3E4E7 /* KMSigntureViewItem.m in Sources */ = {isa = PBXBuildFile; fileRef = BB7F7BF529AA469F00A3E4E7 /* KMSigntureViewItem.m */; };
-		BB7F7BF929AA469F00A3E4E7 /* KMSigntureViewItem.m in Sources */ = {isa = PBXBuildFile; fileRef = BB7F7BF529AA469F00A3E4E7 /* KMSigntureViewItem.m */; };
 		BB7F7BFA29AA469F00A3E4E7 /* KMSigntureViewItem.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB7F7BF629AA469F00A3E4E7 /* KMSigntureViewItem.xib */; };
 		BB7F7BFB29AA469F00A3E4E7 /* KMSigntureViewItem.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB7F7BF629AA469F00A3E4E7 /* KMSigntureViewItem.xib */; };
 		BB7F7BFC29AA469F00A3E4E7 /* KMSigntureViewItem.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB7F7BF629AA469F00A3E4E7 /* KMSigntureViewItem.xib */; };
@@ -3609,8 +3609,6 @@
 		89E4E75E29656A88002DBA6F /* KMAnnotationStampViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMAnnotationStampViewController.m; sourceTree = "<group>"; };
 		89E4E75F29656A88002DBA6F /* KMAnnotationStampViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KMAnnotationStampViewController.xib; sourceTree = "<group>"; };
 		89E4E76029656A88002DBA6F /* KMAnnotationStampViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMAnnotationStampViewController.h; sourceTree = "<group>"; };
-		89E4E76729656B35002DBA6F /* KMButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMButton.h; sourceTree = "<group>"; };
-		89E4E76829656B35002DBA6F /* KMButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMButton.m; sourceTree = "<group>"; };
 		89E4E76C29657953002DBA6F /* KMStampManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMStampManager.h; sourceTree = "<group>"; };
 		89E4E76D29657953002DBA6F /* KMStampManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMStampManager.m; sourceTree = "<group>"; };
 		89E4E7762967B370002DBA6F /* KMDynamicStampViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KMDynamicStampViewController.h; sourceTree = "<group>"; };
@@ -4205,6 +4203,8 @@
 		ADDEEA612AD3A6E700EF675D /* KMPDFSignatureTextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMPDFSignatureTextView.swift; sourceTree = "<group>"; };
 		ADDEEA652AD3C4BE00EF675D /* KMPDFSignatureImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMPDFSignatureImageView.swift; sourceTree = "<group>"; };
 		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>"; };
 		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>"; };
@@ -4534,8 +4534,6 @@
 		BB7BC4D72AD3D6B700D6BEE6 /* PDFListView+KMExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PDFListView+KMExtensions.swift"; sourceTree = "<group>"; };
 		BB7F4C8C29A79AD9008998F9 /* KMPDFMergeFileNameTabelViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KMPDFMergeFileNameTabelViewCell.h; sourceTree = "<group>"; };
 		BB7F4C8D29A79AD9008998F9 /* KMPDFMergeFileNameTabelViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KMPDFMergeFileNameTabelViewCell.m; sourceTree = "<group>"; };
-		BB7F7BF429AA469F00A3E4E7 /* KMSigntureViewItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KMSigntureViewItem.h; sourceTree = "<group>"; };
-		BB7F7BF529AA469F00A3E4E7 /* KMSigntureViewItem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KMSigntureViewItem.m; sourceTree = "<group>"; };
 		BB7F7BF629AA469F00A3E4E7 /* KMSigntureViewItem.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMSigntureViewItem.xib; sourceTree = "<group>"; };
 		BB7F7BFE29AA586800A3E4E7 /* signAdd.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = signAdd.png; sourceTree = "<group>"; };
 		BB7F7BFF29AA586800A3E4E7 /* signAddBack.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = signAddBack.png; sourceTree = "<group>"; };
@@ -5018,8 +5016,7 @@
 				8931681F296D73CC0073EA59 /* KMSignatureAnnotationViewController.h */,
 				89316820296D73CC0073EA59 /* KMSignatureAnnotationViewController.m */,
 				89316821296D73CC0073EA59 /* KMSignatureAnnotationViewController.xib */,
-				BB7F7BF429AA469F00A3E4E7 /* KMSigntureViewItem.h */,
-				BB7F7BF529AA469F00A3E4E7 /* KMSigntureViewItem.m */,
+				ADDEEA6D2AD3E16100EF675D /* KMSigntureViewItem.swift */,
 				BB7F7BF629AA469F00A3E4E7 /* KMSigntureViewItem.xib */,
 				ADDEEA692AD3CF3A00EF675D /* KMDrawView.swift */,
 				ADDEEA652AD3C4BE00EF675D /* KMPDFSignatureImageView.swift */,
@@ -5341,8 +5338,7 @@
 		89E4E6F82963D341002DBA6F /* View */ = {
 			isa = PBXGroup;
 			children = (
-				89E4E76729656B35002DBA6F /* KMButton.h */,
-				89E4E76829656B35002DBA6F /* KMButton.m */,
+				ADDEEA712AD3EFE200EF675D /* KMButton.swift */,
 				89E4E6FA2963D341002DBA6F /* KMPopUpButton.h */,
 				89E4E6F92963D341002DBA6F /* KMPopUpButton.m */,
 				89E4E7202963FB23002DBA6F /* KMGeneralButton.h */,
@@ -11060,7 +11056,6 @@
 				ADE3C1AB29A4779E00793B13 /* KMPrintAccessoryController.swift in Sources */,
 				ADB1FE6E29752BB700ED072D /* KMBatchConvertPDFView.swift in Sources */,
 				BB8F4557295AA1270037EA22 /* KMHeaderFooterPropertyInfoController.swift in Sources */,
-				BB7F7BF729AA469F00A3E4E7 /* KMSigntureViewItem.m in Sources */,
 				AD88108D29A760D100178CA1 /* KMRegisterPresenter.swift in Sources */,
 				BB146FB4299DC0D100784A6A /* GTLRUtilities.m in Sources */,
 				BBC745F7296178BD0072C2ED /* KMCropTools.swift in Sources */,
@@ -11088,6 +11083,7 @@
 				9F1FE49C29406E4700E952CA /* HoverCloseButton.m in Sources */,
 				AD44D652292C9E7900A94554 /* KMImageToPDFChooseView.swift in Sources */,
 				AD9527D72952ED970039D2BC /* KMPrintPresenter_C.swift in Sources */,
+				ADDEEA6E2AD3E16100EF675D /* KMSigntureViewItem.swift in Sources */,
 				BB6CA4CC298BB0D000A13864 /* KMPreferenceWindowController.swift in Sources */,
 				BB8F456D295AC1220037EA22 /* KMHeaderFooterAdjectiveModel.swift in Sources */,
 				BB31981A2AC567B500107371 /* CPDFSelection+PDFListView.swift in Sources */,
@@ -11158,6 +11154,7 @@
 				BB6B43662A04919200E02B54 /* KMBaseViewController.swift in Sources */,
 				BB146FCF299DC0D100784A6A /* GTMMIMEDocument.m in Sources */,
 				9F1F82EA2935D02E0092C4B4 /* KMComboBox.swift in Sources */,
+				ADDEEA722AD3EFE200EF675D /* KMButton.swift in Sources */,
 				BB49ECE5293EF54800C82CA2 /* KMCustomPDFView.swift in Sources */,
 				9F0CB48F29683DEE00007028 /* KMPropertiesPanelLineSubVC.swift in Sources */,
 				BB6719E92AD2A57C003D44D5 /* CPDFLinkAnnotation+PDFListView.swift in Sources */,
@@ -11198,7 +11195,6 @@
 				AD0FA50229A8E36200EDEB50 /* KMLightMemberAlertView.swift in Sources */,
 				9F0CB53D2986571A00007028 /* KMDesignToken+Typography.swift in Sources */,
 				9F1FE4AB29406E4700E952CA /* CTBrowserWindow.m in Sources */,
-				89E4E76929656B35002DBA6F /* KMButton.m in Sources */,
 				BBFE6E65293097A600142C01 /* KMPageRangePickerWindowController.swift in Sources */,
 				BB2EDF4C296E63E5003BCF58 /* KMPageEditInsertCustomPageWindowController.swift in Sources */,
 				9F0CB521298656AA00007028 /* KMDesignToken+BorderRadiusBottomLeft.swift in Sources */,
@@ -11851,6 +11847,7 @@
 				89D2D2C6294972B900BFF5FE /* KMFormCellView.swift in Sources */,
 				BB146FFD299DC0D100784A6A /* OIDAuthState+Mac.m in Sources */,
 				BB897225294B07960045787C /* KMWatermarkAdjectiveTopBarItemView.swift in Sources */,
+				ADDEEA6F2AD3E16100EF675D /* KMSigntureViewItem.swift in Sources */,
 				BB14703F299DC0D200784A6A /* OIDEndSessionResponse.m in Sources */,
 				BBFE6E802930EBD400142C01 /* KMCompressWindowController.swift in Sources */,
 				BBFE6E66293097A600142C01 /* KMPageRangePickerWindowController.swift in Sources */,
@@ -11865,7 +11862,6 @@
 				BBD7FE082A13241C00F96075 /* KMOutlineEditViewController.swift in Sources */,
 				ADB1FE6F29752BB700ED072D /* KMBatchConvertPDFView.swift in Sources */,
 				BB8F4558295AA1270037EA22 /* KMHeaderFooterPropertyInfoController.swift in Sources */,
-				BB7F7BF829AA469F00A3E4E7 /* KMSigntureViewItem.m in Sources */,
 				AD88108E29A760D100178CA1 /* KMRegisterPresenter.swift in Sources */,
 				BB146FB5299DC0D100784A6A /* GTLRUtilities.m in Sources */,
 				BBC745F8296178BD0072C2ED /* KMCropTools.swift in Sources */,
@@ -11913,6 +11909,7 @@
 				ADE8BC3F29F9458700570F89 /* KMRecommondInfo.m in Sources */,
 				89752DA02936EC50003FF08E /* KMToolbar.m in Sources */,
 				ADDEEA672AD3C4BE00EF675D /* KMPDFSignatureImageView.swift in Sources */,
+				ADDEEA732AD3EFE200EF675D /* KMButton.swift in Sources */,
 				BB146FE5299DC0D100784A6A /* GTLRURITemplate.m in Sources */,
 				9F1FE4F129406E4700E952CA /* BackgroundGradientView.m in Sources */,
 				89E4E6E42963CD82002DBA6F /* KMGeneralAnnotationViewController.m in Sources */,
@@ -12001,7 +11998,6 @@
 				AD0FA50329A8E36200EDEB50 /* KMLightMemberAlertView.swift in Sources */,
 				9F0CB53E2986571A00007028 /* KMDesignToken+Typography.swift in Sources */,
 				ADCB98E22924776F00B51A03 /* KMBatchProcessingSizeTableCell.swift in Sources */,
-				89E4E76A29656B35002DBA6F /* KMButton.m in Sources */,
 				9FCFEC712AC40F9B00EAD2CB /* CStampSignatureObject.swift in Sources */,
 				BBD7FE032A13218E00F96075 /* KMWatermarkAdjectivePropertyBaseController.swift in Sources */,
 				BB2EDF4D296E63E5003BCF58 /* KMPageEditInsertCustomPageWindowController.swift in Sources */,
@@ -12208,7 +12204,6 @@
 				BB49ED1F293F4FB200C82CA2 /* KMConvertPPTsSettingView.swift in Sources */,
 				BB9807FF29CA93D400BEEB81 /* WelcomeWindowController.m in Sources */,
 				BB14703D299DC0D200784A6A /* OIDErrorUtilities.m in Sources */,
-				BB7F7BF929AA469F00A3E4E7 /* KMSigntureViewItem.m in Sources */,
 				BBFE6E772930E53000142C01 /* KMMergePopoverViewController.swift in Sources */,
 				ADF6B8782A48155E0090CB78 /* KMComparativeViewCollectionItem.swift in Sources */,
 				BB32BF252A5EA05900D11348 /* KMAnalytics.swift in Sources */,
@@ -12424,6 +12419,7 @@
 				AD02573C2A8601AA00EAD5D5 /* KMLoginManager.swift in Sources */,
 				BBFE6E89293210AB00142C01 /* KMCompressCellView.swift in Sources */,
 				8931683C296E436B0073EA59 /* KMSignatureWindowController.m in Sources */,
+				ADDEEA702AD3E16100EF675D /* KMSigntureViewItem.swift in Sources */,
 				BB147040299DC0D200784A6A /* OIDEndSessionResponse.m in Sources */,
 				ADDEEA6C2AD3CF3A00EF675D /* KMDrawView.swift in Sources */,
 				ADE614B729861CCC00F62ED7 /* KMBatchSelectedFilesView.swift in Sources */,
@@ -12597,7 +12593,6 @@
 				BB146FE3299DC0D100784A6A /* GTLRDriveQuery.m in Sources */,
 				ADB1FE3D29700D3400ED072D /* KMBatchCollectionViewItem.swift in Sources */,
 				9F72D20A2994BDAF00DCACF1 /* KMNotificationVC.swift in Sources */,
-				89E4E76B29656B35002DBA6F /* KMButton.m in Sources */,
 				BB8F456F295AC1220037EA22 /* KMHeaderFooterAdjectiveModel.swift in Sources */,
 				BBB7B48F2A0384E100B58A5A /* NSCollectionViewItem+KMExtension.swift in Sources */,
 				BB146FFE299DC0D100784A6A /* OIDAuthState+Mac.m in Sources */,
@@ -12788,6 +12783,7 @@
 				BB98080729CA945F00BEEB81 /* WaitingView.m in Sources */,
 				9FBC48C1299E23B100CA39D7 /* NSViewController+DesignToken.swift in Sources */,
 				89752DF429389F82003FF08E /* KMToolbarItem.m in Sources */,
+				ADDEEA742AD3EFE200EF675D /* KMButton.swift in Sources */,
 				ADBC374329CAB1C300D93208 /* KMComparativeOutlineCell.swift in Sources */,
 				ADBC372B29CA950500D93208 /* KMComparativeOutlineView.swift in Sources */,
 				9F81ADC429B87C7F002251F4 /* KMConvertPDFManagerOC.m in Sources */,

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

@@ -1,15 +0,0 @@
-//
-//  KMButton.h
-//  SignFlow
-//
-//  Created by wangshuai on 16/3/23.
-//
-//
-
-#import <Cocoa/Cocoa.h>
-
-@interface KMButton : NSButton
-
-@property (nonatomic,copy) void (^mouseMoveCallback) (BOOL mouseEntered);
-
-@end

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

@@ -1,45 +0,0 @@
-//
-//  KMButton.m
-//  SignFlow
-//
-//  Created by wangshuai on 16/3/23.
-//
-//
-
-#import "KMButton.h"
-
-@implementation KMButton
-
-
-- (void)viewDidMoveToWindow {
-    [super viewDidMoveToWindow];
-    if ([self window] != nil) {
-        [self addTrackingRect:[self bounds]
-                        owner:self
-                     userData:NULL
-                 assumeInside:NO];
-    }
-}
-
-- (void)setFrameSize:(NSSize)newSize {
-    [super setFrameSize:newSize];
-    [self addTrackingRect:NSMakeRect(0, 0, newSize.width, newSize.height)
-                    owner:self
-                 userData:NULL
-             assumeInside:NO];
-}
-
-- (void)mouseEntered:(NSEvent *)theEvent {
-    if (self.mouseMoveCallback) {
-        self.mouseMoveCallback(YES);
-    }
-}
-
-- (void)mouseExited:(NSEvent *)theEvent {
-    if (self.mouseMoveCallback) {
-        self.mouseMoveCallback(NO);
-    }
-}
-
-
-@end

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

@@ -0,0 +1,36 @@
+//
+//  KMButton.swift
+//  PDF Master
+//
+//  Created by lizhe on 2023/10/9.
+//
+
+import Cocoa
+
+@objcMembers class KMButton: NSButton {
+    var mouseMoveCallback: ((Bool) -> Void)?
+
+    override func viewDidMoveToWindow() {
+        super.viewDidMoveToWindow()
+        if window != nil {
+            addTrackingRect(bounds, owner: self, userData: nil, assumeInside: false)
+        }
+    }
+
+    override func setFrameSize(_ newSize: NSSize) {
+        super.setFrameSize(newSize)
+        addTrackingRect(NSMakeRect(0, 0, newSize.width, newSize.height), owner: self, userData: nil, assumeInside: false)
+    }
+
+    override func mouseEntered(with theEvent: NSEvent) {
+        if let callback = mouseMoveCallback {
+            callback(true)
+        }
+    }
+
+    override func mouseExited(with theEvent: NSEvent) {
+        if let callback = mouseMoveCallback {
+            callback(false)
+        }
+    }
+}

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

@@ -7,8 +7,6 @@
 
 #import "KMSignatureAnnotationViewController.h"
 #import "KMSignatureWindowController.h"
-#import "KMButton.h"
-#import "KMSigntureViewItem.h"
 #import <PDF_Master-Swift.h>
 
 @interface KMSignatureAnnotationViewController ()<NSCollectionViewDelegate,

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

@@ -1,35 +0,0 @@
-//
-//  KMSigntureViewItem.h
-//  PDF Master
-//
-//  Created by Niehaoyu on 2023/2/25.
-//
-
-#import <Cocoa/Cocoa.h>
-
-NS_ASSUME_NONNULL_BEGIN
-@protocol KMSigntureViewItemDelegate;
-
-@interface KMSigntureViewItem : NSCollectionViewItem
-
-
-@property (strong) IBOutlet NSImageView *iconImg;
-@property (strong) IBOutlet NSButton *deleteIconBtn;
-
-@property (nonatomic, assign) NSInteger itemIndex;
-@property (nonatomic, weak) id<KMSigntureViewItemDelegate>delegate;
-@property (nonatomic, assign) BOOL isSelect;
-
-@end
-
-@protocol KMSigntureViewItemDelegate <NSObject>
-
-- (void)kmSigntureViewItem:(KMSigntureViewItem *)item didClickMenuWithItem:(NSMenuItem *)menuItem;
-
-- (void)kmSigntureViewItemDidClickDeleteMenuItem:(KMSigntureViewItem *)item;
-
-- (void)kmSigntureViewItemDidClickAllDeleteMenuItem:(KMSigntureViewItem *)item;
-
-@end
-
-NS_ASSUME_NONNULL_END

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

@@ -1,117 +0,0 @@
-//
-//  KMSigntureViewItem.m
-//  PDF Master
-//
-//  Created by Niehaoyu on 2023/2/25.
-//
-
-#import "KMSigntureViewItem.h"
-#import <PDF_Master-Swift.h>
-
-@interface KMSigntureViewItem ()
-
-@property (strong) IBOutlet NSView *contendView;
-
-@property (nonatomic, copy) NSTrackingArea *trackingArea;
-@end
-
-@implementation KMSigntureViewItem
-- (void)dealloc {
-    
-    if (self.trackingArea) {
-        [self.view removeTrackingArea:self.trackingArea];
-    }
-}
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    // Do view setup here.
-    
-    self.contendView.wantsLayer = YES;
-    self.contendView.layer.cornerRadius = 8.0;
-    self.contendView.layer.masksToBounds = YES;
-    self.contendView.layer.borderWidth = 1.;
-    self.contendView.layer.borderColor = [NSColor clearColor].CGColor;
-    
-    self.trackingArea = [[NSTrackingArea alloc] initWithRect:self.view.bounds options:NSTrackingMouseEnteredAndExited | NSTrackingInVisibleRect | NSTrackingActiveAlways |NSTrackingMouseMoved owner:self userInfo:nil];
-    [self.view addTrackingArea:self.trackingArea];
-    
-    self.deleteIconBtn.hidden = YES;
-    
-    [self tableViewMenu];
-}
-
-- (void)tableViewMenu {
-    NSMenu *menu = [[NSMenu alloc] init];
-    NSMenuItem *item = [menu addItemWithTitle:NSLocalizedString(@"Export stamp", nil) action:nil target:self];
-    NSMenu *tSubMenu = [[NSMenu alloc] init];
-    NSMenuItem *tMenuItem = [tSubMenu insertItemWithTitle:NSLocalizedString(@"PNG", @"Menu item title") action:@selector(exportCustomizeStamp:) target:self atIndex:0];
-    tMenuItem.tag = 0;
-//    tMenuItem = [tSubMenu insertItemWithTitle:NSLocalizedString(@"JPG", @"Menu item title") action:@selector(exportCustomizeStamp:) target:self atIndex:1];
-//    tMenuItem.tag = 1;
-    tMenuItem = [tSubMenu insertItemWithTitle:NSLocalizedString(@"PDF", @"Menu item title") action:@selector(exportCustomizeStamp:) target:self atIndex:1];
-    tMenuItem.tag = 2;
-    item.submenu = tSubMenu;
-    [menu addItem:[NSMenuItem separatorItem]];
-    [menu addItemWithTitle:NSLocalizedString(@"Delete stamp", nil) action:@selector(deleteCustomizeStamp) target:self];
-    [menu addItemWithTitle:NSLocalizedString(@"Delete All stamp", nil) action:@selector(deleteAllCustomizeStamp) target:self];
-    self.view.menu = menu;
-}
-
-#pragma mark - set
-- (void)setIsSelect:(BOOL)isSelect {
-    _isSelect = isSelect;
-    
-    if(_isSelect) {
-        self.contendView.layer.borderColor = [NSColor km_initWithHex: @"#CED0D4" alpha: 0.6].CGColor;
-        self.contendView.layer.backgroundColor = [NSColor km_initWithHex: @"#CED0D4" alpha: 1].CGColor;
-    } else {
-        self.contendView.layer.borderColor = [NSColor clearColor].CGColor;
-        self.contendView.layer.backgroundColor = [NSColor clearColor].CGColor;
-    }
-    
-}
-
-#pragma mark - mouse
-- (void)mouseEntered:(NSEvent *)event {
-    [super mouseEntered:event];
-    
-    if (_isSelect) {
-        
-    } else {
-        self.contendView.layer.borderColor = [NSColor km_initWithHex: @"#EDEEF0" alpha: 1].CGColor;
-        self.contendView.layer.backgroundColor = [NSColor km_initWithHex: @"#EDEEF0" alpha: 1].CGColor;
-    }
-}
-
-- (void)mouseExited:(NSEvent *)event {
-    [super mouseExited:event];
-    
-//    self.deleteIconBtn.hidden = YES;
-    if (_isSelect) {
-        
-    } else {
-        self.contendView.layer.borderColor = [NSColor clearColor].CGColor;
-        self.contendView.layer.backgroundColor = [NSColor clearColor].CGColor;
-    }
-}
-
-
-- (void)exportCustomizeStamp:(NSMenuItem *)sender {
-    if (self.delegate && [self.delegate respondsToSelector:@selector(kmSigntureViewItem:didClickMenuWithItem:)]) {
-        [self.delegate kmSigntureViewItem:self didClickMenuWithItem:sender];
-    }
-}
-
-- (void)deleteCustomizeStamp {
-    if (self.delegate && [self.delegate respondsToSelector:@selector(kmSigntureViewItemDidClickDeleteMenuItem:)]) {
-        [self.delegate kmSigntureViewItemDidClickDeleteMenuItem:self];
-    }
-}
-
-- (void)deleteAllCustomizeStamp {
-    if (self.delegate && [self.delegate respondsToSelector:@selector(kmSigntureViewItemDidClickAllDeleteMenuItem:)]) {
-        [self.delegate kmSigntureViewItemDidClickAllDeleteMenuItem:self];
-    }
-}
-@end

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

@@ -0,0 +1,113 @@
+//
+//  KMSigntureViewItem.swift
+//  PDF Master
+//
+//  Created by lizhe on 2023/10/9.
+//
+
+import Cocoa
+
+@objcMembers class KMSigntureViewItem: NSCollectionViewItem {
+    @IBOutlet var contendView: NSView!
+    @IBOutlet var iconImg: NSImageView!
+    @IBOutlet var deleteIconBtn: NSButton!
+
+    weak var delegate: KMSigntureViewItemDelegate?
+    
+    var trackingArea: NSTrackingArea?
+    var itemIndex: Int = 0
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        self.contendView.wantsLayer = true
+        self.contendView.layer?.cornerRadius = 8.0
+        self.contendView.layer?.masksToBounds = true
+        self.contendView.layer?.borderWidth = 1.0
+        self.contendView.layer?.borderColor = NSColor.clear.cgColor
+
+        self.trackingArea = NSTrackingArea(rect: self.view.bounds, options: [.mouseEnteredAndExited, .inVisibleRect, .activeAlways, .mouseMoved], owner: self, userInfo: nil)
+        self.view.addTrackingArea(self.trackingArea!)
+
+        self.deleteIconBtn.isHidden = true
+
+        tableViewMenu()
+    }
+
+    func tableViewMenu() {
+        let menu = NSMenu()
+        let item = menu.addItem(withTitle: NSLocalizedString("Export stamp", comment: ""), action: nil, keyEquivalent: "")
+        let tSubMenu = NSMenu()
+        var tMenuItem = tSubMenu.insertItem(withTitle: NSLocalizedString("PNG", comment: ""), action: #selector(exportCustomizeStamp(_:)), keyEquivalent: "", at: 0)
+        tMenuItem.tag = 0
+        // tMenuItem = tSubMenu.insertItem(withTitle: NSLocalizedString("JPG", comment: ""), action: #selector(exportCustomizeStamp(_:)), keyEquivalent: "", at: 1)
+        // tMenuItem.tag = 1
+        tMenuItem = tSubMenu.insertItem(withTitle: NSLocalizedString("PDF", comment: ""), action: #selector(exportCustomizeStamp(_:)), keyEquivalent: "", at: 1)
+        tMenuItem.tag = 2
+        item.submenu = tSubMenu
+
+        menu.addItem(NSMenuItem.separator())
+        menu.addItem(withTitle: NSLocalizedString("Delete stamp", comment: ""), action: #selector(deleteCustomizeStamp), keyEquivalent: "")
+        menu.addItem(withTitle: NSLocalizedString("Delete All stamp", comment: ""), action: #selector(deleteAllCustomizeStamp), keyEquivalent: "")
+
+        self.view.menu = menu
+    }
+
+    var isSelect: Bool = false {
+        didSet {
+            if isSelect {
+                self.contendView.layer?.borderColor = NSColor(red: 206/255, green: 208/255, blue: 212/255, alpha: 0.6).cgColor
+                self.contendView.layer?.backgroundColor = NSColor(red: 206/255, green: 208/255, blue: 212/255, alpha: 1).cgColor
+            } else {
+                self.contendView.layer?.borderColor = NSColor.clear.cgColor
+                self.contendView.layer?.backgroundColor = NSColor.clear.cgColor
+            }
+        }
+    }
+
+    override func mouseEntered(with event: NSEvent) {
+        super.mouseEntered(with: event)
+
+        if isSelect {
+
+        } else {
+            self.contendView.layer?.borderColor = NSColor(red: 237/255, green: 238/255, blue: 240/255, alpha: 1).cgColor
+            self.contendView.layer?.backgroundColor = NSColor(red: 237/255, green: 238/255, blue: 240/255, alpha: 1).cgColor
+        }
+    }
+
+    override func mouseExited(with event: NSEvent) {
+        super.mouseExited(with: event)
+
+        if isSelect {
+
+        } else {
+            self.contendView.layer?.borderColor = NSColor.clear.cgColor
+            self.contendView.layer?.backgroundColor = NSColor.clear.cgColor
+        }
+    }
+
+    @objc func exportCustomizeStamp(_ sender: NSMenuItem) {
+        if let delegate = self.delegate {
+            delegate.kmSigntureViewItem(self, didClickMenuWithItem: sender)
+        }
+    }
+
+    @objc func deleteCustomizeStamp() {
+        if let delegate = self.delegate {
+            delegate.kmSigntureViewItemDidClickDeleteMenuItem(self)
+        }
+    }
+
+    @objc func deleteAllCustomizeStamp() {
+        if let delegate = self.delegate {
+            delegate.kmSigntureViewItemDidClickAllDeleteMenuItem(self)
+        }
+    }
+}
+
+@objc protocol KMSigntureViewItemDelegate: NSObjectProtocol {
+    func kmSigntureViewItem(_ item: KMSigntureViewItem, didClickMenuWithItem menuItem: NSMenuItem)
+    func kmSigntureViewItemDidClickDeleteMenuItem(_ item: KMSigntureViewItem)
+    func kmSigntureViewItemDidClickAllDeleteMenuItem(_ item: KMSigntureViewItem)
+}

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

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