【2025】【综合】代码整理

PDF Office/PDF Master/Class/DigtalSignature/CPDFDigtalView/Event/CPDFAnnotation+PDFListView.h

@@ -13,7 +13,7 @@
 #import <ComPDFKit/ComPDFKit.h>
 
 
-@class CPDFAnnotationModel,CPDFListView;
+@class CPDFListView;
 
 @interface CPDFAnnotation (PDFListView)
 

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/AppKitCategories/CPDFListEditAnnotationViewController.swift

@@ -156,14 +156,13 @@ class CPDFListEditAnnotationViewController: KMNBaseViewController, NSTextViewDel
         var content: String = ""
 
         if let modificationDate = self.annotation.modificationDate() {
-            string = CPDFAnnotationModel.timeString(withTime: modificationDate)
-            if let string1 = CPDFAnnotationModel.timeString(withTime: modificationDate) {
-                if !string1.isEmpty {
-                    if !content.isEmpty {
-                        content = "\(content) \(string1)"
-                    } else {
-                        content = string
-                    }
+            string = self.timeString(with: modificationDate)
+            let string1 = self.timeString(with: modificationDate)
+            if !string1.isEmpty {
+                if !content.isEmpty {
+                    content = "\(content) \(string1)"
+                } else {
+                    content = string
                 }
             }
         }
@@ -178,6 +177,19 @@ class CPDFListEditAnnotationViewController: KMNBaseViewController, NSTextViewDel
         }
     }
     
+    func timeString(with timeDate: Date) -> String {
+        let formatter = DateFormatter()
+        let calendar = Calendar.current
+        
+        let unit: Set<Calendar.Component> = [.day, .month, .year]
+        let nowCmps = calendar.dateComponents(unit, from: Date())
+        let currentCmps = calendar.dateComponents(unit, from: timeDate)
+        
+        formatter.dateFormat = "yyyy-MM-dd HH:mm"
+        
+        return formatter.string(from: timeDate)
+    }
+    
     func undoManager(for view: NSTextView) -> UndoManager? {
         return self.textViewUndoManager
     }

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

