【OCToSwift】CPDFSignatureWidgetAnnotation+PDFListView

PDF Office/PDF Master.xcodeproj/project.pbxproj

@@ -2496,6 +2496,9 @@
 		BB6719F52AD2C949003D44D5 /* CPDFRedactAnnotation+PDFListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB6719F42AD2C949003D44D5 /* CPDFRedactAnnotation+PDFListView.swift */; };
 		BB6719F62AD2C949003D44D5 /* CPDFRedactAnnotation+PDFListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB6719F42AD2C949003D44D5 /* CPDFRedactAnnotation+PDFListView.swift */; };
 		BB6719F72AD2C949003D44D5 /* CPDFRedactAnnotation+PDFListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB6719F42AD2C949003D44D5 /* CPDFRedactAnnotation+PDFListView.swift */; };
+		BB6719F92AD2CC05003D44D5 /* CPDFSignatureWidgetAnnotation+PDFListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB6719F82AD2CC05003D44D5 /* CPDFSignatureWidgetAnnotation+PDFListView.swift */; };
+		BB6719FA2AD2CC05003D44D5 /* CPDFSignatureWidgetAnnotation+PDFListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB6719F82AD2CC05003D44D5 /* CPDFSignatureWidgetAnnotation+PDFListView.swift */; };
+		BB6719FB2AD2CC05003D44D5 /* CPDFSignatureWidgetAnnotation+PDFListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB6719F82AD2CC05003D44D5 /* CPDFSignatureWidgetAnnotation+PDFListView.swift */; };
 		BB69C95C299116FD0001A9B1 /* five_line_score.pdf in Resources */ = {isa = PBXBuildFile; fileRef = BB69C959299116FD0001A9B1 /* five_line_score.pdf */; };
 		BB69C95D299116FD0001A9B1 /* five_line_score.pdf in Resources */ = {isa = PBXBuildFile; fileRef = BB69C959299116FD0001A9B1 /* five_line_score.pdf */; };
 		BB69C95E299116FD0001A9B1 /* five_line_score.pdf in Resources */ = {isa = PBXBuildFile; fileRef = BB69C959299116FD0001A9B1 /* five_line_score.pdf */; };
@@ -3321,9 +3324,6 @@
 		F373230B292DF9410013862C /* CPDFTextWidgetAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322D6292DF9410013862C /* CPDFTextWidgetAnnotation+PDFListView.m */; };
 		F373230C292DF9410013862C /* CPDFTextWidgetAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322D6292DF9410013862C /* CPDFTextWidgetAnnotation+PDFListView.m */; };
 		F373230D292DF9410013862C /* CPDFTextWidgetAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322D6292DF9410013862C /* CPDFTextWidgetAnnotation+PDFListView.m */; };
-		F3732311292DF9410013862C /* CPDFSignatureWidgetAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322D9292DF9410013862C /* CPDFSignatureWidgetAnnotation+PDFListView.m */; };
-		F3732312292DF9410013862C /* CPDFSignatureWidgetAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322D9292DF9410013862C /* CPDFSignatureWidgetAnnotation+PDFListView.m */; };
-		F3732313292DF9410013862C /* CPDFSignatureWidgetAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322D9292DF9410013862C /* CPDFSignatureWidgetAnnotation+PDFListView.m */; };
 		F3732314292DF9410013862C /* CPDFTextAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322DA292DF9410013862C /* CPDFTextAnnotation+PDFListView.m */; };
 		F3732315292DF9410013862C /* CPDFTextAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322DA292DF9410013862C /* CPDFTextAnnotation+PDFListView.m */; };
 		F3732316292DF9410013862C /* CPDFTextAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322DA292DF9410013862C /* CPDFTextAnnotation+PDFListView.m */; };
