Revision: 29796
http://sourceforge.net/p/bibdesk/svn/29796
Author: hofman
Date: 2025-11-14 10:14:19 +0000 (Fri, 14 Nov 2025)
Log Message:
-----------
use different Key or String suffix to template string constants
Modified Paths:
--------------
trunk/bibdesk/BDSKTemplate.h
trunk/bibdesk/BDSKTemplate.m
trunk/bibdesk/BDSKTemplateObjectProxy.m
trunk/bibdesk/BibPref_Export.m
Modified: trunk/bibdesk/BDSKTemplate.h
===================================================================
--- trunk/bibdesk/BDSKTemplate.h 2025-11-13 23:08:51 UTC (rev 29795)
+++ trunk/bibdesk/BDSKTemplate.h 2025-11-14 10:14:19 UTC (rev 29796)
@@ -59,10 +59,10 @@
extern NSString * const BDSKTemplateRoleKey;
extern NSString * const BDSKTemplateNameKey;
extern NSString * const BDSKTemplateFileURLKey;
-extern NSString * const BDSKTemplateAccessoryKey;
-extern NSString * const BDSKTemplateMainPageKey;
-extern NSString * const BDSKTemplateDefaultItemKey;
-extern NSString * const BDSKTemplateScriptKey;
+extern NSString * const BDSKTemplateAccessoryString;
+extern NSString * const BDSKTemplateMainPageString;
+extern NSString * const BDSKTemplateDefaultItemString;
+extern NSString * const BDSKTemplateScriptString;
// concrete subclass with specific accessors for the template tree
@interface BDSKTemplate : BDSKTreeNode
Modified: trunk/bibdesk/BDSKTemplate.m
===================================================================
--- trunk/bibdesk/BDSKTemplate.m 2025-11-13 23:08:51 UTC (rev 29795)
+++ trunk/bibdesk/BDSKTemplate.m 2025-11-14 10:14:19 UTC (rev 29796)
@@ -48,19 +48,22 @@
NSString * const BDSKTemplateRoleKey = @"role";
NSString * const BDSKTemplateNameKey = @"name";
NSString * const BDSKTemplateFileURLKey = @"representedFileURL";
-NSString * const BDSKTemplateAliasString = @"_BDAlias";
-NSString * const BDSKTemplateBookmarkString = @"bookmark";
-NSString * const BDSKTemplateFilePathString = @"filePath";
-NSString * const BDSKTemplateStringString = @"string";
-NSString * const BDSKTemplateAttributedStringString = @"attributedString";
-NSString * const BDSKTemplateAccessoryKey = @"Accessory File";
-NSString * const BDSKTemplateMainPageKey = @"Main Page";
-NSString * const BDSKTemplateDefaultItemKey = @"Default Item";
-NSString * const BDSKTemplateScriptKey = @"Postprocess Script";
-static NSString *BDSKExportTemplateTree = @"BDSKExportTemplateTree";
-static NSString *BDSKServiceTemplateTree = @"BDSKServiceTemplateTree";
+static NSString * const BDSKTemplateAliasKey = @"_BDAlias";
+static NSString * const BDSKTemplateBookmarkKey = @"bookmark";
+static NSString * const BDSKTemplateFilePathKey = @"filePath";
+static NSString * const BDSKTemplateStringKey = @"string";
+NSString * const BDSKTemplateAccessoryString = @"Accessory File";
+NSString * const BDSKTemplateMainPageString = @"Main Page";
+NSString * const BDSKTemplateDefaultItemString = @"Default Item";
+NSString * const BDSKTemplateScriptString = @"Postprocess Script";
+
+static NSString * const BDSKTemplateAttributedStringKey = @"attributedString";
+
+static NSString * const BDSKExportTemplateTreeKey = @"BDSKExportTemplateTree";
+static NSString * const BDSKServiceTemplateTreeKey =
@"BDSKServiceTemplateTree";
+
static inline NSRange itemTemplateRange(NSString *templateString){
NSInteger start, end, length = [templateString length];
NSUInteger nonwsLoc;
@@ -162,13 +165,13 @@
}
+ (NSString *)localizedRoleString:(NSString *)string {
- if ([string isEqualToString:BDSKTemplateAccessoryKey])
+ if ([string isEqualToString:BDSKTemplateAccessoryString])
string = [self localizedAccessoryString];
- else if ([string isEqualToString:BDSKTemplateMainPageKey])
+ else if ([string isEqualToString:BDSKTemplateMainPageString])
string = [self localizedMainPageString];
- else if ([string isEqualToString:BDSKTemplateDefaultItemKey])
+ else if ([string isEqualToString:BDSKTemplateDefaultItemString])
string = [self localizedDefaultItemString];
- else if ([string isEqualToString:BDSKTemplateScriptKey])
+ else if ([string isEqualToString:BDSKTemplateScriptString])
string = [self localizedScriptString];
return string;
}
@@ -175,13 +178,13 @@
+ (NSString *)unlocalizedRoleString:(NSString *)string {
if ([string isEqualToString:[self localizedAccessoryString]])
- string = BDSKTemplateAccessoryKey;
+ string = BDSKTemplateAccessoryString;
else if ([string isEqualToString:[self localizedMainPageString]])
- string = BDSKTemplateMainPageKey;
+ string = BDSKTemplateMainPageString;
else if ([string isEqualToString:[self localizedDefaultItemString]])
- string = BDSKTemplateDefaultItemKey;
+ string = BDSKTemplateDefaultItemString;
else if ([string isEqualToString:[self localizedScriptString]])
- string = BDSKTemplateScriptKey;
+ string = BDSKTemplateScriptString;
return string;
}
@@ -210,9 +213,9 @@
template = [BDSKTemplate templateWithName:NSLocalizedString(@"Default HTML
template", @"template name") mainPageURL:fileURL];
// a user could potentially have templates for multiple BibTeX types; we
could add all of those, as well
fileURL = [templatesURL
URLByAppendingPathComponent:@"htmlItemExportTemplate.html" isDirectory:NO];
- [template addChildWithURL:fileURL role:BDSKTemplateDefaultItemKey];
+ [template addChildWithURL:fileURL role:BDSKTemplateDefaultItemString];
fileURL = [templatesURL
URLByAppendingPathComponent:@"htmlExportStyleSheet.css" isDirectory:NO];
- [template addChildWithURL:fileURL role:BDSKTemplateAccessoryKey];
+ [template addChildWithURL:fileURL role:BDSKTemplateAccessoryString];
[itemNodes addObject:template];
// RSS template
@@ -256,7 +259,7 @@
template = [BDSKTemplate templateWithName:NSLocalizedString(@"RTF Service
template", @"template name") mainPageURL:fileURL];
[template setValue:NSLocalizedString(@"RTF Service template", @"template
name") forKey:BDSKTemplateNameKey];
fileURL = [templatesURL URLByAppendingPathComponent:@"rtfServiceTemplate
default item.rtf" isDirectory:NO];
- [template addChildWithURL:fileURL role:BDSKTemplateDefaultItemKey];
+ [template addChildWithURL:fileURL role:BDSKTemplateDefaultItemString];
fileURL = [templatesURL URLByAppendingPathComponent:@"rtfServiceTemplate
book.rtf" isDirectory:NO];
[template addChildWithURL:fileURL role:BDSKBookString];
[itemNodes addObject:template];
@@ -267,7 +270,7 @@
+ (NSArray *)exportTemplates{
if (exportTemplateTree == nil) {
NSArray *templates = nil;
- NSData *prefData = [[NSUserDefaults standardUserDefaults]
objectForKey:BDSKExportTemplateTree];
+ NSData *prefData = [[NSUserDefaults standardUserDefaults]
objectForKey:BDSKExportTemplateTreeKey];
if ([prefData length])
templates = [NSKeyedUnarchiver unarchivedObjectOfClasses:[NSSet
setWithObjects:[NSArray class], [BDSKTreeNode class], nil] fromData:prefData
error:NULL];
if ([templates count] == 0)
@@ -287,7 +290,7 @@
NSLog(@"Unable to archive %@", tree);
} else {
exportTemplateTree = nil;
- [[NSUserDefaults standardUserDefaults] setObject:data
forKey:BDSKExportTemplateTree];
+ [[NSUserDefaults standardUserDefaults] setObject:data
forKey:BDSKExportTemplateTreeKey];
[[NSNotificationCenter defaultCenter]
postNotificationName:BDSKExportTemplatesChangedNotification object:self];
}
}
@@ -296,7 +299,7 @@
+ (NSArray *)serviceTemplates{
if (serviceTemplateTree == nil) {
NSArray *templates = nil;
- NSData *prefData = [[NSUserDefaults standardUserDefaults]
objectForKey:BDSKServiceTemplateTree];
+ NSData *prefData = [[NSUserDefaults standardUserDefaults]
objectForKey:BDSKServiceTemplateTreeKey];
if ([prefData length])
templates = [NSKeyedUnarchiver unarchivedObjectOfClasses:[NSSet
setWithObjects:[NSArray class], [BDSKTreeNode class], nil] fromData:prefData
error:NULL];
if ([templates count] == 0)
@@ -315,7 +318,7 @@
NSLog(@"Unable to archive %@", tree);
} else {
serviceTemplateTree = nil;
- [[NSUserDefaults standardUserDefaults] setObject:data
forKey:BDSKServiceTemplateTree];
+ [[NSUserDefaults standardUserDefaults] setObject:data
forKey:BDSKServiceTemplateTreeKey];
}
}
}
@@ -327,7 +330,7 @@
+ (void)addDefaultPreviewTemplateIfNeeded
{
- NSData *prefData = [[NSUserDefaults standardUserDefaults]
objectForKey:BDSKExportTemplateTree];
+ NSData *prefData = [[NSUserDefaults standardUserDefaults]
objectForKey:BDSKExportTemplateTreeKey];
if ([prefData length] == 0)
return;
@@ -430,7 +433,7 @@
BDSKTemplate *template = [[BDSKTemplate alloc] init];
[template setValue:name forKey:BDSKTemplateNameKey];
[template setValue:[[fileURL pathExtension] lowercaseString]
forKey:BDSKTemplateRoleKey];
- [template addChildWithURL:fileURL role:BDSKTemplateMainPageKey];
+ [template addChildWithURL:fileURL role:BDSKTemplateMainPageString];
return template;
}
@@ -438,7 +441,7 @@
{
BDSKTemplate *template = [[BDSKTemplate alloc] init];
[template setValue:fileType forKey:BDSKTemplateRoleKey];
- [template setValue:string forKey:BDSKTemplateStringString];
+ [template setValue:string forKey:BDSKTemplateStringKey];
return template;
}
@@ -446,7 +449,7 @@
{
BDSKTemplate *template = [[BDSKTemplate alloc] init];
[template setValue:fileType forKey:BDSKTemplateRoleKey];
- [template setValue:attributedString
forKey:BDSKTemplateAttributedStringString];
+ [template setValue:attributedString
forKey:BDSKTemplateAttributedStringKey];
return template;
}
@@ -497,7 +500,7 @@
BDSKASSERT([self parent] == nil);
NSString *extension = [[self valueForKey:BDSKTemplateRoleKey]
lowercaseString];
BDSKTemplateFormat format = BDSKTemplateFormatUnknown;
- BOOL isValid = [self hasMainPageTemplateURL] || [self
valueForKey:BDSKTemplateStringString] || [self
valueForKey:BDSKTemplateAttributedStringString];
+ BOOL isValid = [self hasMainPageTemplateURL] || [self
valueForKey:BDSKTemplateStringKey] || [self
valueForKey:BDSKTemplateAttributedStringKey];
if (extension == nil || isValid == NO) {
format = BDSKTemplateFormatUnknown;
@@ -514,12 +517,12 @@
} else if ([extension isEqualToString:@"webarchive"]) {
format = BDSKTemplateFormatWebArchive;
} else if ([extension isEqualToString:@"html"] || [extension
isEqualToString:@"htm"]) {
- if ([self valueForKey:BDSKTemplateStringString]) {
+ if ([self valueForKey:BDSKTemplateStringKey]) {
format = BDSKTemplateFormatPlainHTML;
- } else if ([self valueForKey:BDSKTemplateAttributedStringString]) {
+ } else if ([self valueForKey:BDSKTemplateAttributedStringKey]) {
format = BDSKTemplateFormatRichHTML;
} else {
- NSURL *url = [[self childForRole:BDSKTemplateMainPageKey]
representedFileURLNoUI];
+ NSURL *url = [[self childForRole:BDSKTemplateMainPageString]
representedFileURLNoUI];
NSString *htmlString = url ? [[NSString alloc]
initWithData:[NSData dataWithContentsOfURL:url] encoding:NSUTF8StringEncoding]
: nil;
// should we return Unknown when we don't get a URL? It may be on
an unmounted disk
if ([htmlString rangeOfString:@"<$"].location == NSNotFound &&
[htmlString rangeOfString:@"<$"].location != NSNotFound)
@@ -568,7 +571,7 @@
if (mainPageURL) {
return [NSString stringWithContentsOfURL:[self mainPageTemplateURL]
encoding:NSUTF8StringEncoding error:NULL];
} else {
- return [self valueForKey:BDSKTemplateStringString];
+ return [self valueForKey:BDSKTemplateStringKey];
}
}
@@ -580,7 +583,7 @@
return [[NSAttributedString alloc] initWithURL:[self
mainPageTemplateURL] options:@{} documentAttributes:docAttributes error:NULL];
} else {
if (docAttributes) *docAttributes = nil;
- return [self valueForKey:BDSKTemplateAttributedStringString];
+ return [self valueForKey:BDSKTemplateAttributedStringKey];
}
}
@@ -623,20 +626,20 @@
- (NSURL *)mainPageTemplateURL;
{
BDSKASSERT([self parent] == nil);
- return [self templateURLForType:BDSKTemplateMainPageKey];
+ return [self templateURLForType:BDSKTemplateMainPageString];
}
- (BOOL)hasMainPageTemplateURL {
// we don't try to resolve here, because that may try to mount external
disks
// but we could try to resolve without UI, but then we will miss templates
we might use
- BDSKTemplate *mainPage = [self childForRole:BDSKTemplateMainPageKey];
- return [mainPage valueForKey:BDSKTemplateAliasString] || [mainPage
valueForKey:BDSKTemplateBookmarkString];
+ BDSKTemplate *mainPage = [self childForRole:BDSKTemplateMainPageString];
+ return [mainPage valueForKey:BDSKTemplateAliasKey] || [mainPage
valueForKey:BDSKTemplateBookmarkKey];
}
- (NSURL *)defaultItemTemplateURL;
{
BDSKASSERT([self parent] == nil);
- return [self templateURLForType:BDSKTemplateDefaultItemKey];
+ return [self templateURLForType:BDSKTemplateDefaultItemString];
}
- (NSURL *)templateURLForType:(NSString *)pubType;
@@ -652,7 +655,7 @@
NSMutableArray *fileURLs = [NSMutableArray array];
NSURL *fileURL;
for (BDSKTemplate *aChild in [self children]) {
- if ([[aChild valueForKey:BDSKTemplateRoleKey]
isEqualToString:BDSKTemplateAccessoryKey]) {
+ if ([[aChild valueForKey:BDSKTemplateRoleKey]
isEqualToString:BDSKTemplateAccessoryString]) {
fileURL = [aChild representedFileURL];
if (fileURL)
[fileURLs addObject:fileURL];
@@ -664,7 +667,7 @@
- (NSURL *)scriptURL;
{
BDSKASSERT([self parent] == nil);
- return [[self childForRole:BDSKTemplateScriptKey] representedFileURL];
+ return [[self childForRole:BDSKTemplateScriptString] representedFileURL];
}
- (BOOL)addChildWithURL:(NSURL *)fileURL role:(NSString *)role;
@@ -702,14 +705,14 @@
if (data) {
NSString *name = [aURL lastPathComponent];
- [self setValue:data forKey:BDSKTemplateBookmarkString];
- [self setValue:nil forKey:BDSKTemplateAliasString];
+ [self setValue:data forKey:BDSKTemplateBookmarkKey];
+ [self setValue:nil forKey:BDSKTemplateAliasKey];
- [self setValue:[[aURL path] stringByAbbreviatingWithTildeInPath]
forKey:BDSKTemplateFilePathString];
+ [self setValue:[[aURL path] stringByAbbreviatingWithTildeInPath]
forKey:BDSKTemplateFilePathKey];
[self setValue:name forKey:BDSKTemplateNameKey];
- if ([[self valueForKey:BDSKTemplateRoleKey]
isEqualToString:BDSKTemplateMainPageKey]) {
+ if ([[self valueForKey:BDSKTemplateRoleKey]
isEqualToString:BDSKTemplateMainPageString]) {
if ([[self parent] valueForKey:BDSKTemplateRoleKey] == nil) {
NSString *extension = [aURL pathExtension];
if ([NSString isEmptyString:extension] == NO)
@@ -727,12 +730,12 @@
- (NSURL *)representedFileURL;
{
BDSKASSERT([self isLeaf]);
- NSData *aliasData = [self valueForKey:BDSKTemplateAliasString];
- NSData *bmData = [self valueForKey:BDSKTemplateBookmarkString];
+ NSData *aliasData = [self valueForKey:BDSKTemplateAliasKey];
+ NSData *bmData = [self valueForKey:BDSKTemplateBookmarkKey];
NSURL *theURL = [NSURL fileURLWithAliasData:aliasData bookmarkData:bmData];
BOOL wantsReset = NO;
if (theURL == nil) {
- NSString *path = [[self valueForKey:BDSKTemplateFilePathString]
stringByExpandingTildeInPath];
+ NSString *path = [[self valueForKey:BDSKTemplateFilePathKey]
stringByExpandingTildeInPath];
if (path && [[NSFileManager defaultManager] fileExistsAtPath:path]) {
theURL = [NSURL fileURLWithPath:path isDirectory:NO];
wantsReset = YES;
@@ -743,8 +746,8 @@
if (wantsReset) {
bmData = [theURL bookmarkDataWithOptions:0
includingResourceValuesForKeys:nil relativeToURL:nil error:NULL];
if (aliasData) {
- [self setValue:bmData forKey:BDSKTemplateBookmarkString];
- [self setValue:nil forKey:BDSKTemplateAliasString];
+ [self setValue:bmData forKey:BDSKTemplateBookmarkKey];
+ [self setValue:nil forKey:BDSKTemplateAliasKey];
}
}
return theURL;
@@ -753,12 +756,12 @@
- (NSURL *)representedFileURLNoUI;
{
BDSKASSERT([self isLeaf]);
- NSData *aliasData = [self valueForKey:BDSKTemplateAliasString];
- NSData *bmData = [self valueForKey:BDSKTemplateBookmarkString];
+ NSData *aliasData = [self valueForKey:BDSKTemplateAliasKey];
+ NSData *bmData = [self valueForKey:BDSKTemplateBookmarkKey];
NSURL *theURL = [NSURL fileURLNoUIWithAliasData:aliasData
bookmarkData:bmData];
BOOL wantsReset = NO;
if (theURL == nil) {
- NSString *path = [[self valueForKey:BDSKTemplateFilePathString]
stringByExpandingTildeInPath];
+ NSString *path = [[self valueForKey:BDSKTemplateFilePathKey]
stringByExpandingTildeInPath];
if (path && [[NSFileManager defaultManager] fileExistsAtPath:path]) {
theURL = [NSURL fileURLWithPath:path isDirectory:NO];
wantsReset = YES;
@@ -769,8 +772,8 @@
if (wantsReset) {
bmData = [theURL bookmarkDataWithOptions:0
includingResourceValuesForKeys:nil relativeToURL:nil error:NULL];
if (bmData) {
- [self setValue:bmData forKey:BDSKTemplateBookmarkString];
- [self setValue:nil forKey:BDSKTemplateAliasString];
+ [self setValue:bmData forKey:BDSKTemplateBookmarkKey];
+ [self setValue:nil forKey:BDSKTemplateAliasKey];
}
}
return theURL;
Modified: trunk/bibdesk/BDSKTemplateObjectProxy.m
===================================================================
--- trunk/bibdesk/BDSKTemplateObjectProxy.m 2025-11-13 23:08:51 UTC (rev
29795)
+++ trunk/bibdesk/BDSKTemplateObjectProxy.m 2025-11-14 10:14:19 UTC (rev
29796)
@@ -140,11 +140,11 @@
if ([template templateURLForType:[pub pubType]]) {
parsedTemplate = [BDSKTemplateParser
arrayByParsingTemplateString:[template stringForType:[pub pubType]]
isSubtemplate:NO];
} else {
- parsedTemplate = [parsedTemplates
objectForKey:BDSKTemplateDefaultItemKey];
+ parsedTemplate = [parsedTemplates
objectForKey:BDSKTemplateDefaultItemString];
if (parsedTemplate == nil) {
- parsedTemplate = [BDSKTemplateParser
arrayByParsingTemplateString:[template
stringForType:BDSKTemplateDefaultItemKey] isSubtemplate:NO];
+ parsedTemplate = [BDSKTemplateParser
arrayByParsingTemplateString:[template
stringForType:BDSKTemplateDefaultItemString] isSubtemplate:NO];
BDSKPRECONDITION(nil != parsedTemplate);
- [parsedTemplates setObject:parsedTemplate
forKey:BDSKTemplateDefaultItemKey];
+ [parsedTemplates setObject:parsedTemplate
forKey:BDSKTemplateDefaultItemString];
}
}
BDSKPRECONDITION(nil != parsedTemplate);
@@ -167,10 +167,10 @@
if ([template templateURLForType:[pub pubType]]) {
parsedTemplate = [BDSKTemplateParser
arrayByParsingTemplateAttributedString:[template attributedStringForType:[pub
pubType]] isSubtemplate:NO];
} else {
- parsedTemplate = [parsedTemplates
objectForKey:BDSKTemplateDefaultItemKey];
+ parsedTemplate = [parsedTemplates
objectForKey:BDSKTemplateDefaultItemString];
if (parsedTemplate == nil) {
- parsedTemplate = [BDSKTemplateParser
arrayByParsingTemplateAttributedString:[template
attributedStringForType:BDSKTemplateDefaultItemKey] isSubtemplate:NO];
- [parsedTemplates setObject:parsedTemplate
forKey:BDSKTemplateDefaultItemKey];
+ parsedTemplate = [BDSKTemplateParser
arrayByParsingTemplateAttributedString:[template
attributedStringForType:BDSKTemplateDefaultItemString] isSubtemplate:NO];
+ [parsedTemplates setObject:parsedTemplate
forKey:BDSKTemplateDefaultItemString];
}
}
[parsedTemplates setObject:parsedTemplate forKey:[pub
pubType]];
Modified: trunk/bibdesk/BibPref_Export.m
===================================================================
--- trunk/bibdesk/BibPref_Export.m 2025-11-13 23:08:51 UTC (rev 29795)
+++ trunk/bibdesk/BibPref_Export.m 2025-11-14 10:14:19 UTC (rev 29796)
@@ -165,7 +165,7 @@
// each style needs at least a Main Page child, and newNode will
be recognized as a non-leaf node
BDSKTemplate *child = [[BDSKTemplate alloc] init];
- [child setValue:BDSKTemplateMainPageKey
forKey:BDSKTemplateRoleKey];
+ [child setValue:BDSKTemplateMainPageString
forKey:BDSKTemplateRoleKey];
[[newNode mutableArrayValueForKey:@"children"] addObject:child];
// reload so we can expand this new parent node
@@ -250,7 +250,7 @@
[(NSComboBox *)textField removeAllItems];
[(NSComboBox *)textField addItemsWithObjectValues:([item isLeaf]) ?
roles : fileTypes];
[textField setEnabled:(templatePrefList == BDSKTemplateListExport &&
- ([item isLeaf] == NO || [[item valueForKey:BDSKTemplateRoleKey]
isEqualToString:BDSKTemplateMainPageKey] == NO))];
+ ([item isLeaf] == NO || [[item valueForKey:BDSKTemplateRoleKey]
isEqualToString:BDSKTemplateMainPageString] == NO))];
[textField setPlaceholderString:[item isLeaf] ?
NSLocalizedString(@"Choose role", @"Default text for template role") :
NSLocalizedString(@"Choose file type", @"Default text for template type")];
} else if ([columnID isEqualToString:BDSKTemplateNameKey]) {
[textField setEditable:(templatePrefList == BDSKTemplateListExport &&
[item isLeaf] == NO)];
@@ -300,7 +300,7 @@
id item = [outlineView itemAtRow:row];
NSString *role = [BDSKTemplate unlocalizedRoleString:[sender objectValue]];
- if ([item isLeaf] && [role isEqualToString:BDSKTemplateAccessoryKey] == NO
&& [(BDSKTemplate *)[item parent] childForRole:role] != nil) {
+ if ([item isLeaf] && [role isEqualToString:BDSKTemplateAccessoryString] ==
NO && [(BDSKTemplate *)[item parent] childForRole:role] != nil) {
[outlineView reloadDataForRowIndexes:[NSIndexSet
indexSetWithIndex:row] columnIndexes:[NSIndexSet indexSetWithIndex:1]];
} else if (role != nil) { // object can be nil when a NSComboBoxCell is
edited while the options are shown, looks like an AppKit bug
[item setValue:role forKey:BDSKTemplateRoleKey];
@@ -315,7 +315,7 @@
- (BOOL)canDeleteItem:(BDSKTreeNode *)item
{
return ((templatePrefList == BDSKTemplateListExport && [item isLeaf] ==
NO) ||
- ([item isLeaf] && [[item valueForKey:BDSKTemplateRoleKey]
isEqualToString:BDSKTemplateMainPageKey] == NO));
+ ([item isLeaf] && [[item valueForKey:BDSKTemplateRoleKey]
isEqualToString:BDSKTemplateMainPageString] == NO));
}
- (BOOL)canDeleteSelectedItem
@@ -362,7 +362,7 @@
#pragma mark Drag / drop
- (id<NSPasteboardWriting>)outlineView:(NSOutlineView *)ov
pasteboardWriterForItem:(id)item {
- if ([item isLeaf] == NO || [[item valueForKey:BDSKTemplateRoleKey]
isEqualToString:BDSKTemplateMainPageKey] == NO) {
+ if ([item isLeaf] == NO || [[item valueForKey:BDSKTemplateRoleKey]
isEqualToString:BDSKTemplateMainPageString] == NO) {
draggedTemplate = item;
NSPasteboardItem *pbItem = [[NSPasteboardItem alloc] init];
[pbItem setData:[NSData data] forType:BDSKPasteboardTypeTemplateRows];
@@ -427,7 +427,7 @@
id childNode = [[BDSKTemplate alloc] init];
[itemNodes insertObject:newNode atIndex:idx++];
[[newNode mutableArrayValueForKey:@"children"]
addObject:childNode];
- [childNode setValue:BDSKTemplateMainPageKey
forKey:BDSKTemplateRoleKey];
+ [childNode setValue:BDSKTemplateMainPageString
forKey:BDSKTemplateRoleKey];
fileURL = [fileURLs objectAtIndex:0];
if ([fileURL isFileReferenceURL])
fileURL = [fileURL filePathURL];
@@ -457,7 +457,7 @@
}
childNode = [[BDSKTemplate alloc] init];
if (mainIndex == -1 || i == mainIndex) {
- [childNode setValue:BDSKTemplateMainPageKey
forKey:BDSKTemplateRoleKey];
+ [childNode setValue:BDSKTemplateMainPageString
forKey:BDSKTemplateRoleKey];
[addedNode insertObject:childNode
inChildrenAtIndex:0];
} else {
[[addedNode mutableArrayValueForKey:@"children"]
addObject:childNode];
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
