From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 14 May 2015 11:58:38 +0000 (+0000)
Subject: Use message instead of label in user menu
X-Git-Tag: argeo-commons-2.1.30~249
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=170c56881f05f1028c35e6fe8c6e69dfd764c30e;p=lgpl%2Fargeo-commons.git

Use message instead of label in user menu

git-svn-id: https://svn.argeo.org/commons/trunk@8103 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java b/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java
index 9f6c2c0e7..73567886b 100644
--- a/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java
@@ -116,19 +116,27 @@ public class UserMenu extends Shell implements CmsStyles, CallbackHandler {
 	}
 
 	protected void anonymousUi() {
+		setLayout(CmsUtils.noSpaceGridLayout());
+
+		// We need a composite for the traversal
+		Composite c = new Composite(this, SWT.NONE);
+		c.setLayout(new GridLayout());
+		c.setLayoutData(CmsUtils.fillAll());
+
 		Integer textWidth = 150;
 		setData(RWT.CUSTOM_VARIANT, CMS_USER_MENU);
-		setLayout(new GridLayout(2, false));
 
-		new Label(this, SWT.NONE).setText(CmsMsg.username.lead());
-		username = new Text(this, SWT.BORDER);
+		// new Label(this, SWT.NONE).setText(CmsMsg.username.lead());
+		username = new Text(c, SWT.BORDER);
+		username.setMessage(CmsMsg.username.lead());
 		username.setData(RWT.CUSTOM_VARIANT, CMS_LOGIN_DIALOG_USERNAME);
 		GridData gd = CmsUtils.fillWidth();
 		gd.widthHint = textWidth;
 		username.setLayoutData(gd);
 
-		new Label(this, SWT.NONE).setText(CmsMsg.password.lead());
-		password = new Text(this, SWT.BORDER | SWT.PASSWORD);
+		// new Label(this, SWT.NONE).setText(CmsMsg.password.lead());
+		password = new Text(c, SWT.BORDER | SWT.PASSWORD);
+		password.setMessage(CmsMsg.password.lead());
 		password.setData(RWT.CUSTOM_VARIANT, CMS_LOGIN_DIALOG_PASSWORD);
 		gd = CmsUtils.fillWidth();
 		gd.widthHint = textWidth;
@@ -142,8 +150,12 @@ public class UserMenu extends Shell implements CmsStyles, CallbackHandler {
 					login();
 			}
 		};
+		c.addTraverseListener(tl);
 		username.addTraverseListener(tl);
 		password.addTraverseListener(tl);
+		setTabList(new Control[] { c });
+		c.setTabList(new Control[] { username, password });
+		c.setFocus();
 	}
 
 	protected void login() {