Browse Source

【2025】【Fill】代码整理

niehaoyu 2 months ago
parent
commit
41868ade86
12 changed files with 196 additions and 982 deletions
  1. 2 2
      PDF Office/KMComponentLibrary/KMComponentLibrary.xcodeproj/project.pbxproj
  2. 5 0
      PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/Fill/SelfSign/KMSelfSignAnnotation.swift
  3. 0 16
      PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/AnnotationProperty/KMGeneralAnnotationViewController.swift
  4. 0 17
      PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/AnnotationProperty/View/KMFreeTextStylesViewController/KMFreeTextStylesViewController.h
  5. 0 683
      PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/AnnotationProperty/View/KMFreeTextStylesViewController/KMFreeTextStylesViewController.m
  6. 0 218
      PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/AnnotationProperty/View/KMFreeTextStylesViewController/KMFreeTextStylesViewController.xib
  7. 10 10
      PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/AnnotationProperty/ViewController/KMPropertiesPanelNameSubVC.xib
  8. 1 2
      PDF Office/PDF Master/PDF_Reader_Pro DMG-Bridging-Header.h
  9. 1 2
      PDF Office/PDF Master/PDF_Reader_Pro Edition-Bridging-Header.h
  10. 1 2
      PDF Office/PDF Master/PDF_Reader_Pro-Bridging-Header.h
  11. 0 26
      PDF Office/PDF Reader Pro.xcodeproj/project.pbxproj
  12. 176 4
      PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

+ 2 - 2
PDF Office/KMComponentLibrary/KMComponentLibrary.xcodeproj/project.pbxproj

@@ -1398,7 +1398,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = 4GGQPGRTSV;
+				DEVELOPMENT_TEAM = F552E2RJ98;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -1430,7 +1430,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = 4GGQPGRTSV;
+				DEVELOPMENT_TEAM = F552E2RJ98;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";

+ 5 - 0
PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/Fill/SelfSign/KMSelfSignAnnotation.swift

@@ -7,6 +7,11 @@
 
 import Quartz
 
