MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

svn: Update icons - reuse existing

Browse Source
This commit is contained in:
Konstantin Kolosovsky
2018-11-21 17:09:45 +03:00
parent 611db7d8c4
commit 240fa0f5cd
6 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/gen/icons/SvnIcons.java
-2
View File
@@ -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
plugins/svn4idea/resources/icons/IntegrateToBranch.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 339 B

plugins/svn4idea/resources/icons/mergeSourcesDetails.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 766 B

plugins/svn4idea/src/META-INF/plugin.xml
+1 -1
View File
@@ -28,7 +28,7 @@
<action id="IntegrateChangeSetAction" class="org.jetbrains.idea.svn.actions.IntegrateChangeSetAction" popup="true"
icon="SvnIcons.IntegrateToBranch">
icon="AllIcons.Vcs.Merge">
<add-to-group group-id="Vcs.RepositoryChangesBrowserToolbar" anchor="last"/>
</action>
plugins/svn4idea/src/org/jetbrains/idea/svn/history/MergeSourceDetailsAction.java
+2 -2
View File
@@ -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
plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java
+1 -1
View File
@@ -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);