adapting layout in RemotingLoginDialog

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/RemotingLoginDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/RemotingLoginDialog.java
index 8bd83a6e9cbe50641f14d42a225109bf30501110..c76d219ca6f378a0bf6bac32060402d4eebddb19 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/RemotingLoginDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/RemotingLoginDialog.java
@@ -159,8 +159,8 @@ public class RemotingLoginDialog extends Dialog implements ICDMServerError {
     private Text txtEditorCdmVersion;
 
     private final int MESSAGE_HEIGHT = 50;
-    private final int COMBO_MIN_WIDTH = 150;
-//  private final int MIN_HEIGHT = 220;
+    private final int COMBO_MIN_WIDTH =200;
+    private final int CONTROLS_MIN_HEIGHT = 23; //does not seem to work yet
 //  private final int MIN_EXP_HEIGHT = 380;
 
     private boolean autoConnect = false;
@@ -265,14 +265,15 @@ public class RemotingLoginDialog extends Dialog implements ICDMServerError {
                 onRefreshCdmServer();
             }
         });
-        GridData gd_comboCdmServer = new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1);
+        GridData gd_comboCdmServer = new GridData(SWT.FILL, SWT.CENTER, true, true, 1, 1);
         comboCdmServer.setLayoutData(gd_comboCdmServer);
         comboCdmServer.select(0);
 
         txtCdmServerStatus = new Text(cdmServerComposite, SWT.BORDER);
         txtCdmServerStatus.setBackground(SWTResourceManager.getColor(SWT.COLOR_INFO_BACKGROUND));
         txtCdmServerStatus.setEditable(false);
-        GridData gd_txtCdmServerStatus = new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1);
+        GridData gd_txtCdmServerStatus = new GridData(SWT.FILL, SWT.CENTER, true, true, 1, 1);
+        gd_txtCdmServerStatus.minimumHeight = CONTROLS_MIN_HEIGHT;
         txtCdmServerStatus.setLayoutData(gd_txtCdmServerStatus);
 
         btnCdmServerRefresh = new Button(cdmServerComposite, SWT.NONE);
@@ -282,12 +283,14 @@ public class RemotingLoginDialog extends Dialog implements ICDMServerError {
                 onRefreshCdmServer();
             }
         });
-        btnCdmServerRefresh.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
+        GridData gd_btnCdmServerRefresh = new GridData(SWT.FILL, SWT.CENTER, true, true, 1, 1);
+        gd_btnCdmServerRefresh.minimumHeight = CONTROLS_MIN_HEIGHT;
+        btnCdmServerRefresh.setLayoutData(gd_btnCdmServerRefresh);
         btnCdmServerRefresh.setText(Messages.RemotingLoginDialog_LABEL_REFRESH);
 
         //instance
         Label lblCdmInstance = new Label(cdmServerComposite, SWT.NONE);
-        GridData gd_lblCdmInstance = new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1);
+        GridData gd_lblCdmInstance = new GridData(SWT.RIGHT, SWT.CENTER, false, true, 1, 1);
         //gd_lblCdmInstance.heightHint = 30;
         lblCdmInstance.setLayoutData(gd_lblCdmInstance);
         lblCdmInstance.setText(Messages.RemotingLoginDialog_LABEL_CDM_INSTANCE);
@@ -299,7 +302,7 @@ public class RemotingLoginDialog extends Dialog implements ICDMServerError {
                 onRefreshCdmInstance();
             }
         });
-        GridData gd_comboCdmInstance = new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1);
+        GridData gd_comboCdmInstance = new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1);
         gd_comboCdmInstance.minimumWidth = COMBO_MIN_WIDTH;
         comboCdmInstance.setLayoutData(gd_comboCdmInstance);
         comboCdmInstance.select(0);
@@ -307,7 +310,8 @@ public class RemotingLoginDialog extends Dialog implements ICDMServerError {
         txtCdmInstanceStatus = new Text(cdmServerComposite, SWT.BORDER);
         txtCdmInstanceStatus.setBackground(SWTResourceManager.getColor(SWT.COLOR_INFO_BACKGROUND));
         txtCdmInstanceStatus.setEditable(false);
-        GridData gd_txtCdmInstanceStatus = new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1);
+        GridData gd_txtCdmInstanceStatus = new GridData(SWT.FILL, SWT.CENTER, true, true, 1, 1);
+        gd_txtCdmInstanceStatus.minimumHeight = CONTROLS_MIN_HEIGHT;
         txtCdmInstanceStatus.setLayoutData(gd_txtCdmInstanceStatus);
 
         btnCdmInstanceRefresh = new Button(cdmServerComposite, SWT.FLAT);
@@ -317,7 +321,8 @@ public class RemotingLoginDialog extends Dialog implements ICDMServerError {
                 onRefreshCdmInstance();
             }
         });
-        GridData gd_btnCdmInstanceRefresh = new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1);
+        GridData gd_btnCdmInstanceRefresh = new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1);
+        gd_btnCdmInstanceRefresh.minimumHeight = CONTROLS_MIN_HEIGHT;
         btnCdmInstanceRefresh.setLayoutData(gd_btnCdmInstanceRefresh);
         btnCdmInstanceRefresh.setText(Messages.RemotingLoginDialog_LABEL_REFRESH);