【OCToSwift】CPDFAnnotation+PDFListView

PDF Office/PDF Master.xcodeproj/project.pbxproj

@@ -2935,6 +2935,9 @@
 		BBB9B337299A5F35004F3235 /* ObjectiveDropboxOfficial.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBB9B335299A5F35004F3235 /* ObjectiveDropboxOfficial.framework */; };
 		BBB9B339299A5FD1004F3235 /* ObjectiveDropboxOfficial.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBB9B335299A5F35004F3235 /* ObjectiveDropboxOfficial.framework */; };
 		BBB9B33A299A5FD1004F3235 /* ObjectiveDropboxOfficial.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BBB9B335299A5F35004F3235 /* ObjectiveDropboxOfficial.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		BBBB6CCA2AD109F30035AA66 /* CPDFAnnotation+PDFListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBBB6CC92AD109F30035AA66 /* CPDFAnnotation+PDFListView.swift */; };
+		BBBB6CCB2AD109F30035AA66 /* CPDFAnnotation+PDFListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBBB6CC92AD109F30035AA66 /* CPDFAnnotation+PDFListView.swift */; };
+		BBBB6CCC2AD109F30035AA66 /* CPDFAnnotation+PDFListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBBB6CC92AD109F30035AA66 /* CPDFAnnotation+PDFListView.swift */; };
 		BBBF68802A3BF17F0058E14E /* KMFilePromiseProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBBF687F2A3BF17F0058E14E /* KMFilePromiseProvider.swift */; };
 		BBBF68812A3BF17F0058E14E /* KMFilePromiseProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBBF687F2A3BF17F0058E14E /* KMFilePromiseProvider.swift */; };
 		BBBF68822A3BF17F0058E14E /* KMFilePromiseProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBBF687F2A3BF17F0058E14E /* KMFilePromiseProvider.swift */; };
@@ -3303,9 +3306,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 */; };
-		F37322FF292DF9410013862C /* CPDFAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322D0292DF9410013862C /* CPDFAnnotation+PDFListView.m */; };
-		F3732300292DF9410013862C /* CPDFAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322D0292DF9410013862C /* CPDFAnnotation+PDFListView.m */; };
-		F3732301292DF9410013862C /* CPDFAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322D0292DF9410013862C /* CPDFAnnotation+PDFListView.m */; };
 		F3732302292DF9410013862C /* CPDFLinkAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322D2292DF9410013862C /* CPDFLinkAnnotation+PDFListView.m */; };
 		F3732303292DF9410013862C /* CPDFLinkAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322D2292DF9410013862C /* CPDFLinkAnnotation+PDFListView.m */; };
 		F3732304292DF9410013862C /* CPDFLinkAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322D2292DF9410013862C /* CPDFLinkAnnotation+PDFListView.m */; };
@@ -4701,6 +4701,7 @@
 		BBB9B305299A5D6C004F3235 /* GTMOAuth2KeychainCompatibility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMOAuth2KeychainCompatibility.m; sourceTree = "<group>"; };
 		BBB9B306299A5D6C004F3235 /* GTMAppAuthFetcherAuthorization.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMAppAuthFetcherAuthorization.m; sourceTree = "<group>"; };
 		BBB9B335299A5F35004F3235 /* ObjectiveDropboxOfficial.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ObjectiveDropboxOfficial.framework; sourceTree = "<group>"; };
+		BBBB6CC92AD109F30035AA66 /* CPDFAnnotation+PDFListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CPDFAnnotation+PDFListView.swift"; sourceTree = "<group>"; };
 		BBBF687F2A3BF17F0058E14E /* KMFilePromiseProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMFilePromiseProvider.swift; sourceTree = "<group>"; };
 		BBBF68832A3C3AF10058E14E /* NSDocumentController+KMExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSDocumentController+KMExtension.swift"; sourceTree = "<group>"; };
 		BBC2BCC4295DA8F30036B983 /* KMCropPreviewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMCropPreviewController.swift; sourceTree = "<group>"; };
@@ -4859,7 +4860,6 @@
 		F37322B9292DF9410013862C /* CPDFSquareAnnotation+PDFListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CPDFSquareAnnotation+PDFListView.h"; sourceTree = "<group>"; };
 		F37322BA292DF9410013862C /* CPDFStampAnnotation+PDFListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CPDFStampAnnotation+PDFListView.m"; sourceTree = "<group>"; };
 		F37322BB292DF9410013862C /* CPDFLinkAnnotation+PDFListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CPDFLinkAnnotation+PDFListView.h"; sourceTree = "<group>"; };
-		F37322BC292DF9410013862C /* CPDFAnnotation+PDFListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CPDFAnnotation+PDFListView.h"; sourceTree = "<group>"; };
 		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>"; };
@@ -4878,7 +4878,6 @@
 		F37322CD292DF9410013862C /* CPDFCircleAnnotation+PDFListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CPDFCircleAnnotation+PDFListView.h"; sourceTree = "<group>"; };
 		F37322CE292DF9410013862C /* CPDFChoiceWidgetAnnotation+PDFListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CPDFChoiceWidgetAnnotation+PDFListView.h"; sourceTree = "<group>"; };
 		F37322CF292DF9410013862C /* CPDFWidgetAnnotation+PDFListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CPDFWidgetAnnotation+PDFListView.m"; sourceTree = "<group>"; };
-		F37322D0292DF9410013862C /* CPDFAnnotation+PDFListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CPDFAnnotation+PDFListView.m"; sourceTree = "<group>"; };
 		F37322D1292DF9410013862C /* CPDFMarkupAnnotation+PDFListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CPDFMarkupAnnotation+PDFListView.h"; sourceTree = "<group>"; };
 		F37322D2292DF9410013862C /* CPDFLinkAnnotation+PDFListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CPDFLinkAnnotation+PDFListView.m"; sourceTree = "<group>"; };
 		F37322D3292DF9410013862C /* CPDFStampAnnotation+PDFListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CPDFStampAnnotation+PDFListView.h"; sourceTree = "<group>"; };
@@ -9201,8 +9200,7 @@
 				F37322BF292DF9410013862C /* CPDFAnnotationHeader.h */,
 				F344A3B1293094DB003A4383 /* Signature */,
 				F3732326292F78200013862C /* Stamp */,
