From 2fd10f4fbc2317f4cba20ad65f15346fe84eadf1 Mon Sep 17 00:00:00 2001
From: Konstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Date: Thu, 15 Nov 2018 15:03:26 +0300
Subject: [PATCH] svn: Update integrate-related actions - update toolbar, fix
 titles

---
 plugins/svn4idea/gen/icons/SvnIcons.java      |   3 ---
 .../resources/icons/FilterIntegrated.png      | Bin 576 -> 0 bytes
 .../resources/icons/FilterNotIntegrated.png   | Bin 590 -> 0 bytes
 .../svn4idea/resources/icons/FilterOthers.png | Bin 604 -> 0 bytes
 .../jetbrains/idea/svn/SvnBundle.properties   |  12 ++++-----
 .../idea/svn/history/RootsAndBranches.java    |  23 +++++++++---------
 .../svn/history/ShowHideMergePanelAction.java |  18 +++-----------
 7 files changed, 21 insertions(+), 35 deletions(-)
 delete mode 100644 plugins/svn4idea/resources/icons/FilterIntegrated.png
 delete mode 100644 plugins/svn4idea/resources/icons/FilterNotIntegrated.png
 delete mode 100644 plugins/svn4idea/resources/icons/FilterOthers.png

diff --git a/plugins/svn4idea/gen/icons/SvnIcons.java b/plugins/svn4idea/gen/icons/SvnIcons.java
index f9c3192bd446..87c88c16981d 100644
--- a/plugins/svn4idea/gen/icons/SvnIcons.java
+++ b/plugins/svn4idea/gen/icons/SvnIcons.java
@@ -22,9 +22,6 @@ public final class SvnIcons {
   public static final Icon Conflictp = load("/icons/conflictp.png"); // 16x16
   public static final Icon Conflictt = load("/icons/conflictt.png"); // 16x16
   public static final Icon Conflicttp = load("/icons/conflicttp.png"); // 16x16
-  public static final Icon FilterIntegrated = load("/icons/FilterIntegrated.png"); // 16x16
-  public static final Icon FilterNotIntegrated = load("/icons/FilterNotIntegrated.png"); // 16x16
-  public static final Icon FilterOthers = load("/icons/FilterOthers.png"); // 16x16
   public static final Icon Integrated = load("/icons/Integrated.png"); // 16x16
   public static final Icon IntegrationStatusUnknown = load("/icons/IntegrationStatusUnknown.png"); // 16x16
   public static final Icon MarkAsMerged = load("/icons/MarkAsMerged.png"); // 16x16
diff --git a/plugins/svn4idea/resources/icons/FilterIntegrated.png b/plugins/svn4idea/resources/icons/FilterIntegrated.png
deleted file mode 100644
index 9b8d7d24488628588575d18bda96119e3218e7cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 576
zcmV-G0>Ax<P)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0003gP)t-sBsyjF
z_4WV%|0FtPBsyg&M|mbfb0|Y|GHkpmP>Cy0gDXvaE>D3fNO&hhZYoA`D@=YUSDLGT
z0IGiiDN~H4eFvm}3_xd{pnVTBVxa(!LjY_u*1H+x>-GHQwmE^=J8GsoZLmCQrap1A
zK61D}cDh4vtwVXeL~EZ`g0)$d+gy>;WsbsYo!)Pdw|%SMewn&}p1Odp--D>vi?iX3
zvfz=l;hDPLnz-1Tyy7fVi`e7p;_UM*U#08v_3ZNY?eg^U_V)7j`t$et_4xYs`1$v|
zRQSMM_`_!S$#nSn`uyRk{Nt|t<g@(bv^8Iv{OP~^>csu-(f#t>{`>c-$>XYp7Wn%5
z``@9fh8C=c7OcqQt;E^K+wjh`Bhk4+ov_BCei5dF76O0&nE(I)8gx=lQvd(}5HMP5
zYHEXtl$f5OqqD~5=<f0K_5A(0>e|Tw0068>L_t(|UR}-Aj)PDXK+!{~``r4uK;7Nl
z-F4jO|36|vo0PzQTrV3`itfO1h#VmV7=zJdu~~n<E=W&D!2u8cROzwb8zUk`+<HOZ
z4JUKO!Us~ZjT?Y<rpxWY^!tqTuv-%VQ2Vm)!{@gXQen9e0kr#kXZ0#<)-Utf6+oA0
zPM-dLT}0eoGiOGh^#(|>F}@aO7)Fv1Ux_LqqJ*Ff0#%Pj1}!@aH~0q>-540sK}}8o
O0000<MNUMnLSTY#N+#?8

