【OCToSwift】KMGeneralButton

PDF Office/PDF Master.xcodeproj/project.pbxproj

@@ -217,9 +217,6 @@
 		89E4E71D2963F77C002DBA6F /* KMSelfSignAnnotationFreeText.m in Sources */ = {isa = PBXBuildFile; fileRef = 89E4E71C2963F77C002DBA6F /* KMSelfSignAnnotationFreeText.m */; };
 		89E4E71E2963F77C002DBA6F /* KMSelfSignAnnotationFreeText.m in Sources */ = {isa = PBXBuildFile; fileRef = 89E4E71C2963F77C002DBA6F /* KMSelfSignAnnotationFreeText.m */; };
 		89E4E71F2963F77C002DBA6F /* KMSelfSignAnnotationFreeText.m in Sources */ = {isa = PBXBuildFile; fileRef = 89E4E71C2963F77C002DBA6F /* KMSelfSignAnnotationFreeText.m */; };
-		89E4E7222963FB23002DBA6F /* KMGeneralButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 89E4E7212963FB23002DBA6F /* KMGeneralButton.m */; };
-		89E4E7232963FB23002DBA6F /* KMGeneralButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 89E4E7212963FB23002DBA6F /* KMGeneralButton.m */; };
-		89E4E7242963FB23002DBA6F /* KMGeneralButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 89E4E7212963FB23002DBA6F /* KMGeneralButton.m */; };
 		89E4E7282963FB74002DBA6F /* KMPropertiesViewPopController.m in Sources */ = {isa = PBXBuildFile; fileRef = 89E4E7262963FB74002DBA6F /* KMPropertiesViewPopController.m */; };
 		89E4E7292963FB74002DBA6F /* KMPropertiesViewPopController.m in Sources */ = {isa = PBXBuildFile; fileRef = 89E4E7262963FB74002DBA6F /* KMPropertiesViewPopController.m */; };
 		89E4E72A2963FB74002DBA6F /* KMPropertiesViewPopController.m in Sources */ = {isa = PBXBuildFile; fileRef = 89E4E7262963FB74002DBA6F /* KMPropertiesViewPopController.m */; };
@@ -1876,6 +1873,9 @@
 		ADDEEA822AD4DAB200EF675D /* KMSignatureWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADDEEA812AD4DAB200EF675D /* KMSignatureWindowController.swift */; };
 		ADDEEA832AD4DAB200EF675D /* KMSignatureWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADDEEA812AD4DAB200EF675D /* KMSignatureWindowController.swift */; };
 		ADDEEA842AD4DAB200EF675D /* KMSignatureWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADDEEA812AD4DAB200EF675D /* KMSignatureWindowController.swift */; };
+		ADDEEA862AD7805200EF675D /* KMGeneralButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADDEEA852AD7805200EF675D /* KMGeneralButton.swift */; };
+		ADDEEA872AD7805200EF675D /* KMGeneralButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADDEEA852AD7805200EF675D /* KMGeneralButton.swift */; };
+		ADDEEA882AD7805200EF675D /* KMGeneralButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADDEEA852AD7805200EF675D /* KMGeneralButton.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 */; };
@@ -3562,8 +3562,6 @@
 		89E4E7172963F5D3002DBA6F /* KMSelfSignAnnotation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMSelfSignAnnotation.h; sourceTree = "<group>"; };
 		89E4E71B2963F77C002DBA6F /* KMSelfSignAnnotationFreeText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMSelfSignAnnotationFreeText.h; sourceTree = "<group>"; };
 		89E4E71C2963F77C002DBA6F /* KMSelfSignAnnotationFreeText.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMSelfSignAnnotationFreeText.m; sourceTree = "<group>"; };
-		89E4E7202963FB23002DBA6F /* KMGeneralButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMGeneralButton.h; sourceTree = "<group>"; };
-		89E4E7212963FB23002DBA6F /* KMGeneralButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMGeneralButton.m; sourceTree = "<group>"; };
 		89E4E7252963FB74002DBA6F /* KMPropertiesViewPopController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMPropertiesViewPopController.h; sourceTree = "<group>"; };
 		89E4E7262963FB74002DBA6F /* KMPropertiesViewPopController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMPropertiesViewPopController.m; sourceTree = "<group>"; };
 		89E4E72E2963FBA1002DBA6F /* KMPropertiesViewPopController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KMPropertiesViewPopController.xib; sourceTree = "<group>"; };
@@ -4184,6 +4182,7 @@
 		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>"; };
 		ADDEEA812AD4DAB200EF675D /* KMSignatureWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMSignatureWindowController.swift; sourceTree = "<group>"; };
+		ADDEEA852AD7805200EF675D /* KMGeneralButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMGeneralButton.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>"; };
@@ -5277,8 +5276,7 @@
 			children = (
 				ADDEEA712AD3EFE200EF675D /* KMButton.swift */,
 				ADDEEA792AD3F4C800EF675D /* KMPopUpButton.swift */,
