Revision: 26463
http://sourceforge.net/p/bibdesk/svn/26463
Author: hofman
Date: 2021-07-22 17:52:58 +0000 (Thu, 22 Jul 2021)
Log Message:
-----------
Rename displayColor property to displayAsColor
Modified Paths:
--------------
trunk/bibdesk/BDSKCategoryGroup.m
trunk/bibdesk/BDSKGroup.h
trunk/bibdesk/BDSKGroup.m
trunk/bibdesk/BDSKGroupCell.h
trunk/bibdesk/BDSKGroupCell.m
trunk/bibdesk/BDSKGroupTextFieldCell.h
trunk/bibdesk/BDSKGroupTextFieldCell.m
trunk/bibdesk/BibDocument_DataSource.m
Modified: trunk/bibdesk/BDSKCategoryGroup.m
===================================================================
--- trunk/bibdesk/BDSKCategoryGroup.m 2021-07-22 17:48:51 UTC (rev 26462)
+++ trunk/bibdesk/BDSKCategoryGroup.m 2021-07-22 17:52:58 UTC (rev 26463)
@@ -189,7 +189,7 @@
- (BOOL)isEmpty { return NO; }
-- (BOOL)displayColor { return [key isEqualToString:BDSKColorLabelString] ||
[key isEqualToString:BDSKColorString]; }
+- (BOOL)displayAsColor { return [key isEqualToString:BDSKColorLabelString] ||
[key isEqualToString:BDSKColorString]; }
@end
@@ -232,6 +232,6 @@
- (BOOL)isEmpty { return YES; }
-- (BOOL)displayColor { return NO; }
+- (BOOL)displayAsColor { return NO; }
@end
Modified: trunk/bibdesk/BDSKGroup.h
===================================================================
--- trunk/bibdesk/BDSKGroup.h 2021-07-22 17:48:51 UTC (rev 26462)
+++ trunk/bibdesk/BDSKGroup.h 2021-07-22 17:52:58 UTC (rev 26463)
@@ -98,7 +98,7 @@
@property (nonatomic, readonly) BOOL allowsRemoval;
@property (nonatomic, readonly) BOOL failedDownload;
@property (nonatomic, readonly, getter=isRetrieving) BOOL retrieving;
-@property (nonatomic, readonly, getter=displayColor) BOOL displayColor;
+@property (nonatomic, readonly) BOOL displayAsColor;
@property (nonatomic, readonly) NSString *displayName;
@property (nonatomic, readonly) NSString *stringValue;
Modified: trunk/bibdesk/BDSKGroup.m
===================================================================
--- trunk/bibdesk/BDSKGroup.m 2021-07-22 17:48:51 UTC (rev 26462)
+++ trunk/bibdesk/BDSKGroup.m 2021-07-22 17:52:58 UTC (rev 26463)
@@ -50,7 +50,7 @@
@implementation BDSKGroup
@synthesize uniqueID, name, count, parent, document;
-@dynamic dictionaryValue, label, icon, groupType, nameEditable, editable,
allowsRemoval, failedDownload, retrieving, displayColor, displayName,
stringValue, numberValue, editingStringValue, cellValue, toolTip, errorMessage,
macroResolver, publications;
+@dynamic dictionaryValue, label, icon, groupType, nameEditable, editable,
allowsRemoval, failedDownload, retrieving, displayAsColor, displayName,
stringValue, numberValue, editingStringValue, cellValue, toolTip, errorMessage,
macroResolver, publications;
static NSArray *cellValueKeys = nil;
static NSArray *noCountCellValueKeys = nil;
@@ -57,8 +57,8 @@
+ (void)initialize {
BDSKINITIALIZE;
- cellValueKeys = [[NSArray alloc] initWithObjects:@"stringValue",
@"editingStringValue", @"numberValue", @"label", @"icon", @"retrieving",
@"failedDownload", @"displayColor", nil];
- noCountCellValueKeys = [[NSArray alloc] initWithObjects:@"stringValue",
@"editingStringValue", @"label", @"icon", @"retrieving", @"failedDownload",
@"displayColor", nil];
+ cellValueKeys = [[NSArray alloc] initWithObjects:@"stringValue",
@"editingStringValue", @"numberValue", @"label", @"icon", @"retrieving",
@"failedDownload", @"displayAsColor", nil];
+ noCountCellValueKeys = [[NSArray alloc] initWithObjects:@"stringValue",
@"editingStringValue", @"label", @"icon", @"retrieving", @"failedDownload",
@"displayAsColor", nil];
}
// super's designated initializer
@@ -147,7 +147,7 @@
- (BOOL)isRetrieving { return NO; }
-- (BOOL)displayColor { return NO; }
+- (BOOL)displayAsColor { return NO; }
// custom accessors
Modified: trunk/bibdesk/BDSKGroupCell.h
===================================================================
--- trunk/bibdesk/BDSKGroupCell.h 2021-07-22 17:48:51 UTC (rev 26462)
+++ trunk/bibdesk/BDSKGroupCell.h 2021-07-22 17:52:58 UTC (rev 26463)
@@ -45,7 +45,7 @@
extern NSString *BDSKGroupCellCountKey;
extern NSString *BDSKGroupCellIsRetrievingKey;
extern NSString *BDSKGroupCellFailedDownloadKey;
-extern NSString *BDSKGroupCellDisplayColorKey;
+extern NSString *BDSKGroupCellDisplayAsColorKey;
@class BDSKGroup;
Modified: trunk/bibdesk/BDSKGroupCell.m
===================================================================
--- trunk/bibdesk/BDSKGroupCell.m 2021-07-22 17:48:51 UTC (rev 26462)
+++ trunk/bibdesk/BDSKGroupCell.m 2021-07-22 17:52:58 UTC (rev 26463)
@@ -53,7 +53,7 @@
NSString *BDSKGroupCellCountKey = @"numberValue";
NSString *BDSKGroupCellIsRetrievingKey = @"retrieving";
NSString *BDSKGroupCellFailedDownloadKey = @"failedDownload";
-NSString *BDSKGroupCellDisplayColorKey = @"displayColor";
+NSString *BDSKGroupCellDisplayAsColorKey = @"displayAsColor";
#define LABEL_FONTSIZE_OFFSET 2.0
@@ -206,8 +206,8 @@
return [nonNullObjectValueForKey([self objectValue],
BDSKGroupCellFailedDownloadKey) boolValue];
}
-- (BOOL)displayColor {
- return [nonNullObjectValueForKey([self objectValue],
BDSKGroupCellDisplayColorKey) boolValue];
+- (BOOL)displayAsColor {
+ return [nonNullObjectValueForKey([self objectValue],
BDSKGroupCellDisplayAsColorKey) boolValue];
}
#pragma mark Drawing
@@ -281,7 +281,7 @@
NSSize cellSize = [super cellSizeForBounds:aRect];
NSSize countSize = NSZeroSize;
CGFloat iconHeight = cellSize.height + IMAGE_SIZE_OFFSET;
- if ([self displayColor]) {
+ if ([self displayAsColor]) {
cellSize.width = cellSize.height;
}
if ([self label]) {
@@ -306,7 +306,7 @@
// Draw the text
NSRect textRect = [self textRectForBounds:aRect];
- if ([self displayColor]) {
+ if ([self displayAsColor]) {
CGFloat height = [super cellSizeForBounds:textRect].height;
NSRect swatchRect = BDSKSliceRect(BDSKSliceRect(textRect, height,
NSMinXEdge), height, [controlView isFlipped] ? NSMinYEdge : NSMaxYEdge);
NSColor *color = [NSColor colorWithFourByteString:[self stringValue]];
Modified: trunk/bibdesk/BDSKGroupTextFieldCell.h
===================================================================
--- trunk/bibdesk/BDSKGroupTextFieldCell.h 2021-07-22 17:48:51 UTC (rev
26462)
+++ trunk/bibdesk/BDSKGroupTextFieldCell.h 2021-07-22 17:52:58 UTC (rev
26463)
@@ -40,9 +40,9 @@
@interface BDSKGroupTextFieldCell : NSTextFieldCell {
- BOOL displayColor;
+ BOOL displayAsColor;
}
-@property (nonatomic) BOOL displayColor;
+@property (nonatomic) BOOL displayAsColor;
@end
Modified: trunk/bibdesk/BDSKGroupTextFieldCell.m
===================================================================
--- trunk/bibdesk/BDSKGroupTextFieldCell.m 2021-07-22 17:48:51 UTC (rev
26462)
+++ trunk/bibdesk/BDSKGroupTextFieldCell.m 2021-07-22 17:52:58 UTC (rev
26463)
@@ -42,10 +42,10 @@
@implementation BDSKGroupTextFieldCell
-@synthesize displayColor;
+@synthesize displayAsColor;
- (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView *)controlView {
- if ([self displayColor]) {
+ if ([self displayAsColor]) {
NSColor *color = [NSColor colorWithFourByteString:[self stringValue]];
NSRect rect = cellFrame;
rect.size.width = NSHeight(cellFrame);
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m 2021-07-22 17:48:51 UTC (rev
26462)
+++ trunk/bibdesk/BibDocument_DataSource.m 2021-07-22 17:52:58 UTC (rev
26463)
@@ -952,7 +952,7 @@
[textField setFormatter:[[[BDSKCategoryFormatter alloc]
initWithKey:[item key]] autorelease]];
else
[textField setFormatter:nil];
- [(BDSKGroupTextFieldCell *)[textField cell] setDisplayColor:[item
displayColor]];
+ [(BDSKGroupTextFieldCell *)[textField cell] setDisplayAsColor:[item
displayAsColor]];
[textField setObjectValue:[(BDSKGroup *)item name]];
[self updateCountBubbleForGroup:item inView:view];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
Bibdesk-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
