import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.argeo.cms.CmsMsg;
+import org.argeo.cms.LocaleUtils;
import org.argeo.cms.auth.HttpRequestCallback;
-import org.argeo.cms.i18n.LocaleUtils;
import org.argeo.cms.ui.CmsStyles;
import org.argeo.cms.ui.CmsView;
import org.argeo.cms.ui.internal.Activator;
import org.argeo.cms.util.CmsUtils;
import org.argeo.eclipse.ui.specific.UiContext;
import org.argeo.node.NodeConstants;
+import org.argeo.node.NodeState;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.MouseAdapter;
import org.eclipse.swt.events.MouseEvent;
public CmsLogin(CmsView cmsView) {
this.cmsView = cmsView;
- defaultLocale = Activator.getNodeState().getDefaultLocale();
- List<Locale> locales = Activator.getNodeState().getLocales();
- if (locales != null)
- localeChoice = new LocaleChoice(locales, defaultLocale);
+ NodeState nodeState = Activator.getNodeState();
+ if (nodeState != null) {
+ defaultLocale = nodeState.getDefaultLocale();
+ List<Locale> locales = nodeState.getLocales();
+ if (locales != null)
+ localeChoice = new LocaleChoice(locales, defaultLocale);
+ } else {
+ defaultLocale = Locale.getDefault();
+ }
loginSelectionListener = new SelectionListener() {
private static final long serialVersionUID = -8832133363830973578L;
Locale locale = localeChoice == null ? this.defaultLocale : localeChoice.getSelectedLocale();
credentialsBlock = new Composite(parent, SWT.NONE);
credentialsBlock.setLayout(new GridLayout());
- credentialsBlock.setLayoutData(CmsUtils.fillAll());
+ // credentialsBlock.setLayoutData(CmsUtils.fillAll());
specificUserUi(credentialsBlock);
// We need a composite for the traversal
credentialsBlock = new Composite(parent, SWT.NONE);
credentialsBlock.setLayout(new GridLayout());
- credentialsBlock.setLayoutData(CmsUtils.fillAll());
+ // credentialsBlock.setLayoutData(CmsUtils.fillAll());
+ CmsUtils.style(credentialsBlock, CMS_LOGIN_DIALOG);
Integer textWidth = 120;
- CmsUtils.style(parent, CMS_USER_MENU);
+ if (parent instanceof Shell)
+ CmsUtils.style(parent, CMS_USER_MENU);
// new Label(this, SWT.NONE).setText(CmsMsg.username.lead());
usernameT = new Text(credentialsBlock, SWT.BORDER);
usernameT.setMessage(username.lead(locale));
passwordT.addTraverseListener(tl);
parent.setTabList(new Control[] { credentialsBlock });
credentialsBlock.setTabList(new Control[] { usernameT, passwordT });
- // credentialsBlock.setFocus();
+
+ // Button
+ Button loginButton = new Button(credentialsBlock, SWT.PUSH);
+ loginButton.setText(CmsMsg.login.lead(locale));
+ loginButton.setLayoutData(CmsUtils.fillWidth());
+ loginButton.addSelectionListener(loginSelectionListener);
extendsCredentialsBlock(credentialsBlock, locale, loginSelectionListener);
if (localeChoice != null)
protected Composite createLocalesBlock(final Composite parent) {
Composite c = new Composite(parent, SWT.NONE);
+ CmsUtils.style(c, CMS_USER_MENU_ITEM);
c.setLayout(CmsUtils.noSpaceGridLayout());
c.setLayoutData(CmsUtils.fillAll());
for (Integer i = 0; i < locales.size(); i++) {
Locale locale = locales.get(i);
Button button = new Button(c, SWT.RADIO);
+ CmsUtils.style(button, CMS_USER_MENU_ITEM);
button.setData(i);
button.setText(LocaleUtils.lead(locale.getDisplayName(locale), locale) + " (" + locale + ")");
// button.addListener(SWT.Selection, listener);