unification in preferences

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java
index f8a302972746046060cd124baad10d81b4c0d3fb..35ecc1e521dec53a9859b8b4da84f36af3d20fe1 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java
@@ -80,7 +80,10 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
 
         if (isAllowOverride || isAdminPreference){
             Composite activateComp = createComposite(composite);
-
+            Label separator= new Label(activateComp, SWT.HORIZONTAL | SWT.SEPARATOR);
+            GridData sepGrid = createTextGridData();
+            separator.setLayoutData(sepGrid);
+            separator.setVisible(false);
             final Button activateCheckButton = new Button(activateComp, SWT.CHECK);
             activateCheckButton.setText(Messages.ChecklistEditorGeneralPreference_enable);
             activateCheckButton.setSelection(isEditorActivated);
@@ -128,8 +131,8 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
             child  = createComposite(composite);
 
             child.setVisible(isEditorActivated);
-            Label separator= new Label(child, SWT.HORIZONTAL | SWT.SEPARATOR);
-            GridData sepGrid = createTextGridData();
+            separator= new Label(child, SWT.HORIZONTAL | SWT.SEPARATOR);
+            sepGrid = createTextGridData();
 
             GridData textGrid = createTextGridData();
             textGrid.verticalSpan = 2;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralPreferencePage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralPreferencePage.java
index 98bc8f7f9b94055cbb7afff9ffb9fb6e1e72ca9a..33882870fea761705c0773c29f916c944e099523 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralPreferencePage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralPreferencePage.java
@@ -11,9 +11,11 @@ package eu.etaxonomy.taxeditor.preference;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
 
 import eu.etaxonomy.cdm.model.metadata.CdmPreference;
 import eu.etaxonomy.taxeditor.l10n.Messages;
@@ -48,7 +50,11 @@ public class GeneralPreferencePage extends CdmPreferencePage {
         getValues();
         final Composite composite = createComposite(parent);
 
+        GridData gridData = createTextGridData();
 
+        Label separator= new Label(composite, SWT.HORIZONTAL | SWT.SEPARATOR);
+        separator.setLayoutData(gridData);
+        separator.setVisible(false);
         final Button showIOMenuButton = new Button(composite, SWT.CHECK);
         showIOMenuButton.setText(Messages.DatabasePreferncesPage_Show_IOMenu);
         showIOMenuButton.setSelection(isShowIOMenu);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SpecimenOrObservationPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SpecimenOrObservationPreferences.java
index 15cc63ccba8629b7b62be68aefe79c3a7a4e2be9..d996e422929a8ede3f4f2b9541caeea768cf7536 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SpecimenOrObservationPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SpecimenOrObservationPreferences.java
@@ -85,7 +85,11 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage {
         Label label = new Label(parent, SWT.NONE);
         label.setText(DESCRIPTION);
         Composite titleComp = createComposite(parent);
+        GridData gridData = createTextGridData();
 
+        Label separator= new Label(titleComp, SWT.HORIZONTAL | SWT.SEPARATOR);
+        separator.setLayoutData(gridData);
+        separator.setVisible(false);
         final Button showSpecimenButton = new Button(titleComp, SWT.CHECK);
 
         showSpecimenButton.setText(Messages.DatabasePreferncesPage_Show_Specimen);
@@ -106,6 +110,8 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage {
               }
          });
         Button allowOverrideIsShowSpecimenRelatedIssuesButton = createAllowOverrideButton(titleComp);
+
+
         if (isAdminPreference){
             allowOverrideIsShowSpecimenRelatedIssuesButton.setSelection(allowOverrideShowSpecimenRelatedIssues);
             allowOverrideIsShowSpecimenRelatedIssuesButton.addSelectionListener(new SelectionAdapter(){
@@ -131,9 +137,9 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage {
         }
         composite = createComposite(parent);
         composite.setEnabled(isShowSpecimenRelatedIssues);
-        GridData gridData = createTextGridData();
+        gridData = createTextGridData();
 
-        Label separator= new Label(composite, SWT.HORIZONTAL | SWT.SEPARATOR);
+        separator= new Label(composite, SWT.HORIZONTAL | SWT.SEPARATOR);
         separator.setLayoutData(gridData);
 
         final Button showCollectingAreaInGeneralSectionButton = new Button(composite, SWT.CHECK);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CdmPreferencePage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CdmPreferencePage.java
index ea2a7ca37f41cb0b06d669e89709769f57218782..58f61703218adbcf85eeca5ece6585254ba731b0 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CdmPreferencePage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CdmPreferencePage.java
@@ -85,10 +85,12 @@ public abstract class CdmPreferencePage extends PreferencePage implements IE4Pre
         Composite activateComp = new Composite(composite, SWT.NULL);
         GridLayout layout = new GridLayout();
         layout.numColumns = 2;
+
         activateComp.setLayout(layout);
-        GridData gridData = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
+        GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
 
         activateComp.setLayoutData(gridData);
+
         return activateComp;
     }