Bug #228953 Usability: Project Properties->C/C++ Build->Variables

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvDialog.java

@@ -40,10 +40,11 @@ public class EnvDialog extends Dialog {
 	public String t1 = AbstractCPropertyTab.EMPTY_STR;
 	public String t2 = AbstractCPropertyTab.EMPTY_STR;
 	public boolean toAll = false;
+	private String title;
 
 	public EnvDialog(Shell parent, 
 			IEnvironmentVariable _var, 
-			String title, 
+			String _title, 
 			boolean _newAction,
 			boolean _multiCfg,
 			ICConfigurationDescription _cfgd) {
@@ -52,6 +53,7 @@ public class EnvDialog extends Dialog {
 		newAction = _newAction;
 		multiCfg = _multiCfg;
 		cfgd = _cfgd;
+		title = _title;
 	}
 
 	/**
@@ -64,6 +66,12 @@ public class EnvDialog extends Dialog {
 		return out;
 	}	
 	
+	@Override
+	protected void configureShell(Shell newShell) {
+		super.configureShell(newShell);
+		newShell.setText(title);
+	}
+	
 	@Override
 	protected Control createDialogArea(Composite c) {
 		c.setLayout(new GridLayout(3, false));

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvironmentTab.java

@@ -61,9 +61,6 @@ import org.eclipse.cdt.internal.core.envvar.UserDefinedEnvironmentSupplier;
 
 
 public class EnvironmentTab extends AbstractCPropertyTab {
-	private static final String PREFIX = "EnvironmentBlock";	//$NON-NLS-1$
-	private static final String LABEL = PREFIX + ".label";	//$NON-NLS-1$
-	private static final String VALUE_UNDEF = LABEL + ".value.undef";	//$NON-NLS-1$
 	private static final String SEMI = ";"; //$NON-NLS-1$
 	private static final String LBR = " ["; //$NON-NLS-1$
 	private static final String RBR = "]"; //$NON-NLS-1$
@@ -116,7 +113,7 @@ public class EnvironmentTab extends AbstractCPropertyTab {
 				return td.var.getName();
 			case 1:
 				if(td.var.getOperation() == IEnvironmentVariable.ENVVAR_REMOVE)
-					return UIMessages.getString(VALUE_UNDEF);
+					return UIMessages.getString(UIMessages.getString("EnvironmentTab.20")); //$NON-NLS-1$
 				return td.var.getValue();
 			case 2:
 				return ce.getOrigin(td.var);
@@ -135,10 +132,6 @@ public class EnvironmentTab extends AbstractCPropertyTab {
 				if (isUsers(td.var))
 					return JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT);
 				break;
-			case 1:
-				if(td.var.getOperation() == IEnvironmentVariable.ENVVAR_REMOVE)
-					return JFaceResources.getFontRegistry().getItalic(JFaceResources.DIALOG_FONT);
-				break;
 			default:
 				break;
 			}

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties

@@ -51,67 +51,6 @@ BuildPreferencePage.apply.internal.error=An Internal error has occurred. Please
 ResourceBuildPropertyPage.defaults.title=Reset Resource Configuration Tool
 ResourceBuildPropertyPage.defaults.message=This action will reset all options of the tool in the current resource configuration to their default settings.\n\nDo you want to proceed? 
 
-# ----------- Tools Settings Block -----------
-ToolsSettingsBlock.label.Settings=Tool Settings
-ToolsSettingsBlock.label.ToolTree=Tools
-ToolsSettingsBlock.label.ToolOptions=Options
-
-# ----------- Build Settings Block -----------
-BuildSettingsBlock.label.Settings=Build Settings
-BuildSettingsBlock.label.makecmdgroup=Build command
-BuildSettingsBlock.label.makecmddef=Use default command
-BuildSettingsBlock.label.output.group=Build output
-BuildSettingsBlock.label.output.name=Artifact name:
-BuildSettingsBlock.label.output.extension=Artifact extension:
-BuildSettingsBlock.defaults.title=Reset Build Settings
-BuildSettingsBlock.defaults.message=This action will reset the build settings to their default settings.\n\nDo you want to proceed?
-BuildSettingsBlock.label.macros.group=Build Macros usage
-BuildSettingsBlock.label.macros.expand=Expand Build Environment Macros
-BuildSettingsBlock.label.internal.builder.group=Internal Builder
-BuildSettingsBlock.label.internal.builder.enable=Enable Internal Builder
-BuildSettingsBlock.label.internal.builder.ignore.err=Ignore build errors
-BuildSettingsBlock.label.internal.builder.experimental.note=NOTE: This is experimental functionality
-BuildSettingsBlock.label.internal.builder.parallel.head=Parallel build
-BuildSettingsBlock.label.internal.builder.parallel.use=Enable parallel build
-BuildSettingsBlock.label.internal.builder.parallel.default=Use optimal jobs number
-BuildSettingsBlock.label.internal.builder.parallel.number=Use parallel jobs: 
-BuildSettingsBlock.label.internal.builder.parallel.tooltip=Select the number of jobs to be used for the build
-
-# ----------- Build Steps Block -----------
-BuildStepSettingsBlock.label.Settings=Build Steps
-BuildStepSettingsBlock.label.prebuildstep.group=Pre-build step:
-BuildStepSettingsBlock.label.prebuildstep.cmd=Command:
-BuildStepSettingsBlock.label.prebuildstep.desc=Description:
-BuildStepSettingsBlock.label.postbuildstep.group=Post-build step:
-BuildStepSettingsBlock.label.postbuildstep.cmd=Command:
-BuildStepSettingsBlock.label.postbuildstep.desc=Description:
-BuildStepsSettingsBlock.defaults.title=Reset Build Steps
-BuildStepsSettingsBlock.defaults.message=This action will reset the pre-build and post-build steps to their default settings.\n\nDo you want to proceed?
-
-# ----------- Environment Set Block -----------
-EnvironmentSetBlock.label.environment=Environment
-EnvironmentSetBlock.label.environment.group=Environment variables
-EnvironmentSetBlock.label.tab.configuration=Configuration
-EnvironmentSetBlock.label.tab.project=Project
-EnvironmentSetBlock.label.tab.workspace=Workspace
-EnvironmentSetBlock.label.tab.eclipse=Eclipse Environment
-
-# ----------- Environment Block -----------
-EnvironmentBlock.label.header.name=Name
-EnvironmentBlock.label.header.value=Value
-EnvironmentBlock.label.button.new=New
-EnvironmentBlock.label.button.edit=Edit
-EnvironmentBlock.label.button.delete=Delete
-EnvironmentBlock.label.button.undef=Undefine
-EnvironmentBlock.label.value.undef=<UNDEFINED>
-EnvironmentBlock.label.button.check.chow.parent=Show parent level variables
-EnvironmentBlock.label.user.var=User Variables
-EnvironmentBlock.label.system.var=System Variables
-EnvironmentBlock.label.delete.confirm.title=Variable deletion confirmation
-EnvironmentBlock.label.delete.confirm.message=Are you sure you want to delete the selected user variable(s)? 
-EnvironmentBlock.label.delete.all.confirm.title=Variable deletion confirmation
-EnvironmentBlock.label.delete.all.confirm.message=Are you sure you want to delete all user variables? 
-
 # ----------- New Env Var Dialog -----------
 NewEnvVarDialog.label.name=Name
 NewEnvVarDialog.label.value=Value
@@ -152,7 +91,6 @@ MacrosBlock.label.type.path.dir.list=Directory List
 MacrosBlock.label.type.path.any=Path
 MacrosBlock.label.type.path.any.list=Path List
 
-
 # ----------- New Build Macro Dialog -----------
 NewBuildMacroDialog.label.name=Name
 NewBuildMacroDialog.label.value=Value
@@ -446,7 +384,7 @@ EnvironmentTab.22=WRITE mode:
 EnvironmentTab.23=Current String List WRITE mode. Double-click to change
 EnvironmentTab.3=Append variables to native environment
 EnvironmentTab.4=Replace native environment with specified one
-EnvironmentTab.5=New...
+EnvironmentTab.5=Add...
 EnvironmentTab.6=Select...
 EnvironmentTab.7=Edit...
 EnvironmentTab.8=Delete
@@ -461,6 +399,7 @@ EnvironmentTab.16=Origin
 EnvironmentTab.17=CONJUNCTION
 EnvironmentTab.18=DISJUNCTION
 EnvironmentTab.19=DISPLAY mode:
+EnvironmentTab.20=<UNDEFINED> 
 IncludeTab.0=Include directories
 IncludeTab.1=Add directory path
 IncludeTab.2=Change directory path