From f0b42a7fa6cc61d9d1f0c44c190b9b6655771483 Mon Sep 17 00:00:00 2001 From: Alena Laskavaia Date: Wed, 20 May 2009 13:59:58 +0000 Subject: [PATCH] [275773] - updated labels and icons for make targets view, patch from Andrew Gvozdev --- .../icons/dtool16/target_build.gif | Bin 571 -> 0 bytes .../icons/dtool16/target_build.png | Bin 0 -> 3390 bytes .../icons/etool16/target_add.gif | Bin 580 -> 591 bytes .../icons/etool16/target_build.gif | Bin 592 -> 0 bytes .../icons/etool16/target_build.png | Bin 0 -> 3379 bytes .../make/internal/ui/MakeResources.properties | 28 +++++++++--------- .../cdt/make/internal/ui/MakeUIImages.java | 2 +- .../cdt/make/ui/dialogs/MakeTargetDialog.java | 4 +-- .../cdt/make/ui/views/AddTargetAction.java | 1 + .../cdt/make/ui/views/DeleteTargetAction.java | 11 +++++-- .../eclipse/cdt/make/ui/views/MakeView.java | 22 ++++++++------ 11 files changed, 39 insertions(+), 29 deletions(-) delete mode 100644 build/org.eclipse.cdt.make.ui/icons/dtool16/target_build.gif create mode 100644 build/org.eclipse.cdt.make.ui/icons/dtool16/target_build.png delete mode 100644 build/org.eclipse.cdt.make.ui/icons/etool16/target_build.gif create mode 100644 build/org.eclipse.cdt.make.ui/icons/etool16/target_build.png diff --git a/build/org.eclipse.cdt.make.ui/icons/dtool16/target_build.gif b/build/org.eclipse.cdt.make.ui/icons/dtool16/target_build.gif deleted file mode 100644 index f545148573109d5f9011db18ab1fc74c911aa5a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 571 zcmZ?wbhEHb6krfwc*ekR<>vKkw{Aet_1iZ;fBC%s*r9Fvb^+1OgL@AgKXUNIk+<*P z{rLG~!klS9G;ihN`Ky*}+O=)RfjwXahcDl_`tZr4$IqTXq&Do_vT@f|AOb2lb>Zyk zi|4lQ-*xlu?F-i~0TGb#=;>n!8%SQia}y}?^35wC`t$eC??1nP0pXwD-+zAp`THjX z0l7daAo}<3-`~G~Tl<=Uj8z+!efs?I*RLPnzkPZ8`swFSZ`ZAyvv%d2jcev_TDM@s znt3mt-UW&;nLl~i!l^*CV)1k!TD^SMspESe+_`w<;LgVnt{pwF_0axpySJ_0yJOw| z|Nqkl0x14uVPs&4V9;Rz0#KYVu+M0SXlib0ZENpnV(ac<>tGWS>@TdGc9Rl9%UIVGtKq(Zffeb*0$=3#=0}uf*gX}c&*R# zNSYY+v4sXW1%$fW9nw%V)#>(heEQ6VM{|dv%GK}?kC1SG2`OP!i?t`hg2R00+EhGY bQ03}w)L_%|Sd_AIfl_m?nCdJE4hCxgW;Hms diff --git a/build/org.eclipse.cdt.make.ui/icons/dtool16/target_build.png b/build/org.eclipse.cdt.make.ui/icons/dtool16/target_build.png new file mode 100644 index 0000000000000000000000000000000000000000..4aa66788ae0b7df1fa7f87a8476d8fdfed141dd6 GIT binary patch literal 3390 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 Up1<=R!TylsCZ<{;c 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 JPDHLkV1kvAcgg?& literal 0 HcmV?d00001 diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeResources.properties b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeResources.properties index e76f463f078..9ec4e061e17 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeResources.properties +++ b/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 diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeUIImages.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeUIImages.java index ff5d7abc0ef..06159b94631 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeUIImages.java +++ b/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$ diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/MakeTargetDialog.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/MakeTargetDialog.java index a6954c025c2..37b80ad0067 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/MakeTargetDialog.java +++ b/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 diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/AddTargetAction.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/AddTargetAction.java index 4f2f4ab1ad9..ae5075f4e6c 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/AddTargetAction.java +++ b/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 diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/DeleteTargetAction.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/DeleteTargetAction.java index 9cf0c2ea783..68fcc98ec8c 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/DeleteTargetAction.java +++ b/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)); } /** diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/MakeView.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/MakeView.java index d271dd06922..ec65d73ae92 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/MakeView.java +++ b/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);