-				F37322BC292DF9410013862C /* CPDFAnnotation+PDFListView.h */,
-				F37322D0292DF9410013862C /* CPDFAnnotation+PDFListView.m */,
+				BBBB6CC92AD109F30035AA66 /* CPDFAnnotation+PDFListView.swift */,
 				F37322CC292DF9410013862C /* CPDFAnnotationModel.h */,
 				F37322B8292DF9410013862C /* CPDFAnnotationModel.m */,
 				F37322D8292DF9410013862C /* CPDFButtonWidgetAnnotation+PDFListView.h */,
@@ -10888,6 +10886,7 @@
 				AD53B70529ACC65500D61E81 /* KMMailHelper.m in Sources */,
 				ADE3C1E429A5ABC200793B13 /* KMLoginWindowController.swift in Sources */,
 				9F0CB4D52986551600007028 /* KMDesignToken+Spacing.swift in Sources */,
+				BBBB6CCA2AD109F30035AA66 /* CPDFAnnotation+PDFListView.swift in Sources */,
 				BB0A55102A302DB700B6E84B /* KMTextField.swift in Sources */,
 				89E4E70E2963D62C002DBA6F /* KMAnnotationFontWindowController.m in Sources */,
 				F37322E4292DF9410013862C /* CPDFCircleAnnotation+PDFListView.m in Sources */,
@@ -11226,7 +11225,6 @@
 				9F39B9442A661ED500930ACA /* KMHomeScrollView.swift in Sources */,
 				BB89725E294C5DDA0045787C /* KMWatermarkPropertyInfoController.swift in Sources */,
 				BB146FAB299DC0D000784A6A /* GTLRBatchQuery.m in Sources */,
-				F37322FF292DF9410013862C /* CPDFAnnotation+PDFListView.m in Sources */,
 				ADB1FEAE297543C000ED072D /* KMBatchSettingView.swift in Sources */,
 				BB897218294AED6C0045787C /* KMWatermarkAdjectivePreViewBaseController.swift in Sources */,
 				ADE8BC2F29F8CD7200570F89 /* KMPDFThumbnailModel.swift in Sources */,
@@ -11492,6 +11490,7 @@
 				F3B698A6298BC84500E0EB4D /* KMDocumentAIPopViewController.m in Sources */,
 				ADC6FC1A297630BA00D7C274 /* KMBatchProcessingColumnHeaderCell.swift in Sources */,
 				ADCB98DA2924774F00B51A03 /* KMBatchProcessingOrderTableCell.swift in Sources */,
+				BBBB6CCB2AD109F30035AA66 /* CPDFAnnotation+PDFListView.swift in Sources */,
 				F37322FA292DF9410013862C /* CPDFRedactAnnotation+PDFListView.m in Sources */,
 				BB3AAB9A2987BEA900992A5A /* KMWatermarkPDFView_OC.m in Sources */,
 				F3F0B27429B8ACD000722957 /* CPDFListViewDragObject.m in Sources */,
@@ -11719,7 +11718,6 @@
 				9F5664882988B16F00020985 /* KMTextfieldVC.swift in Sources */,
 				89D2D2FC294C806000BFF5FE /* KMPDFThumbnailItem.swift in Sources */,
 				9F0CB4EA2986559400007028 /* KMDesignToken+PaddingBottom.swift in Sources */,
-				F3732300292DF9410013862C /* CPDFAnnotation+PDFListView.m in Sources */,
 				9F1FE4AF29406E4700E952CA /* CTPresentationModeController.m in Sources */,
 				9F0CB4FA298655E500007028 /* KMDesignToken+Border.swift in Sources */,
 				F37322E2292DF9410013862C /* CPDFChoiceWidgetAnnotation+PDFListView.m in Sources */,
@@ -12498,7 +12496,6 @@
 				9FDD0F8E2952FCE0000C4DAD /* KMGlobalParser.swift in Sources */,
 				BBC348352955A118008D2CD1 /* KMCreateBackgroundController.swift in Sources */,
 				89E4E757296427E5002DBA6F /* NSImage_SKExtensions.m in Sources */,
-				F3732301292DF9410013862C /* CPDFAnnotation+PDFListView.m in Sources */,
 				ADD1B6EE2946C04C00C3FFF7 /* KMPrintChoosePageSizePamphletView.swift in Sources */,
 				9F0CB4DB2986553600007028 /* KMDesignToken+VerticalPadding.swift in Sources */,
 				BB6DD816293486FA001F0544 /* KMSecureEncryptPasswordCellView.swift in Sources */,
@@ -12850,6 +12847,7 @@
 				ADC63E4A2A49BEDD00854E02 /* KMSubscribeWaterMarkCollectionItem.swift in Sources */,
 				9F8DDF2829237910006CDC73 /* Array+KMExtensions.swift in Sources */,
 				9F0CB5172986566D00007028 /* KMDesignToken+BorderRadiusTopLeft.swift in Sources */,
