Property pages adjust

This commit is contained in:
Oleg Krasilnikov 2007-04-04 10:36:55 +00:00
parent 9bcb71d896
commit af1e9d0989
14 changed files with 85 additions and 76 deletions

View file

@ -25,6 +25,9 @@ MngOtherProp.name= Error/Binary Parsers
MakeBuildPref.name=Makefile Project
MngBuildPref.name=Managed Build
NewCDTWizardPref.name=New CDT project wizard
varsPrefName=CDT build variables
envPrefName=Environment
propSettingsPrefName=Property Pages settings
#The Resource Property page
MngResourceProp.name=C/C++ Build

View file

@ -89,16 +89,29 @@
point="org.eclipse.ui.preferencePages">
<page
name="%MakeBuildPref.name"
category="org.eclipse.cdt.managedbuilder.ui.preferences.WizardPreferences"
category="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTWizard"
class="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTProject"
id="org.eclipse.cdt.managedbuilder.ui.preferences.BuildPreferences">
</page>
id="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTProject"/>
<page
name="%NewCDTWizardPref.name"
category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
class="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTWizard"
id="org.eclipse.cdt.managedbuilder.ui.preferences.WizardPreferences">
</page>
id="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTWizard"/>
<page
category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
class="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_Env"
id="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_Env"
name="%envPrefName"/>
<page
category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
class="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_Vars"
id="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_Vars"
name="%varsPrefName"/>
<page
category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
class="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_PropertyPage"
id="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_PropertyPage"
name="%propSettingsPrefName"/>
</extension>
<!-- Action for Project Converter in context menu -->
@ -244,39 +257,39 @@
icon="icons/elcl16/discovery.gif"
name="%Discovery.options"
weight="005"
parent="org.eclipse.cdt.ui.newui.Page_PathAndSymb"/>
parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"/>
<tab
class="org.eclipse.cdt.managedbuilder.ui.properties.ToolSettingsTab"
icon="icons/elcl16/config-tool.gif"
name="%Tool.settings"
weight="001"
parent="org.eclipse.cdt.ui.newui.Page_BuildSettings"/>
parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"/>
<tab
class="org.eclipse.cdt.managedbuilder.ui.properties.BuildStepsTab"
icon="icons/obj16/steps.gif"
name="%Build.steps"
parent="org.eclipse.cdt.ui.newui.Page_BuildSettings"
parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"
weight="002"/>
<tab
class="org.eclipse.cdt.managedbuilder.ui.properties.ArtifactTab"
icon="icons/obj16/artifact.gif"
name="%Build.artifact"
parent="org.eclipse.cdt.ui.newui.Page_BuildSettings"
parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"
weight="003"/>
<tab
class="org.eclipse.cdt.managedbuilder.ui.properties.BuilderSettingsTab"
icon="icons/obj16/build_settings.gif"
name="%Builder.settings"
parent="org.eclipse.cdt.ui.newui.Page_BuildSettings"
parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"
weight="004"/>
<tab
class="org.eclipse.cdt.managedbuilder.ui.properties.CPropertyVarsTab"
name="(Single) CDT Vars (macros)"
parent="org.eclipse.cdt.ui.newui.Page_Variables"/>
parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_Variables"/>
<tab
class="org.eclipse.cdt.managedbuilder.ui.properties.ToolChainEditTab"
name="(Single) Tool chain edit"
parent="org.eclipse.cdt.managedbuilder.ui.properties.Page_ToolChain"/>
parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_ToolChain"/>
<!-- exported from CORE -->
<tab
@ -284,143 +297,143 @@
icon="icons/obj16/hfolder_obj.gif"
name="%Includes"
weight="001"
parent="org.eclipse.cdt.ui.newui.Page_PathAndSymb"
parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"
tooltip="&quot;Includes list&quot;"/>
<tab
class="org.eclipse.cdt.ui.newui.SymbolTab"
icon="icons/obj16/define_obj.gif"
name="%Symbols"
weight="002"
parent="org.eclipse.cdt.ui.newui.Page_PathAndSymb"
parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"
tooltip="&quot;Macros list&quot;"/>
<tab
class="org.eclipse.cdt.ui.newui.LibraryTab"
icon="icons/obj16/lib_obj.gif"
name="%Libraries"
weight="003"
parent="org.eclipse.cdt.ui.newui.Page_PathAndSymb"
parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"
tooltip="&quot;Libraries list&quot;"/>
<tab
class="org.eclipse.cdt.ui.newui.LibraryPathTab"
icon="icons/obj16/opentype.gif"
name="%Library.paths"
weight="004"
parent="org.eclipse.cdt.ui.newui.Page_PathAndSymb"/>
parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"/>
<tab
class="org.eclipse.cdt.ui.newui.RefsTab"
icon="icons/obj16/search_ref_obj.gif"
name="%References"
weight="010"
parent="org.eclipse.cdt.ui.newui.Page_PathAndSymb"/>
parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"/>
<tab
class="org.eclipse.cdt.ui.newui.CLocationSourceTab"
icon="icons/obj16/fldr_obj.gif"
name="%Source.location"
weight="008"
parent="org.eclipse.cdt.ui.newui.Page_PathAndSymb"/>
parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"/>
<tab
class="org.eclipse.cdt.managedbuilder.ui.properties.CBuildLocationOutputTab"
icon="icons/obj16/output_folder_obj.gif"
name="%Output.location"
weight="009"
parent="org.eclipse.cdt.ui.newui.Page_PathAndSymb"/>
parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"/>
<tab
class="org.eclipse.cdt.ui.newui.StructureTreeTab"
icon="icons/obj16/hierarchy.gif"
name="%Data.hierarchy"
parent="org.eclipse.cdt.ui.newui.Page_PathAndSymb"
parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"
weight="012"/>
<tab
class="org.eclipse.cdt.ui.newui.EnvironmentTab"
icon="icons/obj16/environment.gif"
name="%Environment"
weight="005"
parent="org.eclipse.cdt.ui.newui.Page_BuildSettings"/>
parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"/>
<tab
class="org.eclipse.cdt.ui.newui.BinaryParsTab"
icon="icons/obj16/bin_obj.gif"
name="%Binary.parsers"
weight="006"
parent="org.eclipse.cdt.ui.newui.Page_BuildSettings"/>
parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"/>
<tab
class="org.eclipse.cdt.ui.newui.ErrorParsTab"
icon="icons/obj16/error_obj.gif"
name="%Error.parsers"
weight="007"
parent="org.eclipse.cdt.ui.newui.Page_BuildSettings"/>
parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"/>
<!-- Export settings page -->
<tab
class="org.eclipse.cdt.ui.newui.ExpIncludeTab"
icon="icons/obj16/hfolder_obj.gif"
name="%Includes"
parent="org.eclipse.cdt.ui.newui.Page_ExpPathAndSymb"
parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_ExpPathAndSymb"
tooltip="&quot;Includes list&quot;"/>
<tab
class="org.eclipse.cdt.ui.newui.ExpSymbolTab"
icon="icons/obj16/define_obj.gif"
name="%Symbols"
parent="org.eclipse.cdt.ui.newui.Page_ExpPathAndSymb"
parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_ExpPathAndSymb"
tooltip="&quot;Macros list&quot;"/>
<tab
class="org.eclipse.cdt.ui.newui.ExpLibraryTab"
icon="icons/obj16/lib_obj.gif"
name="%Libraries"
parent="org.eclipse.cdt.ui.newui.Page_ExpPathAndSymb"
parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_ExpPathAndSymb"
tooltip="&quot;Libraries list&quot;"/>
<tab
class="org.eclipse.cdt.ui.newui.ExpLibraryPathTab"
icon="icons/obj16/opentype.gif"
name="%Library.paths"
parent="org.eclipse.cdt.ui.newui.Page_ExpPathAndSymb"/>
parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_ExpPathAndSymb"/>
<!-- tabs for Preference pages -->
<tab
class="org.eclipse.cdt.ui.newui.EnvironmentTab"
icon="icons/obj16/environment.gif"
name="(Single) Environment"
parent="org.eclipse.cdt.ui.newui.PrefPage_Env"/>
parentId="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_Env"/>
<tab
class="org.eclipse.cdt.managedbuilder.ui.properties.CPropertyVarsTab"
name="(Single) CDT Vars (macros)"
parent="org.eclipse.cdt.ui.newui.PrefPage_Vars"/>
parentId="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_Vars"/>
<tab
class="org.eclipse.cdt.ui.newui.BinaryParsTab"
name="%Binary.parsers"
icon="icons/obj16/bin_obj.gif"
parent="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTProject"
parentId="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTProject"
/>
<tab
class="org.eclipse.cdt.ui.newui.ErrorParsTab"
name="%Error.parsers"
icon="icons/obj16/error_obj.gif"
parent="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTProject"
parentId="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTProject"
/>
<tab
class="org.eclipse.cdt.managedbuilder.ui.properties.DiscoveryTab"
icon="icons/elcl16/discovery.gif"
name="%Discovery.options"
parent="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTProject"
parentId="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTProject"
/>
<tab
class="org.eclipse.cdt.managedbuilder.ui.properties.BuilderSettingsTab"
icon="icons/obj16/build_settings.gif"
name="%Builder.settings"
parent="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTProject"/>
parentId="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTProject"/>
<tab
class="org.eclipse.cdt.managedbuilder.ui.preferences.PreferredToolchainsTab"
name="%Preferred.toolchains"
parent="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTWizard"/>
parentId="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTWizard"/>
<tab
class="org.eclipse.cdt.managedbuilder.ui.preferences.WizardDefaultsTab"
name="%Wizard.defaults"
parent="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTWizard"/>
parentId="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTWizard"/>
<tab
class="org.eclipse.cdt.ui.newui.PropertyPageDefsTab"
name="%PropertyPage.defaults"
parent="org.eclipse.cdt.ui.newui.PrefPage_PropertyPage"/>
parentId="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_PropertyPage"/>
</extension>
@ -495,8 +508,8 @@
<extension
point="org.eclipse.ui.propertyPages">
<page
class="org.eclipse.cdt.ui.newui.Page_Variables"
id="org.eclipse.ui.propertypages.project.ref10"
class="org.eclipse.cdt.managedbuilder.ui.properties.Page_Variables"
id="org.eclipse.cdt.managedbuilder.ui.properties.Page_Variables"
name="%CDTVariablesProperty.name"
>
<filter
@ -512,8 +525,8 @@
</page>
<page
class="org.eclipse.cdt.ui.newui.Page_PathAndSymb"
id="org.eclipse.ui.propertypages.project.ref12"
class="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"
id="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"
name="%CDTPathSymbolsProperty.name"
>
<filter
@ -543,7 +556,7 @@
<!--page
class="org.eclipse.cdt.ui.newui.Page_ExpPathAndSymb"
id="org.eclipse.ui.propertypages.project.ref16"
id="org.eclipse.cdt.ui.newui.Page_ExpPathAndSymb"
name="%CDTExpPathSymbolsProperty.name"
>
<filter
@ -559,8 +572,8 @@
</page-->
<page
class="org.eclipse.cdt.ui.newui.Page_BuildSettings"
id="org.eclipse.ui.propertypages.project.ref13"
class="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"
id="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"
name="%CDTBuildProperty.name"
>
<filter
@ -588,7 +601,7 @@
</page>
<page
class="org.eclipse.cdt.managedbuilder.ui.properties.Page_ToolChain"
id="org.eclipse.ui.propertypages.project.ref14"
id="org.eclipse.cdt.managedbuilder.ui.properties.Page_ToolChain"
name="%CDTToolchainProperty.name"
>
<filter

