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 cf1d2a2f12e2..000000000000 Binary files a/plugins/svn4idea/resources/icons/IntegrateToBranch.png and /dev/null differ diff --git a/plugins/svn4idea/resources/icons/mergeSourcesDetails.png b/plugins/svn4idea/resources/icons/mergeSourcesDetails.png deleted file mode 100644 index ec9525732de9..000000000000 Binary files a/plugins/svn4idea/resources/icons/mergeSourcesDetails.png and /dev/null differ 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);