Attachment #50145 for bug #157291

View | Details | Raw Unified | Return to bug 157291
Collapse All | Expand All

Lines 223-228 Link Here

(-)contexts_CDT.xml (+24 lines)
223	<topic href="reference/cdt_u_sprop_indexer.htm"	223	<topic href="reference/cdt_u_sprop_indexer.htm"
224	label="Indexer"/>	224	label="Indexer"/>
225	</context>	225	</context>
		226	<context id ="std_prop_allprojtabs">
		227	<description>Click below to see help.</description>
		228	<topic href="reference/cdt_u_sprop_mbuild.htm"
		229	label="Make Builder"/>
		230	<topic href="reference/cdt_u_sprop_merror.htm"
		231	label="Error Parser"/>
		232	<topic href="reference/cdt_u_sprop_mbinary.htm"
		233	label="Binary Parser"/>
		234	<topic href="reference/cdt_u_sprop_mdiscovery.htm"
		235	label="Discovery Options"/>
		236	</context>
226	<context id ="std_prop_build">	237	<context id ="std_prop_build">
227	<description>Click below to see help.</description>	238	<description>Click below to see help.</description>
228	<topic href="reference/cdt_u_sprop_mbuild.htm"	239	<topic href="reference/cdt_u_sprop_mbuild.htm"
Lines 243-248 Link Here
243	<topic href="reference/cdt_u_sprop_mdiscovery.htm"	254	<topic href="reference/cdt_u_sprop_mdiscovery.htm"
244	label="Discovery Options"/>	255	label="Discovery Options"/>
245	</context>	256	</context>
		257	<context id ="std_prop_allpathtabs">
		258	<description>Click below to see help.</description>
		259	<topic href="reference/cdt_u_sprop_psource.htm"
		260	label="Source"/>
		261	<topic href="reference/cdt_u_sprop_poutput.htm"
		262	label="Output"/>
		263	<topic href="reference/cdt_u_sprop_pproj.htm"
		264	label="Projects"/>
		265	<topic href="reference/cdt_u_sprop_plib.htm"
		266	label="Libraries"/>
		267	<topic href="reference/cdt_u_sprop_pcontainers.htm"
		268	label="Path Containers"/>
		269	</context>
246	<context id ="std_prop_source">	270	<context id ="std_prop_source">
247	<description>Click below to see help.</description>	271	<description>Click below to see help.</description>
248	<topic href="reference/cdt_u_sprop_psource.htm"	272	<topic href="reference/cdt_u_sprop_psource.htm"




			if( optionContainer != null && optionContainer instanceof MakePropertyPage )
				switch( i ){
					case 0 : helpSystem.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_PROP_BUILDER_SETTINGS); break;
					// case 1: the discovery page!
					case 2 : helpSystem.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_PROP_ERROR_PARSER );    break;
					case 3 : helpSystem.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_PROP_BINARY_PARSER );   break;
					case 4 : helpSystem.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_PROP_DISCOVERY );       break;
				}
			else 
				switch( i ){
					case 0 : helpSystem.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_BUILDER_SETTINGS);             break;
					// case 1: the discovery page!
					case 2 : helpSystem.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_PREF_ERROR_PARSER );           break;
					case 3 : helpSystem.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_PREF_BINARY_PARSER );          break;
					case 4 : helpSystem.setHelp(page.getControl(), IMakeHelpContextIds.SCANNER_CONFIG_DISCOVERY_OPTIONS ); break;
				}
		}


Lines 12-20 Link Here

(-)src/org/eclipse/cdt/make/internal/ui/properties/MakePropertyPage.java (+4 lines)
12		12
13	import java.lang.reflect.InvocationTargetException;	13	import java.lang.reflect.InvocationTargetException;
14		14
		15	import org.eclipse.cdt.internal.ui.ICHelpContextIds;
15	import org.eclipse.cdt.make.core.MakeCorePlugin;	16	import org.eclipse.cdt.make.core.MakeCorePlugin;
16	import org.eclipse.cdt.make.internal.ui.MakeProjectOptionBlock;	17	import org.eclipse.cdt.make.internal.ui.MakeProjectOptionBlock;
17	import org.eclipse.cdt.make.internal.ui.MakeUIPlugin;	18	import org.eclipse.cdt.make.internal.ui.MakeUIPlugin;
		19	import org.eclipse.cdt.ui.CUIPlugin;