+				BBBB6CCC2AD109F30035AA66 /* CPDFAnnotation+PDFListView.swift in Sources */,
 				89E4E6FD2963D341002DBA6F /* KMPopUpButton.m in Sources */,
 				BB49ECDF293EED6100C82CA2 /* KMConvertWordWindowController.swift in Sources */,
 				BBE0BDF529A22EF300440583 /* KMMainViewController+MenuAction.swift in Sources */,

PDF Office/PDF Master.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -23,16 +23,48 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "81C3C756-2B0A-4210-9F19-A01716F01D1D"
+            uuid = "152CCB94-DFDF-452D-AEE6-643991622327"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/PDFWindowController/PDFListView/CPDFListView.m"
+            filePath = "PDF Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Extension.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "325"
-            endingLineNumber = "325"
-            landmarkName = "-addAnnotationWithType:selection:page:bounds:"
+            startingLineNumber = "105"
+            endingLineNumber = "105"
+            landmarkName = "-checkSpelling:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "8DE8E32D-5F0B-47F9-9DBF-8B7EFBBCA913"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/Home/ViewController/KMHomeViewController+Action.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1240"
+            endingLineNumber = "1240"
+            landmarkName = "openBlankPage(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "95106932-3E19-4B03-998A-6F394F49879C"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/Home/ViewController/KMAIOpenPDFFilesVC.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "145"
+            endingLineNumber = "145"
+            landmarkName = "openImageFile(url:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/AppKitCategories/CPDFListHoverAnnotationViewController.m

@@ -12,7 +12,7 @@
 
 #import "CPDFListHoverAnnotationViewController.h"
 #import "CPDFListView.h"
-#import "CPDFAnnotation+PDFListView.h"
+#import <PDF_Master-Swift.h>
 
 @interface CPDFListHoverAnnotationViewController ()
 

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

@@ -1,56 +0,0 @@
-//
-//  CPDFAnnotation+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>
-
-#import "CPDFAnnotationHeader.h"
-
-#import "NSGeometry+PDFListView.h"
-#import "NSGraphics+PDFListView.h"
-
-@class CPDFAnnotationModel,CPDFListView;
-
-@interface CPDFAnnotation (PDFListView)
-
-- (instancetype)initPDFListViewNoteWithDocument:(CPDFDocument *)document;
-
-- (NSSet *)keysForValuesToObserveForUndo;
-
-- (CRectEdges)resizeHandleForPoint:(NSPoint)point scaleFactor:(CGFloat)scaleFactor;
-
-- (void)drawSelectionHighlightForView:(CPDFListView *)pdfView inContext:(CGContextRef)context isHover:(BOOL)isHover;
-
-- (CGRect)borderRecctForView:(CPDFListView *)pdfView;
-
-- (BOOL)isResizable;
-
-- (BOOL)isForm;
-
-- (BOOL)isMovable;
-
-- (BOOL)hitTest:(NSPoint)point;
-
-- (CPDFBorderStyle)borderStyle;
-
-- (void)setBorderStyle:(CPDFBorderStyle)style;
-
-- (CGFloat)lineWidth;
-
-- (void)setLineWidth:(CGFloat)width;
-
-- (NSArray *)dashPattern;
-
-- (void)setDashPattern:(NSArray *)pattern;
-
-- (NSString *)toolTipsString;
-
-@end

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

