Browse Source

【OCToSwift】KMSignatureHelpViewController

lizhe 1 year ago
parent
commit
bead4993aa

+ 8 - 10
PDF Office/PDF Master.xcodeproj/project.pbxproj

@@ -1855,6 +1855,9 @@
 		ADD5AE592A64DD2600C14249 /* KMPurchaseAlertView.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADD5AE582A64DD2600C14249 /* KMPurchaseAlertView.xib */; };
 		ADD5AE5A2A64DD2600C14249 /* KMPurchaseAlertView.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADD5AE582A64DD2600C14249 /* KMPurchaseAlertView.xib */; };
 		ADD5AE5B2A64DD2600C14249 /* KMPurchaseAlertView.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADD5AE582A64DD2600C14249 /* KMPurchaseAlertView.xib */; };
+		ADDEEA492AD38BDB00EF675D /* KMSignatureHelpViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADDEEA482AD38BDB00EF675D /* KMSignatureHelpViewController.swift */; };
+		ADDEEA4A2AD38BDB00EF675D /* KMSignatureHelpViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADDEEA482AD38BDB00EF675D /* KMSignatureHelpViewController.swift */; };
+		ADDEEA4B2AD38BDB00EF675D /* KMSignatureHelpViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADDEEA482AD38BDB00EF675D /* KMSignatureHelpViewController.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 */; };
@@ -2251,9 +2254,6 @@
 		BB2C6AC928F4085200478A33 /* CPDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = BB2C6AC828F4085200478A33 /* CPDFListView.m */; };
 		BB2C6ACE28F41B9F00478A33 /* CPDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = BB2C6AC828F4085200478A33 /* CPDFListView.m */; };
 		BB2C6ACF28F41BA000478A33 /* CPDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = BB2C6AC828F4085200478A33 /* CPDFListView.m */; };
-		BB2E665F29C885550000FEBC /* KMSignatureHelpViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BB2E665D29C885550000FEBC /* KMSignatureHelpViewController.m */; };
-		BB2E666029C885550000FEBC /* KMSignatureHelpViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BB2E665D29C885550000FEBC /* KMSignatureHelpViewController.m */; };
-		BB2E666129C885550000FEBC /* KMSignatureHelpViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BB2E665D29C885550000FEBC /* KMSignatureHelpViewController.m */; };
 		BB2E666229C885550000FEBC /* KMSignatureHelpViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB2E665E29C885550000FEBC /* KMSignatureHelpViewController.xib */; };
 		BB2E666329C885550000FEBC /* KMSignatureHelpViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB2E665E29C885550000FEBC /* KMSignatureHelpViewController.xib */; };
 		BB2E666429C885550000FEBC /* KMSignatureHelpViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BB2E665E29C885550000FEBC /* KMSignatureHelpViewController.xib */; };
@@ -4218,6 +4218,7 @@
 		ADD272D329B9CFE20032B5D6 /* KMLightNoNetworkView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMLightNoNetworkView.xib; sourceTree = "<group>"; };
 		ADD5AE542A64D31200C14249 /* KMPurchaseAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMPurchaseAlertView.swift; sourceTree = "<group>"; };
 		ADD5AE582A64DD2600C14249 /* KMPurchaseAlertView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMPurchaseAlertView.xib; sourceTree = "<group>"; };
+		ADDEEA482AD38BDB00EF675D /* KMSignatureHelpViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMSignatureHelpViewController.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>"; };
@@ -4421,8 +4422,6 @@
 		BB2C6A7E28F26CF000478A33 /* PDF_Master DMG-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "PDF_Master DMG-Bridging-Header.h"; sourceTree = "<group>"; };
 		BB2C6AC728F4085200478A33 /* CPDFListView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CPDFListView.h; sourceTree = "<group>"; };
 		BB2C6AC828F4085200478A33 /* CPDFListView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CPDFListView.m; sourceTree = "<group>"; };
-		BB2E665C29C885550000FEBC /* KMSignatureHelpViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KMSignatureHelpViewController.h; sourceTree = "<group>"; };
-		BB2E665D29C885550000FEBC /* KMSignatureHelpViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KMSignatureHelpViewController.m; sourceTree = "<group>"; };
 		BB2E665E29C885550000FEBC /* KMSignatureHelpViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMSignatureHelpViewController.xib; sourceTree = "<group>"; };
 		BB2EDF45296E4618003BCF58 /* KMPageEditTools.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMPageEditTools.swift; sourceTree = "<group>"; };
 		BB2EDF4A296E63E5003BCF58 /* KMPageEditInsertCustomPageWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMPageEditInsertCustomPageWindowController.swift; sourceTree = "<group>"; };
@@ -5063,12 +5062,11 @@
 				89316836296E436B0073EA59 /* KMSignatureWindowController.xib */,
 				8931682B296E436A0073EA59 /* NSImage+CustomImage.h */,
 				89316828296E436A0073EA59 /* NSImage+CustomImage.m */,
