Revision: 29780
http://sourceforge.net/p/bibdesk/svn/29780
Author: hofman
Date: 2025-11-10 15:08:01 +0000 (Mon, 10 Nov 2025)
Log Message:
-----------
rename some string constants, use typedefed string
Modified Paths:
--------------
trunk/bibdesk/BDSKStringConstants.h
trunk/bibdesk/BDSKStringConstants.m
trunk/bibdesk/BDSKTemplate.h
trunk/bibdesk/BDSKTemplate.m
trunk/bibdesk/BDSKTemplateObjectProxy.m
trunk/bibdesk/BibPref_Export.m
Modified: trunk/bibdesk/BDSKStringConstants.h
===================================================================
--- trunk/bibdesk/BDSKStringConstants.h 2025-11-10 10:30:10 UTC (rev 29779)
+++ trunk/bibdesk/BDSKStringConstants.h 2025-11-10 15:08:01 UTC (rev 29780)
@@ -326,6 +326,6 @@
#pragma mark Exception name strings
-extern NSString * const BDSKUnimplementedException;
+extern NSExceptionName const BDSKUnimplementedException;
NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKStringConstants.m
===================================================================
--- trunk/bibdesk/BDSKStringConstants.m 2025-11-10 10:30:10 UTC (rev 29779)
+++ trunk/bibdesk/BDSKStringConstants.m 2025-11-10 15:08:01 UTC (rev 29780)
@@ -336,7 +336,7 @@
#pragma mark Exception name strings
-NSString * const BDSKUnimplementedException = @"BDSKUnimplementedException";
+NSExceptionName const BDSKUnimplementedException =
@"BDSKUnimplementedException";
/*
Modified: trunk/bibdesk/BDSKTemplate.h
===================================================================
--- trunk/bibdesk/BDSKTemplate.h 2025-11-10 10:30:10 UTC (rev 29779)
+++ trunk/bibdesk/BDSKTemplate.h 2025-11-10 15:08:01 UTC (rev 29780)
@@ -56,13 +56,13 @@
BDSKTemplateFormatRichText = BDSKTemplateFormatRichHTML |
BDSKTemplateFormatRTF | BDSKTemplateFormatRTFD | BDSKTemplateFormatDoc |
BDSKTemplateFormatDocx | BDSKTemplateFormatOdt | BDSKTemplateFormatWebArchive
// Any rich text template
};
-extern NSString * const BDSKTemplateRoleString;
-extern NSString * const BDSKTemplateNameString;
-extern NSString * const BDSKTemplateFileURLString;
-extern NSString * const BDSKTemplateAccessoryString;
-extern NSString * const BDSKTemplateMainPageString;
-extern NSString * const BDSKTemplateDefaultItemString;
-extern NSString * const BDSKTemplateScriptString;
+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;
// concrete subclass with specific accessors for the template tree
@interface BDSKTemplate : BDSKTreeNode
Modified: trunk/bibdesk/BDSKTemplate.m
===================================================================
--- trunk/bibdesk/BDSKTemplate.m 2025-11-10 10:30:10 UTC (rev 29779)
+++ trunk/bibdesk/BDSKTemplate.m 2025-11-10 15:08:01 UTC (rev 29780)
@@ -45,18 +45,18 @@
#import "BDSKStringConstants.h"
// do not localized these strings
-NSString * const BDSKTemplateRoleString = @"role";
-NSString * const BDSKTemplateNameString = @"name";
-NSString * const BDSKTemplateFileURLString = @"representedFileURL";
+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 BDSKTemplateAccessoryString = @"Accessory File";
-NSString * const BDSKTemplateMainPageString = @"Main Page";
-NSString * const BDSKTemplateDefaultItemString = @"Default Item";
-NSString * const BDSKTemplateScriptString = @"Postprocess Script";
+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";
@@ -162,13 +162,13 @@
}
+ (NSString *)localizedRoleString:(NSString *)string {
- if ([string isEqualToString:BDSKTemplateAccessoryString])
+ if ([string isEqualToString:BDSKTemplateAccessoryKey])
string = [self localizedAccessoryString];
- else if ([string isEqualToString:BDSKTemplateMainPageString])
+ else if ([string isEqualToString:BDSKTemplateMainPageKey])
string = [self localizedMainPageString];
- else if ([string isEqualToString:BDSKTemplateDefaultItemString])
+ else if ([string isEqualToString:BDSKTemplateDefaultItemKey])
string = [self localizedDefaultItemString];
- else if ([string isEqualToString:BDSKTemplateScriptString])
+ else if ([string isEqualToString:BDSKTemplateScriptKey])
string = [self localizedScriptString];
return string;
}
@@ -175,13 +175,13 @@
+ (NSString *)unlocalizedRoleString:(NSString *)string {
if ([string isEqualToString:[self localizedAccessoryString]])
- string = BDSKTemplateAccessoryString;
+ string = BDSKTemplateAccessoryKey;
else if ([string isEqualToString:[self localizedMainPageString]])
- string = BDSKTemplateMainPageString;
+ string = BDSKTemplateMainPageKey;
else if ([string isEqualToString:[self localizedDefaultItemString]])
- string = BDSKTemplateDefaultItemString;
+ string = BDSKTemplateDefaultItemKey;
else if ([string isEqualToString:[self localizedScriptString]])
- string = BDSKTemplateScriptString;
+ string = BDSKTemplateScriptKey;
return string;
}
@@ -210,9 +210,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:BDSKTemplateDefaultItemKey];
fileURL = [templatesURL
URLByAppendingPathComponent:@"htmlExportStyleSheet.css" isDirectory:NO];
- [template addChildWithURL:fileURL role:BDSKTemplateAccessoryString];
+ [template addChildWithURL:fileURL role:BDSKTemplateAccessoryKey];
[itemNodes addObject:template];
// RSS template
@@ -254,9 +254,9 @@
// RTF template
fileURL = [templatesURL
URLByAppendingPathComponent:@"rtfServiceTemplate.rtf" isDirectory:NO];
template = [BDSKTemplate templateWithName:NSLocalizedString(@"RTF Service
template", @"template name") mainPageURL:fileURL];
- [template setValue:NSLocalizedString(@"RTF Service template", @"template
name") forKey:BDSKTemplateNameString];
+ [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:BDSKTemplateDefaultItemKey];
fileURL = [templatesURL URLByAppendingPathComponent:@"rtfServiceTemplate
book.rtf" isDirectory:NO];
[template addChildWithURL:fileURL role:BDSKBookString];
[itemNodes addObject:template];
@@ -337,7 +337,7 @@
__block NSUInteger idx = 0;
[templates enumerateObjectsUsingBlock:^(BDSKTemplate *template, NSUInteger
i, BOOL *stop){
- NSString *name = [template valueForKey:BDSKTemplateNameString];
+ NSString *name = [template valueForKey:BDSKTemplateNameKey];
if ([name isEqualToString:defaultName]) {
idx = NSNotFound;
*stop = YES;
@@ -365,7 +365,7 @@
NSString *name;
for (id aNode in [self exportTemplates]) {
if ([aNode isLeaf] == NO && [aNode hasMainPageTemplateURL]) {
- name = [aNode valueForKey:BDSKTemplateNameString];
+ name = [aNode valueForKey:BDSKTemplateNameKey];
if(name != nil)
[names addObject:name];
}
@@ -379,7 +379,7 @@
NSString *name;
for (id aNode in [self exportTemplates]) {
if ([aNode isLeaf] == NO && [aNode hasMainPageTemplateURL]) {
- name = [aNode valueForKey:BDSKTemplateNameString];
+ name = [aNode valueForKey:BDSKTemplateNameKey];
if (name != nil && ([aNode templateFormatNoUI] & format))
[names addObject:name];
}
@@ -392,8 +392,8 @@
NSString *name;
for (id aNode in [self exportTemplates]) {
if ([aNode isLeaf] == NO && [aNode hasMainPageTemplateURL]) {
- name = [aNode valueForKey:BDSKTemplateNameString];
- if (name != nil && [fileType isCaseInsensitiveEqual:[aNode
valueForKey:BDSKTemplateRoleString]])
+ name = [aNode valueForKey:BDSKTemplateNameKey];
+ if (name != nil && [fileType isCaseInsensitiveEqual:[aNode
valueForKey:BDSKTemplateRoleKey]])
return name;
}
}
@@ -404,7 +404,7 @@
+ (BDSKTemplate *)templateForStyle:(NSString *)styleName;
{
for (id aNode in [self exportTemplates]) {
- if (NO == [aNode isLeaf] && [[aNode
valueForKey:BDSKTemplateNameString] isEqualToString:styleName])
+ if (NO == [aNode isLeaf] && [[aNode valueForKey:BDSKTemplateNameKey]
isEqualToString:styleName])
return aNode;
}
return nil;
@@ -428,9 +428,9 @@
+ (BDSKTemplate *)templateWithName:(NSString *)name mainPageURL:(NSURL
*)fileURL;
{
BDSKTemplate *template = [[BDSKTemplate alloc] init];
- [template setValue:name forKey:BDSKTemplateNameString];
- [template setValue:[[fileURL pathExtension] lowercaseString]
forKey:BDSKTemplateRoleString];
- [template addChildWithURL:fileURL role:BDSKTemplateMainPageString];
+ [template setValue:name forKey:BDSKTemplateNameKey];
+ [template setValue:[[fileURL pathExtension] lowercaseString]
forKey:BDSKTemplateRoleKey];
+ [template addChildWithURL:fileURL role:BDSKTemplateMainPageKey];
return template;
}
@@ -437,7 +437,7 @@
+ (BDSKTemplate *)templateWithString:(NSString *)string fileType:(NSString
*)fileType;
{
BDSKTemplate *template = [[BDSKTemplate alloc] init];
- [template setValue:fileType forKey:BDSKTemplateRoleString];
+ [template setValue:fileType forKey:BDSKTemplateRoleKey];
[template setValue:string forKey:BDSKTemplateStringString];
return template;
}
@@ -445,7 +445,7 @@
+ (BDSKTemplate *)templateWithAttributedString:(NSAttributedString
*)attributedString fileType:(NSString *)fileType;
{
BDSKTemplate *template = [[BDSKTemplate alloc] init];
- [template setValue:fileType forKey:BDSKTemplateRoleString];
+ [template setValue:fileType forKey:BDSKTemplateRoleKey];
[template setValue:attributedString
forKey:BDSKTemplateAttributedStringString];
return template;
}
@@ -455,7 +455,7 @@
- (BDSKTemplateFormat)templateFormat;
{
BDSKASSERT([self parent] == nil);
- NSString *extension = [[self valueForKey:BDSKTemplateRoleString]
lowercaseString];
+ NSString *extension = [[self valueForKey:BDSKTemplateRoleKey]
lowercaseString];
BDSKTemplateFormat format = BDSKTemplateFormatUnknown;
NSURL *url = nil;
NSString *string = nil;
@@ -495,7 +495,7 @@
- (BDSKTemplateFormat)templateFormatNoUI;
{
BDSKASSERT([self parent] == nil);
- NSString *extension = [[self valueForKey:BDSKTemplateRoleString]
lowercaseString];
+ NSString *extension = [[self valueForKey:BDSKTemplateRoleKey]
lowercaseString];
BDSKTemplateFormat format = BDSKTemplateFormatUnknown;
BOOL isValid = [self hasMainPageTemplateURL] || [self
valueForKey:BDSKTemplateStringString] || [self
valueForKey:BDSKTemplateAttributedStringString];
@@ -519,7 +519,7 @@
} else if ([self valueForKey:BDSKTemplateAttributedStringString]) {
format = BDSKTemplateFormatRichHTML;
} else {
- NSURL *url = [[self childForRole:BDSKTemplateMainPageString]
representedFileURLNoUI];
+ NSURL *url = [[self childForRole:BDSKTemplateMainPageKey]
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)
@@ -558,7 +558,7 @@
- (NSString *)fileExtension;
{
BDSKASSERT([self parent] == nil);
- return [self valueForKey:BDSKTemplateRoleString];
+ return [self valueForKey:BDSKTemplateRoleKey];
}
- (NSString *)mainPageString;
@@ -623,13 +623,13 @@
- (NSURL *)mainPageTemplateURL;
{
BDSKASSERT([self parent] == nil);
- return [self templateURLForType:BDSKTemplateMainPageString];
+ return [self templateURLForType:BDSKTemplateMainPageKey];
}
- (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:BDSKTemplateMainPageKey];
return [mainPage valueForKey:BDSKTemplateAliasString] || [mainPage
valueForKey:BDSKTemplateBookmarkString];
}
@@ -636,7 +636,7 @@
- (NSURL *)defaultItemTemplateURL;
{
BDSKASSERT([self parent] == nil);
- return [self templateURLForType:BDSKTemplateDefaultItemString];
+ return [self templateURLForType:BDSKTemplateDefaultItemKey];
}
- (NSURL *)templateURLForType:(NSString *)pubType;
@@ -652,7 +652,7 @@
NSMutableArray *fileURLs = [NSMutableArray array];
NSURL *fileURL;
for (BDSKTemplate *aChild in [self children]) {
- if ([[aChild valueForKey:BDSKTemplateRoleString]
isEqualToString:BDSKTemplateAccessoryString]) {
+ if ([[aChild valueForKey:BDSKTemplateRoleKey]
isEqualToString:BDSKTemplateAccessoryKey]) {
fileURL = [aChild representedFileURL];
if (fileURL)
[fileURLs addObject:fileURL];
@@ -664,7 +664,7 @@
- (NSURL *)scriptURL;
{
BDSKASSERT([self parent] == nil);
- return [[self childForRole:BDSKTemplateScriptString] representedFileURL];
+ return [[self childForRole:BDSKTemplateScriptKey] representedFileURL];
}
- (BOOL)addChildWithURL:(NSURL *)fileURL role:(NSString *)role;
@@ -673,8 +673,8 @@
retVal = [fileURL checkResourceIsReachableAndReturnError:NULL];
BDSKTemplate *newChild = [[BDSKTemplate alloc] init];
- [newChild setValue:fileURL forKey:BDSKTemplateFileURLString];
- [newChild setValue:role forKey:BDSKTemplateRoleString];
+ [newChild setValue:fileURL forKey:BDSKTemplateFileURLKey];
+ [newChild setValue:role forKey:BDSKTemplateRoleKey];
[self insertObject:newChild inChildrenAtIndex:[self countOfChildren]];
if([newChild representedFileURL] == nil)
retVal = NO;
@@ -688,7 +688,7 @@
// assume roles are unique by grabbing the first one; this works for any
case except the accessory files
for (id aNode in [self children]) {
- if ([[aNode valueForKey:BDSKTemplateRoleString] isEqualToString:role])
+ if ([[aNode valueForKey:BDSKTemplateRoleKey] isEqualToString:role])
return aNode;
}
return nil;
@@ -707,18 +707,18 @@
[self setValue:[[aURL path] stringByAbbreviatingWithTildeInPath]
forKey:BDSKTemplateFilePathString];
- [self setValue:name forKey:BDSKTemplateNameString];
+ [self setValue:name forKey:BDSKTemplateNameKey];
- if ([[self valueForKey:BDSKTemplateRoleString]
isEqualToString:BDSKTemplateMainPageString]) {
- if ([[self parent] valueForKey:BDSKTemplateRoleString] == nil) {
+ if ([[self valueForKey:BDSKTemplateRoleKey]
isEqualToString:BDSKTemplateMainPageKey]) {
+ if ([[self parent] valueForKey:BDSKTemplateRoleKey] == nil) {
NSString *extension = [aURL pathExtension];
if ([NSString isEmptyString:extension] == NO)
- [[self parent] setValue:extension
forKey:BDSKTemplateRoleString];
+ [[self parent] setValue:extension
forKey:BDSKTemplateRoleKey];
}
- if ([[self parent] valueForKey:BDSKTemplateNameString] == nil) {
+ if ([[self parent] valueForKey:BDSKTemplateNameKey] == nil) {
name = [name stringByDeletingPathExtension];
if ([NSString isEmptyString:name] == NO)
- [[self parent] setValue:name
forKey:BDSKTemplateNameString];
+ [[self parent] setValue:name forKey:BDSKTemplateNameKey];
}
}
}
Modified: trunk/bibdesk/BDSKTemplateObjectProxy.m
===================================================================
--- trunk/bibdesk/BDSKTemplateObjectProxy.m 2025-11-10 10:30:10 UTC (rev
29779)
+++ trunk/bibdesk/BDSKTemplateObjectProxy.m 2025-11-10 15:08:01 UTC (rev
29780)
@@ -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:BDSKTemplateDefaultItemKey];
if (parsedTemplate == nil) {
- parsedTemplate = [BDSKTemplateParser
arrayByParsingTemplateString:[template
stringForType:BDSKTemplateDefaultItemString] isSubtemplate:NO];
+ parsedTemplate = [BDSKTemplateParser
arrayByParsingTemplateString:[template
stringForType:BDSKTemplateDefaultItemKey] isSubtemplate:NO];
BDSKPRECONDITION(nil != parsedTemplate);
- [parsedTemplates setObject:parsedTemplate
forKey:BDSKTemplateDefaultItemString];
+ [parsedTemplates setObject:parsedTemplate
forKey:BDSKTemplateDefaultItemKey];
}
}
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:BDSKTemplateDefaultItemKey];
if (parsedTemplate == nil) {
- parsedTemplate = [BDSKTemplateParser
arrayByParsingTemplateAttributedString:[template
attributedStringForType:BDSKTemplateDefaultItemString] isSubtemplate:NO];
- [parsedTemplates setObject:parsedTemplate
forKey:BDSKTemplateDefaultItemString];
+ parsedTemplate = [BDSKTemplateParser
arrayByParsingTemplateAttributedString:[template
attributedStringForType:BDSKTemplateDefaultItemKey] isSubtemplate:NO];
+ [parsedTemplates setObject:parsedTemplate
forKey:BDSKTemplateDefaultItemKey];
}
}
[parsedTemplates setObject:parsedTemplate forKey:[pub
pubType]];
Modified: trunk/bibdesk/BibPref_Export.m
===================================================================
--- trunk/bibdesk/BibPref_Export.m 2025-11-10 10:30:10 UTC (rev 29779)
+++ trunk/bibdesk/BibPref_Export.m 2025-11-10 15:08:01 UTC (rev 29780)
@@ -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:BDSKTemplateRoleString];
+ [child setValue:BDSKTemplateMainPageKey
forKey:BDSKTemplateRoleKey];
[[newNode mutableArrayValueForKey:@"children"] addObject:child];
// reload so we can expand this new parent node
@@ -229,7 +229,7 @@
NSString *columnID = [tableColumn identifier];
id value = [item valueForKey:columnID];
- if ([columnID isEqualToString:BDSKTemplateRoleString])
+ if ([columnID isEqualToString:BDSKTemplateRoleKey])
value = [BDSKTemplate localizedRoleString:value];
[textField setObjectValue:value];
@@ -246,13 +246,13 @@
[textField setTextColor:color];
[textField setFont:font];
- if ([columnID isEqualToString:BDSKTemplateRoleString]) {
+ if ([columnID isEqualToString:BDSKTemplateRoleKey]) {
[(NSComboBox *)textField removeAllItems];
[(NSComboBox *)textField addItemsWithObjectValues:([item isLeaf]) ?
roles : fileTypes];
[textField setEnabled:(templatePrefList == BDSKTemplateListExport &&
- ([item isLeaf] == NO || [[item valueForKey:BDSKTemplateRoleString]
isEqualToString:BDSKTemplateMainPageString] == NO))];
+ ([item isLeaf] == NO || [[item valueForKey:BDSKTemplateRoleKey]
isEqualToString:BDSKTemplateMainPageKey] == 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:BDSKTemplateNameString]) {
+ } else if ([columnID isEqualToString:BDSKTemplateNameKey]) {
[textField setEditable:(templatePrefList == BDSKTemplateListExport &&
[item isLeaf] == NO)];
[textField setPlaceholderString:[item isLeaf] ?
NSLocalizedString(@"Double-click to choose file", @"Default text for template
file") : NSLocalizedString(@"Click twice to change name", @"Default text for
template name")];
if ([item isLeaf])
@@ -271,7 +271,7 @@
NSString *columnID = [[[outlineView tableColumns]
objectAtIndex:column] identifier];
BDSKTemplate *node = [outlineView itemAtRow:row];
- if ([node isLeaf] && [columnID isEqualToString:BDSKTemplateNameString])
+ if ([node isLeaf] && [columnID isEqualToString:BDSKTemplateNameKey])
[self chooseFile:nil];
}
}
@@ -283,12 +283,12 @@
id item = [outlineView itemAtRow:row];
NSString *name = [sender objectValue];
- NSString *oldName = [item valueForKey:BDSKTemplateNameString];
+ NSString *oldName = [item valueForKey:BDSKTemplateNameKey];
if ([name isEqualToString:oldName])
return;
- [item setValue:name forKey:BDSKTemplateNameString];
+ [item setValue:name forKey:BDSKTemplateNameKey];
[self synchronizePrefs];
}
@@ -300,10 +300,10 @@
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:BDSKTemplateAccessoryKey] == 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:BDSKTemplateRoleString];
+ [item setValue:role forKey:BDSKTemplateRoleKey];
[self synchronizePrefs];
}
}
@@ -315,7 +315,7 @@
- (BOOL)canDeleteItem:(BDSKTreeNode *)item
{
return ((templatePrefList == BDSKTemplateListExport && [item isLeaf] ==
NO) ||
- ([item isLeaf] && [[item valueForKey:BDSKTemplateRoleString]
isEqualToString:BDSKTemplateMainPageString] == NO));
+ ([item isLeaf] && [[item valueForKey:BDSKTemplateRoleKey]
isEqualToString:BDSKTemplateMainPageKey] == 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:BDSKTemplateRoleString]
isEqualToString:BDSKTemplateMainPageString] == NO) {
+ if ([item isLeaf] == NO || [[item valueForKey:BDSKTemplateRoleKey]
isEqualToString:BDSKTemplateMainPageKey] == NO) {
draggedTemplate = item;
NSPasteboardItem *pbItem = [[NSPasteboardItem alloc] init];
[pbItem setData:[NSData data] forType:BDSKPasteboardTypeTemplateRows];
@@ -419,7 +419,7 @@
fileURL = [fileURLs objectAtIndex:0];
if ([fileURL isFileReferenceURL])
fileURL = [fileURL filePathURL];
- [item setValue:fileURL forKey:BDSKTemplateFileURLString];
+ [item setValue:fileURL forKey:BDSKTemplateFileURLKey];
newNode = item;
} else if (item == nil && idx != NSOutlineViewDropOnItemIndex) {
if ([fileURLs count] == 1){
@@ -427,11 +427,11 @@
id childNode = [[BDSKTemplate alloc] init];
[itemNodes insertObject:newNode atIndex:idx++];
[[newNode mutableArrayValueForKey:@"children"]
addObject:childNode];
- [childNode setValue:BDSKTemplateMainPageString
forKey:BDSKTemplateRoleString];
+ [childNode setValue:BDSKTemplateMainPageKey
forKey:BDSKTemplateRoleKey];
fileURL = [fileURLs objectAtIndex:0];
if ([fileURL isFileReferenceURL])
fileURL = [fileURL filePathURL];
- [childNode setValue:fileURL forKey:BDSKTemplateFileURLString];
+ [childNode setValue:fileURL forKey:BDSKTemplateFileURLKey];
} else {
[chooseMainPagePopup removeAllItems];
[chooseMainPagePopup
addItemWithTitle:NSLocalizedString(@"Separate templates", @"Popup menu item
title")];
@@ -457,12 +457,12 @@
}
childNode = [[BDSKTemplate alloc] init];
if (mainIndex == -1 || i == mainIndex) {
- [childNode setValue:BDSKTemplateMainPageString
forKey:BDSKTemplateRoleString];
+ [childNode setValue:BDSKTemplateMainPageKey
forKey:BDSKTemplateRoleKey];
[addedNode insertObject:childNode
inChildrenAtIndex:0];
} else {
[[addedNode mutableArrayValueForKey:@"children"]
addObject:childNode];
}
- [childNode setValue:[fileURLs objectAtIndex:i]
forKey:BDSKTemplateFileURLString];
+ [childNode setValue:[fileURLs objectAtIndex:i]
forKey:BDSKTemplateFileURLKey];
}
[self synchronizePrefs];
@@ -480,7 +480,7 @@
fileURL = [fileURL filePathURL];
newNode = [[BDSKTemplate alloc] init];
[item insertObject:newNode inChildrenAtIndex:idx++];
- [newNode setValue:fileURL forKey:BDSKTemplateFileURLString];
+ [newNode setValue:fileURL forKey:BDSKTemplateFileURLKey];
}
} else return NO;
[self synchronizePrefs];
@@ -594,7 +594,7 @@
NSURL *fileURL = [[openPanel URLs] lastObject];
if(NSModalResponseOK == result && nil != fileURL){
// this will set the name property
- [item setValue:fileURL forKey:BDSKTemplateFileURLString];
+ [item setValue:fileURL forKey:BDSKTemplateFileURLKey];
}
[openPanel orderOut:nil];
[self synchronizePrefs];
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