@@ -1,135 +0,0 @@
-//
-//  CPDFAnnotation+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 "CPDFAnnotation+PDFListView.h"
-
-#import "CPDFListView+Tool.h"
-#import "CPDFListViewConfig.h"
-#import "CPDFListView+Private.h"
-#import <objc/runtime.h>
-
-@implementation CPDFAnnotation (PDFListView)
-
-- (instancetype)initPDFListViewNoteWithDocument:(CPDFDocument *)document {
-    self = [self initWithDocument:document];
-    if (self) {
-        
-    }
-    return self;
-}
-
-- (NSSet *)keysForValuesToObserveForUndo {
-    static NSSet *keys = nil;
-    if (keys == nil)
-        keys = [[NSSet alloc] initWithObjects:CPDFAnnotationBoundsKey,
-                                              CPDFAnnotationContentKey,
-                                              CPDFAnnotationborderWidthKey,
-                                              CPDFAnnotationBorderKey,
-                                              CPDFAnnotationOpacityKey,
-                                              CPDFAnnotationColorKey,
-//                                              CPDFAnnotationModificationDateKey,
-                                              CPDFAnnotationUserNameKey, nil];
-    return keys;
-}
-
-- (void)drawSelectionHighlightForView:(CPDFListView *)pdfView inContext:(CGContextRef)context isHover:(BOOL)isHover {
-    if (NSIsEmptyRect([self bounds]))
-        return;
-
-    NSRect rect = [self borderRecctForView:pdfView];
-
-    CGFloat lineWidth = [pdfView unitWidthOnPage:[self page]];
-    CGContextSaveGState(context);
-    CGColorRef color = [CPDFListViewConfig defaultManager].annotationBorderColor.CGColor;
-    CGContextSetStrokeColorWithColor(context, color);
-    if(isHover) {
-        CGFloat length[] = {5,5};
-        CGContextSetLineDash(context, 0, length, 2);
-        CGContextStrokeRectWithWidth(context, CGRectInset(NSRectToCGRect(rect), 0,0), lineWidth);
-    } else {
-        CGContextStrokeRectWithWidth(context, CGRectInset(NSRectToCGRect(rect), 0,0), lineWidth);
-    }
-    CGContextRestoreGState(context);
-    CGContextSaveGState(context);
-    if ([self isResizable] && (pdfView.activeAnnotations.count == 1 || pdfView.selectAnnotations.count > 0) && !isHover)
-        CPDFListViewDrawResizeHandles(context, rect, 4.0 * lineWidth, YES);
-    CGContextRestoreGState(context);
-}
-
-- (CGRect)borderRecctForView:(CPDFListView *)pdfView {
-    NSRect rect = [pdfView integralRect:[self bounds] onPage:[self page]];
-    NSNumber *offsetNum = [CPDFListViewConfig defaultManager].annotationBorderOffset;
-    rect = NSRectFromCGRect(CGRectInset(NSRectToCGRect(rect), -(offsetNum.floatValue), -(offsetNum.floatValue)));
-    return rect;
-}
-
-- (BOOL)isForm {
-    return NO;
-}
-
-- (BOOL)isResizable {
-    return NO;
-}
-
-- (BOOL)isMovable {
-    return NO;
-}
-
-- (CRectEdges)resizeHandleForPoint:(NSPoint)point scaleFactor:(CGFloat)scaleFactor {
-    NSNumber *offsetNum = [CPDFListViewConfig defaultManager].annotationBorderOffset;
-    NSRect rect = NSRectFromCGRect(CGRectInset(NSRectToCGRect([self bounds]), -(offsetNum.floatValue), -(offsetNum.floatValue)));
-    return [self isResizable] ? CPDFListViewResizeHandleForPointFromRect(point, rect, 8.0 / scaleFactor) : 0;
-}
-
-- (BOOL)hitTest:(NSPoint)point {
-    return [self shouldDisplay] ? NSPointInRect(point, [self bounds]) : NO;
-}
-
-- (CPDFBorderStyle)borderStyle {
-    return [[self border] style];
-}
-
-- (void)setBorderStyle:(CPDFBorderStyle)style {
-    CPDFBorder *oldBorder = [self border];
-    NSMutableArray *dashPattern = [NSMutableArray array];
-    if (CPDFBorderStyleDashed == style) {
-        [dashPattern addObjectsFromArray:@[@5,@5]];
-    }
-    CPDFBorder *border = [[CPDFBorder alloc]initWithStyle:style lineWidth:oldBorder.lineWidth dashPattern:dashPattern];
-    [self setBorder:border];
-}
-
-- (CGFloat)lineWidth {
-    return self.borderWidth;
-}
-
-- (void)setLineWidth:(CGFloat)width {
-    CPDFBorder *oldBorder = [self border];
-    CPDFBorder *border = [[CPDFBorder alloc]initWithStyle:oldBorder.style lineWidth:width dashPattern:oldBorder.dashPattern];
-    [self setBorder:border];
-}
-
-- (NSArray *)dashPattern {
-    return [[self border] dashPattern];
-}
-
-- (void)setDashPattern:(NSArray *)pattern {
-    CPDFBorder *oldBorder = [self border];
-    CPDFBorder *border = [[CPDFBorder alloc]initWithStyle:oldBorder.style lineWidth:oldBorder.lineWidth dashPattern:pattern];
-    [self setBorder:border];
-}
-
-- (NSString *)toolTipsString {
-    return self.contents?:@"";
-}
-
-@end

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

