Revision: 29848
http://sourceforge.net/p/bibdesk/svn/29848
Author: hofman
Date: 2025-11-18 23:01:35 +0000 (Tue, 18 Nov 2025)
Log Message:
-----------
replace deprecated control state values
Modified Paths:
--------------
trunk/bibdesk/BDSKAppController.m
trunk/bibdesk/BDSKAuthenticationController.m
trunk/bibdesk/BDSKButtonBar.m
trunk/bibdesk/BDSKColorLabelWell.m
trunk/bibdesk/BDSKCondition.m
trunk/bibdesk/BDSKEditor.m
trunk/bibdesk/BDSKErrorEditor.m
trunk/bibdesk/BDSKFiler.m
trunk/bibdesk/BDSKFindController.m
trunk/bibdesk/BDSKFontManager.m
trunk/bibdesk/BDSKFontWell.m
trunk/bibdesk/BDSKMacroWindowController.m
trunk/bibdesk/BDSKMainTableView.m
trunk/bibdesk/BDSKMergeController.m
trunk/bibdesk/BDSKOrphanedFilesFinder.m
trunk/bibdesk/BDSKRadioTransformer.m
trunk/bibdesk/BDSKSaveAccessoryViewController.m
trunk/bibdesk/BDSKSearchGroupSheetController.m
trunk/bibdesk/BDSKSecureTextField.m
trunk/bibdesk/BDSKStringEncodingManager.m
trunk/bibdesk/BDSKToken.m
trunk/bibdesk/BDSKTypeInfoEditor.m
trunk/bibdesk/BDSKZoomablePDFView.m
trunk/bibdesk/BibDocument.m
trunk/bibdesk/BibDocument_Actions.m
trunk/bibdesk/BibDocument_DataSource.m
trunk/bibdesk/BibDocument_Groups.m
trunk/bibdesk/BibDocument_Menus.m
trunk/bibdesk/BibDocument_Toolbar.m
trunk/bibdesk/BibDocument_UI.m
trunk/bibdesk/BibItem.m
trunk/bibdesk/NSString_BDSKExtensions.m
Modified: trunk/bibdesk/BDSKAppController.m
===================================================================
--- trunk/bibdesk/BDSKAppController.m 2025-11-18 22:16:26 UTC (rev 29847)
+++ trunk/bibdesk/BDSKAppController.m 2025-11-18 23:01:35 UTC (rev 29848)
@@ -547,9 +547,9 @@
// menu item for toggling the preview panel
// set the on/off state according to the panel's visibility
if ([BDSKPreviewer isSharedPreviewerVisible]) {
- [menuItem setState:NSOnState];
+ [menuItem setState:NSControlStateValueOn];
}else {
- [menuItem setState:NSOffState];
+ [menuItem setState:NSControlStateValueOff];
}
return YES;
}
@@ -557,9 +557,9 @@
// menu item for toggling the error panel
// set the on/off state according to the panel's visibility
if ([[BDSKErrorObjectController sharedErrorObjectController]
isWindowVisible]) {
- [menuItem setState:NSOnState];
+ [menuItem setState:NSControlStateValueOn];
}else {
- [menuItem setState:NSOffState];
+ [menuItem setState:NSControlStateValueOff];
}
return YES;
}
@@ -568,9 +568,9 @@
// menu item for toggling the orphaned files panel
// set the on/off state according to the panel's visibility
if ([[BDSKOrphanedFilesFinder sharedFinder] isWindowVisible]) {
- [menuItem setState:NSOnState];
+ [menuItem setState:NSControlStateValueOn];
}else {
- [menuItem setState:NSOffState];
+ [menuItem setState:NSControlStateValueOff];
}
return YES;
}
Modified: trunk/bibdesk/BDSKAuthenticationController.m
===================================================================
--- trunk/bibdesk/BDSKAuthenticationController.m 2025-11-18 22:16:26 UTC
(rev 29847)
+++ trunk/bibdesk/BDSKAuthenticationController.m 2025-11-18 23:01:35 UTC
(rev 29848)
@@ -132,7 +132,7 @@
}
- (NSURLCredential *)credential {
- return [NSURLCredential credentialWithUser:[userField stringValue] ?: @""
password:[passwordField stringValue] ?: @"" persistence:([rememberButton state]
== NSOnState) ? NSURLCredentialPersistencePermanent :
NSURLCredentialPersistenceForSession];
+ return [NSURLCredential credentialWithUser:[userField stringValue] ?: @""
password:[passwordField stringValue] ?: @"" persistence:([rememberButton state]
== NSControlStateValueOn) ? NSURLCredentialPersistencePermanent :
NSURLCredentialPersistenceForSession];
}
- (void)runAuthentication:(NSURLAuthenticationChallenge *)challenge
window:(NSWindow *)window completionHandler:(void
(^)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential
*credential))completionHandler {
Modified: trunk/bibdesk/BDSKButtonBar.m
===================================================================
--- trunk/bibdesk/BDSKButtonBar.m 2025-11-18 22:16:26 UTC (rev 29847)
+++ trunk/bibdesk/BDSKButtonBar.m 2025-11-18 23:01:35 UTC (rev 29848)
@@ -117,7 +117,7 @@
button = [self newButtonWithIdentifier:identifier title:title];
[button setTarget:self];
[button setAction:@selector(clickButton:)];
- [button setState:NSOffState];
+ [button setState:NSControlStateValueOff];
[buttons addObject:button];
[self tile];
}
@@ -141,7 +141,7 @@
- (NSString *)selectedIdentifier {
for (NSButton *button in buttons) {
- if ([button state] == NSOnState)
+ if ([button state] == NSControlStateValueOn)
return [button identifier];
}
return nil;
@@ -170,12 +170,12 @@
for (NSButton *button in buttons) {
if ([button isEqual:sender]) {
// the button click already swaps the state
- if ([button state] == NSOnState)
+ if ([button state] == NSControlStateValueOn)
didChangeSelection = YES;
else
- [button setState:NSOnState];
- } else if ([button state] == NSOnState) {
- [button setState:NSOffState];
+ [button setState:NSControlStateValueOn];
+ } else if ([button state] == NSControlStateValueOn) {
+ [button setState:NSControlStateValueOff];
didChangeSelection = YES;
}
}
Modified: trunk/bibdesk/BDSKColorLabelWell.m
===================================================================
--- trunk/bibdesk/BDSKColorLabelWell.m 2025-11-18 22:16:26 UTC (rev 29847)
+++ trunk/bibdesk/BDSKColorLabelWell.m 2025-11-18 23:01:35 UTC (rev 29848)
@@ -468,7 +468,7 @@
CGFloat inset = [self isHovered] ? 1.0 : 3.0;
NSRect rect = NSInsetRect(cellFrame, inset, inset);
[NSGraphicsContext saveGraphicsState];
- if ([self state] == NSOnState) {
+ if ([self state] == NSControlStateValueOn) {
NSRect r = NSInsetRect(cellFrame, 1.0, 1.0);
NSBezierPath *path = [NSBezierPath bezierPathWithOvalInRect:r];
[path setLineWidth:1.5];
Modified: trunk/bibdesk/BDSKCondition.m
===================================================================
--- trunk/bibdesk/BDSKCondition.m 2025-11-18 22:16:26 UTC (rev 29847)
+++ trunk/bibdesk/BDSKCondition.m 2025-11-18 23:01:35 UTC (rev 29848)
@@ -573,7 +573,7 @@
[self setStringValue:[NSString stringWithBool:NO]];
break;
case BDSKTriStateField:
- [self setStringValue:[NSString
stringWithTriStateValue:NSOffState]];
+ [self setStringValue:[NSString
stringWithTriStateValue:NSControlStateValueOff]];
break;
case BDSKRatingField:
[self setStringValue:@"0"];
Modified: trunk/bibdesk/BDSKEditor.m
===================================================================
--- trunk/bibdesk/BDSKEditor.m 2025-11-18 22:16:26 UTC (rev 29847)
+++ trunk/bibdesk/BDSKEditor.m 2025-11-18 23:01:35 UTC (rev 29848)
@@ -758,7 +758,7 @@
[disableAutoFileButton setTitle:NSLocalizedString(@"Disable Auto
File", @"Choose local file button title")];
[disableAutoFileButton sizeToFit];
}
- [disableAutoFileButton setState:NSOffState];
+ [disableAutoFileButton setState:NSControlStateValueOff];
[oPanel setAccessoryView:disableAutoFileButton];
}
@@ -765,7 +765,7 @@
[oPanel beginSheetModalForWindow:[self window]
completionHandler:^(NSInteger result){
if(result == NSModalResponseOK){
NSURL *aURL = [[oPanel URLs] objectAtIndex:0];
- BOOL shouldAutoFile = disableAutoFileButton && [oPanel
accessoryView] == disableAutoFileButton && [disableAutoFileButton state] ==
NSOffState;
+ BOOL shouldAutoFile = disableAutoFileButton && [oPanel
accessoryView] == disableAutoFileButton && [disableAutoFileButton state] ==
NSControlStateValueOff;
if (anIndex != NSNotFound) {
BDSKLinkedFile *aFile = [BDSKLinkedFile linkedFileWithURL:aURL
delegate:publication];
if (aFile == nil)
@@ -1079,7 +1079,7 @@
// use didDismissSelector or else we can have sheets competing for the
window
[alert beginSheetModalForWindow:[self window]
completionHandler:^(NSInteger returnCode){
- if ([[alert suppressionButton] state] == NSOnState)
+ if ([[alert suppressionButton] state] == NSControlStateValueOn)
[[NSUserDefaults standardUserDefaults] setBool:NO
forKey:BDSKWarnOnCiteKeyChangeKey];
if (returnCode == NSAlertFirstButtonReturn) {
// remove the sheet in case we get an alert
@@ -1771,7 +1771,7 @@
[alert addButtonWithTitle:NSLocalizedString(@"Yes", @"Button
title")];
[alert setShowsSuppressionButton:YES];
[alert beginSheetModalForWindow:[self window]
completionHandler:^(NSInteger returnCode){
- if (alert && [[alert suppressionButton] state] == NSOnState)
+ if (alert && [[alert suppressionButton] state] ==
NSControlStateValueOn)
[[NSUserDefaults standardUserDefaults] setBool:NO
forKey:BDSKAskToTrashFilesKey];
if (returnCode == NSAlertSecondButtonReturn)
[self trashFileURLs:fileURLs];
@@ -1980,7 +1980,7 @@
NSInteger rv = [alert runModal];
- if ([[alert suppressionButton] state] == NSOnState)
+ if ([[alert suppressionButton] state] == NSControlStateValueOn)
[[NSUserDefaults standardUserDefaults] setBool:NO
forKey:BDSKWarnOnEditInheritedKey];
if (rv == NSAlertThirdButtonReturn) {
Modified: trunk/bibdesk/BDSKErrorEditor.m
===================================================================
--- trunk/bibdesk/BDSKErrorEditor.m 2025-11-18 22:16:26 UTC (rev 29847)
+++ trunk/bibdesk/BDSKErrorEditor.m 2025-11-18 23:01:35 UTC (rev 29848)
@@ -123,7 +123,7 @@
[reopenButton setEnabled:NO];
[[textView textStorage] setDelegate:self];
- [syntaxHighlightCheckbox setState:NSOnState];
+ [syntaxHighlightCheckbox setState:NSControlStateValueOn];
// faster layout if it's not antialiased, and fixed pitch makes
pretty-printed files look right
[textView setFont:[NSFont userFixedPitchFontOfSize:0.0]];
Modified: trunk/bibdesk/BDSKFiler.m
===================================================================
--- trunk/bibdesk/BDSKFiler.m 2025-11-18 22:16:26 UTC (rev 29847)
+++ trunk/bibdesk/BDSKFiler.m 2025-11-18 23:01:35 UTC (rev 29848)
@@ -426,7 +426,7 @@
[alert addButtonWithTitle:NSLocalizedString(@"Don't Move",
@"Button title")];
[alert setShowsSuppressionButton:YES];
ignoreMove = (NSAlertSecondButtonReturn == [alert runModal]);
- if([[alert suppressionButton] state] == NSOnState)
+ if([[alert suppressionButton] state] == NSControlStateValueOn)
[[NSUserDefaults standardUserDefaults] setBool:NO
forKey:BDSKWarnOnMoveFolderKey];
}
if(ignoreMove){
Modified: trunk/bibdesk/BDSKFindController.m
===================================================================
--- trunk/bibdesk/BDSKFindController.m 2025-11-18 22:16:26 UTC (rev 29847)
+++ trunk/bibdesk/BDSKFindController.m 2025-11-18 23:01:35 UTC (rev 29848)
@@ -138,11 +138,11 @@
NSInteger i;
for (i = 0; i < numItems; i++)
if ([searchTypePopUpButton indexOfSelectedItem] != i)
- [[searchTypePopUpButton itemAtIndex:i]
setState:NSOffState];
+ [[searchTypePopUpButton itemAtIndex:i]
setState:NSControlStateValueOff];
numItems = [searchScopePopUpButton numberOfItems];
for (i = 0; i < numItems; i++)
if ([searchScopePopUpButton indexOfSelectedItem] != i)
- [[searchScopePopUpButton itemAtIndex:i]
setState:NSOffState];
+ [[searchScopePopUpButton itemAtIndex:i]
setState:NSControlStateValueOff];
[self updateUI];
}
Modified: trunk/bibdesk/BDSKFontManager.m
===================================================================
--- trunk/bibdesk/BDSKFontManager.m 2025-11-18 22:16:26 UTC (rev 29847)
+++ trunk/bibdesk/BDSKFontManager.m 2025-11-18 23:01:35 UTC (rev 29848)
@@ -106,7 +106,7 @@
- (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
if ([menuItem action] == @selector(chooseSystemFont:)) {
- [menuItem setState:[[[self selectedFont] fontName] isEqual:[menuItem
representedObject]] ? NSOnState : NSOffState];
+ [menuItem setState:[[[self selectedFont] fontName] isEqual:[menuItem
representedObject]] ? NSControlStateValueOn : NSControlStateValueOff];
return YES;
} else if ([[BDSKFontManager superclass] instancesRespondToSelector:_cmd])
{
return [super validateMenuItem:menuItem];
Modified: trunk/bibdesk/BDSKFontWell.m
===================================================================
--- trunk/bibdesk/BDSKFontWell.m 2025-11-18 22:16:26 UTC (rev 29847)
+++ trunk/bibdesk/BDSKFontWell.m 2025-11-18 23:01:35 UTC (rev 29848)
@@ -159,13 +159,13 @@
[nc addObserver:self selector:@selector(fontPanelWillClose:)
name:NSWindowWillCloseNotification object:[fm fontPanel:YES]];
- [self setState:NSOnState];
+ [self setState:NSControlStateValueOn];
[self setNeedsDisplay:YES];
}
- (void)deactivate {
[[NSNotificationCenter defaultCenter] removeObserver:self];
- [self setState:NSOffState];
+ [self setState:NSControlStateValueOff];
[self setNeedsDisplay:YES];
}
@@ -199,7 +199,7 @@
}
- (BOOL)isActive {
- return [self state] == NSOnState;
+ return [self state] == NSControlStateValueOn;
}
- (void)setFont:(NSFont *)newFont {
@@ -345,7 +345,7 @@
- (void)commonInit {
[self setBezelStyle:NSShadowlessSquareBezelStyle]; // this is mainly to
make it selectable
[self setButtonType:NSPushOnPushOffButton];
- [self setState:NSOffState];
+ [self setState:NSControlStateValueOff];
}
- (instancetype)initTextCell:(NSString *)aString {
@@ -383,7 +383,7 @@
[bgCell drawWithFrame:frame inView:controlView];
[bgCell setControlView:nil];
- if ([self state] == NSOnState) {
+ if ([self state] == NSControlStateValueOn) {
[NSGraphicsContext saveGraphicsState];
[[NSGraphicsContext currentContext]
setCompositingOperation:NSCompositingOperationMultiply];
[[NSColor selectedControlColor] setFill];
Modified: trunk/bibdesk/BDSKMacroWindowController.m
===================================================================
--- trunk/bibdesk/BDSKMacroWindowController.m 2025-11-18 22:16:26 UTC (rev
29847)
+++ trunk/bibdesk/BDSKMacroWindowController.m 2025-11-18 23:01:35 UTC (rev
29848)
@@ -340,7 +340,7 @@
}
- (IBAction)changeShowAll:(id)sender{
- showAll = [sender state] == NSOnState;
+ showAll = [sender state] == NSControlStateValueOn;
isEditable = showAll == NO && [arrayController filterPredicate] == nil &&
(macroResolver == [BDSKMacroResolver defaultMacroResolver] || [[macroResolver
owner] isDocument]);
[self updateButtons];
Modified: trunk/bibdesk/BDSKMainTableView.m
===================================================================
--- trunk/bibdesk/BDSKMainTableView.m 2025-11-18 22:16:26 UTC (rev 29847)
+++ trunk/bibdesk/BDSKMainTableView.m 2025-11-18 23:01:35 UTC (rev 29848)
@@ -556,7 +556,7 @@
}
- (void)columnsMenuSelectTableColumn:(id)sender{
- if ([sender state] == NSOnState)
+ if ([sender state] == NSControlStateValueOn)
[self removeTableColumnWithIdentifier:[sender representedObject]];
else
[self addTableColumnWithIdentifier:[sender representedObject]];
@@ -616,7 +616,7 @@
atIndex:0];
[item setRepresentedObject:colName];
[item setTarget:self];
- [item setState:NSOnState];
+ [item setState:NSControlStateValueOn];
}
}
Modified: trunk/bibdesk/BDSKMergeController.m
===================================================================
--- trunk/bibdesk/BDSKMergeController.m 2025-11-18 22:16:26 UTC (rev 29847)
+++ trunk/bibdesk/BDSKMergeController.m 2025-11-18 23:01:35 UTC (rev 29848)
@@ -165,17 +165,17 @@
}
- (IBAction)selectAll:(id)sender {
- [selectAllButton setState:NSOnState];
+ [selectAllButton setState:NSControlStateValueOn];
[self toggleAll:selectAllButton];
}
- (IBAction)selectNone:(id)sender {
- [selectAllButton setState:NSOffState];
+ [selectAllButton setState:NSControlStateValueOff];
[self toggleAll:selectAllButton];
}
- (IBAction)changeDisplayAddedFields:(id)sender {
- [self setDisplayAddedFields:[sender state] == NSOnState];
+ [self setDisplayAddedFields:[sender state] == NSControlStateValueOn];
[self updateSelectAllButtonState];
}
Modified: trunk/bibdesk/BDSKOrphanedFilesFinder.m
===================================================================
--- trunk/bibdesk/BDSKOrphanedFilesFinder.m 2025-11-18 22:16:26 UTC (rev
29847)
+++ trunk/bibdesk/BDSKOrphanedFilesFinder.m 2025-11-18 23:01:35 UTC (rev
29848)
@@ -248,7 +248,7 @@
if ([menuItem action] == @selector(previewAction:)) {
return [[tableView selectedRowIndexes] count] > 0;
} else if ([menuItem action] == @selector(showMatches:)) {
- [menuItem setState:showsMatches == [menuItem tag] ? NSOnState :
NSOffState];
+ [menuItem setState:showsMatches == [menuItem tag] ?
NSControlStateValueOn : NSControlStateValueOff];
return YES;
}
return YES;
Modified: trunk/bibdesk/BDSKRadioTransformer.m
===================================================================
--- trunk/bibdesk/BDSKRadioTransformer.m 2025-11-18 22:16:26 UTC (rev
29847)
+++ trunk/bibdesk/BDSKRadioTransformer.m 2025-11-18 23:01:35 UTC (rev
29848)
@@ -72,11 +72,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/bibdesk/BDSKSaveAccessoryViewController.m
===================================================================
--- trunk/bibdesk/BDSKSaveAccessoryViewController.m 2025-11-18 22:16:26 UTC
(rev 29847)
+++ trunk/bibdesk/BDSKSaveAccessoryViewController.m 2025-11-18 23:01:35 UTC
(rev 29848)
@@ -96,11 +96,11 @@
}
- (BOOL)exportSelection {
- return [exportSelectionCheckButton state] == NSOnState;
+ return [exportSelectionCheckButton state] == NSControlStateValueOn;
}
- (void)setExportSelection:(BOOL)flag {
- [exportSelectionCheckButton setState:flag ? NSOnState : NSOffState];
+ [exportSelectionCheckButton setState:flag ? NSControlStateValueOn :
NSControlStateValueOff];
}
- (BOOL)isSaveTextEncodingPopupButtonEnabled {
Modified: trunk/bibdesk/BDSKSearchGroupSheetController.m
===================================================================
--- trunk/bibdesk/BDSKSearchGroupSheetController.m 2025-11-18 22:16:26 UTC
(rev 29847)
+++ trunk/bibdesk/BDSKSearchGroupSheetController.m 2025-11-18 23:01:35 UTC
(rev 29848)
@@ -170,7 +170,7 @@
if (i == [sender numberOfItems] - 1) {
[self setServerInfo:originalServerInfo ?: [BDSKServerInfo
defaultServerInfoWithType:[[self serverInfo] type]]];
- if ([revealButton state] == NSOffState)
+ if ([revealButton state] == NSControlStateValueOff)
[revealButton performClick:self];
[self setCustom:YES];
[self setEditable:YES];
@@ -241,7 +241,7 @@
- (IBAction)editServer:(id)sender;
{
- if ([revealButton state] == NSOffState)
+ if ([revealButton state] == NSControlStateValueOff)
[revealButton performClick:sender];
if ([self isCustom]) {
@@ -296,7 +296,7 @@
- (IBAction)toggle:(id)sender;
{
- BOOL collapse = [revealButton state] == NSOffState;
+ BOOL collapse = [revealButton state] == NSControlStateValueOff;
CGFloat constant = collapse ? -[serverView fittingSize].width : 0.0;
if (collapse == NO)
[serverView setHidden:NO];
Modified: trunk/bibdesk/BDSKSecureTextField.m
===================================================================
--- trunk/bibdesk/BDSKSecureTextField.m 2025-11-18 22:16:26 UTC (rev 29847)
+++ trunk/bibdesk/BDSKSecureTextField.m 2025-11-18 23:01:35 UTC (rev 29848)
@@ -89,7 +89,7 @@
}
- (void)toggleShowsText:(id)sender {
- [self setShowsText:[sender state] == NSOnState];
+ [self setShowsText:[sender state] == NSControlStateValueOn];
}
- (void)makeButton {
@@ -176,7 +176,7 @@
return;
showsText = flag;
- [button setState:showsText ? NSOnState : NSOffState];
+ [button setState:showsText ? NSControlStateValueOn :
NSControlStateValueOff];
[button setToolTip:showsText ? NSLocalizedString(@"Hide password", @"Tool
tip message") : NSLocalizedString(@"Show password", @"Tool tip message")];
NSTextFieldCell *oldCell = [self cell];
Modified: trunk/bibdesk/BDSKStringEncodingManager.m
===================================================================
--- trunk/bibdesk/BDSKStringEncodingManager.m 2025-11-18 22:16:26 UTC (rev
29847)
+++ trunk/bibdesk/BDSKStringEncodingManager.m 2025-11-18 23:01:35 UTC (rev
29848)
@@ -327,7 +327,7 @@
NSInteger cnt, numEncodings = [tableView numberOfRows];
for (cnt = 0; cnt < numEncodings; cnt++) {
NSButton *button = (NSButton *)[[tableView viewAtColumn:0 row:cnt
makeIfNecessary:NO] control];
- [button setState:[encodings containsObject:[NSNumber
numberWithUnsignedInteger:[button tag]]] ? NSOnState : NSOffState];
+ [button setState:[encodings containsObject:[NSNumber
numberWithUnsignedInteger:[button tag]]] ? NSControlStateValueOn :
NSControlStateValueOff];
}
}
@@ -340,7 +340,7 @@
NSMutableArray *encs = nil;
NSNumber *enc = [NSNumber numberWithUnsignedInteger:(NSUInteger)[sender
tag]];
- if ([sender state] == NSOffState) {
+ if ([sender state] == NSControlStateValueOff) {
encs = [encodings mutableCopy];
[encs removeObject:enc];
} else {
@@ -385,7 +385,7 @@
NSButton *button = (NSButton *)[view control];
[button setTag:enc];
[button setTitle:[NSString localizedNameOfStringEncoding:enc]];
- [button setState:[encodings containsObject:[NSNumber
numberWithUnsignedInteger:enc]] ? NSOnState : NSOffState];
+ [button setState:[encodings containsObject:[NSNumber
numberWithUnsignedInteger:enc]] ? NSControlStateValueOn :
NSControlStateValueOff];
return view;
}
Modified: trunk/bibdesk/BDSKToken.m
===================================================================
--- trunk/bibdesk/BDSKToken.m 2025-11-18 22:16:26 UTC (rev 29847)
+++ trunk/bibdesk/BDSKToken.m 2025-11-18 23:01:35 UTC (rev 29848)
@@ -123,8 +123,8 @@
inRepository = NO;
fontName = nil;
fontSize = 0.0;
- bold = NSMixedState;
- italic = NSMixedState;
+ bold = NSControlStateValueMixed;
+ italic = NSControlStateValueMixed;
}
return self;
}
@@ -194,8 +194,8 @@
NSInteger traits = [fm traitsOfFont:font];
BOOL wasBold = (traits & NSBoldFontMask) != 0;
BOOL wasItalic = (traits & NSItalicFontMask) != 0;
- BOOL useBold = bold == NSMixedState ? wasBold : bold;
- BOOL useItalic = italic == NSMixedState ? wasItalic : italic;
+ BOOL useBold = bold == NSControlStateValueMixed ? wasBold : bold;
+ BOOL useItalic = italic == NSControlStateValueMixed ? wasItalic : italic;
if (fontName)
font = [NSFont fontWithName:fontName size:fontSize > 0.0 ? fontSize :
[font pointSize]];
Modified: trunk/bibdesk/BDSKTypeInfoEditor.m
===================================================================
--- trunk/bibdesk/BDSKTypeInfoEditor.m 2025-11-18 22:16:26 UTC (rev 29847)
+++ trunk/bibdesk/BDSKTypeInfoEditor.m 2025-11-18 23:01:35 UTC (rev 29848)
@@ -93,7 +93,7 @@
[requiredTableView sizeToFit];
[optionalTableView sizeToFit];
- [canEditDefaultTypesButton setState:canEditDefaultTypes ? NSOnState :
NSOffState];
+ [canEditDefaultTypesButton setState:canEditDefaultTypes ?
NSControlStateValueOn : NSControlStateValueOff];
[typeTableView reloadData];
[requiredTableView reloadData];
@@ -345,7 +345,7 @@
- (void)doChangeCanEditDefaultTypes:(BOOL)canEdit {
canEditDefaultTypes = canEdit;
- [canEditDefaultTypesButton setState:canEditDefaultTypes ? NSOnState :
NSOffState];
+ [canEditDefaultTypesButton setState:canEditDefaultTypes ?
NSControlStateValueOn : NSControlStateValueOff];
for (NSTableView *tv in @[typeTableView, requiredTableView,
optionalTableView]) {
NSUInteger row, numRows = [tv numberOfRows];
@@ -362,7 +362,7 @@
}
- (IBAction)changeCanEditDefaultTypes:(id)sender {
- if ([sender state] == NSOnState) {
+ if ([sender state] == NSControlStateValueOn) {
NSAlert *alert = [[NSAlert alloc] init];
[alert setMessageText:NSLocalizedString(@"Are you sure you want to
edit default types?", @"Message in alert dialog")];
[alert setInformativeText:NSLocalizedString(@"Changing the default
bibtex types and fields can give misleading information.", @"Informative text
in alert dialog")];
Modified: trunk/bibdesk/BDSKZoomablePDFView.m
===================================================================
--- trunk/bibdesk/BDSKZoomablePDFView.m 2025-11-18 22:16:26 UTC (rev 29847)
+++ trunk/bibdesk/BDSKZoomablePDFView.m 2025-11-18 23:01:35 UTC (rev 29848)
@@ -177,7 +177,7 @@
}
- (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
if ([menuItem action] == @selector(doActualSize:)) {
- [menuItem setState:fabs([self scaleFactor] - 1.0) < 0.1 ? NSOnState :
NSOffState];
+ [menuItem setState:fabs([self scaleFactor] - 1.0) < 0.1 ?
NSControlStateValueOn : NSControlStateValueOff];
return YES;
} else if ([[BDSKZoomablePDFView superclass]
instancesRespondToSelector:_cmd]) {
return [super validateMenuItem:menuItem];
Modified: trunk/bibdesk/BibDocument.m
===================================================================
--- trunk/bibdesk/BibDocument.m 2025-11-18 22:16:26 UTC (rev 29847)
+++ trunk/bibdesk/BibDocument.m 2025-11-18 23:01:35 UTC (rev 29848)
@@ -300,13 +300,13 @@
if ([documentWindow attachedSheet]) {
NSInteger returnCode = [alert runModal];
- if ([[alert suppressionButton] state] == NSOnState)
+ if ([[alert suppressionButton] state] == NSControlStateValueOn)
[[NSUserDefaults standardUserDefaults] setBool:YES
forKey:BDSKDisableMigrationWarningKey];
if (NSAlertFirstButtonReturn == returnCode)
[self migrateFiles:self];
} else {
[alert beginSheetModalForWindow:documentWindow
completionHandler:^(NSInteger returnCode){
- if ([[alert suppressionButton] state] == NSOnState)
+ if ([[alert suppressionButton] state] == NSControlStateValueOn)
[[NSUserDefaults standardUserDefaults] setBool:YES
forKey:BDSKDisableMigrationWarningKey];
if (NSAlertFirstButtonReturn == returnCode)
[self migrateFiles:self];
@@ -2412,8 +2412,8 @@
- (NSInteger)numberOfClickedOrSelectedPubs{
switch ([self displaysFileSearch]) {
- case NSOffState: return [tableView numberOfClickedOrSelectedRows];
- case NSOnState: return [[fileSearchController
clickedOrSelectedIdentifierURLs] count];
+ case NSControlStateValueOff: return [tableView
numberOfClickedOrSelectedRows];
+ case NSControlStateValueOn: return [[fileSearchController
clickedOrSelectedIdentifierURLs] count];
default: return 0;
}
}
@@ -2421,11 +2421,11 @@
- (NSArray *)clickedOrSelectedPublications{
NSArray *selPubs = nil;
switch ([self displaysFileSearch]) {
- case NSOffState:
+ case NSControlStateValueOff:
if ([tableView numberOfClickedOrSelectedRows])
selPubs = [shownPublications objectsAtIndexes:[tableView
clickedOrSelectedRowIndexes]];
break;
- case NSOnState:
+ case NSControlStateValueOn:
if ([[fileSearchController clickedOrSelectedIdentifierURLs] count])
selPubs = [publications
itemsForIdentifierURLs:[fileSearchController clickedOrSelectedIdentifierURLs]];
break;
@@ -2481,8 +2481,8 @@
- (NSArray *)clickedOrSelectedFileURLs {
switch ([self displaysFileSearch]) {
- case NSOffState: return [[self clickedOrSelectedPublications]
valueForKeyPath:@"@unionOfArrays.localFiles.URL"];
- case NSOnState: return [fileSearchController clickedOrSelectedURLs];
+ case NSControlStateValueOff: return [[self
clickedOrSelectedPublications]
valueForKeyPath:@"@unionOfArrays.localFiles.URL"];
+ case NSControlStateValueOn: return [fileSearchController
clickedOrSelectedURLs];
default: return nil;
}
}
Modified: trunk/bibdesk/BibDocument_Actions.m
===================================================================
--- trunk/bibdesk/BibDocument_Actions.m 2025-11-18 22:16:26 UTC (rev 29847)
+++ trunk/bibdesk/BibDocument_Actions.m 2025-11-18 23:01:35 UTC (rev 29848)
@@ -235,7 +235,7 @@
[alert setShowsSuppressionButton:YES];
// use didDismissSelector because the action may pop up its own
sheet
[alert beginSheetModalForWindow:documentWindow
completionHandler:^(NSInteger returnCode){
- if ([[alert suppressionButton]state] == NSOnState)
+ if ([[alert suppressionButton]state] == NSControlStateValueOn)
[[NSUserDefaults standardUserDefaults] setBool:NO
forKey:BDSKWarnOnRemovalFromGroupKey];
if (returnCode == NSAlertFirstButtonReturn)
[self doRemovePublicationsFromSelectedGroups:pubs];
@@ -308,7 +308,7 @@
[alert setShowsSuppressionButton:YES];
// use didDismissSelector because the action may pop up its own sheet
[alert beginSheetModalForWindow:documentWindow
completionHandler:^(NSInteger returnCode){
- if ([[alert suppressionButton] state] == NSOnState)
+ if ([[alert suppressionButton] state] == NSControlStateValueOn)
[[NSUserDefaults standardUserDefaults] setBool:NO
forKey:BDSKWarnOnDeleteKey];
if (returnCode == NSAlertFirstButtonReturn)
[self doDeletePublications:pubs];
@@ -446,7 +446,7 @@
BibItem *pub = [self singleSelectedPublication];
- if (pub == nil || [self displaysFileSearch] == NSMixedState) {
+ if (pub == nil || [self displaysFileSearch] == NSControlStateValueMixed) {
NSBeep();
return;
}
@@ -715,7 +715,7 @@
}
- (void)changeColor:(id)sender {
- if ([self hasGroupTypeSelected:BDSKExternalGroupType] == NO && [self
displaysFileSearch] == NSOffState && [[self selectedPublications] count] &&
[BDSKColorLabelWell updatingColorPanel] == NO) {
+ if ([self hasGroupTypeSelected:BDSKExternalGroupType] == NO && [self
displaysFileSearch] == NSControlStateValueOff && [[self selectedPublications]
count] && [BDSKColorLabelWell updatingColorPanel] == NO) {
[BDSKColorLabelWell setUpdatingColorPanel:YES];
[[self selectedPublications] setValue:[sender color] forKey:@"color"];
[BDSKColorLabelWell setUpdatingColorPanel:NO];
@@ -724,7 +724,7 @@
}
- (void)changeColorLabel:(id)sender {
- if ([self hasGroupTypeSelected:BDSKExternalGroupType] == NO && [self
displaysFileSearch] == NSOffState) {
+ if ([self hasGroupTypeSelected:BDSKExternalGroupType] == NO && [self
displaysFileSearch] == NSControlStateValueOff) {
NSColor *color = [sender color];
if (color == nil) {
[self selectPublications:[self clickedOrSelectedPublications]];
@@ -766,7 +766,7 @@
}
} else if ([tcID isBooleanField]) {
BOOL oldStatus = [pub boolValueOfField:tcID];
- BOOL newStatus = [sender state] == NSOnState;
+ BOOL newStatus = [sender state] == NSControlStateValueOn;
if (newStatus != oldStatus) {
[pub setField:tcID toBoolValue:newStatus];
[[pub undoManager] setActionName:NSLocalizedString(@"Change Check
Box", @"Undo action name")];
@@ -1035,7 +1035,7 @@
[oPanel beginSheetModalForWindow:documentWindow
completionHandler:^(NSInteger result){
if (result == NSModalResponseOK) {
NSURL *aURL = [[oPanel URLs] objectAtIndex:0];
- BOOL shouldAutoFile = [(NSButton *)[oPanel accessoryView] state]
== NSOffState && [[NSUserDefaults standardUserDefaults]
boolForKey:BDSKFilePapersAutomaticallyKey];
+ BOOL shouldAutoFile = [(NSButton *)[oPanel accessoryView] state]
== NSControlStateValueOff && [[NSUserDefaults standardUserDefaults]
boolForKey:BDSKFilePapersAutomaticallyKey];
if (anIndex != NSNotFound) {
BDSKLinkedFile *aFile = [BDSKLinkedFile linkedFileWithURL:aURL
delegate:publication];
if (aFile == nil)
@@ -1057,7 +1057,7 @@
}
- (IBAction)chooseLinkedURL:(id)sender{
- if ([self displaysFileSearch] != NSOffState || [self
hasGroupTypeSelected:BDSKExternalGroupType] || [[self selectedPublications]
count] != 1) {
+ if ([self displaysFileSearch] != NSControlStateValueOff || [self
hasGroupTypeSelected:BDSKExternalGroupType] || [[self selectedPublications]
count] != 1) {
NSBeep();
return;
}
@@ -1439,7 +1439,7 @@
#pragma mark AutoFile
- (IBAction)consolidateLinkedFiles:(id)sender{
- if ([self displaysFileSearch] == NSMixedState || [self
hasGroupTypeSelected:BDSKExternalGroupType]) {
+ if ([self displaysFileSearch] == NSControlStateValueMixed || [self
hasGroupTypeSelected:BDSKExternalGroupType]) {
NSBeep();
return;
}
@@ -1533,7 +1533,7 @@
{
NSUInteger numberOfSelectedPubs = [self numberOfSelectedPubs];
if (numberOfSelectedPubs == 0 ||
- [self displaysFileSearch] == NSMixedState ||
+ [self displaysFileSearch] == NSControlStateValueMixed ||
[self hasGroupTypeSelected:BDSKExternalGroupType]) return;
if([[NSUserDefaults standardUserDefaults]
boolForKey:BDSKWarnOnCiteKeyChangeKey]){
@@ -1546,7 +1546,7 @@
[alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Button
title")];
[alert setShowsSuppressionButton:YES];
[alert beginSheetModalForWindow:documentWindow
completionHandler:^(NSInteger returnCode){
- if([[alert suppressionButton] state] == NSOnState)
+ if([[alert suppressionButton] state] == NSControlStateValueOn)
[[NSUserDefaults standardUserDefaults] setBool:NO
forKey:BDSKWarnOnCiteKeyChangeKey];
if (returnCode == NSAlertFirstButtonReturn)
[self generateCiteKeysForPublications:[self
selectedPublications]];
@@ -1605,7 +1605,7 @@
}
- (IBAction)selectCrossrefParentAction:(id)sender{
- BDSKASSERT([self displaysFileSearch] == NSOffState);
+ BDSKASSERT([self displaysFileSearch] == NSControlStateValueOff);
BibItem *selectedBI = [[self clickedOrSelectedPublications] lastObject];
[self selectCrossrefParentForItem:selectedBI];
}
@@ -1626,7 +1626,7 @@
- (IBAction)duplicateTitleToBooktitle:(id)sender{
if ([self numberOfSelectedPubs] == 0 ||
- [self displaysFileSearch] == NSMixedState ||
+ [self displaysFileSearch] == NSControlStateValueMixed ||
[self hasGroupTypeSelected:BDSKExternalGroupType]) return;
NSAlert *alert = [[NSAlert alloc] init];
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m 2025-11-18 22:16:26 UTC (rev
29847)
+++ trunk/bibdesk/BibDocument_DataSource.m 2025-11-18 23:01:35 UTC (rev
29848)
@@ -1480,7 +1480,7 @@
[alert setShowsSuppressionButton:YES];
NSInteger rv = [alert runModal];
- if ([[alert suppressionButton] state] == NSOnState)
+ if ([[alert suppressionButton] state] == NSControlStateValueOn)
[[NSUserDefaults standardUserDefaults] setBool:NO
forKey:BDSKWarnOnRenameGroupKey];
return (rv == NSAlertFirstButtonReturn);
}
@@ -1682,7 +1682,7 @@
[alert addButtonWithTitle:NSLocalizedString(@"Yes", @"Button
title")];
[alert setShowsSuppressionButton:YES];
[alert beginSheetModalForWindow:documentWindow
completionHandler:^(NSInteger returnCode){
- if ([[alert suppressionButton] state] == NSOnState)
+ if ([[alert suppressionButton] state] == NSControlStateValueOn)
[[NSUserDefaults standardUserDefaults] setBool:NO
forKey:BDSKAskToTrashFilesKey];
if (returnCode == NSAlertSecondButtonReturn)
[self trashFiles:fileURLs];
Modified: trunk/bibdesk/BibDocument_Groups.m
===================================================================
--- trunk/bibdesk/BibDocument_Groups.m 2025-11-18 22:16:26 UTC (rev 29847)
+++ trunk/bibdesk/BibDocument_Groups.m 2025-11-18 23:01:35 UTC (rev 29848)
@@ -1158,7 +1158,7 @@
}
- (IBAction)editNewStaticGroupWithSelection:(id)sender{
- if ([self displaysFileSearch] == NSMixedState) {
+ if ([self displaysFileSearch] == NSControlStateValueMixed) {
NSBeep();
return;
}
@@ -1228,7 +1228,7 @@
}
- (IBAction)editNewCategoryGroupWithSelection:(id)sender{
- if ([self displaysFileSearch] == NSMixedState) {
+ if ([self displaysFileSearch] == NSControlStateValueMixed) {
NSBeep();
return;
}
Modified: trunk/bibdesk/BibDocument_Menus.m
===================================================================
--- trunk/bibdesk/BibDocument_Menus.m 2025-11-18 22:16:26 UTC (rev 29847)
+++ trunk/bibdesk/BibDocument_Menus.m 2025-11-18 23:01:35 UTC (rev 29848)
@@ -64,7 +64,7 @@
return NO;
id firstResponder = [documentWindow firstResponder];
if (firstResponder != tableView ||
- [self displaysFileSearch] != NSOffState ||
+ [self displaysFileSearch] != NSControlStateValueOff ||
[self numberOfSelectedPubs] == 0 ||
[self hasGroupTypeSelected:BDSKExternalGroupType]) {
// no selection or selection includes shared groups
@@ -81,7 +81,7 @@
return NO;
id firstResponder = [documentWindow firstResponder];
if (firstResponder != tableView ||
- [self displaysFileSearch] != NSOffState ||
+ [self displaysFileSearch] != NSControlStateValueOff ||
[self numberOfSelectedPubs] == 0) {
// no selection
return NO;
@@ -116,7 +116,7 @@
if ([documentWindow isKeyWindow] == NO)
return NO;
if ([documentWindow firstResponder] != tableView ||
- [self displaysFileSearch] != NSOffState ||
+ [self displaysFileSearch] != NSControlStateValueOff ||
[self numberOfSelectedPubs] == 0 ||
[self hasGroupTypeSelected:BDSKExternalGroupType])
return NO;
@@ -128,7 +128,7 @@
}
- (BOOL) validatePasteAndMergeMenuItem:(NSMenuItem*) menuItem {
- if ([self displaysFileSearch] == NSMixedState || [self
singleSelectedPublication] == nil)
+ if ([self displaysFileSearch] == NSControlStateValueMixed || [self
singleSelectedPublication] == nil)
return NO;
return [BibItem canReadItemFromPasteboard:[NSPasteboard
generalPasteboard]];
}
@@ -233,15 +233,15 @@
}
- (BOOL) validateDuplicateTitleToBooktitleMenuItem:(NSMenuItem*) menuItem {
- return ([self numberOfSelectedPubs] > 0 && [self displaysFileSearch] !=
NSMixedState && [self hasGroupTypeSelected:BDSKExternalGroupType] == NO);
+ return ([self numberOfSelectedPubs] > 0 && [self displaysFileSearch] !=
NSControlStateValueMixed && [self hasGroupTypeSelected:BDSKExternalGroupType]
== NO);
}
- (BOOL) validateGenerateCiteKeyMenuItem:(NSMenuItem*) menuItem {
- return ([self numberOfSelectedPubs] > 0 && [self displaysFileSearch] !=
NSMixedState && [self hasGroupTypeSelected:BDSKExternalGroupType] == NO);
+ return ([self numberOfSelectedPubs] > 0 && [self displaysFileSearch] !=
NSControlStateValueMixed && [self hasGroupTypeSelected:BDSKExternalGroupType]
== NO);
}
- (BOOL) validateConsolidateLinkedFilesMenuItem:(NSMenuItem*) menuItem {
- return ([self numberOfSelectedPubs] > 0 && [self displaysFileSearch] !=
NSMixedState && [self hasGroupTypeSelected:BDSKExternalGroupType] == NO);
+ return ([self numberOfSelectedPubs] > 0 && [self displaysFileSearch] !=
NSControlStateValueMixed && [self hasGroupTypeSelected:BDSKExternalGroupType]
== NO);
}
- (BOOL) validateToggleShowingCustomCitationsMenuItem:(NSMenuItem*) menuItem {
@@ -291,7 +291,7 @@
}
- (BOOL)validateSelectCrossrefParentActionMenuItem:(NSMenuItem *)menuItem{
- if([self displaysFileSearch] == NSOffState && [self
numberOfClickedOrSelectedPubs] == 1){
+ if([self displaysFileSearch] == NSControlStateValueOff && [self
numberOfClickedOrSelectedPubs] == 1){
BibItem *selectedBI = [[self clickedOrSelectedPublications]
objectAtIndex:0];
if(![NSString isEmptyString:[selectedBI
valueOfField:BDSKCrossrefString inherit:NO]])
return YES;
@@ -300,7 +300,7 @@
}
- (BOOL)validateSelectCrossrefsMenuItem:(NSMenuItem *)menuItem{
- if([self displaysFileSearch] == NSOffState && [self
numberOfClickedOrSelectedPubs] > 0)
+ if([self displaysFileSearch] == NSControlStateValueOff && [self
numberOfClickedOrSelectedPubs] > 0)
return YES;
return NO;
}
@@ -318,10 +318,10 @@
- (BOOL) validateSortGroupsByGroupMenuItem:(NSMenuItem *)menuItem{
if([sortGroupsKey isEqualToString:BDSKDocumentCountKey]){
- [menuItem setState:NSOffState];
+ [menuItem setState:NSControlStateValueOff];
[menuItem setImage:nil];
}else{
- [menuItem setState:NSOnState];
+ [menuItem setState:NSControlStateValueOn];
[menuItem setImage:[NSImage imageNamed:docFlags.sortGroupsDescending ?
@"NSDescendingSortIndicator" : @"NSAscendingSortIndicator"]];
}
return YES;
@@ -329,10 +329,10 @@
- (BOOL) validateSortGroupsByCountMenuItem:(NSMenuItem *)menuItem{
if([sortGroupsKey isEqualToString:BDSKDocumentCountKey]){
- [menuItem setState:NSOnState];
+ [menuItem setState:NSControlStateValueOn];
[menuItem setImage:[NSImage imageNamed:docFlags.sortGroupsDescending ?
@"NSDescendingSortIndicator" : @"NSAscendingSortIndicator"]];
}else{
- [menuItem setState:NSOffState];
+ [menuItem setState:NSControlStateValueOff];
[menuItem setImage:nil];
}
return YES;
@@ -340,9 +340,9 @@
- (BOOL) validateToggleGroupFieldActionMenuItem:(NSMenuItem *)menuItem{
if([[self currentGroupFields] containsObject:[menuItem
representedObject]])
- [menuItem setState:NSOnState];
+ [menuItem setState:NSControlStateValueOn];
else
- [menuItem setState:NSOffState];
+ [menuItem setState:NSControlStateValueOff];
return YES;
}
@@ -441,12 +441,12 @@
- (BOOL)validateEditNewStaticGroupWithSelectionMenuItem:(NSMenuItem *)menuItem
{
[menuItem setTitle:[self hasGroupTypeSelected:BDSKExternalGroupType] ?
NSLocalizedString(@"New Static Group With Merged Selection", @"Menu item
title") : NSLocalizedString(@"New Static Group With Selection", @"Menu item
title")];
- return ([self numberOfSelectedPubs] > 0 && [self displaysFileSearch] !=
NSMixedState);
+ return ([self numberOfSelectedPubs] > 0 && [self displaysFileSearch] !=
NSControlStateValueMixed);
}
- (BOOL)validateEditNewCategoryGroupWithSelectionMenuItem:(NSMenuItem
*)menuItem {
[menuItem setTitle:[self hasGroupTypeSelected:BDSKExternalGroupType] ?
NSLocalizedString(@"New Field Group With Merged Selection", @"Menu item title")
: NSLocalizedString(@"New Field Group With Selection", @"Menu item title")];
- return ([self numberOfSelectedPubs] > 0 && [self displaysFileSearch] !=
NSMixedState && [[self currentGroupFields] count] > 0);
+ return ([self numberOfSelectedPubs] > 0 && [self displaysFileSearch] !=
NSControlStateValueMixed && [[self currentGroupFields] count] > 0);
}
- (BOOL)validateAddSearchBookmarkMenuItem:(NSMenuItem *)menuItem {
@@ -458,13 +458,13 @@
}
- (BOOL)validateChangePreviewDisplayMenuItem:(NSMenuItem *)menuItem {
- BDSKPreviewDisplay tag = [menuItem tag], state = NSOffState;
+ BDSKPreviewDisplay tag = [menuItem tag], state = NSControlStateValueOff;
NSString *style = [menuItem representedObject];
if (tag == bottomPreviewDisplay && tag != BDSKPreviewDisplayText) {
- state = NSOnState;
+ state = NSControlStateValueOn;
} else if (tag == BDSKPreviewDisplayText && [style
isEqualToString:bottomPreviewDisplayTemplate]) {
if (tag == bottomPreviewDisplay || [menuItem menu] ==
bottomTemplatePreviewMenu)
- state = NSOnState;
+ state = NSControlStateValueOn;
}
[menuItem setState:state];
return tag != BDSKPreviewDisplayTeX || [[NSUserDefaults
standardUserDefaults] boolForKey:BDSKUsesTeXKey];
@@ -471,13 +471,13 @@
}
- (BOOL)validateChangeSidePreviewDisplayMenuItem:(NSMenuItem *)menuItem {
- BDSKPreviewDisplay tag = [menuItem tag], state = NSOffState;
+ BDSKPreviewDisplay tag = [menuItem tag], state = NSControlStateValueOff;
NSString *style = [menuItem representedObject];
if (tag == sidePreviewDisplay && tag != BDSKPreviewDisplayText) {
- state = NSOnState;
+ state = NSControlStateValueOn;
} else if (tag == BDSKPreviewDisplayText && [style
isEqualToString:sidePreviewDisplayTemplate]) {
if (tag == sidePreviewDisplay || [menuItem menu] ==
sideTemplatePreviewMenu)
- state = NSOnState;
+ state = NSControlStateValueOn;
}
[menuItem setState:state];
return tag != BDSKPreviewDisplayTeX || [[NSUserDefaults
standardUserDefaults] boolForKey:BDSKUsesTeXKey];
@@ -484,7 +484,7 @@
}
- (BOOL)validateChangeIntersectGroupsActionMenuItem:(NSMenuItem *)menuItem {
- [menuItem setState: ((BOOL)[menuItem tag] == docFlags.intersectGroups) ?
NSOnState : NSOffState];
+ [menuItem setState: ((BOOL)[menuItem tag] == docFlags.intersectGroups) ?
NSControlStateValueOn : NSControlStateValueOff];
return YES;
}
@@ -558,9 +558,9 @@
- (BOOL)validateChangeSearchTypeMenuItem:(NSMenuItem *)menuItem {
if ([[NSUserDefaults standardUserDefaults]
integerForKey:BDSKSearchMenuTagKey] == [menuItem tag])
- [menuItem setState:NSOnState];
+ [menuItem setState:NSControlStateValueOn];
else
- [menuItem setState:NSOffState];
+ [menuItem setState:NSControlStateValueOff];
return YES;
}
Modified: trunk/bibdesk/BibDocument_Toolbar.m
===================================================================
--- trunk/bibdesk/BibDocument_Toolbar.m 2025-11-18 22:16:26 UTC (rev 29847)
+++ trunk/bibdesk/BibDocument_Toolbar.m 2025-11-18 23:01:35 UTC (rev 29848)
@@ -275,11 +275,11 @@
BOOL enable = YES;
if([[toolbarItem itemIdentifier] isEqualToString:
BibDocumentToolbarEditItemIdentifier]
|| [[toolbarItem itemIdentifier] isEqualToString:
BibDocumentToolbarActionItemIdentifier]){
- if([self numberOfSelectedPubs] == 0 || [self displaysFileSearch] ==
NSMixedState) enable = NO;
+ if([self numberOfSelectedPubs] == 0 || [self displaysFileSearch] ==
NSControlStateValueMixed) enable = NO;
}else if([[toolbarItem itemIdentifier] isEqualToString:
BibDocumentToolbarDeleteItemIdentifier]){
- if([self numberOfSelectedPubs] == 0 || [self displaysFileSearch] ==
NSMixedState || [documentWindow isKeyWindow] == NO) enable = NO; // disable
click-through
+ if([self numberOfSelectedPubs] == 0 || [self displaysFileSearch] ==
NSControlStateValueMixed || [documentWindow isKeyWindow] == NO) enable = NO;
// disable click-through
}else if([[toolbarItem itemIdentifier] isEqualToString:
BibDocumentToolbarNewItemIdentifier]){
- if(([NSEvent standardModifierFlags] & NSEventModifierFlagOption) &&
([self numberOfSelectedPubs] != 1 || [self displaysFileSearch] ==
NSMixedState)) enable = NO;
+ if(([NSEvent standardModifierFlags] & NSEventModifierFlagOption) &&
([self numberOfSelectedPubs] != 1 || [self displaysFileSearch] ==
NSControlStateValueMixed)) enable = NO;
}
return enable;
}
Modified: trunk/bibdesk/BibDocument_UI.m
===================================================================
--- trunk/bibdesk/BibDocument_UI.m 2025-11-18 22:16:26 UTC (rev 29847)
+++ trunk/bibdesk/BibDocument_UI.m 2025-11-18 23:01:35 UTC (rev 29848)
@@ -693,7 +693,7 @@
- (NSCellStateValue)displaysFileSearch {
BOOL displays = [self displaysControlView:BDSKControlViewFileSearch];
BOOL currentlyDisplays = [self
currentlyDisplaysControlView:BDSKControlViewFileSearch];
- return displays != currentlyDisplays ? NSMixedState : displays ? NSOnState
: NSOffState;
+ return displays != currentlyDisplays ? NSControlStateValueMixed : displays
? NSControlStateValueOn : NSControlStateValueOff;
}
#pragma mark Columns Menu
@@ -736,7 +736,7 @@
- (void)updateActionMenu:(NSMenu *)menu {
NSColor *color = nil;
- if ([self hasGroupTypeSelected:BDSKExternalGroupType] == NO && [self
displaysFileSearch] == NSOffState && [[self clickedOrSelectedPublications]
count]) {
+ if ([self hasGroupTypeSelected:BDSKExternalGroupType] == NO && [self
displaysFileSearch] == NSControlStateValueOff && [[self
clickedOrSelectedPublications] count]) {
for (BibItem *pub in [self clickedOrSelectedPublications]) {
NSColor *aColor = [pub color] ?: [NSColor clearColor];
if (color == nil) {
@@ -989,7 +989,7 @@
[menuItem setTarget:self];
[menuItem setRepresentedObject:field];
if ([[item key] isEqualToString:field])
- [menuItem setState:NSOnState];
+ [menuItem setState:NSControlStateValueOn];
}
} else {
[menu addItemsFromMenu:groupMenu];
Modified: trunk/bibdesk/BibItem.m
===================================================================
--- trunk/bibdesk/BibItem.m 2025-11-18 22:16:26 UTC (rev 29847)
+++ trunk/bibdesk/BibItem.m 2025-11-18 23:01:35 UTC (rev 29848)
@@ -1631,7 +1631,7 @@
if([BDSKReadString isBooleanField])
[info setObject:(__bridge id)([self boolValueOfField:BDSKReadString] ?
kCFBooleanTrue : kCFBooleanFalse)
forKey:@"net_sourceforge_bibdesk_itemreadstatus"];
else if([BDSKReadString isTriStateField])
- [info setObject:(__bridge id)([self
triStateValueOfField:BDSKReadString] == NSOnState ? kCFBooleanTrue :
kCFBooleanFalse) forKey:@"net_sourceforge_bibdesk_itemreadstatus"];
+ [info setObject:(__bridge id)([self
triStateValueOfField:BDSKReadString] == NSControlStateValueOn ? kCFBooleanTrue
: kCFBooleanFalse) forKey:@"net_sourceforge_bibdesk_itemreadstatus"];
// kMDItemWhereFroms is the closest we get to a URL field, so add our
standard fields if available
NSMutableArray *mutableArray = [[NSMutableArray alloc] initWithCapacity:2];
@@ -3538,15 +3538,15 @@
} else if ([[sud stringArrayForKey:BDSKTriStateFieldsKey]
containsObject:field]) {
// this operation also doesn't make much sense for tri-state
fields
// so we do something that seems OK:
- NSCellStateValue newVal = NSOffState;
+ NSCellStateValue newVal = NSControlStateValueOff;
NSCellStateValue oldVal = [groupName triStateValue];
switch(oldVal){
- case NSOffState:
- newVal = NSOnState;
+ case NSControlStateValueOff:
+ newVal = NSControlStateValueOn;
break;
- case NSOnState:
- case NSMixedState:
- newVal = NSOffState;
+ case NSControlStateValueOn:
+ case NSControlStateValueMixed:
+ newVal = NSControlStateValueOff;
}
[self setField:field toTriStateValue:newVal];
return BDSKFieldActionSet;
Modified: trunk/bibdesk/NSString_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSString_BDSKExtensions.m 2025-11-18 22:16:26 UTC (rev
29847)
+++ trunk/bibdesk/NSString_BDSKExtensions.m 2025-11-18 23:01:35 UTC (rev
29848)
@@ -191,11 +191,11 @@
+ (NSString *)stringWithTriStateValue:(NSCellStateValue)triStateValue {
switch (triStateValue) {
- case NSOffState:
+ case NSControlStateValueOff:
return @"0";
- case NSOnState:
+ case NSControlStateValueOn:
return @"1";
- case NSMixedState:
+ case NSControlStateValueMixed:
default:
return @"-";
}
@@ -1031,15 +1031,15 @@
- (NSCellStateValue)triStateValue{
// check for "non" for backard compatibility with French localization
if([self booleanValue]){
- return NSOnState;
+ return NSControlStateValueOn;
}else if([self isEqualToString:@""] ||
[self isEqualToString:@"0"] ||
[self compare:@"n" options:NSCaseInsensitiveSearch] ==
NSOrderedSame ||
[self compare:@"no" options:NSCaseInsensitiveSearch] ==
NSOrderedSame ||
[self compare:@"non" options:NSCaseInsensitiveSearch] ==
NSOrderedSame){
- return NSOffState;
+ return NSControlStateValueOff;
}else{
- return NSMixedState;
+ return NSControlStateValueMixed;
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