@@ -1,174 +0,0 @@
-//
-//  CPDFAnnotationModel.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 <Foundation/Foundation.h>
-#import "CPDFListView.h"
-
-@interface CPDFAnnotationModel : NSObject
-
-- (instancetype)initWithAnnotationType:(CAnnotationType)annotationType;
-
-- (instancetype)initWithPDFAnnotations:(NSArray *)annotations;
-
-@property (nonatomic,readonly) CAnnotationType annotationType;
-
-@property (nonatomic,readonly) CPDFAnnotation *annotation;
-
-@property (nonatomic,readonly) NSArray *annotations;
-
-@property (nonatomic,retain) NSImage *annotationImage;
-
-+ (NSString *)tagString;
-
-+ (NSMutableArray *)supportFonts;
-
-+ (NSMutableArray <NSDictionary *>*)defaultFreeTextPropert;
-
-+ (NSString *)timeStringWithTimeDate:(NSDate *)date;
-
-- (NSRect)annotationImageBounds;
-
-#pragma mark - Common
-
-- (NSColor *)color;
-- (void)setColor:(NSColor *)color;
-
-- (CGFloat)opacity;
-- (void)setOpacity:(CGFloat)opacity;
-
-- (CPDFBorderStyle)style;
-- (void)setStyle:(CPDFBorderStyle)style;
-
-- (NSArray *)dashPattern;
-
-- (CGFloat)lineWidth;
-- (void)setLineWidth:(CGFloat)lineWidth;
-
-- (BOOL)shouldDisplay;
-- (void)setShouldDisplay:(BOOL)shouldDisplay;
-
-- (BOOL)shouldPrint;
-- (void)setShouldPrint:(BOOL)shouldPrint;
-
-- (NSString *)contents;
-- (void)setContents:(NSString *)contents;
-
-#pragma mark - Text
-
-- (CPDFTextAnnotationIconType)anchoredIconType;
-- (void)setAnchoredIconType:(CPDFTextAnnotationIconType)anchoredIconType;
-
-#pragma mark - Line
-
-- (CGPoint)annotationImageStartPoint;
-
-- (CGPoint)annotationImageEndPoint;
-
-- (CPDFLineStyle)startLineStyle;
-- (void)setStartLineStyle:(CPDFLineStyle)startLineStyle;
-
-- (CPDFLineStyle)endLineStyle;
-- (void)setEndLineStyle:(CPDFLineStyle)endLineStyle;
-
-#pragma mark - FreeText
-
-- (NSColor *)fontColor;
-- (void)setFontColor:(NSColor *)fontColor;
-
-- (CGFloat)fontSize;
-- (void)setFontSize:(CGFloat)fontSize;
-
-- (NSString *)fontName;
-- (void)setFontName:(NSString *)fontName;
-
-- (NSTextAlignment)alignment;
-- (void)setAlignment:(NSTextAlignment)alignment;
-
-#pragma mark - Circle&Square
-
-- (NSColor *)interiorColor;
-- (void)setInteriorColor:(NSColor *)interiorColor;
-
-- (void)setInteriorMesColor:(NSColor *)interiorColor;
-
-- (CGFloat)interiorOpacity;
-- (void)setInteriorOpacity:(CGFloat)interiorOpacity;
-
-#pragma mark - Widget
-
-- (NSColor *)backgroundColor;
-- (void)setBackgroundColor:(NSColor *)backgroundColor;
-
-- (CGFloat)backgroundOpacity;
-- (void)setBackgroundOpacity:(CGFloat)backgroundOpacity;
-
-- (BOOL)isMultiline;
-- (void)setIsMultiline:(BOOL)isMultiline;
-
-- (NSString *)stringValue;
-- (void)setStringValue:(NSString *)stringValue;
-
-#pragma mark - Redact
-
-- (BOOL)isOverlayText;
-- (void)setIsOverlayText:(BOOL)isOverlayText;
-
-- (NSString *)overlayText;
-- (void)setOverlayText:(NSString *)overlayText;
-
-#pragma mark - SelfSign
-
-- (NSInteger)dateFormatIndex;
-- (void)setDateFormatIndex:(NSInteger)dateFormatIndex;
-
-- (BOOL)includeTime;
-- (void)setIncludeTime:(BOOL)includeTime;
-
-- (CAnnotationType)stampAnnotationType;
-- (void)setStampAnnotationType:(CAnnotationType)stampAnnotationType;
-
-#pragma mark - Measure
-
-- (NSColor *)measureBorderColor;
-- (void)setMeasureBorderColor:(NSColor *)color;
-
-- (NSColor *)measureLineColor;
-- (void)setMeasureLineColor:(NSColor *)color;
-
-- (CGFloat)measureOpacity;
-- (void)setMeasureOpacity:(CGFloat)opacity;
-
-- (CGFloat)measureLineWidth;
-- (void)setMeasureLineWidth:(CGFloat)width;
-
-- (CPDFBorderStyle)measureLineStyle;
-- (void)setMeasureLineStyle:(CPDFBorderStyle)lineStyle;
-
-- (NSArray *)measureDashPattern;
-- (void)setMeasureDashPattern:(NSArray *)dashPattern;
-
-- (CPDFLineStyle)measureStartLineStyle;
-- (void)setMeasureStartLineStyle:(CPDFLineStyle)startLineStyle;
-
-- (CPDFLineStyle)measureEndLineStyle;
--(void)setMeasureEndLineStyle:(CPDFLineStyle)endLineStyle;
-
-- (NSColor *)measureFontColor;
-- (void)setMeasureFontColor:(NSColor *)fontColor;
-
-- (CGFloat)measureFontSize;
-- (void)setMeasureFontSize:(CGFloat)fontSize;
-
-- (NSString *)measureFontName;
-- (void)setMeasureFontName:(NSString *)fontName;
-
-@end

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