@@ -0,0 +1,137 @@
+//
+//  CPDFAnnotation+PDFListView.swift
+//  PDF Master
+//
+//  Created by tangchao on 2023/10/7.
+//
+
+import Foundation
+ 
+@objc extension CPDFAnnotation {
+    convenience init(PDFListViewNoteWith document: CPDFDocument) {
+        self.init(document: document)
+    }
+    
+    private static var _keys: Set<AnyHashable>?
+    func keysForValuesToObserveForUndo() -> Set<AnyHashable>! {
+//    func keysForValuesToObserveForUndo() -> NSSet? {
+        if (CPDFAnnotation._keys == nil) {
+            CPDFAnnotation._keys = (NSSet(objects: CPDFAnnotationBoundsKey,
+                                          CPDFAnnotationContentKey,
+                                          CPDFAnnotationborderWidthKey,
+                                          CPDFAnnotationBorderKey,
+                                          CPDFAnnotationOpacityKey,
+                                          CPDFAnnotationColorKey,
+                                          //                                         CPDFAnnotationModificationDateKey,
+                                          CPDFAnnotationUserNameKey) as! Set<AnyHashable>)
+        }
+        return CPDFAnnotation._keys
+    }
+    
+    func drawSelectionHighlightForView(_ pdfView: CPDFListView, inContext context: CGContext, isHover: Bool) {
+        if (NSIsEmptyRect(self.bounds)) {
+            return
+        }
+        
+        let rect = self.borderRecct(for: pdfView)
+        
+        let lineWidth = pdfView.unitWidth(on: self.page)
+        context.saveGState()
+        let color = CPDFListViewConfig.defaultManager().annotationBorderColor.cgColor
+        context.setStrokeColor(color)
+        if (isHover) {
+            let lengths: [CGFloat] = [5.0, 5.0]
+            context.setLineDash(phase: 0.0, lengths: lengths)
+            context.stroke(CGRectInset(NSRectToCGRect(rect), 0,0), width: lineWidth)
+        } else {
+            context.stroke(CGRectInset(NSRectToCGRect(rect), 0,0), width: lineWidth)
+        }
+        context.restoreGState()
+        context.saveGState()
+        if (self.isResizable() && (pdfView.activeAnnotations.count == 1 || pdfView.selectAnnotations.count > 0) && !isHover) {
+            CPDFListViewDrawResizeHandles(context, rect, 4.0 * lineWidth, true)
+        }
+        context.restoreGState()
+    }
+    
+    func borderRecct(for pdfView: CPDFListView) -> CGRect {
+        var rect = pdfView.integralRect(self.bounds, on: self.page)
+        let offsetNum = CPDFListViewConfig.defaultManager().annotationBorderOffset
+        rect = NSRectFromCGRect(CGRectInset(NSRectToCGRect(rect), CGFloat(-(offsetNum?.floatValue ?? 0.0)), CGFloat(-(offsetNum?.floatValue ?? 0.0))))
+        return rect
+    }
+    
+    func isForm() -> Bool {
+        return false
+    }
+    
+    func isResizable() -> Bool {
+        return false
+    }
+
+    func isMovable() -> Bool {
+        return false
+    }
+
+    func resizeHandleForPoint(_ point: NSPoint, scaleFactor: CGFloat) -> CRectEdges {
+        let offsetNum = CPDFListViewConfig.defaultManager().annotationBorderOffset
+        let rect = NSRectFromCGRect(CGRectInset(NSRectToCGRect(self.bounds), CGFloat(-(offsetNum?.floatValue ?? 0.0)), CGFloat(-(offsetNum?.floatValue ?? 0.0))))
+        return self.isResizable() ? CPDFListViewResizeHandleForPointFromRect(point, rect, 8.0 / scaleFactor) : CRectEdges(rawValue: 0)
+    }
+    
+    func hitTest(_ point: NSPoint) -> Bool {
+        return self.shouldDisplay() ? NSPointInRect(point, self.bounds) : false
+    }
+    
+    func borderStyle() -> CPDFBorderStyle {
+        return self.border.style
+    }
+    
+    func setBorderStyle(_ style: CPDFBorderStyle) {
+        let oldBorder = self.border
+        var dashPattern: [CGFloat] = []
+        if (style == .dashed) {
+            dashPattern.append(5.0)
+            dashPattern.append(5.0)
+        }
+        let border = CPDFBorder(style: style, lineWidth: oldBorder?.lineWidth ?? 0.0, dashPattern: dashPattern)
+        self.border = border
+    }
+    
+    func lineWidth() -> CGFloat {
+        return self.borderWidth
+    }
+    
+    func setLineWidth(_ width: CGFloat) {
+        if let oldBorder = self.border {
+            let border = CPDFBorder(style: oldBorder.style, lineWidth: oldBorder.lineWidth, dashPattern: oldBorder.dashPattern)
+            self.border = border
+        }
+    }
+    
+    func dashPattern() -> [Any] {
+        return self.border.dashPattern
+    }
+    
+    func setDashPattern(_ pattern: [Any]) {
+        if let oldBorder = self.border {
+            let border = CPDFBorder(style: oldBorder.style, lineWidth: oldBorder.lineWidth, dashPattern: pattern)
+            self.border = border
+        }
+    }
+    
+    func toolTipsString() -> String {
+        return self.contents.isEmpty ? "" : self.contents
+    }
+}
+
+@objc extension CPDFAnnotation {
+    convenience init(PDFListViewNoteWithDocument document: CPDFDocument) {
+        self.init(PDFListViewNoteWith: document)
+    }
+    
+    func borderRecctForView(_ pdfView: CPDFListView) -> CGRect {
+        return self.borderRecct(for: pdfView)
+    }
+}
+

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFAnnotationModel.m

@@ -12,7 +12,6 @@
 
 #import "CPDFAnnotationModel.h"
 
-#import "CPDFAnnotation+PDFListView.h"
 #import "CPDFFreeTextAnnotation+PDFListView.h"
 #import "CPDFInkAnnotation+PDFListView.h"
 #import "CPDFLineAnnotation+PDFListView.h"
@@ -28,11 +27,7 @@
 #import "CStringConstants.h"
 #import "NSUserDefaults+PDFListView.h"
 
-#if VERSION_DMG
 #import <PDF_Master-Swift.h>
-#else
-#import <PDF_Master-Swift.h>
-#endif
 
 @interface CPDFAnnotationModel()
 

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

@@ -15,9 +15,9 @@
 #import "NSGeometry+PDFListView.h"
 #import "CPDFListView+Private.h"
 #import "CPDFListView+Tool.h"
-#import "CPDFAnnotation+PDFListView.h"
 #import "CPDFAnnotationModel.h"
 #import "CPDFListViewConfig.h"
+#import <PDF_Master-Swift.h>
 
 @implementation CPDFButtonWidgetAnnotation (PDFListView)
 

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

@@ -11,8 +11,8 @@
 //
 
 #import "CPDFChoiceWidgetAnnotation+PDFListView.h"
-#import "CPDFAnnotation+PDFListView.h"
 #import "CPDFAnnotationModel.h"
+#import <PDF_Master-Swift.h>
 
 @implementation CPDFChoiceWidgetAnnotation (PDFListView)
 

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

@@ -11,8 +11,8 @@
 //
 
 #import "CPDFCircleAnnotation+PDFListView.h"
-#import "CPDFAnnotation+PDFListView.h"
 #import "CPDFAnnotationModel.h"
