Revision: 16219
http://sourceforge.net/p/skim-app/code/16219
Author: hofman
Date: 2026-05-05 09:39:56 +0000 (Tue, 05 May 2026)
Log Message:
-----------
declare canAddNotes property
Modified Paths:
--------------
trunk/SKMainToolbarController.m
trunk/SKMainWindowController_UI.m
trunk/SKPDFView.h
trunk/SKPDFView.m
Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m 2026-05-05 08:51:08 UTC (rev 16218)
+++ trunk/SKMainToolbarController.m 2026-05-05 09:39:56 UTC (rev 16219)
@@ -1063,7 +1063,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] == SKToolModeText ||
[mainController.pdfView toolMode] == SKToolModeNote) && [mainController.pdfView
hideNotes] == NO;
+ return [mainController interactionMode] != SKPresentationMode &&
[mainController hasOverview] == NO && [mainController.pdfView canAddNotes] &&
([mainController.pdfView toolMode] == SKToolModeText || [mainController.pdfView
toolMode] == SKToolModeNote);
} else if (action == @selector(createNewShapeNote:)) {
[menuItem setState:[circleNoteButton tagForSegment:0] == [menuItem
tag] ? NSControlStateValueOn : NSControlStateValueOff];
return [mainController hasOverview] == NO && [mainController.pdfView
canSelectNote];
Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m 2026-05-05 08:51:08 UTC (rev 16218)
+++ trunk/SKMainWindowController_UI.m 2026-05-05 09:39:56 UTC (rev 16219)
@@ -1321,7 +1321,7 @@
item = [menu addItemWithTitle:NSLocalizedString(@"Select",
@"Menu item title") action:@selector(selectSelections:) target:self];
[item setRepresentedObject:selections];
}
- if ([pdfView hideNotes] == NO && [[pdfView document] allowsNotes])
{
+ if ([pdfView canAddNotes]) {
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:SKNoteTypeSquare];
@@ -1353,7 +1353,7 @@
item = [menu addItemWithTitle:NSLocalizedString(@"Select",
@"Menu item title") action:@selector(selectSelections:) target:self];
[item setRepresentedObject:selections];
}
- if ([pdfView hideNotes] == NO && [[pdfView document] allowsNotes])
{
+ if ([pdfView canAddNotes]) {
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:SKNoteTypeSquare];
@@ -1434,7 +1434,7 @@
[item setAlternate:YES];
}
}
- if ([pdfView hideNotes] == NO && [[self pdfDocument]
allowsNotes]) {
+ if ([pdfView canAddNotes]) {
if ([pdfView currentAnnotation] == annotation) {
item = [menu
addItemWithTitle:NSLocalizedString(@"Deselect", @"Menu item title")
action:@selector(deselectNote:) target:self];
[item setRepresentedObject:annotation];
Modified: trunk/SKPDFView.h
===================================================================
--- trunk/SKPDFView.h 2026-05-05 08:51:08 UTC (rev 16218)
+++ trunk/SKPDFView.h 2026-05-05 09:39:56 UTC (rev 16219)
@@ -189,6 +189,7 @@
@property (nonatomic, nullable, strong) PDFPage *selectToolPage;
@property (nonatomic, readonly) CGFloat magnifyToolMagnification;
@property (nonatomic) BOOL hideNotes;
+@property (nonatomic, readonly) BOOL canAddNotes;
@property (nonatomic, readonly) BOOL canSelectNote;
@property (nonatomic, readonly) BOOL hasReadingBar;
@property (nullable, readonly) SKReadingBar *readingBar;
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2026-05-05 08:51:08 UTC (rev 16218)
+++ trunk/SKPDFView.m 2026-05-05 09:39:56 UTC (rev 16219)
@@ -245,7 +245,7 @@
@implementation SKPDFView
@synthesize toolMode, annotationMode, temporaryToolMode, currentAnnotation,
readingBar, pacerSpeed, typeSelectHelper, syncDot, hideNotes, zooming;
-@dynamic extendedDisplayMode, displaySettings, canSelectNote, hasReadingBar,
hasPacer, selectToolPage, selectToolRect, magnifyToolMagnification,
needsRewind, editing, delegate;
+@dynamic extendedDisplayMode, displaySettings, canAddNotes, canSelectNote,
hasReadingBar, hasPacer, selectToolPage, selectToolRect,
magnifyToolMagnification, needsRewind, editing, delegate;
+ (void)initialize {
SKINITIALIZE;
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