@@ -1,520 +0,0 @@
-//
-//  CPDFAnnotationModel.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 "CPDFAnnotationModel.h"
-
-#import "CSelfSignAnnotationFreeText.h"
-#import "CSelfSignAnnotation.h"
-#import <PDF_Reader_Pro-Swift.h>
-
-#define kWidth 2.0
-@interface CPDFAnnotationModel()
-
-@property (nonatomic,assign) CAnnotationType annotationType;
-
-@property (nonatomic,retain) CPDFAnnotation *annotation;
-
-@property (nonatomic,retain) NSArray *annotations;
-
-@end
-
-@implementation CPDFAnnotationModel
-
-- (instancetype)initWithAnnotationType:(CAnnotationType)annotationType {
-    if (self = [super init]) {
-        self.annotationType = annotationType;
-    }
-    return self;
-}
-
-- (instancetype)initWithPDFAnnotations:(NSArray *)annotations {
-    if (self = [super init]) {
-        self.annotation = annotations.firstObject;
-        self.annotations = [NSArray arrayWithArray:annotations];
-        self.annotationType = [self convertAnnotationType];
-        
-    }
-    return self;
-}
-
-+ (NSString *)tagString {
-    NSDateFormatter *formatter = [[NSDateFormatter alloc ] init];
-    [formatter setDateFormat:@"YYYY-MM-dd hh:mm:ss"];
-    NSString *dateString = [formatter stringFromDate:[NSDate date]];
-    return [NSString stringWithFormat:@"%@ %d ", dateString,rand()%10000];
-}
-
-+ (NSMutableArray *)supportFonts {
-    NSMutableArray*fonts = [NSMutableArray array];
-    
-    NSMutableDictionary *dic = [NSMutableDictionary dictionary];
-    [dic setValue:@[@"Regular",@"Bold",@"Bold Oblique",@"Oblique"] forKey:@"Courier"];
-    [fonts addObject:dic];
-    
-    dic = [NSMutableDictionary dictionary];
-    [dic setValue:@[@"Regular",@"Bold",@"Bold Oblique",@"Oblique"] forKey:@"Helvetica"];
-    [fonts addObject:dic];
-    
-    dic = [NSMutableDictionary dictionary];
-    [dic setValue:@[@"Roman",@"Bold",@"Bold Italic",@"Italic"] forKey:@"Times"];
-    [fonts addObject:dic];
-    return fonts;
-}
-
-+ (NSMutableArray <NSDictionary *>*)defaultFreeTextPropert {
-    NSMutableArray*defaultFreeTexts = [NSMutableArray array];
-    NSDictionary *dich1 = [[NSUserDefaults standardUserDefaults] objectForKey:@"CPDFFreeTextDefaultFontObjects_H1"] ? : @{@"fontName":@"Helvetica-Bold",@"fontSize":@"36"};
-    NSDictionary *dich2 = [[NSUserDefaults standardUserDefaults] objectForKey:@"CPDFFreeTextDefaultFontObjects_H2"] ? : @{@"fontName":@"Helvetica-Bold",@"fontSize":@"24"};
-    NSDictionary *dich3 = [[NSUserDefaults standardUserDefaults] objectForKey:@"CPDFFreeTextDefaultFontObjects_H3"] ? : @{@"fontName":@"Helvetica-Bold",@"fontSize":@"18"};
-    NSDictionary *dicb1 =  [[NSUserDefaults standardUserDefaults] objectForKey:@"CPDFFreeTextDefaultFontObjects_B1"] ? : @{@"fontName":@"Helvetica",@"fontSize":@"14"};
-    NSDictionary *dicb2 = [[NSUserDefaults standardUserDefaults] objectForKey:@"CPDFFreeTextDefaultFontObjects_B2"] ? : @{@"fontName":@"Helvetica",@"fontSize":@"12"};
-    NSDictionary *dicb3 = [[NSUserDefaults standardUserDefaults] objectForKey:@"CPDFFreeTextDefaultFontObjects_B3"] ? : @{@"fontName":@"Helvetica",@"fontSize":@"11"};
-    NSDictionary *normal = @{@"fontName":@"Helvetica",@"fontSize":@"12"};
-    
-    [defaultFreeTexts addObject:normal];
-    [defaultFreeTexts addObject:dich1];
-    [defaultFreeTexts addObject:dich2];
-    [defaultFreeTexts addObject:dich3];
-    [defaultFreeTexts addObject:dicb1];
-    [defaultFreeTexts addObject:dicb2];
-    [defaultFreeTexts addObject:dicb3];
-    
-    return defaultFreeTexts;
-}
-
-+ (NSString *)timeStringWithTimeDate:(NSDate *)date {
-    static NSDateFormatter *formatter = nil;
-    if (formatter == nil) {
-        formatter = [[NSDateFormatter alloc] init];
-    }
-    NSCalendar *calendar = [NSCalendar currentCalendar];
-    int unit =NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear;
-    NSDateComponents *nowCmps = [calendar components:unit fromDate:[NSDate date]];
-    NSDateComponents *currentCmps = [calendar components:unit fromDate:date];
-    [formatter setDateFormat:@"yyyy-MM-dd HH:mm"];
-    
-    return [formatter stringFromDate:date];
-}
-
-- (CAnnotationType)convertAnnotationType {
-    CAnnotationType annotationType = CAnnotationTypeFreeText;
-     
-    return annotationType;
-}
-
-- (NSRect)annotationImageBounds {
-    NSRect bounds = CGRectMake(0, 0, 140, 60);
-    
-    return bounds;
-}
-
-- (NSImage *)annotationImage {
-    NSImage *image = nil;
-    
-    return image;
-}
-
-- (BOOL)isMultiAnnottation {
-   
-    return NO;
-}
-
-- (NSColor *)color {
-    NSColor  *color = nil;
-    
-    return color;
-}
-
-- (void)setColor:(NSColor *)color {
-    
-}
-
-- (CGFloat)opacity {
-    CGFloat opacity = 1;
-     
-    return opacity;
-}
-
-- (void)setOpacity:(CGFloat)opacity {
-     
-}
-
-- (CPDFBorderStyle)style {
-    CPDFBorderStyle style = CPDFBorderStyleSolid;
-    
-     
-    return style;
-}
-
-- (void)setStyle:(CPDFBorderStyle)style {
-     
-}
-
-- (NSArray *)dashPattern {
-    
-    return @[@5];
-}
-
-- (CGFloat)lineWidth {
-    CGFloat lineWidth = 2;
-    
-    return lineWidth;
-}
-
-- (void)setLineWidth:(CGFloat)lineWidth {
-    
-}
-
-- (BOOL)shouldDisplay {
-    BOOL shouldDisplay = YES;
-    
-    return shouldDisplay;
-}
-
-- (void)setShouldDisplay:(BOOL)shouldDisplay {
-    
-}
-
-- (BOOL)shouldPrint {
-    BOOL shouldPrint = YES;
-   
-    return shouldPrint;
-}
-
-- (void)setShouldPrint:(BOOL)shouldPrint {
-    
-}
-
-- (NSString *)contents {
-    NSString *contents = nil;
-   
-    return contents?:NSLocalizedString(@"Sample", nil);
-}
-
-- (void)setContents:(NSString *)contents {
-    
-}
-
-#pragma mark - Text
-
-- (CPDFTextAnnotationIconType)anchoredIconType {
-    CPDFTextAnnotationIconType anchoredIconType = CPDFTextAnnotationIconComment;
-    
-    return anchoredIconType;
-}
-
-- (void)setAnchoredIconType:(CPDFTextAnnotationIconType)anchoredIconType {
-   
-}
-
-#pragma mark - Line
-
-- (CGPoint)annotationImageStartPoint {
-    return NSMakePoint(self.lineWidth, self.lineWidth);
-}
-
-- (CGPoint)annotationImageEndPoint {
-    return  NSMakePoint(50, 50);
-}
-
-- (CPDFLineStyle)startLineStyle {
-    CPDFLineStyle startLineStyle = CPDFLineStyleNone;
-   
-    return startLineStyle;
-}
-
-- (void)setStartLineStyle:(CPDFLineStyle)startLineStyle {
-   
-}
-
-- (CPDFLineStyle)endLineStyle {
-    CPDFLineStyle endLineStyle = CPDFLineStyleNone;
-   
-    return endLineStyle;
-}
-
--(void)setEndLineStyle:(CPDFLineStyle)endLineStyle {
-    
-}
-
-#pragma mark - FreeText
-
-- (NSColor *)fontColor {
-    NSColor  *color = nil;
-   
-    return color;
-}
-
-- (void)setFontColor:(NSColor *)fontColor {
-     
-}
-
-- (CGFloat)fontSize {
-    CGFloat fontSize = 11;
-    
-    return fontSize;
-}
-
-- (void)setFontSize:(CGFloat)fontSize {
-    
-}
-
-- (NSString *)fontName {
-    NSString  *fontName = nil;
-   
-    return fontName;
-}
-
-- (void)setFontName:(NSString *)fontName {
-    
-}
-
-- (NSTextAlignment)alignment {
-    NSTextAlignment alignment = NSTextAlignmentLeft;
-    
-    return alignment;
-}
-
-- (void)setAlignment:(NSTextAlignment)alignment {
-    
-}
-
-#pragma mark - Circle&Square
-
-- (NSColor *)interiorColor {
-    NSColor  *interiorColor = nil;
-     
-    return interiorColor;
-}
-
-- (void)setInteriorColor:(NSColor *)interiorColor {
-    
-}
-
-- (CGFloat)interiorOpacity {
-    CGFloat opacity = 1;
-    
-    return opacity;
-}
-
-- (void)setInteriorOpacity:(CGFloat)interiorOpacity {
-     
-}
-
-#pragma mark - Widget
-
-- (NSColor *)backgroundColor {
-    NSColor  *backgroundColor = nil;
-    
-    return backgroundColor;
-}
-
-- (CGFloat)backgroundOpacity {
-    CGFloat opacity = 0;
-     
-    return opacity;
-}
-
-- (void)setBackgroundOpacity:(CGFloat)backgroundOpacity {
-     
-}
-
-- (void)setBackgroundColor:(NSColor *)backgroundColor {
-    
-}
-
-- (BOOL)isMultiline {
-    BOOL isMultiline = YES;
-   
-    return isMultiline;
-}
-
-- (void)setIsMultiline:(BOOL)isMultiline {
-    
-}
-
-- (NSString *)stringValue {
-    
-    return @"";
-}
-
-- (void)setStringValue:(NSString *)stringValue {
-   
-}
-
-#pragma mark - Redact
-
-- (BOOL)isOverlayText {
-    BOOL isOverlayText = NO;
-    
-    return isOverlayText;
-}
-
-- (void)setIsOverlayText:(BOOL)isOverlayText {
-   
-}
-
-- (NSString *)overlayText {
-    
-    return nil;
-}
-
-- (void)setOverlayText:(NSString *)overlayText {
-    
-}
-
-#pragma mark - SelfSign
-
-- (NSInteger)dateFormatIndex {
-    NSInteger dateFormatIndex = 0;
-     
-    return dateFormatIndex;
-}
-
-- (void)setDateFormatIndex:(NSInteger)dateFormatIndex {
-     
-}
-
-- (BOOL)includeTime {
-    BOOL includeTime = YES;
-  
-    return includeTime;
-}
-
-- (void)setIncludeTime:(BOOL)includeTime {
-     
-}
-
-- (CAnnotationType)stampAnnotationType {
-    CAnnotationType stampAnnotationType = CAnnotationTypeUnkown;
-    
-    return stampAnnotationType;
-}
-
-- (void)setStampAnnotationType:(CAnnotationType)stampAnnotationType {
-    
-}
-
-#pragma mark - Measure
-
-- (NSColor *)measureBorderColor {
-    NSColor  *color = nil;
-    
-    return color;
-}
-
-- (void)setMeasureBorderColor:(NSColor *)color {
-     
-}
-
-- (NSColor *)measureLineColor {
-    NSColor  *color = nil;
-     
-    return color;
-}
-
-- (void)setMeasureLineColor:(NSColor *)color {
-    
-}
-
-- (CGFloat)measureOpacity {
-    CGFloat opacity = 1;
-    
-    return opacity;
-}
-
-- (void)setMeasureOpacity:(CGFloat)opacity {
-    
-}
-
-- (CGFloat)measureLineWidth {
-    CGFloat lineWidth = 2;
-     
-    return lineWidth;
-
-}
-
-- (void)setMeasureLineWidth:(CGFloat)lineWidth {
-    
-}
-
-- (CPDFBorderStyle)measureLineStyle {
-    CPDFBorderStyle style = CPDFBorderStyleSolid;
-    
-    return style;
-}
-
-- (void)setMeasureLineStyle:(CPDFBorderStyle)style {
-     
-}
-
-- (NSArray *)measureDashPattern {
-    NSArray *dashPattern = @[@5];
- 
-    return dashPattern;
-}
-
-- (void)setMeasureDashPattern:(NSArray *)dashPattern {
-    
-}
-
-- (CPDFLineStyle)measureStartLineStyle {
-    CPDFLineStyle startLineStyle = CPDFLineStyleNone;
-     
-    return startLineStyle;
-}
-
-- (void)setMeasureStartLineStyle:(CPDFLineStyle)startLineStyle {
-     
-}
-
-- (CPDFLineStyle)measureEndLineStyle {
-    CPDFLineStyle endLineStyle = CPDFLineStyleNone;
-    
-    return endLineStyle;
-}
-
--(void)setMeasureEndLineStyle:(CPDFLineStyle)endLineStyle {
-    
-}
-
-- (NSColor *)measureFontColor {
-    NSColor *fontColor = nil;
-     
-    return fontColor;
-}
-
-- (void)setMeasureFontColor:(NSColor *)fontColor {
-     
-}
-
-- (CGFloat)measureFontSize {
-    CGFloat fontSize = 11;
-    
-    return fontSize;
-}
-
-- (void)setMeasureFontSize:(CGFloat)fontSize {
-     
-}
-
-- (NSString *)measureFontName {
-    NSString  *fontName = nil;
-    
-    return fontName;
-}
-
-- (void)setMeasureFontName:(NSString *)fontName {
-    
-}
-
-@end

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

