【OCToSwift】CPDFTextWidgetAnnotation+PDFListView

PDF Office/PDF Master.xcodeproj/project.pbxproj

@@ -2490,6 +2490,9 @@
 		BB6013802AD38E0100A76FB2 /* CPDFTextAnnotation+PDFListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB60137F2AD38E0100A76FB2 /* CPDFTextAnnotation+PDFListView.swift */; };
 		BB6013812AD38E0100A76FB2 /* CPDFTextAnnotation+PDFListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB60137F2AD38E0100A76FB2 /* CPDFTextAnnotation+PDFListView.swift */; };
 		BB6013822AD38E0100A76FB2 /* CPDFTextAnnotation+PDFListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB60137F2AD38E0100A76FB2 /* CPDFTextAnnotation+PDFListView.swift */; };
+		BB6013842AD3A0DE00A76FB2 /* CPDFTextWidgetAnnotation+PDFListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB6013832AD3A0DE00A76FB2 /* CPDFTextWidgetAnnotation+PDFListView.swift */; };
+		BB6013852AD3A0E200A76FB2 /* CPDFTextWidgetAnnotation+PDFListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB6013832AD3A0DE00A76FB2 /* CPDFTextWidgetAnnotation+PDFListView.swift */; };
+		BB6013862AD3A0E300A76FB2 /* CPDFTextWidgetAnnotation+PDFListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB6013832AD3A0DE00A76FB2 /* CPDFTextWidgetAnnotation+PDFListView.swift */; };
 		BB6719E52AD28527003D44D5 /* CPDFLineAnnotation+PDFListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB6719E42AD28527003D44D5 /* CPDFLineAnnotation+PDFListView.swift */; };
 		BB6719E62AD28527003D44D5 /* CPDFLineAnnotation+PDFListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB6719E42AD28527003D44D5 /* CPDFLineAnnotation+PDFListView.swift */; };
 		BB6719E72AD28527003D44D5 /* CPDFLineAnnotation+PDFListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB6719E42AD28527003D44D5 /* CPDFLineAnnotation+PDFListView.swift */; };
@@ -3324,9 +3327,6 @@
 		F37322FC292DF9410013862C /* CPDFWidgetAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322CF292DF9410013862C /* CPDFWidgetAnnotation+PDFListView.m */; };
 		F37322FD292DF9410013862C /* CPDFWidgetAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322CF292DF9410013862C /* CPDFWidgetAnnotation+PDFListView.m */; };
 		F37322FE292DF9410013862C /* CPDFWidgetAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322CF292DF9410013862C /* CPDFWidgetAnnotation+PDFListView.m */; };
-		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 */; };
 		F3732323292DFFFE0013862C /* CPDFListView+Extension.m in Sources */ = {isa = PBXBuildFile; fileRef = F3732322292DFFFE0013862C /* CPDFListView+Extension.m */; };
 		F3732324292DFFFE0013862C /* CPDFListView+Extension.m in Sources */ = {isa = PBXBuildFile; fileRef = F3732322292DFFFE0013862C /* CPDFListView+Extension.m */; };
 		F3732325292DFFFE0013862C /* CPDFListView+Extension.m in Sources */ = {isa = PBXBuildFile; fileRef = F3732322292DFFFE0013862C /* CPDFListView+Extension.m */; };
