From 6870b4d62993fb8c3e2c367a9b35cf86a46b6500 Mon Sep 17 00:00:00 2001
From: Markus Schorn <markus.schorn@windriver.com>
Date: Fri, 21 Apr 2006 12:31:29 +0000
Subject: [PATCH] removed duplicate action in toolbar for changing editor
 presentation, bugzilla 135150

---
 .../cdt/make/internal/ui/MakeResources.properties  |  7 ++++---
 .../ui/editor/MakefileEditorActionContributor.java | 14 ++++++++------
 .../MakefileEditorTogglePresentationAction.java    |  2 +-
 3 files changed, 13 insertions(+), 10 deletions(-)

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 adcd5832df9..1bfa76bd04a 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
@@ -7,6 +7,7 @@
 #
 # Contributors:
 #     QNX Software Systems - initial API and implementation
+#     Wind River Systems - fix for bugzilla 135150
 ###############################################################################
 
 MakeCWizard.title=C/Make Project
@@ -191,10 +192,10 @@ ContentAssistTip.tooltip=Content Tip
 ContentAssistTip.image=
 ContentAssistTip.description=Content Tip
  
-TogglePresentation.label=Change Presentation
-TogglePresentation.tooltip=Enable/Disable Segmented Source Viewer
+TogglePresentation.label=Show Source of Selected Element Only
+TogglePresentation.tooltip=Show Source of Selected Element Only
 TogglePresentation.description=Enable/Disable Segmented Source Viewer
-
+ 
 Comment.label=&Comment
 Comment.tooltip=Comment the Selected Lines
 Comment.description=Turn the selected lines into # style comments
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileEditorActionContributor.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileEditorActionContributor.java
index 9e4fa3904eb..bf96a0a63ad 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileEditorActionContributor.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileEditorActionContributor.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     QNX Software Systems - Initial API and implementation
+ *     Wind River Systems - fix for bugzilla 135150
  *******************************************************************************/
 package org.eclipse.cdt.make.internal.ui.editor;
 
@@ -97,12 +98,13 @@ public class MakefileEditorActionContributor extends BasicTextEditorActionContri
 		}
 
 		bars.setGlobalActionHandler(ITextEditorActionDefinitionIds.TOGGLE_SHOW_SELECTED_ELEMENT_ONLY, fTogglePresentation);
-
-		IToolBarManager toolBarManager = bars.getToolBarManager();
-		if (toolBarManager != null) {
-			toolBarManager.add(new Separator());
-			toolBarManager.add(fTogglePresentation);
-		}
+		// there is a global action in the toolbar, that is retargeted,
+		// there is no need to add another one.
+//		IToolBarManager toolBarManager = bars.getToolBarManager();
+//		if (toolBarManager != null) {
+//			toolBarManager.add(new Separator());
+//			toolBarManager.add(fTogglePresentation);
+//		}
 	}
 
 }
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileEditorTogglePresentationAction.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileEditorTogglePresentationAction.java
index 4d8a9c96fc0..e70aefce92f 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileEditorTogglePresentationAction.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileEditorTogglePresentationAction.java
@@ -23,7 +23,7 @@ public class MakefileEditorTogglePresentationAction extends TextEditorAction {
 	 * Constructor for MakefileEditorTogglePresentationAction.
 	 */
 	public MakefileEditorTogglePresentationAction() {
-		super(MakeUIPlugin.getDefault().getResourceBundle(), "MakefileEditorTogglePresentation.", null); //$NON-NLS-1$
+		super(MakeUIPlugin.getDefault().getResourceBundle(), "TogglePresentation.", null); //$NON-NLS-1$
 		MakeUIImages.setImageDescriptors(this, MakeUIImages.T_TOOL, MakeUIImages.IMG_TOOLS_MAKEFILE_SEGMENT_EDIT);
 		update();
 	}