diff --git a/platform/icons/src/vcs/Shelve.png b/platform/icons/src/vcs/Shelve.png old mode 100644 new mode 100755 index 5c866789b808..f36c150ca9db Binary files a/platform/icons/src/vcs/Shelve.png and b/platform/icons/src/vcs/Shelve.png differ diff --git a/platform/icons/src/vcs/Shelve@2x.png b/platform/icons/src/vcs/Shelve@2x.png old mode 100644 new mode 100755 index 35448bac87d7..0891abd67348 Binary files a/platform/icons/src/vcs/Shelve@2x.png and b/platform/icons/src/vcs/Shelve@2x.png differ diff --git a/platform/icons/src/vcs/Shelve@2x_dark.png b/platform/icons/src/vcs/Shelve@2x_dark.png old mode 100644 new mode 100755 index b5e39a365f51..a1c0476328fa Binary files a/platform/icons/src/vcs/Shelve@2x_dark.png and b/platform/icons/src/vcs/Shelve@2x_dark.png differ diff --git a/platform/icons/src/vcs/Shelve_dark.png b/platform/icons/src/vcs/Shelve_dark.png old mode 100644 new mode 100755 index 8e7bf0c84147..021fc3c77e90 Binary files a/platform/icons/src/vcs/Shelve_dark.png and b/platform/icons/src/vcs/Shelve_dark.png differ diff --git a/platform/icons/src/vcs/SilentShelve.png b/platform/icons/src/vcs/SilentShelve.png deleted file mode 100644 index dc19c29409a2..000000000000 Binary files a/platform/icons/src/vcs/SilentShelve.png and /dev/null differ diff --git a/platform/icons/src/vcs/SilentShelve@2x.png b/platform/icons/src/vcs/SilentShelve@2x.png deleted file mode 100644 index 204c3599365a..000000000000 Binary files a/platform/icons/src/vcs/SilentShelve@2x.png and /dev/null differ diff --git a/platform/icons/src/vcs/SilentShelve@2x_dark.png b/platform/icons/src/vcs/SilentShelve@2x_dark.png deleted file mode 100644 index ff81e00db7f3..000000000000 Binary files a/platform/icons/src/vcs/SilentShelve@2x_dark.png and /dev/null differ diff --git a/platform/icons/src/vcs/SilentShelve_dark.png b/platform/icons/src/vcs/SilentShelve_dark.png deleted file mode 100644 index 70c8397cc84b..000000000000 Binary files a/platform/icons/src/vcs/SilentShelve_dark.png and /dev/null differ diff --git a/platform/icons/src/vcs/SilentUnshelve.png b/platform/icons/src/vcs/SilentUnshelve.png deleted file mode 100644 index 4c972b2c6f0a..000000000000 Binary files a/platform/icons/src/vcs/SilentUnshelve.png and /dev/null differ diff --git a/platform/icons/src/vcs/SilentUnshelve@2x.png b/platform/icons/src/vcs/SilentUnshelve@2x.png deleted file mode 100644 index 36392fba9b1b..000000000000 Binary files a/platform/icons/src/vcs/SilentUnshelve@2x.png and /dev/null differ diff --git a/platform/icons/src/vcs/SilentUnshelve@2x_dark.png b/platform/icons/src/vcs/SilentUnshelve@2x_dark.png deleted file mode 100644 index a223ff4ab689..000000000000 Binary files a/platform/icons/src/vcs/SilentUnshelve@2x_dark.png and /dev/null differ diff --git a/platform/icons/src/vcs/SilentUnshelve_dark.png b/platform/icons/src/vcs/SilentUnshelve_dark.png deleted file mode 100644 index 9408aaa7db37..000000000000 Binary files a/platform/icons/src/vcs/SilentUnshelve_dark.png and /dev/null differ diff --git a/platform/icons/src/vcs/Unshelve.png b/platform/icons/src/vcs/Unshelve.png old mode 100644 new mode 100755 index c3da5dee062d..f843e2d7f6e8 Binary files a/platform/icons/src/vcs/Unshelve.png and b/platform/icons/src/vcs/Unshelve.png differ diff --git a/platform/icons/src/vcs/Unshelve@2x.png b/platform/icons/src/vcs/Unshelve@2x.png old mode 100644 new mode 100755 index 333d91c8e914..23d4589e3ca7 Binary files a/platform/icons/src/vcs/Unshelve@2x.png and b/platform/icons/src/vcs/Unshelve@2x.png differ diff --git a/platform/icons/src/vcs/Unshelve@2x_dark.png b/platform/icons/src/vcs/Unshelve@2x_dark.png old mode 100644 new mode 100755 index 1e103f0c9894..3bb0081e95d4 Binary files a/platform/icons/src/vcs/Unshelve@2x_dark.png and b/platform/icons/src/vcs/Unshelve@2x_dark.png differ diff --git a/platform/icons/src/vcs/Unshelve_dark.png b/platform/icons/src/vcs/Unshelve_dark.png old mode 100644 new mode 100755 index 80d12d5cc21e..9c6b4bb58a26 Binary files a/platform/icons/src/vcs/Unshelve_dark.png and b/platform/icons/src/vcs/Unshelve_dark.png differ diff --git a/platform/icons/src/vcs/shelveSilent.png b/platform/icons/src/vcs/shelveSilent.png new file mode 100755 index 000000000000..66e8836d9bd9 Binary files /dev/null and b/platform/icons/src/vcs/shelveSilent.png differ diff --git a/platform/icons/src/vcs/shelveSilent@2x.png b/platform/icons/src/vcs/shelveSilent@2x.png new file mode 100755 index 000000000000..e1da5895a12a Binary files /dev/null and b/platform/icons/src/vcs/shelveSilent@2x.png differ diff --git a/platform/icons/src/vcs/shelveSilent@2x_dark.png b/platform/icons/src/vcs/shelveSilent@2x_dark.png new file mode 100755 index 000000000000..23a02c998ee8 Binary files /dev/null and b/platform/icons/src/vcs/shelveSilent@2x_dark.png differ diff --git a/platform/icons/src/vcs/shelveSilent_dark.png b/platform/icons/src/vcs/shelveSilent_dark.png new file mode 100755 index 000000000000..c6931b8df52e Binary files /dev/null and b/platform/icons/src/vcs/shelveSilent_dark.png differ diff --git a/platform/icons/src/vcs/unshelveSilent.png b/platform/icons/src/vcs/unshelveSilent.png new file mode 100755 index 000000000000..9e56dad776e0 Binary files /dev/null and b/platform/icons/src/vcs/unshelveSilent.png differ diff --git a/platform/icons/src/vcs/unshelveSilent@2x.png b/platform/icons/src/vcs/unshelveSilent@2x.png new file mode 100755 index 000000000000..9b64e1923ffa Binary files /dev/null and b/platform/icons/src/vcs/unshelveSilent@2x.png differ diff --git a/platform/icons/src/vcs/unshelveSilent@2x_dark.png b/platform/icons/src/vcs/unshelveSilent@2x_dark.png new file mode 100755 index 000000000000..2a263ec13a45 Binary files /dev/null and b/platform/icons/src/vcs/unshelveSilent@2x_dark.png differ diff --git a/platform/icons/src/vcs/unshelveSilent_dark.png b/platform/icons/src/vcs/unshelveSilent_dark.png new file mode 100755 index 000000000000..fd0cbba7ba30 Binary files /dev/null and b/platform/icons/src/vcs/unshelveSilent_dark.png differ diff --git a/platform/platform-resources/src/idea/VcsActions.xml b/platform/platform-resources/src/idea/VcsActions.xml index 15d003474731..2eff1eb8ab3d 100644 --- a/platform/platform-resources/src/idea/VcsActions.xml +++ b/platform/platform-resources/src/idea/VcsActions.xml @@ -95,7 +95,7 @@ + text="Shelve Silently" description="Shelve changes to appropriate shelved changelists" icon="AllIcons.Vcs.ShelveSilent"> + text="Unshelve Silently" description="Unshelve changes to appropriate changelists" icon="AllIcons.Vcs.UnshelveSilent"> diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java index a6fbabff6ebb..1768d56f1f05 100644 --- a/platform/util/src/com/intellij/icons/AllIcons.java +++ b/platform/util/src/com/intellij/icons/AllIcons.java @@ -1268,13 +1268,13 @@ public class AllIcons { 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 Shelve = IconLoader.getIcon("/vcs/Shelve.png"); // 16x16 + public static final Icon ShelveSilent = IconLoader.getIcon("/vcs/shelveSilent.png"); // 16x16 public static final Icon ShowUnversionedFiles = IconLoader.getIcon("/vcs/ShowUnversionedFiles.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 public static final Icon Unshelve = IconLoader.getIcon("/vcs/Unshelve.png"); // 16x16 + public static final Icon UnshelveSilent = IconLoader.getIcon("/vcs/unshelveSilent.png"); // 16x16 }