View file

@ -8,7 +8,9 @@
* Contributors:
* Intel Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.cdt.ui.newui;
package org.eclipse.cdt.managedbuilder.ui.preferences;
import org.eclipse.cdt.ui.newui.PrefPage_Abstract;
public class PrefPage_Env extends PrefPage_Abstract {
}

View file

@ -9,11 +9,12 @@
* Intel Corporation - Initial API and implementation
*******************************************************************************/
package org.eclipse.cdt.ui.newui;
package org.eclipse.cdt.managedbuilder.ui.preferences;
import org.eclipse.cdt.core.settings.model.ICResourceDescription;
import org.eclipse.cdt.ui.newui.AbstractPrefPage;
import org.eclipse.cdt.ui.newui.ICPropertyTab;
import org.eclipse.cdt.ui.newui.UIMessages;
public class PrefPage_PropertyPage extends AbstractPrefPage {

View file

@ -8,7 +8,9 @@
* Contributors:
* Intel Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.cdt.ui.newui;
package org.eclipse.cdt.managedbuilder.ui.preferences;
import org.eclipse.cdt.ui.newui.PrefPage_Abstract;
public class PrefPage_Vars extends PrefPage_Abstract {

View file

@ -8,7 +8,9 @@
* Contributors:
* Intel Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.cdt.ui.newui;
package org.eclipse.cdt.managedbuilder.ui.properties;
import org.eclipse.cdt.ui.newui.AbstractPage;
/**

View file

@ -8,7 +8,9 @@
* Contributors:
* Intel Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.cdt.ui.newui;
package org.eclipse.cdt.managedbuilder.ui.properties;
import org.eclipse.cdt.ui.newui.AbstractPage;
/**

View file

@ -8,7 +8,9 @@
* Contributors:
* Intel Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.cdt.ui.newui;
package org.eclipse.cdt.managedbuilder.ui.properties;
import org.eclipse.cdt.ui.newui.AbstractPage;
public class Page_Languages extends AbstractPage {
protected boolean isSingle() { return true; }

View file

@ -8,7 +8,9 @@
* Contributors:
* Intel Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.cdt.ui.newui;
package org.eclipse.cdt.managedbuilder.ui.properties;
import org.eclipse.cdt.ui.newui.AbstractPage;
/**

View file

@ -8,7 +8,9 @@
* Contributors:
* Intel Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.cdt.ui.newui;
package org.eclipse.cdt.managedbuilder.ui.properties;
import org.eclipse.cdt.ui.newui.AbstractPage;
public class Page_Variables extends AbstractPage {

View file

@ -351,10 +351,6 @@ completionProposalComputer=Completion Proposal Computer
# Indexer Preference Name
indexerPrefName=Indexer
varsPrefName=CDT build variables
envPrefName=Environment
propSettingsPrefName=Property Pages settings
# indexer names
CDTIndexer.domsourceindexer=Full C/C++ Indexer (complete parse)
CDTIndexer.nullindexer=No Indexer (search based features will not work correctly)

View file

@ -685,21 +685,6 @@
class="org.eclipse.cdt.internal.ui.preferences.IndexerPreferencePage"
id="org.eclipse.cdt.ui.preferences.IndexerPreferencePage"
name="%indexerPrefName"/>
<page
category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
class="org.eclipse.cdt.ui.newui.PrefPage_Env"
id="org.eclipse.cdt.ui.preferences.EnvironmentPrefPage"
name="%envPrefName"/>
<page
category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
class="org.eclipse.cdt.ui.newui.PrefPage_Vars"
id="org.eclipse.cdt.ui.preferences.VariablesPrefPage"
name="%varsPrefName"/>
<page
category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
class="org.eclipse.cdt.ui.newui.PrefPage_PropertyPage"
id="org.eclipse.cdt.ui.preferences.PropertyPageSettings"
name="%propSettingsPrefName"/>
<!--page
name="%WorkInProgress.name"
category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"

View file

@ -90,7 +90,7 @@ Ignored for single-tab pages.
</documentation>
</annotation>
</attribute>
<attribute name="parent" type="string" use="required">
<attribute name="parentId" type="string" use="required">
<annotation>
<documentation>
Class name for container page.
@ -98,9 +98,6 @@ Usually pages are to be derived from
org.eclipse.cdt.ui.newui.AbstractPage,
but it is not obligatory.
</documentation>
<appInfo>
<meta.attribute kind="java"/>
</appInfo>
</annotation>
</attribute>
<attribute name="tooltip" type="string">

View file

@ -113,7 +113,7 @@ implements
private static final String EXTENSION_POINT_ID = "org.eclipse.cdt.ui.cPropertyTab"; //$NON-NLS-1$
public static final String ELEMENT_NAME = "tab"; //$NON-NLS-1$
public static final String CLASS_NAME = "class"; //$NON-NLS-1$
public static final String PARENT_NAME = "parent"; //$NON-NLS-1$
public static final String PARENT_NAME = "parentId"; //$NON-NLS-1$
public static final String IMAGE_NAME = "icon"; //$NON-NLS-1$
public static final String TIP_NAME = "tooltip"; //$NON-NLS-1$
public static final String TEXT_NAME = "name"; //$NON-NLS-1$