[275773] - updated labels and icons for make targets view, patch from Andrew Gvozdev

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeResources.properties

@@ -68,8 +68,8 @@ SettingsBlock.message=Make builder settings.
 SettingsBlock.makeSetting.group_label=Build Settings
 SettingsBlock.makeSetting.stopOnError=Stop on first build error
 SettingsBlock.makeSetting.runAllBuilders=Run all project builders
-SettingsBlock.makeSetting.sameAsTarget=Same as the Target Name
-SettingsBlock.makeCmd.group_label=Build command
+SettingsBlock.makeSetting.sameAsTarget=Same as the target name
+SettingsBlock.makeCmd.group_label=Build Command
 SettingsBlock.makeCmd.use_default=Use default
 SettingsBlock.makeCmd.useBuilderSettings=Use builder settings
 SettingsBlock.makeCmd.label=Build command:
@@ -90,12 +90,12 @@ SettingsBlock.makeWorkbench.incrementalBuildTarget=Incremental Build Target
 SettingsBlock.makeWorkbench.cleanTarget=Clean Target
 SettingsBlock.variables=Variables...
 TargetBlock.target.group_label=Target
-TargetBlock.target.label=Target Name:
+TargetBlock.target.label=Target name:
 
 ErrorParserBlock.label.missingBuilderInformation=Builder is missing or disabled on project.
 
 BuildTarget.target.group_label=Make Target
-BuildTarget.target.label=Make Target:
+BuildTarget.target.label=Make target:
 
 MakeTargetsPreferencePage.buildTargetInBackground.label=Build make targets in background.
 
@@ -137,9 +137,9 @@ BuildTargetDialog.button.build=Build
 BuildTargetDialog.title.makeTargetsFor=Make Targets for: 
 
 MakeTargetDialog.exception.noTargetBuilderOnProject=Not target builders on the project
-MakeTargetDialog.title.createMakeTarget=Create a new Make target
-MakeTargetDialog.title.modifyMakeTarget=Modify a Make target
-MakeTargetDialog.message.mustSpecifyName=Must specify a non-empty Target Name
+MakeTargetDialog.title.createMakeTarget=Create Make Target
+MakeTargetDialog.title.modifyMakeTarget=Modify Make Target
+MakeTargetDialog.message.mustSpecifyName=Must specify a non-empty target name
 MakeTargetDialog.message.targetWithNameExists=Target with that name already exists
 MakeTargetDialog.message.mustSpecifyBuildCommand=Must specify a build command
 MakeTargetDialog.button.update=Update
@@ -172,7 +172,7 @@ SettingsBlock.label.missingBuilderInformation=Builder is missing or disabled on
 SettingsBlock.monitor.applyingSettings=Applying Settings...
 SettingsBlock.message.mustEnterBuildCommand=Must enter a build command
 
-DeleteTargetAction.label=Delete Make Target
+DeleteTargetAction.label=Delete
 DeleteTargetAction.tooltip=Delete Make Target
 DeleteTargetAction.title.confirmDeletion=Confirm Target Deletion
 DeleteTargetAction.message.confirmDeleteion=Are you sure you want to delete  ''{0}''?
@@ -181,25 +181,25 @@ DeleteTargetAction.message.confirmMultipleDeletion=Are you sure you want to dele
 DeleteTargetAction.exception.removeError=Make Target Remove Error
 DeleteTargetAction.exception.errorDeletingBuildTarget=Error deleting Make target
 
-BuildTargetAction.label=Build Make Target
+BuildTargetAction.label=Build Target
 BuildTargetAction.tooltip=Build Make Target
 
-EditTargetAction.label=Edit Make Target
+EditTargetAction.label=Edit...
 EditTargetAction.tooltip=Edit Make Target
 EditTargetAction.exception.internalError=Internal Error
 EditTargetAction.exception.errorEditingTarget=Error editing target.
 
-AddTargetAction.label=Add Make Target
-AddTargetAction.tooltip=Add Make Target
+AddTargetAction.label=New...
+AddTargetAction.tooltip=New Make Target
 AddTargetAction.exception.title=Error Adding Make Target
 AddTargetAction.exception.message=There was an error adding make target in Make Target View. See log for more details.
 
-CopyTargetAction.label=&Copy Target
+CopyTargetAction.label=&Copy
 CopyTargetAction.tooltip=Copy Make Target
 CopyTargetAction.title.clipboardProblem=Problem Copying to Clipboard
 CopyTargetAction.message.clipboardProblem=There was a problem when accessing the system clipboard.
 
-PasteTargetAction.label=&Paste Target
+PasteTargetAction.label=&Paste
 PasteTargetAction.tooltip=Paste Make Target
 
 FilterEmptyFolderAction.label=Hide Empty Folders

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeUIImages.java