@@ -21,8 +21,7 @@
 #import "CPDFListView+Extension.h"
 #import "CSelfSignAnnotationFreeText.h"
 
-#import "CSelfSignAnnotation.h"
-#import "CPDFAnnotationModel.h"
+#import "CSelfSignAnnotation.h" 
 #import "CStringConstants.h"
 #import <ComPDFKit/CPDFView+Editing.h>
 #import <ComPDFKit/CMetalShared.h>

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

@@ -15,8 +15,7 @@
 #import "CPDFListView+Private.h"
 #import "NSCursor+PDFListView.h"
 
-#import "NSGeometry+PDFListView.h"
-#import "CPDFAnnotationModel.h"
+#import "NSGeometry+PDFListView.h" 
 #import <PDF_Reader_Pro-Swift.h>
 
 @interface NSEvent (PDFListView)

PDF Office/PDF Master/PDF_Reader_Pro DMG-Bridging-Header.h

@@ -45,8 +45,7 @@
 #import "NSImage_SKExtensions.h"
 
 #import "KMOCTool.h"
-#import "KMGOCRManager.h"
-#import "CPDFAnnotationModel.h"
+#import "KMGOCRManager.h" 
 #import "Reachability.h"
 #import "NSPointerArray+PDFListView.h"
 

PDF Office/PDF Master/PDF_Reader_Pro Edition-Bridging-Header.h

