Revision: 14106
http://sourceforge.net/p/skim-app/code/14106
Author: hofman
Date: 2024-03-14 22:24:59 +0000 (Thu, 14 Mar 2024)
Log Message:
-----------
use NSControlStateValue enum values
Modified Paths:
--------------
trunk/NSValueTransformer_SKExtensions.m
trunk/PDFAnnotationButtonWidget_SKExtensions.m
trunk/SKFindController.m
trunk/SKFontWell.m
trunk/SKMainDocument.m
trunk/SKMainToolbarController.m
trunk/SKMainWindowController.m
trunk/SKMainWindowController_Actions.m
trunk/SKMainWindowController_UI.m
trunk/SKNavigationWindow.m
trunk/SKNoteOutlineView.m
trunk/SKNoteTypeSheetController.m
trunk/SKNotesDocument.m
trunk/SKPDFView.m
trunk/SKSecondaryPDFView.m
trunk/SKSnapshotPDFView.m
trunk/SKSnapshotWindowController.m
Modified: trunk/NSValueTransformer_SKExtensions.m
===================================================================
--- trunk/NSValueTransformer_SKExtensions.m 2024-03-14 15:34:26 UTC (rev
14105)
+++ trunk/NSValueTransformer_SKExtensions.m 2024-03-14 22:24:59 UTC (rev
14106)
@@ -257,11 +257,11 @@
}
- (id)transformedValue:(id)value {
- return [NSNumber numberWithInteger:[value integerValue] == targetValue ?
NSOnState : NSOffState];
+ return [NSNumber numberWithInteger:[value integerValue] == targetValue ?
NSControlStateValueOn : NSControlStateValueOff];
}
- (id)reverseTransformedValue:(id)value {
- return [NSNumber numberWithInteger:[value integerValue] == NSOnState ?
targetValue : 0];
+ return [NSNumber numberWithInteger:[value integerValue] ==
NSControlStateValueOn ? targetValue : 0];
}
@end
Modified: trunk/PDFAnnotationButtonWidget_SKExtensions.m
===================================================================
--- trunk/PDFAnnotationButtonWidget_SKExtensions.m 2024-03-14 15:34:26 UTC
(rev 14105)
+++ trunk/PDFAnnotationButtonWidget_SKExtensions.m 2024-03-14 22:24:59 UTC
(rev 14106)
@@ -51,7 +51,7 @@
[fdfString appendFDFName:SKFDFAnnotationFieldNameKey];
[fdfString appendFormat:@"(%@)", [[[self fieldName] ?: @""
lossyStringUsingEncoding:NSISOLatin1StringEncoding]
stringByEscapingParenthesis]];
[fdfString appendFDFName:SKFDFAnnotationFieldValueKey];
- [fdfString appendFormat:@"/%@", [self state] == NSOnState ? [self
onStateValue] : @"Off"];
+ [fdfString appendFormat:@"/%@", [self state] == NSControlStateValueOn ?
[self onStateValue] : @"Off"];
return fdfString;
}
Modified: trunk/SKFindController.m
===================================================================
--- trunk/SKFindController.m 2024-03-14 15:34:26 UTC (rev 14105)
+++ trunk/SKFindController.m 2024-03-14 22:24:59 UTC (rev 14106)
@@ -149,7 +149,7 @@
- (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
if ([menuItem action] == @selector(toggleCaseInsensitiveFind:)) {
- [menuItem setState:[[NSUserDefaults standardUserDefaults]
boolForKey:SKCaseInsensitiveFindKey] ? NSOnState : NSOffState];
+ [menuItem setState:[[NSUserDefaults standardUserDefaults]
boolForKey:SKCaseInsensitiveFindKey] ? NSControlStateValueOn :
NSControlStateValueOff];
return YES;
}
return YES;
Modified: trunk/SKFontWell.m
===================================================================
--- trunk/SKFontWell.m 2024-03-14 15:34:26 UTC (rev 14105)
+++ trunk/SKFontWell.m 2024-03-14 22:24:59 UTC (rev 14106)
@@ -221,7 +221,7 @@
[nc addObserver:self selector:@selector(fontPanelWillClose:)
name:NSWindowWillCloseNotification object:[fm fontPanel:YES]];
- [self setState:NSOnState];
+ [self setState:NSControlStateValueOn];
[self dirty];
[self setNeedsDisplay:YES];
}
@@ -228,7 +228,7 @@
- (void)deactivate {
[[NSNotificationCenter defaultCenter] removeObserver:self];
- [self setState:NSOffState];
+ [self setState:NSControlStateValueOff];
[self dirty];
[self setNeedsDisplay:YES];
}
@@ -252,7 +252,7 @@
- (void)setTarget:(id)newTarget { target = newTarget; }
- (BOOL)isActive {
- return [self state] == NSOnState;
+ return [self state] == NSControlStateValueOn;
}
- (void)setFont:(NSFont *)newFont {
@@ -448,7 +448,7 @@
[self setTextColor:[NSColor controlTextColor]];
[self setBezelStyle:NSShadowlessSquareBezelStyle]; // this is mainly to
make it selectable
[self setButtonType:NSPushOnPushOffButton];
- [self setState:NSOffState];
+ [self setState:NSControlStateValueOff];
}
- (instancetype)initTextCell:(NSString *)aString {
@@ -478,7 +478,7 @@
- (void)drawBezelWithFrame:(NSRect)frame inView:(NSView *)controlView {
SKDrawTextFieldBezel(frame, controlView);
- if ([self state] == NSOnState) {
+ if ([self state] == NSControlStateValueOn) {
[NSGraphicsContext saveGraphicsState];
[[NSGraphicsContext currentContext]
setCompositingOperation:NSCompositingOperationMultiply];
[[NSColor selectedControlColor] setFill];
@@ -506,7 +506,7 @@
NSMutableAttributedString *attrString = [[super attributedTitle]
mutableCopy];
[attrString addAttribute:NSForegroundColorAttributeName value:[self
textColor] range:NSMakeRange(0, [attrString length])];
CGFloat textLuminance = [[self textColor] luminance];
- CGFloat backgroundLuminance = [([self state] == NSOnState ? [NSColor
selectedControlColor] : [self backgroundColor]) luminance];
+ CGFloat backgroundLuminance = [([self state] == NSControlStateValueOn
? [NSColor selectedControlColor] : [self backgroundColor]) luminance];
if ((fmax(textLuminance, backgroundLuminance) + 0.05) /
(fmin(textLuminance, backgroundLuminance) + 0.05) < 4.5) {
NSShadow *shade = [[NSShadow alloc] init];
[shade setShadowColor:backgroundLuminance < 0.5 ? [NSColor
whiteColor] : [NSColor blackColor]];
Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m 2024-03-14 15:34:26 UTC (rev 14105)
+++ trunk/SKMainDocument.m 2024-03-14 22:24:59 UTC (rev 14106)
@@ -1086,7 +1086,7 @@
readNotesAccessoryView = [[NSView alloc]
initWithFrame:NSInsetRect([replaceNotesCheckButton frame],
-CHECK_BUTTON_OFFSET_X, -CHECK_BUTTON_OFFSET_Y)];
[readNotesAccessoryView addSubview:replaceNotesCheckButton];
[oPanel setAccessoryView:readNotesAccessoryView];
- [replaceNotesCheckButton setState:NSOnState];
+ [replaceNotesCheckButton setState:NSControlStateValueOn];
[oPanel setAccessoryViewDisclosed:YES];
}
@@ -1095,7 +1095,7 @@
[oPanel beginSheetModalForWindow:[self windowForSheet]
completionHandler:^(NSModalResponse result){
if (result == NSModalResponseOK) {
NSURL *notesURL = [[oPanel URLs] objectAtIndex:0];
- BOOL replace = (replaceNotesCheckButton &&
[replaceNotesCheckButton state] == NSOnState);
+ BOOL replace = (replaceNotesCheckButton &&
[replaceNotesCheckButton state] == NSControlStateValueOn);
[self readNotesFromURL:notesURL replace:replace];
}
}];
Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m 2024-03-14 15:34:26 UTC (rev 14105)
+++ trunk/SKMainToolbarController.m 2024-03-14 22:24:59 UTC (rev 14106)
@@ -966,13 +966,13 @@
} else if (action == @selector(zoomActualPhysical:)) {
return [mainController.pdfView.document isLocked] == NO &&
[mainController hasOverview] == NO;
} else if (action == @selector(createNewTextNote:)) {
- [menuItem setState:[[textNoteButton cell] tagForSegment:0] ==
[menuItem tag] ? NSOnState : NSOffState];
+ [menuItem setState:[[textNoteButton cell] 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;
} else if (action == @selector(createNewCircleNote:)) {
- [menuItem setState:[[circleNoteButton cell] tagForSegment:0] ==
[menuItem tag] ? NSOnState : NSOffState];
+ [menuItem setState:[[circleNoteButton cell] tagForSegment:0] ==
[menuItem tag] ? NSControlStateValueOn : NSControlStateValueOff];
return [mainController hasOverview] == NO && [mainController.pdfView
canSelectNote];
} else if (action == @selector(createNewMarkupNote:)) {
- [menuItem setState:[[markupNoteButton cell] tagForSegment:0] ==
[menuItem tag] ? NSOnState : NSOffState];
+ [menuItem setState:[[markupNoteButton cell] tagForSegment:0] ==
[menuItem tag] ? NSControlStateValueOn : NSControlStateValueOff];
return [mainController hasOverview] == NO && [mainController.pdfView
canSelectNote];
} else if (action == @selector(toggleFullScreen:)) {
return [mainController canEnterFullscreen] || [mainController
canExitFullscreen];
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2024-03-14 15:34:26 UTC (rev 14105)
+++ trunk/SKMainWindowController.m 2024-03-14 22:24:59 UTC (rev 14106)
@@ -691,7 +691,7 @@
rect = [[pdfView currentPage] boundsForBox:[pdfView displayBox]];
if (NSEqualRects(rect, NSZeroRect) == NO) {
- if ([[[statusBar rightField] cell] state] == NSOnState) {
+ if ([[[statusBar rightField] cell] state] == NSControlStateValueOn) {
BOOL useMetric = [[[NSLocale currentLocale]
objectForKey:NSLocaleUsesMetricSystem] boolValue];
NSString *units = useMetric ? NSLocalizedString(@"cm", @"size
unit") : NSLocalizedString(@"in", @"size unit");
CGFloat factor = useMetric ? CM_PER_POINT : INCH_PER_POINT;
Modified: trunk/SKMainWindowController_Actions.m
===================================================================
--- trunk/SKMainWindowController_Actions.m 2024-03-14 15:34:26 UTC (rev
14105)
+++ trunk/SKMainWindowController_Actions.m 2024-03-14 22:24:59 UTC (rev
14106)
@@ -102,8 +102,8 @@
- (IBAction)changeColor:(id)sender{
PDFAnnotation *annotation = [pdfView currentAnnotation];
if (mwcFlags.updatingColor == 0 && [self hasOverview] == NO && [annotation
isSkimNote]) {
- BOOL isFill = [colorAccessoryView state] == NSOnState && [annotation
hasInteriorColor];
- BOOL isText = [textColorAccessoryView state] == NSOnState &&
[annotation isText];
+ BOOL isFill = [colorAccessoryView state] == NSControlStateValueOn &&
[annotation hasInteriorColor];
+ BOOL isText = [textColorAccessoryView state] == NSControlStateValueOn
&& [annotation isText];
BOOL isShift = ([NSEvent standardModifierFlags] &
NSEventModifierFlagShift) != 0;
mwcFlags.updatingColor = 1;
[annotation setColor:[sender color] alternate:isFill || isText
updateDefaults:isShift];
Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m 2024-03-14 15:34:26 UTC (rev 14105)
+++ trunk/SKMainWindowController_UI.m 2024-03-14 22:24:59 UTC (rev 14106)
@@ -172,9 +172,9 @@
textColorAccessoryView = [self
newColorAccessoryButtonWithTitle:NSLocalizedString(@"Text color", @"Check
button title")];
accessoryView = textColorAccessoryView;
}
- if ([annotation hasInteriorColor] && [colorAccessoryView state] ==
NSOnState) {
+ if ([annotation hasInteriorColor] && [colorAccessoryView state] ==
NSControlStateValueOn) {
color = [(id)annotation interiorColor] ?: [NSColor clearColor];
- } else if ([annotation isText] && [textColorAccessoryView state]
== NSOnState) {
+ } else if ([annotation isText] && [textColorAccessoryView state]
== NSControlStateValueOn) {
color = [(id)annotation fontColor] ?: [NSColor blackColor];
} else {
color = [annotation color];
@@ -1721,28 +1721,28 @@
[menuItem setTitle:NSLocalizedString(@"Hide Notes", @"Menu item
title")];
return YES;
} else if (action == @selector(changeDisplaySinglePages:)) {
- [menuItem setState:([pdfView displayMode] & kPDFDisplayTwoUp) ==
(PDFDisplayMode)[menuItem tag] ? NSOnState : NSOffState];
+ [menuItem setState:([pdfView displayMode] & kPDFDisplayTwoUp) ==
(PDFDisplayMode)[menuItem tag] ? NSControlStateValueOn :
NSControlStateValueOff];
return [self interactionMode] != SKPresentationMode && [self
hasOverview] == NO && [[self pdfDocument] isLocked] == NO;
} else if (action == @selector(changeDisplayContinuous:)) {
- [menuItem setState:([pdfView displayMode] &
kPDFDisplaySinglePageContinuous) == (PDFDisplayMode)[menuItem tag] ? NSOnState
: NSOffState];
+ [menuItem setState:([pdfView displayMode] &
kPDFDisplaySinglePageContinuous) == (PDFDisplayMode)[menuItem tag] ?
NSControlStateValueOn : NSControlStateValueOff];
return [self interactionMode] != SKPresentationMode && [self
hasOverview] == NO && [[self pdfDocument] isLocked] == NO;
} else if (action == @selector(changeDisplayMode:)) {
- [menuItem setState: [pdfView extendedDisplayMode] == [menuItem tag] ?
NSOnState : NSOffState];
+ [menuItem setState: [pdfView extendedDisplayMode] == [menuItem tag] ?
NSControlStateValueOn : NSControlStateValueOff];
return [self interactionMode] != SKPresentationMode && [self
hasOverview] == NO && [[self pdfDocument] isLocked] == NO;
} else if (action == @selector(changeDisplayDirection:)) {
- [menuItem setState:[pdfView displaysHorizontally] == (BOOL)[menuItem
tag] ? NSOnState : NSOffState];
+ [menuItem setState:[pdfView displaysHorizontally] == (BOOL)[menuItem
tag] ? NSControlStateValueOn : NSControlStateValueOff];
return [self interactionMode] != SKPresentationMode && [self
hasOverview] == NO && [[self pdfDocument] isLocked] == NO && [pdfView
displayMode] == kPDFDisplaySinglePageContinuous;
} else if (action == @selector(toggleDisplaysRTL:)) {
- [menuItem setState:[pdfView displaysRTL] ? NSOnState : NSOffState];
+ [menuItem setState:[pdfView displaysRTL] ? NSControlStateValueOn :
NSControlStateValueOff];
return [self interactionMode] != SKPresentationMode && [self
hasOverview] == NO && [[self pdfDocument] isLocked] == NO;
} else if (action == @selector(toggleDisplaysAsBook:)) {
- [menuItem setState:[pdfView displaysAsBook] ? NSOnState : NSOffState];
+ [menuItem setState:[pdfView displaysAsBook] ? NSControlStateValueOn :
NSControlStateValueOff];
return [self interactionMode] != SKPresentationMode && [self
hasOverview] == NO && [[self pdfDocument] isLocked] == NO;
} else if (action == @selector(toggleDisplayPageBreaks:)) {
- [menuItem setState:[pdfView displaysPageBreaks] ? NSOnState :
NSOffState];
+ [menuItem setState:[pdfView displaysPageBreaks] ?
NSControlStateValueOn : NSControlStateValueOff];
return [self interactionMode] != SKPresentationMode && [self
hasOverview] == NO && [[self pdfDocument] isLocked] == NO;
} else if (action == @selector(changeDisplayBox:)) {
- [menuItem setState:[pdfView displayBox] == (PDFDisplayBox)[menuItem
tag] ? NSOnState : NSOffState];
+ [menuItem setState:[pdfView displayBox] == (PDFDisplayBox)[menuItem
tag] ? NSControlStateValueOn : NSControlStateValueOff];
return [self interactionMode] != SKPresentationMode && [self
hasOverview] == NO && [[self pdfDocument] isLocked] == NO;
} else if (action == @selector(delete:) || action == @selector(copy:) ||
action == @selector(cut:) || action == @selector(paste:) || action ==
@selector(alternatePaste:) || action == @selector(pasteAsPlainText:) || action
== @selector(deselectAll:) || action == @selector(changeAnnotationMode:) ||
action == @selector(changeToolMode:)) {
return [self hasOverview] == NO && [pdfView validateMenuItem:menuItem];
@@ -1802,7 +1802,7 @@
} else if (action == @selector(doAutoScale:)) {
return [[self pdfDocument] isLocked] == NO && [pdfView autoScales] ==
NO && [self hasOverview] == NO;
} else if (action == @selector(toggleAutoScale:)) {
- [menuItem setState:[pdfView autoScales] ? NSOnState : NSOffState];
+ [menuItem setState:[pdfView autoScales] ? NSControlStateValueOn :
NSControlStateValueOff];
return [[self pdfDocument] isLocked] == NO && [self hasOverview] == NO;
} else if (action == @selector(rotateRight:) || action ==
@selector(rotateLeft:) || action == @selector(rotateAllRight:) || action ==
@selector(rotateAllLeft:)) {
return [self interactionMode] != SKPresentationMode && [[self
pdfDocument] isLocked] == NO;
@@ -1827,17 +1827,17 @@
[menuItem setTitle:NSLocalizedString(@"Show Notes Pane", @"Menu
item title")];
return [self interactionMode] != SKPresentationMode;
} else if (action == @selector(changeLeftSidePaneState:)) {
- [menuItem setState:mwcFlags.leftSidePaneState ==
(SKLeftSidePaneState)[menuItem tag] ? (([leftSideController.findTableView
window] || [leftSideController.groupedFindTableView window]) ? NSMixedState :
NSOnState) : NSOffState];
+ [menuItem setState:mwcFlags.leftSidePaneState ==
(SKLeftSidePaneState)[menuItem tag] ? (([leftSideController.findTableView
window] || [leftSideController.groupedFindTableView window]) ?
NSControlStateValueMixed : NSControlStateValueOn) : NSControlStateValueOff];
return (SKLeftSidePaneState)[menuItem tag] == SKSidePaneStateThumbnail
|| [[pdfView document] outlineRoot];
} else if (action == @selector(changeRightSidePaneState:)) {
- [menuItem setState:mwcFlags.rightSidePaneState ==
(SKRightSidePaneState)[menuItem tag] ? NSOnState : NSOffState];
+ [menuItem setState:mwcFlags.rightSidePaneState ==
(SKRightSidePaneState)[menuItem tag] ? NSControlStateValueOn :
NSControlStateValueOff];
return [self interactionMode] != SKPresentationMode;
} else if (action == @selector(changeFindPaneState:)) {
if ([[leftSideController.searchField stringValue] length] == 0) {
- [menuItem setState:NSOffState];
+ [menuItem setState:NSControlStateValueOff];
return NO;
}
- [menuItem setState:mwcFlags.findPaneState ==
(SKFindPaneState)[menuItem tag] ? (([leftSideController.findTableView window]
== nil && [leftSideController.groupedFindTableView window] == nil) ?
NSMixedState : NSOnState) : NSOffState];
+ [menuItem setState:mwcFlags.findPaneState ==
(SKFindPaneState)[menuItem tag] ? (([leftSideController.findTableView window]
== nil && [leftSideController.groupedFindTableView window] == nil) ?
NSControlStateValueMixed : NSControlStateValueOn) : NSControlStateValueOff];
return YES;
} else if (action == @selector(toggleOverview:)) {
if ([self hasOverview])
@@ -1894,7 +1894,7 @@
CGFloat speed = [pdfView pacerSpeed];
NSInteger s = 5 * MAX(0, (NSInteger)round(0.2 * speed) - 1) +
[menuItem tag];
[menuItem setTitle:[NSString stringWithFormat:@"%ld",(long)s]];
- [menuItem setState:(NSInteger)round(speed) == s ? NSOnState :
NSOffState];
+ [menuItem setState:(NSInteger)round(speed) == s ?
NSControlStateValueOn : NSControlStateValueOff];
}
return YES;
} else if (action == @selector(savePDFSettingToDefaults:)) {
@@ -1906,16 +1906,16 @@
} else if (action == @selector(chooseTransition:)) {
return [[self pdfDocument] pageCount] > 1;
} else if (action == @selector(toggleCaseInsensitiveSearch:)) {
- [menuItem setState:mwcFlags.caseInsensitiveSearch ? NSOnState :
NSOffState];
+ [menuItem setState:mwcFlags.caseInsensitiveSearch ?
NSControlStateValueOn : NSControlStateValueOff];
return YES;
} else if (action == @selector(toggleWholeWordSearch:)) {
- [menuItem setState:mwcFlags.wholeWordSearch ? NSOnState : NSOffState];
+ [menuItem setState:mwcFlags.wholeWordSearch ? NSControlStateValueOn :
NSControlStateValueOff];
return YES;
} else if (action == @selector(toggleCaseInsensitiveFilter:)) {
- [menuItem setState:mwcFlags.caseInsensitiveFilter ? NSOnState :
NSOffState];
+ [menuItem setState:mwcFlags.caseInsensitiveFilter ?
NSControlStateValueOn : NSControlStateValueOff];
return YES;
} else if (action == @selector(toggleAutoResizeNoteRows:)) {
- [menuItem setState:mwcFlags.autoResizeNoteRows ? NSOnState :
NSOffState];
+ [menuItem setState:mwcFlags.autoResizeNoteRows ? NSControlStateValueOn
: NSControlStateValueOff];
return YES;
} else if (action == @selector(performFindPanelAction:)) {
if ([self interactionMode] == SKPresentationMode)
Modified: trunk/SKNavigationWindow.m
===================================================================
--- trunk/SKNavigationWindow.m 2024-03-14 15:34:26 UTC (rev 14105)
+++ trunk/SKNavigationWindow.m 2024-03-14 22:24:59 UTC (rev 14106)
@@ -234,7 +234,7 @@
}
- (void)handleScaleChangedNotification:(NSNotification *)notification {
- [zoomButton setState:[[notification object] autoScales] ? NSOnState :
NSOffState];
+ [zoomButton setState:[[notification object] autoScales] ?
NSControlStateValueOn : NSControlStateValueOff];
}
- (void)handlePageChangedNotification:(NSNotification *)notification {
@@ -398,7 +398,7 @@
[item setRepresentedObject:color];
[item setImage:image];
if ([color isEqual:tmpColor ?: inkColor])
- [item setState:NSOnState];
+ [item setState:NSControlStateValueOn];
}
}
@@ -598,11 +598,11 @@
- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView {
[[NSColor colorWithDeviceWhite:1.0 alpha:[self isEnabled] == NO ? 0.3 :
[self isHighlighted] ? 0.9 : 0.6] setFill];
- [([self state] == NSOnState && [self alternatePath] ? [self alternatePath]
: [self path]) fill];
+ [([self state] == NSControlStateValueOn && [self alternatePath] ? [self
alternatePath] : [self path]) fill];
}
- (void)mouseEntered:(NSEvent *)theEvent {
- NSString *currentToolTip = [self state] == NSOnState && alternateToolTip ?
alternateToolTip : toolTip;
+ NSString *currentToolTip = [self state] == NSControlStateValueOn &&
alternateToolTip ? alternateToolTip : toolTip;
[[SKNavigationToolTipWindow sharedToolTipWindow]
showToolTip:currentToolTip forView:[self controlView]];
[super mouseEntered:theEvent];
}
@@ -621,17 +621,17 @@
if (alternatePath)
[button setNeedsDisplay:YES];
if (alternateToolTip && [[[SKNavigationToolTipWindow
sharedToolTipWindow] view] isEqual:button]) {
- NSString *currentToolTip = [self state] == NSOnState &&
alternateToolTip ? alternateToolTip : toolTip;
+ NSString *currentToolTip = [self state] == NSControlStateValueOn
&& alternateToolTip ? alternateToolTip : toolTip;
[[SKNavigationToolTipWindow sharedToolTipWindow]
showToolTip:currentToolTip forView:button];
}
}
- [self setAccessibilityLabel:state == NSOnState && alternateToolTip ?
alternateToolTip : toolTip];
+ [self setAccessibilityLabel:state == NSControlStateValueOn &&
alternateToolTip ? alternateToolTip : toolTip];
}
- (void)setToolTip:(NSString *)aToolTip {
if (aToolTip != toolTip) {
toolTip = aToolTip;
- if ([self state] == NSOffState || alternateToolTip == nil)
+ if ([self state] == NSControlStateValueOff || alternateToolTip == nil)
[self setAccessibilityLabel:toolTip];
}
}
@@ -639,13 +639,13 @@
- (void)setAlternateToolTip:(NSString *)aToolTip {
if (aToolTip != alternateToolTip) {
alternateToolTip = aToolTip;
- if ([self state] == NSOnState)
+ if ([self state] == NSControlStateValueOn)
[self setAccessibilityLabel:alternateToolTip];
}
}
- (NSString *)accessibilityLabel {
- return [self state] == NSOnState && alternateToolTip ? alternateToolTip :
toolTip;
+ return [self state] == NSControlStateValueOn && alternateToolTip ?
alternateToolTip : toolTip;
}
@end
Modified: trunk/SKNoteOutlineView.m
===================================================================
--- trunk/SKNoteOutlineView.m 2024-03-14 15:34:26 UTC (rev 14105)
+++ trunk/SKNoteOutlineView.m 2024-03-14 22:24:59 UTC (rev 14106)
@@ -140,7 +140,7 @@
- (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
if ([menuItem action] == @selector(toggleTableColumn:)) {
- [menuItem setState:[[self tableColumnWithIdentifier:[menuItem
representedObject]] isHidden] ? NSOffState : NSOnState];
+ [menuItem setState:[[self tableColumnWithIdentifier:[menuItem
representedObject]] isHidden] ? NSControlStateValueOff : NSControlStateValueOn];
return YES;
} else if ([[SKNoteOutlineView superclass]
instancesRespondToSelector:_cmd]) {
return [super validateMenuItem:menuItem];
Modified: trunk/SKNoteTypeSheetController.m
===================================================================
--- trunk/SKNoteTypeSheetController.m 2024-03-14 15:34:26 UTC (rev 14105)
+++ trunk/SKNoteTypeSheetController.m 2024-03-14 22:24:59 UTC (rev 14106)
@@ -66,7 +66,7 @@
menuItem = [noteTypeMenu addItemWithTitle:[type typeName]
action:@selector(toggleDisplayNoteType:) target:self];
[menuItem setTag:tag++];
[menuItem setRepresentedObject:type];
- [menuItem setState:NSOnState];
+ [menuItem setState:NSControlStateValueOn];
}
[noteTypeMenu addItem:[NSMenuItem separatorItem]];
[noteTypeMenu addItemWithTitle:NSLocalizedString(@"Show All", @"Menu
item title") action:@selector(displayAllNoteTypes:) target:self];
@@ -100,7 +100,7 @@
NSInteger i;
for (i = 0; i < NOTETYPES_COUNT; i++) {
NSMenuItem *item = [noteTypeMenu itemAtIndex:i];
- if ([item state] == NSOnState)
+ if ([item state] == NSControlStateValueOn)
[types addObject:[item representedObject]];
}
return types;
@@ -147,7 +147,7 @@
- (void)displayAllNoteTypes:(id)sender {
NSInteger i;
for (i = 0; i < NOTETYPES_COUNT; i++)
- [[noteTypeMenu itemAtIndex:i] setState:NSOnState];
+ [[noteTypeMenu itemAtIndex:i] setState:NSControlStateValueOn];
[delegate noteTypeSheetControllerNoteTypesDidChange];
}
Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m 2024-03-14 15:34:26 UTC (rev 14105)
+++ trunk/SKNotesDocument.m 2024-03-14 22:24:59 UTC (rev 14106)
@@ -630,10 +630,10 @@
[menuItem setTitle:NSLocalizedString(@"Show Status Bar", @"Menu
item title")];
return YES;
} else if (action == @selector(toggleCaseInsensitiveSearch:)) {
- [menuItem setState:ndFlags.caseInsensitiveSearch ? NSOnState :
NSOffState];
+ [menuItem setState:ndFlags.caseInsensitiveSearch ?
NSControlStateValueOn : NSControlStateValueOff];
return YES;
} else if (action == @selector(toggleAutoResizeNoteRows:)) {
- [menuItem setState:ndFlags.autoResizeRows ? NSOnState : NSOffState];
+ [menuItem setState:ndFlags.autoResizeRows ? NSControlStateValueOn :
NSControlStateValueOff];
return YES;
} else if (action == @selector(toggleFullscreen:)) {
if ([self interactionMode] == SKFullScreenMode)
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2024-03-14 15:34:26 UTC (rev 14105)
+++ trunk/SKPDFView.m 2024-03-14 22:24:59 UTC (rev 14106)
@@ -3345,13 +3345,13 @@
- (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
SEL action = [menuItem action];
if (action == @selector(changeToolMode:)) {
- [menuItem setState:[self toolMode] == (SKToolMode)[menuItem tag] ?
NSOnState : NSOffState];
+ [menuItem setState:[self toolMode] == (SKToolMode)[menuItem tag] ?
NSControlStateValueOn : NSControlStateValueOff];
return YES;
} else if (action == @selector(changeAnnotationMode:)) {
if ([[menuItem menu] numberOfItems] > ANNOTATION_MODE_COUNT)
- [menuItem setState:[self toolMode] == SKNoteToolMode && [self
annotationMode] == (SKNoteType)[menuItem tag] ? NSOnState : NSOffState];
+ [menuItem setState:[self toolMode] == SKNoteToolMode && [self
annotationMode] == (SKNoteType)[menuItem tag] ? NSControlStateValueOn :
NSControlStateValueOff];
else
- [menuItem setState:[self annotationMode] == (SKNoteType)[menuItem
tag] ? NSOnState : NSOffState];
+ [menuItem setState:[self annotationMode] == (SKNoteType)[menuItem
tag] ? NSControlStateValueOn : NSControlStateValueOff];
return YES;
} else if (action == @selector(copy:)) {
return ([[self currentSelection] hasCharacters] || [currentAnnotation
isSkimNote] ||
@@ -3377,19 +3377,19 @@
} else if (action == @selector(takeSnapshot:)) {
return [[self document] isLocked] == NO;
} else if (action == @selector(_setSinglePageScrolling:)) {
- [menuItem setState:[self extendedDisplayMode] ==
kPDFDisplaySinglePageContinuous ? NSOnState : NSOffState];
+ [menuItem setState:[self extendedDisplayMode] ==
kPDFDisplaySinglePageContinuous ? NSControlStateValueOn :
NSControlStateValueOff];
return YES;
} else if (action == @selector(_setDoublePageScrolling:)) {
- [menuItem setState:[self extendedDisplayMode] ==
kPDFDisplayTwoUpContinuous ? NSOnState : NSOffState];
+ [menuItem setState:[self extendedDisplayMode] ==
kPDFDisplayTwoUpContinuous ? NSControlStateValueOn : NSControlStateValueOff];
return YES;
} else if (action == @selector(_setDoublePage:)) {
- [menuItem setState:[self extendedDisplayMode] == kPDFDisplayTwoUp ?
NSOnState : NSOffState];
+ [menuItem setState:[self extendedDisplayMode] == kPDFDisplayTwoUp ?
NSControlStateValueOn : NSControlStateValueOff];
return YES;
} else if (action == @selector(setHorizontalScrolling:)) {
- [menuItem setState:[self extendedDisplayMode] ==
kPDFDisplayHorizontalContinuous ? NSOnState : NSOffState];
+ [menuItem setState:[self extendedDisplayMode] ==
kPDFDisplayHorizontalContinuous ? NSControlStateValueOn :
NSControlStateValueOff];
return YES;
} else if (action == @selector(zoomToPhysicalSize:)) {
- [menuItem setState:([self autoScales] || fabs([self
physicalScaleFactor] - 1.0) > 0.001) ? NSOffState : NSOnState];
+ [menuItem setState:([self autoScales] || fabs([self
physicalScaleFactor] - 1.0) > 0.001) ? NSControlStateValueOff :
NSControlStateValueOn];
return YES;
} else if (action == @selector(editCurrentAnnotation:)) {
return [[self currentAnnotation] isEditable];
Modified: trunk/SKSecondaryPDFView.m
===================================================================
--- trunk/SKSecondaryPDFView.m 2024-03-14 15:34:26 UTC (rev 14105)
+++ trunk/SKSecondaryPDFView.m 2024-03-14 22:24:59 UTC (rev 14106)
@@ -469,7 +469,7 @@
selectsText = newSelectsText;
if (selectsText == NO)
[self setCurrentSelection:nil];
- [toolModeButton setState:selectsText ? NSOnState : NSOffState];
+ [toolModeButton setState:selectsText ? NSControlStateValueOn :
NSControlStateValueOff];
[[NSUserDefaults standardUserDefaults] setBool:selectsText
forKey:SKLastSecondarySelectsTextKey];
}
}
@@ -606,19 +606,19 @@
} else if ([menuItem action] == @selector(selectAll:)) {
return [self selectsText];
} else if ([menuItem action] == @selector(toggleDisplaysAsBookFromMenu:)) {
- [menuItem setState:[self displaysAsBook] ? NSOnState : NSOffState];
+ [menuItem setState:[self displaysAsBook] ? NSControlStateValueOn :
NSControlStateValueOff];
return YES;
} else if ([menuItem action] ==
@selector(toggleDisplayPageBreaksFromMenu:)) {
- [menuItem setState:[self displaysPageBreaks] ? NSOnState : NSOffState];
+ [menuItem setState:[self displaysPageBreaks] ? NSControlStateValueOn :
NSControlStateValueOff];
return YES;
} else if ([menuItem action] == @selector(doActualSize:)) {
- [menuItem setState:fabs([self scaleFactor] - 1.0) > 0.0 ? NSOffState :
NSOnState];
+ [menuItem setState:fabs([self scaleFactor] - 1.0) > 0.0 ?
NSControlStateValueOff : NSControlStateValueOn];
return YES;
} else if ([menuItem action] == @selector(doPhysicalSize:)) {
- [menuItem setState:([self autoScales] || fabs([self
physicalScaleFactor] - 1.0) > 0.001) ? NSOffState : NSOnState];
+ [menuItem setState:([self autoScales] || fabs([self
physicalScaleFactor] - 1.0) > 0.001) ? NSControlStateValueOff :
NSControlStateValueOn];
return YES;
} else if ([menuItem action] == @selector(changeToolMode:)) {
- [menuItem setState:[self selectsText] == (BOOL)[menuItem tag] ?
NSOnState : NSOffState];
+ [menuItem setState:[self selectsText] == (BOOL)[menuItem tag] ?
NSControlStateValueOn : NSControlStateValueOff];
return YES;
} else if ([[SKSecondaryPDFView superclass]
instancesRespondToSelector:_cmd]) {
return [super validateMenuItem:menuItem];
Modified: trunk/SKSnapshotPDFView.m
===================================================================
--- trunk/SKSnapshotPDFView.m 2024-03-14 15:34:26 UTC (rev 14105)
+++ trunk/SKSnapshotPDFView.m 2024-03-14 22:24:59 UTC (rev 14106)
@@ -574,13 +574,13 @@
} else if ([menuItem action] == @selector(selectAll:)) {
return NO;
} else if ([menuItem action] == @selector(doAutoFit:)) {
- [menuItem setState:[self autoFits] ? NSOnState : NSOffState];
+ [menuItem setState:[self autoFits] ? NSControlStateValueOn :
NSControlStateValueOff];
return [self shouldAutoFit];
} else if ([menuItem action] == @selector(doActualSize:)) {
- [menuItem setState:fabs([self scaleFactor] - 1.0) > 0.0 ? NSOffState :
NSOnState];
+ [menuItem setState:fabs([self scaleFactor] - 1.0) > 0.0 ?
NSControlStateValueOff : NSControlStateValueOn];
return YES;
} else if ([menuItem action] == @selector(doPhysicalSize:)) {
- [menuItem setState:([self autoScales] || fabs([self
physicalScaleFactor] - 1.0) > 0.001) ? NSOffState : NSOnState];
+ [menuItem setState:([self autoScales] || fabs([self
physicalScaleFactor] - 1.0) > 0.001) ? NSControlStateValueOff :
NSControlStateValueOn];
return YES;
} else if ([[SKSnapshotPDFView superclass]
instancesRespondToSelector:_cmd]) {
return [super validateMenuItem:menuItem];
Modified: trunk/SKSnapshotWindowController.m
===================================================================
--- trunk/SKSnapshotWindowController.m 2024-03-14 15:34:26 UTC (rev 14105)
+++ trunk/SKSnapshotWindowController.m 2024-03-14 22:24:59 UTC (rev 14106)
@@ -454,7 +454,7 @@
} else if (action == @selector(doZoomToPhysicalSize:)) {
return fabs([pdfView physicalScaleFactor] - 1.0) > 0.001;
} else if (action == @selector(toggleAutoScale:)) {
- [menuItem setState:[pdfView autoFits] ? NSOnState : NSOffState];
+ [menuItem setState:[pdfView autoFits] ? NSControlStateValueOn :
NSControlStateValueOff];
return YES;
}
return YES;
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