@@ -4514,6 +4514,7 @@
 		BB6719E42AD28527003D44D5 /* CPDFLineAnnotation+PDFListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CPDFLineAnnotation+PDFListView.swift"; sourceTree = "<group>"; };
 		BB6719E82AD2A57C003D44D5 /* CPDFLinkAnnotation+PDFListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CPDFLinkAnnotation+PDFListView.swift"; sourceTree = "<group>"; };
 		BB6719F42AD2C949003D44D5 /* CPDFRedactAnnotation+PDFListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CPDFRedactAnnotation+PDFListView.swift"; sourceTree = "<group>"; };
+		BB6719F82AD2CC05003D44D5 /* CPDFSignatureWidgetAnnotation+PDFListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CPDFSignatureWidgetAnnotation+PDFListView.swift"; sourceTree = "<group>"; };
 		BB69C959299116FD0001A9B1 /* five_line_score.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = five_line_score.pdf; sourceTree = "<group>"; };
 		BB69C95A299116FD0001A9B1 /* plaid.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = plaid.pdf; sourceTree = "<group>"; };
 		BB69C95B299116FD0001A9B1 /* horizontal_line.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = horizontal_line.pdf; sourceTree = "<group>"; };
@@ -4857,7 +4858,6 @@
 		F37322BD292DF9410013862C /* CPDFMarkupAnnotation+PDFListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CPDFMarkupAnnotation+PDFListView.m"; sourceTree = "<group>"; };
 		F37322BE292DF9410013862C /* CPDFTextAnnotation+PDFListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CPDFTextAnnotation+PDFListView.h"; sourceTree = "<group>"; };
 		F37322BF292DF9410013862C /* CPDFAnnotationHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPDFAnnotationHeader.h; sourceTree = "<group>"; };
-		F37322C0292DF9410013862C /* CPDFSignatureWidgetAnnotation+PDFListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CPDFSignatureWidgetAnnotation+PDFListView.h"; sourceTree = "<group>"; };
 		F37322C3292DF9410013862C /* CPDFTextWidgetAnnotation+PDFListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CPDFTextWidgetAnnotation+PDFListView.h"; sourceTree = "<group>"; };
 		F37322C7292DF9410013862C /* CSelfSignAnnotation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSelfSignAnnotation.h; sourceTree = "<group>"; };
 		F37322C8292DF9410013862C /* CSelfSignAnnotationFreeText.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSelfSignAnnotationFreeText.m; sourceTree = "<group>"; };
@@ -4869,7 +4869,6 @@
 		F37322D3292DF9410013862C /* CPDFStampAnnotation+PDFListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CPDFStampAnnotation+PDFListView.h"; sourceTree = "<group>"; };
 		F37322D4292DF9410013862C /* CPDFSquareAnnotation+PDFListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CPDFSquareAnnotation+PDFListView.m"; sourceTree = "<group>"; };
 		F37322D6292DF9410013862C /* CPDFTextWidgetAnnotation+PDFListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CPDFTextWidgetAnnotation+PDFListView.m"; sourceTree = "<group>"; };
-		F37322D9292DF9410013862C /* CPDFSignatureWidgetAnnotation+PDFListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CPDFSignatureWidgetAnnotation+PDFListView.m"; sourceTree = "<group>"; };
 		F37322DA292DF9410013862C /* CPDFTextAnnotation+PDFListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CPDFTextAnnotation+PDFListView.m"; sourceTree = "<group>"; };
 		F3732321292DFFFE0013862C /* CPDFListView+Extension.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "CPDFListView+Extension.h"; sourceTree = "<group>"; };
 		F3732322292DFFFE0013862C /* CPDFListView+Extension.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "CPDFListView+Extension.m"; sourceTree = "<group>"; };
@@ -9187,8 +9186,7 @@
 				F37322D1292DF9410013862C /* CPDFMarkupAnnotation+PDFListView.h */,
 				F37322BD292DF9410013862C /* CPDFMarkupAnnotation+PDFListView.m */,
 				BB6719F42AD2C949003D44D5 /* CPDFRedactAnnotation+PDFListView.swift */,
-				F37322C0292DF9410013862C /* CPDFSignatureWidgetAnnotation+PDFListView.h */,
-				F37322D9292DF9410013862C /* CPDFSignatureWidgetAnnotation+PDFListView.m */,
+				BB6719F82AD2CC05003D44D5 /* CPDFSignatureWidgetAnnotation+PDFListView.swift */,
 				F37322B9292DF9410013862C /* CPDFSquareAnnotation+PDFListView.h */,
 				F37322D4292DF9410013862C /* CPDFSquareAnnotation+PDFListView.m */,
 				F37322D3292DF9410013862C /* CPDFStampAnnotation+PDFListView.h */,
@@ -10559,7 +10557,6 @@
 				9F0CB5012986560D00007028 /* KMDesignToken+BorderTop.swift in Sources */,
 				89DB5DA9291B8DE70029624F /* KMOutlineEditViewController.swift in Sources */,
 				BB6DD80C29347F77001F0544 /* KMSecureEncryptWindowController.swift in Sources */,
-				F3732311292DF9410013862C /* CPDFSignatureWidgetAnnotation+PDFListView.m in Sources */,
 				BBB14A572978E75D00936EDB /* KMRedactMutilPageFlagWindowController.swift in Sources */,
 				899E0B092919244500B13D34 /* KMCustomTableRowView.swift in Sources */,
 				BBB9B30D299A5D6D004F3235 /* KMCloudUploadOperationQueue.m in Sources */,