+#import <PDF_Master-Swift.h>
 
 @implementation CPDFCircleAnnotation (PDFListView)
 

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

@@ -11,12 +11,12 @@
 //
 
 #import "CPDFFreeTextAnnotation+PDFListView.h"
-#import "CPDFAnnotation+PDFListView.h"
 #import "CPDFListView+Tool.h"
 #import "CPDFListView+Private.h"
 
 #import "CPDFAnnotationModel.h"
 #import "CPDFListViewConfig.h"
+#import <PDF_Master-Swift.h>
 
 @implementation CPDFFreeTextAnnotation (PDFListView)
 

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

@@ -15,7 +15,7 @@
 #import "NSGraphics+PDFListView.h"
 #import "NSGeometry+PDFListView.h"
 #import "CPDFAnnotationModel.h"
-#import "CPDFAnnotation+PDFListView.h"
+#import <PDF_Master-Swift.h>
 
 @implementation CPDFInkAnnotation (PDFListView)
 

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

@@ -11,12 +11,12 @@
 //
 
 #import "CPDFLineAnnotation+PDFListView.h"
-#import "CPDFAnnotation+PDFListView.h"
 #import "CPDFListView+Tool.h"
 #import "CPDFListView+Private.h"
 
 #import "CPDFAnnotationModel.h"
 #import "CPDFListViewConfig.h"
+#import <PDF_Master-Swift.h>
 
 @implementation CPDFLineAnnotation (PDFListView)
 

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

@@ -11,10 +11,10 @@
 //
 
 #import "CPDFLinkAnnotation+PDFListView.h"
-#import "CPDFAnnotation+PDFListView.h"
 #import "CPDFListView+Tool.h"
 #import "NSString+PDFListView.h"
 #import "CPDFListView+Private.h"
+#import <PDF_Master-Swift.h>
 
 @implementation CPDFLinkAnnotation (PDFListView)
 

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

@@ -14,8 +14,8 @@
 #import "CPDFListView+Tool.h"
 #import "CPDFAnnotationModel.h"
 #import "CPDFListViewConfig.h"
-#import "CPDFAnnotation+PDFListView.h"
 #import "NSPointerArray+PDFListView.h"