-				89E4E7202963FB23002DBA6F /* KMGeneralButton.h */,
-				89E4E7212963FB23002DBA6F /* KMGeneralButton.m */,
+				ADDEEA852AD7805200EF675D /* KMGeneralButton.swift */,
 				89E4E7172963F5D3002DBA6F /* KMSelfSignAnnotation.h */,
 				89E4E7162963F5D3002DBA6F /* KMSelfSignAnnotation.m */,
 				89E4E71B2963F77C002DBA6F /* KMSelfSignAnnotationFreeText.h */,
@@ -10545,6 +10543,7 @@
 				BB3AD6F929935483004FC1AE /* Reachability.m in Sources */,
 				BBEC00BF295C306400A26C98 /* KMBatesPropertyController.swift in Sources */,
 				89E4E6EC2963D1B7002DBA6F /* KMColorPickerViewController.m in Sources */,
+				ADDEEA862AD7805200EF675D /* KMGeneralButton.swift in Sources */,
 				BB49ED19293F4D4E00C82CA2 /* KMConvertCSVSettingView.swift in Sources */,
 				AD9527BA295291F20039D2BC /* KMPrintPage.swift in Sources */,
 				89752E192941FD48003FF08E /* KMSearchCellView.swift in Sources */,
@@ -10608,7 +10607,6 @@
 				BB00301D298CB799002DD1A0 /* KMPreferenceManager.swift in Sources */,
 				89E93EFA299CB4C200F10F66 /* KMOCRBox.m in Sources */,
 				ADBC2D28299DCA76006280C8 /* NSTextField+Layer.swift in Sources */,
-				89E4E7222963FB23002DBA6F /* KMGeneralButton.m in Sources */,
 				ADF6B8762A48155E0090CB78 /* KMComparativeViewCollectionItem.swift in Sources */,
 				BB49ECF1293F40F500C82CA2 /* KMConvertPageRangeSettingItemView.swift in Sources */,
 				BBBF68802A3BF17F0058E14E /* KMFilePromiseProvider.swift in Sources */,
@@ -11405,7 +11403,6 @@
 				ADA9102F2A272CEA003352F0 /* KMImageOptimization.swift in Sources */,
 				AD9527DC2952EE700039D2BC /* KMPrintPage_C.swift in Sources */,
 				ADBC2D29299DCA76006280C8 /* NSTextField+Layer.swift in Sources */,
-				89E4E7232963FB23002DBA6F /* KMGeneralButton.m in Sources */,
 				9F0CB4702967E63100007028 /* KMPropertiesPanelNameSubVC.swift in Sources */,
 				9FD0FA3229CD947000F2AB0D /* KMOpacityPanel.swift in Sources */,
 				BB89722A294B08720045787C /* KMWatermarkAdjectiveTopBarItemModel.swift in Sources */,
@@ -11507,6 +11504,7 @@
 				9F0CB4602966C9E200007028 /* KMFormPropertPanelViewController.swift in Sources */,
 				BB6719F62AD2C949003D44D5 /* CPDFRedactAnnotation+PDFListView.swift in Sources */,
 				ADCFFC0329C004AD007D3657 /* KMBookMarkTableRowView.swift in Sources */,
+				ADDEEA872AD7805200EF675D /* KMGeneralButton.swift in Sources */,
 				9F1FE4EE29406E4700E952CA /* ThrobberView.m in Sources */,
 				BB2F18472A0C7E250003F65E /* KMConvertBaseView.swift in Sources */,
 				9FBA0EE228FEC253001117AF /* KMProductPromotionViewController.swift in Sources */,
@@ -12223,6 +12221,7 @@
 				ADDEEA5C2AD399BB00EF675D /* KMSignature.swift in Sources */,
 				BBBB6CD82AD150D20035AA66 /* CPDFCircleAnnotation+PDFListView.swift in Sources */,
 				BBD7FE092A13241E00F96075 /* KMOutlineEditViewController.swift in Sources */,
+				ADDEEA882AD7805200EF675D /* KMGeneralButton.swift in Sources */,
 				BBD54ED62A1CBD720012A230 /* NSView+KMExtension.swift in Sources */,
 				BBC3485029582920008D2CD1 /* KMBackgroundColorView.swift in Sources */,
 				ADB1FE982975300B00ED072D /* KMBatchHeaderAndFooterView.swift in Sources */,
@@ -12684,7 +12683,6 @@
 				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 */,
 				ADC075DB29876612006C752F /* KMBatchConverPDFPPTView.swift in Sources */,
 				BB146FAD299DC0D000784A6A /* GTLRBatchQuery.m in Sources */,

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

@@ -12,7 +12,6 @@
 #import "KMSelfSignAnnotationFreeText.h"
 #import "CPDFMarkupAnnotation+PDFListView.h"
 
