Revision: 27334
http://sourceforge.net/p/bibdesk/svn/27334
Author: hofman
Date: 2022-03-29 14:10:49 +0000 (Tue, 29 Mar 2022)
Log Message:
-----------
No table cell images to remove. Return localized header title from convenience
method.
Modified Paths:
--------------
trunk/bibdesk/BDSKMainTableView.m
Modified: trunk/bibdesk/BDSKMainTableView.m
===================================================================
--- trunk/bibdesk/BDSKMainTableView.m 2022-03-29 06:30:39 UTC (rev 27333)
+++ trunk/bibdesk/BDSKMainTableView.m 2022-03-29 14:10:49 UTC (rev 27334)
@@ -246,15 +246,11 @@
[tc setColumnType:columnType];
NSTableHeaderCell *headerCell = [tc headerCell];
- NSImage *image;
- NSString *title;
-
- if ((image = [self headerImageForField:identifier]))
+ NSImage *image = [self headerImageForField:identifier];
+ if (image)
[headerCell setImage:image];
- else if ((title = [self headerTitleForField:identifier]))
- [headerCell setStringValue:title];
else
- [headerCell setStringValue:[[NSBundle mainBundle]
localizedStringForKey:identifier value:@"" table:@"BibTeXKeys"]];
+ [headerCell setStringValue:[self headerTitleForField:identifier]];
if (columnType != BDSKColumnTypeText && columnType !=
BDSKColumnTypeLinkedFile && columnType != BDSKColumnTypeRelevance) {
NSView *view = [self makeViewForTableColumn:tc owner:[self delegate]];
@@ -357,17 +353,14 @@
NSMutableDictionary *tmpDict = [[NSMutableDictionary alloc] init];
NSDictionary *imagePaths = [[NSUserDefaults standardUserDefaults]
objectForKey:BDSKTableCellImagesKey];
[imagePaths enumerateKeysAndObjectsUsingBlock:^(NSString *key,
NSString *imagePath, BOOL *stop){
- if ([imagePath isKindOfClass:[NSString class]]) {
- NSImage *image;
- if ([imagePath isEqualToString:@""]) {
- [tmpDict removeObjectForKey:key];
- } else if ([[NSFileManager defaultManager]
fileExistsAtPath:imagePath] &&
- (image = [[NSImage alloc]
initWithContentsOfFile:imagePath])) {
- if ([[[imagePath lastPathComponent]
stringByDeletingPathExtension] hasSuffix:@"Template"])
- [image setTemplate:YES];
- [tmpDict setObject:image forKey:key];
- [image release];
- }
+ NSImage *image;
+ if ([imagePath isKindOfClass:[NSString class]] &&
+ [[NSFileManager defaultManager] fileExistsAtPath:imagePath] &&
+ (image = [[NSImage alloc] initWithContentsOfFile:imagePath])) {
+ if ([[[imagePath lastPathComponent]
stringByDeletingPathExtension] hasSuffix:@"Template"])
+ [image setTemplate:YES];
+ [tmpDict setObject:image forKey:key];
+ [image release];
}
}];
cellImageCache = [tmpDict copy];
@@ -553,7 +546,7 @@
[tmpDict release];
}
- return [headerTitleCache objectForKey:field];
+ return [headerTitleCache objectForKey:field] ?: [[NSBundle mainBundle]
localizedStringForKey:field value:@"" table:@"BibTeXKeys"];
}
- (void)updateTableColumnDefaults {
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