diff --git a/plugins/svn4idea/resources/icons/FilterNotIntegrated.png b/plugins/svn4idea/resources/icons/FilterNotIntegrated.png
deleted file mode 100644
index cc635384ec3e50db2b34068375088894ba3e392b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 590
zcmV-U0<ryxP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0003#P)t-sBsyjF
z_4WV%|EqrhBsyg(MsX`meJW6iD^P<fNO&hhZYWoppnVTAY`m&}0wg+RGh(48LUSlX
zbESO;E>D4^e+(&8j6i3dDMxuLOn&|H-Q?@_)Bpkb&Vu;EW`M5WfS$U3nYyjS+3WK4
z{Nt`~khlEgv;6AB{N=W<1p|Yq*VyCg?eg^Y`1#SfLjCU2&a@*uYNl(Q-mJ*u^7i)l
z`uePg7W>|-`q!KK)Q|rA_xQ<lEMKKHUz&ZZ-{S1^`1$&)h8FqCclpO~_`qHFyi|*`
z;Y4enK5?^Uj>7Wx`p4VwnY!MZxY$E)t^W4sk+k7MdA+I0<6M!`KX$r4a=1Hfusdp|
zjI!WXg0(DDi}UyTo4n%n`1-1a7N&z1p?(oLf!O@vsr~NJS(V$Ju*U52_WkV1{OP~^
z<h0bynePAq02*{sPE!B?0Ok;*l!J+$p~n1b=rH|iYVnx#?)6%;l97fw0001`Nkl<Z
z7*}ItVn79qFabsw&B(_1kNFR4^l2{9)1F5dpD}WWG4D1O*=unSEYJ0fkyoEb@XT*U
z#$UW3f!`k)8CZmDuQLL{8&L~J#-9s;X7MvBF+#u-xyMgIh70O|cz0A8Z>urx1KTEK
zDhd+X`~hygh$&bA;T{&Rv!;w27#RM;9ccJUn{O?e0RI{^0fE)X0^yAN8DAm`MD2h5
chY>6Q0L%+7QT6iWo&W#<07*qoM6N<$f>Sgu>;M1&