18	import org.eclipse.cdt.ui.dialogs.ICOptionContainer;	20	import org.eclipse.cdt.ui.dialogs.ICOptionContainer;
19	import org.eclipse.core.resources.IProject;	21	import org.eclipse.core.resources.IProject;
20	import org.eclipse.core.runtime.IProgressMonitor;	22	import org.eclipse.core.runtime.IProgressMonitor;
Lines 56-61 Link Here
56	contentForCProject(composite);	58	contentForCProject(composite);
57	}	59	}
58		60
		61	CUIPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(parent, ICHelpContextIds.PROJECT_PATHS_ALLPROJTABS);
		62
59	return composite;	63	return composite;
60	}	64	}
61		65

Lines 17-22 Link Here

(-)src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathPropertyPage.java (+5 lines)
17	import org.eclipse.cdt.core.model.ICElement;	17	import org.eclipse.cdt.core.model.ICElement;
18	import org.eclipse.cdt.core.model.ICProject;	18	import org.eclipse.cdt.core.model.ICProject;
19	import org.eclipse.cdt.core.resources.IPathEntryStore;	19	import org.eclipse.cdt.core.resources.IPathEntryStore;
		20
		21	import org.eclipse.cdt.internal.ui.ICHelpContextIds;
20	import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener;	22	import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener;
21	import org.eclipse.cdt.internal.ui.dialogs.StatusUtil;	23	import org.eclipse.cdt.internal.ui.dialogs.StatusUtil;
22	import org.eclipse.cdt.internal.ui.util.ExceptionHandler;	24	import org.eclipse.cdt.internal.ui.util.ExceptionHandler;
Lines 64-69 Link Here
64	result = createWithCProject(parent, project);	66	result = createWithCProject(parent, project);
65	}	67	}
66	Dialog.applyDialogFont(result);	68	Dialog.applyDialogFont(result);
		69
		70	CUIPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(parent, ICHelpContextIds.PROJECT_PATHS_ALLPATHTABS);
		71
67	return result;	72	return result;
68	}	73	}
69		74

Lines 19-24 Link Here

(-)src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IncludesSymbolsPropertyPage.java (+5 lines)
19	import org.eclipse.cdt.core.resources.IPathEntryStore;	19	import org.eclipse.cdt.core.resources.IPathEntryStore;
20	import org.eclipse.cdt.core.resources.IPathEntryStoreListener;	20	import org.eclipse.cdt.core.resources.IPathEntryStoreListener;
21	import org.eclipse.cdt.core.resources.PathEntryStoreChangedEvent;	21	import org.eclipse.cdt.core.resources.PathEntryStoreChangedEvent;
		22
		23	import org.eclipse.cdt.internal.ui.ICHelpContextIds;
22	import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener;	24	import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener;
23	import org.eclipse.cdt.internal.ui.dialogs.StatusUtil;	25	import org.eclipse.cdt.internal.ui.dialogs.StatusUtil;
24	import org.eclipse.cdt.internal.ui.util.ExceptionHandler;	26	import org.eclipse.cdt.internal.ui.util.ExceptionHandler;
Lines 67-72 Link Here
67	}	69	}
68	Dialog.applyDialogFont(result);	70	Dialog.applyDialogFont(result);
69	noDefaultAndApplyButton();	71	noDefaultAndApplyButton();
		72
		73	CUIPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(parent, ICHelpContextIds.PROJECT_INCLUDE_PATHS_SYMBOLS);
		74
70	return result;	75	return result;
71	}	76	}

Lines 70-77 Link Here