@@ -10703,6 +10700,7 @@
 				9F02017E2A1BAC1600C9B673 /* KMAIRewritingVC.swift in Sources */,
 				9FCFECA02AD17B8A00EAD2CB /* SKProgressController.swift in Sources */,
 				89D9897428FE743E003A3E87 /* KMOutlineView.swift in Sources */,
+				BB6719F92AD2CC05003D44D5 /* CPDFSignatureWidgetAnnotation+PDFListView.swift in Sources */,
 				ADC63E482A49BEDD00854E02 /* KMSubscribeWaterMarkCollectionItem.swift in Sources */,
 				89752E1D2942CB03003FF08E /* KMSearchMode.swift in Sources */,
 				AD3A3587294C11ED00D72802 /* KMPrintPreviewPresenter.swift in Sources */,
@@ -11805,7 +11803,6 @@
 				BB4EEF492976504C003A3537 /* KMRedactColorView.swift in Sources */,
 				BBEC00E2295C410A00A26C98 /* KMBatesPrefixInfoView.swift in Sources */,
 				9F1F82E42934D5240092C4B4 /* KMHomeExtractActionViewController.swift in Sources */,
-				F3732312292DF9410013862C /* CPDFSignatureWidgetAnnotation+PDFListView.m in Sources */,
 				ADEC7A7F299397F8009A8256 /* NSFont+SFProText.swift in Sources */,
 				89E4E76F29657953002DBA6F /* KMStampManager.m in Sources */,
 				9F221ED029A85D3700978A59 /* KMDesignBase.swift in Sources */,
@@ -11976,6 +11973,7 @@
 				BB0A55152A3052F800B6E84B /* KMCustomTextField.swift in Sources */,
 				BBB9B329299A5D6D004F3235 /* GTMAppAuthFetcherAuthorization+Keychain.m in Sources */,
 				9F1FE4A329406E4700E952CA /* CTToolbarController.m in Sources */,
+				BB6719FA2AD2CC05003D44D5 /* CPDFSignatureWidgetAnnotation+PDFListView.swift in Sources */,
 				BB2EDF71296ECE17003BCF58 /* KMPageEditThumbnailView.swift in Sources */,
 				9FD0FA2A29CD3ED400F2AB0D /* KMRightSideEmptyVC.swift in Sources */,
 				ADC075D029875F49006C752F /* KMBatchConverPDFExcelView.swift in Sources */,
@@ -12403,7 +12401,6 @@
 				9F705F8B291E576D005199AD /* KMTableView.swift in Sources */,
 				ADD1B6A729416FE800C3FFF7 /* KMOCRPresenter.swift in Sources */,
 				BB146FE6299DC0D100784A6A /* GTLRURITemplate.m in Sources */,
-				F3732313292DF9410013862C /* CPDFSignatureWidgetAnnotation+PDFListView.m in Sources */,
 				89E4E7842967BF5A002DBA6F /* KMCustomizeStampViewController.m in Sources */,
 				ADB1FE8029752F2900ED072D /* KMBatchSecurityView.swift in Sources */,
 				BB146FFB299DC0D100784A6A /* OIDExternalUserAgentMac.m in Sources */,
@@ -12418,7 +12415,6 @@
 				BBC3483029559E12008D2CD1 /* KMBackgroundModel.swift in Sources */,
 				BB146FE9299DC0D100784A6A /* GTLRQuery.m in Sources */,
 				BB147016299DC0D100784A6A /* OIDAuthState.m in Sources */,
-				F3732313292DF9410013862C /* CPDFSignatureWidgetAnnotation+PDFListView.m in Sources */,
 				BB897258294C559F0045787C /* KMWatermarkPropertyCreateController.swift in Sources */,
 				89E93EFC299CB4C200F10F66 /* KMOCRBox.m in Sources */,
 				9F0CB5132986565700007028 /* KMDesignToken+BorderRadius.swift in Sources */,
@@ -12436,6 +12432,7 @@
 				BB897277294DC04F0045787C /* KMWatermartAdjectivePageRangeView.swift in Sources */,
 				ADB1FE2A297006DF00ED072D /* KMBatchWindowController.swift in Sources */,
 				BBEC00D3295C33D600A26C98 /* KMCreateBatesController.swift in Sources */,
+				BB6719FB2AD2CC05003D44D5 /* CPDFSignatureWidgetAnnotation+PDFListView.swift in Sources */,
 				9F221ED129A85D3700978A59 /* KMDesignBase.swift in Sources */,
 				ADB5E51B2A3711CB007110A8 /* KMSubscribeWaterMarkView.swift in Sources */,
 				89D9896028FD21E6003A3E87 /* KMAnnotationCollectionView.swift in Sources */,

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFSignatureWidgetAnnotation+PDFListView.h