@@ -48,7 +48,7 @@ public class MakeUIImages {
 	public static final String IMG_OBJS_ERROR = NAME_PREFIX + "error_obj.gif"; //$NON-NLS-1$
 	public static final ImageDescriptor DESC_OBJ_ERROR = createManaged(OBJ, IMG_OBJS_ERROR);
 
-	public static final String IMG_TOOLS_MAKE_TARGET_BUILD = NAME_PREFIX + "target_build.gif"; //$NON-NLS-1$
+	public static final String IMG_TOOLS_MAKE_TARGET_BUILD = NAME_PREFIX + "target_build.png"; //$NON-NLS-1$
 	public static final String IMG_TOOLS_MAKE_TARGET_ADD = NAME_PREFIX + "target_add.gif"; //$NON-NLS-1$
 	public static final String IMG_TOOLS_MAKE_TARGET_DELETE = NAME_PREFIX + "target_delete.gif"; //$NON-NLS-1$
 	public static final String IMG_TOOLS_MAKE_TARGET_EDIT = NAME_PREFIX + "target_edit.gif"; //$NON-NLS-1$

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/MakeTargetDialog.java

@@ -363,9 +363,9 @@ public class MakeTargetDialog extends Dialog {
 	@Override
 	protected void createButtonsForButtonBar(Composite parent) {
 		if (fTarget == null || !MakeCorePlugin.getDefault().getTargetManager().targetExists(fTarget)) {
-			createButton(parent, IDialogConstants.OK_ID, MakeUIPlugin.getResourceString("MakeTargetDialog.button.create"), true); //$NON-NLS-1$
+			createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
 		} else {
-			createButton(parent, IDialogConstants.OK_ID, MakeUIPlugin.getResourceString("MakeTargetDialog.button.update"), true); //$NON-NLS-1$
+			createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
 		}
 		createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
 		//do this here because setting the text will set enablement on the ok

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/AddTargetAction.java

@@ -32,6 +32,7 @@ public class AddTargetAction extends SelectionListenerAction {
 
 		setToolTipText(MakeUIPlugin.getResourceString("AddTargetAction.tooltip")); //$NON-NLS-1$
 		MakeUIImages.setImageDescriptors(this, "tool16", MakeUIImages.IMG_TOOLS_MAKE_TARGET_ADD); //$NON-NLS-1$
+		setEnabled(false);
 	}
 
 	@Override

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/DeleteTargetAction.java

@@ -11,20 +11,22 @@
 package org.eclipse.cdt.make.ui.views;
 
 
-import com.ibm.icu.text.MessageFormat;
 import java.util.List;
 
 import org.eclipse.cdt.make.core.IMakeTarget;
 import org.eclipse.cdt.make.core.IMakeTargetManager;
 import org.eclipse.cdt.make.core.MakeCorePlugin;
-import org.eclipse.cdt.make.internal.ui.MakeUIImages;
 import org.eclipse.cdt.make.internal.ui.MakeUIPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.actions.SelectionListenerAction;
 
+import com.ibm.icu.text.MessageFormat;
+
 public class DeleteTargetAction extends SelectionListenerAction {
 	private final Shell shell;
 
@@ -33,7 +35,10 @@ public class DeleteTargetAction extends SelectionListenerAction {
 		this.shell = shell;
 
 		setToolTipText(MakeUIPlugin.getResourceString("DeleteTargetAction.tooltip")); //$NON-NLS-1$
-		MakeUIImages.setImageDescriptors(this, "tool16", MakeUIImages.IMG_TOOLS_MAKE_TARGET_DELETE); //$NON-NLS-1$
+
+		ISharedImages images = PlatformUI.getWorkbench().getSharedImages();
+		setImageDescriptor(images.getImageDescriptor(ISharedImages.IMG_TOOL_DELETE));
+		setDisabledImageDescriptor(images.getImageDescriptor(ISharedImages.IMG_TOOL_DELETE_DISABLED));
 	}
 
 	/**

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/MakeView.java

@@ -77,7 +77,7 @@ public class MakeView extends ViewPart {
 	private BuildTargetAction buildTargetAction;
 	private EditTargetAction editTargetAction;
 	private DeleteTargetAction deleteTargetAction;
-	private AddTargetAction addTargetAction;
+	private AddTargetAction newTargetAction;
 	private CopyTargetAction copyTargetAction;
 	private PasteTargetAction pasteTargetAction;
 	private TreeViewer fViewer;
@@ -285,7 +285,7 @@ public class MakeView extends ViewPart {
 		clipboard = new Clipboard(shell.getDisplay());
 
 		buildTargetAction = new BuildTargetAction(shell);
-		addTargetAction = new AddTargetAction(shell);
+		newTargetAction = new AddTargetAction(shell);
 		copyTargetAction = new CopyTargetAction(shell, clipboard, pasteTargetAction);
 		pasteTargetAction = new PasteTargetAction(shell, clipboard);
 		deleteTargetAction = new DeleteTargetAction(shell);
@@ -304,8 +304,10 @@ public class MakeView extends ViewPart {
 	}
 
 	private void fillLocalToolBar(IToolBarManager toolBar) {
-		drillDownAdapter.addNavigationActions(toolBar);
+		toolBar.add(newTargetAction);
 		toolBar.add(buildTargetAction);
+		toolBar.add(new Separator());
+		drillDownAdapter.addNavigationActions(toolBar);
 		toolBar.add(trimEmptyFolderAction);
 	}
 
@@ -328,14 +330,16 @@ public class MakeView extends ViewPart {
 	}
 
 	protected void fillContextMenu(IMenuManager manager) {
-		manager.add(buildTargetAction);
-		manager.add(addTargetAction);
-		manager.add(copyTargetAction);
-		manager.add(pasteTargetAction);
-		manager.add(deleteTargetAction);
+		manager.add(newTargetAction);
 		manager.add(editTargetAction);
 		manager.add(new Separator());
 		drillDownAdapter.addNavigationActions(manager);
+		manager.add(new Separator());
+		manager.add(copyTargetAction);
+		manager.add(pasteTargetAction);
+		manager.add(deleteTargetAction);
+		manager.add(new Separator());
+		manager.add(buildTargetAction);
 
 		// Other plug-ins can contribute there actions here
 		// manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
@@ -355,7 +359,7 @@ public class MakeView extends ViewPart {
 	}
 
 	void updateActions(IStructuredSelection sel) {
-		addTargetAction.selectionChanged(sel);
+		newTargetAction.selectionChanged(sel);
 		buildTargetAction.selectionChanged(sel);
 		deleteTargetAction.selectionChanged(sel);
 		editTargetAction.selectionChanged(sel);