New background image for login dialog

7 files changed, 41 insertions, 12 deletions

diff --git a/src/com.gluster.storage.management.console/splash/gluster-about.png b/src/com.gluster.storage.management.console/images/gluster-about.png
index 9518b2b2..9518b2b2 100644
--- a/src/com.gluster.storage.management.console/splash/gluster-about.png
+++ b/src/com.gluster.storage.management.console/images/gluster-about.png
diff --git a/src/com.gluster.storage.management.console/images/splash-dialog.bmp b/src/com.gluster.storage.management.console/images/splash-dialog.bmp
new file mode 100644
index 00000000..932032fb
--- /dev/null
+++ b/src/com.gluster.storage.management.console/images/splash-dialog.bmp
diff --git a/src/com.gluster.storage.management.console/plugin.xml b/src/com.gluster.storage.management.console/plugin.xml
index 60316263..29927d3b 100644
--- a/src/com.gluster.storage.management.console/plugin.xml
+++ b/src/com.gluster.storage.management.console/plugin.xml
@@ -393,7 +393,7 @@
          </property>
          <property
                name="aboutImage"
-               value="splash/gluster-about.png">
+               value="images/gluster-about.png">
          </property>
          <property
                name="appName"
diff --git a/src/com.gluster.storage.management.console/splash/splash-dialog.bmp b/src/com.gluster.storage.management.console/splash/splash-dialog.bmp
deleted file mode 100644
index 2de2897f..00000000
--- a/src/com.gluster.storage.management.console/splash/splash-dialog.bmp
+++ /dev/null
diff --git a/src/com.gluster.storage.management.console/splash/splash-dialog.png b/src/com.gluster.storage.management.console/splash/splash-dialog.png
deleted file mode 100644
index 789eafb0..00000000
--- a/src/com.gluster.storage.management.console/splash/splash-dialog.png
+++ /dev/null
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/IImageKeys.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/IImageKeys.java
index 2b20cb02..89b19f3f 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/IImageKeys.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/IImageKeys.java
@@ -89,7 +89,7 @@ public interface IImageKeys {
 	public static final String OVERLAY_STAR_8x8 = "icons/tango/8x8/star.png";
 
 	public static final String SPLASH_IMAGE = "splash.bmp";
-	public static final String DIALOG_SPLASH_IMAGE = "splash/splash-dialog.bmp";
+	public static final String DIALOG_SPLASH_IMAGE = "images/splash-dialog.bmp";
 
 	public static final String GAUGE_SMALL = "images/gauge_small.png";
 	
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/LoginDialog.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/LoginDialog.java
index b2b647e1..cbb23367 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/LoginDialog.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/LoginDialog.java
@@ -106,9 +106,7 @@ public class LoginDialog extends Dialog {
 		userIdText.setText("gluster");
 		userIdText.setEnabled(false);
 
-		GridData layoutData = new GridData(SWT.FILL, GridData.FILL, true, false);
-		;
-		layoutData.widthHint = convertWidthInCharsToPixels(32);
+		GridData layoutData = new GridData(convertWidthInCharsToPixels(32), 15);
 		userIdText.setLayoutData(layoutData);
 	}
 
@@ -121,20 +119,28 @@ public class LoginDialog extends Dialog {
 	private void createPasswordText(Composite composite) {
 		passwordText = new Text(composite, SWT.BORDER | SWT.PASSWORD);
 
-		GridData layoutData = new GridData(SWT.FILL, GridData.FILL, true, false);
-		;
-		layoutData.widthHint = convertWidthInCharsToPixels(32);
+		GridData layoutData = new GridData(convertWidthInCharsToPixels(32), 15);
 		passwordText.setLayoutData(layoutData);
 	}
 
 	private void configureDialogLayout(Composite composite) {
 		GridLayout layout = (GridLayout) composite.getLayout();
 		layout.numColumns = 2;
+		layout.marginLeft = 10;
+		layout.marginRight = 10;
+		layout.marginTop = 30;
+		layout.marginBottom = 0;
+		layout.horizontalSpacing = 20;
+		layout.verticalSpacing = 10;
+	}
+	
+	private void configureButtonCompositeLayout(Composite composite) {
+		GridLayout layout = (GridLayout) composite.getLayout();
 		layout.marginLeft = 20;
 		layout.marginRight = 20;
-		layout.marginTop = 20;
-		layout.horizontalSpacing = 20;
-		layout.verticalSpacing = 20;
+		layout.marginTop = 0;
+		layout.horizontalSpacing = 10;
+		layout.verticalSpacing = 10;
 	}
 
 	/**
@@ -144,6 +150,7 @@ public class LoginDialog extends Dialog {
 	protected void initializeBounds() {
 		super.initializeBounds();
 
+		getShell().setSize(390, 240);
 		guiHelper.centerShellInScreen(getShell());
 	}
 
@@ -156,6 +163,8 @@ public class LoginDialog extends Dialog {
 
 		composite = (Composite) super.createDialogArea(parent);
 		configureDialogLayout(composite);
+		GridData layoutData = new GridData(390, 110);
+		composite.setLayoutData(layoutData);
 
 		createUserIdLabel(composite);
 		createUserIdText(composite);
@@ -168,8 +177,28 @@ public class LoginDialog extends Dialog {
 
 	@Override
 	protected void createButtonsForButtonBar(Composite parent) {
+		configureButtonCompositeLayout(parent);
+		GridData layoutData = new GridData(390, 130);
+		layoutData.horizontalAlignment = SWT.CENTER;
+		layoutData.verticalAlignment = SWT.TOP;
+		layoutData.grabExcessHorizontalSpace = true;
+		parent.setLayoutData(layoutData);
+		
+		layoutData = new GridData();
+		layoutData.widthHint = 70;
+		layoutData.horizontalAlignment = SWT.LEFT;
+		layoutData.grabExcessHorizontalSpace = true;
+		
 		okButton = createButton(parent, IDialogConstants.OK_ID, "&Login", true);
-		createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
+		okButton.setLayoutData(layoutData);		
+
+		layoutData = new GridData();
+		layoutData.widthHint = 70;
+		layoutData.horizontalAlignment = SWT.RIGHT;
+		layoutData.grabExcessHorizontalSpace = true;
+
+		Button cancelButton = createButton(parent, IDialogConstants.CANCEL_ID, "&Cancel", false);
+		cancelButton.setLayoutData(layoutData);
 
 		setupDataBinding();
 	}