Revision: 14372
http://sourceforge.net/p/skim-app/code/14372
Author: hofman
Date: 2024-07-11 14:39:13 +0000 (Thu, 11 Jul 2024)
Log Message:
-----------
rename some enum values
Modified Paths:
--------------
trunk/SKMainDocument.m
trunk/SKMainToolbarController.m
trunk/SKMainTouchBarController.m
trunk/SKMainWindowController.m
trunk/SKMainWindowController_Actions.m
trunk/SKMainWindowController_UI.m
trunk/SKPDFView.h
trunk/SKPDFView.m
Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m 2024-07-10 14:56:27 UTC (rev 14371)
+++ trunk/SKMainDocument.m 2024-07-11 14:39:13 UTC (rev 14372)
@@ -1781,15 +1781,15 @@
- (NSInteger)toolMode {
NSInteger toolMode = [[self pdfView] toolMode];
- if (toolMode == SKNoteToolMode)
+ if (toolMode == SKToolModeNote)
toolMode += [[self pdfView] annotationMode];
return toolMode;
}
- (void)setToolMode:(NSInteger)newToolMode {
- if (newToolMode >= SKNoteToolMode) {
- [[self pdfView] setAnnotationMode:newToolMode - SKNoteToolMode];
- newToolMode = SKNoteToolMode;
+ if (newToolMode >= SKToolModeNote) {
+ [[self pdfView] setAnnotationMode:newToolMode - SKToolModeNote];
+ newToolMode = SKToolModeNote;
}
[[self pdfView] setToolMode:newToolMode];
}
Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m 2024-07-10 14:56:27 UTC (rev 14371)
+++ trunk/SKMainToolbarController.m 2024-07-11 14:39:13 UTC (rev 14372)
@@ -423,14 +423,14 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarNewTextNoteItemIdentifier]) {
menu = [NSMenu menu];
- [menu addItemWithTitle:NSLocalizedString(@"Text Note", @"Menu item
title") imageNamed:SKImageNameToolbarAddTextNote
action:@selector(createNewTextNote:) target:self tag:SKFreeTextNote];
- [menu addItemWithTitle:NSLocalizedString(@"Anchored Note", @"Menu
item title") imageNamed:SKImageNameToolbarAddAnchoredNote
action:@selector(createNewTextNote:) target:self tag:SKAnchoredNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Text Note", @"Menu item
title") imageNamed:SKImageNameToolbarAddTextNote
action:@selector(createNewTextNote:) target:self tag:SKNoteTypeFreeText];
+ [menu addItemWithTitle:NSLocalizedString(@"Anchored Note", @"Menu
item title") imageNamed:SKImageNameToolbarAddAnchoredNote
action:@selector(createNewTextNote:) target:self tag:SKNoteTypeAnchored];
[textNoteButton setMenu:menu forSegment:0];
menuItem = [[NSMenuItem alloc]
initWithSubmenuAndTitle:NSLocalizedString(@"Add Note", @"Toolbar item label")];
menu = [menuItem submenu];
- [menu addItemWithTitle:NSLocalizedString(@"Text Note", @"Menu item
title") imageNamed:SKImageNameToolbarAddTextNote
action:@selector(createNewNote:) target:mainController tag:SKFreeTextNote];
- [menu addItemWithTitle:NSLocalizedString(@"Anchored Note", @"Menu
item title") imageNamed:SKImageNameToolbarAddAnchoredNote
action:@selector(createNewNote:) target:mainController tag:SKAnchoredNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Text Note", @"Menu item
title") imageNamed:SKImageNameToolbarAddTextNote
action:@selector(createNewNote:) target:mainController tag:SKNoteTypeFreeText];
+ [menu addItemWithTitle:NSLocalizedString(@"Anchored Note", @"Menu
item title") imageNamed:SKImageNameToolbarAddAnchoredNote
action:@selector(createNewNote:) target:mainController tag:SKNoteTypeAnchored];
[item setLabels:NSLocalizedString(@"Add Note", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Add New Note", @"Tool tip
message")];
@@ -440,14 +440,14 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarNewCircleNoteItemIdentifier]) {
menu = [NSMenu menu];
- [menu addItemWithTitle:NSLocalizedString(@"Circle", @"Menu item
title") imageNamed:SKImageNameToolbarAddCircleNote
action:@selector(createNewCircleNote:) target:self tag:SKCircleNote];
- [menu addItemWithTitle:NSLocalizedString(@"Box", @"Menu item
title") imageNamed:SKImageNameToolbarAddSquareNote
action:@selector(createNewCircleNote:) target:self tag:SKSquareNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Circle", @"Menu item
title") imageNamed:SKImageNameToolbarAddCircleNote
action:@selector(createNewCircleNote:) target:self tag:SKNoteTypeCircle];
+ [menu addItemWithTitle:NSLocalizedString(@"Box", @"Menu item
title") imageNamed:SKImageNameToolbarAddSquareNote
action:@selector(createNewCircleNote:) target:self tag:SKNoteTypeSquare];
[circleNoteButton setMenu:menu forSegment:0];
menuItem = [[NSMenuItem alloc]
initWithSubmenuAndTitle:NSLocalizedString(@"Add Shape", @"Toolbar item label")];
menu = [menuItem submenu];
- [menu addItemWithTitle:NSLocalizedString(@"Circle", @"Menu item
title") imageNamed:SKImageNameToolbarAddCircleNote
action:@selector(createNewNote:) target:mainController tag:SKCircleNote];
- [menu addItemWithTitle:NSLocalizedString(@"Box", @"Menu item
title") imageNamed:SKImageNameToolbarAddSquareNote
action:@selector(createNewNote:) target:mainController tag:SKSquareNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Circle", @"Menu item
title") imageNamed:SKImageNameToolbarAddCircleNote
action:@selector(createNewNote:) target:mainController tag:SKNoteTypeCircle];
+ [menu addItemWithTitle:NSLocalizedString(@"Box", @"Menu item
title") imageNamed:SKImageNameToolbarAddSquareNote
action:@selector(createNewNote:) target:mainController tag:SKNoteTypeSquare];
[item setLabels:NSLocalizedString(@"Add Shape", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Add New Circle or Box",
@"Tool tip message")];
@@ -457,16 +457,16 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarNewMarkupItemIdentifier]) {
menu = [NSMenu menu];
- [menu addItemWithTitle:NSLocalizedString(@"Highlight", @"Menu item
title") imageNamed:SKImageNameToolbarAddHighlightNote
action:@selector(createNewMarkupNote:) target:self tag:SKHighlightNote];
- [menu addItemWithTitle:NSLocalizedString(@"Underline", @"Menu item
title") imageNamed:SKImageNameToolbarAddUnderlineNote
action:@selector(createNewMarkupNote:) target:self tag:SKUnderlineNote];
- [menu addItemWithTitle:NSLocalizedString(@"Strike Out", @"Menu
item title") imageNamed:SKImageNameToolbarAddStrikeOutNote
action:@selector(createNewMarkupNote:) target:self tag:SKStrikeOutNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Highlight", @"Menu item
title") imageNamed:SKImageNameToolbarAddHighlightNote
action:@selector(createNewMarkupNote:) target:self tag:SKNoteTypeHighlight];
+ [menu addItemWithTitle:NSLocalizedString(@"Underline", @"Menu item
title") imageNamed:SKImageNameToolbarAddUnderlineNote
action:@selector(createNewMarkupNote:) target:self tag:SKNoteTypeUnderline];
+ [menu addItemWithTitle:NSLocalizedString(@"Strike Out", @"Menu
item title") imageNamed:SKImageNameToolbarAddStrikeOutNote
action:@selector(createNewMarkupNote:) target:self tag:SKNoteTypeStrikeOut];
[markupNoteButton setMenu:menu forSegment:0];
menuItem = [[NSMenuItem alloc]
initWithSubmenuAndTitle:NSLocalizedString(@"Add Markup", @"Toolbar item
label")];
menu = [menuItem submenu];
- [menu addItemWithTitle:NSLocalizedString(@"Highlight", @"Menu item
title") imageNamed:SKImageNameToolbarAddHighlightNote
action:@selector(createNewNote:) target:mainController tag:SKHighlightNote];
- [menu addItemWithTitle:NSLocalizedString(@"Underline", @"Menu item
title") imageNamed:SKImageNameToolbarAddUnderlineNote
action:@selector(createNewNote:) target:mainController tag:SKUnderlineNote];
- [menu addItemWithTitle:NSLocalizedString(@"Strike Out", @"Menu
item title") imageNamed:SKImageNameToolbarAddStrikeOutNote
action:@selector(createNewNote:) target:mainController tag:SKStrikeOutNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Highlight", @"Menu item
title") imageNamed:SKImageNameToolbarAddHighlightNote
action:@selector(createNewNote:) target:mainController tag:SKNoteTypeHighlight];
+ [menu addItemWithTitle:NSLocalizedString(@"Underline", @"Menu item
title") imageNamed:SKImageNameToolbarAddUnderlineNote
action:@selector(createNewNote:) target:mainController tag:SKNoteTypeUnderline];
+ [menu addItemWithTitle:NSLocalizedString(@"Strike Out", @"Menu
item title") imageNamed:SKImageNameToolbarAddStrikeOutNote
action:@selector(createNewNote:) target:mainController tag:SKNoteTypeStrikeOut];
[item setLabels:NSLocalizedString(@"Add Markup", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Add New Markup", @"Tool tip
message")];
@@ -476,14 +476,14 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarNewLineItemIdentifier]) {
menu = [NSMenu menu];
- [menu addItemWithTitle:NSLocalizedString(@"Line", @"Menu item
title") imageNamed:SKImageNameToolbarAddLineNote
action:@selector(createNewLineNote:) target:self tag:SKLineNote];
- [menu addItemWithTitle:NSLocalizedString(@"Freehand", @"Menu item
title") imageNamed:SKImageNameToolbarAddInkNote
action:@selector(createNewLineNote:) target:self tag:SKInkNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Line", @"Menu item
title") imageNamed:SKImageNameToolbarAddLineNote
action:@selector(createNewLineNote:) target:self tag:SKNoteTypeLine];
+ [menu addItemWithTitle:NSLocalizedString(@"Freehand", @"Menu item
title") imageNamed:SKImageNameToolbarAddInkNote
action:@selector(createNewLineNote:) target:self tag:SKNoteTypeInk];
[lineNoteButton setMenu:menu forSegment:0];
menuItem = [[NSMenuItem alloc]
initWithSubmenuAndTitle:NSLocalizedString(@"Add Line", @"Toolbar item label")];
menu = [menuItem submenu];
- [menu addItemWithTitle:NSLocalizedString(@"Line", @"Menu item
title") imageNamed:SKImageNameToolbarAddLineNote
action:@selector(createNewNote:) target:mainController tag:SKLineNote];
- [menu addItemWithTitle:NSLocalizedString(@"Freehand", @"Menu item
title") imageNamed:SKImageNameToolbarAddInkNote
action:@selector(createNewNote:) target:mainController tag:SKInkNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Line", @"Menu item
title") imageNamed:SKImageNameToolbarAddLineNote
action:@selector(createNewNote:) target:mainController tag:SKNoteTypeLine];
+ [menu addItemWithTitle:NSLocalizedString(@"Freehand", @"Menu item
title") imageNamed:SKImageNameToolbarAddInkNote
action:@selector(createNewNote:) target:mainController tag:SKNoteTypeInk];
[item setLabels:NSLocalizedString(@"Add Line", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Add New Line", @"Tool tip
message")];
@@ -494,27 +494,27 @@
menuItem = [[NSMenuItem alloc]
initWithSubmenuAndTitle:NSLocalizedString(@"Add Note", @"Toolbar item label")];
menu = [menuItem submenu];
- [menu addItemWithTitle:NSLocalizedString(@"Text Note", @"Menu item
title") imageNamed:SKImageNameToolbarAddTextNote
action:@selector(createNewNote:) target:mainController tag:SKFreeTextNote];
- [menu addItemWithTitle:NSLocalizedString(@"Anchored Note", @"Menu
item title") imageNamed:SKImageNameToolbarAddAnchoredNote
action:@selector(createNewNote:) target:mainController tag:SKAnchoredNote];
- [menu addItemWithTitle:NSLocalizedString(@"Circle", @"Menu item
title") imageNamed:SKImageNameToolbarAddCircleNote
action:@selector(createNewNote:) target:mainController tag:SKCircleNote];
- [menu addItemWithTitle:NSLocalizedString(@"Box", @"Menu item
title") imageNamed:SKImageNameToolbarAddSquareNote
action:@selector(createNewNote:) target:mainController tag:SKSquareNote];
- [menu addItemWithTitle:NSLocalizedString(@"Highlight", @"Menu item
title") imageNamed:SKImageNameToolbarAddHighlightNote
action:@selector(createNewNote:) target:mainController tag:SKHighlightNote];
- [menu addItemWithTitle:NSLocalizedString(@"Underline", @"Menu item
title") imageNamed:SKImageNameToolbarAddUnderlineNote
action:@selector(createNewNote:) target:mainController tag:SKUnderlineNote];
- [menu addItemWithTitle:NSLocalizedString(@"Strike Out", @"Menu
item title") imageNamed:SKImageNameToolbarAddStrikeOutNote
action:@selector(createNewNote:) target:mainController tag:SKStrikeOutNote];
- [menu addItemWithTitle:NSLocalizedString(@"Line", @"Menu item
title") imageNamed:SKImageNameToolbarAddLineNote
action:@selector(createNewNote:) target:mainController tag:SKLineNote];
- [menu addItemWithTitle:NSLocalizedString(@"Freehand", @"Menu item
title") imageNamed:SKImageNameToolbarAddInkNote
action:@selector(createNewNote:) target:mainController tag:SKInkNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Text Note", @"Menu item
title") imageNamed:SKImageNameToolbarAddTextNote
action:@selector(createNewNote:) target:mainController tag:SKNoteTypeFreeText];
+ [menu addItemWithTitle:NSLocalizedString(@"Anchored Note", @"Menu
item title") imageNamed:SKImageNameToolbarAddAnchoredNote
action:@selector(createNewNote:) target:mainController tag:SKNoteTypeAnchored];
+ [menu addItemWithTitle:NSLocalizedString(@"Circle", @"Menu item
title") imageNamed:SKImageNameToolbarAddCircleNote
action:@selector(createNewNote:) target:mainController tag:SKNoteTypeCircle];
+ [menu addItemWithTitle:NSLocalizedString(@"Box", @"Menu item
title") imageNamed:SKImageNameToolbarAddSquareNote
action:@selector(createNewNote:) target:mainController tag:SKNoteTypeSquare];
+ [menu addItemWithTitle:NSLocalizedString(@"Highlight", @"Menu item
title") imageNamed:SKImageNameToolbarAddHighlightNote
action:@selector(createNewNote:) target:mainController tag:SKNoteTypeHighlight];
+ [menu addItemWithTitle:NSLocalizedString(@"Underline", @"Menu item
title") imageNamed:SKImageNameToolbarAddUnderlineNote
action:@selector(createNewNote:) target:mainController tag:SKNoteTypeUnderline];
+ [menu addItemWithTitle:NSLocalizedString(@"Strike Out", @"Menu
item title") imageNamed:SKImageNameToolbarAddStrikeOutNote
action:@selector(createNewNote:) target:mainController tag:SKNoteTypeStrikeOut];
+ [menu addItemWithTitle:NSLocalizedString(@"Line", @"Menu item
title") imageNamed:SKImageNameToolbarAddLineNote
action:@selector(createNewNote:) target:mainController tag:SKNoteTypeLine];
+ [menu addItemWithTitle:NSLocalizedString(@"Freehand", @"Menu item
title") imageNamed:SKImageNameToolbarAddInkNote
action:@selector(createNewNote:) target:mainController tag:SKNoteTypeInk];
[item setLabels:NSLocalizedString(@"Add Note", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Add New Note", @"Tool tip
message")];
- [noteButton setHelp:NSLocalizedString(@"Add New Text Note", @"Tool
tip message") forSegment:SKFreeTextNote];
- [noteButton setHelp:NSLocalizedString(@"Add New Anchored Note",
@"Tool tip message") forSegment:SKAnchoredNote];
- [noteButton setHelp:NSLocalizedString(@"Add New Circle", @"Tool
tip message") forSegment:SKCircleNote];
- [noteButton setHelp:NSLocalizedString(@"Add New Box", @"Tool tip
message") forSegment:SKSquareNote];
- [noteButton setHelp:NSLocalizedString(@"Add New Highlight", @"Tool
tip message") forSegment:SKHighlightNote];
- [noteButton setHelp:NSLocalizedString(@"Add New Underline", @"Tool
tip message") forSegment:SKUnderlineNote];
- [noteButton setHelp:NSLocalizedString(@"Add New Strike Out",
@"Tool tip message") forSegment:SKStrikeOutNote];
- [noteButton setHelp:NSLocalizedString(@"Add New Line", @"Tool tip
message") forSegment:SKLineNote];
- [noteButton setHelp:NSLocalizedString(@"Add New Freehand", @"Tool
tip message") forSegment:SKInkNote];
+ [noteButton setHelp:NSLocalizedString(@"Add New Text Note", @"Tool
tip message") forSegment:SKNoteTypeFreeText];
+ [noteButton setHelp:NSLocalizedString(@"Add New Anchored Note",
@"Tool tip message") forSegment:SKNoteTypeAnchored];
+ [noteButton setHelp:NSLocalizedString(@"Add New Circle", @"Tool
tip message") forSegment:SKNoteTypeCircle];
+ [noteButton setHelp:NSLocalizedString(@"Add New Box", @"Tool tip
message") forSegment:SKNoteTypeSquare];
+ [noteButton setHelp:NSLocalizedString(@"Add New Highlight", @"Tool
tip message") forSegment:SKNoteTypeHighlight];
+ [noteButton setHelp:NSLocalizedString(@"Add New Underline", @"Tool
tip message") forSegment:SKNoteTypeUnderline];
+ [noteButton setHelp:NSLocalizedString(@"Add New Strike Out",
@"Tool tip message") forSegment:SKNoteTypeStrikeOut];
+ [noteButton setHelp:NSLocalizedString(@"Add New Line", @"Tool tip
message") forSegment:SKNoteTypeLine];
+ [noteButton setHelp:NSLocalizedString(@"Add New Freehand", @"Tool
tip message") forSegment:SKNoteTypeInk];
[noteButton setSegmentStyle:NSSegmentStyleSeparated];
[item setView:noteButton];
[item setMenuFormRepresentation:menuItem];
@@ -522,41 +522,41 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarToolModeItemIdentifier]) {
menu = [NSMenu menu];
- [menu addItemWithTitle:NSLocalizedString(@"Text Note", @"Menu item
title") imageNamed:SKImageNameTextNote action:@selector(changeAnnotationMode:)
target:mainController tag:SKFreeTextNote];
- [menu addItemWithTitle:NSLocalizedString(@"Anchored Note", @"Menu
item title") imageNamed:SKImageNameAnchoredNote
action:@selector(changeAnnotationMode:) target:mainController
tag:SKAnchoredNote];
- [menu addItemWithTitle:NSLocalizedString(@"Circle", @"Menu item
title") imageNamed:SKImageNameCircleNote
action:@selector(changeAnnotationMode:) target:mainController tag:SKCircleNote];
- [menu addItemWithTitle:NSLocalizedString(@"Box", @"Menu item
title") imageNamed:SKImageNameSquareNote
action:@selector(changeAnnotationMode:) target:mainController tag:SKSquareNote];
- [menu addItemWithTitle:NSLocalizedString(@"Highlight", @"Menu item
title") imageNamed:SKImageNameHighlightNote
action:@selector(changeAnnotationMode:) target:mainController
tag:SKHighlightNote];
- [menu addItemWithTitle:NSLocalizedString(@"Underline", @"Menu item
title") imageNamed:SKImageNameUnderlineNote
action:@selector(changeAnnotationMode:) target:mainController
tag:SKUnderlineNote];
- [menu addItemWithTitle:NSLocalizedString(@"Strike Out", @"Menu
item title") imageNamed:SKImageNameStrikeOutNote
action:@selector(changeAnnotationMode:) target:mainController
tag:SKStrikeOutNote];
- [menu addItemWithTitle:NSLocalizedString(@"Line", @"Menu item
title") imageNamed:SKImageNameLineNote action:@selector(changeAnnotationMode:)
target:mainController tag:SKLineNote];
- [menu addItemWithTitle:NSLocalizedString(@"Freehand", @"Menu item
title") imageNamed:SKImageNameInkNote action:@selector(changeAnnotationMode:)
target:mainController tag:SKInkNote];
- [toolModeButton setMenu:menu forSegment:SKNoteToolMode];
+ [menu addItemWithTitle:NSLocalizedString(@"Text Note", @"Menu item
title") imageNamed:SKImageNameTextNote action:@selector(changeAnnotationMode:)
target:mainController tag:SKNoteTypeFreeText];
+ [menu addItemWithTitle:NSLocalizedString(@"Anchored Note", @"Menu
item title") imageNamed:SKImageNameAnchoredNote
action:@selector(changeAnnotationMode:) target:mainController
tag:SKNoteTypeAnchored];
+ [menu addItemWithTitle:NSLocalizedString(@"Circle", @"Menu item
title") imageNamed:SKImageNameCircleNote
action:@selector(changeAnnotationMode:) target:mainController
tag:SKNoteTypeCircle];
+ [menu addItemWithTitle:NSLocalizedString(@"Box", @"Menu item
title") imageNamed:SKImageNameSquareNote
action:@selector(changeAnnotationMode:) target:mainController
tag:SKNoteTypeSquare];
+ [menu addItemWithTitle:NSLocalizedString(@"Highlight", @"Menu item
title") imageNamed:SKImageNameHighlightNote
action:@selector(changeAnnotationMode:) target:mainController
tag:SKNoteTypeHighlight];
+ [menu addItemWithTitle:NSLocalizedString(@"Underline", @"Menu item
title") imageNamed:SKImageNameUnderlineNote
action:@selector(changeAnnotationMode:) target:mainController
tag:SKNoteTypeUnderline];
+ [menu addItemWithTitle:NSLocalizedString(@"Strike Out", @"Menu
item title") imageNamed:SKImageNameStrikeOutNote
action:@selector(changeAnnotationMode:) target:mainController
tag:SKNoteTypeStrikeOut];
+ [menu addItemWithTitle:NSLocalizedString(@"Line", @"Menu item
title") imageNamed:SKImageNameLineNote action:@selector(changeAnnotationMode:)
target:mainController tag:SKNoteTypeLine];
+ [menu addItemWithTitle:NSLocalizedString(@"Freehand", @"Menu item
title") imageNamed:SKImageNameInkNote action:@selector(changeAnnotationMode:)
target:mainController tag:SKNoteTypeInk];
+ [toolModeButton setMenu:menu forSegment:SKToolModeNote];
menuItem = [[NSMenuItem alloc]
initWithSubmenuAndTitle:NSLocalizedString(@"Tool Mode", @"Toolbar item label")];
menu = [menuItem submenu];
- [menu addItemWithTitle:NSLocalizedString(@"Text Tool", @"Menu item
title") action:@selector(changeToolMode:) target:mainController
tag:SKTextToolMode];
- [menu addItemWithTitle:NSLocalizedString(@"Scroll Tool", @"Menu
item title") action:@selector(changeToolMode:) target:mainController
tag:SKMoveToolMode];
- [menu addItemWithTitle:NSLocalizedString(@"Magnify Tool", @"Menu
item title") action:@selector(changeToolMode:) target:mainController
tag:SKMagnifyToolMode];
- [menu addItemWithTitle:NSLocalizedString(@"Select Tool", @"Menu
item title") action:@selector(changeToolMode:) target:mainController
tag:SKSelectToolMode];
+ [menu addItemWithTitle:NSLocalizedString(@"Text Tool", @"Menu item
title") action:@selector(changeToolMode:) target:mainController
tag:SKToolModeText];
+ [menu addItemWithTitle:NSLocalizedString(@"Scroll Tool", @"Menu
item title") action:@selector(changeToolMode:) target:mainController
tag:SKToolModeMove];
+ [menu addItemWithTitle:NSLocalizedString(@"Magnify Tool", @"Menu
item title") action:@selector(changeToolMode:) target:mainController
tag:SKToolModeMagnify];
+ [menu addItemWithTitle:NSLocalizedString(@"Select Tool", @"Menu
item title") action:@selector(changeToolMode:) target:mainController
tag:SKToolModeSelect];
[menu addItem:[NSMenuItem separatorItem]];
- [menu addItemWithTitle:NSLocalizedString(@"Text Note Tool", @"Menu
item title") action:@selector(changeAnnotationMode:) target:mainController
tag:SKFreeTextNote];
- [menu addItemWithTitle:NSLocalizedString(@"Anchored Note Tool",
@"Menu item title") action:@selector(changeAnnotationMode:)
target:mainController tag:SKAnchoredNote];
- [menu addItemWithTitle:NSLocalizedString(@"Circle Tool", @"Menu
item title") action:@selector(changeAnnotationMode:) target:mainController
tag:SKCircleNote];
- [menu addItemWithTitle:NSLocalizedString(@"Box Tool", @"Menu item
title") action:@selector(changeAnnotationMode:) target:mainController
tag:SKSquareNote];
- [menu addItemWithTitle:NSLocalizedString(@"Highlight Tool", @"Menu
item title") action:@selector(changeAnnotationMode:) target:mainController
tag:SKHighlightNote];
- [menu addItemWithTitle:NSLocalizedString(@"Underline Tool", @"Menu
item title") action:@selector(changeAnnotationMode:) target:mainController
tag:SKUnderlineNote];
- [menu addItemWithTitle:NSLocalizedString(@"Strike Out Tool",
@"Menu item title") action:@selector(changeAnnotationMode:)
target:mainController tag:SKStrikeOutNote];
- [menu addItemWithTitle:NSLocalizedString(@"Line Tool", @"Menu item
title") action:@selector(changeAnnotationMode:) target:mainController
tag:SKLineNote];
- [menu addItemWithTitle:NSLocalizedString(@"Freehand Tool", @"Menu
item title") action:@selector(changeAnnotationMode:) target:mainController
tag:SKInkNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Text Note Tool", @"Menu
item title") action:@selector(changeAnnotationMode:) target:mainController
tag:SKNoteTypeFreeText];
+ [menu addItemWithTitle:NSLocalizedString(@"Anchored Note Tool",
@"Menu item title") action:@selector(changeAnnotationMode:)
target:mainController tag:SKNoteTypeAnchored];
+ [menu addItemWithTitle:NSLocalizedString(@"Circle Tool", @"Menu
item title") action:@selector(changeAnnotationMode:) target:mainController
tag:SKNoteTypeCircle];
+ [menu addItemWithTitle:NSLocalizedString(@"Box Tool", @"Menu item
title") action:@selector(changeAnnotationMode:) target:mainController
tag:SKNoteTypeSquare];
+ [menu addItemWithTitle:NSLocalizedString(@"Highlight Tool", @"Menu
item title") action:@selector(changeAnnotationMode:) target:mainController
tag:SKNoteTypeHighlight];
+ [menu addItemWithTitle:NSLocalizedString(@"Underline Tool", @"Menu
item title") action:@selector(changeAnnotationMode:) target:mainController
tag:SKNoteTypeUnderline];
+ [menu addItemWithTitle:NSLocalizedString(@"Strike Out Tool",
@"Menu item title") action:@selector(changeAnnotationMode:)
target:mainController tag:SKNoteTypeStrikeOut];
+ [menu addItemWithTitle:NSLocalizedString(@"Line Tool", @"Menu item
title") action:@selector(changeAnnotationMode:) target:mainController
tag:SKNoteTypeLine];
+ [menu addItemWithTitle:NSLocalizedString(@"Freehand Tool", @"Menu
item title") action:@selector(changeAnnotationMode:) target:mainController
tag:SKNoteTypeInk];
[item setLabels:NSLocalizedString(@"Tool Mode", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Tool Mode", @"Tool tip
message")];
- [toolModeButton setHelp:NSLocalizedString(@"Text Tool", @"Tool tip
message") forSegment:SKTextToolMode];
- [toolModeButton setHelp:NSLocalizedString(@"Scroll Tool", @"Tool
tip message") forSegment:SKMoveToolMode];
- [toolModeButton setHelp:NSLocalizedString(@"Magnify Tool", @"Tool
tip message") forSegment:SKMagnifyToolMode];
- [toolModeButton setHelp:NSLocalizedString(@"Select Tool", @"Tool
tip message") forSegment:SKSelectToolMode];
- [toolModeButton setHelp:NSLocalizedString(@"Note Tool", @"Tool tip
message") forSegment:SKNoteToolMode];
+ [toolModeButton setHelp:NSLocalizedString(@"Text Tool", @"Tool tip
message") forSegment:SKToolModeText];
+ [toolModeButton setHelp:NSLocalizedString(@"Scroll Tool", @"Tool
tip message") forSegment:SKToolModeMove];
+ [toolModeButton setHelp:NSLocalizedString(@"Magnify Tool", @"Tool
tip message") forSegment:SKToolModeMagnify];
+ [toolModeButton setHelp:NSLocalizedString(@"Select Tool", @"Tool
tip message") forSegment:SKToolModeSelect];
+ [toolModeButton setHelp:NSLocalizedString(@"Note Tool", @"Tool tip
message") forSegment:SKToolModeNote];
[item setView:toolModeButton];
[item setMenuFormRepresentation:menuItem];
@@ -956,7 +956,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarZoomToFitItemIdentifier]) {
return [mainController.pdfView.document isLocked] == NO &&
[mainController hasOverview] == NO && [mainController.pdfView autoScales] == NO;
} else if ([identifier
isEqualToString:SKDocumentToolbarZoomToSelectionItemIdentifier]) {
- return [mainController.pdfView.document isLocked] == NO &&
[mainController hasOverview] == NO && (NSIsEmptyRect([mainController.pdfView
currentSelectionRect]) == NO || [mainController.pdfView toolMode] !=
SKSelectToolMode);
+ return [mainController.pdfView.document isLocked] == NO &&
[mainController hasOverview] == NO && (NSIsEmptyRect([mainController.pdfView
currentSelectionRect]) == NO || [mainController.pdfView toolMode] !=
SKToolModeSelect);
} else if ([identifier
isEqualToString:SKDocumentToolbarZoomInOutItemIdentifier] ||
[identifier
isEqualToString:SKDocumentToolbarZoomInActualOutItemIdentifier] ||
[identifier
isEqualToString:SKDocumentToolbarAutoScalesItemIdentifier] ||
@@ -1002,7 +1002,7 @@
return [mainController.pdfView.document isLocked] == NO &&
[mainController hasOverview] == NO;
} else if (action == @selector(createNewTextNote:)) {
[menuItem setState:[textNoteButton tagForSegment:0] == [menuItem tag]
? NSControlStateValueOn : NSControlStateValueOff];
- return [mainController interactionMode] != SKPresentationMode &&
[mainController hasOverview] == NO && [mainController.pdfView.document
allowsNotes] && ([mainController.pdfView toolMode] == SKTextToolMode ||
[mainController.pdfView toolMode] == SKNoteToolMode) && [mainController.pdfView
hideNotes] == NO;
+ return [mainController interactionMode] != SKPresentationMode &&
[mainController hasOverview] == NO && [mainController.pdfView.document
allowsNotes] && ([mainController.pdfView toolMode] == SKToolModeText ||
[mainController.pdfView toolMode] == SKToolModeNote) && [mainController.pdfView
hideNotes] == NO;
} else if (action == @selector(createNewCircleNote:)) {
[menuItem setState:[circleNoteButton tagForSegment:0] == [menuItem
tag] ? NSControlStateValueOn : NSControlStateValueOff];
return [mainController hasOverview] == NO && [mainController.pdfView
canSelectNote];
@@ -1338,24 +1338,24 @@
SKToolMode toolMode = [mainController.pdfView toolMode];
NSString *name = nil;
switch ([mainController.pdfView temporaryToolMode]) {
- case SKZoomToolMode : name = SKImageNameToolbarZoomToSelection;
break;
- case SKSnapshotToolMode : name = SKImageNameToolbarSnapshotTool;
break;
- case SKFreeTextToolMode : name = SKImageNameToolbarAddTextNote;
break;
+ case SKToolModeZoom : name = SKImageNameToolbarZoomToSelection;
break;
+ case SKToolModeSnapshot : name = SKImageNameToolbarSnapshotTool;
break;
+ case SKToolModeFreeText : name = SKImageNameToolbarAddTextNote;
break;
case SKAnchoredToolMode : name = SKImageNameToolbarAddAnchoredNote;
break;
- case SKCircleToolMode : name = SKImageNameToolbarAddCircleNote;
break;
- case SKSquareToolMode : name = SKImageNameToolbarAddSquareNote;
break;
- case SKHighlightToolMode : name = SKImageNameToolbarAddHighlightNote;
break;
- case SKUnderlineToolMode : name = SKImageNameToolbarAddUnderlineNote;
break;
- case SKStrikeOutToolMode : name = SKImageNameToolbarAddStrikeOutNote;
break;
- case SKLineToolMode : name = SKImageNameToolbarAddLineNote;
break;
- case SKInkToolMode : name = SKImageNameToolbarAddInkNote;
break;
- case SKNoToolMode:
+ case SKToolModeCircle : name = SKImageNameToolbarAddCircleNote;
break;
+ case SKToolModeSquare : name = SKImageNameToolbarAddSquareNote;
break;
+ case SKToolModeHighlight : name = SKImageNameToolbarAddHighlightNote;
break;
+ case SKToolModeUnderline : name = SKImageNameToolbarAddUnderlineNote;
break;
+ case SKToolModeStrikeOut : name = SKImageNameToolbarAddStrikeOutNote;
break;
+ case SKToolModeLine : name = SKImageNameToolbarAddLineNote;
break;
+ case SKToolModeInk : name = SKImageNameToolbarAddInkNote;
break;
+ case SKToolModeNone:
switch (toolMode) {
- case SKTextToolMode : name = SKImageNameToolbarTextTool;
break;
- case SKMoveToolMode : name = SKImageNameToolbarMoveTool;
break;
- case SKMagnifyToolMode : name = SKImageNameToolbarMagnifyTool;
break;
- case SKSelectToolMode : name = SKImageNameToolbarSelectTool;
break;
- case SKNoteToolMode : name =
noteToolImageNames[mainController.pdfView.annotationMode]; break;
+ case SKToolModeText : name = SKImageNameToolbarTextTool;
break;
+ case SKToolModeMove : name = SKImageNameToolbarMoveTool;
break;
+ case SKToolModeMagnify : name = SKImageNameToolbarMagnifyTool;
break;
+ case SKToolModeSelect : name = SKImageNameToolbarSelectTool;
break;
+ case SKToolModeNote : name =
noteToolImageNames[mainController.pdfView.annotationMode]; break;
}
break;
}
@@ -1400,7 +1400,7 @@
}
- (void)handleAnnotationModeChangedNotification:(NSNotification *)notification
{
- [toolModeButton setImage:[NSImage
imageNamed:noteToolImageNames[[mainController.pdfView annotationMode]]]
forSegment:SKNoteToolMode];
+ [toolModeButton setImage:[NSImage
imageNamed:noteToolImageNames[[mainController.pdfView annotationMode]]]
forSegment:SKToolModeNote];
}
- (void)handlePacerStartedOrStoppedNotification:(NSNotification *)notification
{
Modified: trunk/SKMainTouchBarController.m
===================================================================
--- trunk/SKMainTouchBarController.m 2024-07-10 14:56:27 UTC (rev 14371)
+++ trunk/SKMainTouchBarController.m 2024-07-11 14:39:13 UTC (rev 14372)
@@ -337,7 +337,7 @@
- (void)changeAnnotationMode:(id)sender {
NSInteger newAnnotationMode = [sender selectedSegment];
- [mainController.pdfView setToolMode:SKNoteToolMode];
+ [mainController.pdfView setToolMode:SKToolModeNote];
[mainController.pdfView setAnnotationMode:newAnnotationMode];
}
@@ -376,7 +376,7 @@
- (void)handleToolModeChangedNotification:(NSNotification *)notification {
[toolModeButton selectSegmentWithTag:[mainController.pdfView toolMode]];
[noteButton setEnabled:[mainController.pdfView canSelectNote]];
- if ([mainController.pdfView toolMode] == SKNoteToolMode) {
+ if ([mainController.pdfView toolMode] == SKToolModeNote) {
[annotationModeButton selectSegmentWithTag:[mainController.pdfView
annotationMode]];
} else {
NSInteger i = [annotationModeButton selectedSegment];
@@ -389,24 +389,24 @@
SKToolMode toolMode = [mainController.pdfView toolMode];
NSString *name = nil;
switch ([mainController.pdfView temporaryToolMode]) {
- case SKZoomToolMode : name = SKImageNameTouchBarZoomToSelection;
break;
- case SKSnapshotToolMode : name = SKImageNameTouchBarSnapshotTool;
break;
- case SKFreeTextToolMode : name = SKImageNameTouchBarAddTextNote;
break;
+ case SKToolModeZoom : name = SKImageNameTouchBarZoomToSelection;
break;
+ case SKToolModeSnapshot : name = SKImageNameTouchBarSnapshotTool;
break;
+ case SKToolModeFreeText : name = SKImageNameTouchBarAddTextNote;
break;
case SKAnchoredToolMode : name = SKImageNameTouchBarAddAnchoredNote;
break;
- case SKCircleToolMode : name = SKImageNameTouchBarAddCircleNote;
break;
- case SKSquareToolMode : name = SKImageNameTouchBarAddSquareNote;
break;
- case SKHighlightToolMode : name = SKImageNameTouchBarAddHighlightNote;
break;
- case SKUnderlineToolMode : name = SKImageNameTouchBarAddUnderlineNote;
break;
- case SKStrikeOutToolMode : name = SKImageNameTouchBarAddStrikeOutNote;
break;
- case SKInkToolMode : name = SKImageNameTouchBarAddInkNote;
break;
- case SKLineToolMode : name = SKImageNameTouchBarAddLineNote;
break;
- case SKNoToolMode:
+ case SKToolModeCircle : name = SKImageNameTouchBarAddCircleNote;
break;
+ case SKToolModeSquare : name = SKImageNameTouchBarAddSquareNote;
break;
+ case SKToolModeHighlight : name = SKImageNameTouchBarAddHighlightNote;
break;
+ case SKToolModeUnderline : name = SKImageNameTouchBarAddUnderlineNote;
break;
+ case SKToolModeStrikeOut : name = SKImageNameTouchBarAddStrikeOutNote;
break;
+ case SKToolModeInk : name = SKImageNameTouchBarAddInkNote;
break;
+ case SKToolModeLine : name = SKImageNameTouchBarAddLineNote;
break;
+ case SKToolModeNone:
switch (toolMode) {
- case SKTextToolMode : name = SKImageNameTouchBarTextTool;
break;
- case SKMoveToolMode : name = SKImageNameTouchBarMoveTool;
break;
- case SKMagnifyToolMode : name =
SKImageNameTouchBarMagnifyTool; break;
- case SKSelectToolMode : name = SKImageNameTouchBarSelectTool;
break;
- case SKNoteToolMode : name =
noteToolImageNames[mainController.pdfView.annotationMode]; break;
+ case SKToolModeText : name = SKImageNameTouchBarTextTool;
break;
+ case SKToolModeMove : name = SKImageNameTouchBarMoveTool;
break;
+ case SKToolModeMagnify : name =
SKImageNameTouchBarMagnifyTool; break;
+ case SKToolModeSelect : name = SKImageNameTouchBarSelectTool;
break;
+ case SKToolModeNote : name =
noteToolImageNames[mainController.pdfView.annotationMode]; break;
}
break;
}
@@ -414,8 +414,8 @@
}
- (void)handleAnnotationModeChangedNotification:(NSNotification *)notification
{
- [toolModeButton setImage:[NSImage
imageNamed:noteToolImageNames[[mainController.pdfView annotationMode]]]
forSegment:SKNoteToolMode];
- if ([mainController.pdfView toolMode] == SKNoteToolMode)
+ [toolModeButton setImage:[NSImage
imageNamed:noteToolImageNames[[mainController.pdfView annotationMode]]]
forSegment:SKToolModeNote];
+ if ([mainController.pdfView toolMode] == SKToolModeNote)
[annotationModeButton selectSegmentWithTag:[mainController.pdfView
annotationMode]];
}
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2024-07-10 14:56:27 UTC (rev 14371)
+++ trunk/SKMainWindowController.m 2024-07-11 14:39:13 UTC (rev 14372)
@@ -1888,7 +1888,7 @@
} else {
[self updateRightStatus];
}
- if ([pdfView toolMode] == SKMoveToolMode || [pdfView toolMode] ==
SKMagnifyToolMode || [pdfView toolMode] == SKSelectToolMode)
+ if ([pdfView toolMode] == SKToolModeMove || [pdfView toolMode] ==
SKToolModeMagnify || [pdfView toolMode] == SKToolModeSelect)
[pdfView setCurrentSelection:nil];
}
}
Modified: trunk/SKMainWindowController_Actions.m
===================================================================
--- trunk/SKMainWindowController_Actions.m 2024-07-10 14:56:27 UTC (rev
14371)
+++ trunk/SKMainWindowController_Actions.m 2024-07-11 14:39:13 UTC (rev
14372)
@@ -413,7 +413,7 @@
}
- (IBAction)doZoomToSelection:(id)sender {
- if ([pdfView toolMode] == SKSelectToolMode) {
+ if ([pdfView toolMode] == SKToolModeSelect) {
NSRect selRect = [pdfView currentSelectionRect];
PDFPage *page = [pdfView currentPage];
if (NSIsEmptyRect(selRect) == NO && page)
@@ -420,7 +420,7 @@
[pdfView zoomToRect:selRect onPage:page];
else NSBeep();
} else {
- [pdfView setTemporaryToolMode:SKZoomToolMode];
+ [pdfView setTemporaryToolMode:SKToolModeZoom];
}
}
@@ -742,7 +742,7 @@
}
- (IBAction)changeAnnotationMode:(id)sender {
- [pdfView setToolMode:SKNoteToolMode];
+ [pdfView setToolMode:SKToolModeNote];
[pdfView setAnnotationMode:[sender tag]];
}
Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m 2024-07-10 14:56:27 UTC (rev 14371)
+++ trunk/SKMainWindowController_UI.m 2024-07-11 14:39:13 UTC (rev 14372)
@@ -325,13 +325,13 @@
- (void)window:(NSWindow *)sender willSendEvent:(NSEvent *)event {
[[SKImageToolTipWindow sharedToolTipWindow] orderOut:nil];
- if ([pdfView temporaryToolMode] != SKNoToolMode && [pdfView window] ==
sender) {
+ if ([pdfView temporaryToolMode] != SKToolModeNone && [pdfView window] ==
sender) {
if ([event type] == NSEventTypeLeftMouseDown) {
NSView *view = [pdfView hitTest:[event locationInView:pdfView]];
if ([view isDescendantOf:[pdfView documentView]] == NO || [view
isKindOfClass:[NSTextView class]])
- [pdfView setTemporaryToolMode:SKNoToolMode];
+ [pdfView setTemporaryToolMode:SKToolModeNone];
} else {
- [pdfView setTemporaryToolMode:SKNoToolMode];
+ [pdfView setTemporaryToolMode:SKToolModeNone];
}
}
}
@@ -1231,20 +1231,20 @@
if ([rowIndexes containsIndex:row] == NO)
rowIndexes = [NSIndexSet indexSetWithIndex:row];
NSArray *selections = [[leftSideController.findArrayController
arrangedObjects] objectsAtIndexes:rowIndexes];
- if ([pdfView toolMode] == SKTextToolMode) {
+ if ([pdfView toolMode] == SKToolModeText) {
item = [menu addItemWithTitle:NSLocalizedString(@"Select",
@"Menu item title") action:@selector(selectSelections:) target:self];
[item setRepresentedObject:selections];
}
if ([pdfView hideNotes] == NO && [[pdfView document] allowsNotes])
{
- item = [menu addItemWithTitle:NSLocalizedString(@"New Circle",
@"Menu item title") action:@selector(addAnnotationForContext:) target:pdfView
tag:SKCircleNote];
+ item = [menu addItemWithTitle:NSLocalizedString(@"New Circle",
@"Menu item title") action:@selector(addAnnotationForContext:) target:pdfView
tag:SKNoteTypeCircle];
[item setRepresentedObject:selections];
- item = [menu addItemWithTitle:NSLocalizedString(@"New Box",
@"Menu item title") action:@selector(addAnnotationForContext:) target:pdfView
tag:SKSquareNote];
+ item = [menu addItemWithTitle:NSLocalizedString(@"New Box",
@"Menu item title") action:@selector(addAnnotationForContext:) target:pdfView
tag:SKNoteTypeSquare];
[item setRepresentedObject:selections];
- item = [menu addItemWithTitle:NSLocalizedString(@"New
Highlight", @"Menu item title") action:@selector(addAnnotationForContext:)
target:pdfView tag:SKHighlightNote];
+ item = [menu addItemWithTitle:NSLocalizedString(@"New
Highlight", @"Menu item title") action:@selector(addAnnotationForContext:)
target:pdfView tag:SKNoteTypeHighlight];
[item setRepresentedObject:selections];
- item = [menu addItemWithTitle:NSLocalizedString(@"New
Underline", @"Menu item title") action:@selector(addAnnotationForContext:)
target:pdfView tag:SKUnderlineNote];
+ item = [menu addItemWithTitle:NSLocalizedString(@"New
Underline", @"Menu item title") action:@selector(addAnnotationForContext:)
target:pdfView tag:SKNoteTypeUnderline];
[item setRepresentedObject:selections];
- item = [menu addItemWithTitle:NSLocalizedString(@"New Strike
Out", @"Menu item title") action:@selector(addAnnotationForContext:)
target:pdfView tag:SKStrikeOutNote];
+ item = [menu addItemWithTitle:NSLocalizedString(@"New Strike
Out", @"Menu item title") action:@selector(addAnnotationForContext:)
target:pdfView tag:SKNoteTypeStrikeOut];
[item setRepresentedObject:selections];
}
}
@@ -1263,20 +1263,20 @@
if ([rowIndexes containsIndex:row] == NO)
rowIndexes = [NSIndexSet indexSetWithIndex:row];
NSArray *selections =
[[[leftSideController.groupedFindArrayController arrangedObjects]
objectsAtIndexes:rowIndexes] valueForKeyPath:@"@unionOfArrays.matches"];
- if ([pdfView toolMode] == SKTextToolMode) {
+ if ([pdfView toolMode] == SKToolModeText) {
item = [menu addItemWithTitle:NSLocalizedString(@"Select",
@"Menu item title") action:@selector(selectSelections:) target:self];
[item setRepresentedObject:selections];
}
if ([pdfView hideNotes] == NO && [[pdfView document] allowsNotes])
{
- item = [menu addItemWithTitle:NSLocalizedString(@"New Circle",
@"Menu item title") action:@selector(addAnnotationForContext:) target:pdfView
tag:SKCircleNote];
+ item = [menu addItemWithTitle:NSLocalizedString(@"New Circle",
@"Menu item title") action:@selector(addAnnotationForContext:) target:pdfView
tag:SKNoteTypeCircle];
[item setRepresentedObject:selections];
- item = [menu addItemWithTitle:NSLocalizedString(@"New Box",
@"Menu item title") action:@selector(addAnnotationForContext:) target:pdfView
tag:SKSquareNote];
+ item = [menu addItemWithTitle:NSLocalizedString(@"New Box",
@"Menu item title") action:@selector(addAnnotationForContext:) target:pdfView
tag:SKNoteTypeSquare];
[item setRepresentedObject:selections];
- item = [menu addItemWithTitle:NSLocalizedString(@"New
Highlight", @"Menu item title") action:@selector(addAnnotationForContext:)
target:pdfView tag:SKHighlightNote];
+ item = [menu addItemWithTitle:NSLocalizedString(@"New
Highlight", @"Menu item title") action:@selector(addAnnotationForContext:)
target:pdfView tag:SKNoteTypeHighlight];
[item setRepresentedObject:selections];
- item = [menu addItemWithTitle:NSLocalizedString(@"New
Underline", @"Menu item title") action:@selector(addAnnotationForContext:)
target:pdfView tag:SKUnderlineNote];
+ item = [menu addItemWithTitle:NSLocalizedString(@"New
Underline", @"Menu item title") action:@selector(addAnnotationForContext:)
target:pdfView tag:SKNoteTypeUnderline];
[item setRepresentedObject:selections];
- item = [menu addItemWithTitle:NSLocalizedString(@"New Strike
Out", @"Menu item title") action:@selector(addAnnotationForContext:)
target:pdfView tag:SKStrikeOutNote];
+ item = [menu addItemWithTitle:NSLocalizedString(@"New Strike
Out", @"Menu item title") action:@selector(addAnnotationForContext:)
target:pdfView tag:SKNoteTypeStrikeOut];
[item setRepresentedObject:selections];
}
}
@@ -1805,7 +1805,7 @@
} else if (action == @selector(doZoomToPhysicalSize:)) {
return [self interactionMode] != SKPresentationMode && [self
hasOverview] == NO && [[self pdfDocument] isLocked] == NO && ([pdfView
autoScales] || fabs([pdfView physicalScaleFactor] - 1.0 ) > 0.001);
} else if (action == @selector(doZoomToSelection:)) {
- return [self interactionMode] != SKPresentationMode && [self
hasOverview] == NO && [[self pdfDocument] isLocked] == NO &&
(NSIsEmptyRect([pdfView currentSelectionRect]) == NO || [pdfView toolMode] !=
SKSelectToolMode);
+ return [self interactionMode] != SKPresentationMode && [self
hasOverview] == NO && [[self pdfDocument] isLocked] == NO &&
(NSIsEmptyRect([pdfView currentSelectionRect]) == NO || [pdfView toolMode] !=
SKToolModeSelect);
} else if (action == @selector(doZoomToFit:)) {
return [self interactionMode] != SKPresentationMode && [self
hasOverview] == NO && [[self pdfDocument] isLocked] == NO && [pdfView
autoScales] == NO;
} else if (action == @selector(alternateZoomToFit:)) {
@@ -1829,7 +1829,7 @@
} else if (action == @selector(resetCrop:)) {
return mwcFlags.hasCropped && [self interactionMode] !=
SKPresentationMode && [[self pdfDocument] isLocked] == NO;
} else if (action == @selector(autoSelectContent:)) {
- return [self interactionMode] != SKPresentationMode && [self
hasOverview] == NO && [[self pdfDocument] isLocked] == NO && [pdfView toolMode]
== SKSelectToolMode;
+ return [self interactionMode] != SKPresentationMode && [self
hasOverview] == NO && [[self pdfDocument] isLocked] == NO && [pdfView toolMode]
== SKToolModeSelect;
} else if (action == @selector(takeSnapshot:)) {
return [[self pdfDocument] isLocked] == NO && [self hasOverview] == NO;
} else if (action == @selector(toggleLeftSidePane:)) {
Modified: trunk/SKPDFView.h
===================================================================
--- trunk/SKPDFView.h 2024-07-10 14:56:27 UTC (rev 14371)
+++ trunk/SKPDFView.h 2024-07-11 14:39:13 UTC (rev 14372)
@@ -64,38 +64,38 @@
extern NSString *SKPDFViewNewPageKey;
typedef NS_ENUM(NSInteger, SKToolMode) {
- SKTextToolMode,
- SKMoveToolMode,
- SKMagnifyToolMode,
- SKSelectToolMode,
- SKNoteToolMode
+ SKToolModeText,
+ SKToolModeMove,
+ SKToolModeMagnify,
+ SKToolModeSelect,
+ SKToolModeNote
};
typedef NS_ENUM(NSInteger, SKNoteType) {
- SKFreeTextNote,
- SKAnchoredNote,
- SKCircleNote,
- SKSquareNote,
- SKHighlightNote,
- SKUnderlineNote,
- SKStrikeOutNote,
- SKLineNote,
- SKInkNote
+ SKNoteTypeFreeText,
+ SKNoteTypeAnchored,
+ SKNoteTypeCircle,
+ SKNoteTypeSquare,
+ SKNoteTypeHighlight,
+ SKNoteTypeUnderline,
+ SKNoteTypeStrikeOut,
+ SKNoteTypeLine,
+ SKNoteTypeInk
};
typedef NS_ENUM(NSInteger, SKTemporaryToolMode) {
- SKNoToolMode,
- SKZoomToolMode,
- SKSnapshotToolMode,
- SKFreeTextToolMode,
+ SKToolModeNone,
+ SKToolModeZoom,
+ SKToolModeSnapshot,
+ SKToolModeFreeText,
SKAnchoredToolMode,
- SKCircleToolMode,
- SKSquareToolMode,
- SKHighlightToolMode,
- SKUnderlineToolMode,
- SKStrikeOutToolMode,
- SKLineToolMode,
- SKInkToolMode
+ SKToolModeCircle,
+ SKToolModeSquare,
+ SKToolModeHighlight,
+ SKToolModeUnderline,
+ SKToolModeStrikeOut,
+ SKToolModeLine,
+ SKToolModeInk
};
enum {
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2024-07-10 14:56:27 UTC (rev 14371)
+++ trunk/SKPDFView.m 2024-07-11 14:39:13 UTC (rev 14372)
@@ -85,11 +85,11 @@
#define ANNOTATION_MODE_COUNT 9
#define TOOL_MODE_COUNT 5
-#define IS_MARKUP(noteType) (noteType == SKHighlightNote || noteType ==
SKUnderlineNote || noteType == SKStrikeOutNote)
-#define IS_MARKUP_TOOL(tempoToolMode) (tempoToolMode == SKHighlightToolMode ||
tempoToolMode == SKUnderlineToolMode || tempoToolMode == SKStrikeOutToolMode)
+#define IS_MARKUP(noteType) (noteType == SKNoteTypeHighlight || noteType ==
SKNoteTypeUnderline || noteType == SKNoteTypeStrikeOut)
+#define IS_MARKUP_TOOL(tempoToolMode) (tempoToolMode == SKToolModeHighlight ||
tempoToolMode == SKToolModeUnderline || tempoToolMode == SKToolModeStrikeOut)
-#define NOTE_TYPE_FROM_TEMP_TOOL_MODE(tempToolMode) (SKNoteType)(tempToolMode
- SKFreeTextToolMode)
-#define TEMP_TOOL_MODE_FROM_NOTE_TYPE(noteType) (SKTemporaryToolMode)(noteType
+ SKFreeTextToolMode)
+#define NOTE_TYPE_FROM_TEMP_TOOL_MODE(tempToolMode) (SKNoteType)(tempToolMode
- SKToolModeFreeText)
+#define TEMP_TOOL_MODE_FROM_NOTE_TYPE(noteType) (SKTemporaryToolMode)(noteType
+ SKToolModeFreeText)
#define READINGBAR_RESIZE_EDGE_HEIGHT 3.0
#define NAVIGATION_BOTTOM_EDGE_HEIGHT 5.0
@@ -393,7 +393,7 @@
if ([self document] && [self window] && pdfvFlags.presentationMode == 0) {
NSRect visibleRect = [self visibleContentRect];
NSView *docView = [self documentView];
- BOOL hasLinkToolTips = toolMode != SKMagnifyToolMode;
+ BOOL hasLinkToolTips = toolMode != SKToolModeMagnify;
NSPoint mouseLoc = [docView convertPointFromScreen:[NSEvent
mouseLocation]];
BOOL mouseInView = [[self window] isVisible] &&
NSMouseInRect(mouseLoc, [docView visibleRect], [docView isFlipped]);
NSTrackingAreaOptions options = NSTrackingMouseEnteredAndExited |
NSTrackingActiveInKeyWindow;
@@ -629,20 +629,20 @@
- (void)setToolMode:(SKToolMode)newToolMode {
if (toolMode != newToolMode) {
- [self setTemporaryToolMode:SKNoToolMode];
- if (toolMode == SKTextToolMode || toolMode == SKNoteToolMode) {
- if (newToolMode != SKTextToolMode) {
- if (newToolMode != SKNoteToolMode && currentAnnotation)
+ [self setTemporaryToolMode:SKToolModeNone];
+ if (toolMode == SKToolModeText || toolMode == SKToolModeNote) {
+ if (newToolMode != SKToolModeText) {
+ if (newToolMode != SKToolModeNote && currentAnnotation)
[self setCurrentAnnotation:nil];
if ([[self currentSelection] hasCharacters])
[self setCurrentSelection:nil];
}
- } else if (toolMode == SKSelectToolMode) {
+ } else if (toolMode == SKToolModeSelect) {
if (NSEqualRects(selectionRect, NSZeroRect) == NO) {
[self setCurrentSelectionRect:NSZeroRect];
[[NSNotificationCenter defaultCenter]
postNotificationName:SKPDFViewSelectionChangedNotification object:self];
}
- } else if (toolMode == SKMagnifyToolMode) {
+ } else if (toolMode == SKToolModeMagnify) {
[self removeLoupeWindow];
}
@@ -652,7 +652,7 @@
[[NSNotificationCenter defaultCenter]
postNotificationName:SKPDFViewToolModeChangedNotification object:self];
[self setCursorForMouse:nil];
[self resetPDFToolTipRects];
- if (toolMode == SKMagnifyToolMode && [[NSUserDefaults
standardUserDefaults] boolForKey:SKMagnifyWithMousePressedKey] == NO)
+ if (toolMode == SKToolModeMagnify && [[NSUserDefaults
standardUserDefaults] boolForKey:SKMagnifyWithMousePressedKey] == NO)
[self doMagnifyWithEvent:nil];
}
}
@@ -680,7 +680,7 @@
- (void)setPresentationMode:(BOOL)flag {
if (pdfvFlags.presentationMode != flag) {
- [self setTemporaryToolMode:SKNoToolMode];
+ [self setTemporaryToolMode:SKToolModeNone];
if (pdfvFlags.presentationMode) {
pdfvFlags.cursorHidden = NO;
[NSCursor setHiddenUntilMouseMoves:NO];
@@ -689,12 +689,12 @@
}
pdfvFlags.presentationMode = flag;
if (pdfvFlags.presentationMode) {
- if (toolMode == SKTextToolMode || toolMode == SKNoteToolMode) {
+ if (toolMode == SKToolModeText || toolMode == SKToolModeNote) {
if (currentAnnotation)
[self setCurrentAnnotation:nil];
if ([[self currentSelection] hasCharacters])
[self setCurrentSelection:nil];
- } else if (toolMode == SKSelectToolMode &&
NSEqualRects(selectionRect, NSZeroRect) == NO) {
+ } else if (toolMode == SKToolModeSelect &&
NSEqualRects(selectionRect, NSZeroRect) == NO) {
[self setCurrentSelectionRect:NSZeroRect];
[[NSNotificationCenter defaultCenter]
postNotificationName:SKPDFViewSelectionChangedNotification object:self];
}
@@ -899,19 +899,19 @@
}
- (void)setCurrentSelection:(PDFSelection *)selection {
- if ((toolMode == SKNoteToolMode && annotationMode == SKHighlightNote) ||
temporaryToolMode == SKHighlightToolMode)
+ if ((toolMode == SKToolModeNote && annotationMode == SKNoteTypeHighlight)
|| temporaryToolMode == SKToolModeHighlight)
[selection setColor:[[NSUserDefaults standardUserDefaults]
colorForKey:SKHighlightNoteColorKey]];
[super setCurrentSelection:selection];
}
- (NSRect)currentSelectionRect {
- if (toolMode == SKSelectToolMode)
+ if (toolMode == SKToolModeSelect)
return selectionRect;
return NSZeroRect;
}
- (void)setCurrentSelectionRect:(NSRect)rect {
- if (toolMode == SKSelectToolMode) {
+ if (toolMode == SKToolModeSelect) {
if (NSEqualRects(selectionRect, rect) == NO)
[self requiresDisplay];
@synchronized (self) {
@@ -932,7 +932,7 @@
}
- (void)setCurrentSelectionPage:(PDFPage *)page {
- if (toolMode == SKSelectToolMode) {
+ if (toolMode == SKToolModeSelect) {
if (selectionPageIndex != [page pageIndex] || (page == nil &&
selectionPageIndex != NSNotFound))
[self requiresDisplay];
@synchronized (self) {
@@ -1003,7 +1003,7 @@
}
- (BOOL)canSelectNote {
- return pdfvFlags.hideNotes == NO && pdfvFlags.presentationMode == 0 &&
(toolMode == SKTextToolMode || toolMode == SKNoteToolMode) && [[self document]
allowsNotes];
+ return pdfvFlags.hideNotes == NO && pdfvFlags.presentationMode == 0 &&
(toolMode == SKToolModeText || toolMode == SKToolModeNote) && [[self document]
allowsNotes];
}
#pragma mark Reading bar
@@ -1248,7 +1248,7 @@
attrString = [[currentAnnotation selection] attributedString];
}
- if (toolMode == SKSelectToolMode && NSIsEmptyRect(selectionRect) == NO &&
selectionPageIndex != NSNotFound) {
+ if (toolMode == SKToolModeSelect && NSIsEmptyRect(selectionRect) == NO &&
selectionPageIndex != NSNotFound) {
NSRect selRect = NSIntegralRect(selectionRect);
PDFPage *page = [self currentSelectionPage];
NSData *pdfData = nil;
@@ -1317,7 +1317,7 @@
[self beginNewUndoGroupIfNeededWithCommit:YES];
[[self document] addAnnotation:newAnnotation toPage:page];
- if (toolMode == SKTextToolMode || toolMode == SKNoteToolMode)
+ if (toolMode == SKToolModeText || toolMode == SKToolModeNote)
[self setCurrentAnnotation:newAnnotation];
}
@@ -1392,7 +1392,7 @@
[[self document] addAnnotation:newAnnotation toPage:page];
[self setUndoActionName:NSLocalizedString(@"Add Note", @"Undo
action name")];
- if (toolMode == SKTextToolMode || toolMode == SKNoteToolMode)
+ if (toolMode == SKToolModeText || toolMode == SKToolModeNote)
[self setCurrentAnnotation:newAnnotation];
} else {
@@ -1425,8 +1425,8 @@
}
- (IBAction)selectAll:(id)sender {
- [self setTemporaryToolMode:SKNoToolMode];
- if (toolMode == SKTextToolMode)
+ [self setTemporaryToolMode:SKToolModeNone];
+ if (toolMode == SKToolModeText)
[super selectAll:sender];
}
@@ -1435,7 +1435,7 @@
}
- (IBAction)autoSelectContent:(id)sender {
- if (toolMode == SKSelectToolMode) {
+ if (toolMode == SKToolModeSelect) {
PDFPage *page = [self currentPage];
@synchronized (self) {
selectionRect = NSIntersectionRect(NSUnionRect([page autoCropBox],
selectionRect), [page boundsForBox:[self displayBox]]);
@@ -1451,7 +1451,7 @@
}
- (IBAction)changeAnnotationMode:(id)sender {
- [self setToolMode:SKNoteToolMode];
+ [self setToolMode:SKToolModeNote];
[self setAnnotationMode:[sender tag]];
}
@@ -1605,7 +1605,7 @@
idx = 0;
}
- [self setTemporaryToolMode:SKNoToolMode];
+ [self setTemporaryToolMode:SKToolModeNone];
if (range.location != NSNotFound) {
selection = [page selectionForRange:range];
@@ -1793,16 +1793,16 @@
if ((eventChar == NSDeleteCharacter || eventChar ==
NSDeleteFunctionKey) &&
(modifiers == 0)) {
[self delete:self];
- } else if (([self toolMode] == SKTextToolMode || [self toolMode] ==
SKNoteToolMode) && currentAnnotation && editor == nil && IS_ENTER(eventChar) &&
(modifiers == 0)) {
+ } else if (([self toolMode] == SKToolModeText || [self toolMode] ==
SKToolModeNote) && currentAnnotation && editor == nil && IS_ENTER(eventChar) &&
(modifiers == 0)) {
[self editCurrentAnnotation:self];
- } else if (([self toolMode] == SKTextToolMode || [self toolMode] ==
SKNoteToolMode) &&
+ } else if (([self toolMode] == SKToolModeText || [self toolMode] ==
SKToolModeNote) &&
(eventChar == SKEscapeCharacter) && (modifiers ==
NSEventModifierFlagOption)) {
[self setCurrentAnnotation:nil];
- } else if (([self toolMode] == SKTextToolMode || [self toolMode] ==
SKNoteToolMode) &&
+ } else if (([self toolMode] == SKToolModeText || [self toolMode] ==
SKToolModeNote) &&
(eventChar == NSTabCharacter) && (modifiers ==
NSEventModifierFlagOption)) {
[self selectNextCurrentAnnotation:self];
// backtab is a bit inconsistent, it seems Shift+Tab gives a
Shift-BackTab key event, I would have expected either Shift-Tab (as for the raw
event) or BackTab (as for most shift-modified keys)
- } else if (([self toolMode] == SKTextToolMode || [self toolMode] ==
SKNoteToolMode) &&
+ } else if (([self toolMode] == SKToolModeText || [self toolMode] ==
SKToolModeNote) &&
(((eventChar == NSBackTabCharacter) && ((modifiers &
~NSEventModifierFlagShift) == NSEventModifierFlagOption)) ||
((eventChar == NSTabCharacter) && (modifiers ==
(NSEventModifierFlagOption | NSEventModifierFlagShift))))) {
[self selectPreviousCurrentAnnotation:self];
@@ -1821,24 +1821,24 @@
// with some keyboard layouts, e.g. Japanese, the '=' character
requires Shift
} else if ([currentAnnotation isResizable] && [currentAnnotation
isLine] == NO && [currentAnnotation isInk] == NO && (eventChar == '=') &&
((modifiers & ~(NSEventModifierFlagOption | NSEventModifierFlagShift)) ==
NSEventModifierFlagControl)) {
[self doAutoSizeActiveNoteIgnoringWidth:(modifiers &
NSEventModifierFlagOption) != 0];
- } else if ([self toolMode] == SKNoteToolMode && (eventChar == 't') &&
(modifiers == 0)) {
- [self setAnnotationMode:SKFreeTextNote];
- } else if ([self toolMode] == SKNoteToolMode && (eventChar == 'n') &&
(modifiers == 0)) {
- [self setAnnotationMode:SKAnchoredNote];
- } else if ([self toolMode] == SKNoteToolMode && (eventChar == 'c') &&
(modifiers == 0)) {
- [self setAnnotationMode:SKCircleNote];
- } else if ([self toolMode] == SKNoteToolMode && (eventChar == 'b') &&
(modifiers == 0)) {
- [self setAnnotationMode:SKSquareNote];
- } else if ([self toolMode] == SKNoteToolMode && (eventChar == 'h') &&
(modifiers == 0)) {
- [self setAnnotationMode:SKHighlightNote];
- } else if ([self toolMode] == SKNoteToolMode && (eventChar == 'u') &&
(modifiers == 0)) {
- [self setAnnotationMode:SKUnderlineNote];
- } else if ([self toolMode] == SKNoteToolMode && (eventChar == 's') &&
(modifiers == 0)) {
- [self setAnnotationMode:SKStrikeOutNote];
- } else if ([self toolMode] == SKNoteToolMode && (eventChar == 'l') &&
(modifiers == 0)) {
- [self setAnnotationMode:SKLineNote];
- } else if ([self toolMode] == SKNoteToolMode && (eventChar == 'f') &&
(modifiers == 0)) {
- [self setAnnotationMode:SKInkNote];
+ } else if ([self toolMode] == SKToolModeNote && (eventChar == 't') &&
(modifiers == 0)) {
+ [self setAnnotationMode:SKNoteTypeFreeText];
+ } else if ([self toolMode] == SKToolModeNote && (eventChar == 'n') &&
(modifiers == 0)) {
+ [self setAnnotationMode:SKNoteTypeAnchored];
+ } else if ([self toolMode] == SKToolModeNote && (eventChar == 'c') &&
(modifiers == 0)) {
+ [self setAnnotationMode:SKNoteTypeCircle];
+ } else if ([self toolMode] == SKToolModeNote && (eventChar == 'b') &&
(modifiers == 0)) {
+ [self setAnnotationMode:SKNoteTypeSquare];
+ } else if ([self toolMode] == SKToolModeNote && (eventChar == 'h') &&
(modifiers == 0)) {
+ [self setAnnotationMode:SKNoteTypeHighlight];
+ } else if ([self toolMode] == SKToolModeNote && (eventChar == 'u') &&
(modifiers == 0)) {
+ [self setAnnotationMode:SKNoteTypeUnderline];
+ } else if ([self toolMode] == SKToolModeNote && (eventChar == 's') &&
(modifiers == 0)) {
+ [self setAnnotationMode:SKNoteTypeStrikeOut];
+ } else if ([self toolMode] == SKToolModeNote && (eventChar == 'l') &&
(modifiers == 0)) {
+ [self setAnnotationMode:SKNoteTypeLine];
+ } else if ([self toolMode] == SKToolModeNote && (eventChar == 'f') &&
(modifiers == 0)) {
+ [self setAnnotationMode:SKNoteTypeInk];
} else if ((eventChar == '?') && ((modifiers &
~NSEventModifierFlagShift) == 0)) {
[self showHelpMenu];
} else if ([typeSelectHelper handleEvent:theEvent] == NO) {
@@ -1864,13 +1864,13 @@
PDFAnnotation *wasCurrentAnnotation = currentAnnotation;
if ((modifiers & NSEventModifierFlagCommand) != 0)
- [self setTemporaryToolMode:SKNoToolMode];
+ [self setTemporaryToolMode:SKToolModeNone];
if ([[self document] isLocked]) {
- [self setTemporaryToolMode:SKNoToolMode];
+ [self setTemporaryToolMode:SKToolModeNone];
[super mouseDown:theEvent];
} else if (pdfvFlags.presentationMode) {
- [self setTemporaryToolMode:SKNoToolMode];
+ [self setTemporaryToolMode:SKToolModeNone];
BOOL didHideMouse = pdfvFlags.cursorHidden;
if ([NSApp willDragMouse] == NO) {
if ((area & kPDFLinkArea)) {
@@ -1913,7 +1913,7 @@
if (wantsLoupe)
[loupeController update];
} else if ((area & SKReadingBarArea) && (area & kPDFLinkArea) == 0) {
- [self setTemporaryToolMode:SKNoToolMode];
+ [self setTemporaryToolMode:SKToolModeNone];
BOOL wantsLoupe = [loupeController hide];
if ((area & (SKResizeUpDownArea | SKResizeLeftRightArea |
SKResizeRightArea | SKResizeUpArea | SKResizeLeftArea | SKResizeDownArea)))
[self doResizeReadingBarWithEvent:theEvent];
@@ -1923,13 +1923,13 @@
[loupeController update];
} else if ((area & kPDFPageArea) == 0) {
[self doDragWithEvent:theEvent];
- } else if (temporaryToolMode != SKNoToolMode && (modifiers &
NSEventModifierFlagCommand) == 0) {
+ } else if (temporaryToolMode != SKToolModeNone && (modifiers &
NSEventModifierFlagCommand) == 0) {
BOOL wantsLoupe = [loupeController hide];
- if (temporaryToolMode == SKZoomToolMode) {
+ if (temporaryToolMode == SKToolModeZoom) {
[self doMarqueeZoomWithEvent:theEvent];
- } else if (temporaryToolMode == SKSnapshotToolMode) {
+ } else if (temporaryToolMode == SKToolModeSnapshot) {
[self doSelectSnapshotWithEvent:theEvent];
- } else if (temporaryToolMode == SKInkToolMode) {
+ } else if (temporaryToolMode == SKToolModeInk) {
[self doDrawFreehandNoteWithEvent:theEvent];
} else if (IS_MARKUP_TOOL(temporaryToolMode) == NO) {
[self setCurrentAnnotation:nil];
@@ -1942,19 +1942,19 @@
[self setCurrentSelection:nil];
}
}
- [self setTemporaryToolMode:SKNoToolMode];
+ [self setTemporaryToolMode:SKToolModeNone];
if (wantsLoupe)
[loupeController update];
- } else if (toolMode == SKMoveToolMode) {
+ } else if (toolMode == SKToolModeMove) {
[self setCurrentSelection:nil];
if ((area & kPDFLinkArea))
[super mouseDown:theEvent];
else
[self doDragWithEvent:theEvent];
- } else if (toolMode == SKSelectToolMode) {
+ } else if (toolMode == SKToolModeSelect) {
[self setCurrentSelection:nil];
[self doSelectWithEvent:theEvent];
- } else if (toolMode == SKMagnifyToolMode) {
+ } else if (toolMode == SKToolModeMagnify) {
[self setCurrentSelection:nil];
[self doMagnifyWithEvent:theEvent];
} else if (pdfvFlags.hideNotes == NO && [[self document] allowsNotes] &&
IS_TABLET_EVENT(theEvent, NSPointingDeviceTypeEraser)) {
@@ -1972,10 +1972,10 @@
} else {
[self doDragMouseWithEvent:theEvent];
}
- } else if (toolMode == SKNoteToolMode && pdfvFlags.hideNotes == NO &&
[[self document] allowsNotes] && IS_MARKUP(annotationMode) == NO) {
+ } else if (toolMode == SKToolModeNote && pdfvFlags.hideNotes == NO &&
[[self document] allowsNotes] && IS_MARKUP(annotationMode) == NO) {
if ((area & kPDFLinkArea) != 0 && [NSApp willDragMouse] == NO) {
[super mouseDown:theEvent];
- } else if (annotationMode == SKInkNote) {
+ } else if (annotationMode == SKNoteTypeInk) {
[self doDrawFreehandNoteWithEvent:theEvent];
} else {
[self setCurrentAnnotation:nil];
@@ -1987,7 +1987,7 @@
} else if ([self doDragTextWithEvent:theEvent] == NO) {
[self setCurrentAnnotation:nil];
[super mouseDown:theEvent];
- if ((toolMode == SKNoteToolMode && pdfvFlags.hideNotes == NO && [[self
document] allowsNotes] && IS_MARKUP(annotationMode)) && [[self
currentSelection] hasCharacters]) {
+ if ((toolMode == SKToolModeNote && pdfvFlags.hideNotes == NO && [[self
document] allowsNotes] && IS_MARKUP(annotationMode)) && [[self
currentSelection] hasCharacters]) {
[self addAnnotationWithType:annotationMode];
[self setCurrentSelection:nil];
}
@@ -2000,7 +2000,7 @@
if (pdfvFlags.presentationMode == 0)
[super mouseMoved:theEvent];
- if (toolMode == SKMagnifyToolMode && loupeController) {
+ if (toolMode == SKToolModeMagnify && loupeController) {
[loupeController update];
} else {
@@ -2056,7 +2056,7 @@
}
// On Leopard the selection is automatically set. In some cases we never
want a selection though.
- if (pdfvFlags.presentationMode || (toolMode != SKTextToolMode && [[self
currentSelection] hasCharacters])) {
+ if (pdfvFlags.presentationMode || (toolMode != SKToolModeText && [[self
currentSelection] hasCharacters])) {
static NSSet *selectionActions = nil;
if (selectionActions == nil)
selectionActions = [[NSSet alloc]
initWithObjects:@"_searchInSpotlight:", @"_searchInGoogle:",
@"_searchInDictionary:", @"_revealSelection:", nil];
@@ -2112,33 +2112,33 @@
item = [menu insertItemWithSubmenuAndTitle:NSLocalizedString(@"Tools",
@"Menu item title") atIndex:0];
submenu = [item submenu];
- [submenu addItemWithTitle:NSLocalizedString(@"Text", @"Menu item title")
action:@selector(changeToolMode:) target:self tag:SKTextToolMode];
+ [submenu addItemWithTitle:NSLocalizedString(@"Text", @"Menu item title")
action:@selector(changeToolMode:) target:self tag:SKToolModeText];
- [submenu addItemWithTitle:NSLocalizedString(@"Scroll", @"Menu item title")
action:@selector(changeToolMode:) target:self tag:SKMoveToolMode];
+ [submenu addItemWithTitle:NSLocalizedString(@"Scroll", @"Menu item title")
action:@selector(changeToolMode:) target:self tag:SKToolModeMove];
- [submenu addItemWithTitle:NSLocalizedString(@"Magnify", @"Menu item
title") action:@selector(changeToolMode:) target:self tag:SKMagnifyToolMode];
+ [submenu addItemWithTitle:NSLocalizedString(@"Magnify", @"Menu item
title") action:@selector(changeToolMode:) target:self tag:SKToolModeMagnify];
- [submenu addItemWithTitle:NSLocalizedString(@"Select", @"Menu item title")
action:@selector(changeToolMode:) target:self tag:SKSelectToolMode];
+ [submenu addItemWithTitle:NSLocalizedString(@"Select", @"Menu item title")
action:@selector(changeToolMode:) target:self tag:SKToolModeSelect];
[submenu addItem:[NSMenuItem separatorItem]];
- [submenu addItemWithTitle:NSLocalizedString(@"Text Note", @"Menu item
title") action:@selector(changeAnnotationMode:) target:self tag:SKFreeTextNote];
+ [submenu addItemWithTitle:NSLocalizedString(@"Text Note", @"Menu item
title") action:@selector(changeAnnotationMode:) target:self
tag:SKNoteTypeFreeText];
- [submenu addItemWithTitle:NSLocalizedString(@"Anchored Note", @"Menu item
title") action:@selector(changeAnnotationMode:) target:self tag:SKAnchoredNote];
+ [submenu addItemWithTitle:NSLocalizedString(@"Anchored Note", @"Menu item
title") action:@selector(changeAnnotationMode:) target:self
tag:SKNoteTypeAnchored];
- [submenu addItemWithTitle:NSLocalizedString(@"Circle", @"Menu item title")
action:@selector(changeAnnotationMode:) target:self tag:SKCircleNote];
+ [submenu addItemWithTitle:NSLocalizedString(@"Circle", @"Menu item title")
action:@selector(changeAnnotationMode:) target:self tag:SKNoteTypeCircle];
- [submenu addItemWithTitle:NSLocalizedString(@"Box", @"Menu item title")
action:@selector(changeAnnotationMode:) target:self tag:SKSquareNote];
+ [submenu addItemWithTitle:NSLocalizedString(@"Box", @"Menu item title")
action:@selector(changeAnnotationMode:) target:self tag:SKNoteTypeSquare];
- [submenu addItemWithTitle:NSLocalizedString(@"Highlight", @"Menu item
title") action:@selector(changeAnnotationMode:) target:self
tag:SKHighlightNote];
+ [submenu addItemWithTitle:NSLocalizedString(@"Highlight", @"Menu item
title") action:@selector(changeAnnotationMode:) target:self
tag:SKNoteTypeHighlight];
- [submenu addItemWithTitle:NSLocalizedString(@"Underline", @"Menu item
title") action:@selector(changeAnnotationMode:) target:self
tag:SKUnderlineNote];
+ [submenu addItemWithTitle:NSLocalizedString(@"Underline", @"Menu item
title") action:@selector(changeAnnotationMode:) target:self
tag:SKNoteTypeUnderline];
- [submenu addItemWithTitle:NSLocalizedString(@"Strike Out", @"Menu item
title") action:@selector(changeAnnotationMode:) target:self
tag:SKStrikeOutNote];
+ [submenu addItemWithTitle:NSLocalizedString(@"Strike Out", @"Menu item
title") action:@selector(changeAnnotationMode:) target:self
tag:SKNoteTypeStrikeOut];
- [submenu addItemWithTitle:NSLocalizedString(@"Line", @"Menu item title")
action:@selector(changeAnnotationMode:) target:self tag:SKLineNote];
+ [submenu addItemWithTitle:NSLocalizedString(@"Line", @"Menu item title")
action:@selector(changeAnnotationMode:) target:self tag:SKNoteTypeLine];
- [submenu addItemWithTitle:NSLocalizedString(@"Freehand", @"Menu item
title") action:@selector(changeAnnotationMode:) target:self tag:SKInkNote];
+ [submenu addItemWithTitle:NSLocalizedString(@"Freehand", @"Menu item
title") action:@selector(changeAnnotationMode:) target:self tag:SKNoteTypeInk];
[menu insertItem:[NSMenuItem separatorItem] atIndex:0];
@@ -2152,30 +2152,30 @@
item = [menu insertItemWithSubmenuAndTitle:NSLocalizedString(@"New
Note or Highlight", @"Menu item title") atIndex:0];
submenu = [item submenu];
- item = [submenu addItemWithTitle:NSLocalizedString(@"Text Note",
@"Menu item title") action:@selector(addAnnotationForContext:) target:self
tag:SKFreeTextNote];
+ item = [submenu addItemWithTitle:NSLocalizedString(@"Text Note",
@"Menu item title") action:@selector(addAnnotationForContext:) target:self
tag:SKNoteTypeFreeText];
[item setRepresentedObject:pointValue];
- item = [submenu addItemWithTitle:NSLocalizedString(@"Anchored Note",
@"Menu item title") action:@selector(addAnnotationForContext:) target:self
tag:SKAnchoredNote];
+ item = [submenu addItemWithTitle:NSLocalizedString(@"Anchored Note",
@"Menu item title") action:@selector(addAnnotationForContext:) target:self
tag:SKNoteTypeAnchored];
[item setRepresentedObject:pointValue];
- item = [submenu addItemWithTitle:NSLocalizedString(@"Circle", @"Menu
item title") action:@selector(addAnnotationForContext:) target:self
tag:SKCircleNote];
+ item = [submenu addItemWithTitle:NSLocalizedString(@"Circle", @"Menu
item title") action:@selector(addAnnotationForContext:) target:self
tag:SKNoteTypeCircle];
[item setRepresentedObject:pointValue];
- item = [submenu addItemWithTitle:NSLocalizedString(@"Box", @"Menu item
title") action:@selector(addAnnotationForContext:) target:self
tag:SKSquareNote];
+ item = [submenu addItemWithTitle:NSLocalizedString(@"Box", @"Menu item
title") action:@selector(addAnnotationForContext:) target:self
tag:SKNoteTypeSquare];
[item setRepresentedObject:pointValue];
if ([[self currentSelection] hasCharacters]) {
- item = [submenu addItemWithTitle:NSLocalizedString(@"Highlight",
@"Menu item title") action:@selector(addAnnotationForContext:) target:self
tag:SKHighlightNote];
+ item = [submenu addItemWithTitle:NSLocalizedString(@"Highlight",
@"Menu item title") action:@selector(addAnnotationForContext:) target:self
tag:SKNoteTypeHighlight];
[item setRepresentedObject:pointValue];
- item = [submenu addItemWithTitle:NSLocalizedString(@"Underline",
@"Menu item title") action:@selector(addAnnotationForContext:) target:self
tag:SKUnderlineNote];
+ item = [submenu addItemWithTitle:NSLocalizedString(@"Underline",
@"Menu item title") action:@selector(addAnnotationForContext:) target:self
tag:SKNoteTypeUnderline];
[item setRepresentedObject:pointValue];
- item = [submenu addItemWithTitle:NSLocalizedString(@"Strike Out",
@"Menu item title") action:@selector(addAnnotationForContext:) target:self
tag:SKStrikeOutNote];
+ item = [submenu addItemWithTitle:NSLocalizedString(@"Strike Out",
@"Menu item title") action:@selector(addAnnotationForContext:) target:self
tag:SKNoteTypeStrikeOut];
[item setRepresentedObject:pointValue];
}
- item = [submenu addItemWithTitle:NSLocalizedString(@"Line", @"Menu
item title") action:@selector(addAnnotationForContext:) target:self
tag:SKLineNote];
+ item = [submenu addItemWithTitle:NSLocalizedString(@"Line", @"Menu
item title") action:@selector(addAnnotationForContext:) target:self
tag:SKNoteTypeLine];
[item setRepresentedObject:pointValue];
[menu insertItem:[NSMenuItem separatorItem] atIndex:0];
@@ -2265,7 +2265,7 @@
if ([[menu itemAtIndex:0] isSeparatorItem])
[menu removeItemAtIndex:0];
- } else if ((toolMode == SKSelectToolMode && NSIsEmptyRect(selectionRect)
== NO) || ([self toolMode] == SKTextToolMode && [[self currentSelection]
hasCharacters])) {
+ } else if ((toolMode == SKToolModeSelect && NSIsEmptyRect(selectionRect)
== NO) || ([self toolMode] == SKToolModeText && [[self currentSelection]
hasCharacters])) {
[menu insertItem:[NSMenuItem separatorItem] atIndex:0];
@@ -2301,7 +2301,7 @@
} else {
if (([eventArea options] & NSTrackingInVisibleRect)) {
[[NSCursor arrowCursor] set];
- if (toolMode == SKMagnifyToolMode)
+ if (toolMode == SKToolModeMagnify)
[loupeController hide];
}
if ([[SKPDFView superclass] instancesRespondToSelector:_cmd])
@@ -2454,7 +2454,7 @@
#pragma mark Services
- (BOOL)writeSelectionToPasteboard:(NSPasteboard *)pboard types:(NSArray
*)types {
- if ([self toolMode] == SKSelectToolMode && NSIsEmptyRect(selectionRect) ==
NO && selectionPageIndex != NSNotFound) {
+ if ([self toolMode] == SKToolModeSelect && NSIsEmptyRect(selectionRect) ==
NO && selectionPageIndex != NSNotFound) {
NSMutableArray *writeTypes = [NSMutableArray array];
NSString *pdfType = nil;
NSData *pdfData = nil;
@@ -2503,7 +2503,7 @@
}
- (id)validRequestorForSendType:(NSString *)sendType returnType:(NSString
*)returnType {
- if ([self toolMode] == SKSelectToolMode && NSIsEmptyRect(selectionRect) ==
NO && selectionPageIndex != NSNotFound && returnType == nil &&
+ if ([self toolMode] == SKToolModeSelect && NSIsEmptyRect(selectionRect) ==
NO && selectionPageIndex != NSNotFound && returnType == nil &&
(([[self document] allowsPrinting] && [[self document] isLocked] == NO
&& [sendType isEqualToString:NSPasteboardTypePDF]) || [sendType
isEqualToString:NSPasteboardTypeTIFF])) {
return self;
}
@@ -2523,7 +2523,7 @@
// new note added by note tool mode, don't add actual zero sized notes
if (isInitial)
- bounds = annotationType == SKAnchoredNote ?
SKRectFromCenterAndSize(bounds.origin, SKNPDFAnnotationNoteSize) :
SKRectFromCenterAndSquareSize(bounds.origin, MIN_NOTE_SIZE);
+ bounds = annotationType == SKNoteTypeAnchored ?
SKRectFromCenterAndSize(bounds.origin, SKNPDFAnnotationNoteSize) :
SKRectFromCenterAndSquareSize(bounds.origin, MIN_NOTE_SIZE);
if ([[NSUserDefaults standardUserDefaults]
integerForKey:SKDisableUpdateContentsFromEnclosedTextKey] > 1)
text = nil;
@@ -2532,34 +2532,34 @@
NSString *type = nil;
BOOL isMarkup = NO;
switch (annotationType) {
- case SKFreeTextNote:
+ case SKNoteTypeFreeText:
type = SKNFreeTextString;
break;
- case SKAnchoredNote:
+ case SKNoteTypeAnchored:
type = SKNNoteString;
break;
- case SKCircleNote:
+ case SKNoteTypeCircle:
type = SKNCircleString;
break;
- case SKSquareNote:
+ case SKNoteTypeSquare:
type = SKNSquareString;
break;
- case SKHighlightNote:
+ case SKNoteTypeHighlight:
type = SKNHighlightString;
isMarkup = YES;
break;
- case SKUnderlineNote:
+ case SKNoteTypeUnderline:
type = SKNUnderlineString;
isMarkup = YES;
break;
- case SKStrikeOutNote:
+ case SKNoteTypeStrikeOut:
type = SKNStrikeOutString;
isMarkup = YES;
break;
- case SKLineNote:
+ case SKNoteTypeLine:
type = SKNLineString;
break;
- case SKInkNote:
+ case SKNoteTypeInk:
// we need a drawn path to add an ink note
break;
}
@@ -2590,7 +2590,7 @@
}
[self setUndoActionName:NSLocalizedString(@"Add Note", @"Undo action
name")];
- if (toolMode == SKTextToolMode || toolMode == SKNoteToolMode)
+ if (toolMode == SKToolModeText || toolMode == SKToolModeNote)
[self setCurrentAnnotation:newAnnotation];
return YES;
@@ -2597,7 +2597,7 @@
} else if (newAnnotation) {
[self beginNewUndoGroupIfNeededWithCommit:YES];
- if (annotationType != SKLineNote && annotationType != SKInkNote &&
[text length] > 0)
+ if (annotationType != SKNoteTypeLine && annotationType !=
SKNoteTypeInk && [text length] > 0)
[newAnnotation setString:text];
[newAnnotation registerUserName];
[[self document] addAnnotation:newAnnotation toPage:page];
@@ -2607,7 +2607,7 @@
[newAnnotation setString:@""];
[self setUndoActionName:NSLocalizedString(@"Add Note", @"Undo action
name")];
- if (toolMode == SKTextToolMode || toolMode == SKNoteToolMode)
+ if (toolMode == SKToolModeText || toolMode == SKToolModeNote)
[self setCurrentAnnotation:newAnnotation];
return YES;
@@ -2651,7 +2651,7 @@
// add new markup to the active markup if it's the same type on the
same page, unless we add a specific selection
if (noSelection && page && [[currentAnnotation page] isEqual:page] &&
- [[currentAnnotation type] isEqualToString:(annotationType ==
SKHighlightNote ? SKNHighlightString : annotationType == SKUnderlineNote ?
SKNUnderlineString : annotationType == SKStrikeOutNote ? SKNStrikeOutString :
nil)]) {
+ [[currentAnnotation type] isEqualToString:(annotationType ==
SKNoteTypeHighlight ? SKNHighlightString : annotationType ==
SKNoteTypeUnderline ? SKNUnderlineString : annotationType ==
SKNoteTypeStrikeOut ? SKNStrikeOutString : nil)]) {
selection = [selection copy];
[selection addSelection:[currentAnnotation selection]];
[self removeCurrentAnnotation:nil];
@@ -2661,7 +2661,7 @@
// Get bounds (page space) for selection (first page in case
selection spans multiple pages)
bounds = [selection boundsForPage:page];
- if (annotationType == SKCircleNote) {
+ if (annotationType == SKNoteTypeCircle) {
CGFloat dw, dh, w = NSWidth(bounds), h = NSHeight(bounds);
if (h < w) {
dw = primaryOutset(h / w);
@@ -2672,10 +2672,10 @@
}
CGFloat lw = [[NSUserDefaults standardUserDefaults]
doubleForKey:SKCircleNoteLineWidthKey];
bounds = NSInsetRect(bounds, -0.5 * w * dw - lw, -0.5 * h * dh -
lw);
- } else if (annotationType == SKSquareNote) {
+ } else if (annotationType == SKNoteTypeSquare) {
CGFloat lw = [[NSUserDefaults standardUserDefaults]
doubleForKey:SKSquareNoteLineWidthKey];
bounds = NSInsetRect(bounds, -lw, -lw);
- } else if (annotationType == SKLineNote) {
+ } else if (annotationType == SKNoteTypeLine) {
CGFloat defaultWidth = [[NSUserDefaults standardUserDefaults]
floatForKey:SKDefaultNoteWidthKey];
CGFloat defaultHeight = [[NSUserDefaults standardUserDefaults]
floatForKey:SKDefaultNoteHeightKey];
NSRect pageBounds = [page boundsForBox:[self displayBox]];
@@ -2713,7 +2713,7 @@
break;
}
bounds = SKRectFromPoints(p1, p2);
- } else if (annotationType == SKAnchoredNote) {
+ } else if (annotationType == SKNoteTypeAnchored) {
NSRect pageBounds = [page boundsForBox:[self displayBox]];
switch ([page intrinsicRotation]) {
case 0:
@@ -2767,7 +2767,7 @@
CGFloat defaultWidth = [[NSUserDefaults standardUserDefaults]
floatForKey:SKDefaultNoteWidthKey];
CGFloat defaultHeight = [[NSUserDefaults standardUserDefaults]
floatForKey:SKDefaultNoteHeightKey];
- NSSize defaultSize = (annotationType == SKAnchoredNote) ?
SKNPDFAnnotationNoteSize : ([page rotation] % 180 == 0) ?
NSMakeSize(defaultWidth, defaultHeight) : NSMakeSize(defaultHeight,
defaultWidth);
+ NSSize defaultSize = (annotationType == SKNoteTypeAnchored) ?
SKNPDFAnnotationNoteSize : ([page rotation] % 180 == 0) ?
NSMakeSize(defaultWidth, defaultHeight) : NSMakeSize(defaultHeight,
defaultWidth);
// Convert to "page space".
center = SKIntegralPoint([self convertPoint: center toPage:
page]);
@@ -2779,7 +2779,7 @@
}
if (page != nil && [self addAnnotationWithType:annotationType
selection:selection page:page bounds:bounds]) {
- if (annotationType == SKAnchoredNote || annotationType ==
SKFreeTextNote)
+ if (annotationType == SKNoteTypeAnchored || annotationType ==
SKNoteTypeFreeText)
[self editCurrentAnnotation:self];
else if (isMarkup && noSelection)
[self setCurrentSelection:nil];
@@ -2787,7 +2787,7 @@
}
- (void)addAnnotationWithType:(SKNoteType)annotationType {
- if ((toolMode == SKTextToolMode || toolMode == SKNoteToolMode) &&
(annotationType == SKInkNote || (([[NSUserDefaults standardUserDefaults]
boolForKey:SKNewNoteRequiresSelectionKey] || IS_MARKUP(annotationType)) &&
[[self currentSelection] hasCharacters] == NO))) {
+ if ((toolMode == SKToolModeText || toolMode == SKToolModeNote) &&
(annotationType == SKNoteTypeInk || (([[NSUserDefaults standardUserDefaults]
boolForKey:SKNewNoteRequiresSelectionKey] || IS_MARKUP(annotationType)) &&
[[self currentSelection] hasCharacters] == NO))) {
[self
setTemporaryToolMode:TEMP_TOOL_MODE_FROM_NOTE_TYPE(annotationType)];
} else {
[self addAnnotationWithType:annotationType context:nil];
@@ -3083,7 +3083,7 @@
[readingBar goToLine:line onPage:page];
}
}
- if (select && [sel hasCharacters] && [self toolMode] ==
SKTextToolMode) {
+ if (select && [sel hasCharacters] && [self toolMode] ==
SKToolModeText) {
[self setCurrentSelection:sel];
}
}
@@ -3128,7 +3128,7 @@
NSRect rect = NSZeroRect;
BOOL autoFits = NO;
- if (toolMode == SKSelectToolMode && NSIsEmptyRect(selectionRect) == NO &&
selectionPageIndex != NSNotFound) {
+ if (toolMode == SKToolModeSelect && NSIsEmptyRect(selectionRect) == NO &&
selectionPageIndex != NSNotFound) {
page = [self currentSelectionPage];
rect = NSIntersectionRect(selectionRect, [page
boundsForBox:kPDFDisplayBoxCropBox]);
autoFits = YES;
@@ -3136,7 +3136,7 @@
if (NSIsEmptyRect(rect)) {
if ([sender representedObject] == nil) {
- [self setTemporaryToolMode:SKSnapshotToolMode];
+ [self setTemporaryToolMode:SKToolModeSnapshot];
return;
}
@@ -3272,7 +3272,7 @@
if ([self displayMode] == kPDFDisplaySinglePage || [self displayMode] ==
kPDFDisplayTwoUp) {
[editor layoutWithEvent:nil];
[self resetPDFToolTipRects];
- if (toolMode == SKMagnifyToolMode)
+ if (toolMode == SKToolModeMagnify)
[loupeController updateContents];
}
}
@@ -3296,7 +3296,7 @@
[self setNeedsDisplayForAnnotation:currentAnnotation];
}
if ([[notification name]
isEqualToString:NSWindowDidResignKeyNotification]) {
- [self setTemporaryToolMode:SKNoToolMode];
+ [self setTemporaryToolMode:SKToolModeNone];
if (pdfvFlags.presentationMode) {
[[self class] cancelPreviousPerformRequestsWithTarget:self
selector:@selector(showNavWindow) object:nil];
[[self class] cancelPreviousPerformRequestsWithTarget:self
selector:@selector(doAutoHide) object:nil];
@@ -3303,7 +3303,7 @@
[[self class] cancelPreviousPerformRequestsWithTarget:self
selector:@selector(doAutoHideCursor) object:nil];
pdfvFlags.cursorHidden = 0;
[self setCursorForMouse:nil];
- } else if (toolMode == SKMagnifyToolMode) {
+ } else if (toolMode == SKToolModeMagnify) {
[loupeController hide];
}
}
@@ -3310,7 +3310,7 @@
}
- (void)handleMainStateChangedNotification:(NSNotification *)notification {
- [self setTemporaryToolMode:SKNoToolMode];
+ [self setTemporaryToolMode:SKToolModeNone];
}
- (void)undoManagerDidOpenOrCloseUndoGroup {
@@ -3333,7 +3333,7 @@
[[self class] cancelPreviousPerformRequestsWithTarget:self
selector:@selector(doAutoHideCursor) object:nil];
}
- [self setTemporaryToolMode:SKNoToolMode];
+ [self setTemporaryToolMode:SKToolModeNone];
NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
NSWindow *oldWindow = [self window];
@@ -3374,13 +3374,13 @@
return YES;
} else if (action == @selector(changeAnnotationMode:)) {
if ([[menuItem menu] numberOfItems] > ANNOTATION_MODE_COUNT)
- [menuItem setState:[self toolMode] == SKNoteToolMode && [self
annotationMode] == (SKNoteType)[menuItem tag] ? NSControlStateValueOn :
NSControlStateValueOff];
+ [menuItem setState:[self toolMode] == SKToolModeNote && [self
annotationMode] == (SKNoteType)[menuItem tag] ? NSControlStateValueOn :
NSControlStateValueOff];
else
[menuItem setState:[self annotationMode] == (SKNoteType)[menuItem
tag] ? NSControlStateValueOn : NSControlStateValueOff];
return YES;
} else if (action == @selector(copy:)) {
return ([[self currentSelection] hasCharacters] || [currentAnnotation
isSkimNote] ||
- (toolMode == SKSelectToolMode && NSIsEmptyRect(selectionRect) ==
NO && selectionPageIndex != NSNotFound && [[self document] isLocked] == NO));
+ (toolMode == SKToolModeSelect && NSIsEmptyRect(selectionRect) ==
NO && selectionPageIndex != NSNotFound && [[self document] isLocked] == NO));
} else if (action == @selector(cut:)) {
if ([currentAnnotation isSkimNote] && [currentAnnotation isMovable])
return YES;
@@ -3394,11 +3394,11 @@
} else if (action == @selector(delete:)) {
return [currentAnnotation isSkimNote];
} else if (action == @selector(selectAll:)) {
- return toolMode == SKTextToolMode;
+ return toolMode == SKToolModeText;
} else if (action == @selector(deselectAll:)) {
return [[self currentSelection] hasCharacters] != 0;
} else if (action == @selector(autoSelectContent:)) {
- return toolMode == SKSelectToolMode;
+ return toolMode == SKToolModeSelect;
} else if (action == @selector(takeSnapshot:)) {
return [[self document] isLocked] == NO;
} else if (action == @selector(_setSinglePageScrolling:)) {
@@ -3425,7 +3425,7 @@
} else if (action == @selector(autoSizeCurrentAnnotation:)) {
return [[self currentAnnotation] isResizable] && [[self
currentAnnotation] isLine] == NO && [currentAnnotation isInk] == NO;
} else if (action == @selector(changeOnlyAnnotationMode:)) {
- return toolMode == SKNoteToolMode;
+ return toolMode == SKToolModeNote;
} else if (action == @selector(moveReadingBar:) || action ==
@selector(resizeReadingBar:)) {
return [self hasReadingBar];
} else if (action == @selector(nextLaserPointerColor:) || action ==
@selector(nextLaserPointerColor:)) {
@@ -4220,7 +4220,7 @@
// Hit-test for resize box.
SKRectEdges resizeHandle = [currentAnnotation
resizeHandleForPoint:pagePoint scaleFactor:[self scaleFactor]];
- if (shouldAddAnnotation && temporaryToolMode >= SKFreeTextToolMode)
+ if (shouldAddAnnotation && temporaryToolMode >= SKToolModeFreeText)
noteType = NOTE_TYPE_FROM_TEMP_TOOL_MODE(temporaryToolMode);
atomic_store(&highlightLayerState, SKLayerAdd);
@@ -4228,12 +4228,12 @@
[self setNeedsDisplayForAnnotation:currentAnnotation];
if (shouldAddAnnotation) {
- if (noteType == SKAnchoredNote) {
- [self addAnnotationWithType:SKAnchoredNote selection:nil page:page
bounds:SKRectFromCenterAndSquareSize(SKIntegralPoint(pagePoint), 0.0)];
+ if (noteType == SKNoteTypeAnchored) {
+ [self addAnnotationWithType:SKNoteTypeAnchored selection:nil
page:page bounds:SKRectFromCenterAndSquareSize(SKIntegralPoint(pagePoint),
0.0)];
originalBounds = [[self currentAnnotation] bounds];
} else {
originalBounds =
SKRectFromCenterAndSquareSize(SKIntegralPoint(pagePoint), 0.0);
- if (noteType == SKLineNote) {
+ if (noteType == SKNoteTypeLine) {
isLine = YES;
resizeHandle = SKMaxXEdgeMask;
originalStartPoint = originalEndPoint = originalBounds.origin;
@@ -4294,7 +4294,7 @@
if (draggedAnnotation)
[currentAnnotation autoUpdateString];
- if (shouldAddAnnotation && (noteType == SKAnchoredNote || noteType ==
SKFreeTextNote))
+ if (shouldAddAnnotation && (noteType == SKNoteTypeAnchored || noteType
== SKNoteTypeFreeText))
[self editCurrentAnnotation:self];
atomic_store(&highlightLayerState, SKLayerRemove);
@@ -4349,7 +4349,7 @@
if ([annotation isSkimNote] && [annotation hitTest:point] && [self
isEditingAnnotation:annotation] == NO) {
newCurrentAnnotation = annotation;
break;
- } else if ([annotation shouldDisplay] && NSPointInRect(point,
[annotation bounds]) && (toolMode == SKTextToolMode ||
IS_MARKUP(annotationMode)) && linkAnnotation == nil) {
+ } else if ([annotation shouldDisplay] && NSPointInRect(point,
[annotation bounds]) && (toolMode == SKToolModeText ||
IS_MARKUP(annotationMode)) && linkAnnotation == nil) {
if ([annotation isLink])
linkAnnotation = annotation;
else
@@ -4363,7 +4363,7 @@
}
if (pdfvFlags.hideNotes == NO && [[self document] allowsNotes] && page !=
nil && newCurrentAnnotation != nil) {
- BOOL isInk = toolMode == SKNoteToolMode && annotationMode == SKInkNote;
+ BOOL isInk = toolMode == SKToolModeNote && annotationMode ==
SKNoteTypeInk;
NSUInteger modifiers = [theEvent modifierFlags];
if ((modifiers & NSEventModifierFlagOption) && [newCurrentAnnotation
isMovable] &&
[newCurrentAnnotation resizeHandleForPoint:point scaleFactor:[self
scaleFactor]] == 0) {
@@ -5010,7 +5010,7 @@
autoFits = YES;
- } else if (toolMode == SKSelectToolMode && NSIsEmptyRect(selectionRect) ==
NO) {
+ } else if (toolMode == SKToolModeSelect && NSIsEmptyRect(selectionRect) ==
NO) {
rect = NSIntersectionRect(selectionRect, [page
boundsForBox:kPDFDisplayBoxCropBox]);
rect = [self convertRect:rect fromPage:page];
@@ -5205,31 +5205,31 @@
[item setKeyEquivalentModifierMask:NSEventModifierFlagCommand |
NSEventModifierFlagOption];
item = [menu addItemWithTitle:NSLocalizedString(@"Text Note", @"Menu
item title") action:@selector(changeOnlyAnnotationMode:) keyEquivalent:@"t"];
[item setKeyEquivalentModifierMask:0];
- [item setTag:SKFreeTextNote];
+ [item setTag:SKNoteTypeFreeText];
item = [menu addItemWithTitle:NSLocalizedString(@"Anchored Note",
@"Menu item title") action:@selector(changeOnlyAnnotationMode:)
keyEquivalent:@"n"];
[item setKeyEquivalentModifierMask:0];
- [item setTag:SKAnchoredNote];
+ [item setTag:SKNoteTypeAnchored];
item = [menu addItemWithTitle:NSLocalizedString(@"Circle", @"Menu item
title") action:@selector(changeOnlyAnnotationMode:) keyEquivalent:@"c"];
[item setKeyEquivalentModifierMask:0];
- [item setTag:SKCircleNote];
+ [item setTag:SKNoteTypeCircle];
item = [menu addItemWithTitle:NSLocalizedString(@"Box", @"Menu item
title") action:@selector(changeOnlyAnnotationMode:) keyEquivalent:@"b"];
[item setKeyEquivalentModifierMask:0];
- [item setTag:SKSquareNote];
+ [item setTag:SKNoteTypeSquare];
item = [menu addItemWithTitle:NSLocalizedString(@"Highlight", @"Menu
item title") action:@selector(changeOnlyAnnotationMode:) keyEquivalent:@"h"];
[item setKeyEquivalentModifierMask:0];
- [item setTag:SKHighlightNote];
+ [item setTag:SKNoteTypeHighlight];
item = [menu addItemWithTitle:NSLocalizedString(@"Underline", @"Menu
item title") action:@selector(changeOnlyAnnotationMode:) keyEquivalent:@"u"];
[item setKeyEquivalentModifierMask:0];
- [item setTag:SKUnderlineNote];
+ [item setTag:SKNoteTypeUnderline];
item = [menu addItemWithTitle:NSLocalizedString(@"Strike Out", @"Menu
item title") action:@selector(changeOnlyAnnotationMode:) keyEquivalent:@"s"];
[item setKeyEquivalentModifierMask:0];
- [item setTag:SKStrikeOutNote];
+ [item setTag:SKNoteTypeStrikeOut];
item = [menu addItemWithTitle:NSLocalizedString(@"Line", @"Menu item
title") action:@selector(changeOnlyAnnotationMode:) keyEquivalent:@"l"];
[item setKeyEquivalentModifierMask:0];
- [item setTag:SKLineNote];
+ [item setTag:SKNoteTypeLine];
item = [menu addItemWithTitle:NSLocalizedString(@"Freehand", @"Menu
item title") action:@selector(changeOnlyAnnotationMode:) keyEquivalent:@"f"];
[item setKeyEquivalentModifierMask:0];
- [item setTag:SKInkNote];
+ [item setTag:SKNoteTypeInk];
}
NSPoint point = SKTopLeftPoint(SKRectFromCenterAndSize(SKCenterPoint([self
bounds]), [menu size]));
[menu popUpMenuPositioningItem:nil atLocation:point inView:self];
@@ -5238,15 +5238,15 @@
- (NSCursor *)cursorForNoteType:(SKNoteType)noteType {
if (useToolModeCursors) {
switch (noteType) {
- case SKFreeTextNote: return [NSCursor textNoteCursor];
- case SKAnchoredNote: return [NSCursor anchoredNoteCursor];
- case SKCircleNote: return [NSCursor circleNoteCursor];
- case SKSquareNote: return [NSCursor squareNoteCursor];
- case SKHighlightNote: return [NSCursor highlightNoteCursor];
- case SKUnderlineNote: return [NSCursor underlineNoteCursor];
- case SKStrikeOutNote: return [NSCursor strikeOutNoteCursor];
- case SKLineNote: return [NSCursor lineNoteCursor];
- case SKInkNote: return [NSCursor inkNoteCursor];
+ case SKNoteTypeFreeText: return [NSCursor textNoteCursor];
+ case SKNoteTypeAnchored: return [NSCursor anchoredNoteCursor];
+ case SKNoteTypeCircle: return [NSCursor circleNoteCursor];
+ case SKNoteTypeSquare: return [NSCursor squareNoteCursor];
+ case SKNoteTypeHighlight: return [NSCursor highlightNoteCursor];
+ case SKNoteTypeUnderline: return [NSCursor underlineNoteCursor];
+ case SKNoteTypeStrikeOut: return [NSCursor strikeOutNoteCursor];
+ case SKNoteTypeLine: return [NSCursor lineNoteCursor];
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