@@ -44,8 +44,7 @@
 #import "NSImage_SKExtensions.h"
 
 #import "KMOCTool.h"
-#import "KMGOCRManager.h"
-#import "CPDFAnnotationModel.h"
+#import "KMGOCRManager.h" 
 #import "CPDFListView.h"
 #import "Reachability.h"
 #import "NSPointerArray+PDFListView.h"

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

@@ -43,8 +43,7 @@
 #import "NSImage_SKExtensions.h"
 
 #import "KMOCTool.h"
-#import "KMGOCRManager.h"
-#import "CPDFAnnotationModel.h"
+#import "KMGOCRManager.h" 
 #import "CPDFListView.h"
 #import "Reachability.h"
 #import "NSPointerArray+PDFListView.h"

PDF Office/PDF Reader Pro.xcodeproj/project.pbxproj

@@ -4384,7 +4384,6 @@
 		BBF71CEE2D5A06E60043FFA2 /* KMPurchaseCompareDMGWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = BBA922142B4E783F0061057A /* KMPurchaseCompareDMGWindowController.m */; };
 		BBF71CEF2D5A06E60043FFA2 /* KMUserFeekbackHanddler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB031B8D2C47CEFA0099F7AD /* KMUserFeekbackHanddler.swift */; };
 		BBF71CF02D5A06E60043FFA2 /* NSString+Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F1FE46F29406E4700E952CA /* NSString+Utils.m */; };
