ref #7163: adapt labels and structure in local preferences

diff --git a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties
index 19eed76e9334981476591599a977608bc1f344f5..7afd5bdc40027e7e0c318c4ec7d360aba20f4290 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties
+++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties
@@ -30,6 +30,7 @@ page.name.37 = Cdm Preferences
 page.name.38 = General\r
 page.name.39 = Nomenclatural Code\r
 page.name.100 = Distribution\r
+page.name.101 = Term-Editor\r
 view.name = Datasource\r
 view.name.0 = Progress\r
 view.name.1 = Message\r
@@ -199,7 +200,8 @@ page.name.46 = Publish Flag
 page.name.47 = Common Names\r
 page.name.48 = Search Dialogs\r
 command.name.111 = Open Admin Distributionstatus-Wizard\r
-command.name.112 = Open Admin CommonNameArea-Wizard
+command.name.112 = Open Admin CommonNameArea-Wizard\r
+command.name.120 = Open CommonNameArea-Wizard
 handledmenuitem.label.1 = New Feature Tree
 handledmenuitem.label.2 = Add Child Feature
 handledmenuitem.label.3 = Add Feature

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 d844f57f6f00ecf0a986d474c0b5bd5b14c79530..1ac8cad4606e93887e1c3a2d715148e11615863f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties
+++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties
@@ -1,7 +1,7 @@
 #Properties file for eu.etaxonomy.taxeditor.store, German
 page.name = Lokale Pr\u00e4ferenzen
 page.name.0 = Faktendaten
-page.name.1 = Merkmal
+page.name.1 = Merkmale
 page.name.2 = Verbreitungsstatus
 page.name.3 = Taxonomisch
 page.name.4 = Nomenklatur-Code
@@ -14,22 +14,23 @@ page.name.10 = Verf\u00fcgbare Sprachen
 page.name.11 = Marker
 page.name.12 = Erweiterungen
 page.name.13 = Typusarten (Namen)
-page.name.14 = Gebiete
+page.name.14 = Gebietstypen
 page.name.15 = Matching
 page.name.16 = Taxonnamen Matching-Strategie
 page.name.17 = Referenz Matching-Strategie
 page.name.18 = Team oder Personen Matching-Strategie
 page.name.19 = Stadium
-page.name.20 = Konservierungsmethode
+page.name.20 = Konservierungsmethoden
 page.name.22 = Standard Merkmalsbaum
 page.name.23 = Repr\u00e4sentation
 page.name.24 = Mobot Open Url
 page.name.25 = Typus
-page.name.36 = Namensdetails
+page.name.36 = Name Details View
 page.name.37 = CDM Präferenzen
 page.name.38 = Allgemeine CDM Präferenzen
 page.name.39 = Nomenklatur-Code
 page.name.100 = Verbreitungs-Daten
+page.name.101 = Term-Editor
 view.name = Datenquelle
 view.name.0 = Fortschritt
 view.name.1 = Nachrichten
@@ -197,7 +198,7 @@ extension-point.name.1 = Admin Pr
 page.name.45 = Specimen
 page.name.46 = Publish Flag
 page.name.47 = Trivialnamen
-page.name.48 = Such Dialoge
+page.name.48 = Auswahldialoge
 command.name.111 = \u00d6ffne Admin Verbreitungsstatus-Wizard
 command.name.112 = \u00d6ffne Admin Common Name Areal-Wizard
 handledmenuitem.label.1 = Neuer Merkmalsbaum

diff --git a/eu.etaxonomy.taxeditor.store/plugin.xml b/eu.etaxonomy.taxeditor.store/plugin.xml
index a56be32bf7b2c5624a90a72f7ded776d94e9ebf1..187cfc5c5bf72fffe783be360e5fedcd2c2185d0 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/plugin.xml
+++ b/eu.etaxonomy.taxeditor.store/plugin.xml
@@ -393,9 +393,15 @@
    </page>
    <page
          category="eu.etaxonomy.taxeditor.preferences.general"
-         class="eu.etaxonomy.taxeditor.preference.DescriptionPreferences"
+         class="eu.etaxonomy.taxeditor.preference.FactualDataPreference"
          id="eu.etaxonomy.taxeditor.preferences.description"
          name="%page.name.0">
+   </page>
+    <page
+         category="eu.etaxonomy.taxeditor.preferences.description"
+         class="eu.etaxonomy.taxeditor.preference.DescriptionPreferences"
+         id="eu.etaxonomy.taxeditor.preferences.termEditor"
+         name="%page.name.101">
    </page>
    <page
          category="eu.etaxonomy.taxeditor.preferences.description"
@@ -458,7 +464,7 @@
          name="%page.name.13">
    </page>
    <page
-         category="eu.etaxonomy.taxeditor.preferences.language"
+         category="eu.etaxonomy.taxeditor.preference.defaultlanguagepditorpreferencePage"
          class="eu.etaxonomy.taxeditor.preference.menu.LanguageMenuPreferences"
          id="eu.etaxonomy.taxeditor.preferences.languages"
          name="%page.name.10">
@@ -502,13 +508,13 @@
    <page
          category="eu.etaxonomy.taxeditor.preferences.matching"
          class="eu.etaxonomy.taxeditor.preference.matching.ReferenceMatchingPreference"
-         id="eu.etaxonomy.taxeditor.preferences.matching"
+         id="eu.etaxonomy.taxeditor.preferences.matching.reference"
          name="%page.name.17">
    </page>
    <page
          category="eu.etaxonomy.taxeditor.preferences.matching"
          class="eu.etaxonomy.taxeditor.preference.matching.TeamOrPersonMatchingPreference"
-         id="eu.etaxonomy.taxeditor.preferences.matching"
+         id="eu.etaxonomy.taxeditor.preferences.matching.teamOrPerson"
          name="%page.name.18">
    </page>
    <page
@@ -524,7 +530,7 @@
          name="%page.name.20">
    </page>
    <page
-         category="eu.etaxonomy.taxeditor.preferences.feature"
+         category="eu.etaxonomy.taxeditor.preferences.description"
          class="eu.etaxonomy.taxeditor.preference.DefaultFeatureTreePreferenecs"
          id="eu.etaxonomy.taxeditor.preferences.defaultFeatureTreePreferenecs"
          name="%page.name.22">

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/FactualDataPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/FactualDataPreference.java
new file mode 100755 (executable)
index 0000000..4e180ee
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/FactualDataPreference.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 28 Jan 2019
+ *
+ */
+public class FactualDataPreference 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/MediaPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/MediaPreferences.java
index 0d7508adbe00734b105719b957ef4f82d86d5e35..85f5f2c8628feba2ac71126fe9926365f13acf94 100644 (file)
--- 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
@@ -22,9 +22,11 @@ public class MediaPreferences extends FieldEditorPreferencePageE4 {
 
     @Override
     protected void createFieldEditors() {
-        addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString(IPreferenceKeys.SHOW_ADVANCED_MEDIA_SECTION),
+
+       addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString(IPreferenceKeys.SHOW_ADVANCED_MEDIA_SECTION),
                 Messages.MediaPreferences_advanced,
                 getFieldEditorParent()));
+
         addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString(IPreferenceKeys.SHOW_MEDIA_PREVIEW),
                 Messages.MediaPreferences_preview,
                 getFieldEditorParent()));