From 240fa0f5cd68e050d8193e2192e794ce3dee32af Mon Sep 17 00:00:00 2001 From: Konstantin Kolosovsky Date: Wed, 14 Nov 2018 18:06:45 +0300 Subject: [PATCH] svn: Update icons - reuse existing --- plugins/svn4idea/gen/icons/SvnIcons.java | 2 -- .../resources/icons/IntegrateToBranch.png | Bin 339 -> 0 bytes .../resources/icons/mergeSourcesDetails.png | Bin 766 -> 0 bytes plugins/svn4idea/src/META-INF/plugin.xml | 2 +- .../svn/history/MergeSourceDetailsAction.java | 4 ++-- .../idea/svn/history/RootsAndBranches.java | 2 +- 6 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 plugins/svn4idea/resources/icons/IntegrateToBranch.png delete mode 100644 plugins/svn4idea/resources/icons/mergeSourcesDetails.png diff --git a/plugins/svn4idea/gen/icons/SvnIcons.java b/plugins/svn4idea/gen/icons/SvnIcons.java index 669eaabd47e8..b6e25eea279b 100644 --- a/plugins/svn4idea/gen/icons/SvnIcons.java +++ b/plugins/svn4idea/gen/icons/SvnIcons.java @@ -26,11 +26,9 @@ public final class SvnIcons { 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 IntegrateToBranch = load("/icons/IntegrateToBranch.png"); // 16x16 public static final Icon IntegrationStatusUnknown = load("/icons/IntegrationStatusUnknown.png"); // 16x16 public static final Icon MarkAsMerged = load("/icons/MarkAsMerged.png"); // 16x16 public static final Icon MarkAsNotMerged = load("/icons/MarkAsNotMerged.png"); // 16x16 - public static final Icon MergeSourcesDetails = load("/icons/mergeSourcesDetails.png"); // 16x16 public static final Icon Notintegrated = load("/icons/Notintegrated.png"); // 16x16 public static final Icon PropertiesDiff = load("/icons/PropertiesDiff.png"); // 16x16 public static final Icon ShowIntegratedFrom = load("/icons/ShowIntegratedFrom.png"); // 16x16 diff --git a/plugins/svn4idea/resources/icons/IntegrateToBranch.png b/plugins/svn4idea/resources/icons/IntegrateToBranch.png deleted file mode 100644 index cf1d2a2f12e21783ea419da2706893a5b1f36b35..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 339 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}OMp*^Ywf~a3l}c@|NsBaojdiN z6M%>zUzMSQf#HC({cFX7>6@l*I>yq?;yB-ltA~rXkAKJMoBJ<5x$@wx#cL_Md3Hj5 z!eSFdou$heP$K4EGp)yYwQ!Z^v8iR zlVlX8D6BkqOLeN6;VeVbS!OLOS{s4xVJivp1G$T#?@VNg&3PcB!qdeuq#`c2?>e88 zA&>KHhr6Zb)$jlQ|L^W4@9^c9;wHZ}N4g?Eudg~7e)xaOJJx&EVV+6KJ5H-83DoMe zo2fLg^zHssI{Q+?g9|Pj_RaaWx{B>UWC_!;=VuRz7OQU(<6ZqcaktFO85=Y|?(ow} ie#Cq8dHg52%FE`hO&m6C*O}jfT;u8L=d#Wzp$Pz6q>63; diff --git a/plugins/svn4idea/resources/icons/mergeSourcesDetails.png b/plugins/svn4idea/resources/icons/mergeSourcesDetails.png deleted file mode 100644 index ec9525732de9549ad68304c73c0489abb05052af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 766 zcmV`%0fQn3#!m>(MF4RU0C5r#pdDauf(K_A1AHR@aS{xe zEC6v50e>I`a2N!oLji9U1#lQzYj%2zNXWQ6K?s6b7+S2#Y-kVHsO*d|7XL4%j;c zbsGb26%2*2EN($gf3*<=*<3}aNID}LH3&=eR=uQgeOCZWa3*JarbbVNKeh8>h3fV-A zSO6x)G+1?gSa5s?%Vh}VP*`qz3(7wY;X^jJGX>r!Dz2UvG~HMKL+Xa`~d002jHQchC<=F9+Q02`Im z^!<|`_369V0{gDhA?V6Z{r>d)`t{21{O$K}&i?EC{=xkITtff=0M|)GK~xx5V_*OQQFbOKCT<=un-K{3_yst_q&bAyzyiL$ zzH+==5$^uVA}WGlfq(!tp^9XWnp`n)39uF=NvYz}GWSNWa2Z*3MxcRq8yBBoU>a8cnVg(mV4h)Q wUWpcSO5S307*qoM6N<$g0nL!LI3~& diff --git a/plugins/svn4idea/src/META-INF/plugin.xml b/plugins/svn4idea/src/META-INF/plugin.xml index 0d7b68f1ae34..19c6d261c79c 100644 --- a/plugins/svn4idea/src/META-INF/plugin.xml +++ b/plugins/svn4idea/src/META-INF/plugin.xml @@ -28,7 +28,7 @@ + icon="AllIcons.Vcs.Merge"> diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/MergeSourceDetailsAction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/MergeSourceDetailsAction.java index 7ca7161216fb..1f21a008a8e2 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/MergeSourceDetailsAction.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/MergeSourceDetailsAction.java @@ -1,6 +1,7 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.idea.svn.history; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CommonDataKeys; @@ -10,7 +11,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.VcsDataKeys; import com.intellij.openapi.vcs.history.VcsFileRevision; import com.intellij.openapi.vfs.VirtualFile; -import icons.SvnIcons; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -19,7 +19,7 @@ import java.awt.event.KeyEvent; public class MergeSourceDetailsAction extends AnAction implements DumbAware { public MergeSourceDetailsAction() { - super("Show merge sources details", null, SvnIcons.MergeSourcesDetails); + super("Show merge sources details", null, AllIcons.Vcs.Branch); } @Override 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 ef48a369cef8..5d30d1b39131 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java @@ -585,7 +585,7 @@ public class RootsAndBranches implements CommittedChangeListDecorator { @Override protected void updateWithChecker(AnActionEvent e, SelectedCommittedStuffChecker checker) { if (myIntegrate) { - e.getPresentation().setIcon(SvnIcons.IntegrateToBranch); + e.getPresentation().setIcon(AllIcons.Vcs.Merge); } else { e.getPresentation().setIcon(SvnIcons.UndoIntegrateToBranch);