Revision: 29852
http://sourceforge.net/p/bibdesk/svn/29852
Author: hofman
Date: 2025-11-19 16:27:54 +0000 (Wed, 19 Nov 2025)
Log Message:
-----------
rename 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-19 15:52:31 UTC (rev 29851)
+++ trunk/bibdesk/BDSKTemplate.h 2025-11-19 16:27:54 UTC (rev 29852)
@@ -59,10 +59,10 @@
extern NSString * const BDSKTemplateRoleKey;
extern NSString * const BDSKTemplateNameKey;
extern NSString * const BDSKTemplateFileURLKey;
-extern NSString * const BDSKTemplateAccessoryString;
-extern NSString * const BDSKTemplateMainPageString;
-extern NSString * const BDSKTemplateDefaultItemString;
-extern NSString * const BDSKTemplateScriptString;
+extern NSString * const BDSKTemplateRoleAccessory;
+extern NSString * const BDSKTemplateRoleMainPage;
+extern NSString * const BDSKTemplateRoleeDefaultItem;
+extern NSString * const BDSKTemplateRoleScript;
// concrete subclass with specific accessors for the template tree
@interface BDSKTemplate : BDSKTreeNode
Modified: trunk/bibdesk/BDSKTemplate.m
===================================================================
--- trunk/bibdesk/BDSKTemplate.m 2025-11-19 15:52:31 UTC (rev 29851)
+++ trunk/bibdesk/BDSKTemplate.m 2025-11-19 16:27:54 UTC (rev 29852)
@@ -53,14 +53,13 @@
static NSString * const BDSKTemplateBookmarkKey = @"bookmark";
static NSString * const BDSKTemplateFilePathKey = @"filePath";
static NSString * const BDSKTemplateStringKey = @"string";
+static NSString * const BDSKTemplateAttributedStringKey = @"attributedString";
-NSString * const BDSKTemplateAccessoryString = @"Accessory File";
-NSString * const BDSKTemplateMainPageString = @"Main Page";
-NSString * const BDSKTemplateDefaultItemString = @"Default Item";
-NSString * const BDSKTemplateScriptString = @"Postprocess Script";
+NSString * const BDSKTemplateRoleAccessory = @"Accessory File";
+NSString * const BDSKTemplateRoleMainPage = @"Main Page";
+NSString * const BDSKTemplateRoleeDefaultItem = @"Default Item";
+NSString * const BDSKTemplateRoleScript = @"Postprocess Script";
-static NSString * const BDSKTemplateAttributedStringKey = @"attributedString";
-
static NSString * const BDSKExportTemplateTreeKey = @"BDSKExportTemplateTree";
static NSString * const BDSKServiceTemplateTreeKey =
@"BDSKServiceTemplateTree";
@@ -165,13 +164,13 @@
}
+ (NSString *)localizedRoleString:(NSString *)string {
- if ([string isEqualToString:BDSKTemplateAccessoryString])
+ if ([string isEqualToString:BDSKTemplateRoleAccessory])
string = [self localizedAccessoryString];
- else if ([string isEqualToString:BDSKTemplateMainPageString])
+ else if ([string isEqualToString:BDSKTemplateRoleMainPage])
string = [self localizedMainPageString];
- else if ([string isEqualToString:BDSKTemplateDefaultItemString])
+ else if ([string isEqualToString:BDSKTemplateRoleeDefaultItem])
string = [self localizedDefaultItemString];
- else if ([string isEqualToString:BDSKTemplateScriptString])
+ else if ([string isEqualToString:BDSKTemplateRoleScript])
string = [self localizedScriptString];
return string;
}
@@ -178,13 +177,13 @@
+ (NSString *)unlocalizedRoleString:(NSString *)string {
if ([string isEqualToString:[self localizedAccessoryString]])
- string = BDSKTemplateAccessoryString;
+ string = BDSKTemplateRoleAccessory;
else if ([string isEqualToString:[self localizedMainPageString]])
- string = BDSKTemplateMainPageString;
+ string = BDSKTemplateRoleMainPage;
else if ([string isEqualToString:[self localizedDefaultItemString]])
- string = BDSKTemplateDefaultItemString;
+ string = BDSKTemplateRoleeDefaultItem;
else if ([string isEqualToString:[self localizedScriptString]])
- string = BDSKTemplateScriptString;
+ string = BDSKTemplateRoleScript;
return string;
}
@@ -213,9 +212,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:BDSKTemplateDefaultItemString];
+ [template addChildWithURL:fileURL role:BDSKTemplateRoleeDefaultItem];
fileURL = [templatesURL
URLByAppendingPathComponent:@"htmlExportStyleSheet.css" isDirectory:NO];
- [template addChildWithURL:fileURL role:BDSKTemplateAccessoryString];
+ [template addChildWithURL:fileURL role:BDSKTemplateRoleAccessory];
[itemNodes addObject:template];
// RSS template
@@ -259,7 +258,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:BDSKTemplateDefaultItemString];
+ [template addChildWithURL:fileURL role:BDSKTemplateRoleeDefaultItem];
fileURL = [templatesURL URLByAppendingPathComponent:@"rtfServiceTemplate
book.rtf" isDirectory:NO];
[template addChildWithURL:fileURL role:BDSKBookString];
[itemNodes addObject:template];
@@ -433,7 +432,7 @@
BDSKTemplate *template = [[BDSKTemplate alloc] init];
[template setValue:name forKey:BDSKTemplateNameKey];
[template setValue:[[fileURL pathExtension] lowercaseString]
forKey:BDSKTemplateRoleKey];
- [template addChildWithURL:fileURL role:BDSKTemplateMainPageString];
+ [template addChildWithURL:fileURL role:BDSKTemplateRoleMainPage];
return template;
}
@@ -522,7 +521,7 @@
} else if ([self valueForKey:BDSKTemplateAttributedStringKey]) {
format = BDSKTemplateFormatRichHTML;
} else {
- NSURL *url = [[self childForRole:BDSKTemplateMainPageString]
representedFileURLNoUI];
+ NSURL *url = [[self childForRole:BDSKTemplateRoleMainPage]
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)
@@ -626,13 +625,13 @@
- (NSURL *)mainPageTemplateURL;
{
BDSKASSERT([self parent] == nil);
- return [self templateURLForType:BDSKTemplateMainPageString];
+ return [self templateURLForType:BDSKTemplateRoleMainPage];
}
- (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:BDSKTemplateMainPageString];
+ BDSKTemplate *mainPage = [self childForRole:BDSKTemplateRoleMainPage];
return [mainPage valueForKey:BDSKTemplateAliasKey] || [mainPage
valueForKey:BDSKTemplateBookmarkKey];
}
@@ -639,7 +638,7 @@
- (NSURL *)defaultItemTemplateURL;
{
BDSKASSERT([self parent] == nil);
- return [self templateURLForType:BDSKTemplateDefaultItemString];
+ return [self templateURLForType:BDSKTemplateRoleeDefaultItem];
}
- (NSURL *)templateURLForType:(NSString *)pubType;
@@ -655,7 +654,7 @@
NSMutableArray *fileURLs = [NSMutableArray array];
NSURL *fileURL;
for (BDSKTemplate *aChild in [self children]) {
- if ([[aChild valueForKey:BDSKTemplateRoleKey]
isEqualToString:BDSKTemplateAccessoryString]) {
+ if ([[aChild valueForKey:BDSKTemplateRoleKey]
isEqualToString:BDSKTemplateRoleAccessory]) {
fileURL = [aChild representedFileURL];
if (fileURL)
[fileURLs addObject:fileURL];
@@ -667,7 +666,7 @@
- (NSURL *)scriptURL;
{
BDSKASSERT([self parent] == nil);
- return [[self childForRole:BDSKTemplateScriptString] representedFileURL];
+ return [[self childForRole:BDSKTemplateRoleScript] representedFileURL];
}
- (BOOL)addChildWithURL:(NSURL *)fileURL role:(NSString *)role;
@@ -712,7 +711,7 @@
[self setValue:name forKey:BDSKTemplateNameKey];
- if ([[self valueForKey:BDSKTemplateRoleKey]
isEqualToString:BDSKTemplateMainPageString]) {
+ if ([[self valueForKey:BDSKTemplateRoleKey]
isEqualToString:BDSKTemplateRoleMainPage]) {
if ([[self parent] valueForKey:BDSKTemplateRoleKey] == nil) {
NSString *extension = [aURL pathExtension];
if ([NSString isEmptyString:extension] == NO)
Modified: trunk/bibdesk/BDSKTemplateObjectProxy.m
===================================================================
--- trunk/bibdesk/BDSKTemplateObjectProxy.m 2025-11-19 15:52:31 UTC (rev
29851)
+++ trunk/bibdesk/BDSKTemplateObjectProxy.m 2025-11-19 16:27:54 UTC (rev
29852)
@@ -140,11 +140,11 @@
if ([template templateURLForType:[pub pubType]]) {
parsedTemplate = [BDSKTemplateParser
arrayByParsingTemplateString:[template stringForType:[pub pubType]]
isSubtemplate:NO];
} else {
- parsedTemplate = [parsedTemplates
objectForKey:BDSKTemplateDefaultItemString];
+ parsedTemplate = [parsedTemplates
objectForKey:BDSKTemplateRoleeDefaultItem];
if (parsedTemplate == nil) {
- parsedTemplate = [BDSKTemplateParser
arrayByParsingTemplateString:[template
stringForType:BDSKTemplateDefaultItemString] isSubtemplate:NO];
+ parsedTemplate = [BDSKTemplateParser
arrayByParsingTemplateString:[template
stringForType:BDSKTemplateRoleeDefaultItem] isSubtemplate:NO];
BDSKPRECONDITION(nil != parsedTemplate);
- [parsedTemplates setObject:parsedTemplate
forKey:BDSKTemplateDefaultItemString];
+ [parsedTemplates setObject:parsedTemplate
forKey:BDSKTemplateRoleeDefaultItem];
}
}
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:BDSKTemplateDefaultItemString];
+ parsedTemplate = [parsedTemplates
objectForKey:BDSKTemplateRoleeDefaultItem];
if (parsedTemplate == nil) {
- parsedTemplate = [BDSKTemplateParser
arrayByParsingTemplateAttributedString:[template
attributedStringForType:BDSKTemplateDefaultItemString] isSubtemplate:NO];
- [parsedTemplates setObject:parsedTemplate
forKey:BDSKTemplateDefaultItemString];
+ parsedTemplate = [BDSKTemplateParser
arrayByParsingTemplateAttributedString:[template
attributedStringForType:BDSKTemplateRoleeDefaultItem] isSubtemplate:NO];
+ [parsedTemplates setObject:parsedTemplate
forKey:BDSKTemplateRoleeDefaultItem];
}
}
[parsedTemplates setObject:parsedTemplate forKey:[pub
pubType]];
Modified: trunk/bibdesk/BibPref_Export.m
===================================================================
--- trunk/bibdesk/BibPref_Export.m 2025-11-19 15:52:31 UTC (rev 29851)
+++ trunk/bibdesk/BibPref_Export.m 2025-11-19 16:27:54 UTC (rev 29852)
@@ -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:BDSKTemplateMainPageString
forKey:BDSKTemplateRoleKey];
+ [child setValue:BDSKTemplateRoleMainPage
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:BDSKTemplateMainPageString] == NO))];
+ ([item isLeaf] == NO || [[item valueForKey:BDSKTemplateRoleKey]
isEqualToString:BDSKTemplateRoleMainPage] == 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:BDSKTemplateAccessoryString] ==
NO && [(BDSKTemplate *)[item parent] childForRole:role] != nil) {
+ if ([item isLeaf] && [role isEqualToString:BDSKTemplateRoleAccessory] ==
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:BDSKTemplateMainPageString] == NO));
+ ([item isLeaf] && [[item valueForKey:BDSKTemplateRoleKey]
isEqualToString:BDSKTemplateRoleMainPage] == 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:BDSKTemplateMainPageString] == NO) {
+ if ([item isLeaf] == NO || [[item valueForKey:BDSKTemplateRoleKey]
isEqualToString:BDSKTemplateRoleMainPage] == 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:BDSKTemplateMainPageString
forKey:BDSKTemplateRoleKey];
+ [childNode setValue:BDSKTemplateRoleMainPage
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:BDSKTemplateMainPageString
forKey:BDSKTemplateRoleKey];
+ [childNode setValue:BDSKTemplateRoleMainPage
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
