Revision 8fecfdbd
Added by Katja Luther over 4 years ago
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties | ||
|---|---|---|
| 468 | 468 |
|
| 469 | 469 |
DatabasePreferncesPage_Show_Id_In_SelectionDialog=Show ID in selection dialogs |
| 470 | 470 |
DatabasePreferncesPage_Search_for_identifier_as_default=Use identifier search as default |
| 471 |
DatabasePreferncesPage_search_for_identifier_and_titleCache=Search also for titlecache if identifier search is activated |
|
| 471 |
DatabasePreferncesPage_search_for_identifier_and_titleCache=Search also for title cache if identifier search is activated
|
|
| 472 | 472 |
DatabasePreferncesPage_Sort_Taxa_By_Name_And_Rank=Sort taxa by rank and name |
| 473 | 473 |
DatabasePreferncesPage_CommonNameFilter=Filter common name references |
| 474 | 474 |
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties | ||
|---|---|---|
| 334 | 334 |
SearchDialog_patternLabel=Nutze * als Platzhalter f?r eine beliebige Zeichenkette |
| 335 | 335 |
SearchDialogPreferences_0=Objekt ID in Suchdialogen anzeigen |
| 336 | 336 |
SearchDialogPreferences_1=Indentifier standardm??ig in Suche verwenden |
| 337 |
SearchDialogPreferences_2=Suche nach Identifiern und Titlecache, wenn Identifier Suche aktiviert ist
|
|
| 337 |
SearchDialogPreferences_2=Suche nach Identifiern und Title Cache, wenn Identifier Suche aktiviert ist
|
|
| 338 | 338 |
SearchDialogPreferences_3=In Taxon Suchdialogen nach Rang und Namen sortieren |
| 339 | 339 |
SearchDialogPreferences_4=Filter Referenzen f?r Trivialnamen |
| 340 | 340 |
|
| ... | ... | |
| 468 | 468 |
|
| 469 | 469 |
DatabasePreferncesPage_Show_Id_In_SelectionDialog=Zeige ID in Selection Dialogen |
| 470 | 470 |
DatabasePreferncesPage_Search_for_identifier_as_default=Nutze Identifier Suche als Default |
| 471 |
DatabasePreferncesPage_search_for_identifier_and_titleCache=Suche nach Identifier und TitleCache, wenn Identifier Suche aktiviert ist |
|
| 471 |
DatabasePreferncesPage_search_for_identifier_and_titleCache=Suche nach Identifier und Title Cache, wenn Identifier Suche aktiviert ist
|
|
| 472 | 472 |
DatabasePreferncesPage_Sort_Taxa_By_Name_And_Rank=Sortiere Taxa nach Rang und Namen |
| 473 | 473 |
DatabasePreferncesPage_CommonNameFilter=Filtere Referenzen, die als Referenzen f?r Trivialnamen markiert sind |
| 474 | 474 |
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralPreferencePage.java | ||
|---|---|---|
| 152 | 152 |
if (isShowCheckListPerspective != null){
|
| 153 | 153 |
PreferencesUtil.setBooleanValue(PreferencePredicate.ShowChecklistPerspective.getKey(), isShowCheckListPerspective); |
| 154 | 154 |
} |
| 155 |
PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowChecklistPerspective.getKey()), false);
|
|
| 155 |
PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowChecklistPerspective.getKey()), isOverrideShowCheckListPerspective);
|
|
| 156 | 156 |
|
| 157 | 157 |
|
| 158 | 158 |
} |
| ... | ... | |
| 178 | 178 |
isAdminPreference = false; |
| 179 | 179 |
|
| 180 | 180 |
CdmPreferenceCache cache = CdmPreferenceCache.instance(); |
| 181 |
isShowIOMenu = PreferencesUtil.getBooleanValue(PreferencePredicate.ShowImportExportMenu.getKey(), true); |
|
| 182 |
|
|
| 183 | 181 |
isOverrideShowIOMenu = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowImportExportMenu.getKey()), true) != null? |
| 184 | 182 |
PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowImportExportMenu.getKey()), true): false; |
| 183 |
if (isOverrideShowIOMenu){
|
|
| 184 |
isShowIOMenu = PreferencesUtil.getBooleanValue(PreferencePredicate.ShowImportExportMenu.getKey(), true); |
|
| 185 |
} |
|
| 186 |
|
|
| 187 |
|
|
| 185 | 188 |
PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowImportExportMenu); |
| 186 | 189 |
CdmPreference pref = cache.findBestMatching(key); |
| 187 | 190 |
if (pref != null){
|
| ... | ... | |
| 190 | 193 |
isAllowOverrideShowIOMenu = true; |
| 191 | 194 |
} |
| 192 | 195 |
|
| 193 |
isShowCheckListPerspective = PreferencesUtil.getBooleanValue(PreferencePredicate.ShowChecklistPerspective.getKey(), true); |
|
| 194 |
|
|
| 195 | 196 |
isOverrideShowCheckListPerspective = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowChecklistPerspective.getKey()), true) != null? PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowChecklistPerspective.getKey()), true): false; |
| 197 |
if (isOverrideShowCheckListPerspective){
|
|
| 198 |
isShowCheckListPerspective = PreferencesUtil.getBooleanValue(PreferencePredicate.ShowChecklistPerspective.getKey(), true); |
|
| 199 |
} |
|
| 200 |
|
|
| 201 |
|
|
| 196 | 202 |
key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowChecklistPerspective); |
| 197 | 203 |
pref = cache.findBestMatching(key); |
| 198 | 204 |
if (pref != null){
|
| ... | ... | |
| 201 | 207 |
isAllowOverrideShowCheckListPerspective = true; |
| 202 | 208 |
} |
| 203 | 209 |
|
| 204 |
isShowTaxonNodeWizard = PreferencesUtil.getBooleanValue(PreferencePredicate.ShowTaxonNodeWizard.getKey(), true); |
|
| 205 | 210 |
isOverrideShowTaxonNodeWizard = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowTaxonNodeWizard.getKey()), true) != null? PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowTaxonNodeWizard.getKey()), true): false; |
| 211 |
if (isOverrideShowTaxonNodeWizard){
|
|
| 212 |
isShowTaxonNodeWizard = PreferencesUtil.getBooleanValue(PreferencePredicate.ShowTaxonNodeWizard.getKey(), true); |
|
| 213 |
} |
|
| 214 |
|
|
| 206 | 215 |
key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowTaxonNodeWizard); |
| 207 | 216 |
pref = cache.findBestMatching(key); |
| 208 | 217 |
if (pref != null){
|
| ... | ... | |
| 298 | 307 |
showIOMenuButton.select(2); |
| 299 | 308 |
} |
| 300 | 309 |
|
| 301 |
if (isShowCheckListPerspective == null || (!isOverrideShowIOMenu && !isAdminPreference)){
|
|
| 310 |
if (isShowCheckListPerspective == null || (!isOverrideShowCheckListPerspective && !isAdminPreference)){
|
|
| 302 | 311 |
showChecklistPerspectiveButton.select(0); |
| 303 | 312 |
}else if (isShowCheckListPerspective){
|
| 304 | 313 |
showChecklistPerspectiveButton.select(1); |
| ... | ... | |
| 306 | 315 |
showChecklistPerspectiveButton.select(2); |
| 307 | 316 |
} |
| 308 | 317 |
|
| 309 |
if (isShowTaxonNodeWizard == null || (!isOverrideShowIOMenu && !isAdminPreference)){
|
|
| 318 |
if (isShowTaxonNodeWizard == null || (!isOverrideShowTaxonNodeWizard && !isAdminPreference)){
|
|
| 310 | 319 |
showTaxonNodeWizardButton.select(0); |
| 311 | 320 |
}else if (isShowTaxonNodeWizard){
|
| 312 | 321 |
showTaxonNodeWizardButton.select(1); |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PublishFlagLocalPreference.java | ||
|---|---|---|
| 91 | 91 |
@Override |
| 92 | 92 |
public void widgetSelected(SelectionEvent e) {
|
| 93 | 93 |
setApply(true); |
| 94 |
if (!publishFlagBehaviour.getText().startsWith(Messages.Preference_Use_Default)){
|
|
| 95 |
|
|
| 96 |
publishBehaviour = (PublishEnum)publishFlagBehaviour.getData(publishFlagBehaviour.getText()); |
|
| 97 |
} |
|
| 94 | 98 |
|
| 95 | 99 |
} |
| 96 | 100 |
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CdmPreferencePage.java | ||
|---|---|---|
| 213 | 213 |
booleanCombo.add(Messages.Preference_Use_Default + " ("+defaultValue+")");;
|
| 214 | 214 |
for (IKeyLabel value: enumValues){
|
| 215 | 215 |
booleanCombo.add(value.getLabel()); |
| 216 |
booleanCombo.setData(value.getLabel(), value); |
|
| 216 | 217 |
} |
| 217 | 218 |
|
| 218 | 219 |
return booleanCombo; |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CommonNameLanguagePreferences.java | ||
|---|---|---|
| 129 | 129 |
|
| 130 | 130 |
String preferredLanguagesString = StringUtils.join(preferredTermUuids, ";"); |
| 131 | 131 |
PreferencesUtil.setStringValue(PreferencePredicate.CommonNameLanguages.getKey(), preferredLanguagesString); |
| 132 |
PreferencesUtil.setBooleanValue(PreferencesUtil.createOverridePreferenceString(PreferencePredicate.CommonNameLanguages.getKey()), true); |
|
| 132 | 133 |
} |
| 133 | 134 |
|
| 134 | 135 |
PreferencesUtil.firePreferencesChanged(this.getClass()); |
Also available in: Unified diff
ref #8385: fix general prefs and publish flag prefs page