From b0138f2973874b80c4a18e75244f3650d15f82a6 Mon Sep 17 00:00:00 2001 From: John Camelon Date: Mon, 29 Sep 2003 14:56:38 +0000 Subject: [PATCH] Patch for Hoda Amer Documentation needs a different help ID for each CEditor preference page. --- core/org.eclipse.cdt.ui/ChangeLog | 3 +++ .../src/org/eclipse/cdt/internal/ui/ICHelpContextIds.java | 1 + .../cdt/internal/ui/preferences/CEditorPreferencePage.java | 6 ++++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index f8670516403..258c63729ee 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,6 @@ +2003-09-29 Hoda Amer + - Fixed Help IDs for C_Editor preference tabs. + 2003-09-26 David Inglis fixes: https://bugs.eclipse.org/bugs/show_bug.cgi?id=43776 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 67dd0bf7cfd..1a8cb51ce10 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 @@ -34,6 +34,7 @@ public interface ICHelpContextIds { public static final String C_EDITOR_PREF_PAGE= PREFIX + "new_c_editor_pref_page_context"; public static final String C_EDITOR_ANNOTATIONS_PREF_PAGE= PREFIX + "new_c_editor_annotations_pref_page_context"; public static final String C_EDITOR_COLORS_PREF_PAGE= PREFIX + "new_c_editor_colors_pref_page_context"; + public static final String C_EDITOR_CONTENT_ASSIST_PREF_PAGE= PREFIX + "new_c_editor_content_assist_pref_page_context"; public static final String TEMPLATE_PREFERENCE_PAGE= PREFIX + "new_c_templates_pref_page_context"; public static final String LAUNCH_PROPERTY_PAGE= PREFIX + "new_launch_property_page_context"; public static final String PROJECT_PROPERTY_PAGE= PREFIX + "new_project_property_page_context"; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java index b60ce22c214..7ba7def7283 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java @@ -360,7 +360,6 @@ public class CEditorPreferencePage extends PreferencePage implements IWorkbenchP */ public void createControl(Composite parent) { super.createControl(parent); - WorkbenchHelp.setHelp(parent, ICHelpContextIds.C_EDITOR_PREF_PAGE); } protected void handleListSelection() { @@ -661,7 +660,7 @@ public class CEditorPreferencePage extends PreferencePage implements IWorkbenchP } }); - WorkbenchHelp.setHelp(parent, ICHelpContextIds.C_EDITOR_COLORS_PREF_PAGE); + WorkbenchHelp.setHelp(colorComposite, ICHelpContextIds.C_EDITOR_COLORS_PREF_PAGE); return colorComposite; } @@ -878,6 +877,7 @@ public class CEditorPreferencePage extends PreferencePage implements IWorkbenchP } }); + WorkbenchHelp.setHelp(behaviorComposite, ICHelpContextIds.C_EDITOR_PREF_PAGE); return behaviorComposite; } @@ -927,6 +927,8 @@ public class CEditorPreferencePage extends PreferencePage implements IWorkbenchP // label= "Fo®round for method parameters:"; // addColorButton(contentAssistComposite, label, ContentAssistPreference.PARAMETERS_FOREGROUND, 0); + WorkbenchHelp.setHelp(contentAssistComposite, ICHelpContextIds.C_EDITOR_CONTENT_ASSIST_PREF_PAGE); + return contentAssistComposite; }