(-)src/org/eclipse/cdt/internal/ui/ICHelpContextIds.java (+2 lines)
70	public static final String TODO_TASK_PROPERTY_PAGE = PREFIX + "tasktags_property_page_context"; //$NON-NLS-1$	70	public static final String TODO_TASK_PROPERTY_PAGE = PREFIX + "tasktags_property_page_context"; //$NON-NLS-1$
71	public static final String TODO_TASK_PREFERENCE_PAGE = PREFIX + "tasktags_preference_page_context"; //$NON-NLS-1$	71	public static final String TODO_TASK_PREFERENCE_PAGE = PREFIX + "tasktags_preference_page_context"; //$NON-NLS-1$
72		72
		73	public static final String PROJECT_PATHS_ALLPROJTABS = PREFIX + "std_prop_allprojtabs"; //$NON-NLS-1$
73	public static final String BINARY_PARSER_PAGE = PREFIX + "newproj_parser_binary"; //$NON-NLS-1$	74	public static final String BINARY_PARSER_PAGE = PREFIX + "newproj_parser_binary"; //$NON-NLS-1$
74	public static final String ERROR_PARSERS_PAGE = PREFIX + "newproj_parser_error"; //$NON-NLS-1$	75	public static final String ERROR_PARSERS_PAGE = PREFIX + "newproj_parser_error"; //$NON-NLS-1$
		76	public static final String PROJECT_PATHS_ALLPATHTABS = PREFIX + "std_prop_allpathtabs"; //$NON-NLS-1$
75	public static final String PROJECT_PATHS_SOURCE = PREFIX + "std_prop_source"; //$NON-NLS-1$	77	public static final String PROJECT_PATHS_SOURCE = PREFIX + "std_prop_source"; //$NON-NLS-1$
76	public static final String PROJECT_PATHS_OUTPUT = PREFIX + "std_prop_output"; //$NON-NLS-1$	78	public static final String PROJECT_PATHS_OUTPUT = PREFIX + "std_prop_output"; //$NON-NLS-1$
77	public static final String PROJECT_PATHS_PROJECTS = PREFIX + "std_prop_projects"; //$NON-NLS-1$	79	public static final String PROJECT_PATHS_PROJECTS = PREFIX + "std_prop_projects"; //$NON-NLS-1$

Return to bug 157291

Lines 61-76 Link Here

(-)src/org/eclipse/cdt/make/internal/ui/MakeProjectOptionBlock.java (-6 / +8 lines)
61	if( optionContainer != null && optionContainer instanceof MakePropertyPage )	61	if( optionContainer != null && optionContainer instanceof MakePropertyPage )
62	switch( i ){	62	switch( i ){
63	case 0 : helpSystem.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_PROP_BUILDER_SETTINGS); break;	63	case 0 : helpSystem.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_PROP_BUILDER_SETTINGS); break;
64	case 1 : helpSystem.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_PROP_ERROR_PARSER ); break;	64	// case 1: the discovery page!
65	case 2 : helpSystem.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_PROP_BINARY_PARSER ); break;	65	case 2 : helpSystem.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_PROP_ERROR_PARSER ); break;
66	case 3 : helpSystem.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_PROP_DISCOVERY ); break;	66	case 3 : helpSystem.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_PROP_BINARY_PARSER ); break;
		67	case 4 : helpSystem.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_PROP_DISCOVERY ); break;
67	}	68	}
68	else	69	else
69	switch( i ){	70	switch( i ){
70	case 0 : helpSystem.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_BUILDER_SETTINGS); break;	71	case 0 : helpSystem.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_BUILDER_SETTINGS); break;
71	case 1 : helpSystem.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_PREF_ERROR_PARSER ); break;	72	// case 1: the discovery page!
72	case 2 : helpSystem.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_PREF_BINARY_PARSER ); break;	73	case 2 : helpSystem.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_PREF_ERROR_PARSER ); break;
73	case 3 : helpSystem.setHelp(page.getControl(), IMakeHelpContextIds.SCANNER_CONFIG_DISCOVERY_OPTIONS ); break;	74	case 3 : helpSystem.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_PREF_BINARY_PARSER ); break;
		75	case 4 : helpSystem.setHelp(page.getControl(), IMakeHelpContextIds.SCANNER_CONFIG_DISCOVERY_OPTIONS ); break;
74	}	76	}
75	}	77	}
76		78