-#import "KMGeneralButton.h"
 #import "KMPropertiesViewPopController.h"
 #import <PDF_Master-Swift.h>
 
@@ -1210,32 +1209,6 @@
     self.centerAlignVC.button.toolTip = NSLocalizedString(@"Center", nil);
     self.rightAlignVC.button.toolTip = NSLocalizedString(@"Right Alignment", nil);
     
-//    NSArray *array = @[blockSelf.leftAlignBox,blockSelf.centerAlignBox,blockSelf.rightAlignBox];
-//    for (KMBox *box in array) {
-//        box.fillColor = [NSColor clearColor];
-//        box.mouseDownCallback = ^(BOOL downEntered, KMBox *mouseBox) {
-//            if (downEntered) {
-//                box.fillColor = [NSColor colorWithRed:206.0/255.0 green:208.0/255.0 blue:212.0/255.0 alpha:0.6];
-//                if (box == blockSelf.leftAlignBox) {
-//                    [blockSelf leftAlignButtonAction:box];
-//                } else if (box == blockSelf.centerAlignBox) {
-//                    [blockSelf centerAlignButtonAction:box];
-//                } else if (box == blockSelf.rightAlignBox) {
-//                    [blockSelf rightAlignButtonAction:box];
-//                }
-//            } else {
-//                box.fillColor = [NSColor clearColor];
-//            }
-//        };
-//        box.mouseMoveCallback = ^(BOOL mouseEntered, KMBox *mouseBox) {
-//            if (mouseEntered) {
-//                box.fillColor = [NSColor colorWithRed:237.0/255.0 green:238.0/255.0 blue:240.0/255.0 alpha:1];
-//            } else {
-//                box.fillColor = [NSColor clearColor];
-//            }
-//        };
-//    }
-    
     self.borderWidthSlider.floatValue = self.annotationModel.lineWidth;
     self.borderWidthVC.stringValue = [NSString stringWithFormat:@"%0.1f pt",self.annotationModel.lineWidth];
     

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

@@ -222,7 +222,7 @@
                                                         <action selector="fontCustomColorButtonAction:" target="-2" id="UGk-7t-CVJ"/>
                                                     </connections>
                                                 </button>
-                                                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2I2-fI-EWd" customClass="KMGeneralButton">
+                                                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2I2-fI-EWd" customClass="KMGeneralButton" customModule="PDF_Master" customModuleProvider="target">
                                                     <rect key="frame" x="8" y="5" width="20" height="20"/>
                                                     <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="DLu-8k-sgt">
                                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>

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

@@ -1,15 +0,0 @@
-//
-//  KMGeneralButton.h
-//  SignFlow
-//
-//  Created by 丁林圭 on 2021/9/1.
-//
-
-#import <Cocoa/Cocoa.h>
-
-@interface KMGeneralButton : NSButton
-
-@property (nonatomic,retain)NSColor *color;
-
-@end
-

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

@@ -1,28 +0,0 @@
-//
-//  KMGeneralButton.m
-//  SignFlow
-//
-//  Created by 丁林圭 on 2021/9/1.
-//
-
-#import "KMGeneralButton.h"
-
-@implementation KMGeneralButton
-
-- (void)drawRect:(NSRect)dirtyRect
-{
-    [super drawRect:dirtyRect];
-    
-    CGRect rect = self.bounds;
-    CGRect coverRect = CGRectMake(dirtyRect.size.width-2.5, 0, 0, dirtyRect.size.height);
-    [_color setFill];
-
-    NSBezierPath *be = [NSBezierPath bezierPathWithRoundedRect:rect xRadius:rect.size.width/2 yRadius:rect.size.height/2];
-    [be fill];
-
-    [_color setFill];
-    NSBezierPath *coverpath = [NSBezierPath bezierPathWithRect:coverRect];
-    [coverpath fill];
-}
-
-@end

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

@@ -0,0 +1,29 @@
+//
+//  KMGeneralButton.swift
+//  PDF Master
+//
+//  Created by lizhe on 2023/10/12.
+//
+
+import Cocoa
+
+@objcMembers class KMGeneralButton: NSButton {
+
+    var color: NSColor = NSColor.red // 请替换为您需要的颜色
+
+    override func draw(_ dirtyRect: NSRect) {
+        super.draw(dirtyRect)
+
+        let rect = self.bounds
+        let coverRect = NSMakeRect(dirtyRect.size.width - 2.5, 0, 0, dirtyRect.size.height)
+
+        color.setFill()
+
+        let be = NSBezierPath(roundedRect: rect, xRadius: rect.size.width / 2, yRadius: rect.size.height / 2)
+        be.fill()
+
+        color.setFill()
+        let coverPath = NSBezierPath(rect: coverRect)
+        coverPath.fill()
+    }
+}