+@objc extension CSelfSignAnnotation {
+    
+    
+}
+
 @objcMembers class KMSelfSignAnnotation: CPDFStampAnnotation {
 
     var annotationType: CAnnotationType = .unkown {

+ 0 - 16
PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/AnnotationProperty/KMGeneralAnnotationViewController.swift

@@ -951,22 +951,6 @@ let KMColorPickerViewHeight: CGFloat = 64
     }
     
     func openFreeTextStylesViewController() {
-        let vc = KMFreeTextStylesViewController()
-        vc.annotations = annotations
-        vc.annotationModel = self.annotationModel
-        vc.view.frame = CGRect(x: 0, y: 0, width: 280, height: NSHeight(self.view.window?.frame ?? CGRect.zero) - 300)
-        vc.didSelect = { [weak self] data in
-            self?.updateAnnotation()
-        }
-        
-        let createFilePopover = NSPopover()
-        createFilePopover.contentViewController = vc
-        createFilePopover.animates = true
-        createFilePopover.behavior = .transient
-        createFilePopover.show(relativeTo: CGRect(x: textImageBox.bounds.origin.x, y: 10, width: textImageBox.bounds.size.width, height: textImageBox.bounds.size.height), of: textImageBox, preferredEdge: .minY)
-        
-        // Assuming _textImageBox is an NSView instance
-        createFilePopover.show(relativeTo: textImageBox.bounds, of: textImageBox, preferredEdge: .minY)
         
 //         Release is not needed in Swift due to automatic reference counting (ARC)
     }

+ 0 - 17
PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/AnnotationProperty/View/KMFreeTextStylesViewController/KMFreeTextStylesViewController.h

@@ -1,17 +0,0 @@
-//
-//  KMFreeTextStylesViewController.h
-//  PDF Reader Pro Edition
-//
-//  Created by KdanWJ on 2021/1/29.
-//
-
-#import <Cocoa/Cocoa.h>
-#import "CPDFAnnotationModel.h"
-
-@interface KMFreeTextStylesViewController : NSViewController
-
-@property (nonatomic, copy) void (^didSelect) (NSDictionary *data);
-@property (nonatomic, retain) NSArray *annotations;
-@property (nonatomic, retain) CPDFAnnotationModel *annotationModel;
-
-@end

+ 0 - 683
PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/AnnotationProperty/View/KMFreeTextStylesViewController/KMFreeTextStylesViewController.m

@@ -1,683 +0,0 @@
-//
-//  KMFreeTextStylesViewController.m
-//  PDF Reader Pro Edition
-//
-//  Created by KdanWJ on 2021/1/29.
-//
-
-#import "KMFreeTextStylesViewController.h"
-#import "PDF_Reader_Pro-Swift.h"
-//#import "NSMenu_SKExtensions.h"
-//#import <SkimNotes/SkimNotes.h>
-//#import "PDFAnnotation_SKExtensions.h"
-
-typedef NS_ENUM(NSUInteger, KMFreeTextMenuActionType) {
-    KMFreeTextMenuActionType_Redefine = 0,
-    KMFreeTextMenuActionType_Rename,
-    KMFreeTextMenuActionType_Delete,
-    KMFreeTextMenuActionType_Default
-};
-
-#pragma mark - KMScstyleTableRowView
-
-@interface KMScstyleTableRowView : NSTableRowView
-@end
-@implementation KMScstyleTableRowView
-
-- (instancetype)init {
-    self = [super init];
-    if (self) {
-        [self addTrackingArea];
-    }
-    return self;
-}
-
-- (void)addTrackingArea {
-    NSTrackingArea *trackingArea = [[NSTrackingArea alloc] initWithRect:self.bounds options:NSTrackingMouseEnteredAndExited | NSTrackingInVisibleRect | NSTrackingActiveAlways |NSTrackingMouseMoved owner:self userInfo:nil];
-    [self addTrackingArea:trackingArea];
-}
-
-- (void)drawSelectionInRect:(NSRect)dirtyRect {
-        NSRect selectionRect = self.bounds;
-        [[KMAppearance KMColor_Status_Sel] setFill];
-         NSBezierPath *selectionPath = [NSBezierPath bezierPathWithRoundedRect:selectionRect xRadius:0 yRadius:0];
-         [selectionPath fill];
-}
-
-- (void)mouseEntered:(NSEvent *)event {
-    [super mouseEntered:event];
-}
-
-@end
-
-@interface KMFreeTextStyleTableViewCell:NSTableCellView <NSTextFieldDelegate>
-
-@property (nonatomic, retain) IBOutlet NSImageView *checkImageView;
-
-@property (nonatomic, retain) IBOutlet NSButton *updateButton;
-
-@property (nonatomic, retain) IBOutlet NSButton *moreButton;
-
-@property (nonatomic, retain) IBOutlet NSTextField *styleLabel;
-
-@property (assign) IBOutlet NSLayoutConstraint *styleLabelHeightConstant;
-
-@property (nonatomic, copy) void (^mouseMoveCallback) (BOOL mouseEntered);
-
-@property (nonatomic, copy) void (^menuActionCallback) (KMFreeTextMenuActionType memuType);
-
-@property (nonatomic, copy) void (^renameActionCallback) (NSString *count, KMFreeTextMenuActionType memuType);
-
-@property (nonatomic, retain) NSArray *annotations;
-
-@property (nonatomic, retain) NSArray *styleTitles;
-
-@property (nonatomic, assign) NSInteger *selectRow;
-
-@end
-
-@implementation KMFreeTextStyleTableViewCell
-
-- (void)dealloc {
-
-}
-
-- (void)awakeFromNib {
-    [super awakeFromNib];
-    
-    self.checkImageView.hidden = YES;
-        
-    self.updateButton.wantsLayer = YES;
-    self.updateButton.title = @"􀅈";
-    self.updateButton.layer.cornerRadius = CGRectGetWidth(_updateButton.bounds)/2;
-    self.updateButton.layer.backgroundColor = [KMAppearance KMColor_Layout_H2].CGColor;
-    self.updateButton.hidden = YES;
-        
-    self.moreButton.image = [NSImage imageNamed:@"KMImageNameUXIconBtnArrowRight"];
-    _moreButton.hidden = YES;
-    _moreButton.enabled = NO;
-    
-    self.styleLabel.editable = NO;
-    
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(contextDidEndEdit:) name:NSControlTextDidEndEditingNotification object:_styleLabel];
-}
-
-- (void)viewDidMoveToWindow {
-    [super viewDidMoveToWindow];
-    if ([self window] != nil) {
-        [self addTrackingRect:[self bounds]
-                        owner:self
-                     userData:NULL
-                 assumeInside:NO];
-    }
-}
-
-- (void)setFrameSize:(NSSize)newSize {
-    [super setFrameSize:newSize];
-    [self addTrackingRect:NSMakeRect(0, 0, newSize.width, newSize.height)
-                    owner:self
-                 userData:NULL
-             assumeInside:NO];
-}
-
-- (void)mouseEntered:(NSEvent *)event {
-    if (self.mouseMoveCallback) {
-        self.mouseMoveCallback(YES);
-    }
-}
-
-- (void)mouseExited:(NSEvent *)event {
-    if (self.mouseMoveCallback) {
-        self.mouseMoveCallback(NO);
-    }
-}
-
-- (BOOL) isChange {
-    int selectInt = (int)self.selectRow;
-
-    NSAttributedString *string = self.styleLabel.attributedStringValue;
-    if(string.length < 1) {
-        return NO;
-    }
-    NSDictionary *dict = [string attributesAtIndex:0 effectiveRange:nil];
-    NSFont *font = dict[NSFontAttributeName];
-    NSColor *color = dict[NSForegroundColorAttributeName];
-    NSInteger alignment = self.styleLabel.alignment;
-    
-    BOOL colorIsEqual = NO;
-    BOOL alignEqual = NO;
-    BOOL fontSizeEqual = NO;
-    BOOL fontWeightEqual = NO;
-    BOOL fontNameEqual = NO;
-    BOOL stringEqual = NO;
-    
-    NSColor *color2 = nil;
-    if (_styleTitles[selectInt][@"Font Color"]) {
-        color2 = [NSUnarchiver unarchiveObjectWithData:_styleTitles[selectInt][@"Font Color"]];
-    }
-    if (CGColorEqualToColor(color.CGColor, color2.CGColor)){
-        colorIsEqual = YES;
-    }
-    NSString *alignString = @"NSTextAlignmentLeft";
-    if (_styleLabel.alignment == NSTextAlignmentLeft) {
-        alignment = @"NSTextAlignmentLeft";
-    } else if (_styleLabel.alignment == NSTextAlignmentCenter) {
-        alignment = @"NSTextAlignmentCenter";
-    } else if (_styleLabel.alignment == NSTextAlignmentRight) {
-        alignment = @"NSTextAlignmentRight";
-    } else if (_styleLabel.alignment == NSTextAlignmentJustified) {
-        alignment = @"NSTextAlignmentJustified";
-    }
-    if ([alignString isEqualToString:_styleTitles[selectInt][@"Font Alignment"]]) {
-        alignEqual = YES;
-    }
-    if ([_styleLabel.stringValue isEqualToString:_styleTitles[selectInt][@"StringValue"]]) {
-        stringEqual = YES;
-    }
-    NSString *fontSize = [NSString stringWithFormat:@"%.f",font.pointSize];
-    if ([fontSize isEqualToString:_styleTitles[selectInt][@"Font Size"]]) {
-        fontSizeEqual = YES;
-    }
-    if ([font.fontName isEqualToString:_styleTitles[selectInt][@"Font Name"]]) {
-        fontNameEqual = YES;
-    }
-    NSString *weight = [font.fontDescriptor objectForKey:NSFontFaceAttribute];
-    if ([weight isEqualToString:_styleTitles[selectInt][@"Font Weight"]]) {
-        fontWeightEqual = YES;
-    }
-    
-    if (colorIsEqual && alignEqual && fontSizeEqual && fontWeightEqual && stringEqual) {
-        return NO;
-    } else {
-        return YES;
-    }
-}
-
-#pragma mark - Action
-
-- (IBAction)updateButtonAction:(NSButton *)sender {
-    
-}
-
-- (IBAction)moreButtonAction:(NSButton *)sender {
-    NSMenu *menu = [[NSMenu alloc] init];
-    NSMenuItem *redefineItem = [menu addItemWithTitle:NSLocalizedString(@"Redefine from Selection", nil) action:@selector(redefineAction:) target:self];
-    [redefineItem setRepresentedObject:self];
-    [menu addItem:[NSMenuItem separatorItem]];
-    NSMenuItem *renameItem = [menu addItemWithTitle:NSLocalizedString(@"Rename Style", nil) action:@selector(renameAction:) target:self];
-    [renameItem setRepresentedObject:self];
-    [menu addItem:[NSMenuItem separatorItem]];
-    NSMenuItem *deleteItem = [menu addItemWithTitle:NSLocalizedString(@"Delete style", nil) action:@selector(deleteAction:) target:self];
-    [deleteItem setRepresentedObject:self];
-    NSMenuItem *defaultItem = [menu addItemWithTitle:NSLocalizedString(@"Restore Default Style", nil) action:@selector(defaultAction:) target:self];
-    [defaultItem setRepresentedObject:self];
-    [NSMenu popUpContextMenu:menu withEvent:[NSApp currentEvent] forView:(NSButton *)sender];
-}
-
-- (IBAction)redefineAction:(id)sender {
-    if (self.menuActionCallback) {
-        self.menuActionCallback(KMFreeTextMenuActionType_Redefine);
-    }
-}
-
-- (IBAction)renameAction:(id)sender {
-    _styleLabel.editable = YES;
-    [_styleLabel becomeFirstResponder];
-}
-
-- (IBAction)deleteAction:(id)sender {
-    if (self.menuActionCallback) {
-        self.menuActionCallback(KMFreeTextMenuActionType_Delete);
-    }
-}
-
-- (IBAction)defaultAction:(id)sender {
-    if (self.menuActionCallback) {
-        self.menuActionCallback(KMFreeTextMenuActionType_Default);
-    }
-}
-
-- (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
-    SEL action = [menuItem action];
-    if (action == @selector(redefineAction:)) {
-        PDFAnnotation *annotation = _annotations.firstObject;
-//        if (annotation.string != nil) {
-//            return YES;
-//        } else {
-            return NO;
-//        }
-    } else if (action == @selector(deleteAction:)) {
-        if (_styleTitles.count > 1) {
-            return YES;
-        } else {
-            return NO;
-        }
-    } else if (action == @selector(defaultAction:)) {
-        if (_selectRow > 9) {
-            return NO;
-        } else {
-            if (_styleTitles.count > 1) {
-                if ([self isChange]) {
-                    return YES;
-                } else {
-                    return NO;
-                }
-            }
-            return YES;
-        }
-    }
-    return YES;
-}
-
-#pragma mark - NSNotification
-
-- (void)contextDidEndEdit:(NSNotification *)notification {
-    NSTextField *textField = (NSTextField *)notification.object;
-    
-    if (self.renameActionCallback) {
-        self.renameActionCallback(textField.stringValue, KMFreeTextMenuActionType_Rename);
-    }
-}
-
-@end
-
-@interface KMFreeTextStylesViewController () <NSTableViewDelegate, NSTableViewDataSource>
-
-@property (assign) IBOutlet NSTextField *defaultStylesLabel;
-@property (assign) IBOutlet NSButton *styleAddButton;
-@property (assign) IBOutlet NSButton *styleMoreButton;
-
-@property (assign) IBOutlet NSScrollView *styleScrollView;
-@property (assign) IBOutlet NSTableView *scstyleTableView;
-
-@property (nonatomic, retain) NSMutableArray <NSDictionary *>*freetextStyles;
-
-@property (nonatomic, assign) NSInteger lastSelectRow;
-
-@end
-
-@implementation KMFreeTextStylesViewController
-
-- (void)dealloc {
-
-}
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    // Do view setup here.
-    
-    self.defaultStylesLabel.stringValue = NSLocalizedString(@"Default Style", nil);
-    
-    self.styleAddButton.image = [NSImage imageNamed:@"KMImageNameUXIconBtnAddNor"];
-    self.styleMoreButton.image = [NSImage imageNamed:@"KMImageNameUXIconBtnSidebarMoreSecondary"];
-    
-    [[_defaultStylesLabel cell] setLineBreakMode:NSLineBreakByCharWrapping];
-    [[_defaultStylesLabel cell] setTruncatesLastVisibleLine:YES];
-    
-    self.lastSelectRow = -1;
-}
-
-#pragma mark - View Methods
-
-#pragma mark - freetextStyles
-
-- (void)setFreetextStyles:(NSMutableArray<NSDictionary *> *)freetextStyles {
-    [[NSUserDefaults standardUserDefaults] setObject:freetextStyles forKey:@"KMFreetextAnnotationStylesKey"];
-    [[NSUserDefaults standardUserDefaults] synchronize];
-}
-
-- (NSMutableArray<NSDictionary *> *)freetextStyles {
-    if ([[NSUserDefaults standardUserDefaults] objectForKey:@"KMFreetextAnnotationStylesKey"]) {
-        return [[NSUserDefaults standardUserDefaults] objectForKey:@"KMFreetextAnnotationStylesKey"];
-    } else {
-        return [self defaultFreetextStyles];
-    }
-}
-
-- (NSMutableArray <NSDictionary *>*)defaultFreetextStyles {
-    return @[@{@"Font Name" : @"PingFang HK", @"Font Size" : @"40", @"Font Weight" : @"Semibold", @"Font Color" : [self dataForColor:[NSColor colorWithRed:36/255.0 green:42/255.0 blue:51/255.0 alpha:1.0]], @"Font Alignment" : @"NSTextAlignmentLeft", @"StringValue" : NSLocalizedString(@"The Headlines", nil)},
-             @{@"Font Name" : @"PingFang HK", @"Font Size" : @"32", @"Font Weight" : @"Semibold", @"Font Color" : [self dataForColor:[NSColor colorWithRed:36/255.0 green:42/255.0 blue:51/255.0 alpha:1.0]], @"Font Alignment" : @"NSTextAlignmentLeft", @"StringValue" : NSLocalizedString(@"Title (small)", nil)},
-             @{@"Font Name" : @"PingFang HK", @"Font Size" : @"24", @"Font Weight" : @"Semibold", @"Font Color" : [self dataForColor:[NSColor colorWithRed:36/255.0 green:42/255.0 blue:51/255.0 alpha:1.0]], @"Font Alignment" : @"NSTextAlignmentLeft", @"StringValue" : NSLocalizedString(@"Subtitle (Bold)", nil)},
-             @{@"Font Name" : @"PingFang HK", @"Font Size" : @"24", @"Font Weight" : @"Regular", @"Font Color" : [self dataForColor:[NSColor colorWithRed:36/255.0 green:42/255.0 blue:51/255.0 alpha:1.0]], @"Font Alignment" : @"NSTextAlignmentLeft", @"StringValue" : NSLocalizedString(@"Subtitle", nil)},
-             @{@"Font Name" : @"PingFang HK", @"Font Size" : @"20", @"Font Weight" : @"Regular", @"Font Color" : [self dataForColor:[NSColor colorWithRed:36/255.0 green:42/255.0 blue:51/255.0 alpha:1.0]], @"Font Alignment" : @"NSTextAlignmentLeft", @"StringValue" : NSLocalizedString(@"Text", nil)},
-             @{@"Font Name" : @"PingFang HK", @"Font Size" : @"16", @"Font Weight" : @"Regular", @"Font Color" : [self dataForColor:[NSColor colorWithRed:36/255.0 green:42/255.0 blue:51/255.0 alpha:1.0]], @"Font Alignment" : @"NSTextAlignmentLeft", @"StringValue" : NSLocalizedString(@"Text (small)", nil)},
-             @{@"Font Name" : @"PingFang HK", @"Font Size" : @"16", @"Font Weight" : @"Regular", @"Font Color" : [self dataForColor:[NSColor colorWithRed:117/255.0 green:119/255.0 blue:128/255.0 alpha:1.0]], @"Font Alignment" : @"NSTextAlignmentLeft", @"StringValue" : NSLocalizedString(@"Text (grey)", nil)},
-             @{@"Font Name" : @"PingFang HK", @"Font Size" : @"14", @"Font Weight" : @"Semibold", @"Font Color" : [self dataForColor:[NSColor colorWithRed:36/255.0 green:42/255.0 blue:51/255.0 alpha:1.0]], @"Font Alignment" : @"NSTextAlignmentLeft", @"StringValue" : NSLocalizedString(@"Instructions", nil)},
-             @{@"Font Name" : @"PingFang HK", @"Font Size" : @"16", @"Font Weight" : @"Semibold", @"Font Color" : [self dataForColor:[NSColor colorWithRed:200/255.0 green:38/255.0 blue:6/255.0 alpha:1.0]], @"Font Alignment" : @"NSTextAlignmentLeft", @"StringValue" : NSLocalizedString(@"Instructions (red)", nil)},
-             @{@"Font Name" : @"PingFang HK", @"Font Size" : @"12", @"Font Weight" : @"Regular", @"Font Color" : [self dataForColor:[NSColor colorWithRed:36/255.0 green:42/255.0 blue:51/255.0 alpha:1.0]], @"Font Alignment" : @"NSTextAlignmentLeft", @"StringValue" : NSLocalizedString(@"Annotations", nil)}];
-}
-
-- (NSColor *)colorForData:(NSData *)data {
-    NSColor *color = nil;
-    if (data) {
-        color = [NSUnarchiver unarchiveObjectWithData:data];
-    }
-    return color;
-}
-
-- (NSData *)dataForColor:(NSColor *)color {
-    NSData *data = color ? [NSArchiver archivedDataWithRootObject:color] : nil;
-    return data;
-}
-
-- (CGFloat)heightForNoteStringValue:(NSString *)text attrited:(NSDictionary *)attrited {
-    CGSize maxSize = CGSizeMake(MAXFLOAT, MAXFLOAT);
-    NSStringDrawingOptions opts = NSStringDrawingUsesLineFragmentOrigin| NSStringDrawingUsesFontLeading;
-    CGRect rect = [text boundingRectWithSize:maxSize
-                                     options:opts
-                                  attributes:attrited
-                                     context:nil];
-    return rect.size.height;
-}
-
-#pragma mark - Action
-
-- (IBAction)styleAddButtonAction:(NSButton *)sender {
-    PDFAnnotationFreeText *annotation = (PDFAnnotationFreeText *)self.annotations.firstObject;
-    
-    NSFont *annotationModelFont = [NSFont fontWithName:_annotationModel.fontName size:12];
-    
-    NSString *fontName = annotation?[annotation.font.fontDescriptor objectForKey:NSFontFamilyAttribute] ? : @"PingFang HK" : annotationModelFont.fontName;
-    NSString *fontSize = [NSString stringWithFormat:@"%f", annotation? annotation.font.pointSize : _annotationModel.fontSize] ? : @"20";
-    NSString *fontWeight = annotation?[annotation.font.fontDescriptor objectForKey:NSFontFaceAttribute] ? : @"Regular" : [annotationModelFont.fontDescriptor objectForKey:NSFontFaceAttribute];
-    NSColor *fontColor = annotation? annotation.fontColor ? : [NSColor colorWithRed:36/255.0 green:42/255.0 blue:51/255.0 alpha:1.0] : _annotationModel.fontColor;
-    NSColor *backgroundColor = annotation? annotation.color ? : [NSColor colorWithRed:36/255.0 green:42/255.0 blue:51/255.0 alpha:1.0] : _annotationModel.color;
-    NSString *alignmentType = @"NSTextAlignmentLeft";
-    NSTextAlignment *alignment = annotation? annotation.alignment : _annotationModel.alignment;
-    if (alignment == NSTextAlignmentLeft) {
-        alignmentType = @"NSTextAlignmentLeft";
-    } else if (alignment == NSTextAlignmentCenter) {
-        alignmentType = @"NSTextAlignmentCenter";
-    } else if (alignment == NSTextAlignmentRight) {
-        alignmentType = @"NSTextAlignmentRight";
-    } else if (alignment == NSTextAlignmentJustified) {
-        alignmentType = @"NSTextAlignmentJustified";
-    }
-    NSString *fontAlignment = alignmentType ? : @"NSTextAlignmentLeft";
-    NSString *noteString = /*annotation.string ? :*/ NSLocalizedString(@"Text", nil);
-    NSDictionary *dict = @{@"Font Name" : fontName, @"Font Size" : fontSize, @"Font Weight" : fontWeight, @"Font Color" : [self dataForColor:fontColor], @"Font Alignment" : fontAlignment, @"StringValue" : noteString};
-    NSMutableArray <NSDictionary *>*styleArr = [NSMutableArray arrayWithArray:[self freetextStyles]];
-    [styleArr addObject:dict];
-    [self setFreetextStyles:styleArr];
-    
-    [_scstyleTableView reloadData];
-    
-    NSIndexSet *indexSet = [NSIndexSet indexSetWithIndex:(styleArr.count - 1)];
-    [self.scstyleTableView selectRowIndexes:indexSet byExtendingSelection:NO];
-    [self.scstyleTableView.enclosingScrollView.contentView scrollToPoint:NSMakePoint(0, ((NSView*)self.scstyleTableView.enclosingScrollView.documentView).frame.size.height - self.scstyleTableView.enclosingScrollView.contentSize.height)];
-}
-
-- (IBAction)styleMoreButtonAction:(NSButton *)sender {
-    NSMenu *menu = [[NSMenu alloc] init];
-    NSMenuItem *moreItem = [menu addItemWithTitle:NSLocalizedString(@"Restore Default Style", nil) action:@selector(freetextNote_moreAction:) target:self];
-    [moreItem setRepresentedObject:self];
-    [NSMenu popUpContextMenu:menu withEvent:[NSApp currentEvent] forView:(NSButton *)sender];
-}
-
-- (IBAction)freetextNote_moreAction:(id)sender {
-    [self setFreetextStyles:[self defaultFreetextStyles]];
-    
-    [_scstyleTableView reloadData];
-}
-
-- (void)redefineAction:(NSInteger)count {
-    if (self.annotations.count > 0) {
-        PDFAnnotationFreeText *tAnnotation = (PDFAnnotationFreeText *)self.annotations.firstObject;
-        NSString * family =   [tAnnotation.font.fontDescriptor objectForKey:NSFontFamilyAttribute];
-        NSString * style =   [tAnnotation.font.fontDescriptor objectForKey:NSFontFaceAttribute];
-        NSString *fontSize = [NSString stringWithFormat:@"%f",tAnnotation.font.pointSize];
-        NSColor *color = tAnnotation.fontColor;
-        NSString *alignment = @"NSTextAlignmentLeft";
-        if (tAnnotation.alignment == NSTextAlignmentLeft) {
-            alignment = @"NSTextAlignmentLeft";
-        } else if (tAnnotation.alignment == NSTextAlignmentCenter) {
-            alignment = @"NSTextAlignmentCenter";
-        } else if (tAnnotation.alignment == NSTextAlignmentRight) {
-            alignment = @"NSTextAlignmentRight";
-        } else if (tAnnotation.alignment == NSTextAlignmentJustified) {
-            alignment = @"NSTextAlignmentJustified";
-        }
-        NSString *stringValue = @"";
-        /*if (tAnnotation.string && tAnnotation.string.length > 0) {
-            stringValue = tAnnotation.string;
-        } else */if (count < (NSInteger)self.defaultFreetextStyles.count) {
-            NSDictionary *dict = self.defaultFreetextStyles[count];
-            stringValue = dict[@"StringValue"] ? : @"";
-        }
-        
-        NSMutableArray <NSDictionary *>*dictArr = [NSMutableArray arrayWithArray:[self freetextStyles]];
-        dictArr[count] = @{@"Font Name" : family, @"Font Size" : fontSize, @"Font Weight" : style, @"Font Color" : [self dataForColor:color], @"Font Alignment" : alignment, @"StringValue" : stringValue};
-        [self setFreetextStyles:dictArr];
-        [_scstyleTableView reloadData];
-    }
-}
-
-- (IBAction)renameAction:(NSString *)value
-                   Count:(NSInteger)count {
-    if(count >= [self freetextStyles].count) return;
-    NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithDictionary:[self freetextStyles][count]];
-    [dict setObject:value forKey:@"StringValue"];
-    NSMutableArray *styleArr = [NSMutableArray arrayWithArray:[self freetextStyles]];
-    styleArr[count] = (NSDictionary *)dict;
-    [self setFreetextStyles:styleArr];
-    
-    NSInteger selectRow = _scstyleTableView.selectedRow;
-    [_scstyleTableView reloadData];
-    if (selectRow >= 0 && selectRow < self.scstyleTableView.numberOfRows) {
-        NSIndexSet *indexSet = [NSIndexSet indexSetWithIndex:selectRow];
-        [self.scstyleTableView selectRowIndexes:indexSet byExtendingSelection:NO];
-    }
-}
-
-- (IBAction)deleteAction:(NSInteger)count {
-    NSMutableArray *styleArr = [NSMutableArray arrayWithArray:[self freetextStyles]];
-    [styleArr removeObjectAtIndex:count];
-    [self setFreetextStyles:styleArr];
-    
-    [self.scstyleTableView reloadData];
-}
-
-- (IBAction)defaultAction:(NSInteger)count {
-    if (count < 10) {
-        NSDictionary *dict = [self defaultFreetextStyles][count];
-        
-        NSMutableArray *styleArr = [NSMutableArray arrayWithArray:[self freetextStyles]];
-        styleArr[count] = dict;
-        [self setFreetextStyles:styleArr];
-        
-        NSMutableIndexSet *rowIndexSet = [[NSMutableIndexSet alloc] init];
-        [rowIndexSet addIndex:count];
-        NSMutableIndexSet *columnIndexSet = [[NSMutableIndexSet alloc] init];
-        [columnIndexSet addIndex:0];
-        [self.scstyleTableView reloadDataForRowIndexes:rowIndexSet columnIndexes:columnIndexSet];
-    }
-}
-
-#pragma mark - NSTableViewDelegate, NSTableViewDataSource
-
-- (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView {
-    return [self freetextStyles].count;
-}
-
-- (CGFloat)tableView:(NSTableView *)tableView heightOfRow:(NSInteger)row {
-    NSDictionary *dict = [self freetextStyles][row];
-    NSString *fontName = dict[@"Font Name"];
-    CGFloat fontSize = [dict[@"Font Size"] floatValue];
-    NSString *fontWeight = dict[@"Font Weight"];
-    NSString *fontStringValue = dict[@"StringValue"];
-    
-    NSMutableParagraphStyle *paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
-    paragraphStyle.lineBreakMode = NSLineBreakByWordWrapping;
-    paragraphStyle.alignment = NSTextAlignmentLeft;
-    paragraphStyle.lineSpacing = 1;
-    
-    NSFontDescriptor *attributeFontDescriptor = [NSFontDescriptor fontDescriptorWithFontAttributes:@{NSFontFamilyAttribute:fontName,NSFontFaceAttribute:fontWeight}];
-    NSFont *font = [NSFont fontWithDescriptor:attributeFontDescriptor size:fontSize];
-    if (font == nil) {
-        font = [NSFont fontWithName:fontName size:fontSize];
-    }
-    NSDictionary *attrited = @{NSFontAttributeName:font, NSParagraphStyleAttributeName: paragraphStyle};
-       
-   CGRect rect = [fontStringValue boundingRectWithSize:CGSizeMake(135.0, CGRectMaxYEdge)
-                                        options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading
-                                     attributes:attrited
-                                        context:nil];
-    return CGRectGetHeight(rect);
-}
-
-- (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row {
-    NSString *identifier = [tableColumn identifier];
-    KMFreeTextStyleTableViewCell *cellView = [tableView makeViewWithIdentifier:identifier owner:self];
-    NSDictionary *dict = [self freetextStyles][row];
-    NSString *fontName = dict[@"Font Name"];
-    CGFloat fontSize = [dict[@"Font Size"] floatValue];
-    NSString *fontWeight = dict[@"Font Weight"];
-    NSColor *fontColor = [self colorForData:dict[@"Font Color"]];
-    NSString *fontAlignment = dict[@"Font Alignment"];
-    NSString *fontStringValue = dict[@"StringValue"];
-    
-    if (@available(macOS 10.14, *)) {
-        cellView.styleLabel.wantsLayer = YES;
-        NSAppearanceName appearanceName = [[NSApp effectiveAppearance] bestMatchFromAppearancesWithNames:@[NSAppearanceNameAqua, NSAppearanceNameDarkAqua]];
-        if ([appearanceName isEqualToString:NSAppearanceNameDarkAqua]) {
-            if (row == 0 || row == 1 || row == 2 || row == 3 || row == 4 || row == 5  || row == 7 || row == 9) {
-                cellView.styleLabel.layer.backgroundColor = [KMAppearance KMColor_Layout_W30].CGColor;
-            } else {
-                cellView.styleLabel.layer.backgroundColor = [NSColor clearColor].CGColor;
-            }
-        } else {
-            cellView.styleLabel.layer.backgroundColor = [NSColor clearColor].CGColor;
-        }
-    }
-    
-    NSFontDescriptor *attributeFontDescriptor = [NSFontDescriptor fontDescriptorWithFontAttributes:@{NSFontFamilyAttribute:fontName,NSFontFaceAttribute:fontWeight}];
-    NSFont *font = [NSFont fontWithDescriptor:attributeFontDescriptor size:fontSize];
-    if (font == nil) {
-        font = [NSFont fontWithName:fontName size:fontSize];
-    }
-    NSDictionary *attrited = @{NSFontAttributeName:font, NSForegroundColorAttributeName:fontColor};
-    NSAttributedString *string = [[NSAttributedString alloc] initWithString:fontStringValue attributes:attrited];
-    cellView.styleLabel.attributedStringValue = string;
-    if ([fontAlignment isEqualToString:@"NSTextAlignmentLeft"]) {
-        cellView.styleLabel.alignment = NSTextAlignmentLeft;
-    } else if ([fontAlignment isEqualToString:@"NSTextAlignmentCenter"]) {
-        cellView.styleLabel.alignment = NSTextAlignmentCenter;
-    } else if ([fontAlignment isEqualToString:@"NSTextAlignmentRight"]) {
-        cellView.styleLabel.alignment = NSTextAlignmentRight;
-    } else if ([fontAlignment isEqualToString:@"NSTextAlignmentJustified"]) {
-        cellView.styleLabel.alignment = NSTextAlignmentJustified;
-    }
-    cellView.styleLabelHeightConstant.constant = [self heightForNoteStringValue:fontStringValue attrited:attrited];
-    
-    cellView.annotations = _annotations;
-    cellView.styleTitles = [self freetextStyles];
-    cellView.selectRow = row;
-    
-    if (row != tableView.selectedRow) {
-        cellView.moreButton.hidden = YES;
-        cellView.moreButton.enabled = NO;
-    }
-    
-    cellView.mouseMoveCallback = ^(BOOL mouseEntered) {
-        if (mouseEntered) {
-            cellView.moreButton.hidden = NO;
-            cellView.moreButton.enabled = YES;
-        } else {
-            if (row != tableView.selectedRow) {
-                cellView.moreButton.hidden = YES;
-                cellView.moreButton.enabled = NO;
-            }
-        }
-    };
-    
-    __block typeof(self) blockSelf = self;
-    cellView.menuActionCallback = ^(KMFreeTextMenuActionType memuType) {
-        switch (memuType) {
-            case KMFreeTextMenuActionType_Redefine:
-                [blockSelf redefineAction:row];
-                break;
-            case KMFreeTextMenuActionType_Delete:
-                [blockSelf deleteAction:row];
-                break;
-            case KMFreeTextMenuActionType_Default:
-                [blockSelf.view.window makeFirstResponder:nil];
-                [blockSelf defaultAction:row];
-                break;
-            default:
-                break;
-        }
-    };
-    
-    cellView.renameActionCallback = ^(NSString *count, KMFreeTextMenuActionType memuType) {
-        if (memuType == KMFreeTextMenuActionType_Rename) {
-            [blockSelf renameAction:count Count:row];
-        }
-    };
-    
-    return cellView;
-}
-
-- (void)tableViewSelectionDidChange:(NSNotification *)notification {
-    NSTableView *tableView = (NSTableView *)notification.object;
-    NSInteger selectRow = tableView.selectedRow;
-    if(selectRow < 0) return;
-    if (_lastSelectRow != selectRow && _lastSelectRow != -1) {
-        NSMutableIndexSet *rowIndexSet = [[NSMutableIndexSet alloc] init];
-        [rowIndexSet addIndex:_lastSelectRow];
-        NSMutableIndexSet *columnIndexSet = [[NSMutableIndexSet alloc] init];
-        [columnIndexSet addIndex:0];
-        [tableView reloadDataForRowIndexes:rowIndexSet columnIndexes:columnIndexSet];
-    }
-    _lastSelectRow = selectRow;
-    
-    NSDictionary *dict = [self freetextStyles][selectRow];
-    NSString *fontName = dict[@"Font Name"];
-    CGFloat fontSize = [dict[@"Font Size"] floatValue];
-    NSString *fontWeight = dict[@"Font Weight"];
-    NSColor *fontColor = [self colorForData:dict[@"Font Color"]];
-    NSString *fontAlignment = dict[@"Font Alignment"];
-    
-    NSTextAlignment alignment = NSTextAlignmentLeft;
-    if ([fontAlignment isEqualToString:@"NSTextAlignmentLeft"]) {
-        alignment = NSTextAlignmentLeft;
-    } else if ([fontAlignment isEqualToString:@"NSTextAlignmentCenter"]) {
-        alignment = NSTextAlignmentCenter;
-    } else if ([fontAlignment isEqualToString:@"NSTextAlignmentRight"]) {
-        alignment = NSTextAlignmentRight;
-    } else if ([fontAlignment isEqualToString:@"NSTextAlignmentJustified"]) {
-        alignment = NSTextAlignmentJustified;
-    }
-    
-    for (PDFAnnotation *tAnnotation in self.annotations) {
-        NSFontDescriptor *attributeFontDescriptor = [NSFontDescriptor fontDescriptorWithFontAttributes:@{NSFontFamilyAttribute:fontName,NSFontFaceAttribute:fontWeight}];
-        NSFont *font = [NSFont fontWithDescriptor:attributeFontDescriptor size:fontSize];
-        if (font == nil) {
-            font = [NSFont fontWithName:fontName size:fontSize];
-        }
-        if (font) {
-            tAnnotation.font = font;
-        }
-        if (fontColor) {
-            tAnnotation.fontColor = fontColor;
-        }
-        tAnnotation.alignment = alignment;
-    }
-    
-    if (self.annotationModel != nil) {
-        [self.annotationModel setFontName: fontName];
-        [self.annotationModel setFontSize:fontSize];
-        [self.annotationModel setFontColor:fontColor];
-        [self.annotationModel setAlignment:alignment];
-//        [self.annotationModel.annotation updateAppearanceStream];
-    }
-    
-    if (_didSelect != nil)
-        self.didSelect(dict);
-}
-
-- (NSTableRowView *)tableView:(NSTableView *)tableView rowViewForRow:(NSInteger)row {
-    KMScstyleTableRowView *rowView = [[KMScstyleTableRowView alloc] init];
-    return rowView;
-}
-
-@end

+ 0 - 218
PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/AnnotationProperty/View/KMFreeTextStylesViewController/KMFreeTextStylesViewController.xib

@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
-    <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMFreeTextStylesViewController">
-            <connections>
-                <outlet property="defaultStylesLabel" destination="Gzb-9T-0tE" id="Gmc-hB-Zzh"/>
-                <outlet property="scstyleTableView" destination="Z7J-YB-AAs" id="THM-R9-2TJ"/>
-                <outlet property="styleAddButton" destination="k3S-hD-FHn" id="2j8-lO-MhV"/>
-                <outlet property="styleMoreButton" destination="13Z-Zn-F1p" id="CPL-5g-fyk"/>
-                <outlet property="styleScrollView" destination="7y1-Xw-f9S" id="y6W-oa-LAL"/>
-                <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
-            </connections>
-        </customObject>
-        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customView misplaced="YES" id="Hz6-mo-xeY">
-            <rect key="frame" x="0.0" y="0.0" width="280" height="350"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-            <subviews>
-                <customView translatesAutoresizingMaskIntoConstraints="NO" id="oKi-FG-j4C">
-                    <rect key="frame" x="0.0" y="234" width="280" height="30"/>
-                    <subviews>
-                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Gzb-9T-0tE">
-                            <rect key="frame" x="121" y="8" width="39" height="15"/>
-                            <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="Label" id="V6W-Qz-DGI">
-                                <font key="font" metaFont="cellTitle"/>
-                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                            </textFieldCell>
-                        </textField>
-                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="k3S-hD-FHn">
-                            <rect key="frame" x="232" y="7" width="16" height="16"/>
-                            <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="KMImageNameUXIconBtnAddNor" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="ltt-nH-5Da">
-                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                <font key="font" metaFont="system"/>
-                            </buttonCell>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="16" id="ryH-wu-HIA"/>
-                                <constraint firstAttribute="width" constant="16" id="xXX-Rj-Ur3"/>
-                            </constraints>
-                            <connections>
-                                <action selector="styleAddButtonAction:" target="-2" id="7Le-QW-AWT"/>
-                            </connections>
-                        </button>
-                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="13Z-Zn-F1p">
-                            <rect key="frame" x="256" y="7" width="16" height="16"/>
-                            <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="KMImageNameUXIconBtnSidebarMoreSecondary" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="4e5-xG-0os">
-                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                <font key="font" metaFont="system"/>
-                            </buttonCell>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="16" id="At0-OD-C3r"/>
-                                <constraint firstAttribute="height" constant="16" id="n8c-lz-3tg"/>
-                            </constraints>
-                            <connections>
-                                <action selector="styleMoreButtonAction:" target="-2" id="Ehx-EB-NAR"/>
-                            </connections>
-                        </button>
-                        <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="eSd-Jr-1St">
-                            <rect key="frame" x="12" y="-2" width="256" height="5"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="1" id="l9W-d2-K3y"/>
-                            </constraints>
-                        </box>
-                    </subviews>
-                    <constraints>
-                        <constraint firstItem="13Z-Zn-F1p" firstAttribute="centerY" secondItem="k3S-hD-FHn" secondAttribute="centerY" id="01U-VO-f5a"/>
-                        <constraint firstItem="Gzb-9T-0tE" firstAttribute="centerY" secondItem="oKi-FG-j4C" secondAttribute="centerY" id="HxR-o0-ZiH"/>
-                        <constraint firstItem="13Z-Zn-F1p" firstAttribute="centerY" secondItem="oKi-FG-j4C" secondAttribute="centerY" id="JwJ-qT-HBo"/>
-                        <constraint firstAttribute="bottom" secondItem="eSd-Jr-1St" secondAttribute="bottom" id="SJy-pf-AUT"/>
-                        <constraint firstItem="13Z-Zn-F1p" firstAttribute="leading" secondItem="k3S-hD-FHn" secondAttribute="trailing" constant="8" id="VPx-m3-5v6"/>
-                        <constraint firstAttribute="trailing" secondItem="13Z-Zn-F1p" secondAttribute="trailing" constant="8" id="hhi-Va-RnO"/>
-                        <constraint firstAttribute="height" constant="30" id="kCJ-zE-5Im"/>
-                        <constraint firstItem="Gzb-9T-0tE" firstAttribute="centerX" secondItem="oKi-FG-j4C" secondAttribute="centerX" id="mQl-Oc-r0G"/>
-                        <constraint firstAttribute="trailing" secondItem="eSd-Jr-1St" secondAttribute="trailing" constant="12" id="tqk-eU-RRn"/>
-                        <constraint firstItem="eSd-Jr-1St" firstAttribute="leading" secondItem="oKi-FG-j4C" secondAttribute="leading" constant="12" id="ycp-eC-o09"/>
-                    </constraints>
-                </customView>
-                <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="77" horizontalPageScroll="10" verticalLineScroll="77" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7y1-Xw-f9S">
-                    <rect key="frame" x="0.0" y="0.0" width="280" height="234"/>
-                    <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="60s-CE-t8g">
-                        <rect key="frame" x="0.0" y="0.0" width="280" height="234"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="75" rowSizeStyle="automatic" viewBased="YES" id="Z7J-YB-AAs">
-                                <rect key="frame" x="0.0" y="0.0" width="280" height="234"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                <size key="intercellSpacing" width="3" height="2"/>
-                                <color key="backgroundColor" white="1" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
-                                <tableColumns>
-                                    <tableColumn width="248" minWidth="40" maxWidth="1000" id="g77-Mp-maO">
-                                        <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
-                                            <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
-                                            <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
-                                        </tableHeaderCell>
-                                        <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="ah1-fv-9UC">
-                                            <font key="font" metaFont="system"/>
-                                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                            <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                        </textFieldCell>
-                                        <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
-                                        <prototypeCellViews>
-                                            <tableCellView id="V0s-yA-xvK" customClass="KMFreeTextStyleTableViewCell">
-                                                <rect key="frame" x="11" y="1" width="257" height="75"/>
-                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                                <subviews>
-                                                    <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="aLR-Ih-hWR">
-                                                        <rect key="frame" x="16" y="32" width="12" height="12"/>
-                                                        <constraints>
-                                                            <constraint firstAttribute="height" constant="12" id="IbQ-oP-04G"/>
-                                                            <constraint firstAttribute="width" constant="12" id="Zo8-Kk-h7o"/>
-                                                        </constraints>
-                                                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="OXu-8s-2tx"/>
-                                                    </imageView>
-                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Qhl-y5-raD">
-                                                        <rect key="frame" x="34" y="30" width="37" height="16"/>
-                                                        <constraints>
-                                                            <constraint firstAttribute="height" constant="16" id="2PZ-nq-Zuf"/>
-                                                        </constraints>
-                                                        <textFieldCell key="cell" lineBreakMode="truncatingTail" truncatesLastVisibleLine="YES" title="Label" id="uyo-Vx-wIU">
-                                                            <font key="font" metaFont="system"/>
-                                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                                        </textFieldCell>
-                                                    </textField>
-                                                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="IEp-Vd-zdP">
-                                                        <rect key="frame" x="233" y="0.0" width="16" height="75"/>
-                                                        <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="KMImageNameUXIconBtnArrowRight" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="8gv-dG-17v">
-                                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                            <font key="font" metaFont="system"/>
-                                                        </buttonCell>
-                                                        <constraints>
-                                                            <constraint firstAttribute="width" constant="16" id="CJm-1M-RzL"/>
-                                                            <constraint firstAttribute="height" constant="75" id="xrA-mG-p9T"/>
-                                                        </constraints>
-                                                        <connections>
-                                                            <action selector="moreButtonAction:" target="V0s-yA-xvK" id="a1w-NU-Ns3"/>
-                                                        </connections>
-                                                    </button>
-                                                    <button hidden="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="oWq-Xq-NnS">
-                                                        <rect key="frame" x="213" y="30" width="16" height="16"/>
-                                                        <buttonCell key="cell" type="square" title="􀅈" bezelStyle="shadowlessSquare" alignment="center" imageScaling="proportionallyDown" inset="2" id="aax-vk-qBo">
-                                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                            <font key="font" metaFont="system"/>
-                                                        </buttonCell>
-                                                        <constraints>
-                                                            <constraint firstAttribute="height" constant="16" id="kMC-12-jI3"/>
-                                                            <constraint firstAttribute="width" constant="16" id="lGn-Lf-Rbg"/>
-                                                        </constraints>
-                                                        <connections>
-                                                            <action selector="updateButtonAction:" target="-1" id="1i1-6N-jwn"/>
-                                                        </connections>
-                                                    </button>
-                                                </subviews>
-                                                <constraints>
-                                                    <constraint firstItem="Qhl-y5-raD" firstAttribute="centerY" secondItem="V0s-yA-xvK" secondAttribute="centerY" id="4pK-IB-vBf"/>
-                                                    <constraint firstItem="Qhl-y5-raD" firstAttribute="centerY" secondItem="aLR-Ih-hWR" secondAttribute="centerY" id="7Ir-u1-hao"/>
-                                                    <constraint firstItem="Qhl-y5-raD" firstAttribute="leading" secondItem="aLR-Ih-hWR" secondAttribute="trailing" constant="8" id="Deo-JU-p01"/>
-                                                    <constraint firstItem="aLR-Ih-hWR" firstAttribute="leading" secondItem="V0s-yA-xvK" secondAttribute="leading" constant="16" id="L9h-Fh-zpe"/>
-                                                    <constraint firstItem="IEp-Vd-zdP" firstAttribute="centerY" secondItem="V0s-yA-xvK" secondAttribute="centerY" id="SDB-bs-pwu"/>
-                                                    <constraint firstItem="oWq-Xq-NnS" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Qhl-y5-raD" secondAttribute="trailing" constant="8" id="T7e-D5-eej"/>
-                                                    <constraint firstItem="IEp-Vd-zdP" firstAttribute="centerY" secondItem="oWq-Xq-NnS" secondAttribute="centerY" id="pjW-5R-LRw"/>
-                                                    <constraint firstItem="IEp-Vd-zdP" firstAttribute="leading" secondItem="oWq-Xq-NnS" secondAttribute="trailing" constant="4" id="rzb-mG-mn1"/>
-                                                    <constraint firstAttribute="trailing" secondItem="IEp-Vd-zdP" secondAttribute="trailing" constant="8" id="vCp-7e-MRO"/>
-                                                </constraints>
-                                                <connections>
-                                                    <outlet property="checkImageView" destination="aLR-Ih-hWR" id="lF9-xZ-EdI"/>
-                                                    <outlet property="moreButton" destination="IEp-Vd-zdP" id="Uz7-h5-sL3"/>
-                                                    <outlet property="styleLabel" destination="Qhl-y5-raD" id="7sJ-x9-HGp"/>
-                                                    <outlet property="styleLabelHeightConstant" destination="2PZ-nq-Zuf" id="WBt-jw-8Pa"/>
-                                                    <outlet property="updateButton" destination="oWq-Xq-NnS" id="c6M-As-848"/>
-                                                </connections>
-                                            </tableCellView>
-                                        </prototypeCellViews>
-                                    </tableColumn>
-                                </tableColumns>
-                                <connections>
-                                    <outlet property="dataSource" destination="-2" id="VsW-ZF-DsS"/>
-                                    <outlet property="delegate" destination="-2" id="pK8-Ci-u3S"/>
-                                </connections>
-                            </tableView>
-                        </subviews>
-                        <color key="backgroundColor" white="1" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                    </clipView>
-                    <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="ynv-cX-WoY">
-                        <rect key="frame" x="-100" y="-100" width="238" height="16"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                    </scroller>
-                    <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="Duu-lp-Acy">
-                        <rect key="frame" x="-100" y="-100" width="15" height="102"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                    </scroller>
-                </scrollView>
-            </subviews>
-            <constraints>
-                <constraint firstItem="7y1-Xw-f9S" firstAttribute="top" secondItem="oKi-FG-j4C" secondAttribute="bottom" id="1de-mf-urb"/>
-                <constraint firstAttribute="trailing" secondItem="oKi-FG-j4C" secondAttribute="trailing" id="CWq-WD-pMz"/>
-                <constraint firstAttribute="bottom" secondItem="7y1-Xw-f9S" secondAttribute="bottom" id="D5j-5t-puu"/>
-                <constraint firstItem="7y1-Xw-f9S" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="GhX-vN-Xak"/>
-                <constraint firstAttribute="trailing" secondItem="7y1-Xw-f9S" secondAttribute="trailing" id="GrU-6h-3Tp"/>
-                <constraint firstItem="oKi-FG-j4C" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" id="Oid-bB-xfe"/>
-                <constraint firstItem="oKi-FG-j4C" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="e96-SO-RzR"/>
-            </constraints>
-            <point key="canvasLocation" x="139" y="173.5"/>
-        </customView>
-    </objects>
-    <resources>
-        <image name="KMImageNameUXIconBtnAddNor" width="16" height="16"/>
-        <image name="KMImageNameUXIconBtnArrowRight" width="17" height="16"/>
-        <image name="KMImageNameUXIconBtnSidebarMoreSecondary" width="16" height="16"/>
-    </resources>
-</document>

+ 10 - 10
PDF Office/PDF Master/KMClass/KMPDFViewController/RightSideController/Views/AnnotationProperty/ViewController/KMPropertiesPanelNameSubVC.xib

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMPropertiesPanelNameSubVC" customModule="PDF_Master" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMPropertiesPanelNameSubVC" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="labelAndTextFieldSpacing" destination="dkG-bj-K24" id="sie-Jx-cbC"/>
                 <outlet property="popButtonBox" destination="cO8-BU-BtP" id="NrH-Nc-oQN"/>
@@ -38,7 +38,7 @@
                         <rect key="frame" x="1" y="1" width="333" height="30"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Wzf-KB-fhz">
+                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Wzf-KB-fhz">
                                 <rect key="frame" x="-2" y="0.0" width="337" height="30"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" alignment="left" id="bBY-CK-sjM">
                                     <font key="font" usesAppearanceFont="YES"/>
@@ -61,7 +61,7 @@
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="0TY-KZ-dcI">
                     <rect key="frame" x="0.0" y="126" width="335" height="20"/>
                     <subviews>
-                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jfj-fA-2cU">
+                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jfj-fA-2cU">
                             <rect key="frame" x="-2" y="2" width="37" height="16"/>
                             <textFieldCell key="cell" lineBreakMode="charWrapping" title="Label" id="heO-ad-iSE">
                                 <font key="font" usesAppearanceFont="YES"/>
@@ -82,7 +82,7 @@
                         <rect key="frame" x="1" y="1" width="333" height="30"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <popUpButton translatesAutoresizingMaskIntoConstraints="NO" id="xDU-jF-q9R" customClass="KMPopUpButton" customModule="PDF_Master" customModuleProvider="target">
+                            <popUpButton translatesAutoresizingMaskIntoConstraints="NO" id="xDU-jF-q9R" customClass="KMPopUpButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
                                 <rect key="frame" x="0.0" y="0.0" width="333" height="30"/>
                                 <popUpButtonCell key="cell" type="bevel" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" imageScaling="proportionallyDown" inset="2" arrowPosition="noArrow" selectedItem="sLY-jI-EW4" id="475-Rh-wme">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -118,15 +118,15 @@
                             <scrollView borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AoJ-mn-dB9">
                                 <rect key="frame" x="0.0" y="0.0" width="333" height="30"/>
                                 <clipView key="contentView" drawsBackground="NO" id="JKe-I5-oG0">
-                                    <rect key="frame" x="0.0" y="0.0" width="333" height="30"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="318" height="30"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <textView wantsLayer="YES" drawsBackground="NO" importsGraphics="NO" richText="NO" verticallyResizable="YES" spellingCorrection="YES" smartInsertDelete="YES" id="1ao-H1-lxA">
-                                            <rect key="frame" x="0.0" y="0.0" width="15" height="30"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="0.0" height="30"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                            <size key="minSize" width="333" height="30"/>
+                                            <size key="minSize" width="318" height="30"/>
                                             <size key="maxSize" width="333" height="10000000"/>
                                             <color key="insertionPointColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                         </textView>
@@ -138,7 +138,7 @@
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
                                 <scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="4VS-5a-Utq">
-                                    <rect key="frame" x="317" y="0.0" width="16" height="30"/>
+                                    <rect key="frame" x="318" y="0.0" width="15" height="30"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
                             </scrollView>

+ 1 - 2
PDF Office/PDF Master/PDF_Reader_Pro DMG-Bridging-Header.h

@@ -93,8 +93,7 @@
 #import "SKBookmarkSheetController.h"
 #import "SKBookmarkController.h"
 #import "SKBookmark.h"
-//文字
-#import "KMFreeTextStylesViewController.h"
+//文字 
 #import "TextFieldFormatter.h"
 
 #import "AutoSavePopController.h"

+ 1 - 2
PDF Office/PDF Master/PDF_Reader_Pro Edition-Bridging-Header.h

@@ -90,8 +90,7 @@
 #import "SKBookmarkSheetController.h"
 #import "SKBookmarkController.h"
 #import "SKBookmark.h"
-//文字
-#import "KMFreeTextStylesViewController.h"
+//文字 
 #import "TextFieldFormatter.h"
 
 #import "AutoSavePopController.h"

+ 1 - 2
PDF Office/PDF Master/PDF_Reader_Pro-Bridging-Header.h

@@ -93,8 +93,7 @@
 #import "SKBookmarkSheetController.h"
 #import "SKBookmarkController.h"
 #import "SKBookmark.h"
-//文字
-#import "KMFreeTextStylesViewController.h"
+//文字 
 #import "TextFieldFormatter.h"
 
 #import "AutoSavePopController.h"

+ 0 - 26
PDF Office/PDF Reader Pro.xcodeproj/project.pbxproj

@@ -2048,12 +2048,6 @@
 		ADD3EC032D13F23D005B711B /* KMOCRController.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADD3EBFF2D13F23D005B711B /* KMOCRController.xib */; };
 		ADD3EC042D13F23D005B711B /* KMOCRController.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADD3EBFF2D13F23D005B711B /* KMOCRController.xib */; };
 		ADD3EC052D13F23D005B711B /* KMOCRController.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADD3EBFF2D13F23D005B711B /* KMOCRController.xib */; };