@@ -1,20 +0,0 @@
-//
-//  CPDFSignatureWidgetAnnotation+PDFListView.h
-//  ComPDFKit
-//
-//  Copyright © 2014-2022 PDF Technologies, Inc. All Rights Reserved.
-//
-//  THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
-//  AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE ComPDFKit LICENSE AGREEMENT.
-//  UNAUTHORIZED REPRODUCTION OR DISTRIBUTION IS SUBJECT TO CIVIL AND CRIMINAL PENALTIES.
-//  This notice may not be removed from this file.
-//
-
-#import <ComPDFKit/ComPDFKit.h>
-
-@interface CPDFSignatureWidgetAnnotation (PDFListView)
-
-- (NSImage *)contentImage;
-
-@end
-

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFSignatureWidgetAnnotation+PDFListView.m

@@ -1,46 +0,0 @@
-//
-//  CPDFSignatureWidgetAnnotation+PDFListView.m
-//  ComPDFKit
-//
-//  Copyright © 2014-2022 PDF Technologies, Inc. All Rights Reserved.
-//
-//  THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
-//  AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE ComPDFKit LICENSE AGREEMENT.
-//  UNAUTHORIZED REPRODUCTION OR DISTRIBUTION IS SUBJECT TO CIVIL AND CRIMINAL PENALTIES.
-//  This notice may not be removed from this file.
-//
-
-#import "CPDFSignatureWidgetAnnotation+PDFListView.h"
-#import "CPDFAnnotationModel.h"
-
-@implementation CPDFSignatureWidgetAnnotation (PDFListView)
-
-- (instancetype)initPDFListViewNoteWithDocument:(CPDFDocument *)document {
-    self = [self initWithDocument:document];
-    if (self) {
-        CPDFAnnotationModel *annotationModel = [[CPDFAnnotationModel alloc] initWithAnnotationType:CAnnotationTypeSignature];
-        [self setBackgroundColor:annotationModel.backgroundColor];
-        [self setBackgroundOpacity:annotationModel.backgroundOpacity];
-        self.border = [[CPDFBorder alloc] initWithStyle:annotationModel.style lineWidth:annotationModel.lineWidth dashPattern:annotationModel.dashPattern];
-        [self setFieldName:[NSString stringWithFormat:@"%@%@",@"Signature_",[CPDFAnnotationModel tagString]]];
-    }
-    return self;
-}
-
-- (BOOL)isMovable { return YES; }
-
-- (BOOL)isResizable { return YES; }
-
-- (NSImage *)contentImage {
-    NSImage * newImage = [[NSImage alloc] initWithSize:self.bounds.size];
-    [newImage lockFocus];
-    
-    CGContextRef imageContext = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
-    CGContextTranslateCTM(imageContext,-self.bounds.origin.x,  -self.bounds.origin.y);
-    [self drawWithBox:CPDFDisplayMediaBox inContext:imageContext];
-    [newImage unlockFocus];
-    
-    return newImage;
-}
-
-@end

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

@@ -0,0 +1,42 @@
+//
+//  CPDFSignatureWidgetAnnotation+PDFListView.swift
+//  PDF Master
+//
+//  Created by tangchao on 2023/10/8.
+//
+
+import Foundation
+
+@objc extension CPDFSignatureWidgetAnnotation {
+    convenience init(PDFListViewNoteWith document: CPDFDocument) {
+        self.init(document: document)
+        if let model = CPDFAnnotationModel(annotationType: .signature) {
+            self.backgroundColor = model.backgroundColor()
+            self.backgroundOpacity = model.backgroundOpacity()
+            self.border = CPDFBorder(style: model.style(), lineWidth: model.lineWidth(), dashPattern: model.dashPattern())
+            self.setFieldName(String(format: "%@%@", "Signature_", CPDFAnnotationModel.tagString()))
+        }
+    }
+    
+    override func isMovable() -> Bool {
+        return true
+    }
+    override func isResizable() -> Bool {
+        return true
+    }
+    
+    /*
+
+    - (NSImage *)contentImage {
+        NSImage * newImage = [[NSImage alloc] initWithSize:self.bounds.size];
+        [newImage lockFocus];
+        
+        CGContextRef imageContext = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
+        CGContextTranslateCTM(imageContext,-self.bounds.origin.x,  -self.bounds.origin.y);
+        [self drawWithBox:CPDFDisplayMediaBox inContext:imageContext];
+        [newImage unlockFocus];
+        
+        return newImage;
+    }
+     */
+}

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/ComPDFUIKit.h

@@ -23,4 +23,3 @@
 #import "CPDFSquareAnnotation+PDFListView.h"
 #import "CPDFWidgetAnnotation+PDFListView.h"
 #import "CPDFTextWidgetAnnotation+PDFListView.h"
-#import "CPDFSignatureWidgetAnnotation+PDFListView.h"