X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.eclipse.ui%2Fsrc%2Forg%2Fargeo%2Feclipse%2Fui%2Fdialogs%2FSingleValue.java;h=8cce0e21719469a9d13787072334b2a2d690e463;hb=4e5217621733b3f8b9c2427a688a18c68dbc1e5d;hp=e47a8360480e4bececf10aeeade3b67bad9bbc81;hpb=7f945886dbd3cd0cf5b0e06b481b78ba1e2c9db9;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/dialogs/SingleValue.java b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/dialogs/SingleValue.java index e47a83604..8cce0e217 100644 --- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/dialogs/SingleValue.java +++ b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/dialogs/SingleValue.java @@ -15,6 +15,7 @@ */ package org.argeo.eclipse.ui.dialogs; +import org.argeo.eclipse.ui.EclipseUiUtils; import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.jface.dialogs.TitleAreaDialog; import org.eclipse.jface.window.Window; @@ -29,7 +30,7 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -/** Dialog retrieve a single value. */ +/** Dialog to retrieve a single value. */ public class SingleValue extends TitleAreaDialog { private static final long serialVersionUID = 2843538207460082349L; @@ -77,20 +78,28 @@ public class SingleValue extends TitleAreaDialog { } protected Point getInitialSize() { - return new Point(300, 250); + if (multiline) + return new Point(450, 350); + + else + return new Point(400, 270); } protected Control createDialogArea(Composite parent) { Composite dialogarea = (Composite) super.createDialogArea(parent); dialogarea.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); Composite composite = new Composite(dialogarea, SWT.NONE); - composite.setLayout(new GridLayout(2, false)); - composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false)); + composite.setLayoutData(EclipseUiUtils.fillAll()); + GridLayout layout = new GridLayout(2, false); + layout.marginWidth = layout.marginHeight = 20; + composite.setLayout(layout); + valueT = createLT(composite, label); setMessage(message, IMessageProvider.NONE); parent.pack(); + valueT.setFocus(); return composite; } @@ -103,9 +112,14 @@ public class SingleValue extends TitleAreaDialog { /** Creates label and text. */ protected Text createLT(Composite parent, String label) { new Label(parent, SWT.NONE).setText(label); - Text text = new Text(parent, SWT.SINGLE | SWT.LEAD | SWT.BORDER - | (multiline ? SWT.MULTI : SWT.NONE)); - text.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + Text text; + if (multiline) { + text = new Text(parent, SWT.LEAD | SWT.BORDER | SWT.MULTI); + text.setLayoutData(EclipseUiUtils.fillAll()); + } else { + text = new Text(parent, SWT.LEAD | SWT.BORDER | SWT.SINGLE); + text.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true)); + } return text; }