@@ -4510,6 +4510,7 @@
 		BB5F8A1729BB15AD00365ADB /* KMEmailSubWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KMEmailSubWindowController.xib; sourceTree = "<group>"; };
 		BB5F8A1829BB15AD00365ADB /* KMEmailSubWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMEmailSubWindowController.m; sourceTree = "<group>"; };
 		BB60137F2AD38E0100A76FB2 /* CPDFTextAnnotation+PDFListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CPDFTextAnnotation+PDFListView.swift"; sourceTree = "<group>"; };
+		BB6013832AD3A0DE00A76FB2 /* CPDFTextWidgetAnnotation+PDFListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CPDFTextWidgetAnnotation+PDFListView.swift"; sourceTree = "<group>"; };
 		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>"; };
@@ -4856,7 +4857,6 @@
 		F37322B8292DF9410013862C /* CPDFAnnotationModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CPDFAnnotationModel.m; sourceTree = "<group>"; };
 		F37322BD292DF9410013862C /* CPDFMarkupAnnotation+PDFListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CPDFMarkupAnnotation+PDFListView.m"; sourceTree = "<group>"; };
 		F37322BF292DF9410013862C /* CPDFAnnotationHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPDFAnnotationHeader.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>"; };
 		F37322C9292DF9410013862C /* CSelfSignAnnotation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSelfSignAnnotation.m; sourceTree = "<group>"; };
@@ -4864,7 +4864,6 @@
 		F37322CC292DF9410013862C /* CPDFAnnotationModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPDFAnnotationModel.h; sourceTree = "<group>"; };
 		F37322CF292DF9410013862C /* CPDFWidgetAnnotation+PDFListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CPDFWidgetAnnotation+PDFListView.m"; sourceTree = "<group>"; };
 		F37322D1292DF9410013862C /* CPDFMarkupAnnotation+PDFListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CPDFMarkupAnnotation+PDFListView.h"; sourceTree = "<group>"; };
-		F37322D6292DF9410013862C /* CPDFTextWidgetAnnotation+PDFListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CPDFTextWidgetAnnotation+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>"; };
 		F386CEFA29361E2D00C44524 /* CPDFListViewConfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CPDFListViewConfig.h; sourceTree = "<group>"; };
@@ -9183,8 +9182,7 @@
 				BB6719FC2AD2CE1B003D44D5 /* CPDFSquareAnnotation+PDFListView.swift */,
 				BB671A002AD2D2A0003D44D5 /* CPDFStampAnnotation+PDFListView.swift */,
 				BB60137F2AD38E0100A76FB2 /* CPDFTextAnnotation+PDFListView.swift */,
-				F37322C3292DF9410013862C /* CPDFTextWidgetAnnotation+PDFListView.h */,
-				F37322D6292DF9410013862C /* CPDFTextWidgetAnnotation+PDFListView.m */,
+				BB6013832AD3A0DE00A76FB2 /* CPDFTextWidgetAnnotation+PDFListView.swift */,
 				F37322B5292DF9410013862C /* CPDFWidgetAnnotation+PDFListView.h */,
 				F37322CF292DF9410013862C /* CPDFWidgetAnnotation+PDFListView.m */,
 				F305A2B229D03D0D00463590 /* CPDFSignatureAnnotation+PDFListView.h */,
@@ -10828,6 +10826,7 @@
 				BB2C6AC928F4085200478A33 /* CPDFListView.m in Sources */,
 				BBFBE6C028DD7B97008B2335 /* ViewController.swift in Sources */,
 				BB4EEF3429764166003A3537 /* KMRedactPropertyWindowController.swift in Sources */,
+				BB6013842AD3A0DE00A76FB2 /* CPDFTextWidgetAnnotation+PDFListView.swift in Sources */,
 				9F8DDF2629237910006CDC73 /* Array+KMExtensions.swift in Sources */,
 				BB8F4560295AA39F0037EA22 /* KMHeaderFooterModel.swift in Sources */,
 				BBB9B325299A5D6D004F3235 /* GTMKeychain_macOS.m in Sources */,
@@ -10866,7 +10865,6 @@
 				9F1FE4ED29406E4700E952CA /* ThrobberView.m in Sources */,
 				9F0CB4F9298655E500007028 /* KMDesignToken+Border.swift in Sources */,
 				ADCB98E92924778C00B51A03 /* KMBatchProcessingStateTableCell.swift in Sources */,
-				F373230B292DF9410013862C /* CPDFTextWidgetAnnotation+PDFListView.m in Sources */,
 				9F0CB45F2966C9E200007028 /* KMFormPropertPanelViewController.swift in Sources */,
 				ADCFFC0229C004AD007D3657 /* KMBookMarkTableRowView.swift in Sources */,
 				ADF6B86C2A480C5F0090CB78 /* KMComparativeView.swift in Sources */,
