From 183a84fce36e97dc7beb4251367f01f7669249bb Mon Sep 17 00:00:00 2001 From: David Inglis Date: Tue, 23 Sep 2003 14:40:12 +0000 Subject: [PATCH] help ids added for error parser page and binary parser page --- .../src/org/eclipse/cdt/internal/ui/ICHelpContextIds.java | 3 +++ .../eclipse/cdt/ui/dialogs/AbstractErrorParserBlock.java | 6 +++++- .../src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java | 6 +++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ICHelpContextIds.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ICHelpContextIds.java index 5264c7a8cf2..81ab3891c71 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ICHelpContextIds.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ICHelpContextIds.java @@ -41,6 +41,9 @@ public interface ICHelpContextIds { public static final String TODO_TASK_INPUT_DIALOG= PREFIX + "todo_task_input_dialog_context"; //$NON-NLS-1$ public static final String TODO_TASK_PROPERTY_PAGE= PREFIX + "tasktags_property_page_context"; //$NON-NLS-1$ public static final String TODO_TASK_PREFERENCE_PAGE= PREFIX + "tasktags_preference_page_context"; //$NON-NLS-1$ + + public static final String BINARY_PARSER_PAGE= PREFIX + "cdt_binary_parser_page"; //$NON-NLS-1$ + public static final String ERROR_PARSERS_PAGE= PREFIX + "cdt_error_parsers_page"; //$NON-NLS-1$ // Console view public static final String CLEAR_CONSOLE_ACTION= PREFIX + "clear_console_action_context"; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractErrorParserBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractErrorParserBlock.java index 4bc6cfcecaf..c5c3898da53 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractErrorParserBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractErrorParserBlock.java @@ -19,6 +19,7 @@ import java.util.StringTokenizer; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.ErrorParserManager; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; import org.eclipse.cdt.internal.ui.wizards.dialogfields.CheckedListDialogField; import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField; import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener; @@ -36,6 +37,7 @@ import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Composite; +import org.eclipse.ui.help.WorkbenchHelp; public abstract class AbstractErrorParserBlock extends AbstractCOptionPage { @@ -164,6 +166,9 @@ public abstract class AbstractErrorParserBlock extends AbstractCOptionPage { public void createControl(Composite parent) { Composite composite = new Composite(parent, SWT.NONE); + setControl(composite); + + WorkbenchHelp.setHelp(getControl(), ICHelpContextIds.ERROR_PARSERS_PAGE); String[] buttonLabels = new String[] { /* 0 */ @@ -190,7 +195,6 @@ public abstract class AbstractErrorParserBlock extends AbstractCOptionPage { LayoutUtil.setHorizontalGrabbing(fErrorParserList.getListControl(null)); initializeValues(); - setControl(composite); } public void performApply(IProgressMonitor monitor) throws CoreException { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java index 4d5a17a0c42..9f1c16e7531 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java @@ -16,6 +16,7 @@ import java.util.Iterator; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.ICDescriptor; import org.eclipse.cdt.core.ICExtensionReference; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.utils.ui.controls.ControlFactory; import org.eclipse.core.runtime.CoreException; @@ -33,6 +34,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 BinaryParserBlock extends AbstractBinaryParserPage { @@ -56,6 +58,9 @@ public class BinaryParserBlock extends AbstractBinaryParserPage { Composite control = ControlFactory.createComposite(parent, 2); ((GridLayout) control.getLayout()).makeColumnsEqualWidth = false; ((GridLayout) control.getLayout()).marginWidth = 5; + setControl(control); + + WorkbenchHelp.setHelp(getControl(), ICHelpContextIds.BINARY_PARSER_PAGE); ControlFactory.createEmptySpace(control, 2); @@ -96,7 +101,6 @@ public class BinaryParserBlock extends AbstractBinaryParserPage { // fire a change event, to quick start. handleBinaryParserChanged(); - setControl(control); } public void performApply(IProgressMonitor monitor) throws CoreException {