-		BBF71CF12D5A06E60043FFA2 /* CPDFAnnotationModel.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322B8292DF9410013862C /* CPDFAnnotationModel.m */; };
 		BBF71CF22D5A06E60043FFA2 /* CPDFListViewAnimatedBorderlessWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FCFEC6B2AC3D96800EAD2CB /* CPDFListViewAnimatedBorderlessWindow.swift */; };
 		BBF71CF32D5A06E60043FFA2 /* KMPageEditSplitSettingModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBD1F79B296FF7A600343885 /* KMPageEditSplitSettingModel.swift */; };
 		BBF71CF42D5A06E60043FFA2 /* KMRectangleController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB451AA02CF59F5B003E1565 /* KMRectangleController.swift */; };
@@ -5695,9 +5694,6 @@
 		F36AD77729642FE80015AD53 /* CPDFListView+UndoManager.m in Sources */ = {isa = PBXBuildFile; fileRef = F36AD77629642FE80015AD53 /* CPDFListView+UndoManager.m */; };
 		F36AD77829642FE80015AD53 /* CPDFListView+UndoManager.m in Sources */ = {isa = PBXBuildFile; fileRef = F36AD77629642FE80015AD53 /* CPDFListView+UndoManager.m */; };
 		F36AD77929642FE80015AD53 /* CPDFListView+UndoManager.m in Sources */ = {isa = PBXBuildFile; fileRef = F36AD77629642FE80015AD53 /* CPDFListView+UndoManager.m */; };
