# HG changeset patch # User dadubrow # Date 1266266770 21600 # Node ID a9c84e6d779fbcd3e30f7eec21df1e3baaf4fc17 # Parent 33531ba934b7ff85d4a1db258f6213bdfb894335 ui tweaks to new launch wizard diff -r 33531ba934b7 -r a9c84e6d779f debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/AbstractLaunchWizardSection.java --- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/AbstractLaunchWizardSection.java Mon Feb 15 14:02:41 2010 -0600 +++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/AbstractLaunchWizardSection.java Mon Feb 15 14:46:10 2010 -0600 @@ -56,11 +56,13 @@ protected Button changeButton; protected Composite control; private ISectionChangeListener changeListener; + protected final UnifiedLaunchOptionsPage launchOptionsPage; - public AbstractLaunchWizardSection(LaunchWizardData data, String sectionName) { + public AbstractLaunchWizardSection(LaunchWizardData data, String sectionName, UnifiedLaunchOptionsPage launchOptionsPage) { this.data = data; this.sectionName = sectionName; + this.launchOptionsPage = launchOptionsPage; status = Status.OK_STATUS; } @@ -167,6 +169,7 @@ if (dialog.open() == Window.OK) { data.apply(dialogData); refresh(); + launchOptionsPage.getWizard().getContainer().getShell().pack(); } } diff -r 33531ba934b7 -r a9c84e6d779f debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/ConnectToDeviceSection.java --- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/ConnectToDeviceSection.java Mon Feb 15 14:02:41 2010 -0600 +++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/ConnectToDeviceSection.java Mon Feb 15 14:46:10 2010 -0600 @@ -36,7 +36,6 @@ public class ConnectToDeviceSection extends AbstractLaunchWizardSection implements IConnectionListener { private static final String NO_CURRENT_CONNECTION_MSG = "No current connection is defined or detected."; - private final UnifiedLaunchOptionsPage launchOptionsPage; private final IConnectionsManager manager; /** @@ -44,8 +43,7 @@ * */ public ConnectToDeviceSection(LaunchWizardData data, UnifiedLaunchOptionsPage launchOptionsPage) { - super(data, "Connect to device"); - this.launchOptionsPage = launchOptionsPage; + super(data, "Connect to device", launchOptionsPage); manager = RemoteConnectionsActivator.getConnectionsManager(); } diff -r 33531ba934b7 -r a9c84e6d779f debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/DebugRunProcessSection.java --- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/DebugRunProcessSection.java Mon Feb 15 14:02:41 2010 -0600 +++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/DebugRunProcessSection.java Mon Feb 15 14:46:10 2010 -0600 @@ -36,8 +36,8 @@ */ public class DebugRunProcessSection extends AbstractLaunchWizardSection { - public DebugRunProcessSection(LaunchWizardData data) { - super(data, MessageFormat.format("{0} process", data.getModeLabel())); + public DebugRunProcessSection(LaunchWizardData data, UnifiedLaunchOptionsPage launchOptionsPage) { + super(data, MessageFormat.format("{0} process", data.getModeLabel()), launchOptionsPage); } @Override diff -r 33531ba934b7 -r a9c84e6d779f debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/OtherSettingsSection.java --- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/OtherSettingsSection.java Mon Feb 15 14:02:41 2010 -0600 +++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/OtherSettingsSection.java Mon Feb 15 14:46:10 2010 -0600 @@ -31,8 +31,8 @@ /** * */ - public OtherSettingsSection(LaunchWizardData data) { - super(data, "Other settings"); + public OtherSettingsSection(LaunchWizardData data, UnifiedLaunchOptionsPage launchOptionsPage) { + super(data, "Other settings", launchOptionsPage); } diff -r 33531ba934b7 -r a9c84e6d779f debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/UnifiedLaunchOptionsPage.java --- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/UnifiedLaunchOptionsPage.java Mon Feb 15 14:02:41 2010 -0600 +++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/UnifiedLaunchOptionsPage.java Mon Feb 15 14:46:10 2010 -0600 @@ -71,10 +71,10 @@ section = new ConnectToDeviceSection(data, this); sections.add(section); - section = new DebugRunProcessSection(data); + section = new DebugRunProcessSection(data, this); sections.add(section); - section = new OtherSettingsSection(data); + section = new OtherSettingsSection(data, this); sections.add(section); }