@@ -11388,7 +11386,6 @@
 				AD867FC629DFFBC400F00440 /* KMAnnotationOutlineRowView.swift in Sources */,
 				BB4EEF2E29763EE7003A3537 /* KMRedactBaseWindowController.swift in Sources */,
 				ADC31FA72A0E0C1A00ED44A2 /* KMEditPropertyAlignmentView.swift in Sources */,
-				F373230C292DF9410013862C /* CPDFTextWidgetAnnotation+PDFListView.m in Sources */,
 				9FAAA333290BD0A20046FFCE /* KMHistoryFileCollectionViewItem.swift in Sources */,
 				BB7648ED29ECEEF400931039 /* KMAppearance.swift in Sources */,
 				8997010728F4082C009AF911 /* KMFromViewController.swift in Sources */,
@@ -11760,6 +11757,7 @@
 				ADD1B6C82942E83000C3FFF7 /* KMPrintBottomView.swift in Sources */,
 				BB14702D299DC0D100784A6A /* OIDEndSessionRequest.m in Sources */,
 				9F0CB4A8296CF19600007028 /* KMPropertiesPanelListMenuSubVC.swift in Sources */,
+				BB6013852AD3A0E200A76FB2 /* CPDFTextWidgetAnnotation+PDFListView.swift in Sources */,
 				BB146FE8299DC0D100784A6A /* GTLRQuery.m in Sources */,
 				ADD1B7032946C8AD00C3FFF7 /* KMBaseTextField.swift in Sources */,
 				8942F818292B678100389627 /* KMAnnotationTableCellView.swift in Sources */,
@@ -12622,7 +12620,6 @@
 				AD68782329A5FADC005B5210 /* KMLightMemberCache.swift in Sources */,
 				BB8F4584295B0F900037EA22 /* KMHeaderFooterMarginInfoView.swift in Sources */,
 				BB49ED17293F489500C82CA2 /* KMConvertImageSettingView.swift in Sources */,
-				F373230D292DF9410013862C /* CPDFTextWidgetAnnotation+PDFListView.m in Sources */,
 				BB1EC80E2967DFE800EC0BC3 /* NSNumber_SKExtensions.m in Sources */,
 				899700EA28F3E4D3009AF911 /* MainWindowController.swift in Sources */,
 				ADCB9973292C65EE00B51A03 /* KMGOCROperation.m in Sources */,
@@ -12713,6 +12710,7 @@
 				BBFE6E5A2930724B00142C01 /* KMMergePageModel.swift in Sources */,
 				9F1FE50429406E4700E952CA /* CTTabStripModelOrderController.m in Sources */,
 				AD61B7AD2A9DC6F600D346C1 /* KMResourceDownloadManager.swift in Sources */,
+				BB6013862AD3A0E300A76FB2 /* CPDFTextWidgetAnnotation+PDFListView.swift in Sources */,
 				BB49ED00293F459500C82CA2 /* KMConvertPPTsWindowController.swift in Sources */,
 				BB0542172965705D00F2665C /* KMCropTipView.swift in Sources */,
 				BB89726F294DB67D0045787C /* KMWatermarkAdjectiveBaseView.swift in Sources */,

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

@@ -1,17 +0,0 @@
-//
-//  CPDFTextWidgetAnnotation+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 CPDFTextWidgetAnnotation (PDFListView)
-
-@end

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

