Merge branch 'master' of github.com:gluster/console

7 files changed, 18 insertions, 11 deletions

diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/add-brick-disabled.png b/src/com.gluster.storage.management.console/icons/tango/32x32/add-brick-disabled.png
new file mode 100644
index 00000000..925c8b44
--- /dev/null
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/add-brick-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/remove-server-disabled.png b/src/com.gluster.storage.management.console/icons/tango/32x32/remove-server-disabled.png
new file mode 100644
index 00000000..3f31d216
--- /dev/null
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/remove-server-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/remove-volume-disabled.png b/src/com.gluster.storage.management.console/icons/tango/32x32/remove-volume-disabled.png
new file mode 100644
index 00000000..5eb09cfd
--- /dev/null
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/remove-volume-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/reset-volume-option-disabled.png b/src/com.gluster.storage.management.console/icons/tango/32x32/reset-volume-option-disabled.png
new file mode 100644
index 00000000..c4c955f5
--- /dev/null
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/reset-volume-option-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/volume-rebalance-disabled.png b/src/com.gluster.storage.management.console/icons/tango/32x32/volume-rebalance-disabled.png
new file mode 100644
index 00000000..35d49af7
--- /dev/null
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/volume-rebalance-disabled.png
diff --git a/src/com.gluster.storage.management.console/plugin.xml b/src/com.gluster.storage.management.console/plugin.xml
index 9cadd537..6fb95258 100644
--- a/src/com.gluster.storage.management.console/plugin.xml
+++ b/src/com.gluster.storage.management.console/plugin.xml
@@ -427,6 +427,7 @@
                allowLabelUpdate="false"
                class="com.gluster.storage.management.console.actions.DeleteVolumeAction"
                definitionId="com.gluster.storage.management.console.commands.DeleteVolume"
+               disabledIcon="icons/tango/32x32/remove-volume-disabled.png"
                icon="icons/tango/32x32/remove-volume.png"
                id="com.gluster.storage.management.console.actions.DeleteVolumeAction"
                label="&Delete Volume(s)"
@@ -538,6 +539,7 @@
                allowLabelUpdate="false"
                class="com.gluster.storage.management.console.actions.DeleteVolumeAction"
                definitionId="com.gluster.storage.management.console.commands.DeleteVolume"
+               disabledIcon="icons/tango/32x32/remove-volume-disabled.png"
                icon="icons/tango/32x32/remove-volume.png"
                id="com.gluster.storage.management.console.actions.DeleteVolumeAction"
                label="&Delete Volume"
@@ -568,6 +570,7 @@
                allowLabelUpdate="false"
                class="com.gluster.storage.management.console.actions.ResetVolumeOptionsAction"
                definitionId="com.gluster.storage.management.console.commands.ResetVolumeOptions"
+               disabledIcon="icons/tango/32x32/reset-volume-option-disabled.png"
                icon="icons/tango/32x32/reset-volume-option.png"
                id="com.gluster.storage.management.console.actions.ResetVolumeOptionsAction"
                label="Reset &Options"
@@ -583,6 +586,7 @@
                allowLabelUpdate="false"
                class="com.gluster.storage.management.console.actions.RebalanceVolumeAction"
                definitionId="com.gluster.storage.management.console.commands.RebalanceVolume"
+               disabledIcon="icons/tango/32x32/volume-rebalance-disabled.png"
                icon="icons/tango/32x32/volume-rebalance.png"
                id="com.gluster.storage.management.console.actions.RebalanceVolumeAction"
                label="&Rebalance Volume"
@@ -646,6 +650,7 @@
                allowLabelUpdate="false"
                class="com.gluster.storage.management.console.actions.AddBrickAction"
                definitionId="com.gluster.storage.management.console.commands.AddDisk"
+               disabledIcon="icons/tango/32x32/add-brick-disabled.png"
                icon="icons/tango/32x32/add-brick.png"
                id="com.gluster.storage.management.console.actions.AddDiskAction"
                label="&Add Brick"
@@ -705,6 +710,7 @@
                allowLabelUpdate="false"
                class="com.gluster.storage.management.console.actions.RemoveServerAction"
                definitionId="com.gluster.storage.management.console.commands.RemoveServer"
+               disabledIcon="icons/tango/32x32/remove-server-disabled.png"
                icon="icons/tango/32x32/remove-server.png"
                id="com.gluster.storage.management.console.actions.RemoveServerAction"
                label="&Remove Server(s)"
@@ -763,6 +769,7 @@
                allowLabelUpdate="false"
                class="com.gluster.storage.management.console.actions.RemoveServerAction"
                definitionId="com.gluster.storage.management.console.commands.RemoveServer"
+               disabledIcon="icons/tango/32x32/remove-server-disabled.png"
                icon="icons/tango/32x32/remove-server.png"
                id="com.gluster.storage.management.console.actions.RemoveServerAction"
                label="&Remove Server(s)"
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 cbb23367..4bbcb36b 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
@@ -157,9 +157,8 @@ public class LoginDialog extends Dialog {
 	@Override
 	protected Control createDialogArea(Composite parent) {
 		parent.setBackgroundImage(guiHelper.getImage(IImageKeys.DIALOG_SPLASH_IMAGE));
-		parent.setBackgroundMode(SWT.INHERIT_FORCE); // Makes sure that child
-														// composites inherit
-														// the same background
+		// Makes sure that child composites inherit the same background
+		parent.setBackgroundMode(SWT.INHERIT_FORCE); 
 
 		composite = (Composite) super.createDialogArea(parent);
 		configureDialogLayout(composite);
@@ -178,6 +177,7 @@ 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;
@@ -186,20 +186,20 @@ public class LoginDialog extends Dialog {
 		
 		layoutData = new GridData();
 		layoutData.widthHint = 70;
-		layoutData.horizontalAlignment = SWT.LEFT;
-		layoutData.grabExcessHorizontalSpace = true;
-		
-		okButton = createButton(parent, IDialogConstants.OK_ID, "&Login", true);
-		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);
 
+		layoutData = new GridData();
+		layoutData.widthHint = 70;
+		layoutData.horizontalAlignment = SWT.LEFT;
+		layoutData.grabExcessHorizontalSpace = true;
+		
+		okButton = createButton(parent, IDialogConstants.OK_ID, "&Login", true);
+		okButton.setLayoutData(layoutData);		
+
 		setupDataBinding();
 	}