-		F37322E7292DF9410013862C /* CPDFAnnotationModel.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322B8292DF9410013862C /* CPDFAnnotationModel.m */; };
-		F37322E8292DF9410013862C /* CPDFAnnotationModel.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322B8292DF9410013862C /* CPDFAnnotationModel.m */; };
-		F37322E9292DF9410013862C /* CPDFAnnotationModel.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322B8292DF9410013862C /* CPDFAnnotationModel.m */; };
 		F37322F3292DF9410013862C /* CSelfSignAnnotationFreeText.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322C8292DF9410013862C /* CSelfSignAnnotationFreeText.m */; };
 		F37322F4292DF9410013862C /* CSelfSignAnnotationFreeText.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322C8292DF9410013862C /* CSelfSignAnnotationFreeText.m */; };
 		F37322F5292DF9410013862C /* CSelfSignAnnotationFreeText.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322C8292DF9410013862C /* CSelfSignAnnotationFreeText.m */; };
@@ -7651,13 +7647,11 @@
 		F36AD77529642FE80015AD53 /* CPDFListView+UndoManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "CPDFListView+UndoManager.h"; sourceTree = "<group>"; };
 		F36AD77629642FE80015AD53 /* CPDFListView+UndoManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "CPDFListView+UndoManager.m"; sourceTree = "<group>"; };
 		F3732288292CB4030013862C /* CPDFListView+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CPDFListView+Private.h"; sourceTree = "<group>"; };
-		F37322B8292DF9410013862C /* CPDFAnnotationModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CPDFAnnotationModel.m; sourceTree = "<group>"; };
 		F37322BF292DF9410013862C /* CPDFAnnotationHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPDFAnnotationHeader.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>"; };
 		F37322CA292DF9410013862C /* CSelfSignAnnotationFreeText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSelfSignAnnotationFreeText.h; sourceTree = "<group>"; };
-		F37322CC292DF9410013862C /* CPDFAnnotationModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPDFAnnotationModel.h; 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>"; };
 		F37ACE6A2D0F182C00150B48 /* default.metallib */ = {isa = PBXFileReference; lastKnownFileType = "archive.metal-library"; name = default.metallib; path = "PDF Master/Class/PDFWindowController/PDFSDK/ComPDFKit.framework/Versions/A/Resources/default.metallib"; sourceTree = SOURCE_ROOT; };