@@ -1,54 +0,0 @@
-//
-//  CPDFTextWidgetAnnotation+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 "CPDFTextWidgetAnnotation+PDFListView.h"
-#import "CPDFAnnotationModel.h"
-#import <PDF_Master-Swift.h>
-
-@implementation CPDFTextWidgetAnnotation (PDFListView)
-
-- (instancetype)initPDFListViewNoteWithDocument:(CPDFDocument *)document {
-    self = [self initWithDocument:document];
-    if (self) {
-        CPDFAnnotationModel *annotationModel = [[CPDFAnnotationModel alloc] initWithAnnotationType:CAnnotationTypeTextField];
-        [self setFont:[NSFont fontWithName:annotationModel.fontName size:annotationModel.fontSize]];
-        [self setBackgroundColor:annotationModel.backgroundColor];
-        [self setFontColor:annotationModel.fontColor];
-        [self setIsMultiline:annotationModel.isMultiline];
-        [self setAlignment:annotationModel.alignment];
-        [self setBackgroundOpacity:annotationModel.backgroundOpacity];
-        self.border = [[CPDFBorder alloc] initWithStyle:annotationModel.style lineWidth:annotationModel.lineWidth dashPattern:annotationModel.dashPattern];
-
-        [self setFieldName:[NSString stringWithFormat:@"%@%@",@"Text Field_",[CPDFAnnotationModel tagString]]];
-    }
-    return self;
-}
-
-- (BOOL)isResizable {
-    return YES;
-}
-
-- (BOOL)isMovable {
-    return YES;
-}
-
-- (NSSet *)keysForValuesToObserveForUndo {
-    static NSSet *circleKeys = nil;
-    if (circleKeys == nil) {
-        NSMutableSet *mutableKeys = [[super keysForValuesToObserveForUndo] mutableCopy];
-        [mutableKeys addObjectsFromArray:@[CPDFAnnotationStringValueKey]];
-        circleKeys = [mutableKeys copy];
-    }
-    return circleKeys;
-}
-
-@end

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

@@ -0,0 +1,42 @@
+//
+//  CPDFTextWidgetAnnotation+PDFListView.swift
+//  PDF Master
+//
+//  Created by tangchao on 2023/10/9.
+//
+
+import Foundation
+
+@objc extension CPDFTextWidgetAnnotation {
+    convenience init(PDFListViewNoteWith document: CPDFDocument) {
+        self.init(document: document)
+        if let model = CPDFAnnotationModel(annotationType: .textField) {
+            self.font = NSFont(name: model.fontName(), size: model.fontSize())
+            self.backgroundColor = model.backgroundColor()
+            self.fontColor = model.fontColor()
+            self.isMultiline = model.isMultiline()
+            self.alignment = model.alignment()
+            self.backgroundOpacity = model.backgroundOpacity()
+            self.border = CPDFBorder(style: model.style(), lineWidth: model.lineWidth(), dashPattern: model.dashPattern())
+            
+            self.setFieldName(String(format: "%@%@", "Text Field_", CPDFAnnotationModel.tagString()))
+        }
+    }
+    
+    override func isResizable() -> Bool {
+        return true
+    }
+    
+    override func isMovable() -> Bool {
+        return true
+    }
+    
+    private static var _textW_keys: Set<AnyHashable>?
+    override func keysForValuesToObserveForUndo() -> Set<AnyHashable>! {
+        if (CPDFTextWidgetAnnotation._textW_keys == nil) {
+            CPDFTextWidgetAnnotation._textW_keys = super.keysForValuesToObserveForUndo()
+            _ = CPDFTextWidgetAnnotation._textW_keys?.insert(CPDFAnnotationStringValueKey)
+        }
+        return CPDFTextWidgetAnnotation._textW_keys
+    }
+}

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFListView.m

@@ -29,7 +29,6 @@
 #import "NSCursor+PDFListView.h"
 
 #import "CPDFMarkupAnnotation+PDFListView.h"
-#import "CPDFTextWidgetAnnotation+PDFListView.h"
 #import "NSPopover+PDFListView.h"
 #import "CPDFListView+Extension.h"
 #import <PDF_Master-Swift.h>

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

@@ -19,4 +19,3 @@
 
 #import "CPDFMarkupAnnotation+PDFListView.h"
 #import "CPDFWidgetAnnotation+PDFListView.h"
-#import "CPDFTextWidgetAnnotation+PDFListView.h"