-		ADD56F572BB3F48300E87ED9 /* KMFreeTextStylesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = ADD56F542BB3F48200E87ED9 /* KMFreeTextStylesViewController.m */; };
-		ADD56F582BB3F48300E87ED9 /* KMFreeTextStylesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = ADD56F542BB3F48200E87ED9 /* KMFreeTextStylesViewController.m */; };
-		ADD56F592BB3F48300E87ED9 /* KMFreeTextStylesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = ADD56F542BB3F48200E87ED9 /* KMFreeTextStylesViewController.m */; };
-		ADD56F5A2BB3F48300E87ED9 /* KMFreeTextStylesViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADD56F552BB3F48200E87ED9 /* KMFreeTextStylesViewController.xib */; };
-		ADD56F5B2BB3F48300E87ED9 /* KMFreeTextStylesViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADD56F552BB3F48200E87ED9 /* KMFreeTextStylesViewController.xib */; };
-		ADD56F5C2BB3F48300E87ED9 /* KMFreeTextStylesViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = ADD56F552BB3F48200E87ED9 /* KMFreeTextStylesViewController.xib */; };
 		ADDDCE212B43A32A005B4AB5 /* AppSandboxFileAccessPersist.m in Sources */ = {isa = PBXBuildFile; fileRef = ADDDCE1C2B43A32A005B4AB5 /* AppSandboxFileAccessPersist.m */; };
 		ADDDCE222B43A32A005B4AB5 /* AppSandboxFileAccessPersist.m in Sources */ = {isa = PBXBuildFile; fileRef = ADDDCE1C2B43A32A005B4AB5 /* AppSandboxFileAccessPersist.m */; };
 		ADDDCE232B43A32A005B4AB5 /* AppSandboxFileAccessPersist.m in Sources */ = {isa = PBXBuildFile; fileRef = ADDDCE1C2B43A32A005B4AB5 /* AppSandboxFileAccessPersist.m */; };