diff --git a/plugins/svn4idea/resources/icons/FilterOthers.png b/plugins/svn4idea/resources/icons/FilterOthers.png
deleted file mode 100644
index 038233b523b0da7c5ffe4c7490edaa4aff615f5d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 604
zcmV-i0;BzjP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0003*P)t-sBsyjF
z_4WV%|EqrhBsyg(NO&qxiKBZ5Cqr&4P=la-4>D}LC|8=Ke+(&8j4MrjDn@Z6I%P9r
zp{joZC_{6leFrX2fhIz8KxdsPM|mque*505{q52E*PHpraQVu2{N=y<-mUn<X8F#7
z<m>hR^y00=*{OvV`Ot`2mD}_8`l-p|?DF>d)Q?<|(}Sqj*yHN$^7Quj`TEq6``Vu@
zU#0oXe?D=uR)V!WYNl(Q-mJ*u^7i)l`uePg7WvG6HD8*2tKZ`6^Z5DttA-Z%z+Lye
zRQ~wyL~Ea$yyErv`l^K%rh^utei8cCmYuN1Wsbt~_WH-$@R_>anz-0QZ>@frx{<Wu
zLwUV`p1P%g68hVuZ;-e6$#koR6@aea{OZa4<h+Zs;Xih|K61D_ZLm9Pri`-S>+<zE
zf!Hili~HlZ$3y~Y0000RbW%=J0002y5T1kep^5xz#`Nx#qcHvGYVnwA^;)yiN!p?S
z0068>L_t&-S7Ts80}L<*GZZi|vT^dW3UK(dyUQp@`zZ@E@MLPnYwKiasjDVrM;qI7
zF>srjTf{_$sYS^oD#~ie^D;27@agFr7#hVXD4OV+$uTo9FbE1+S=-p!Nz3Xg$0~sY
z7{nbMot#~i<>i!I-M|72A|9Sz-afvfU~9oZEFdr_ID`QKSVC38BN!PO5h9i<Ny+E}
qDd+;JC<1Be5|StaSyC(v5CH%KIvNg+N*P`N0000<MNUMnLSTa20WH)3

diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.properties b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.properties
index 737acaafdc94..ed7981e2e04c 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.properties
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.properties
@@ -556,7 +556,7 @@ action.change.wcopy.format.task.title=Convert working copy format
 action.change.wcopy.format.task.progress.text=Converting working copy at {0} format from {1} to {2}
 action.change.wcopy.format.after.change.settings=Selected working copy format ({0}) is older than upgrade mode selected in Project Settings ({1}).\
 \nChange Project Settings upgrade mode to {0}?
-committed.changes.action.enable.merge.highlighting=Highlight integrated
+committed.changes.action.enable.merge.highlighting=Highlight Integrated
 committed.changes.action.enable.merge.highlighting.description.text=Option is available for SVN repositories and working copies with 1.5 version only
 committed.changes.action.merge.highlighting.select.root=from:
 committed.changes.action.merge.highlighting.select.branch=to:
@@ -599,13 +599,13 @@ tab.repository.merge.panel.root.panel.branch=Branch:
 tab.repository.merge.panel.root.panel.url=Url:
 tab.repository.merge.panel.root.panel.local=Local Path:
 tab.repository.merge.panel.root.panel.select.local=Select path to the target working copy
-tab.repository.merge.panel.filter.plus=Filter out integrated
-tab.repository.merge.panel.filter.minus=Filter out not integrated
-tab.repository.merge.panel.filter.others=Filter out others
+tab.repository.merge.panel.filter.plus=Filter Out Integrated
+tab.repository.merge.panel.filter.minus=Filter Out Not Integrated
+tab.repository.merge.panel.filter.others=Filter Out Others
 browse.changes.settings.stop.on.copy=&Stop On Copy
-action.mark.list.as.merged.text=Mark As Merged
+action.mark.list.as.merged.text=Mark as Merged
 action.mark.list.as.merged.description=Mark selected revision as merged, but do not actually merge
-action.mark.list.as.not.merged.text=Mark As Not Merged
+action.mark.list.as.not.merged.text=Mark as Not Merged
 action.mark.list.as.not.merged.description=Mark selected revision as not merged, but do not change anything besides svn:mergeinfo
 label.depth.text=&Depth:
 label.depth.description=Replaces old "recursive" option. "Recursive"=false is equivalent to "immediates", "recursive"=true is equivalent to "infinity"
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java
index d7db88eb1b71..d8a82474a455 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java
@@ -60,11 +60,9 @@ public class RootsAndBranches implements CommittedChangeListDecorator {
   private boolean myHighlightingOn;
   private JPanel myPanelWrapper;
   private final MergePanelFiltering myStrategy;
-  private final CommonFilter myFilterMerged =
-    new CommonFilter(message("tab.repository.merge.panel.filter.plus"), SvnIcons.FilterIntegrated);
-  private final CommonFilter myFilterNotMerged =
-    new CommonFilter(message("tab.repository.merge.panel.filter.minus"), SvnIcons.FilterNotIntegrated);
-  private final CommonFilter myFilterAlien = new CommonFilter(message("tab.repository.merge.panel.filter.others"), SvnIcons.FilterOthers);
+  private final CommonFilter myFilterMerged = new CommonFilter(message("tab.repository.merge.panel.filter.plus"));
+  private final CommonFilter myFilterNotMerged = new CommonFilter(message("tab.repository.merge.panel.filter.minus"));
+  private final CommonFilter myFilterAlien = new CommonFilter(message("tab.repository.merge.panel.filter.others"));
   private final IntegrateChangeListsAction myIntegrateAction;
   private final IntegrateChangeListsAction myUndoIntegrateChangeListsAction;
   private JComponent myToolbarComponent;
@@ -291,15 +289,16 @@ public class RootsAndBranches implements CommittedChangeListDecorator {
   }
 
   private DefaultActionGroup createActions() {
+    DefaultActionGroup presentationGroup = new DefaultActionGroup(new HighlightFrom(), myFilterMerged, myFilterNotMerged, myFilterAlien);
+    presentationGroup.setPopup(true);
+    presentationGroup.getTemplatePresentation().setIcon(AllIcons.Actions.Show);
+
     final DefaultActionGroup svnGroup = new DefaultActionGroup();
-    svnGroup.add(new HighlightFrom());
+    svnGroup.add(presentationGroup);
     svnGroup.add(myIntegrateAction);
     svnGroup.add(myUndoIntegrateChangeListsAction);
     svnGroup.add(new MarkAsMerged(true));
     svnGroup.add(new MarkAsMerged(false));
-    svnGroup.add(myFilterMerged);
-    svnGroup.add(myFilterNotMerged);
-    svnGroup.add(myFilterAlien);
     svnGroup.add(new MyRefresh());
     return svnGroup;
   }
@@ -404,7 +403,7 @@ public class RootsAndBranches implements CommittedChangeListDecorator {
   private class HighlightFrom extends DumbAwareToggleAction {
     private HighlightFrom() {
       super(message("committed.changes.action.enable.merge.highlighting"),
-            message("committed.changes.action.enable.merge.highlighting.description.text"), SvnIcons.ShowIntegratedFrom);
+            message("committed.changes.action.enable.merge.highlighting.description.text"), null);
     }
 
     @Override
@@ -426,8 +425,8 @@ public class RootsAndBranches implements CommittedChangeListDecorator {
   private class CommonFilter extends DumbAwareToggleAction {
     boolean mySelected;
 
-    protected CommonFilter(final String text, final Icon icon) {
-      super(text, null, icon);
+    protected CommonFilter(final String text) {
+      super(text);
     }
 
     @Override
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/ShowHideMergePanelAction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/ShowHideMergePanelAction.java
index dcd44a69754c..b5f206600c2d 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/ShowHideMergePanelAction.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/ShowHideMergePanelAction.java
@@ -2,17 +2,14 @@
 package org.jetbrains.idea.svn.history;
 
 import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.actionSystem.Presentation;
 import com.intellij.openapi.project.DumbAwareToggleAction;
 import com.intellij.openapi.vcs.changes.committed.ChangeListFilteringStrategy;
 import com.intellij.openapi.vcs.changes.committed.DecoratorManager;
 import icons.SvnIcons;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.idea.svn.SvnBundle;
 
-/**
-* @author Konstantin Kolosovsky.
-*/
+import static org.jetbrains.idea.svn.SvnBundle.message;
+
 public class ShowHideMergePanelAction extends DumbAwareToggleAction {
 
   private final DecoratorManager myManager;
@@ -20,19 +17,12 @@ public class ShowHideMergePanelAction extends DumbAwareToggleAction {
   private boolean myIsSelected;
 
   public ShowHideMergePanelAction(final DecoratorManager manager, final ChangeListFilteringStrategy strategy) {
+    super("Show Integrate Panel", message("committed.changes.action.enable.merge.highlighting.description.text"),
+          SvnIcons.ShowIntegratedFrom);
     myManager = manager;
     myStrategy = strategy;
   }
 
-  @Override
-  public void update(@NotNull final AnActionEvent e) {
-    super.update(e);
-    final Presentation presentation = e.getPresentation();
-    presentation.setIcon(SvnIcons.ShowIntegratedFrom);
-    presentation.setText(SvnBundle.message("committed.changes.action.enable.merge.highlighting"));
-    presentation.setDescription(SvnBundle.message("committed.changes.action.enable.merge.highlighting.description.text"));
-  }
-
   @Override
   public boolean isSelected(@NotNull final AnActionEvent e) {
     return myIsSelected;