From 8f0bb1d073d24f726ba7b446fcfc5278de8e82e0 Mon Sep 17 00:00:00 2001 From: Oleg Krasilnikov Date: Wed, 14 Mar 2007 07:28:55 +0000 Subject: [PATCH] Pref pages interface changed --- .../plugin.properties | 4 +++- .../ui/newui/PrefPage_NewCDTProject.java | 6 +++++- .../ui/newui/PrefPage_NewCDTWizard.java | 16 ++++++++++++++++ .../managedbuilder/ui/newui/messages.properties | 2 ++ .../eclipse/cdt/ui/newui/AbstractPrefPage.java | 9 ++++----- .../org/eclipse/cdt/ui/newui/PrefPage_Env.java | 2 +- .../org/eclipse/cdt/ui/newui/PrefPage_Vars.java | 2 +- 7 files changed, 32 insertions(+), 9 deletions(-) create mode 100644 build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/PrefPage_NewCDTWizard.java diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties b/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties index 9ade9bcd717..54c4581caba 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties +++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties @@ -24,6 +24,7 @@ MngOtherProp.name= Error/Binary Parsers #The preference pages MakeBuildPref.name=Makefile Project MngBuildPref.name=Managed Build +NewCDTWizardPref.name=New CDT project wizard #The Resource Property page MngResourceProp.name=C/C++ Build @@ -85,4 +86,5 @@ Environment=Environment Binary.parsers=Binary parsers Error.parsers=Error parsers Data.hierarchy=Data hierarchy - +Preferred.toolchains=Preferred toolchains +Wizard.defaults=Wizard defaults \ No newline at end of file diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/PrefPage_NewCDTProject.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/PrefPage_NewCDTProject.java index f76e63b0177..36b8dc1facc 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/PrefPage_NewCDTProject.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/PrefPage_NewCDTProject.java @@ -15,6 +15,7 @@ import org.eclipse.cdt.core.settings.model.ICResourceDescription; import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager; import org.eclipse.cdt.ui.newui.AbstractPrefPage; import org.eclipse.cdt.ui.newui.ICPropertyTab; +import org.eclipse.cdt.ui.newui.NewUIMessages; import org.eclipse.core.runtime.CoreException; public class PrefPage_NewCDTProject extends AbstractPrefPage { @@ -38,5 +39,8 @@ public class PrefPage_NewCDTProject extends AbstractPrefPage { return true; } - protected boolean needsHeader() { return true; } + protected String getHeader() { + return NewUIMessages.getResourceString("AbstractPrefPage.0") + //$NON-NLS-1$ + NewUIMessages.getResourceString("AbstractPrefPage.1"); //$NON-NLS-1$ + } } diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/PrefPage_NewCDTWizard.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/PrefPage_NewCDTWizard.java new file mode 100644 index 00000000000..4643c2123d9 --- /dev/null +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/PrefPage_NewCDTWizard.java @@ -0,0 +1,16 @@ +package org.eclipse.cdt.managedbuilder.ui.newui; + +import org.eclipse.cdt.ui.newui.AbstractPrefPage; + +public class PrefPage_NewCDTWizard extends AbstractPrefPage { + + protected String getHeader() { + return Messages.getString("PrefPage_NewCDTWizard.0") + //$NON-NLS-1$ + Messages.getString("PrefPage_NewCDTWizard.1"); //$NON-NLS-1$ + } + + protected boolean isSingle() { + return false; + } + +} diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/messages.properties b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/messages.properties index 84616d03fcb..87ba3bc3b20 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/messages.properties +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/messages.properties @@ -68,3 +68,5 @@ BuildAllAction.4=Select... BuildAllAction.5=Build selected configurations in parallel BuildAllAction.6=Select configurations to build BuildAllAction.7=Build configurations +PrefPage_NewCDTWizard.0=Settings will be applied to CDT new project wizard +PrefPage_NewCDTWizard.1=\nduring project creation process diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPrefPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPrefPage.java index 693c024269c..4b80c8917d6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPrefPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPrefPage.java @@ -41,14 +41,13 @@ public abstract class AbstractPrefPage extends AbstractPage compositeLayout.marginWidth = 0; composite.setLayout( compositeLayout ); - if (needsHeader()) { + String s = getHeader(); + if (s != null) { Group configGroup = ControlFactory.createGroup(composite, EMPTY_STR, 1); GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL); gd.grabExcessHorizontalSpace = true; configGroup.setLayoutData(gd); - titleLabel = ControlFactory.createLabel(configGroup, - NewUIMessages.getResourceString("AbstractPrefPage.0") + //$NON-NLS-1$ - NewUIMessages.getResourceString("AbstractPrefPage.1")); //$NON-NLS-1$ + titleLabel = ControlFactory.createLabel(configGroup, s); } createWidgets(composite); return composite; @@ -59,5 +58,5 @@ public abstract class AbstractPrefPage extends AbstractPage public void init(IWorkbench workbench) {} public ICResourceDescription getResDesc() { return null; } public void performApply() { performOk(); } - abstract protected boolean needsHeader(); + abstract protected String getHeader(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PrefPage_Env.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PrefPage_Env.java index efe89889ac1..b15adfe5e27 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PrefPage_Env.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PrefPage_Env.java @@ -10,5 +10,5 @@ public class PrefPage_Env extends AbstractPrefPage { return true; } - protected boolean needsHeader() { return false; } + protected String getHeader() { return null; } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PrefPage_Vars.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PrefPage_Vars.java index 16809bc7d4a..c81368db4c9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PrefPage_Vars.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PrefPage_Vars.java @@ -3,7 +3,7 @@ package org.eclipse.cdt.ui.newui; public class PrefPage_Vars extends AbstractPrefPage { protected boolean isSingle() { return true; } - protected boolean needsHeader() { return false; } + protected String getHeader() { return null; } // Tabs themselves should save data public boolean performOk() {