@@ -6020,9 +6014,6 @@
 		ADD3EBE12D116BAD005B711B /* KMCompressTool.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KMCompressTool.m; sourceTree = "<group>"; };
 		ADD3EBFE2D13F23D005B711B /* KMOCRController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMOCRController.swift; sourceTree = "<group>"; };
 		ADD3EBFF2D13F23D005B711B /* KMOCRController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMOCRController.xib; sourceTree = "<group>"; };
-		ADD56F542BB3F48200E87ED9 /* KMFreeTextStylesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMFreeTextStylesViewController.m; sourceTree = "<group>"; };
-		ADD56F552BB3F48200E87ED9 /* KMFreeTextStylesViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KMFreeTextStylesViewController.xib; sourceTree = "<group>"; };
-		ADD56F562BB3F48200E87ED9 /* KMFreeTextStylesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMFreeTextStylesViewController.h; sourceTree = "<group>"; };
 		ADDDCE1B2B43A32A005B4AB5 /* AppSandboxFileAccess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppSandboxFileAccess.h; sourceTree = "<group>"; };
 		ADDDCE1C2B43A32A005B4AB5 /* AppSandboxFileAccessPersist.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppSandboxFileAccessPersist.m; sourceTree = "<group>"; };
 		ADDDCE1D2B43A32A005B4AB5 /* AppSandboxFileAccessOpenSavePanelDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppSandboxFileAccessOpenSavePanelDelegate.h; sourceTree = "<group>"; };
@@ -8043,7 +8034,6 @@
 		89E4E6F82963D341002DBA6F /* View */ = {
 			isa = PBXGroup;
 			children = (
-				ADD56F532BB3F48200E87ED9 /* KMFreeTextStylesViewController */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -9924,16 +9914,6 @@
 			path = View;
 			sourceTree = "<group>";
 		};
-		ADD56F532BB3F48200E87ED9 /* KMFreeTextStylesViewController */ = {
-			isa = PBXGroup;
-			children = (
-				ADD56F562BB3F48200E87ED9 /* KMFreeTextStylesViewController.h */,
-				ADD56F542BB3F48200E87ED9 /* KMFreeTextStylesViewController.m */,
-				ADD56F552BB3F48200E87ED9 /* KMFreeTextStylesViewController.xib */,
-			);
-			path = KMFreeTextStylesViewController;
-			sourceTree = "<group>";
-		};
 		ADDDCE1A2B43A32A005B4AB5 /* AppSandboxFileAccess */ = {
 			isa = PBXGroup;
 			children = (
@@ -14446,7 +14426,6 @@
 				AD7D5C982B8F20FE006562CD /* synctex_parser_readme.txt in Resources */,
 				BB9AEB582D0FC9F3004BF8D2 /* FormsDigitalSignController.xib in Resources */,
 				F35BC6C92CA3AD710022CDE9 /* Texture.bundle in Resources */,
-				ADD56F5A2BB3F48300E87ED9 /* KMFreeTextStylesViewController.xib in Resources */,
 				9F0CB49229683DEE00007028 /* KMPropertiesPanelLineSubVC.xib in Resources */,
 				F3DB86092CCA691B00D0AFDE /* KMNExtractPDFWindowController.xib in Resources */,
 				9FF371F42C69E1B2005F9CC5 /* Localizable.strings in Resources */,
@@ -14846,7 +14825,6 @@
 				BB853C962AF8DCC7009C20C1 /* KMBatchOperateRemovePasswordViewController.xib in Resources */,
 				F3B2DFC92CF4B2FB0078F439 /* DigtalSignatureImage.xcassets in Resources */,
 				BB1B0AE42B4FC6E900889528 /* KMOpenFileGuideToolbar.xib in Resources */,
-				ADD56F5B2BB3F48300E87ED9 /* KMFreeTextStylesViewController.xib in Resources */,
 				9F5752ED2B58FF73005DC303 /* KMAnnotationFromViewController.xib in Resources */,
 				BB04FD112B206F4000D80F7B /* KMPlanViewController.xib in Resources */,
 				9F3BCDC92CCB749400BDAB67 /* 快速教学.pdf in Resources */,
@@ -15390,7 +15368,6 @@
 				BBAFC8412985194800D0648E /* KMPDFEditAppendWindow.xib in Resources */,
 				BBA19F3829ADACC5001A285A /* signPicture_nor.pdf in Resources */,
 				F328C0BB2CA16F0500BFDD23 /* KMPresentationTopViewController.xib in Resources */,
-				ADD56F5C2BB3F48300E87ED9 /* KMFreeTextStylesViewController.xib in Resources */,
 				89E9B3FB295BE2EC00AEFA61 /* KMEditPDFTextPropertyViewController.xib in Resources */,
 				BB19A75C2CB7C724008204DC /* KMHistoryFileListItem.xib in Resources */,
 				BB6192352D13E9F0003FDEA6 /* FillDateController.xib in Resources */,
@@ -15962,7 +15939,6 @@
 				F3599222292CA27B000D25DE /* CPDFListViewRuntime.m in Sources */,
 				BB1331542AD7A6A1008F6791 /* KMFileAttribute.swift in Sources */,
 				BB0A55182A3074F400B6E84B /* KMHoverView.swift in Sources */,
-				ADD56F572BB3F48300E87ED9 /* KMFreeTextStylesViewController.m in Sources */,
 				BB9AEB2D2D0FC9A0004BF8D2 /* FormsCheckBoxController.swift in Sources */,
 				BBE7889C2CBD2463008086E2 /* DropdownDemoVC.swift in Sources */,
 				9F53D54F2AD677A000CCF9D8 /* CPDFListViewConfig.swift in Sources */,
@@ -17958,7 +17934,6 @@
 				9F0CB4DE2986554D00007028 /* KMDesignToken+HorizontalPadding.swift in Sources */,
 				BBBAED112B57E76400266BD3 /* NSGraphics_SKExtensions.m in Sources */,
 				9F1FE49A29406E4700E952CA /* NewTabButton.m in Sources */,
-				ADD56F582BB3F48300E87ED9 /* KMFreeTextStylesViewController.m in Sources */,
 				9FE0BBDF2B0E009F00CD1CAC /* KMColorPickerView.swift in Sources */,
 				ADE86AD22B04BAEA00414DFA /* KMCompareFilesView.swift in Sources */,
 				9F0CB49829683E1000007028 /* KMPropertiesPanelTextSubVC.swift in Sources */,
@@ -18256,7 +18231,6 @@
 				9F0CB4F7298655D500007028 /* KMDesignToken+Fill.swift in Sources */,
 				BBE7889E2CBD2463008086E2 /* DropdownDemoVC.swift in Sources */,
 				F3A65ECF2CDF19C300F00102 /* KMNThumDecorationView.swift in Sources */,
-				ADD56F592BB3F48300E87ED9 /* KMFreeTextStylesViewController.m in Sources */,
 				BBFE6E772930E53000142C01 /* KMMergePopoverViewController.swift in Sources */,
 				65202DF92CE4803500A204B5 /* KMNBotaHeaderSearchView.swift in Sources */,
 				BB65A07A2AF8E2F2003A27A0 /* KMSyncPreferences.swift in Sources */,

+ 176 - 4
PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -3246,6 +3246,21 @@
                   endingLineNumber = "4131"
                   offsetFromSymbolStart = "11680">
                </Location>
+               <Location
+                  uuid = "92759DD6-8CD9-4B54-BF74-D83EF6A6D5A5 - 19c05758421982cc"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMMainViewController.viewDidLoadOld() -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/KMMainViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "4133"
+                  endingLineNumber = "4133"
+                  offsetFromSymbolStart = "10816">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -3324,6 +3339,21 @@
                   endingLineNumber = "4463"
                   offsetFromSymbolStart = "52">
                </Location>
+               <Location
+                  uuid = "4E0E8246-D746-4D5F-A4A2-89C78AEA0880 - 35a8d536a00df43f"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMMainViewController.loadOpenFileFunctionGuide(PDF_Reader_Pro.KMGuideInfoType) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/KMClass/KMPDFViewController/KMMainViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "4463"
+                  endingLineNumber = "4463"
+                  offsetFromSymbolStart = "860">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -4595,10 +4625,57 @@
             filePath = "PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFAnnotationModel.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1641"
-            endingLineNumber = "1641"
+            startingLineNumber = "1634"
+            endingLineNumber = "1634"
             landmarkName = "-interiorColor"
             landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "A6622DB8-F4DC-4C79-84DE-00DB0AAE8ED8 - 4efd6f66d87a63b8"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[CPDFAnnotationModel interiorColor]"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFAnnotationModel.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "1634"
+                  endingLineNumber = "1634"
+                  offsetFromSymbolStart = "544">
+               </Location>
+               <Location
+                  uuid = "A6622DB8-F4DC-4C79-84DE-00DB0AAE8ED8 - 4efd6f66d87a63b8"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[CPDFAnnotationModel interiorColor]"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFAnnotationModel.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "1634"
+                  endingLineNumber = "1634"
+                  offsetFromSymbolStart = "616">
+               </Location>
+               <Location
+                  uuid = "A6622DB8-F4DC-4C79-84DE-00DB0AAE8ED8 - 4efd6f66d87a639b"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[CPDFAnnotationModel interiorColor]"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFAnnotationModel.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "1635"
+                  endingLineNumber = "1635"
+                  offsetFromSymbolStart = "56">
+               </Location>
+            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -5597,10 +5674,57 @@
             filePath = "PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFListViewExtension/CPDFListView+Event.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "6001"
-            endingLineNumber = "6001"
+            startingLineNumber = "6000"
+            endingLineNumber = "6000"
             landmarkName = "-colorPanelAction:"
             landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "55D287D3-1501-491A-A540-B8728475A83C - 6d6e409ef62a5d6"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[CPDFListView(Event) colorPanelAction:]"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFListViewExtension/CPDFListView+Event.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "6000"
+                  endingLineNumber = "6000"
+                  offsetFromSymbolStart = "108">
+               </Location>
+               <Location
+                  uuid = "55D287D3-1501-491A-A540-B8728475A83C - 6d6e409ef62a5f5"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[CPDFListView(Event) colorPanelAction:]"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFListViewExtension/CPDFListView+Event.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "6001"
+                  endingLineNumber = "6001"
+                  offsetFromSymbolStart = "108">
+               </Location>
+               <Location
+                  uuid = "55D287D3-1501-491A-A540-B8728475A83C - 6d6e409ef62a5d6"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[CPDFListView(Event) colorPanelAction:]"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFListViewExtension/CPDFListView+Event.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "6000"
+                  endingLineNumber = "6000"
+                  offsetFromSymbolStart = "84">
+               </Location>
+            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -5651,5 +5775,53 @@
             landmarkType = "24">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "517594CA-E0B0-4A0A-968C-C090FF6F8308"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/Fill/SelfSign/KMSelfSignAnnotation.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "134"
+            endingLineNumber = "134"
+            landmarkName = "draw(with:inContext:)"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "517594CA-E0B0-4A0A-968C-C090FF6F8308 - 53f0e49631b63d6f"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMSelfSignAnnotation.draw(with: __C.CPDFDisplayBox, inContext: __C.CGContextRef) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/Fill/SelfSign/KMSelfSignAnnotation.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "133"
+                  endingLineNumber = "133"
+                  offsetFromSymbolStart = "1012">
+               </Location>
+               <Location
+                  uuid = "517594CA-E0B0-4A0A-968C-C090FF6F8308 - 53f0e49631b63d0e"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMSelfSignAnnotation.draw(with: __C.CPDFDisplayBox, inContext: __C.CGContextRef) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/Fill/SelfSign/KMSelfSignAnnotation.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "134"
+                  endingLineNumber = "134"
+                  offsetFromSymbolStart = "480">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>