From 534aa38e6d18ffbf888b720be0fe39f8ef77cf2e Mon Sep 17 00:00:00 2001 From: Oleg Krasilnikov Date: Tue, 29 Apr 2008 12:58:57 +0000 Subject: [PATCH] Bug : 228958 : Usability: Project Properties->C/C++ Build->Any->Manage Configuration header --- .../plugin.properties | 2 +- .../org/eclipse/cdt/ui/newui/ManageConfigDialog.java | 12 +++++++++++- .../org/eclipse/cdt/ui/newui/ManageConfigRunner.java | 2 +- .../eclipse/cdt/ui/newui/PluginResources.properties | 6 +++--- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties b/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties index 680bf7e77db..82b8c1d345d 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties +++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties @@ -58,7 +58,7 @@ BuildMenu.label=Build Build.System.Wizard=Build System Wizard Make.Project.Wizard=Make Project Wizard -MBS.create.configuration=MBS: create configuration +MBS.create.configuration=Create New Configuration WizardConvertMakeProject.name=Convert to a C/C++ Make Project WizardConvertMakeProject.name1=Convert to a C/C++ Make Project1 diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigDialog.java index f58cba6fc8e..441954d9ddb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigDialog.java @@ -102,6 +102,12 @@ public class ManageConfigDialog extends Dialog { table.setHeaderVisible(true); table.setLinesVisible(true); + table.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + updateButtons(); + }}); + TableColumn col = new TableColumn(table, SWT.NONE); col.setText(UIMessages.getString("ManageConfigDialog.1")); //$NON-NLS-1$ col.setWidth(100); @@ -258,7 +264,11 @@ public class ManageConfigDialog extends Dialog { int sel = table.getSelectionCount(); delBtn.setEnabled(sel > 0 & sel < table.getItemCount()); renBtn.setEnabled(sel == 1); - actBtn.setEnabled(sel == 1); + if (sel == 1) { + ICConfigurationDescription c = (ICConfigurationDescription)table.getSelection()[0].getData(); + actBtn.setEnabled(c != null && !c.isActive()); + } else + actBtn.setEnabled(false); } /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigRunner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigRunner.java index 03388705d22..6f80370f97b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigRunner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigRunner.java @@ -49,7 +49,7 @@ public class ManageConfigRunner implements IConfigManager { return false; ManageConfigDialog d = new ManageConfigDialog(CUIPlugin.getActiveWorkbenchShell(), - obs[0].getName()+ " : " + MANAGE_TITLE, obs[0]); //$NON-NLS-1$ + obs[0].getName()+ ": " + MANAGE_TITLE, obs[0]); //$NON-NLS-1$ boolean result = false; if (d.open() == Window.OK) { if (doOk) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties index 5bcc2dd3ceb..1c91c7b0b3d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties @@ -191,7 +191,7 @@ RenameConfiguration.error.caseName=A configuration name that differs only in cas RenameConfiguration.error.invalidName=The name "{0}" is invalid. # ----------- Target/Config management dialog ----------------- -ManageConfig.label.configs=Manage configurations +ManageConfig.label.configs=Manage Configurations ManageConfig.label.rename=Rename ManageConfig.label.conversionTargetLabel=Tool chain conversion targets: ManageConfig.label.convertTarget=Convert @@ -205,7 +205,7 @@ ManageConfigDialog.2=Description ManageConfigDialog.3=Status ManageConfigDialog.4=Set Active ManageConfigDialog.5=Active -ManageConfigDialog.0=Manage configurations... +ManageConfigDialog.0=Manage Configurations ManageConfig.tip.conversionTarget=A list of conversion targets available for the selected configuration # Toolchain Conversion Target confirmation Dialog @@ -336,7 +336,7 @@ AbstractCPropertyTab.1=Variables... AbstractCPropertyTab.2=This tab is not supported in multi-configuration mode AbstractPage.0=Unknown element selected AbstractPage.1=This file has no properties to display -AbstractPage.12=Manage configurations +AbstractPage.12=Manage Configurations... AbstractPage.11=setProjectDescription: AbstractPage.10=Cannot create resource configuration for AbstractPage.13=Cannot load