From 2f9887be2d45deaa2d8f437a4df6a45b89f286e7 Mon Sep 17 00:00:00 2001 From: Katja Luther Date: Mon, 21 Jan 2019 11:56:49 +0100 Subject: [PATCH] ref #7163: restructure preferences and externalize strings in preferences --- .../OSGI-INF/l10n/bundle.properties | 15 +- .../OSGI-INF/l10n/bundle_de.properties | 19 +- eu.etaxonomy.taxeditor.store/plugin.xml | 124 ++++++--- .../eu/etaxonomy/taxeditor/l10n/Messages.java | 243 +++--------------- .../taxeditor/l10n/messages.properties | 29 ++- .../taxeditor/l10n/messages_de.properties | 17 ++ .../preference/DebugPreferences.java | 5 +- .../DefaultFeatureTreePreferenecs.java | 9 +- .../preference/DescriptionPreferences.java | 5 +- .../ExperimentalFeaturesPreferences.java | 34 +++ .../ExternalServicesPreferences.java | 49 ++++ .../LanguageRepresentationPreferencePage.java | 5 +- .../preference/MediaPreferences.java | 5 +- .../taxeditor/preference/NamePreferences.java | 32 +++ .../preference/OrderPreferences.java | 8 +- .../preference/SearchDialogPreferences.java | 49 ++++ .../preference/SearchPreferences.java | 27 +- .../SupplementalDataPreferences.java | 33 +++ .../preference/TaxonPreferences.java | 32 +++ .../preference/TaxonSearchPreferences.java | 33 +++ .../TaxonomicEditorGeneralPreferences.java | 56 ++-- .../taxeditor/preference/UIPreferences.java | 34 +++ 22 files changed, 550 insertions(+), 313 deletions(-) create mode 100755 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ExperimentalFeaturesPreferences.java create mode 100755 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ExternalServicesPreferences.java create mode 100755 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NamePreferences.java create mode 100755 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SearchDialogPreferences.java create mode 100755 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SupplementalDataPreferences.java create mode 100755 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonPreferences.java create mode 100755 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonSearchPreferences.java create mode 100755 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/UIPreferences.java diff --git a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties index 635488ebb..19eed76e9 100644 --- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties +++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties @@ -15,7 +15,7 @@ page.name.11 = Marker page.name.12 = Extension Types page.name.13 = Type Designation (Name) page.name.14 = Named Area Type -page.name.15 = Matching (Experimental) +page.name.15 = Matching page.name.16 = Taxon Name Matching Strategy page.name.17 = Reference Matching Strategy page.name.18 = Team or Person Matching Strategy @@ -127,7 +127,7 @@ fontDefinition.description.1 = The font used by default in the search result lis colorDefinition.label.13 = Parse Error colorDefinition.label.14 = Disabled Name Editor Field colorDefinition.label.15 = Editor On Error -page.name.26 = Specimens and FieldUnits +page.name.26 = Specimens page.name.27 = Media page.name.28 = Distribution Editor page.name.29 = Editor Profile @@ -197,7 +197,7 @@ extension-point.name.1 = Admin Preference Page page.name.45 = Specimen page.name.46 = Publish Flag page.name.47 = Common Names -page.name.48 = Identifier Search +page.name.48 = Search Dialogs command.name.111 = Open Admin Distributionstatus-Wizard command.name.112 = Open Admin CommonNameArea-Wizard handledmenuitem.label.1 = New Feature Tree @@ -240,3 +240,12 @@ command.commandname.13 = Open Distribution Status Wizard menu.label.4 = Export handledmenuitem.label.14 = Export as Ontology command.commandname.14 = Export as Ontology + +page.name.49 = Experimental Features +page.name.51 = Names +page.name.52 = Taxa +page.name.53 = UI +page.name.54 = External Services +page.name.55 = Supplemental Data +page.name.56 = Search +page.name.57 = Taxon Search \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties index 02e0c27f2..d844f57f6 100644 --- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties +++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties @@ -1,5 +1,5 @@ #Properties file for eu.etaxonomy.taxeditor.store, German -page.name = Loakale Pr\u00e4ferenzen +page.name = Lokale Pr\u00e4ferenzen page.name.0 = Faktendaten page.name.1 = Merkmal page.name.2 = Verbreitungsstatus @@ -15,7 +15,7 @@ page.name.11 = Marker page.name.12 = Erweiterungen page.name.13 = Typusarten (Namen) page.name.14 = Gebiete -page.name.15 = Matching (experimentell) +page.name.15 = Matching page.name.16 = Taxonnamen Matching-Strategie page.name.17 = Referenz Matching-Strategie page.name.18 = Team oder Personen Matching-Strategie @@ -127,7 +127,7 @@ fontDefinition.description.1 = Die Schrift, die normalerweise in den Suchergebni colorDefinition.label.13 = Fehler beim Parsing colorDefinition.label.14 = Gesperrtes Namenseditierfeld colorDefinition.label.15 = Editor fehlerhaft -page.name.26 = Specimens und Field Units +page.name.26 = Specimens page.name.27 = Media page.name.28 = Verbreitungs-Editor page.name.29 = Editor Profil @@ -197,7 +197,7 @@ extension-point.name.1 = Admin Pr page.name.45 = Specimen page.name.46 = Publish Flag page.name.47 = Trivialnamen -page.name.48 = Identifier Suche +page.name.48 = Such Dialoge command.name.111 = \u00d6ffne Admin Verbreitungsstatus-Wizard command.name.112 = \u00d6ffne Admin Common Name Areal-Wizard handledmenuitem.label.1 = Neuer Merkmalsbaum @@ -234,4 +234,13 @@ command.commandname.13 = menu.label.4 = Export handledmenuitem.label.14 = Export als Ontologie -command.commandname.14 = Export als Ontologie \ No newline at end of file +command.commandname.14 = Export als Ontologie + +page.name.49 = Experimentelle Features +page.name.51 = Namen +page.name.52 = Taxa +page.name.53 = UI +page.name.54 = Externe Services +page.name.55 = Zusatzdaten +page.name.56 = Suche +page.name.57 = Taxon Suche \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.store/plugin.xml b/eu.etaxonomy.taxeditor.store/plugin.xml index 9743a5fc7..c3d558cba 100755 --- a/eu.etaxonomy.taxeditor.store/plugin.xml +++ b/eu.etaxonomy.taxeditor.store/plugin.xml @@ -1,8 +1,8 @@ - - + + @@ -371,7 +371,7 @@ - - --> - - @@ -476,13 +464,13 @@ name="%page.name.10"> @@ -495,6 +483,12 @@ + + @@ -542,17 +536,11 @@ name="%page.name.23"> - - @@ -578,7 +566,7 @@ name="%page.name.30"> @@ -589,6 +577,68 @@ id="eu.etaxonomy.taxeditor.preferences.generalPreferences" name="%page.name.50"> + + + + + + + + + + + + + + + + + + + + + + diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java index 0bf15d31c..722344ec5 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java @@ -27,6 +27,10 @@ public class Messages extends NLS { public static String LanguageEditorPreferencePage_RestartRequired; + public static String LanguageRepresentationPreferencePage_global; + public static String LanguageRepresentationPreferencePage_enable; + + public static String ListComponent_ADD_PROVIDER; @@ -67,8 +71,12 @@ public class Messages extends NLS { public static String OpenDistributionEditorWizardHandlerE4_DISTRIBUTION; - public static String OrderPreferencePage_NewNavigatorWindowRequired; - public static String OrderPreferencePage_PleaseReopenNavigator; + public static String OrderPreferences_Restore; + + + public static String OrderPreferences_Sorting; + + public static String CdmDataSourceViewPart_1; public static String CdmDataSourceViewPart_10; public static String CdmDataSourceViewPart_11; @@ -88,27 +96,14 @@ public class Messages extends NLS { public static String ChangeConnectionHandler_REALLY_CREATE_DATAMODEL; public static String ChangeConnectionHandler_DATASOURCE_NOT_AVAILABLE; public static String ChangeConnectionHandler_NOT_AVAILABLE_REASONS; - public static String UpdateHandler_CHECK_UPDATE_JOB; - + public static String UpdateHandler_CHECK_UPDATE_JOB; public static String UpdateHandler_INSTALL_JOB; - - public static String UpdateHandler_NO_UPDATE_MESSAGE; - - public static String UpdateHandler_NO_UPDATE_TITLE; - - public static String UpdateHandler_UPDATE_INSTALLED_TITLE; - - public static String UpdateHandler_UPDATE_INSTALLED_TITLE_MESSAGE; - - public static String UpdateHandler_UPDATES_FOUND_MESSAGE; - - public static String UpdateHandler_UPDATES_FOUND_TITLE; @@ -136,43 +131,30 @@ public class Messages extends NLS { public static String ConfiguratorComposite_CONFIGURE; - public static String DefinedTermDropAdapterE4_MOVE_DESCRIPTIONS; - + public static String DefinedTermDropAdapterE4_MOVE_DESCRIPTIONS; public static String DefinedTermDropAdapterE4_MOVE_FAILED; - - public static String DefinedTermDropAdapterE4_MOVE_FAILED_MESSAGE; - - public static String DefinedTermDropAdapterE4_MOVE_FAILED_SAVE_MESSAGE; + public static String DebugPreferences_0; + public static String DebugPreferences_1; - public static String DefinedTermEditorE4_SAVE_MESSAGE; + public static String DefaultFeatureTreePreferenecs_0; + public static String DefaultFeatureTreePreferenecs_1; + public static String DefinedTermEditorE4_SAVE_MESSAGE; public static String DefinedTermEditorE4_SAVE_TITLE; - - public static String DefinedTermMenu_FEATURE_TREE; - - public static String DefinedTermMenu_MENU; - - public static String DefinedTermMenu_OTHER_S; - - public static String DefinedTermMenu_OTHERS; - - public static String DefinedTermMenu_TERM_EDITOR; - public static String DetailsViewerE4_TAXON_HAS_NO_NAME; - - public static String DetailsViewPart_VIEWER_NAME; + public static String EditPasswordElement_PLEASE_CREATE_OR_SAVE_USER; public static String EditPasswordElement_USERNAME_DOES_NOT_EXIST; @@ -189,136 +171,62 @@ public class Messages extends NLS { public static String PasswordWizardPage_PASSWORD_MIN_CHARACTER; public static String PasswordWizardPage_PASSWORDS_DO_NOT_MATCH; public static String PasswordWizardPage_REPEAT_PASSWORD; + public static String PresenceAbsenceTermDetailElement_CHOOSE_COLOR; public static String PresenceAbsenceTermDetailElement_COLOR_NOT_SET; public static String PresenceAbsenceTermDetailElement_LABEL_COLOR; - public static String RemotingLoginDialog_CHOOSE_COMPATIBLE_CDM_SERVER; - + public static String RemotingLoginDialog_CHOOSE_COMPATIBLE_CDM_SERVER; public static String RemotingLoginDialog_DEFAULT_LOGIN; - - public static String RemotingLoginDialog_LABEL_ADVANCED; - - public static String RemotingLoginDialog_LABEL_CDM_INSTANCE; - - public static String RemotingLoginDialog_LABEL_CDM_SERVER; - - public static String RemotingLoginDialog_LABEL_CONNECT; - - public static String RemotingLoginDialog_LABEL_EDITOR_CDM_VERSION; - - public static String RemotingLoginDialog_LABEL_EDITOR_CDMLIB_VERSION; - - public static String RemotingLoginDialog_LABEL_LOGIN; - - public static String RemotingLoginDialog_LABEL_LOGIN_COLON; - - public static String RemotingLoginDialog_LABEL_PASSWORD; - - public static String RemotingLoginDialog_LABEL_PORT; - - public static String RemotingLoginDialog_LABEL_REFRESH; - - public static String RemotingLoginDialog_LABEL_REMEMBER_ME; - - public static String RemotingLoginDialog_RETRIEVE_SERVER_INSTANCES; - - public static String RemotingLoginDialog_LABEL_SERVER_CDM_VERSION; - - public static String RemotingLoginDialog_LABEL_SERVER_CDMLIB_VERSION; - - public static String RemotingLoginDialog_LABEL_STOP_MANAGED_SERVER; - - public static String RemotingLoginDialog_LOGIN_CANNOT_BE_EMPTY; - - public static String RemotingLoginDialog_MESSAGE_PORT_SHOULD_BE_INTEGER; - - public static String RemotingLoginDialog_PASSWORD_CANNOT_BE_EMPTY; - - public static String RemotingLoginDialog_SERVER_LAUNCH_ERROR; - - public static String RemotingLoginDialog_STATUS_AVAILABLE; - - public static String RemotingLoginDialog_STATUS_CHECKING; - - public static String RemotingLoginDialog_STATUS_ERROR; public static String RemotingLoginDialog_STATUS_NO_INSTANCES_FOUND; - - public static String RemotingLoginDialog_STATUS_NOT_AVAILABLE; - - public static String RemotingLoginDialog_STATUS_NOT_COMPATIBLE; - - public static String RemotingLoginDialog_STATUS_NOT_STARTED; - - public static String RemotingLoginDialog_STATUS_REMOTING_NOT_ACTIVATED; public static String RemotingLoginDialog_STATUS_RETRIEVING; - - public static String RemotingLoginDialog_STATUS_STARTED; - - public static String RemotingLoginDialog_UPDATE_EDITOR; - - public static String RemotingLoginDialog_CONNECTION_FAILED_MESSAGE; - - public static String RemotingLoginDialog_CONNECTION_FAILED_TITLE; - - public static String RemotingLoginDialog_COULD_NOT_STOP_SERVER; - - public static String RemotingLoginDialog_ERROR_GENERATING_CONFIG_FILE; - - public static String RemotingLoginDialog_ERROR_STARTING_SERVER; - - public static String RemotingLoginDialog_ERROR_STOPPING_SERVER; - - public static String RemotingLoginDialog_GENERATING_CONFIG_FILE; - - public static String RemotingLoginDialog_JOB_SERVER_LAUNCH; - - public static String RemotingLoginDialog_STARTING_MGD_SERVER; - public static String RemotingLoginDialog_TASK_LAUNCHING_SERVER; public static String SearchManager_LARGE_RESULT_EXPECTED; public static String SearchManager_LONG_SEARCH_WARNING; - public static String SupplementalDataViewPart_VIEWER_NAME; + + public static String SupplementalDataPreferences_0; + + public static String SupplementalDataViewPart_VIEWER_NAME; public static String DeleteConfiguration_media_removeFromGallery; public static String DeleteConfiguration_media_deleteIfUsedInTaxonDescription; public static String DeleteConfiguration_media_deleteIfUsedSomeWhereElse; @@ -326,36 +234,21 @@ public class Messages extends NLS { public static String DeleteResultMessagingUtils_ABORT; - - public static String DeleteResultMessagingUtils_SUCCES; - public static String DeleteTermBaseOperation_CANNOT_DELETE_TERM; - + public static String DeleteTermBaseOperation_CANNOT_DELETE_TERM; public static String DeleteTermBaseOperation_CANNOT_DELETE_VOC; - - public static String DeleteTermBaseOperation_DELETE_ALL_TERMS_BEFORE; - - public static String DeleteTermBaseOperation_DELETE_FAILED; - - public static String DeleteTermBaseOperation_SYSTEM_TERM; - - public static String DeleteTermBaseOperation_SYSTEM_VOC; - - public static String DeleteTermBaseOperation_TERM_INCLUDES_OTHERS; - - public static String DeleteTermBaseOperation_TERM_INLCUDES; - - public static String DeleteTermBaseOperation_VOC_NOT_EMPTY; + public static String DescriptionPreferences_1; + public static String NewGrantedAuthority_AlreadyInDb; public static String SetSecundumConfiguration_IncludeAcceptedTaxa; @@ -398,7 +291,6 @@ public class Messages extends NLS { public static String DatabasePreferencesPage_SetPublishFlag; public static String ImportFromFileAndChooseVocIdWizardPage_AreaVoc; - public static String ImportFromFileAndChooseVocIdWizardOage_AreaVoc_toolTip; @@ -411,69 +303,32 @@ public class Messages extends NLS { public static String FeatureTreeDropAdapter_CHOOSE_VOC; - - public static String FeatureTreeDropAdapter_IMPORT_NOT_POSSIBLE; - - public static String FeatureTreeDropAdapter_MOVE_FAILED_SAVE_MESSAGE; - - public static String FeatureTreeDropAdapter_ONLY_MOVE_FEATURES; - - public static String FeatureTreeDropAdapter_ORDER_VOC_NOT_POSSIBLE; - public static String FeatureTreeEditorComposite_ADD_FEATURE; - - public static String FeatureTreeEditorComposite_FEATURE_TREE; - - public static String FeatureTreeEditorComposite_OPEN_TREE; - - public static String FeatureTreeEditorComposite_REMOVE_FEATURE; - public static String FeatureTreeSelectionDialog_CHOOSE_TREE; - - public static String FeatureTreeSelectionDialog_ENTER_LABEL; - - public static String FeatureTreeSelectionDialog_NEW_TREE; - - public static String FeatureTreeSelectionDialog_TREE_LABEL; public static String NonViralNameDetails_confirmDeleteOfZoologicalNameParts; - - public static String NonViralNameDetails_descriptionDeleteZoologicalNameParts; - - public static String NonViralNameDetails_confirmDeleteOfBacterialNameParts; - - public static String NonViralNameDetails_desciptionDeleteOfBacterialNameParts; - - public static String NonViralNameDetails_confirmDeleteOfFungiNameParts; - - public static String NonViralNameDetails_descriptionDeleteOfFungiNameParts; - - public static String NonViralNameDetails_confirmDeleteOfCultivarNameParts; - - public static String NonViralNameDetails_descriptionDeleteOfCultivarNameParts; - - public static String NameDetailsViewComposite_Show_TypeDesignation; + public static String NameDetailsViewComposite_Show_TypeDesignation; public static String NameDetailsViewComposite_Show_Namerelationships; public static String NameDetailsViewComposite_Show_Hybrid; public static String NameDetailsViewComposite_Show_NameApprobiation; @@ -493,8 +348,6 @@ public class Messages extends NLS { public static String NameDetailsViewComposite_Show_Protologue; public static String NameDetailsViewConfiguration_activateSimpleDetailsView; - - public static String NameDetailsViewConfiguration_description; public static String NameDetailsViewConfiguration_useLocalSettings; public static String NameDetailsViewConfiguration_description_not_available; @@ -506,8 +359,6 @@ public class Messages extends NLS { public static String SetPublishConfiguration_Publish; public static String SetPublishConfiguration_Publish_tooltip; public static String SetPublishConfiguration_Description_Configurator; - - public static String SetPublishConfiguration_IncludeAcceptedTaxa; public static String SetPublishConfiguration_IncludeSharedtaxa; public static String SetPublishConfiguration_IncludeSynonyms; @@ -519,11 +370,18 @@ public class Messages extends NLS { public static String ExcelTaxonUpdateWizard_ConfiguratorWizard_label; + public static String ExperimentalFeaturesPreferences; + + public static String SetPublishConfiguration_Title; public static String SetPublishConfiguration_publish; public static String SetPublishConfiguration_dont_publish; + public static String TaxonomicEditorGeneralPreferences_0; + public static String TaxonomicEditorGeneralPreferences_1; + + public static String TCSImportWizard_ConfiguratorWizard_label; @@ -565,17 +423,10 @@ public class Messages extends NLS { public static String AbcdImportProvider_description; public static String AvailableAreaVocabulariesPage_PAGE_DESCRIPTION; - - public static String AvailableAreaVocabulariesPage_PAGE_TITLE; - public static String AvailableDistributionPage_CHECK_MESSAGE; - - public static String AvailableDistributionPage_PAGE_DESCRIPTION; - - public static String AvailableDistributionPage_PAGE_TITLE; @@ -601,7 +452,6 @@ public class Messages extends NLS { public static String CheckBoxTreeComposite_TOGGLE_TREE_SELECTION; - public static String ChecklistEditorGeneralPreference_3; public static String ChecklistEditorGeneralPreference_enable; public static String GeneralPreference_allowOverride; public static String ChecklistEditorGeneralPreference_open_distribution_selection; @@ -645,15 +495,9 @@ public class Messages extends NLS { public static String SpecimenConfiguration_description; - public static String DatabasePreferncesPage_Show_IOMenu; - public static String Distribution_status_selection; - - - - public static String DistributionAdminPreferences_SELECT_STATUS; @@ -672,6 +516,10 @@ public class Messages extends NLS { public static String GeneralPreference_override; + public static String MediaPreferences_advanced; + public static String MediaPreferences_preview; + + @@ -685,19 +533,6 @@ public class Messages extends NLS { public static String PublishFlagPreference_description_not_allowed; - - - - - - - - - - - - - static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, Messages.class); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties index 16b273279..d188ebd61 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties @@ -13,14 +13,16 @@ LanguageEditorPreferencePage_ChooseDefaultLanguage=Please choose your default la LanguageEditorPreferencePage_EditorHasToRestart=The application has to be restarted, in order to complete the language switch.\nDo you want to restart now? LanguageEditorPreferencePage_PleaseRestart=Please Restart LanguageEditorPreferencePage_RestartRequired=After changing the default language, a restart is required,\nin order for the new settings to take effect. +LanguageRepresentationPreferencePage_global=Choose the global language that will be used throughout the editor to get representations in. +LanguageRepresentationPreferencePage_enable=Enable Multiple Language Editing Capability ListComponent_ADD_PROVIDER=Add Provider ListComponent_NO_PROVIDER_AVAILABLE=No Providers available ListComponent_REMOVE_PROVIDER=Remove Provider OpenCommonNameAreaWizardAdminHandler_COMMON_NAMES=Common Names OpenDistributionEditorWizardHandlerAdminE4_DISTRIBUTION=Distribution OpenDistributionEditorWizardHandlerE4_DISTRIBUTION=Distribution -OrderPreferencePage_NewNavigatorWindowRequired=After changing the order of the taxon nodes, closing and reopen of the taxon navigator is required. -OrderPreferencePage_PleaseReopenNavigator=Please close and reopen the taxon navigator. +OrderPreferences_Restore=Restore the last Taxon Navigator state. +OrderPreferences_Sorting=Sorting DatabaseRepairPage_chooseParameter=Please choose the trees where the sortIndex should be recalculated. DatabaseRepairPage_updateTaxonNodes=Taxonomic Tree DatabaseRepairPage_toolTip_taxonNode=The sort indexes of the taxonomic tree will be recalculated. @@ -150,11 +152,19 @@ PasswordWizardPage_REPEAT_PASSWORD=Repeat Password SearchManager_LARGE_RESULT_EXPECTED=Large result expected SearchManager_LONG_SEARCH_WARNING=The current search will return %s objects. This will take a long time and/or might render the editor unusable. Please consider refining your search.\nSearch anyway? +SupplementalDataPreferences_0=Show UUID and object ID in supplemental data view SupplementalDataViewPart_VIEWER_NAME=Supplemental Data + DefinedTermDropAdapterE4_MOVE_DESCRIPTIONS=Move Terms DefinedTermDropAdapterE4_MOVE_FAILED=Move failed DefinedTermDropAdapterE4_MOVE_FAILED_MESSAGE=Cannot move term onto itself or its children DefinedTermDropAdapterE4_MOVE_FAILED_SAVE_MESSAGE=Moving the term failed. Try saving before. + +DebugPreferences_0=Show up widget is disposed error messages. +DebugPreferences_1=Disable services api timestamp check +DefaultFeatureTreePreferenecs_0=Default Feature Tree to be used for textual descriptions +DefaultFeatureTreePreferenecs_1=Default Feature Tree to be used for structured descriptions + DefinedTermEditorE4_SAVE_MESSAGE=You have made changes that must be saved before this query can be executed. Would you like to save? DefinedTermEditorE4_SAVE_TITLE=Save changes DefinedTermMenu_FEATURE_TREE=Feature Tree @@ -233,6 +243,8 @@ ImportFromFileAndChooseVocIdWizardPage_AreaVoc=Area Vocabulary ImportFromFileAndChooseVocIdWizardOage_AreaVoc_toolTip=Please choose a vocabulary for the used areas. ExcelDistributionUpdateWizard_ConfiguratorWizard_label=Configure Excel distribution update AbstractImportWizard_ConfigurationLabel=Configure the Import +TaxonomicEditorGeneralPreferences_0=Run long running operations in background +TaxonomicEditorGeneralPreferences_1=Connect to last used datasource when launching TCSImportWizard_ConfiguratorWizard_label=Configure the TCS import FeatureTreeEditorComposite_ADD_FEATURE=Add a feature to this feature tree. FeatureTreeEditorComposite_FEATURE_TREE=Feature Tree @@ -283,6 +295,7 @@ SetPublishConfiguration_IncludeSynonyms=Synonyms ExcelSpecimenUpdateWizard_ConfiguratorWizard_label=Configuration of excel specimen import ExcelTaxonUpdateWizard_ConfiguratorWizard_label=Configuration of excel taxon import +ExperimentalFeaturesPreferences=Show experimental features SetPublishConfiguration_Title=Configuration for setting the publish flag SetPublishConfiguration_publish=publish @@ -398,14 +411,26 @@ Distribution_status_selection=Status Selection DatabasePreferncesPage_Show_MediaView=Show Media View DatabasePreferncesPage_Show_ChecklistPerspective=Show Checklist Perspective as default Perspective DatabasePreferncesPage_Show_TaxonNodeWizard=Taxon Nodes can be edited in Wizard + DistributionAdminPreferences_SELECT_STATUS=List of available distribution status +MediaPreferences_advanced=Show Advanced Media View in Details View +MediaPreferences_preview=Show Preview in Media View (Tree View) + + ToggleableText_ToolTip_closed=Cache is created automatically from atomized data, cache protected against manual entries ToggleableText_ToolTip_open=Cache can be edited manually, editing the atomized data has no effect on the cache (not recommended) + FeatureTreeDropAdapter_CHOOSE_VOC=Choose vocabulary for import FeatureTreeDropAdapter_IMPORT_NOT_POSSIBLE=Import not possible FeatureTreeDropAdapter_MOVE_FAILED_SAVE_MESSAGE=Moving the feature node failed. Try saving before. FeatureTreeDropAdapter_ONLY_MOVE_FEATURES=Can only move features to feature trees FeatureTreeDropAdapter_ORDER_VOC_NOT_POSSIBLE=The chosen vocabulary is an ordered vocabulary.\nImporting into ordered vocabularies is currently not supported. + +DefaultFeatureTreePreferenecs_0=Default Feature Tree to be used for textual descriptions +DefaultFeatureTreePreferenecs_1=Default Feature Tree to be used for structured descriptions +DescriptionPreferences_1=Show vocabulary id for term labels. +SupplementalDataPreferences_0=Show UUID and object ID in supplemental data view + diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties index d2f8bb94b..cea9779a7 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties @@ -409,3 +409,20 @@ FeatureTreeDropAdapter_MOVE_FAILED_SAVE_MESSAGE=Verschieben des Merkmalsknoten f FeatureTreeDropAdapter_ONLY_MOVE_FEATURES=Es ist nur möglich, Merkmale auf Merkmalsbäume zu verschieben. FeatureTreeDropAdapter_ORDER_VOC_NOT_POSSIBLE=Das gewählte Vokabular ist ein geordnetes Vokabular.\nImporte in geordnete Vokabulare sind aktuell nich unterstützt. +DebugPreferences_0=Zeige \"Widget is disposed\" Fehler Meldungen. +DebugPreferences_1=Deaktiviere die Überprüfung des API Timestamp + +DefaultFeatureTreePreferenecs_0=Default Merkmalsbaum für textuelle Faktendaten +DefaultFeatureTreePreferenecs_1=Default Merkmalsbaum für strukturelle Faktendaten +DescriptionPreferences_1=Zeige Vokabular ID im Label von Termen. +SupplementalDataPreferences_0=Zeige UUID und Objekt ID unter Zusatzdaten +MediaPreferences_advanced=Zeige erweiterten Media View im Details View +MediaPreferences_preview=Zeige Vorschau im Media View (Baumansicht) +ExperimentalFeaturesPreferences=Zeige experimentelle Features + +LanguageRepresentationPreferencePage_global=Wählen Sie die Sprache, für die im gesamten Editor die Repräsentationen ausgewählt werden sollen (sofern vorhanden). +LanguageRepresentationPreferencePage_enable=Aktiviere mehrsprachige Editierbarkeit + +OrderPreferences_Restore=Stelle den letzten Navigator Status wieder her. +OrderPreferences_Sorting=Sortierung + diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DebugPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DebugPreferences.java index bbaed72df..395183c0e 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DebugPreferences.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DebugPreferences.java @@ -10,6 +10,7 @@ package eu.etaxonomy.taxeditor.preference; import org.eclipse.jface.preference.BooleanFieldEditor; +import eu.etaxonomy.taxeditor.l10n.Messages; import eu.etaxonomy.taxeditor.preference.menu.FieldEditorPreferencePageE4; /** @@ -22,10 +23,10 @@ public class DebugPreferences extends FieldEditorPreferencePageE4 { @Override protected void createFieldEditors() { addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString(IPreferenceKeys.IS_SHOW_UP_WIDGET_IS_DISPOSED), - "Show up widget is disposed error messages.", + Messages.DebugPreferences_0, getFieldEditorParent())); addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString(IPreferenceKeys.DISABLE_SERVICES_API_TIMESTAMP_CHECK), - "Disable services api timestamp check", + Messages.DebugPreferences_1, getFieldEditorParent())); } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultFeatureTreePreferenecs.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultFeatureTreePreferenecs.java index fee1fbc50..93245b042 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultFeatureTreePreferenecs.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultFeatureTreePreferenecs.java @@ -27,6 +27,7 @@ import eu.etaxonomy.cdm.api.service.IFeatureTreeService; import eu.etaxonomy.cdm.model.description.FeatureTree; import eu.etaxonomy.taxeditor.featuretree.FeatureTreeContentProvider; import eu.etaxonomy.taxeditor.featuretree.FeatureTreeLabelProvider; +import eu.etaxonomy.taxeditor.l10n.Messages; import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.preference.menu.CdmPreferencePage; import eu.etaxonomy.taxeditor.store.CdmStore; @@ -63,7 +64,7 @@ public class DefaultFeatureTreePreferenecs extends CdmPreferencePage { private void createTextTreeSelection(Composite parent){ final CLabel label = new CLabel(parent, SWT.NONE); - label.setText("Default Feature Tree to be used for textual descriptions"); + label.setText(Messages.DefaultFeatureTreePreferenecs_0); final ListViewer viewer = new ListViewer(parent); viewer.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); @@ -94,7 +95,7 @@ public class DefaultFeatureTreePreferenecs extends CdmPreferencePage { private void createStructureTreeSelection(Composite parent){ final CLabel label = new CLabel(parent, SWT.NONE); - label.setText("Default Feature Tree to be used for structured descriptions"); + label.setText(Messages.DefaultFeatureTreePreferenecs_1); final ListViewer viewer = new ListViewer(parent); viewer.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); @@ -126,8 +127,8 @@ public class DefaultFeatureTreePreferenecs extends CdmPreferencePage { /** {@inheritDoc} */ @Override public boolean performOk() { - String defaultFeatureTreeForTextualDescriptionUuid = ""; - String defaultFeatureTreeForStructuredDescriptionUuid = ""; + String defaultFeatureTreeForTextualDescriptionUuid = ""; //$NON-NLS-1$ + String defaultFeatureTreeForStructuredDescriptionUuid = ""; //$NON-NLS-1$ if(defaultFeatureTreeForTextualDescription != null){ defaultFeatureTreeForTextualDescriptionUuid = defaultFeatureTreeForTextualDescription.getUuid().toString(); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DescriptionPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DescriptionPreferences.java index 24656dc52..c814faf3f 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DescriptionPreferences.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DescriptionPreferences.java @@ -11,6 +11,7 @@ package eu.etaxonomy.taxeditor.preference; import org.eclipse.jface.preference.BooleanFieldEditor; +import eu.etaxonomy.taxeditor.l10n.Messages; import eu.etaxonomy.taxeditor.preference.menu.FieldEditorPreferencePageE4; /** @@ -23,13 +24,13 @@ import eu.etaxonomy.taxeditor.preference.menu.FieldEditorPreferencePageE4; public class DescriptionPreferences extends FieldEditorPreferencePageE4 { /** Constant PLUGIN_ID="eu.etaxonomy.taxeditor.preferences.desc"{trunked} */ - public static final String PLUGIN_ID = "eu.etaxonomy.taxeditor.preferences.description"; + public static final String PLUGIN_ID = "eu.etaxonomy.taxeditor.preferences.description"; //$NON-NLS-1$ @Override protected void createFieldEditors() { addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString(IPreferenceKeys.SHOW_VOCABULARY_ID_FOR_TERM_LABELS), - "Show vocabulary id for term labels.", + Messages.DescriptionPreferences_1, getFieldEditorParent())); } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ExperimentalFeaturesPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ExperimentalFeaturesPreferences.java new file mode 100755 index 000000000..7f483907e --- /dev/null +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ExperimentalFeaturesPreferences.java @@ -0,0 +1,34 @@ +/** +* Copyright (C) 2019 EDIT +* European Distributed Institute of Taxonomy +* http://www.e-taxonomy.eu +* +* The contents of this file are subject to the Mozilla Public License Version 1.1 +* See LICENSE.TXT at the top of this package for the full license terms. +*/ +package eu.etaxonomy.taxeditor.preference; + +import org.eclipse.jface.preference.BooleanFieldEditor; + +import eu.etaxonomy.taxeditor.l10n.Messages; +import eu.etaxonomy.taxeditor.preference.menu.FieldEditorPreferencePageE4; + +/** + * @author k.luther + * @since 18.01.2019 + * + */ +public class ExperimentalFeaturesPreferences extends FieldEditorPreferencePageE4 { + + /** + * {@inheritDoc} + */ + @Override + protected void createFieldEditors() { + addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString( + IPreferenceKeys.SHOW_EXPERIMENTAL_FEATURES), + Messages.ExperimentalFeaturesPreferences, getFieldEditorParent())); + + } + +} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ExternalServicesPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ExternalServicesPreferences.java new file mode 100755 index 000000000..6352f0c9d --- /dev/null +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ExternalServicesPreferences.java @@ -0,0 +1,49 @@ +/** +* Copyright (C) 2019 EDIT +* European Distributed Institute of Taxonomy +* http://www.e-taxonomy.eu +* +* The contents of this file are subject to the Mozilla Public License Version 1.1 +* See LICENSE.TXT at the top of this package for the full license terms. +*/ +package eu.etaxonomy.taxeditor.preference; + +import org.eclipse.jface.preference.IntegerFieldEditor; +import org.eclipse.jface.preference.StringFieldEditor; + +import eu.etaxonomy.taxeditor.databaseAdmin.wizard.SpacerFieldEditor; +import eu.etaxonomy.taxeditor.preference.menu.FieldEditorPreferencePageE4; + +/** + * @author k.luther + * @since 18.01.2019 + * + */ +public class ExternalServicesPreferences extends FieldEditorPreferencePageE4 { + + /** + * {@inheritDoc} + */ + @Override + protected void createFieldEditors() { + addField(new StringFieldEditor( + PreferencesUtil.createPreferenceString(IPreferenceKeys.OPENURL_ACCESS_POINT), + "Mobot Open Url Service Access Point:", getFieldEditorParent())); + addField(new IntegerFieldEditor( + PreferencesUtil.createPreferenceString(IPreferenceKeys.OPENURL_IMAGE_MAX_WIDTH), + "Image Maximum Width:", + getFieldEditorParent())); + addField(new IntegerFieldEditor( + PreferencesUtil.createPreferenceString(IPreferenceKeys.OPENURL_IMAGE_MAX_HEIGHT), + "Image Maximum Height:", + getFieldEditorParent())); + SpacerFieldEditor spacer1 = new SpacerFieldEditor( + getFieldEditorParent()); + + addField(new StringFieldEditor(PreferencesUtil.createPreferenceString( + IPreferenceKeys.EDIT_MAP_SERVICE_ACCES_POINT), + "EDIT Map Service Access Point:", getFieldEditorParent())); + + } + +} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/LanguageRepresentationPreferencePage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/LanguageRepresentationPreferencePage.java index c3541ce50..aa7057e6e 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/LanguageRepresentationPreferencePage.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/LanguageRepresentationPreferencePage.java @@ -23,6 +23,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import eu.etaxonomy.cdm.model.common.Language; +import eu.etaxonomy.taxeditor.l10n.Messages; import eu.etaxonomy.taxeditor.preference.menu.CdmPreferencePage; import eu.etaxonomy.taxeditor.store.CdmStore; @@ -71,7 +72,7 @@ public class LanguageRepresentationPreferencePage extends CdmPreferencePage{ composite.setLayout(new RowLayout(1)); final Label label = new Label(composite, SWT.NONE); - label.setText("Choose the global language that will be used throughout the editor to get representations in."); + label.setText(Messages.LanguageRepresentationPreferencePage_global); final Combo combo_globalLanguage = new Combo(composite, SWT.NONE); @@ -108,7 +109,7 @@ public class LanguageRepresentationPreferencePage extends CdmPreferencePage{ final Button button_toggle = new Button(composite, SWT.CHECK); - button_toggle.setText("Enable Multiple Language Editing Capability"); + button_toggle.setText(Messages.LanguageRepresentationPreferencePage_enable); button_toggle.setSelection(isMultilanguageTextEditingCapability); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/MediaPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/MediaPreferences.java index 21255cd0f..0d7508adb 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/MediaPreferences.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/MediaPreferences.java @@ -10,6 +10,7 @@ package eu.etaxonomy.taxeditor.preference; import org.eclipse.jface.preference.BooleanFieldEditor; +import eu.etaxonomy.taxeditor.l10n.Messages; import eu.etaxonomy.taxeditor.preference.menu.FieldEditorPreferencePageE4; /** @@ -22,10 +23,10 @@ public class MediaPreferences extends FieldEditorPreferencePageE4 { @Override protected void createFieldEditors() { addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString(IPreferenceKeys.SHOW_ADVANCED_MEDIA_SECTION), - "Show Advanced Media Section", + Messages.MediaPreferences_advanced, getFieldEditorParent())); addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString(IPreferenceKeys.SHOW_MEDIA_PREVIEW), - "Show Preview in Media View", + Messages.MediaPreferences_preview, getFieldEditorParent())); } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NamePreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NamePreferences.java new file mode 100755 index 000000000..f691dce10 --- /dev/null +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NamePreferences.java @@ -0,0 +1,32 @@ +/** +* Copyright (C) 2019 EDIT +* European Distributed Institute of Taxonomy +* http://www.e-taxonomy.eu +* +* The contents of this file are subject to the Mozilla Public License Version 1.1 +* See LICENSE.TXT at the top of this package for the full license terms. +*/ +package eu.etaxonomy.taxeditor.preference; + +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; + +import eu.etaxonomy.taxeditor.preference.menu.CdmPreferencePage; + +/** + * @author k.luther + * @since 18.01.2019 + * + */ +public class NamePreferences extends CdmPreferencePage { + + /** + * {@inheritDoc} + */ + @Override + protected Control createContents(Composite parent) { + noDefaultAndApplyButton(); + return null; + } + +} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/OrderPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/OrderPreferences.java index 3e64b0be4..3378377d1 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/OrderPreferences.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/OrderPreferences.java @@ -34,7 +34,7 @@ public class OrderPreferences extends CdmPreferencePage implements SelectionList secondComposite.setLayout(new GridLayout()); final Button activateRestoreNavigatorButton = new Button(secondComposite, SWT.CHECK | SWT.LEFT); - activateRestoreNavigatorButton.setText("Restore the last Taxon Navigator state."); + activateRestoreNavigatorButton.setText(Messages.OrderPreferences_Restore); activateRestoreNavigatorButton.setSelection(isRestoreTaxonNavigator); activateRestoreNavigatorButton.addSelectionListener(new SelectionAdapter(){ @Override @@ -53,7 +53,7 @@ public class OrderPreferences extends CdmPreferencePage implements SelectionList composite.setLayout(new GridLayout()); Label label = new Label(composite, SWT.NONE); - label.setText("Sorting"); + label.setText(Messages.OrderPreferences_Sorting); GridData gridData = new GridData(); gridData = new GridData(GridData.BEGINNING, GridData.CENTER, true, false); @@ -83,7 +83,7 @@ public class OrderPreferences extends CdmPreferencePage implements SelectionList orderSelectionCombo.addSelectionListener(this); final Label description = new Label(parent, SWT.NONE); - description.setText(Messages.OrderPreferencePage_NewNavigatorWindowRequired); + description.setText(""); //$NON-NLS-1$ return composite; } @@ -94,7 +94,7 @@ public class OrderPreferences extends CdmPreferencePage implements SelectionList if (this.orderActivated != null){ PreferencesUtil.setSortNodes(this.orderActivated); PreferencesUtil.setStoreNavigatorState(isRestoreTaxonNavigator); - MessageDialog.openInformation(getShell(), null, Messages.OrderPreferencePage_PleaseReopenNavigator); + MessageDialog.openInformation(getShell(), null, ""); //$NON-NLS-1$ } return super.performOk(); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SearchDialogPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SearchDialogPreferences.java new file mode 100755 index 000000000..7ac710709 --- /dev/null +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SearchDialogPreferences.java @@ -0,0 +1,49 @@ +/** +* Copyright (C) 2018 EDIT +* European Distributed Institute of Taxonomy +* http://www.e-taxonomy.eu +* +* The contents of this file are subject to the Mozilla Public License Version 1.1 +* See LICENSE.TXT at the top of this package for the full license terms. +*/ +package eu.etaxonomy.taxeditor.preference; + +import org.eclipse.jface.preference.BooleanFieldEditor; + +import eu.etaxonomy.taxeditor.preference.menu.FieldEditorPreferencePageE4; + +/** + * @author k.luther + * @since 16.10.2018 + * + */ +public class SearchDialogPreferences extends FieldEditorPreferencePageE4 { + + /** + * {@inheritDoc} + */ + @Override + protected void createFieldEditors() { + addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString(IPreferenceKeys.SHOW_ID_IN_ENTITY_SELECTION_DIAOLOG), + "Show object id in entity selection dialogs", + getFieldEditorParent())); + addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString(IPreferenceKeys.IS_SEARCH_FOR_IDENTIFIER_AS_DEFAULT), + "Set search for Identifier as default.", + getFieldEditorParent())); + addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString(IPreferenceKeys.SEARCH_FOR_IDENTIFIER_AND_TITLECACHE), + "Search for identifier and titleCache, if identifier search is enabled", + getFieldEditorParent())); + + addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString(IPreferenceKeys.SORT_TAXA_BY_RANK_AND_NAME), + "In selection dialogs for taxa, sort by rank and name", + getFieldEditorParent())); + addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString( + IPreferenceKeys.FILTER_COMMON_NAME_REFERENCES), + "Filter common name references", getFieldEditorParent())); + + + + + } + +} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SearchPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SearchPreferences.java index 0b7a80e92..3a35cd4f2 100755 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SearchPreferences.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SearchPreferences.java @@ -1,5 +1,5 @@ /** -* Copyright (C) 2018 EDIT +* Copyright (C) 2019 EDIT * European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu * @@ -8,34 +8,25 @@ */ package eu.etaxonomy.taxeditor.preference; -import org.eclipse.jface.preference.BooleanFieldEditor; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; -import eu.etaxonomy.taxeditor.preference.menu.FieldEditorPreferencePageE4; +import eu.etaxonomy.taxeditor.preference.menu.CdmPreferencePage; /** * @author k.luther - * @since 16.10.2018 + * @since 18.01.2019 * */ -public class SearchPreferences extends FieldEditorPreferencePageE4 { +public class SearchPreferences extends CdmPreferencePage { /** * {@inheritDoc} */ @Override - protected void createFieldEditors() { - - addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString(IPreferenceKeys.IS_SEARCH_FOR_IDENTIFIER_AS_DEFAULT), - "Set search for Identifier as default.", - getFieldEditorParent())); - addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString(IPreferenceKeys.SEARCH_FOR_IDENTIFIER_AND_TITLECACHE), - "Search for identifier and titleCache, if identifier search is enabled", - getFieldEditorParent())); - - - - - + protected Control createContents(Composite parent) { + // TODO Auto-generated method stub + return null; } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SupplementalDataPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SupplementalDataPreferences.java new file mode 100755 index 000000000..b3831ff0f --- /dev/null +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SupplementalDataPreferences.java @@ -0,0 +1,33 @@ +/** +* Copyright (C) 2019 EDIT +* European Distributed Institute of Taxonomy +* http://www.e-taxonomy.eu +* +* The contents of this file are subject to the Mozilla Public License Version 1.1 +* See LICENSE.TXT at the top of this package for the full license terms. +*/ +package eu.etaxonomy.taxeditor.preference; + +import org.eclipse.jface.preference.BooleanFieldEditor; + +import eu.etaxonomy.taxeditor.l10n.Messages; +import eu.etaxonomy.taxeditor.preference.menu.FieldEditorPreferencePageE4; + +/** + * @author k.luther + * @since 18.01.2019 + * + */ +public class SupplementalDataPreferences extends FieldEditorPreferencePageE4 { + + /** + * {@inheritDoc} + */ + @Override + protected void createFieldEditors() { + addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString(IPreferenceKeys.SHOW_DEBUG_INFORMATION), + Messages.SupplementalDataPreferences_0, + getFieldEditorParent())); + } + +} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonPreferences.java new file mode 100755 index 000000000..23744233d --- /dev/null +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonPreferences.java @@ -0,0 +1,32 @@ +/** +* Copyright (C) 2019 EDIT +* European Distributed Institute of Taxonomy +* http://www.e-taxonomy.eu +* +* The contents of this file are subject to the Mozilla Public License Version 1.1 +* See LICENSE.TXT at the top of this package for the full license terms. +*/ +package eu.etaxonomy.taxeditor.preference; + +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; + +import eu.etaxonomy.taxeditor.preference.menu.CdmPreferencePage; + +/** + * @author k.luther + * @since 18.01.2019 + * + */ +public class TaxonPreferences extends CdmPreferencePage { + + /** + * {@inheritDoc} + */ + @Override + protected Control createContents(Composite parent) { + // TODO Auto-generated method stub + return null; + } + +} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonSearchPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonSearchPreferences.java new file mode 100755 index 000000000..ad7dc4b75 --- /dev/null +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonSearchPreferences.java @@ -0,0 +1,33 @@ +/** +* Copyright (C) 2019 EDIT +* European Distributed Institute of Taxonomy +* http://www.e-taxonomy.eu +* +* The contents of this file are subject to the Mozilla Public License Version 1.1 +* See LICENSE.TXT at the top of this package for the full license terms. +*/ +package eu.etaxonomy.taxeditor.preference; + +import org.eclipse.jface.preference.BooleanFieldEditor; + +import eu.etaxonomy.taxeditor.preference.menu.FieldEditorPreferencePageE4; + +/** + * @author k.luther + * @since 18.01.2019 + * + */ +public class TaxonSearchPreferences extends FieldEditorPreferencePageE4{ + + /** + * {@inheritDoc} + */ + @Override + protected void createFieldEditors() { + addField(new BooleanFieldEditor(IPreferenceKeys.SEARCH_OPEN_RESULTS_IN_SEPARATE_WINDOWS, + "Open search results in separate windows", + getFieldEditorParent())); + + } + +} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicEditorGeneralPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicEditorGeneralPreferences.java index 9282817cd..24b8d03d2 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicEditorGeneralPreferences.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicEditorGeneralPreferences.java @@ -10,7 +10,6 @@ package eu.etaxonomy.taxeditor.preference; import org.eclipse.jface.preference.BooleanFieldEditor; -import org.eclipse.jface.preference.StringFieldEditor; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.RowLayout; @@ -18,6 +17,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.internal.IPreferenceConstants; import org.eclipse.ui.internal.Workbench; +import eu.etaxonomy.taxeditor.l10n.Messages; import eu.etaxonomy.taxeditor.preference.menu.FieldEditorPreferencePageE4; /** @@ -37,39 +37,39 @@ public class TaxonomicEditorGeneralPreferences extends @Override protected void createFieldEditors() { runInBackgroundEditor = new BooleanFieldEditor(IPreferenceConstants.RUN_IN_BACKGROUND, - "Run long running operations in background", + Messages.TaxonomicEditorGeneralPreferences_0, getFieldEditorParent()); addField(runInBackgroundEditor); - addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString(IPreferenceKeys.SHOW_DEBUG_INFORMATION), - "Show UUID and object ID in supplemental data view", - getFieldEditorParent())); - addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString(IPreferenceKeys.SHOW_ID_IN_ENTITY_SELECTION_DIAOLOG), - "Show object id in entity selection dialogs", - getFieldEditorParent())); - addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString( - IPreferenceKeys.SHOULD_EXPAND_SECTION_WHEN_DATA_AVAILABLE), - "Should expand sections when data is available (Details View). This might make the Editor slow.", - getFieldEditorParent())); - addField(new StringFieldEditor(PreferencesUtil.createPreferenceString( - IPreferenceKeys.EDIT_MAP_SERVICE_ACCES_POINT), - "EDIT Map Service Access Point:", getFieldEditorParent())); +// addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString(IPreferenceKeys.SHOW_DEBUG_INFORMATION), +// "Show UUID and object ID in supplemental data view", +// getFieldEditorParent())); +// addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString(IPreferenceKeys.SHOW_ID_IN_ENTITY_SELECTION_DIAOLOG), +// "Show object id in entity selection dialogs", +// getFieldEditorParent())); +// addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString( +// IPreferenceKeys.SHOULD_EXPAND_SECTION_WHEN_DATA_AVAILABLE), +// "Should expand sections when data is available (Details View). This might make the Editor slow.", +// getFieldEditorParent())); +// addField(new StringFieldEditor(PreferencesUtil.createPreferenceString( +// IPreferenceKeys.EDIT_MAP_SERVICE_ACCES_POINT), +// "EDIT Map Service Access Point:", getFieldEditorParent())); addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString( IPreferenceKeys.SHOULD_CONNECT_AT_STARTUP), - "Connect to last used datasource when launching", + Messages.TaxonomicEditorGeneralPreferences_1, getFieldEditorParent())); - addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString( - IPreferenceKeys.SHOW_EXPERIMENTAL_FEATURES), - "Show experimental features", getFieldEditorParent())); - addField(new BooleanFieldEditor(IPreferenceKeys.SEARCH_OPEN_RESULTS_IN_SEPARATE_WINDOWS, - "Open search results in separate windows", - getFieldEditorParent())); - addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString(IPreferenceKeys.SORT_TAXA_BY_RANK_AND_NAME), - "In selection dialogs for taxa, sort by rank and name", - getFieldEditorParent())); - addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString( - IPreferenceKeys.FILTER_COMMON_NAME_REFERENCES), - "Filter common name references", getFieldEditorParent())); +// addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString( +// IPreferenceKeys.SHOW_EXPERIMENTAL_FEATURES), +// "Show experimental features", getFieldEditorParent())); +// addField(new BooleanFieldEditor(IPreferenceKeys.SEARCH_OPEN_RESULTS_IN_SEPARATE_WINDOWS, +// "Open search results in separate windows", +// getFieldEditorParent())); +// addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString(IPreferenceKeys.SORT_TAXA_BY_RANK_AND_NAME), +// "In selection dialogs for taxa, sort by rank and name", +// getFieldEditorParent())); +// addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString( +// IPreferenceKeys.FILTER_COMMON_NAME_REFERENCES), +// "Filter common name references", getFieldEditorParent())); Composite composite = new Composite(getFieldEditorParent(), SWT.NULL); composite.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 2, 1)); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/UIPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/UIPreferences.java new file mode 100755 index 000000000..4382be535 --- /dev/null +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/UIPreferences.java @@ -0,0 +1,34 @@ +/** +* Copyright (C) 2019 EDIT +* European Distributed Institute of Taxonomy +* http://www.e-taxonomy.eu +* +* The contents of this file are subject to the Mozilla Public License Version 1.1 +* See LICENSE.TXT at the top of this package for the full license terms. +*/ +package eu.etaxonomy.taxeditor.preference; + +import org.eclipse.jface.preference.BooleanFieldEditor; + +import eu.etaxonomy.taxeditor.preference.menu.FieldEditorPreferencePageE4; + +/** + * @author k.luther + * @since 18.01.2019 + * + */ +public class UIPreferences extends FieldEditorPreferencePageE4 { + + /** + * {@inheritDoc} + */ + @Override + protected void createFieldEditors() { + addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString( + IPreferenceKeys.SHOULD_EXPAND_SECTION_WHEN_DATA_AVAILABLE), + "Expand sections when data are available in Details View. This might make the Editor slow.", + getFieldEditorParent())); + + } + +} -- 2.34.1