From 659bcb13616ba5b4da6ef804e08152c0bda05a46 Mon Sep 17 00:00:00 2001
From: Markus Keller
Date: Tue, 24 Jan 2017 19:48:21 +0100
Subject: Bug 508787: Launch Groups: UI bloopers

---
 .../eclipse/debug/internal/ui/DebugUIMessages.properties   |  2 +-
 .../ui/groups/GroupLaunchConfigurationSelectionDialog.java | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

(limited to 'org.eclipse.debug.ui/ui')

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIMessages.properties b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIMessages.properties
index af3d12e82..5eb723932 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIMessages.properties
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIMessages.properties
@@ -132,7 +132,7 @@ GroupLaunchConfigurationSelectionDialog_15=Edit an existing entry in the launch
 GroupLaunchConfigurationSelectionDialog_adoptText=&Adopt launch if already running
 GroupLaunchConfigurationSelectionDialog_adoptTooltip=Instead of launching a new process, adds the running launch to the group.
 GroupLaunchConfigurationSelectionDialog_errorNoRegexp=Enter a regular expression to wait for
-GroupLaunchConfigurationSelectionDialog_regexp=Regular Expression:
+GroupLaunchConfigurationSelectionDialog_regexp=&Regular Expression:
 GroupLaunchConfigurationTabGroup_0=Wait for output matching "{0}"
 GroupLaunchConfigurationTabGroup_1=&Up
 GroupLaunchConfigurationTabGroup_2=Do&wn
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/groups/GroupLaunchConfigurationSelectionDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/groups/GroupLaunchConfigurationSelectionDialog.java
index 181d1b549..4e54970f6 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/groups/GroupLaunchConfigurationSelectionDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/groups/GroupLaunchConfigurationSelectionDialog.java
@@ -54,7 +54,6 @@ import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
@@ -139,11 +138,6 @@ class GroupLaunchConfigurationSelectionDialog extends TitleAreaDialog implements
 		return x;
 	}
 
-	@Override
-	protected Point getInitialSize() {
-		return new Point(750, 550);
-	}
-
 	@Override
 	protected Control createDialogArea(Composite parent2) {
 		Composite comp = (Composite) super.createDialogArea(parent2);
@@ -190,7 +184,7 @@ class GroupLaunchConfigurationSelectionDialog extends TitleAreaDialog implements
 		if (fInitialSelection != null) {
 			fTree.getViewer().setSelection(fInitialSelection, true);
 		}
-		GridDataFactory.fillDefaults().grab(true, true).minSize(400, 150).applyTo(fTree.getViewer().getControl());
+		GridDataFactory.fillDefaults().grab(true, true).hint(convertWidthInCharsToPixels(100), convertHeightInCharsToPixels(15)).applyTo(fTree.getViewer().getControl());
 
 		Composite additionalSettings = new Composite(comp, SWT.NONE);
 		additionalSettings.setLayout(new GridLayout(4, false));
@@ -227,7 +221,7 @@ class GroupLaunchConfigurationSelectionDialog extends TitleAreaDialog implements
 		modes.keySet().forEach(m -> capitalized.put(m.substring(0, 1).toUpperCase() + m.substring(1), m));
 
 		Combo cvMode = new Combo(comp, SWT.READ_ONLY);
-		GridDataFactory.fillDefaults().grab(true, false).applyTo(cvMode);
+		GridDataFactory.fillDefaults().applyTo(cvMode);
 		cvMode.setItems(capitalized.keySet().toArray(new String[capitalized.size()]));
 
 		// initial selection to the current mode.
@@ -272,11 +266,11 @@ class GroupLaunchConfigurationSelectionDialog extends TitleAreaDialog implements
 			}
 		});
 		combo.setText(action.getDescription());
-		GridDataFactory.fillDefaults().grab(true, false).minSize(250, SWT.DEFAULT).applyTo(combo);
+		GridDataFactory.fillDefaults().applyTo(combo);
 
 		fActionParamLabel = new Label(comp, SWT.NONE);
 		fActionParamWidget = new Text(comp, SWT.SINGLE | SWT.BORDER);
-		GridDataFactory.fillDefaults().grab(true, false).minSize(150, SWT.DEFAULT).applyTo(fActionParamWidget);
+		GridDataFactory.fillDefaults().applyTo(fActionParamWidget);
 		fActionParamWidget.addModifyListener(new ModifyListener() {
 			@Override
 			public void modifyText(ModifyEvent e) {
-- 
cgit v1.2.3