Revision: 27961
http://sourceforge.net/p/bibdesk/svn/27961
Author: hofman
Date: 2022-09-29 22:17:10 +0000 (Thu, 29 Sep 2022)
Log Message:
-----------
replace database text field by combo box, fill content with databases depending
on type
Modified Paths:
--------------
trunk/bibdesk/BDSKSearchGroupSheetController.h
trunk/bibdesk/BDSKSearchGroupSheetController.m
trunk/bibdesk/Base.lproj/BDSKSearchGroupSheet.xib
trunk/bibdesk/de.lproj/BDSKSearchGroupSheet.strings
trunk/bibdesk/en.lproj/BDSKSearchGroupSheet.strings
trunk/bibdesk/fr.lproj/BDSKSearchGroupSheet.strings
Modified: trunk/bibdesk/BDSKSearchGroupSheetController.h
===================================================================
--- trunk/bibdesk/BDSKSearchGroupSheetController.h 2022-09-29 22:10:49 UTC
(rev 27960)
+++ trunk/bibdesk/BDSKSearchGroupSheetController.h 2022-09-29 22:17:10 UTC
(rev 27961)
@@ -117,6 +117,8 @@
@property (nonatomic) NSInteger typeTag;
+@property (nonatomic, readonly) NSArray *databases;
+
@property (nonatomic, copy) BDSKServerInfo *serverInfo;
- (IBAction)selectPredefinedServer:(id)sender;
Modified: trunk/bibdesk/BDSKSearchGroupSheetController.m
===================================================================
--- trunk/bibdesk/BDSKSearchGroupSheetController.m 2022-09-29 22:10:49 UTC
(rev 27960)
+++ trunk/bibdesk/BDSKSearchGroupSheetController.m 2022-09-29 22:17:10 UTC
(rev 27961)
@@ -53,13 +53,13 @@
@implementation BDSKSearchGroupSheetController
@synthesize serverPopup, nameField, addressField, portField, databaseField,
passwordField, userField, syntaxPopup, encodingComboBox,
removeDiacriticsButton, liteButton, editButton, addRemoveButton, serverView,
revealButton, okButton, cancelButton, bottomConstraint, objectController,
custom, editable;
-@dynamic zoom, ISI, zoomOrISI, typeTag, serverInfo, undoManager;
+@dynamic zoom, ISI, zoomOrISI, typeTag, databases, serverInfo, undoManager;
+ (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key {
NSSet *keyPaths = [super keyPathsForValuesAffectingValueForKey:key];
if ([[NSSet setWithObjects:@"type", nil] containsObject:key])
keyPaths = [keyPaths setByAddingObjectsFromSet:[NSSet
setWithObjects:@"serverInfo", nil]];
- else if ([[NSSet setWithObjects:@"typeTag", @"zoom", @"ISI", @"zoomOrISI",
nil] containsObject:key])
+ else if ([[NSSet setWithObjects:@"typeTag", @"zoom", @"ISI", @"zoomOrISI",
@"databases", nil] containsObject:key])
keyPaths = [keyPaths setByAddingObjectsFromSet:[NSSet
setWithObjects:@"type", nil]];
return keyPaths;
}
@@ -357,6 +357,36 @@
}
}
+- (NSArray *)databases {
+ switch ([serverInfo serverType]) {
+ case BDSKServerTypeEntrez:
+ {
+ static NSArray *entrezDatabases = nil;
+ if (entrezDatabases == nil)
+ entrezDatabases = [[NSArray alloc] initWithObjects:@"pubmed",
@"protein", @"nuccore", @"ipg", @"nucleotide", @"structure", @"genome",
@"annotinfo", @"assembly", @"bioproject", @"biosample", @"blastdbinfo",
@"books", @"cdd", @"clinvar", @"gap", @"gapplus", @"grasp", @"dbvar", @"gene",
@"gds", @"geoprofiles", @"homologene", @"medgen", @"mesh", @"nlmcatalog",
@"omim", @"orgtrack", @"pmc", @"popset", @"proteinclusters", @"pcassay",
@"protfam", @"pccompound", @"pcsubstance", @"seqannot", @"snp", @"sra",
@"taxonomy", @"biocollections", @"gtr", nil];
+ return entrezDatabases;
+ }
+ case BDSKServerTypeZoom:
+ return [NSArray array];
+ case BDSKServerTypeISI:
+ {
+ static NSArray *zoomDatabases = nil;
+ if (zoomDatabases == nil)
+ zoomDatabases = [[NSArray alloc] initWithObjects:@"ESCI",
@"SCI", @"SSCI", @"A&HCI", @"BCI", @"CPCI", @"CSCD", @"SciELO", @"KCI",
@"RSCI", @"ARCI", nil];
+ return zoomDatabases;
+ }
+ case BDSKServerTypeDBLP:
+ {
+ static NSArray *dblpDatabases = nil;
+ if (dblpDatabases == nil)
+ dblpDatabases = [[NSArray alloc]
initWithObjects:@"Publications", @"Authors", nil];
+ return dblpDatabases;
+ }
+ default:
+ return [NSArray array];
+ }
+}
+
#pragma mark NSEditor
- (BOOL)commitEditing {
Modified: trunk/bibdesk/Base.lproj/BDSKSearchGroupSheet.xib
===================================================================
--- trunk/bibdesk/Base.lproj/BDSKSearchGroupSheet.xib 2022-09-29 22:10:49 UTC
(rev 27960)
+++ trunk/bibdesk/Base.lproj/BDSKSearchGroupSheet.xib 2022-09-29 22:17:10 UTC
(rev 27961)
@@ -12,7 +12,7 @@
<outlet property="addressField" destination="194" id="225"/>
<outlet property="bottomConstraint" destination="CgE-6E-jUn"
id="hiX-LH-lqG"/>
<outlet property="cancelButton" destination="21"
id="Nmy-Sd-Oel"/>
- <outlet property="databaseField" destination="193" id="226"/>
+ <outlet property="databaseField" destination="uYk-gJ-82e"
id="njC-Nc-bam"/>
<outlet property="editButton" destination="248" id="262"/>
<outlet property="encodingComboBox" destination="303"
id="311"/>
<outlet property="liteButton" destination="985" id="991"/>
@@ -542,7 +542,7 @@
<integer
key="NSValidatesImmediately" value="1"/>
</dictionary>
</binding>
- <outlet property="nextKeyView"
destination="193" id="291"/>
+ <outlet property="nextKeyView"
destination="uYk-gJ-82e" id="AeP-jM-mmU"/>
</connections>
</textField>
<textField verticalHuggingPriority="750"
translatesAutoresizingMaskIntoConstraints="NO" id="190">
@@ -553,26 +553,6 @@
<color key="backgroundColor"
name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <textField toolTip="Host database name"
horizontalHuggingPriority="248" verticalHuggingPriority="750"
translatesAutoresizingMaskIntoConstraints="NO" id="193">
- <rect key="frame" x="97" y="120"
width="256" height="19"/>
- <textFieldCell key="cell"
controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES"
editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel"
drawsBackground="YES" id="916">
- <font key="font"
metaFont="message" size="11"/>
- <color key="textColor"
name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor"
name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <connections>
- <accessibilityConnection
property="title" destination="199" id="523"/>
- <binding destination="-2"
name="enabled" keyPath="editable" id="476"/>
- <binding destination="569"
name="value" keyPath="selection.database" id="574">
- <dictionary key="options">
- <integer
key="NSConditionallySetsEditable" value="0"/>
- <string
key="NSNullPlaceholder">Database Name</string>
- <integer
key="NSValidatesImmediately" value="1"/>
- </dictionary>
- </binding>
- <outlet property="nextKeyView"
destination="194" id="292"/>
- </connections>
- </textField>
<textField verticalHuggingPriority="750"
translatesAutoresizingMaskIntoConstraints="NO" id="199">
<rect key="frame" x="34" y="122"
width="57" height="14"/>
<textFieldCell key="cell"
controlSize="small" scrollable="YES" lineBreakMode="clipping"
sendsActionOnEndEditing="YES" alignment="right" title="Database:" id="917">
@@ -641,6 +621,29 @@
</binding>
</connections>
</button>
+ <comboBox toolTip="Host database name"
verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO"
id="uYk-gJ-82e">
+ <rect key="frame" x="97" y="117"
width="259" height="22"/>
+ <comboBoxCell key="cell"
controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES"
editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel"
drawsBackground="YES" completes="NO" numberOfVisibleItems="5" id="cIB-UH-XOe">
+ <font key="font"
metaFont="smallSystem"/>
+ <color key="textColor"
name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor"
name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </comboBoxCell>
+ <connections>
+ <accessibilityConnection
property="title" destination="199" id="A93-1j-tW1"/>
+ <binding destination="bUh-pS-ujd"
name="content" keyPath="arrangedObjects" id="Q7y-V1-9Nz">
+ <dictionary key="options">
+ <string
key="NSNullPlaceholder">Database Name</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2"
name="enabled" keyPath="editable" id="i1o-Ev-mx7"/>
+ <binding destination="569"
name="value" keyPath="selection.database" previousBinding="Q7y-V1-9Nz"
id="Kia-fU-USx">
+ <dictionary key="options">
+ <bool
key="NSConditionallySetsEnabled" value="NO"/>
+ </dictionary>
+ </binding>
+ <outlet property="nextKeyView"
destination="194" id="6vp-QE-iyB"/>
+ </connections>
+ </comboBox>
</subviews>
<constraints>
<constraint firstItem="3BL-J9-tal"
firstAttribute="top" secondItem="318" secondAttribute="bottom" constant="8"
symbolic="YES" id="0bA-6h-hzI"/>
@@ -658,11 +661,9 @@
<constraint firstItem="201"
firstAttribute="top" secondItem="194" secondAttribute="bottom" constant="8"
symbolic="YES" id="4Zv-6g-ZoO"/>
<constraint firstAttribute="trailing"
relation="greaterThanOrEqual" secondItem="985" secondAttribute="trailing"
constant="20" symbolic="YES" id="4l5-LZ-0F0"/>
<constraint firstAttribute="trailing"
secondItem="192" secondAttribute="trailing" constant="20" symbolic="YES"
id="5FW-iY-LhH"/>
- <constraint firstItem="193"
firstAttribute="top" secondItem="192" secondAttribute="bottom" constant="8"
symbolic="YES" id="5Ud-wS-UAu"/>
<constraint firstItem="303"
firstAttribute="leading" secondItem="3BL-J9-tal" secondAttribute="leading"
id="63A-ds-ScY"/>
<constraint firstItem="200"
firstAttribute="leading" secondItem="201" secondAttribute="trailing"
constant="8" symbolic="YES" id="7Q6-2I-y6p"/>
<constraint firstItem="198"
firstAttribute="firstBaseline" secondItem="196" secondAttribute="firstBaseline"
id="8G0-yp-Rdr"/>
- <constraint firstItem="193"
firstAttribute="leading" secondItem="3BL-J9-tal" secondAttribute="leading"
id="8Ih-xa-fWT"/>
<constraint firstItem="275"
firstAttribute="leading" relation="greaterThanOrEqual" secondItem="189"
secondAttribute="leading" constant="32" id="8lq-5S-qhX"/>
<constraint firstAttribute="trailing"
relation="greaterThanOrEqual" secondItem="247" secondAttribute="trailing"
constant="20" symbolic="YES" id="8xy-y2-7Ym"/>
<constraint firstItem="258"
firstAttribute="top" secondItem="250" secondAttribute="bottom" constant="8"
symbolic="YES" id="9ip-xN-yVd"/>
@@ -672,6 +673,7 @@
<constraint firstItem="305"
firstAttribute="firstBaseline" secondItem="304" secondAttribute="firstBaseline"
id="BZM-at-pYv"/>
<constraint firstItem="192"
firstAttribute="leading" secondItem="190" secondAttribute="trailing"
constant="8" symbolic="YES" id="DyR-Qs-7KC"/>
<constraint firstItem="190"
firstAttribute="leading" relation="greaterThanOrEqual" secondItem="189"
secondAttribute="leading" constant="32" id="E0u-Kl-X2F"/>
+ <constraint firstItem="uYk-gJ-82e"
firstAttribute="firstBaseline" secondItem="199" secondAttribute="firstBaseline"
id="Eb0-nK-vjH"/>
<constraint firstItem="305"
firstAttribute="trailing" secondItem="192" secondAttribute="trailing"
id="HOR-XZ-7K1"/>
<constraint firstItem="3BL-J9-tal"
firstAttribute="firstBaseline" secondItem="753" secondAttribute="firstBaseline"
id="HTR-6o-c9g"/>
<constraint firstItem="985"
firstAttribute="leading" secondItem="3BL-J9-tal" secondAttribute="leading"
id="Hke-nj-aM0"/>
@@ -680,6 +682,7 @@
<constraint firstItem="303"
firstAttribute="leading" secondItem="304" secondAttribute="trailing"
constant="8" symbolic="YES" id="IDj-VH-hv1"/>
<constraint firstItem="247"
firstAttribute="width" secondItem="250" secondAttribute="width"
id="Ivv-WU-XAN"/>
<constraint firstItem="316"
firstAttribute="top" secondItem="189" secondAttribute="top" constant="4"
id="JQx-Np-uyM"/>
+ <constraint firstItem="194"
firstAttribute="top" secondItem="uYk-gJ-82e" secondAttribute="bottom"
constant="9" id="Lqq-gp-DLz"/>
<constraint firstItem="192"
firstAttribute="firstBaseline" secondItem="190" secondAttribute="firstBaseline"
id="N4D-Zj-4Ed"/>
<constraint firstItem="Let-vJ-J5z"
firstAttribute="firstBaseline" secondItem="753" secondAttribute="firstBaseline"
id="O6h-Dy-rhd"/>
<constraint firstItem="201"
firstAttribute="width" secondItem="197" secondAttribute="width"
multiplier="0.978723" id="Okh-eU-nCP"/>
@@ -702,13 +705,15 @@
<constraint firstItem="258"
firstAttribute="leading" secondItem="189" secondAttribute="leading"
constant="12" id="akZ-6M-6Ke"/>
<constraint firstAttribute="trailing"
secondItem="258" secondAttribute="trailing" constant="12" id="bcf-zK-Eeb"/>
<constraint firstItem="318"
firstAttribute="leading" secondItem="189" secondAttribute="leading"
constant="20" symbolic="YES" id="fDF-1D-GZm"/>
+ <constraint firstItem="uYk-gJ-82e"
firstAttribute="top" secondItem="192" secondAttribute="bottom" constant="9"
id="fXy-AU-fRh"/>
<constraint firstItem="RmO-um-4HP"
firstAttribute="firstBaseline" secondItem="753" secondAttribute="firstBaseline"
id="g0f-0y-iMC"/>
<constraint firstItem="3BL-J9-tal"
firstAttribute="leading" secondItem="250" secondAttribute="leading"
id="g3A-if-3ss"/>
<constraint firstItem="277"
firstAttribute="leading" secondItem="275" secondAttribute="trailing"
constant="8" symbolic="YES" id="glK-Ld-7ss"/>
+ <constraint firstItem="uYk-gJ-82e"
firstAttribute="trailing" secondItem="192" secondAttribute="trailing"
id="hkD-K3-3WC"/>
<constraint firstItem="197"
firstAttribute="trailing" secondItem="192" secondAttribute="trailing"
id="jQf-xZ-Qwg"/>
<constraint firstItem="304"
firstAttribute="leading" relation="greaterThanOrEqual" secondItem="189"
secondAttribute="leading" constant="32" id="kC5-pl-WyQ"/>
<constraint firstItem="RmO-um-4HP"
firstAttribute="leading" secondItem="3BL-J9-tal" secondAttribute="trailing"
constant="8" symbolic="YES" id="kK6-It-keg"/>
- <constraint firstItem="193"
firstAttribute="leading" secondItem="199" secondAttribute="trailing"
constant="8" symbolic="YES" id="kcf-YF-qBv"/>
+ <constraint firstItem="uYk-gJ-82e"
firstAttribute="leading" secondItem="199" secondAttribute="trailing"
constant="8" symbolic="YES" id="kS1-gw-6f8"/>
<constraint firstItem="318"
firstAttribute="top" secondItem="258" secondAttribute="bottom" constant="8"
symbolic="YES" id="kfk-nV-9xP"/>
<constraint firstItem="191"
firstAttribute="firstBaseline" secondItem="196" secondAttribute="firstBaseline"
id="kgc-7h-hto"/>
<constraint firstItem="248"
firstAttribute="width" secondItem="250" secondAttribute="width"
id="ksu-RA-ASM"/>
@@ -716,7 +721,6 @@
<constraint firstItem="201"
firstAttribute="firstBaseline" secondItem="195" secondAttribute="firstBaseline"
id="lzu-ID-byH"/>
<constraint firstItem="198"
firstAttribute="leading" secondItem="191" secondAttribute="trailing"
constant="8" symbolic="YES" id="mAc-Si-EwZ"/>
<constraint firstItem="303"
firstAttribute="firstBaseline" secondItem="304" secondAttribute="firstBaseline"
id="nD3-V2-I1Z"/>
- <constraint firstItem="193"
firstAttribute="trailing" secondItem="192" secondAttribute="trailing"
id="nU5-Vd-VAV"/>
<constraint firstItem="303"
firstAttribute="trailing" secondItem="277" secondAttribute="trailing"
id="oNc-7V-nlX"/>
<constraint firstItem="Let-vJ-J5z"
firstAttribute="width" secondItem="3BL-J9-tal" secondAttribute="width"
id="ojz-fe-KDs"/>
<constraint firstItem="201"
firstAttribute="leading" secondItem="195" secondAttribute="trailing"
constant="8" symbolic="YES" id="pd5-qN-yrm"/>
@@ -723,13 +727,12 @@
<constraint firstItem="192"
firstAttribute="leading" secondItem="3BL-J9-tal" secondAttribute="leading"
id="pwA-5m-obT"/>
<constraint firstAttribute="trailing"
secondItem="316" secondAttribute="trailing" constant="12" id="rH4-Np-tOJ"/>
<constraint firstItem="8U9-Rn-xYX"
firstAttribute="leading" secondItem="RmO-um-4HP" secondAttribute="trailing"
constant="8" symbolic="YES" id="sB1-2X-Ykz"/>
- <constraint firstItem="193"
firstAttribute="firstBaseline" secondItem="199" secondAttribute="firstBaseline"
id="tbO-wI-QOD"/>
<constraint firstItem="8U9-Rn-xYX"
firstAttribute="firstBaseline" secondItem="753" secondAttribute="firstBaseline"
id="tiL-ef-NSg"/>
<constraint firstItem="277"
firstAttribute="leading" secondItem="3BL-J9-tal" secondAttribute="leading"
id="u4j-lv-rBn"/>
<constraint firstItem="260"
firstAttribute="top" secondItem="303" secondAttribute="bottom" constant="8"
symbolic="YES" id="uBC-4G-wnw"/>
- <constraint firstItem="194"
firstAttribute="top" secondItem="193" secondAttribute="bottom" constant="8"
symbolic="YES" id="xLd-dM-lCL"/>
<constraint firstItem="303"
firstAttribute="top" secondItem="277" secondAttribute="bottom" constant="8"
symbolic="YES" id="xtc-jE-cs4"/>
<constraint firstItem="296"
firstAttribute="leading" relation="greaterThanOrEqual" secondItem="189"
secondAttribute="leading" constant="20" symbolic="YES" id="yEe-Vo-9w8"/>
+ <constraint firstItem="uYk-gJ-82e"
firstAttribute="leading" secondItem="3BL-J9-tal" secondAttribute="leading"
id="ybd-ol-eyy"/>
<constraint firstItem="277"
firstAttribute="firstBaseline" secondItem="275" secondAttribute="firstBaseline"
id="z5g-8P-nEH"/>
<constraint firstItem="3BL-J9-tal"
firstAttribute="leading" secondItem="753" secondAttribute="trailing"
constant="8" symbolic="YES" id="zEm-kk-sRT"/>
<constraint firstItem="247"
firstAttribute="leading" secondItem="248" secondAttribute="trailing"
constant="8" symbolic="YES" id="znZ-7n-OJv"/>
@@ -797,5 +800,10 @@
<binding destination="-2" name="contentObject"
keyPath="serverInfo" id="570"/>
</connections>
</objectController>
+ <arrayController id="bUh-pS-ujd">
+ <connections>
+ <binding destination="-2" name="contentArray"
keyPath="databases" id="VcY-Fs-Y39"/>
+ </connections>
+ </arrayController>
</objects>
</document>
Modified: trunk/bibdesk/de.lproj/BDSKSearchGroupSheet.strings
===================================================================
(Binary files differ)
Modified: trunk/bibdesk/en.lproj/BDSKSearchGroupSheet.strings
===================================================================
(Binary files differ)
Modified: trunk/bibdesk/fr.lproj/BDSKSearchGroupSheet.strings
===================================================================
(Binary files differ)
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