-				BB2E665C29C885550000FEBC /* KMSignatureHelpViewController.h */,
-				BB2E665D29C885550000FEBC /* KMSignatureHelpViewController.m */,
 				BB2E665E29C885550000FEBC /* KMSignatureHelpViewController.xib */,
 				8931684F296E45CA0073EA59 /* KMImageAccessoryController.h */,
 				89316850296E45CA0073EA59 /* KMImageAccessoryController.m */,
 				89316851296E45CA0073EA59 /* KMImageAccessoryController.xib */,
+				ADDEEA482AD38BDB00EF675D /* KMSignatureHelpViewController.swift */,
 			);
 			path = Signature;
 			sourceTree = "<group>";
@@ -10539,7 +10537,6 @@
 				9F1FE4C329406E4700E952CA /* CTPageTransition.c in Sources */,
 				9FA607DE28FD4C9F00B46586 /* KMHomePopViewController.swift in Sources */,
 				BBDA8A692A31B50C006A2C4E /* KMCustomStepperView.swift in Sources */,
-				BB2E665F29C885550000FEBC /* KMSignatureHelpViewController.m in Sources */,
 				ADB1FE5D2975182100ED072D /* KMBatchProcessingDeleteTableCell.swift in Sources */,
 				BB162E9B295073B40088E9D1 /* KMWatermarkManager.swift in Sources */,
 				BB4BD9CC2909026500A66A65 /* KMRightSideViewController.swift in Sources */,
@@ -10720,6 +10717,7 @@
 				BB003026298CF7EC002DD1A0 /* KMPreferenceDisplayController.swift in Sources */,
 				F36AD77729642FE80015AD53 /* CPDFListView+UndoManager.m in Sources */,
 				F3A9DC7E294309D80074E5D2 /* CPDFListEditAnnotationViewController.m in Sources */,
+				ADDEEA492AD38BDB00EF675D /* KMSignatureHelpViewController.swift in Sources */,
 				BB146FBA299DC0D100784A6A /* GTLRBase64.m in Sources */,
 				BBF38A5E294F42FF0086D025 /* KMWatermarkAdjectiveStepper.swift in Sources */,
 				BB1EC7FE2967B26700EC0BC3 /* KMPDFEditViewController.swift in Sources */,
@@ -11343,7 +11341,6 @@
 				8942F7C02923670F00389627 /* KMBOTAManagerClass.swift in Sources */,
 				BB897242294C028A0045787C /* KMWatermarkAdjectiveSegementControl.swift in Sources */,
 				9F1FE4B529406E4700E952CA /* CTBrowser.m in Sources */,
-				BB2E666029C885550000FEBC /* KMSignatureHelpViewController.m in Sources */,
 				ADB1FE5E2975182100ED072D /* KMBatchProcessingDeleteTableCell.swift in Sources */,
 				BB6719E62AD28527003D44D5 /* CPDFLineAnnotation+PDFListView.swift in Sources */,
 				9FDD0FAB29534FCC000C4DAD /* KMAliasLight.swift in Sources */,
@@ -11522,6 +11519,7 @@
 				ADC63E492A49BEDD00854E02 /* KMSubscribeWaterMarkCollectionItem.swift in Sources */,
 				BBF38A5F294F42FF0086D025 /* KMWatermarkAdjectiveStepper.swift in Sources */,
 				ADBC17502A2991F700959CEE /* KMPurchaseManager.swift in Sources */,
+				ADDEEA4A2AD38BDB00EF675D /* KMSignatureHelpViewController.swift in Sources */,
 				BB003027298CF7EC002DD1A0 /* KMPreferenceDisplayController.swift in Sources */,
 				F36AD77829642FE80015AD53 /* CPDFListView+UndoManager.m in Sources */,
 				BB89726A294DB41D0045787C /* KMWatermarkAdjectivePositionView.swift in Sources */,
@@ -12565,6 +12563,7 @@
 				F386CEFE29361E2D00C44524 /* CPDFListViewConfig.m in Sources */,
 				BBC348452956A638008D2CD1 /* KMEditBackgroundController.swift in Sources */,
 				9FDD0F79294FEF64000C4DAD /* KMConvertPDFManager.swift in Sources */,
+				ADDEEA4B2AD38BDB00EF675D /* KMSignatureHelpViewController.swift in Sources */,
 				9FDD0F7E2952F2D8000C4DAD /* KMBaseParser.swift in Sources */,
 				9FCFEC7E2AC579F600EAD2CB /* CPDFListSignatureAnnotation.swift in Sources */,
 				89E4E77B2967B370002DBA6F /* KMDynamicStampViewController.m in Sources */,
@@ -12802,7 +12801,6 @@
 				AD4B455829408CB00076FA14 /* KMOCRChooseView.swift in Sources */,
 				ADC07617298A02F0006C752F /* KMBatchSecurityViewModel.swift in Sources */,
 				BBB14A61297929BD00936EDB /* KMRedactPageRangeWindowController.swift in Sources */,
