From 317d5aa2cca83ba2e070922f8eb7541a74707d31 Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Thu, 28 Jun 2018 18:18:51 +0300 Subject: [PATCH] [icons] move favorites icons from vcs to nodes --- .../src/com/intellij/dvcs/ui/BranchActionGroup.java | 2 +- platform/icons/src/{vcs => nodes}/favorite.png | Bin platform/icons/src/{vcs => nodes}/favorite@2x.png | Bin .../icons/src/{vcs => nodes}/favoriteOnHover.png | Bin .../icons/src/{vcs => nodes}/favoriteOnHover@2x.png | Bin .../icons/src/{vcs => nodes}/notFavoriteOnHover.png | Bin .../src/{vcs => nodes}/notFavoriteOnHover@2x.png | Bin platform/icons/src/vcs/icon-robots.txt | 2 +- platform/util/src/com/intellij/icons/AllIcons.java | 6 +++--- .../log/ui/filter/BranchFilterPopupComponent.java | 4 ++-- .../git4idea/ui/branch/GitBranchPopupActions.java | 4 ++-- .../zmlx/hg4idea/branch/HgBranchPopupActions.java | 8 ++++---- 12 files changed, 13 insertions(+), 13 deletions(-) rename platform/icons/src/{vcs => nodes}/favorite.png (100%) rename platform/icons/src/{vcs => nodes}/favorite@2x.png (100%) rename platform/icons/src/{vcs => nodes}/favoriteOnHover.png (100%) rename platform/icons/src/{vcs => nodes}/favoriteOnHover@2x.png (100%) rename platform/icons/src/{vcs => nodes}/notFavoriteOnHover.png (100%) rename platform/icons/src/{vcs => nodes}/notFavoriteOnHover@2x.png (100%) diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroup.java b/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroup.java index 8a77528d88b8..c2be2c4a4082 100644 --- a/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroup.java +++ b/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroup.java @@ -32,7 +32,7 @@ public abstract class BranchActionGroup extends ActionGroup implements DumbAware public BranchActionGroup() { super("", true); - setIcons(AllIcons.Vcs.Favorite, EmptyIcon.ICON_16, AllIcons.Vcs.FavoriteOnHover, AllIcons.Vcs.NotFavoriteOnHover); + setIcons(AllIcons.Nodes.Favorite, EmptyIcon.ICON_16, AllIcons.Nodes.FavoriteOnHover, AllIcons.Nodes.NotFavoriteOnHover); } protected void setIcons(@NotNull Icon favorite, diff --git a/platform/icons/src/vcs/favorite.png b/platform/icons/src/nodes/favorite.png similarity index 100% rename from platform/icons/src/vcs/favorite.png rename to platform/icons/src/nodes/favorite.png diff --git a/platform/icons/src/vcs/favorite@2x.png b/platform/icons/src/nodes/favorite@2x.png similarity index 100% rename from platform/icons/src/vcs/favorite@2x.png rename to platform/icons/src/nodes/favorite@2x.png diff --git a/platform/icons/src/vcs/favoriteOnHover.png b/platform/icons/src/nodes/favoriteOnHover.png similarity index 100% rename from platform/icons/src/vcs/favoriteOnHover.png rename to platform/icons/src/nodes/favoriteOnHover.png diff --git a/platform/icons/src/vcs/favoriteOnHover@2x.png b/platform/icons/src/nodes/favoriteOnHover@2x.png similarity index 100% rename from platform/icons/src/vcs/favoriteOnHover@2x.png rename to platform/icons/src/nodes/favoriteOnHover@2x.png diff --git a/platform/icons/src/vcs/notFavoriteOnHover.png b/platform/icons/src/nodes/notFavoriteOnHover.png similarity index 100% rename from platform/icons/src/vcs/notFavoriteOnHover.png rename to platform/icons/src/nodes/notFavoriteOnHover.png diff --git a/platform/icons/src/vcs/notFavoriteOnHover@2x.png b/platform/icons/src/nodes/notFavoriteOnHover@2x.png similarity index 100% rename from platform/icons/src/vcs/notFavoriteOnHover@2x.png rename to platform/icons/src/nodes/notFavoriteOnHover@2x.png diff --git a/platform/icons/src/vcs/icon-robots.txt b/platform/icons/src/vcs/icon-robots.txt index 5c63e6bce8f7..1a89675ad302 100644 --- a/platform/icons/src/vcs/icon-robots.txt +++ b/platform/icons/src/vcs/icon-robots.txt @@ -1 +1 @@ -deprecated: mergeSourcesTree.png -> /actions/showAsTree.svg; to be removed in IDEA 2020 - use AllIcons.Actions.ShowAsTree +deprecated: mergeSourcesTree.png -> /actions/showAsTree.svg; to be removed in IDEA 2020 - use AllIcons.Actions.ShowAsTree \ No newline at end of file diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java index 827ab2718528..1f6de33a51c5 100644 --- a/platform/util/src/com/intellij/icons/AllIcons.java +++ b/platform/util/src/com/intellij/icons/AllIcons.java @@ -1318,6 +1318,8 @@ public class AllIcons { public static final Icon ExcludedFromCompile = IconLoader.getIcon("/nodes/excludedFromCompile.png"); // 16x16 public static final Icon ExpandNode = IconLoader.getIcon("/nodes/expandNode.png"); // 9x9 public static final Icon ExtractedFolder = IconLoader.getIcon("/nodes/extractedFolder.png"); // 16x16 + public static final Icon Favorite = IconLoader.getIcon("/nodes/favorite.png"); // 16x16 + public static final Icon FavoriteOnHover = IconLoader.getIcon("/nodes/favoriteOnHover.png"); // 16x16 public static final Icon Field = IconLoader.getIcon("/nodes/field.svg"); // 16x16 public static final Icon FieldPK = IconLoader.getIcon("/nodes/fieldPK.png"); // 16x16 public static final Icon FinalMark = IconLoader.getIcon("/nodes/finalMark.png"); // 16x16 @@ -1364,6 +1366,7 @@ public class AllIcons { public static final Icon NewFolder = IconLoader.getIcon("/nodes/newFolder.png"); // 16x16 public static final Icon NewParameter = IconLoader.getIcon("/nodes/newParameter.png"); // 16x16 public static final Icon NodePlaceholder = IconLoader.getIcon("/nodes/nodePlaceholder.png"); // 16x16 + public static final Icon NotFavoriteOnHover = IconLoader.getIcon("/nodes/notFavoriteOnHover.png"); // 16x16 public static final Icon Package = IconLoader.getIcon("/nodes/package.svg"); // 16x16 public static final Icon Padlock = IconLoader.getIcon("/nodes/padlock.png"); // 16x16 public static final Icon Parameter = IconLoader.getIcon("/nodes/parameter.svg"); // 16x16 @@ -1857,8 +1860,6 @@ public class AllIcons { public static final Icon Changelist = IconLoader.getIcon("/vcs/changelist.svg"); // 16x16 public static final Icon CheckSpelling = IconLoader.getIcon("/vcs/checkSpelling.png"); // 16x16 public static final Icon Equal = IconLoader.getIcon("/vcs/equal.png"); // 16x16 - public static final Icon Favorite = IconLoader.getIcon("/vcs/favorite.png"); // 16x16 - public static final Icon FavoriteOnHover = IconLoader.getIcon("/vcs/favoriteOnHover.png"); // 16x16 public static final Icon History = IconLoader.getIcon("/vcs/history.svg"); // 16x16 public static final Icon MapBase = IconLoader.getIcon("/vcs/mapBase.png"); // 16x16 public static final Icon Merge = IconLoader.getIcon("/vcs/merge.png"); // 12x12 @@ -1868,7 +1869,6 @@ public class AllIcons { @Deprecated public static final Icon MergeSourcesTree = IconLoader.getIcon("/actions/showAsTree.svg"); // 16x16 public static final Icon Not_equal = IconLoader.getIcon("/vcs/not_equal.png"); // 16x16 - public static final Icon NotFavoriteOnHover = IconLoader.getIcon("/vcs/notFavoriteOnHover.png"); // 16x16 public static final Icon Patch = IconLoader.getIcon("/vcs/patch.svg"); // 16x16 public static final Icon Patch_applied = IconLoader.getIcon("/vcs/patch_applied.svg"); // 16x16 public static final Icon Patch_file = IconLoader.getIcon("/vcs/patch_file.svg"); // 16x16 diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/BranchFilterPopupComponent.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/BranchFilterPopupComponent.java index 2b603fa59873..49f97f8c9668 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/BranchFilterPopupComponent.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/BranchFilterPopupComponent.java @@ -141,8 +141,8 @@ public class BranchFilterPopupComponent extends MultipleValueFilterPopupComponen public BranchFilterAction(@NotNull String value, @NotNull Collection references) { super(value, true); myReferences = references; - myIcon = new LayeredIcon(AllIcons.Vcs.Favorite, EmptyIcon.ICON_16); - myHoveredIcon = new LayeredIcon(AllIcons.Vcs.FavoriteOnHover, AllIcons.Vcs.NotFavoriteOnHover); + myIcon = new LayeredIcon(AllIcons.Nodes.Favorite, EmptyIcon.ICON_16); + myHoveredIcon = new LayeredIcon(AllIcons.Nodes.FavoriteOnHover, AllIcons.Nodes.NotFavoriteOnHover); getTemplatePresentation().setIcon(myIcon); getTemplatePresentation().setSelectedIcon(myHoveredIcon); diff --git a/plugins/git4idea/src/git4idea/ui/branch/GitBranchPopupActions.java b/plugins/git4idea/src/git4idea/ui/branch/GitBranchPopupActions.java index 3998b09c8ec1..b34781ade554 100644 --- a/plugins/git4idea/src/git4idea/ui/branch/GitBranchPopupActions.java +++ b/plugins/git4idea/src/git4idea/ui/branch/GitBranchPopupActions.java @@ -414,8 +414,8 @@ class GitBranchPopupActions { @NotNull String branchName, @NotNull GitRepository selectedRepository) { super(project, repositories, branchName, selectedRepository); - setIcons(DvcsImplIcons.CurrentBranchFavoriteLabel, DvcsImplIcons.CurrentBranchLabel, AllIcons.Vcs.FavoriteOnHover, - AllIcons.Vcs.NotFavoriteOnHover); + setIcons(DvcsImplIcons.CurrentBranchFavoriteLabel, DvcsImplIcons.CurrentBranchLabel, AllIcons.Nodes.FavoriteOnHover, + AllIcons.Nodes.NotFavoriteOnHover); } @NotNull diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/branch/HgBranchPopupActions.java b/plugins/hg4idea/src/org/zmlx/hg4idea/branch/HgBranchPopupActions.java index ab55296bbc01..0638387d28fe 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/branch/HgBranchPopupActions.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/branch/HgBranchPopupActions.java @@ -291,8 +291,8 @@ public class HgBranchPopupActions { public static class CurrentBranch extends BranchActions implements PopupElementWithAdditionalInfo { public CurrentBranch(@NotNull Project project, @NotNull List repositories, @NotNull String branchName) { super(project, repositories, branchName); - setIcons(DvcsImplIcons.CurrentBranchFavoriteLabel, DvcsImplIcons.CurrentBranchLabel, AllIcons.Vcs.FavoriteOnHover, - AllIcons.Vcs.NotFavoriteOnHover); + setIcons(DvcsImplIcons.CurrentBranchFavoriteLabel, DvcsImplIcons.CurrentBranchLabel, AllIcons.Nodes.FavoriteOnHover, + AllIcons.Nodes.NotFavoriteOnHover); } @NotNull @@ -338,8 +338,8 @@ public class HgBranchPopupActions { public CurrentActiveBookmark(@NotNull Project project, @NotNull List repositories, @NotNull String branchName) { super(project, repositories, branchName); - setIcons(DvcsImplIcons.CurrentBranchFavoriteLabel, DvcsImplIcons.CurrentBranchLabel, AllIcons.Vcs.FavoriteOnHover, - AllIcons.Vcs.NotFavoriteOnHover); + setIcons(DvcsImplIcons.CurrentBranchFavoriteLabel, DvcsImplIcons.CurrentBranchLabel, AllIcons.Nodes.FavoriteOnHover, + AllIcons.Nodes.NotFavoriteOnHover); } @NotNull