diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFMainTab.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFMainTab.java index bcc7d06cb00..8aa813071f0 100644 --- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFMainTab.java +++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFMainTab.java @@ -27,6 +27,7 @@ package org.eclipse.cdt.launch.remote.tabs; import org.eclipse.cdt.dsf.gdb.internal.ui.launching.CMainTab; +import org.eclipse.cdt.internal.launch.remote.Activator; import org.eclipse.cdt.internal.launch.remote.Messages; import org.eclipse.cdt.launch.remote.IRemoteConnectionConfigurationConstants; import org.eclipse.cdt.launch.remote.IRemoteConnectionHostConstants; @@ -128,7 +129,7 @@ public class RemoteCDSFMainTab extends CMainTab { .getWorkbench() .getHelpSystem() .setHelp(getControl(), - "org.eclipse.rse.internal.remotecdt.launchgroup"); //$NON-NLS-1$ + Activator.PLUGIN_ID + ".launchgroup"); //$NON-NLS-1$ } diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCMainTab.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCMainTab.java index 1baadaa2979..8b1822fa16a 100644 --- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCMainTab.java +++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCMainTab.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 PalmSource, Inc. and others. + * Copyright (c) 2006, 2014 PalmSource, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -26,6 +26,7 @@ package org.eclipse.cdt.launch.remote.tabs; +import org.eclipse.cdt.internal.launch.remote.Activator; import org.eclipse.cdt.internal.launch.remote.Messages; import org.eclipse.cdt.launch.remote.IRemoteConnectionConfigurationConstants; import org.eclipse.cdt.launch.remote.IRemoteConnectionHostConstants; @@ -142,7 +143,7 @@ public class RemoteCMainTab extends CMainTab { }); PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), - "org.eclipse.rse.internal.remotecdt.launchgroup"); //$NON-NLS-1$ + Activator.PLUGIN_ID + ".launchgroup"); //$NON-NLS-1$ // //No more needed according to // https://bugs.eclipse.org/bugs/show_bug.cgi?id=178832 diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml index c2bc5288985..ac39c567516 100644 --- a/debug/org.eclipse.cdt.debug.ui/plugin.xml +++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml @@ -35,37 +35,43 @@ + helpContextId="org.eclipse.cdt.debug.ui.cdt_debugging_projects" + id="org.eclipse.cdt.launch.applicationLaunchTabGroup" + type="org.eclipse.cdt.launch.applicationLaunchType"> + helpContextId="org.eclipse.cdt.debug.ui.cdt_debugging_projects" + id="org.eclipse.cdt.launch.applicationRunLaunchTabGroup" + type="org.eclipse.cdt.launch.applicationLaunchType"> + helpContextId="org.eclipse.cdt.debug.ui.cdt_debugging_projects" + id="org.eclipse.cdt.launch.attachLaunchTabGroup" + type="org.eclipse.cdt.launch.attachLaunchType"> + helpContextId="org.eclipse.cdt.debug.ui.cdt_debugging_projects" + id="org.eclipse.cdt.launch.postmortemLaunchTabGroup" + type="org.eclipse.cdt.launch.postmortemLaunchType"> + helpContextId="org.eclipse.cdt.debug.ui.cdt_debugging_projects" + id="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup" + type="org.eclipse.cdt.launch.remoteApplicationLaunchType"> + helpContextId="org.eclipse.cdt.debug.ui.cdt_debugging_projects" + id="org.eclipse.cdt.launch.remoteApplicationRunLaunchTabGroup" + type="org.eclipse.cdt.launch.remoteApplicationLaunchType"> diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT_LAUNCH.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT_LAUNCH.xml index 1b73622d530..feeba7bf657 100644 --- a/doc/org.eclipse.cdt.doc.user/contexts_CDT_LAUNCH.xml +++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT_LAUNCH.xml @@ -52,4 +52,12 @@ label="Common"/> - \ No newline at end of file + + How to debug projects, click below to see help. + + + + + diff --git a/doc/org.eclipse.cdt.doc.user/plugin.xml b/doc/org.eclipse.cdt.doc.user/plugin.xml index 3b6edfe6b52..dc5d78ea802 100644 --- a/doc/org.eclipse.cdt.doc.user/plugin.xml +++ b/doc/org.eclipse.cdt.doc.user/plugin.xml @@ -69,6 +69,18 @@ file="contexts_CDT_LAUNCH.xml" plugin="org.eclipse.cdt.launch"> + + + + + + diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/plugin.xml b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/plugin.xml index da1a82374d8..12cf41987cd 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/plugin.xml +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/plugin.xml @@ -12,6 +12,7 @@ point="org.eclipse.debug.ui.launchConfigurationTabGroups"> diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDSFDebuggerTab.java b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDSFDebuggerTab.java index d313f5515eb..089c2a90c4d 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDSFDebuggerTab.java +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDSFDebuggerTab.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 QNX Software Systems and others. + * Copyright (c) 2007, 2014 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -36,6 +36,7 @@ import org.eclipse.cdt.debug.mi.core.command.factories.CommandFactoryManager; import org.eclipse.cdt.dsf.gdb.IGDBLaunchConfigurationConstants; import org.eclipse.cdt.dsf.gdb.IGdbDebugPreferenceConstants; import org.eclipse.cdt.dsf.gdb.internal.GdbPlugin; +import org.eclipse.cdt.dsf.gdb.internal.ui.launching.ICDTLaunchHelpContextIds; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.Platform; import org.eclipse.debug.core.ILaunchConfiguration; @@ -126,6 +127,8 @@ public class GDBJtagDSFDebuggerTab extends AbstractLaunchConfigurationTab { }); // This checkbox needs an explanation. Attach context help to it. PlatformUI.getWorkbench().getHelpSystem().setHelp(fUpdateThreadlistOnSuspend, "org.eclipse.cdt.dsf.gdb.ui.update_threadlist_button_context"); //$NON-NLS-1$ + // Attach context help to this tab. + PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), ICDTLaunchHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_DEBBUGER_TAB); } private void browseButtonSelected(String title, Text text) {