From 466f58fee5506af00638baa9a18f172a067b0bfd Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Mon, 12 Sep 2016 22:53:13 +0200
Subject: [PATCH] Do not use home-made icons in production code

---
 platform/icons/src/vcs/silentShelve.png       | Bin 442 -> 0 bytes
 platform/icons/src/vcs/silentShelve@2x.png    | Bin 776 -> 0 bytes
 platform/icons/src/vcs/silentUnshelve.png     | Bin 300 -> 0 bytes
 platform/icons/src/vcs/silentUnshelve@2x.png  | Bin 505 -> 0 bytes
 .../src/idea/VcsActions.xml                   |  23 ++++++++++++------
 .../util/src/com/intellij/icons/AllIcons.java |   2 --
 6 files changed, 15 insertions(+), 10 deletions(-)
 delete mode 100644 platform/icons/src/vcs/silentShelve.png
 delete mode 100644 platform/icons/src/vcs/silentShelve@2x.png
 delete mode 100644 platform/icons/src/vcs/silentUnshelve.png
 delete mode 100644 platform/icons/src/vcs/silentUnshelve@2x.png

diff --git a/platform/icons/src/vcs/silentShelve.png b/platform/icons/src/vcs/silentShelve.png
deleted file mode 100644
index c9e482fae5505b77f0c21b768f1e810b9731f13c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 442
zcmV;r0Y(0aP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004jNkl<Zc-muN
zpe1-bt?xe!Uq}f0PdfwV%$f5agsZBm{v)#~HsIyj<#2qvG=*{(^c{W($5CBN5e9DB
zwCO(xPn|mTKQbGpIm^xIzls3g|K%56z;WJ^o&PahP*zs<-@?M;KL-cLe{OE>|CvCI
z52y6}FZS{HuOlLe+XXNKyuH2uGcq#%FDNMZ@8#w7pM#b4|Avyh|0TX2|7Cf(|Em~T
z{b%Fg{BIK!kKF)YUtf^m|FE#I|GBxj|6i<G1`fdTh)}S&ds5+lkCbAFnwGhk22@m3
z{C9J613Mq2$VNl;|E2C`unQFVdH?qwdhow^{&uijVC_`QKx}Jk`#)vMl>ckjuKk~y
zn);s!=$(d;0I&g|FaQN!*P8uc1CpmK$8>>{lhc28cJ}|p#l`<aLqq>FGco;d2@m>T
z<n8`nTNo0ECG&TH4G5^7f@wfeQPF>Mb91m4*x1<q`<od4zcrx)9F5ArXapIMKVt*f
k0N?UHlJdrX9GG$d0MA`@<4WiU*8l(j07*qoM6N<$f(@bBNdN!<

diff --git a/platform/icons/src/vcs/silentShelve@2x.png b/platform/icons/src/vcs/silentShelve@2x.png
deleted file mode 100644
index edeb02cf858cae716c0d243c7bd1b7a8079d04ae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 776
zcmV+j1NZ!iP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80008dNkl<Zc-rli
z-Aj{k6vs84Iy0S&Y|RCc=#1#5mM_rIgx=`F&@D*D()Q$ZxLla%mcg7$(nkmBrr{(Z
z+zUbB1cTZ|&@Otp5`!Wv!@?+f`4_&qpZM!}aw3oHLTLxSH|OG<&+~lGIlrW&L~Pgi
z{xE>A_r3Ts;^OK34GU)LYmflgegM<c(+C6t7#|-eVp$e8n+@yb69B)Th4J%oh=6dl
zIMRptcIH0-*vNvw>^FE{FToXA<mtLUg1UYmwjMwv5<xf|CJm$V`F!wrJXkNk5kPqU
z7ea4;5D>0hPiJv;^2rti*zz-Ax7$%tQUa+|iqzCpDEBE)U3v_U+RU{1E9cE<VWLYN
z&iDazcXuNtC50B}DmghB-o^$3@Xpms^G%LB@dGF<EF?uUGc%#pYGE`Qarc@TyToFW
zKcvXVXU`xOhFJ<=zC9WrfKVs|kw`>}s?}=VA?h_U&{n9?T2qaM$q6hyn4|zLy(6eG
zSs^bt2vK?l_8w58;nvvZ{(xLACq=Wfv%xS7Iy*aKUP3NFj&%1LyLK$wczM7l96+bj
z@d`z)&{Q0UyNSVEe-9nPPaF$~HDwhr4Fz%0Hb`@ox)$L8e!m|YjfQN%zh9M=k&cOG
z!x{iZK{4FVKTz)_c`JYM=-CUKzl2j$Q?OdCC@(KZZdMj;CQeJk9NWVKXzz3L4w0fj
zxiUxR>x5sznVA`Qy<P-^L7I>HZ8%v)8;)J6=K*xEqrw2zv%ukS(4w`qwY*DsuhsMy
zppg$?a=LkIxM%;$Djzwc5jF!+|5w*gyuA0(Suhw3aGOmi%9qoIFM7K0aj2gIFdQ4;
zv_|+4>h=1VS8!F$r>e*hz8P@R9Mi?}0CHstl0RH|ZgX#e#bSX<rGiW*BX2>TM1r#7
zB8)P6EV>5>z)Q|splh@90Cwi&lDx9?L~MXK1q3J&B>n($4Jbr{MUf%^0000<MNUMn
GLSTY_onc}C

diff --git a/platform/icons/src/vcs/silentUnshelve.png b/platform/icons/src/vcs/silentUnshelve.png
deleted file mode 100644
index f3df00c2f294151a73dde0624118155b0b7b9aa0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 300
zcmV+{0n`48P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002<Nkl<Zc-muN
zpe1-bt?xe!Uq}f0PdfwV%$f5agsZBm{v)#~HsIyj<#2qvG=*{(^c{W($5CBN5e9DB
zwCO(xPn|mTKQbHLfaMonz;WJ^o&Sk)L8hD2e^*^?xC=DQ?f*N+W}~_Qp8*A4ZvTCZ
z^x+2R+Ijr<NG>AI08rqSga!Zix3&NWBFF$ed(ZzKDaFLQpb+Q+Ut<Hf3$Pl1FA&T9
zy#70AX}|+f*TU|9bWuI=fjB2U=|3+A$Nx=1ZvQKm?)%Td!}mX<e<|@^crc~se~hi=
ye_l4$|6IKM{~aUK|MwnxfNB5%@E-@J4gdh3_?&wePW=r40000<MNUMnLSTZ*&xUdU

diff --git a/platform/icons/src/vcs/silentUnshelve@2x.png b/platform/icons/src/vcs/silentUnshelve@2x.png
deleted file mode 100644
index 15344f636d426aa351c18a9797e3e62464996836..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 505
zcmV<V0S5kwP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80005NNkl<Zc-muN
z7zINWyj;8d|FcE2|39AAhk|cb7yQ4F5cGf40YlFLn>KCwzkK=f|8wTd0psrO?*CO)
zRsV5`k2>Jp{@wrIY}*KS2r_;+t@How(v%V4076l){KAX>vrj$!-*@;S3NBf8_<vN_
z(*J|c0f!GC{=a+oZm@+QymaZ(|5K+<{f|qWkOOw#e*1spwbx*WAmhGW7yjoh**ORu
zFeKB!;{`K827$4!u>n>GNGhp=<wa$cXp;!J*xA4qL|R*5b%3I-30PiMLytBN5a!_l
zTaf5ri`4;YrnX>tC4DpMIsjG>iSqM<ElBnDKq-h|4p29<1IsHLm=7}tz@k8e7ZL?Y
zj@YAM=s1Aff=HB)7i%Jf6-2t0_F#EU6D!)3gjzCEU<(3Gjj%dEK|>cTZ{r<8o08De
zKo4wz7%(JmPwYgAg3isS|1&W&gXO)`%W0Da=4B+qOG6_?`TsM*{Qj@-b^4#vHtoNN
zlq^`Bm7U{%^~%GvaloUgz2M-7IRYIsGBN!RDQTl^djRB!nW^#r9kew5%kcC4XJcmi
vFQusZ-^9iDf64qE#8pOQg8wAqQGfveH&&SL<s;`y00000NkvXXu0mjfy@T?B

diff --git a/platform/platform-resources/src/idea/VcsActions.xml b/platform/platform-resources/src/idea/VcsActions.xml
index e67a8f987486..cc55a94f7f75 100644
--- a/platform/platform-resources/src/idea/VcsActions.xml
+++ b/platform/platform-resources/src/idea/VcsActions.xml
@@ -93,14 +93,20 @@
               icon="AllIcons.Actions.Submit1"/>
       <action id="ChangesView.Move" class="com.intellij.openapi.vcs.changes.actions.MoveChangesToAnotherListAction"
               icon="AllIcons.Actions.MoveToAnotherChangelist"/>
-      <action id="ChangesView.ShelveSilently" class="com.intellij.openapi.vcs.changes.actions.ShelveSilentlyAction"
-              text="Shelve Silently" description="Shelve changes to appropriate shelved changelists" icon="AllIcons.Vcs.SilentShelve">
-        <keyboard-shortcut first-keystroke="control alt H" keymap="$default"/>
-      </action>
       <action id="ChangesView.Diff" class="com.intellij.openapi.vcs.changes.actions.diff.ShowDiffAction"
               icon="AllIcons.Actions.Diff" use-shortcut-of="Diff.ShowDiff"/>
     </group>
 
+    <action id="ChangesView.ShelveSilently" class="com.intellij.openapi.vcs.changes.actions.ShelveSilentlyAction"
+            text="Shelve Silently" description="Shelve changes to appropriate shelved changelists">
+      <keyboard-shortcut first-keystroke="control alt H" keymap="$default"/>
+    </action>
+    <action id="ChangesView.UnshelveSilently" class="com.intellij.openapi.vcs.changes.actions.UnshelveSilentlyAction"
+            text="Unshelve Silently" description="Unshelve changes to appropriate changelists">
+      <keyboard-shortcut first-keystroke="control alt U" keymap="$default"/>
+    </action>
+
+
     <group id="AlienCommitChangesDialog.AdditionalActions"/>
 
     <group id="ChangesViewPopupMenu">
@@ -126,6 +132,7 @@
       <action id="ChangesView.Rename" class="com.intellij.openapi.vcs.changes.actions.RenameChangeListAction"/>
       <reference ref="ChangesView.CreatePatch"/>
       <reference ref="ChangesView.Shelve"/>
+      <reference ref="ChangesView.ShelveSilently"/>
       <separator/>
       <reference ref="ChangesView.Refresh"/>
       <separator/>
@@ -144,6 +151,7 @@
     <group id="ShelvedChangesPopupMenu" popup="true">
       <action id="ShelveChanges.UnshelveWithDialog" class="com.intellij.openapi.vcs.changes.shelf.UnshelveWithDialogAction"
               text="Unshelve..." description="Correct paths where to apply patches and unshelve"/>
+      <reference id="ChangesView.UnshelveSilently"/>
       <action id="ShelvedChanges.Restore" class="com.intellij.openapi.vcs.changes.shelf.RestoreShelvedChange"/>
       <action id="ShelvedChanges.Diff" class="com.intellij.openapi.vcs.changes.shelf.DiffShelvedChangesAction"
           icon="AllIcons.Actions.Diff" use-shortcut-of="Diff.ShowDiff"/>
@@ -163,10 +171,6 @@
 
     <group id="ShelvedChangesToolbar">
       <reference ref="ShelvedChanges.Diff"/>
-      <action id="ChangesView.UnshelveSilently" class="com.intellij.openapi.vcs.changes.actions.UnshelveSilentlyAction"
-              text="Unshelve Silently" description="Unshelve changes to appropriate changelists" icon="AllIcons.Vcs.SilentUnshelve">
-        <keyboard-shortcut first-keystroke="control alt U" keymap="$default"/>
-      </action>
       <reference ref="ChangesView.CreatePatchFromChanges"/>
       <reference ref="ShelvedChanges.ShowHideDeleted" />
       <reference ref="ShelvedChanges.CleanMarkedToDelete"/>
@@ -174,6 +178,7 @@
 
     <group id="ShelvedChangesToolbarGear" popup="true" icon="AllIcons.General.SecondaryGroup">
       <reference ref="ShelveChanges.UnshelveWithDialog"/>
+      <reference ref="ChangesView.UnshelveSilently"/>
       <reference ref="ShelvedChanges.Restore"/>
       <reference ref="ShelvedChanges.ImportPatches"/>
       <separator/>
@@ -296,7 +301,9 @@
 
     <group id="Shelve.KeymapGroup" text="Shelve">
       <reference ref="ChangesView.Shelve"/>
+      <reference ref="ChangesView.ShelveSilently"/>
       <reference ref="ShelveChanges.UnshelveWithDialog"/>
+      <reference ref="ChangesView.UnshelveSilently"/>
       <reference ref="ShelvedChanges.Restore"/>
       <reference ref="ShelvedChanges.ImportPatches"/>
       <separator/>
diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java
index d08e2f297f6d..d139c7d991bc 100644
--- a/platform/util/src/com/intellij/icons/AllIcons.java
+++ b/platform/util/src/com/intellij/icons/AllIcons.java
@@ -1240,8 +1240,6 @@ public class AllIcons {
     public static final Icon Not_equal = IconLoader.getIcon("/vcs/not_equal.png"); // 16x16
     public static final Icon Remove = IconLoader.getIcon("/vcs/remove.png"); // 16x16
     public static final Icon ResetStrip = IconLoader.getIcon("/vcs/resetStrip.png"); // 16x16
-    public static final Icon SilentShelve = IconLoader.getIcon("/vcs/silentShelve.png"); // 16x16
-    public static final Icon SilentUnshelve = IconLoader.getIcon("/vcs/silentUnshelve.png"); // 16x16
     public static final Icon StripDown = IconLoader.getIcon("/vcs/stripDown.png"); // 16x16
     public static final Icon StripNull = IconLoader.getIcon("/vcs/stripNull.png"); // 16x16
     public static final Icon StripUp = IconLoader.getIcon("/vcs/stripUp.png"); // 16x16