+#import <PDF_Master-Swift.h>
 
 @interface CPDFAnnotationMarkupExtraIvars : NSObject {
     NSPointerArray *lineRects;

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

@@ -11,10 +11,10 @@
 //
 
 #import "CPDFRedactAnnotation+PDFListView.h"
-#import "CPDFAnnotation+PDFListView.h"
 #import "CPDFListView+Tool.h"
 
 #import "CPDFAnnotationModel.h"
+#import <PDF_Master-Swift.h>
 
 @implementation CPDFRedactAnnotation (PDFListView)
 

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

@@ -11,8 +11,8 @@
 //
 
 #import "CPDFSquareAnnotation+PDFListView.h"
-#import "CPDFAnnotation+PDFListView.h"
 #import "CPDFAnnotationModel.h"
+#import <PDF_Master-Swift.h>
 
 @implementation CPDFSquareAnnotation (PDFListView)
 

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

@@ -13,11 +13,11 @@
 #import "CPDFStampAnnotation+PDFListView.h"
 #import "CSelfSignAnnotation.h"
 #import "CPDFListViewConfig.h"
-#import "CPDFAnnotation+PDFListView.h"
 #import "NSGeometry+PDFListView.h"
 #import "CPDFListView+Tool.h"
 #import "CPDFAnnotationModel.h"
 #import "CPDFListView+Private.h"
+#import <PDF_Master-Swift.h>
 
 @implementation CPDFStampAnnotation (PDFListView)
 

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

@@ -11,12 +11,12 @@
 //
 
 #import "CPDFTextAnnotation+PDFListView.h"
-#import "CPDFAnnotation+PDFListView.h"
 #import "CPDFListView+Tool.h"
 #import "CPDFAnnotationModel.h"
 #import "CPDFListView+Private.h"
 #import "CPDFListView+Private.h"
 #import "NSImage+PDFListView.h"
+#import <PDF_Master-Swift.h>
 
 @implementation CPDFTextAnnotation (PDFListView)
 

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

@@ -11,8 +11,8 @@
 //
 
 #import "CPDFTextWidgetAnnotation+PDFListView.h"
-#import "CPDFAnnotation+PDFListView.h"
 #import "CPDFAnnotationModel.h"
+#import <PDF_Master-Swift.h>
 
 @implementation CPDFTextWidgetAnnotation (PDFListView)
 

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

@@ -11,12 +11,12 @@
 //
 
 #import "CPDFWidgetAnnotation+PDFListView.h"
-#import "CPDFAnnotation+PDFListView.h"
 #import "CPDFListView+Tool.h"
 #import "NSGraphics+PDFListView.h"
 #import "NSGeometry+PDFListView.h"
 #import "CPDFListView+Private.h"
 #import "CPDFListViewConfig.h"
+#import <PDF_Master-Swift.h>
 
 @implementation CPDFWidgetAnnotation (PDFListView)
 

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFPageExtensions/CPDFPage+PDFListView.swift

@@ -138,7 +138,8 @@ extension CPDFPage {
         }
         
         image?.lockFocus()
-        let context = NSGraphicsContext.current?.graphicsPort
+//        let context = NSGraphicsContext.current?.graphicsPort
+        let context = NSGraphicsContext.current?.cgContext
         NSGraphicsContext.current?.imageInterpolation = .high
         
         NSGraphicsContext.saveGraphicsState()
@@ -158,7 +159,7 @@ extension CPDFPage {
             transform.concat()
         }
         
-        self.drawEdit(with: box, to: (context as! CGContext))
+        self.drawEdit(with: box, to: context!)
         NSGraphicsContext.current?.imageInterpolation = .default
         image?.unlockFocus()
         

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

@@ -22,7 +22,6 @@
 #import "CPDFListView+Private.h"
 #import "CPDFListView+Event.h"
 #import "CPDFListView+Tool.h"
-#import "CPDFAnnotation+PDFListView.h"
 #import "CPDFListView+Extension.h"
 #import "CPDFListView+UndoManager.h"
 #import "NSString+PDFListView.h"
@@ -39,11 +38,7 @@
 #import "CPDFListView+Extension.h"
 #import <PDF_Master-Swift.h>
 
-#if VERSION_DMG
 #import <PDF_Master-Swift.h>
-#else
-#import <PDF_Master-Swift.h>
-#endif
 
 NSNotificationName const CPDFListViewSelectionChangedNotification = @"CPDFListViewSelectionChangedNotification";
 
@@ -352,19 +347,19 @@ NSNotificationName const CPDFListViewAnnotationsAttributeHasChangeNotification =
             bounds = annotationType == CAnnotationTypeAnchored ? CPDFListViewRectFromCenterAndSize(bounds.origin, size) : CPDFListViewRectFromCenterAndSquareSize(bounds.origin, MIN_NOTE_SIZE);
         switch (annotationType) {
             case CAnnotationTypeFreeText:
-                annotation = [[CPDFFreeTextAnnotation alloc]initPDFListViewNoteWithDocument:self.document];
+                annotation = [[CPDFFreeTextAnnotation alloc]initWithPDFListViewNoteWith:self.document];
                 annotation.bounds = bounds;
                 break;
             case CAnnotationTypeAnchored:
-                annotation = [[CPDFTextAnnotation alloc]initPDFListViewNoteWithDocument:self.document];
+                annotation = [[CPDFTextAnnotation alloc]initWithPDFListViewNoteWith:self.document];
                 annotation.bounds = bounds;
                 break;
             case CAnnotationTypeCircle:
-                annotation = [[CPDFCircleAnnotation alloc]initPDFListViewNoteWithDocument:self.document];
+                annotation = [[CPDFCircleAnnotation alloc]initWithPDFListViewNoteWith:self.document];
                 annotation.bounds = bounds;
                 break;
             case CAnnotationTypeSquare:
-                annotation = [[CPDFSquareAnnotation alloc]initPDFListViewNoteWithDocument:self.document];
+                annotation = [[CPDFSquareAnnotation alloc]initWithPDFListViewNoteWith:self.document];
                 annotation.bounds = bounds;
                 break;
             case CAnnotationTypeLine:
@@ -381,11 +376,11 @@ NSNotificationName const CPDFListViewAnnotationsAttributeHasChangeNotification =
             }
                 break;
             case CAnnotationTypeLink:
-                annotation = [[CPDFLinkAnnotation alloc] initPDFListViewNoteWithDocument:self.document];
+                annotation = [[CPDFLinkAnnotation alloc] initWithPDFListViewNoteWith:self.document];
                 annotation.bounds = bounds;
                 break;
             case CAnnotationTypeTextField:
-                annotation = [[CPDFTextWidgetAnnotation alloc] initPDFListViewNoteWithDocument:self.document];
+                annotation = [[CPDFTextWidgetAnnotation alloc] initWithPDFListViewNoteWith:self.document];
                 annotation.bounds = bounds;
                 break;
             case CAnnotationTypeCheckBox:
@@ -405,7 +400,7 @@ NSNotificationName const CPDFListViewAnnotationsAttributeHasChangeNotification =
                 annotation.bounds = bounds;
                 break;
             case CAnnotationTypeSignature:
-                annotation = [[CPDFSignatureWidgetAnnotation alloc] initPDFListViewNoteWithDocument:self.document];
+                annotation = [[CPDFSignatureWidgetAnnotation alloc] initWithPDFListViewNoteWith:self.document];
                 annotation.bounds = bounds;
                 break;
             case CAnnotationTypeActionButton:

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Event.h

@@ -12,8 +12,6 @@
 
 #import "CPDFListView.h"
 
-#import "CPDFAnnotation+PDFListView.h"
-
 static inline NSRect SKRectFromCenterAndPoint(NSPoint center, NSPoint point) {
     NSRect rect;
     rect.size.width = 2.0 * fabs(center.x - point.x);

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Event.m

@@ -24,7 +24,6 @@
 #import "CPDFListEditAnnotationViewController.h"
 
 #import "CPDFListView+Extension.h"
-#import "CPDFAnnotation+PDFListView.h"
 #import "CPDFInkAnnotation+PDFListView.h"
 #import "CPDFLineAnnotation+PDFListView.h"
 #import "CPDFMarkupAnnotation+PDFListView.h"
@@ -1558,7 +1557,7 @@ static inline CPDFAreaOfInterest CAreaOfInterestForResizeHandle(CRectEdges mask,
                 break;
             }
             NSMutableArray *quadrilateralPoints = [NSMutableArray array];
-            CPDFRedactAnnotation *annotation = [[CPDFRedactAnnotation alloc] initPDFListViewNoteWithDocument:self.document];
+            CPDFRedactAnnotation *annotation = [[CPDFRedactAnnotation alloc] initWithPDFListViewNoteWith:self.document];
             CGRect bounds = rect;
             [quadrilateralPoints addObject:[NSValue valueWithPoint:CGPointMake(CGRectGetMinX(bounds), CGRectGetMaxY(bounds))]];
             [quadrilateralPoints addObject:[NSValue valueWithPoint:CGPointMake(CGRectGetMaxX(bounds), CGRectGetMaxY(bounds))]];
@@ -1589,7 +1588,7 @@ static inline CPDFAreaOfInterest CAreaOfInterestForResizeHandle(CRectEdges mask,
 
 - (CPDFRedactAnnotation *)addRedactPDFSelection:(CPDFSelection *)currentSelection {
     NSMutableArray *quadrilateralPoints = [NSMutableArray array];
-    CPDFRedactAnnotation *annotation = [[CPDFRedactAnnotation alloc] initPDFListViewNoteWithDocument:self.document];
+    CPDFRedactAnnotation *annotation = [[CPDFRedactAnnotation alloc] initWithPDFListViewNoteWith:self.document];
     for (CPDFSelection *selection in currentSelection.selectionsByLine) {
         CGRect bounds = selection.bounds;
         [quadrilateralPoints addObject:[NSValue valueWithPoint:CGPointMake(CGRectGetMinX(bounds), CGRectGetMaxY(bounds))]];
@@ -1775,7 +1774,7 @@ static inline CPDFAreaOfInterest CAreaOfInterestForResizeHandle(CRectEdges mask,
     if (points.count>0) {
         NSMutableArray *paths = [[NSMutableArray alloc] init];
         [paths addObject:bezierPath];
-        CPDFInkAnnotation *annotation = [[CPDFInkAnnotation alloc]initPDFListViewNoteWithDocument:self.document];
+        CPDFInkAnnotation *annotation = [[CPDFInkAnnotation alloc]initWithPDFListViewNoteWith:self.document];
         annotation.paths = @[points];
         if(annotation) {
             [self addAnnotation:annotation toPage:page];
@@ -3471,7 +3470,7 @@ static inline CPDFAreaOfInterest CAreaOfInterestForResizeHandle(CRectEdges mask,
             CPDFAnnotation *newAnnotation = nil;
             if ([str isKindOfClass:[NSString class]]) {
                 if ([(NSString *)str length] > 0) {
-                    newAnnotation = [[CPDFFreeTextAnnotation alloc] initPDFListViewNoteWithDocument:self.document];
+                    newAnnotation = [[CPDFFreeTextAnnotation alloc] initWithPDFListViewNoteWith:self.document];
                     newAnnotation.bounds = bounds;
                     [newAnnotation setContents:([str isKindOfClass:[NSAttributedString class]] ? [str string] : str)];
                 }

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Extension.m

@@ -14,7 +14,6 @@
 #import "CPDFListView+Private.h"
 #import "CPDFMarkupAnnotation+PDFListView.h"
 #import "NSGeometry+PDFListView.h"
-#import "CPDFAnnotation+PDFListView.h"
 #import <objc/runtime.h>
 #import <PDF_Master-Swift.h>
 

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+KeyEvent.m

@@ -16,6 +16,7 @@
 #import "NSEvent+PDFListView.h"
 #import "CPDFListView+Event.h"
 #import "CPDFListView+Private.h"
+#import <PDF_Master-Swift.h>
 
 @implementation CPDFListView (KeyEvent)
 

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+MouseEvent.h

@@ -9,7 +9,6 @@
 
 #import "CPDFListView.h"
 
-#import "CPDFAnnotation+PDFListView.h"
 
 @interface CPDFListView (Event)
 

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Tool.m

@@ -14,7 +14,6 @@
 
 #import "CPDFListView+Private.h"
 #import "CPDFListHoverAnnotationViewController.h"
-#import "CPDFAnnotation+PDFListView.h"
 #import "NSCursor+PDFListView.h"
 #import "NSPopover+PDFListView.h"
 

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+UndoManager.m

@@ -13,7 +13,7 @@
 #import "CPDFListView+UndoManager.h"
 
 #import "CPDFListView+Private.h"
-#import "CPDFAnnotation+PDFListView.h"
+#import <PDF_Master-Swift.h>
 
 static NSString *CPDFListViewAnnotationPropertiesObservationContext = @"CPDFListViewAnnotationPropertiesObservationContext";
 

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

@@ -17,7 +17,6 @@
 #import "CPDFAnnotationModel.h"
 #import "ComPDFUIConfig.h"
 
-#import "CPDFAnnotation+PDFListView.h"
 #import "CPDFInkAnnotation+PDFListView.h"
 #import "CPDFTextAnnotation+PDFListView.h"
 #import "CPDFStampAnnotation+PDFListView.h"

PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift

@@ -2831,8 +2831,8 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
                         
                         for i in indexs {
                             let page: CPDFPage = (self?.listView.document.page(at: UInt(i)))!
-                            let redactAnno = CPDFRedactAnnotation(pdfListViewNoteWith: self?.listView.document)
-                            redactAnno?.bounds = page.bounds
+                            let redactAnno = CPDFRedactAnnotation(PDFListViewNoteWith: (self?.listView.document)!)
+                            redactAnno.bounds = page.bounds
                             self?.listView.add(redactAnno, to: page)
                         }
                     }

PDF Office/PDF Master/PDF_Master-Bridging-Header.h

@@ -72,3 +72,4 @@
 
 #import "NSShadow+PDFListView.h"
 #import "NSGeometry+PDFListView.h"
+#import "CPDFAnnotationHeader.h"