Revision: 30067
http://sourceforge.net/p/bibdesk/svn/30067
Author: hofman
Date: 2026-02-26 17:58:04 +0000 (Thu, 26 Feb 2026)
Log Message:
-----------
revert previous commit
Modified Paths:
--------------
trunk/bibdesk/BDSKConditionController.m
trunk/bibdesk/BDSKEditor.m
trunk/bibdesk/BDSKMainTableView.m
trunk/bibdesk/BDSKTemplateDocument.m
trunk/bibdesk/BDSKTextImportController.m
trunk/bibdesk/BDSKTypeManager.m
trunk/bibdesk/BibDocument_Groups.m
trunk/bibdesk/BibDocument_Search.m
Modified: trunk/bibdesk/BDSKConditionController.m
===================================================================
--- trunk/bibdesk/BDSKConditionController.m 2026-02-26 17:43:01 UTC (rev
30066)
+++ trunk/bibdesk/BDSKConditionController.m 2026-02-26 17:58:04 UTC (rev
30067)
@@ -86,7 +86,7 @@
BDSKTypeManager *typeMan = [BDSKTypeManager sharedManager];
keys = [[typeMan allFieldNamesIncluding:@[BDSKDateAddedString,
BDSKDateModifiedString, BDSKAllFieldsString, BDSKPubTypeString,
BDSKAbstractString, BDSKAnnoteString, BDSKRssDescriptionString,
BDSKLocalFileString, BDSKRemoteURLString, BDSKColorLabelString]
- excluding:@[BDSKCrossrefString]] copy];
+ excluding:nil] copy];
}
return self;
}
Modified: trunk/bibdesk/BDSKEditor.m
===================================================================
--- trunk/bibdesk/BDSKEditor.m 2026-02-26 17:43:01 UTC (rev 30066)
+++ trunk/bibdesk/BDSKEditor.m 2026-02-26 17:58:04 UTC (rev 30067)
@@ -852,7 +852,7 @@
[currentFields addObjectsFromArray:[[typeMan integerFieldsSet]
allObjects]];
[currentFields addObjectsFromArray:[[typeMan noteFieldsSet] allObjects]];
- fieldNames = [typeMan allFieldNamesIncluding:nil excluding:currentFields];
+ fieldNames = [typeMan allFieldNamesIncluding:@[BDSKCrossrefString]
excluding:currentFields];
if ([self commitEditing]) {
if ([[[tabView selectedTabViewItem] identifier]
isEqualToString:BDSKBibtexString] == NO)
@@ -957,7 +957,7 @@
[currentFields addObjectsFromArray:[[typeMan integerFieldsSet]
allObjects]];
[currentFields addObjectsFromArray:[[typeMan noteFieldsSet] allObjects]];
- fieldNames = [typeMan allFieldNamesIncluding:nil excluding:currentFields];
+ fieldNames = [typeMan allFieldNamesIncluding:@[BDSKCrossrefString]
excluding:currentFields];
if([fields count] == 0){
NSBeep();
Modified: trunk/bibdesk/BDSKMainTableView.m
===================================================================
--- trunk/bibdesk/BDSKMainTableView.m 2026-02-26 17:43:01 UTC (rev 30066)
+++ trunk/bibdesk/BDSKMainTableView.m 2026-02-26 17:58:04 UTC (rev 30067)
@@ -566,7 +566,7 @@
- (void)columnsMenuAddTableColumn:(id)sender{
// first we fill the popup
BDSKTypeManager *typeMan = [BDSKTypeManager sharedManager];
- NSArray *colNames = [typeMan allFieldNamesIncluding:@[BDSKPubTypeString,
BDSKCiteKeyString, BDSKPubDateString, BDSKDateAddedString,
BDSKDateModifiedString, BDSKFirstAuthorString, BDSKSecondAuthorString,
BDSKThirdAuthorString, BDSKLastAuthorString, BDSKFirstAuthorEditorString,
BDSKSecondAuthorEditorString, BDSKThirdAuthorEditorString,
BDSKAuthorEditorString, BDSKLastAuthorEditorString, BDSKItemNumberString,
BDSKContainerString, BDSKLocalFileString, BDSKRemoteURLString,
BDSKColorLabelString,
+ NSArray *colNames = [typeMan allFieldNamesIncluding:@[BDSKPubTypeString,
BDSKCiteKeyString, BDSKPubDateString, BDSKDateAddedString,
BDSKDateModifiedString, BDSKFirstAuthorString, BDSKSecondAuthorString,
BDSKThirdAuthorString, BDSKLastAuthorString, BDSKFirstAuthorEditorString,
BDSKSecondAuthorEditorString, BDSKThirdAuthorEditorString,
BDSKAuthorEditorString, BDSKLastAuthorEditorString, BDSKItemNumberString,
BDSKContainerString, BDSKCrossrefString, BDSKLocalFileString,
BDSKRemoteURLString, BDSKColorLabelString,
BDSKAbstractString, BDSKAnnoteString, BDSKRssDescriptionString]
excluding:[self
tableColumnIdentifiers]];
Modified: trunk/bibdesk/BDSKTemplateDocument.m
===================================================================
--- trunk/bibdesk/BDSKTemplateDocument.m 2026-02-26 17:43:01 UTC (rev
30066)
+++ trunk/bibdesk/BDSKTemplateDocument.m 2026-02-26 17:58:04 UTC (rev
30067)
@@ -664,7 +664,7 @@
}
- (IBAction)addField:(id)sender {
- NSArray *allFields = [[BDSKTypeManager sharedManager]
allFieldNamesIncluding:nil excluding:@[BDSKCrossrefString]];
+ NSArray *allFields = [[BDSKTypeManager sharedManager]
allFieldNamesIncluding:nil excluding:nil];
BDSKFieldSheetController *addFieldController = [BDSKFieldSheetController
fieldSheetControllerWithChoosableFields:allFields
label:NSLocalizedString(@"Field:", @"Label for adding a field for a template")];
[addFieldController beginSheetModalForWindow:[self windowForSheet]
completionHandler:^(NSModalResponse result){
Modified: trunk/bibdesk/BDSKTextImportController.m
===================================================================
--- trunk/bibdesk/BDSKTextImportController.m 2026-02-26 17:43:01 UTC (rev
30066)
+++ trunk/bibdesk/BDSKTextImportController.m 2026-02-26 17:58:04 UTC (rev
30067)
@@ -404,7 +404,7 @@
- (IBAction)addField:(id)sender{
BDSKTypeManager *typeMan = [BDSKTypeManager sharedManager];
NSArray *currentFields = [[self publication] allFieldNames];
- NSArray *fieldNames = [typeMan allFieldNamesIncluding:nil
excluding:currentFields];
+ NSArray *fieldNames = [typeMan
allFieldNamesIncluding:@[BDSKCrossrefString] excluding:currentFields];
BDSKFieldSheetController *addFieldController = [BDSKFieldSheetController
fieldSheetControllerWithChoosableFields:fieldNames
label:NSLocalizedString(@"Name of field to add:",@"Label for adding field")];
Modified: trunk/bibdesk/BDSKTypeManager.m
===================================================================
--- trunk/bibdesk/BDSKTypeManager.m 2026-02-26 17:43:01 UTC (rev 30066)
+++ trunk/bibdesk/BDSKTypeManager.m 2026-02-26 17:58:04 UTC (rev 30067)
@@ -208,7 +208,6 @@
[allFields unionSet:triStateFieldsSet];
[allFields unionSet:citationFieldsSet];
[allFields unionSet:personFieldsSet];
- [allFields addObject:BDSKCrossrefString];
allFieldsSet = [allFields copy];
Modified: trunk/bibdesk/BibDocument_Groups.m
===================================================================
--- trunk/bibdesk/BibDocument_Groups.m 2026-02-26 17:43:01 UTC (rev 30066)
+++ trunk/bibdesk/BibDocument_Groups.m 2026-02-26 17:58:04 UTC (rev 30067)
@@ -807,7 +807,7 @@
- (IBAction)addGroupFieldAction:(id)sender{
BDSKTypeManager *typeMan = [BDSKTypeManager sharedManager];
NSArray *groupFields = [[NSUserDefaults standardUserDefaults]
stringArrayForKey:BDSKGroupFieldsKey];
- NSArray *colNames = [typeMan allFieldNamesIncluding:@[BDSKPubTypeString,
BDSKColorLabelString]
+ NSArray *colNames = [typeMan allFieldNamesIncluding:@[BDSKPubTypeString,
BDSKCrossrefString, BDSKColorLabelString]
excluding:[[[typeMan
invalidGroupFieldsSet] allObjects] arrayByAddingObjectsFromArray:groupFields]];
BDSKFieldSheetController *addFieldController = [BDSKFieldSheetController
fieldSheetControllerWithChoosableFields:colNames
Modified: trunk/bibdesk/BibDocument_Search.m
===================================================================
--- trunk/bibdesk/BibDocument_Search.m 2026-02-26 17:43:01 UTC (rev 30066)
+++ trunk/bibdesk/BibDocument_Search.m 2026-02-26 17:58:04 UTC (rev 30067)
@@ -231,7 +231,6 @@
[excluded addObjectsFromArray:[[btm integerFieldsSet] allObjects]];
[excluded addObjectsFromArray:[[btm allURLFieldsSet] allObjects]];
[excluded addObject:BDSKTitleString];
- [excluded addObject:BDSKCrossrefString];
if ([searchFields containsObject:BDSKTitleString] == NO)
[included addObject:titleForSearchField(BDSKTitleString)];
if ([searchFields containsObject:BDSKPersonString] == NO)
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
