From 6857d4ccf586d8c6d1abcd3814e5711ee92d76e0 Mon Sep 17 00:00:00 2001 From: Robin Stocker Date: Sat, 13 Oct 2012 21:39:36 +0200 Subject: Add missing Expand All action to Git Tree Compare Bug: 376241 Change-Id: Ib9ee5e4ecba484409057ff86b881aabd77d11255 --- org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java | 3 +++ .../eclipse/egit/ui/internal/dialogs/CompareTreeView.java | 14 ++++++++++++-- .../src/org/eclipse/egit/ui/uitext.properties | 1 + 3 files changed, 16 insertions(+), 2 deletions(-) (limited to 'org.eclipse.egit.ui/src/org') diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java index 0e8cebbc43..b4d0bead8a 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java @@ -977,6 +977,9 @@ public class UIText extends NLS { /** */ public static String CompareTreeView_AnalyzingRepositoryTaskText; + /** */ + public static String CompareTreeView_ExpandAllTooltip; + /** */ public static String CompareTreeView_CollapseAllTooltip; diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CompareTreeView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CompareTreeView.java index ea1c42ef3b..fa5bc321f1 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CompareTreeView.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CompareTreeView.java @@ -217,14 +217,24 @@ public class CompareTreeView extends ViewPart implements IMenuListener, IShowInS getViewSite().getActionBars().getToolBarManager().add(showEqualsAction); IAction expandAllAction = new Action( + UIText.CompareTreeView_ExpandAllTooltip) { + @Override + public void run() { + tree.expandAll(); + } + }; + expandAllAction.setImageDescriptor(UIIcons.EXPAND_ALL); + getViewSite().getActionBars().getToolBarManager().add(expandAllAction); + + IAction collapseAllAction = new Action( UIText.CompareTreeView_CollapseAllTooltip) { @Override public void run() { tree.collapseAll(); } }; - expandAllAction.setImageDescriptor(UIIcons.COLLAPSEALL); - getViewSite().getActionBars().getToolBarManager().add(expandAllAction); + collapseAllAction.setImageDescriptor(UIIcons.COLLAPSEALL); + getViewSite().getActionBars().getToolBarManager().add(collapseAllAction); } private void reactOnOpen(OpenEvent event) { diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties index a08c45ef8d..bc5b8ec3a8 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties @@ -263,6 +263,7 @@ CompareTargetSelectionDialog_CompareTitle=Compare ''{0}'' with a Branch, Tag, or CompareTargetSelectionDialog_CompareTitleEmptyPath=Compare with a Branch, Tag, or Reference CompareTargetSelectionDialog_WindowTitle=Compare CompareTreeView_AnalyzingRepositoryTaskText=Analyzing repository +CompareTreeView_ExpandAllTooltip=Expand all CompareTreeView_CollapseAllTooltip=Collapse all CompareTreeView_ComparingTwoVersionDescription=Comparing version {0} of {1} with {2} CompareTreeView_ComparingWorkspaceVersionDescription=Comparing workspace version of {0} with {1} -- cgit v1.2.3