Revision: 27575
http://sourceforge.net/p/bibdesk/svn/27575
Author: hofman
Date: 2022-06-07 14:09:47 +0000 (Tue, 07 Jun 2022)
Log Message:
-----------
add sets to type manager for title and collection fields
Modified Paths:
--------------
trunk/bibdesk/BDSKEditor.m
trunk/bibdesk/BDSKTypeManager.h
trunk/bibdesk/BDSKTypeManager.m
trunk/bibdesk/BibDocument_UI.m
Modified: trunk/bibdesk/BDSKEditor.m
===================================================================
--- trunk/bibdesk/BDSKEditor.m 2022-06-07 09:33:04 UTC (rev 27574)
+++ trunk/bibdesk/BDSKEditor.m 2022-06-07 14:09:47 UTC (rev 27575)
@@ -2538,7 +2538,7 @@
else if([changeKey isEqualToString:BDSKColorString] == NO){
// this is a normal field displayed in the tableView
- if([changeKey isEqualToString:BDSKTitleString] || [changeKey
isEqualToString:BDSKChapterString] || [changeKey
isEqualToString:BDSKPagesString] ||
+ if([changeKey isTitleField] ||
([[NSUserDefaults standardUserDefaults]
boolForKey:BDSKUseLocalUrlAndUrlKey] && [changeKey
isEqualToString:BDSKLocalUrlString]))
[self synchronizeWindowTitleWithDocumentName];
else if([changeKey isPersonField])
Modified: trunk/bibdesk/BDSKTypeManager.h
===================================================================
--- trunk/bibdesk/BDSKTypeManager.h 2022-06-07 09:33:04 UTC (rev 27574)
+++ trunk/bibdesk/BDSKTypeManager.h 2022-06-07 14:09:47 UTC (rev 27575)
@@ -90,6 +90,8 @@
NSSet *personFieldsSet;
NSSet *noteFieldsSet;
NSSet *numericFieldsSet;
+ NSSet *titleFieldsSet;
+ NSSet *containerFieldsSet;
NSSet *singleValuedGroupFieldsSet;
NSSet *invalidGroupFieldsSet;
@@ -127,6 +129,8 @@
@property (nonatomic, readonly) NSSet *integerFieldsSet;
@property (nonatomic, readonly) NSSet *citationFieldsSet;
@property (nonatomic, readonly) NSSet *numericFieldsSet;
+@property (nonatomic, readonly) NSSet *titleFieldsSet;
+@property (nonatomic, readonly) NSSet *containerFieldsSet;
@property (nonatomic, readonly) NSSet *invalidGroupFieldsSet;
@property (nonatomic, readonly) NSSet *singleValuedGroupFieldsSet;
@property (nonatomic, readonly) NSSet *allFieldsSet;
@@ -202,6 +206,8 @@
- (BOOL)isCitationField;
- (BOOL)isNoteField;
- (BOOL)isNumericField;
+- (BOOL)isTitleField;
+- (BOOL)isContainerField;
// isSingleValuedField checks invalid group fields and single valued group
fields; single valuedGroupFields doesn't include the invalid ones, which are
single valued as well
- (BOOL)isSingleValuedField;
- (BOOL)isInvalidGroupField;
Modified: trunk/bibdesk/BDSKTypeManager.m
===================================================================
--- trunk/bibdesk/BDSKTypeManager.m 2022-06-07 09:33:04 UTC (rev 27574)
+++ trunk/bibdesk/BDSKTypeManager.m 2022-06-07 14:09:47 UTC (rev 27575)
@@ -97,7 +97,7 @@
@implementation BDSKTypeManager
-@synthesize fieldsForTypesDict, types, defaultFieldsForTypes, defaultTypes,
localFileFieldsSet, remoteURLFieldsSet, allURLFieldsSet, noteFieldsSet,
numericFieldsSet, personFieldsSet, booleanFieldsSet, triStateFieldsSet,
ratingFieldsSet, integerFieldsSet, citationFieldsSet, invalidGroupFieldsSet,
singleValuedGroupFieldsSet, allFieldsSet, requiredFieldsForCiteKey,
requiredFieldsForLocalFile, invalidFieldNameCharacterSet=invalidCiteKeyCharSet,
fragileCiteKeyCharacterSet=fragileCiteKeyCharSet;
+@synthesize fieldsForTypesDict, types, defaultFieldsForTypes, defaultTypes,
localFileFieldsSet, remoteURLFieldsSet, allURLFieldsSet, noteFieldsSet,
numericFieldsSet, titleFieldsSet, containerFieldsSet, personFieldsSet,
booleanFieldsSet, triStateFieldsSet, ratingFieldsSet, integerFieldsSet,
citationFieldsSet, invalidGroupFieldsSet, singleValuedGroupFieldsSet,
allFieldsSet, requiredFieldsForCiteKey, requiredFieldsForLocalFile,
invalidFieldNameCharacterSet=invalidCiteKeyCharSet,
fragileCiteKeyCharacterSet=fragileCiteKeyCharSet;
static BDSKTypeManager *sharedManager = nil;
@@ -148,7 +148,9 @@
bibTeXTypeForHCiteTypeDict = [[typeInfoDict
objectForKey:BIBTEX_TYPES_FOR_HCITE_TYPES_KEY] copy];
noteFieldsSet = [[NSSet alloc] initWithObjects:BDSKAnnoteString,
BDSKAbstractString, BDSKRssDescriptionString, nil];
- numericFieldsSet = [[NSSet alloc]
initWithObjects:BDSKYearString, BDSKVolumeString, BDSKNumberString,
BDSKPagesString, nil];
+ numericFieldsSet = [[NSSet alloc] initWithObjects:BDSKYearString,
BDSKVolumeString, BDSKNumberString, BDSKPagesString, nil];
+ titleFieldsSet = [[NSSet alloc] initWithObjects:BDSKTitleString,
BDSKChapterString, BDSKPagesString, BDSKPubTypeString, nil];
+ containerFieldsSet = [[NSSet alloc] initWithObjects:BDSKTitleString,
BDSKBooktitleString, BDSKJournalString, BDSKVolumeString, BDSKSeriesString,
BDSKPubTypeString, nil];
[self reloadFieldSets];
@@ -551,6 +553,8 @@
- (BOOL)isPersonField { return [[[BDSKTypeManager sharedManager]
personFieldsSet] containsObject:self]; }
- (BOOL)isNoteField { return [[[BDSKTypeManager sharedManager] noteFieldsSet]
containsObject:self]; }
- (BOOL)isNumericField { return [[[BDSKTypeManager sharedManager]
numericFieldsSet] containsObject:self]; }
+- (BOOL)isTitleField { return [[[BDSKTypeManager sharedManager]
titleFieldsSet] containsObject:self]; }
+- (BOOL)isContainerField { return [[[BDSKTypeManager sharedManager]
containerFieldsSet] containsObject:self]; }
- (BOOL)isSingleValuedGroupField { return [[[BDSKTypeManager sharedManager]
singleValuedGroupFieldsSet] containsObject:self]; }
- (BOOL)isSingleValuedField { return [self isSingleValuedGroupField] || [self
isInvalidGroupField]; }
- (BOOL)isInvalidGroupField { return [[[BDSKTypeManager sharedManager]
invalidGroupFieldsSet] containsObject:self]; }
Modified: trunk/bibdesk/BibDocument_UI.m
===================================================================
--- trunk/bibdesk/BibDocument_UI.m 2022-06-07 09:33:04 UTC (rev 27574)
+++ trunk/bibdesk/BibDocument_UI.m 2022-06-07 14:09:47 UTC (rev 27575)
@@ -1303,7 +1303,7 @@
if (key == nil)
return YES;
else if([aSortKey isEqualToString:BDSKTitleString])
- return [key isEqualToString:BDSKTitleString] || [key
isEqualToString:BDSKChapterString] || [key isEqualToString:BDSKPagesString] ||
[key isEqualToString:BDSKPubTypeString];
+ return [key isTitleField];
else if([aSortKey isEqualToString:BDSKContainerString])
return [key isEqualToString:BDSKJournalString] || [key
isEqualToString:BDSKBooktitleString] || [key isEqualToString:BDSKVolumeString]
|| [key isEqualToString:BDSKSeriesString] || [key
isEqualToString:BDSKPubTypeString];
else if([aSortKey isEqualToString:BDSKPubDateString])
@@ -1328,7 +1328,7 @@
else if ([searchKey isEqualToString:BDSKPersonString])
return [key isPersonField];
else if ([searchKey isEqualToString:BDSKTitleString])
- return [key isEqualToString:BDSKTitleString] || [key
isEqualToString:BDSKTitleString] || [key isEqualToString:BDSKChapterString] ||
[key isEqualToString:BDSKPagesString] || [key
isEqualToString:BDSKPubTypeString];
+ return [key isTitleField];
else if ([searchKey isEqualToString:BDSKContainerString])
return [key isEqualToString:BDSKJournalString] || [key
isEqualToString:BDSKBooktitleString] || [key isEqualToString:BDSKVolumeString]
|| [key isEqualToString:BDSKSeriesString] || [key
isEqualToString:BDSKPubTypeString];
else
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
