mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-23 14:42:11 +02:00
Commit for Andrew Niefer
This commit is contained in:
parent
ada2d52b6c
commit
0c44656105
5 changed files with 68 additions and 3 deletions
|
@ -17,6 +17,13 @@ public interface ManagedBuilderHelpContextIds {
|
|||
public static final String PREFIX= CUIPlugin.PLUGIN_ID + "."; //$NON-NLS-1$
|
||||
|
||||
// Wizard pages
|
||||
public static final String MAN_PROJ_PLATFORM_HELP = PREFIX + "man_proj_platform_help"; //$NON-NLS-1$
|
||||
public static final String MAN_PROJ_PLATFORM_HELP = PREFIX + "new_proj_wiz_m_target"; //$NON-NLS-1$
|
||||
public static final String MAN_PROJ_WIZ_NAME_PAGE = PREFIX + "new_proj_wiz_m_name"; //$NON-NLS-1$
|
||||
public static final String MAN_PROJ_WIZ_PROJECTS_TAB = PREFIX + "new_proj_wiz_m_proj"; //$NON-NLS-1$
|
||||
public static final String MAN_PROJ_WIZ_ERRORPARSERS_TAB = PREFIX + "new_proj_wiz_m_errorp"; //$NON-NLS-1$
|
||||
public static final String MAN_PROJ_WIZ_INDEXER_TAB = PREFIX + "new_proj_wiz_m_cindexer"; //$NON-NLS-1$
|
||||
|
||||
public static final String MAN_PROJ_BUILD_PROP = PREFIX + "man_prop_build"; //$NON-NLS-1$
|
||||
public static final String MAN_PROJ_ERROR_PARSER = PREFIX + "man_prop_error"; //$NON-NLS-1$
|
||||
|
||||
}
|
||||
|
|
|
@ -13,6 +13,9 @@ package org.eclipse.cdt.managedbuilder.internal.ui;
|
|||
|
||||
import org.eclipse.cdt.ui.dialogs.ICOptionContainer;
|
||||
import org.eclipse.cdt.ui.dialogs.TabFolderOptionBlock;
|
||||
import org.eclipse.swt.widgets.Composite;
|
||||
import org.eclipse.swt.widgets.Control;
|
||||
import org.eclipse.ui.help.WorkbenchHelp;
|
||||
|
||||
public class ManagedProjectOptionBlock extends TabFolderOptionBlock {
|
||||
|
||||
|
@ -36,5 +39,11 @@ public class ManagedProjectOptionBlock extends TabFolderOptionBlock {
|
|||
public ErrorParserBlock getErrorParserBlock() {
|
||||
return errParserBlock;
|
||||
}
|
||||
|
||||
public Control createContents(Composite parent) {
|
||||
Control control = super.createContents( parent );
|
||||
|
||||
WorkbenchHelp.setHelp(getErrorParserBlock().getControl(), ManagedBuilderHelpContextIds.MAN_PROJ_ERROR_PARSER);
|
||||
|
||||
return control;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -29,6 +29,7 @@ import org.eclipse.cdt.managedbuilder.core.IOptionCategory;
|
|||
import org.eclipse.cdt.managedbuilder.core.ITarget;
|
||||
import org.eclipse.cdt.managedbuilder.core.ITool;
|
||||
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
|
||||
import org.eclipse.cdt.managedbuilder.internal.ui.ManagedBuilderHelpContextIds;
|
||||
import org.eclipse.cdt.managedbuilder.internal.ui.ManagedBuilderUIMessages;
|
||||
import org.eclipse.cdt.utils.ui.controls.ControlFactory;
|
||||
import org.eclipse.core.resources.IProject;
|
||||
|
@ -63,6 +64,7 @@ import org.eclipse.swt.widgets.Listener;
|
|||
import org.eclipse.swt.widgets.Shell;
|
||||
import org.eclipse.ui.IWorkbenchPropertyPage;
|
||||
import org.eclipse.ui.dialogs.PropertyPage;
|
||||
import org.eclipse.ui.help.WorkbenchHelp;
|
||||
|
||||
public class BuildPropertyPage extends PropertyPage implements IWorkbenchPropertyPage, IPreferencePageContainer {
|
||||
/*
|
||||
|
@ -263,6 +265,8 @@ public class BuildPropertyPage extends PropertyPage implements IWorkbenchPropert
|
|||
|
||||
// Do not call this until the widgets are constructed
|
||||
handleTargetSelection();
|
||||
|
||||
WorkbenchHelp.setHelp(composite, ManagedBuilderHelpContextIds.MAN_PROJ_BUILD_PROP);
|
||||
return composite;
|
||||
}
|
||||
|
||||
|
|
|
@ -11,9 +11,14 @@ package org.eclipse.cdt.managedbuilder.ui.wizards;
|
|||
* IBM Rational Software - Initial API and implementation
|
||||
* **********************************************************************/
|
||||
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
|
||||
import org.eclipse.cdt.managedbuilder.internal.ui.ErrorParserBlock;
|
||||
import org.eclipse.cdt.managedbuilder.internal.ui.ManagedBuilderHelpContextIds;
|
||||
import org.eclipse.cdt.managedbuilder.internal.ui.ManagedBuilderUIPlugin;
|
||||
import org.eclipse.cdt.managedbuilder.internal.ui.ManagedProjectOptionBlock;
|
||||
import org.eclipse.cdt.ui.dialogs.ICOptionPage;
|
||||
import org.eclipse.cdt.ui.dialogs.IndexerBlock;
|
||||
import org.eclipse.cdt.ui.dialogs.ReferenceBlock;
|
||||
import org.eclipse.cdt.ui.dialogs.TabFolderOptionBlock;
|
||||
|
@ -21,6 +26,7 @@ import org.eclipse.cdt.ui.wizards.NewCProjectWizard;
|
|||
import org.eclipse.cdt.ui.wizards.NewCProjectWizardOptionPage;
|
||||
import org.eclipse.core.resources.IProject;
|
||||
import org.eclipse.core.runtime.Preferences;
|
||||
import org.eclipse.ui.help.WorkbenchHelp;
|
||||
|
||||
public class NewManagedProjectOptionPage extends NewCProjectWizardOptionPage {
|
||||
|
||||
|
@ -51,7 +57,25 @@ public class NewManagedProjectOptionPage extends NewCProjectWizardOptionPage {
|
|||
addTab(new ReferenceBlock());
|
||||
errorParsers = new ErrorParserBlock();
|
||||
addTab(errorParsers);
|
||||
addTab(indexBlock = new IndexerBlock());
|
||||
addTab(indexBlock = new IndexerBlock());
|
||||
}
|
||||
|
||||
public void setupHelpContextIds(){
|
||||
List pages = getOptionPages();
|
||||
|
||||
Iterator iter = pages.iterator();
|
||||
for( int i = 0; i < 3 && iter.hasNext(); i++ ) {
|
||||
ICOptionPage page = (ICOptionPage) iter.next();
|
||||
|
||||
String id = null;
|
||||
switch( i ){
|
||||
case 0 : id = ManagedBuilderHelpContextIds.MAN_PROJ_WIZ_PROJECTS_TAB; break;
|
||||
case 1 : id = ManagedBuilderHelpContextIds.MAN_PROJ_WIZ_ERRORPARSERS_TAB; break;
|
||||
case 2 : id = ManagedBuilderHelpContextIds.MAN_PROJ_WIZ_INDEXER_TAB; break;
|
||||
}
|
||||
WorkbenchHelp.setHelp(page.getControl(), id);
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -93,5 +117,8 @@ public class NewManagedProjectOptionPage extends NewCProjectWizardOptionPage {
|
|||
optionBlock.updateTargetProperties();
|
||||
}
|
||||
|
||||
public void setupHelpContextIds(){
|
||||
optionBlock.setupHelpContextIds();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -20,6 +20,7 @@ import org.eclipse.cdt.managedbuilder.core.IConfiguration;
|
|||
import org.eclipse.cdt.managedbuilder.core.ITarget;
|
||||
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
|
||||
import org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature;
|
||||
import org.eclipse.cdt.managedbuilder.internal.ui.ManagedBuilderHelpContextIds;
|
||||
import org.eclipse.cdt.managedbuilder.internal.ui.ManagedBuilderUIMessages;
|
||||
import org.eclipse.cdt.managedbuilder.internal.ui.ManagedBuilderUIPlugin;
|
||||
import org.eclipse.cdt.ui.wizards.NewCProjectWizard;
|
||||
|
@ -28,6 +29,9 @@ import org.eclipse.core.runtime.IProgressMonitor;
|
|||
import org.eclipse.core.runtime.IStatus;
|
||||
import org.eclipse.core.runtime.NullProgressMonitor;
|
||||
import org.eclipse.core.runtime.SubProgressMonitor;
|
||||
import org.eclipse.jface.wizard.IWizardPage;
|
||||
import org.eclipse.swt.widgets.Composite;
|
||||
import org.eclipse.ui.help.WorkbenchHelp;
|
||||
|
||||
|
||||
public class NewManagedProjectWizard extends NewCProjectWizard {
|
||||
|
@ -78,6 +82,20 @@ public class NewManagedProjectWizard extends NewCProjectWizard {
|
|||
addPage(optionPage);
|
||||
}
|
||||
|
||||
public void createPageControls(Composite pageContainer) {
|
||||
super.createPageControls( pageContainer );
|
||||
|
||||
IWizardPage [] pages = getPages();
|
||||
|
||||
if( pages != null && pages.length == 3 ){
|
||||
WorkbenchHelp.setHelp(pages[0].getControl(), ManagedBuilderHelpContextIds.MAN_PROJ_WIZ_NAME_PAGE);
|
||||
|
||||
//pages[1] is the CProjectPlatformPage which already has a help id.
|
||||
|
||||
NewManagedProjectOptionPage optionPage = (NewManagedProjectOptionPage) pages[2];
|
||||
optionPage.setupHelpContextIds();
|
||||
}
|
||||
}
|
||||
public void updateTargetProperties() {
|
||||
// Update the error parser list
|
||||
optionPage.updateTargetProperties();
|
||||
|
|
Loading…
Add table
Reference in a new issue