-				BB2E666129C885550000FEBC /* KMSignatureHelpViewController.m in Sources */,
 				BB5DF1F32959C9F00025CDA1 /* KMHeaderFooterPropertyMainController.swift in Sources */,
 				ADC63E4A2A49BEDD00854E02 /* KMSubscribeWaterMarkCollectionItem.swift in Sources */,
 				9F8DDF2829237910006CDC73 /* Array+KMExtensions.swift in Sources */,

+ 0 - 18
PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureHelpViewController.h

@@ -1,18 +0,0 @@
-//
-//  KMSignatureHelpViewController.h
-//  PDF Master
-//
-//  Created by tangchao on 2023/3/20.
-//
-
-#import <Cocoa/Cocoa.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface KMSignatureHelpViewController : NSViewController
-
-@property (nonatomic, copy) NSString *tipString;
-
-@end
-
-NS_ASSUME_NONNULL_END

+ 0 - 38
PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureHelpViewController.m

@@ -1,38 +0,0 @@
-//
-//  KMSignatureHelpViewController.m
-//  PDF Master
-//
-//  Created by tangchao on 2023/3/20.
-//
-
-#import "KMSignatureHelpViewController.h"
-
-@interface KMSignatureHelpViewController ()
-
-@property (weak) IBOutlet NSTextField *label;
-
-@end
-
-@implementation KMSignatureHelpViewController
-
-- (instancetype)init {
-    if ([self initWithNibName:@"KMSignatureHelpViewController" bundle:nil]) {
-        
-    }
-    return self;
-}
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    // Do view setup here.
-    
-    self.view.wantsLayer = YES;
-    self.view.layer.backgroundColor = [NSColor colorWithRed:54/255.f green:56/255.f blue:59/255.f alpha:1.f].CGColor;
-    
-    self.label.font = [NSFont fontWithName:@"SFProText-Regular" size:12];
-    self.label.textColor = [NSColor whiteColor];
-    
-    self.label.stringValue = self.tipString;
-}
-
-@end

+ 37 - 0
PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureHelpViewController.swift

@@ -0,0 +1,37 @@
+//
+//  KMSignatureHelpViewController.swift
+//  PDF Master
+//
+//  Created by lizhe on 2023/10/9.
+//
+
+import Cocoa
+
+class KMSignatureHelpViewController: NSViewController {
+
+    @IBOutlet weak var label: NSTextField!
+    
+    @objc var tipString: String = ""
+    
+    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 viewDidLoad() {
+        super.viewDidLoad()
+        
+        // 设置视图背景颜色
+        self.view.wantsLayer = true
+        self.view.layer?.backgroundColor = NSColor(red: 54/255.0, green: 56/255.0, blue: 59/255.0, alpha: 1.0).cgColor
+        
+        // 设置标签字体和颜色
+        self.label.font = NSFont(name: "SFProText-Regular", size: 12)
+        self.label.textColor = NSColor.white
+        
+        self.label.stringValue = self.tipString
+    }
+}

+ 4 - 3
PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureHelpViewController.xib

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" 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>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22154"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -17,7 +18,7 @@
             <rect key="frame" x="0.0" y="0.0" width="280" height="32"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="ske-oW-ZNH">
+                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="ske-oW-ZNH">
                     <rect key="frame" x="14" y="8" width="252" height="16"/>
                     <textFieldCell key="cell" selectable="YES" alignment="center" title="Multiline Label" id="lBS-WA-vWs">
                         <font key="font" usesAppearanceFont="YES"/>

+ 0 - 1
PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureWindowController.m

@@ -15,7 +15,6 @@
 #import "KMPopUpButton.h"
 #import "CPDFListView.h"
 #import <PDF_Master-Swift.h>
-#import "KMSignatureHelpViewController.h"
 
 static NSMutableArray * recentlyFonts;
 

+ 0 - 1
PDF Office/PDF Master/PDF_Master DMG-Bridging-Header.h

@@ -62,7 +62,6 @@
 //广告
 #import "KMRecommondManager.h"
 #import "CPDFListView+Extension.h"
-#import "KMSignatureHelpViewController.h"
 #import <Sparkle/Sparkle.h>
 #import "KMTableRowView.h"
 #import "KMPDFEditAppendCustomView.h"

+ 0 - 1
PDF Office/PDF Master/PDF_Master Pro-Bridging-Header.h

@@ -42,6 +42,5 @@
 //广告
 #import "KMRecommondManager.h"
 #import "CPDFListView+Extension.h"
-#import "KMSignatureHelpViewController.h"
 #import "KMTableRowView.h"
 #import "KMPDFEditAppendCustomView.h"

+ 0 - 1
PDF Office/PDF Master/PDF_Master-Bridging-Header.h

@@ -62,7 +62,6 @@
 //广告
 #import "KMRecommondManager.h"
 #import "CPDFListView+Extension.h"
-#import "KMSignatureHelpViewController.h"
 
 #import "NSShadow+PDFListView.h"
 #import "NSGeometry+PDFListView.h"