diff --git a/launch/org.eclipse.cdt.launch/ChangeLog b/launch/org.eclipse.cdt.launch/ChangeLog index ca8ea211e87..e1e6857880d 100644 --- a/launch/org.eclipse.cdt.launch/ChangeLog +++ b/launch/org.eclipse.cdt.launch/ChangeLog @@ -1,3 +1,15 @@ +2003-09-22 David Inglis + Add help context IDs to plugin and associate ids to each launch tab control. + + src/org/eclipse/cdt/launch/internal/ui/LaunchUIPlugin.java + src/org/eclipse/cdt/launch/ui/ICDTLaunchHelpContextIds.java + src/org/eclipse/cdt/launch/ui/CArgumentsTab.java + src/org/eclipse/cdt/launch/ui/CDebuggerTab.java + src/org/eclipse/cdt/launch/ui/CEnvironmentTab.java + src/org/eclipse/cdt/launch/ui/CMainTab.java + src/org/eclipse/cdt/launch/ui/CSourceLookupTab.java + src/org/eclipse/cdt/launch/ui/CorefileDebuggerTab.java + 2003-08-05 Mikhail Khodjaiants * src/org/eclipse/cdt/launch/sourcelookup/DefaultSourceLocator.java Check if the project saved in the launch configuration equals to the project set diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchUIPlugin.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchUIPlugin.java index 7a433f3bca3..c6ccf3728a3 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchUIPlugin.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchUIPlugin.java @@ -23,7 +23,7 @@ import org.eclipse.ui.plugin.AbstractUIPlugin; */ public class LaunchUIPlugin extends AbstractUIPlugin implements IDebugEventSetListener { - public static final String PLUGIN_ID = "org.eclipse.cdt.launch"; + public static final String PLUGIN_ID = LaunchUIPlugin.getUniqueIdentifier(); /** * Launch UI plug-in instance @@ -39,7 +39,8 @@ public class LaunchUIPlugin extends AbstractUIPlugin super(descriptor); setDefault(this); } -/** + + /** * Sets the Java Debug UI plug-in instance * * @param plugin the plugin instance diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CArgumentsTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CArgumentsTab.java index e51727cf290..71d79f61ce4 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CArgumentsTab.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CArgumentsTab.java @@ -22,6 +22,7 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; +import org.eclipse.ui.help.WorkbenchHelp; /** * A launch configuration tab that displays and edits program arguments, @@ -46,6 +47,9 @@ public class CArgumentsTab extends CLaunchConfigurationTab { Composite comp = new Composite(parent, SWT.NONE); setControl(comp); + + WorkbenchHelp.setHelp(getControl(), ICDTLaunchHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_ARGUMNETS_TAB); + GridLayout topLayout = new GridLayout(); comp.setLayout(topLayout); GridData gd; diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java index 00ecf7c131a..f54ad231d17 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java @@ -29,6 +29,7 @@ import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; +import org.eclipse.ui.help.WorkbenchHelp; public class CDebuggerTab extends AbstractCDebuggerTab { @@ -45,6 +46,9 @@ public class CDebuggerTab extends AbstractCDebuggerTab { Composite comp = new Composite(parent, SWT.NONE); setControl(comp); + + WorkbenchHelp.setHelp(getControl(), ICDTLaunchHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_DEBBUGER_TAB); + GridLayout layout = new GridLayout(2, false); comp.setLayout(layout); diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CEnvironmentTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CEnvironmentTab.java index eef1a09d157..d889e693471 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CEnvironmentTab.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CEnvironmentTab.java @@ -48,6 +48,7 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.Text; +import org.eclipse.ui.help.WorkbenchHelp; public class CEnvironmentTab extends CLaunchConfigurationTab { @@ -193,6 +194,10 @@ public class CEnvironmentTab extends CLaunchConfigurationTab { public void createControl(Composite parent) { fElements = new Properties(); Composite control = new Composite(parent, SWT.NONE); + setControl(control); + + WorkbenchHelp.setHelp(getControl(), ICDTLaunchHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_ENVIRONMENT_TAB); + GridLayout gl = new GridLayout(2, false); createVerticalSpacer(control, 2); @@ -200,7 +205,6 @@ public class CEnvironmentTab extends CLaunchConfigurationTab { control.setLayout(gl); createVariableList(control); createButtons(control); - setControl(control); fVariableList.setInput(fElements); fVariableList.getTable().setFocus(); } diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java index 41da4b76b42..0b7539c636a 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java @@ -40,6 +40,7 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.dialogs.ElementListSelectionDialog; +import org.eclipse.ui.help.WorkbenchHelp; /** * A launch configuration tab that displays and edits project and @@ -73,9 +74,13 @@ public class CMainTab extends CLaunchConfigurationTab { Composite comp = new Composite(parent, SWT.NONE); setControl(comp); + + WorkbenchHelp.setHelp(getControl(), ICDTLaunchHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_MAIN_TAB); + GridLayout topLayout = new GridLayout(); comp.setLayout(topLayout); + createVerticalSpacer(comp, 1); Composite projComp = new Composite(comp, SWT.NONE); diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CSourceLookupTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CSourceLookupTab.java index ab1b4042f7b..0b750cec089 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CSourceLookupTab.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CSourceLookupTab.java @@ -19,6 +19,7 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; +import org.eclipse.ui.help.WorkbenchHelp; /** * Enter type comment. @@ -36,10 +37,13 @@ public class CSourceLookupTab extends CLaunchConfigurationTab { Composite control = new Composite( parent, SWT.NONE ); control.setLayout( new GridLayout() ); + setControl( control ); + + WorkbenchHelp.setHelp(getControl(), ICDTLaunchHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_SOURCELOOKUP_TAB); + fBlock = new SourceLookupBlock(); fBlock.createControl( control ); fBlock.setLaunchConfigurationDialog( getLaunchConfigurationDialog() ); - setControl( control ); } /* (non-Javadoc) diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CorefileDebuggerTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CorefileDebuggerTab.java index 6d272fad301..3bfbdf2e505 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CorefileDebuggerTab.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CorefileDebuggerTab.java @@ -24,6 +24,7 @@ import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; +import org.eclipse.ui.help.WorkbenchHelp; public class CorefileDebuggerTab extends AbstractCDebuggerTab { protected Combo fDCombo; @@ -33,6 +34,9 @@ public class CorefileDebuggerTab extends AbstractCDebuggerTab { public void createControl(Composite parent) { Composite comp = new Composite(parent, SWT.NONE); setControl(comp); + + WorkbenchHelp.setHelp(getControl(), ICDTLaunchHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_DEBBUGER_TAB); + GridLayout topLayout = new GridLayout(2, false); comp.setLayout(topLayout); Label dlabel = new Label(comp, SWT.NONE); diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/ICDTLaunchHelpContextIds.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/ICDTLaunchHelpContextIds.java new file mode 100644 index 00000000000..90f5308a9a3 --- /dev/null +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/ICDTLaunchHelpContextIds.java @@ -0,0 +1,24 @@ +/* + * Created on 22-Sep-2003 + * + * Copyright (c) 2002,2003 QNX Software Systems Ltd. + * + * Contributors: + * QNX Software Systems - Initial API and implementation +***********************************************************************/ +package org.eclipse.cdt.launch.ui; + +import org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin; + +public interface ICDTLaunchHelpContextIds { + + public static final String PREFIX = LaunchUIPlugin.PLUGIN_ID + "."; //$NON-NLS-1$ + + // Launch configuration dialog pages + public static final String LAUNCH_CONFIGURATION_DIALOG_MAIN_TAB = PREFIX + "launch_configuration_dialog_main_tab"; //$NON-NLS-1$ + public static final String LAUNCH_CONFIGURATION_DIALOG_ARGUMNETS_TAB = PREFIX + "launch_configuration_dialog_arguments_tab"; //$NON-NLS-1$ + public static final String LAUNCH_CONFIGURATION_DIALOG_ENVIRONMENT_TAB = PREFIX + "launch_configuration_dialog_environment_tab"; //$NON-NLS-1$ + public static final String LAUNCH_CONFIGURATION_DIALOG_DEBBUGER_TAB = PREFIX + "launch_configuration_dialog_debugger_tab"; //$NON-NLS-1$ + public static final String LAUNCH_CONFIGURATION_DIALOG_SOURCELOOKUP_TAB = PREFIX + "launch_configuration_dialog_source_tab"; //$NON-NLS-1$ + +}