@@ -13535,8 +13529,6 @@
 			isa = PBXGroup;
 			children = (
 				F37322BF292DF9410013862C /* CPDFAnnotationHeader.h */,
-				F37322CC292DF9410013862C /* CPDFAnnotationModel.h */,
-				F37322B8292DF9410013862C /* CPDFAnnotationModel.m */,
 				BB6F46CA2CF5E605003FCC3C /* CPDFAnnotationConfig.swift */,
 				BBBB6CC92AD109F30035AA66 /* CPDFAnnotation+PDFListView.swift */,
 				BBBB6CD52AD150D20035AA66 /* CPDFCircleAnnotation+PDFListView.swift */,
@@ -16467,7 +16459,6 @@
 				BBF71CEE2D5A06E60043FFA2 /* KMPurchaseCompareDMGWindowController.m in Sources */,
 				BBF71CEF2D5A06E60043FFA2 /* KMUserFeekbackHanddler.swift in Sources */,
 				BBF71CF02D5A06E60043FFA2 /* NSString+Utils.m in Sources */,
-				BBF71CF12D5A06E60043FFA2 /* CPDFAnnotationModel.m in Sources */,
 				BBF71CF22D5A06E60043FFA2 /* CPDFListViewAnimatedBorderlessWindow.swift in Sources */,
 				BBF71CF32D5A06E60043FFA2 /* KMPageEditSplitSettingModel.swift in Sources */,
 				BBF71CF42D5A06E60043FFA2 /* KMRectangleController.swift in Sources */,
@@ -17063,7 +17054,6 @@
 				AD3AAD2C2B0B6FFA00DE5FE7 /* KMCompareCoveringView.swift in Sources */,
 				651675DC2CE3312000019A20 /* KMBOTAOutlineItem.swift in Sources */,
 				9FD0D2AB2AD5143D00DA3FF8 /* KMTableRowView.swift in Sources */,
-				F37322E7292DF9410013862C /* CPDFAnnotationModel.m in Sources */,
 				F3EF17972CD5FE330007D364 /* KMNThumnailViewController.swift in Sources */,
 				BBFE6E752930E53000142C01 /* KMMergePopoverViewController.swift in Sources */,
 				BB1E7F302B511079002D9785 /* SKInspectPublicTool.swift in Sources */,
@@ -18705,7 +18695,6 @@
 				9FF371DA2C69B933005F9CC5 /* CDistanceSettingWindowController.swift in Sources */,
 				BB2F9AB42AFCC2F800F9DD93 /* KMProfileInfoWindowController.swift in Sources */,
 				BB5A9D682CB6521400F64C1F /* KMPDFSecToolbarController.swift in Sources */,
-				F37322E8292DF9410013862C /* CPDFAnnotationModel.m in Sources */,
 				BBDA8A6A2A31B50C006A2C4E /* KMCustomStepperView.swift in Sources */,
 				AD07BCD72D02CBB20075054B /* KMBaseCompressTableCellView.swift in Sources */,
 				BB6DD822293497B6001F0544 /* KMSecureEncryptModel.swift in Sources */,
@@ -19321,7 +19310,6 @@
 				BBA9221A2B4E783F0061057A /* KMPurchaseCompareDMGWindowController.m in Sources */,
 				BB031B902C47CEFA0099F7AD /* KMUserFeekbackHanddler.swift in Sources */,
 				9F1FE4DA29406E4700E952CA /* NSString+Utils.m in Sources */,
-				F37322E9292DF9410013862C /* CPDFAnnotationModel.m in Sources */,
 				9FCFEC6E2AC3D96800EAD2CB /* CPDFListViewAnimatedBorderlessWindow.swift in Sources */,
 				BBD1F79E296FF7A600343885 /* KMPageEditSplitSettingModel.swift in Sources */,
 				BB451AA42CF59F5B003E1565 /* KMRectangleController.swift in Sources */,