X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=security%2Fplugins%2Forg.argeo.security.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2Fdialogs%2FDefaultLoginDialog.java;h=97340892d0c62eba0cfdc230bbe82d44fbba996d;hb=00474cf92c05359177aba1768bd2ef95a310afaf;hp=c07e8a9dfc0060a7963d0e4d9e72bfec1b760a1d;hpb=3baeb167c9a92d1f915904bb956632c0aff65b2b;p=lgpl%2Fargeo-commons.git

diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/DefaultLoginDialog.java b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/DefaultLoginDialog.java
index c07e8a9df..97340892d 100644
--- a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/DefaultLoginDialog.java
+++ b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/DefaultLoginDialog.java
@@ -21,13 +21,17 @@ import javax.security.auth.callback.NameCallback;
 import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.callback.TextOutputCallback;
 
+import org.argeo.util.LocaleCallback;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
@@ -47,15 +51,20 @@ public class DefaultLoginDialog extends AbstractLoginDialog {
 	}
 
 	protected Point getInitialSize() {
-		return new Point(300, 180);
+		return new Point(350, 180);
 	}
 
 	@Override
 	protected Control createContents(Composite parent) {
 		Control control = super.createContents(parent);
 		parent.pack();
+
 		// Move the dialog to the center of the top level shell.
-		Rectangle shellBounds = Display.getCurrent().getBounds();
+		Rectangle shellBounds;
+		if (Display.getCurrent().getActiveShell() != null) // RCP
+			shellBounds = Display.getCurrent().getActiveShell().getBounds();
+		else
+			shellBounds = Display.getCurrent().getBounds();// RAP
 		Point dialogSize = parent.getSize();
 		int x = shellBounds.x + (shellBounds.width - dialogSize.x) / 2;
 		int y = shellBounds.y + (shellBounds.height - dialogSize.y) / 2;
@@ -84,6 +93,8 @@ public class DefaultLoginDialog extends AbstractLoginDialog {
 				createNameHandler(composite, (NameCallback) callback);
 			} else if (callback instanceof PasswordCallback) {
 				createPasswordHandler(composite, (PasswordCallback) callback);
+			} else if (callback instanceof LocaleCallback) {
+				createLocaleHandler(composite, (LocaleCallback) callback);
 			}
 		}
 	}
@@ -105,6 +116,30 @@ public class DefaultLoginDialog extends AbstractLoginDialog {
 		});
 	}
 
+	private void createLocaleHandler(Composite composite,
+			final LocaleCallback callback) {
+		String[] labels = callback.getSupportedLocalesLabels();
+		if (labels.length == 0)
+			return;
+		Label label = new Label(composite, SWT.NONE);
+		label.setText(callback.getPrompt());
+
+		final Combo combo = new Combo(composite, SWT.READ_ONLY);
+		combo.setItems(labels);
+		combo.select(callback.getDefaultIndex());
+		combo.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+		combo.addSelectionListener(new SelectionListener() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				callback.setSelectedIndex(combo.getSelectionIndex());
+			}
+
+			@Override
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+		});
+	}
+
 	private void createNameHandler(Composite composite,
 			final NameCallback callback) {
 		Label label = new Label(composite, SWT.NONE);