diff --git a/platform/icons/src/objectBrowser/icon-robots.txt b/platform/icons/src/objectBrowser/icon-robots.txt new file mode 100644 index 000000000000..4138be170f75 --- /dev/null +++ b/platform/icons/src/objectBrowser/icon-robots.txt @@ -0,0 +1 @@ +deprecated: showModules.png -> /actions/GroupByModule.svg; to be removed in IDEA 2020 - use AllIcons.Actions.GroupByModule diff --git a/platform/icons/src/objectBrowser/showModules.png b/platform/icons/src/objectBrowser/showModules.png index 0e3b650e0f68..044483bedfa9 100644 Binary files a/platform/icons/src/objectBrowser/showModules.png and b/platform/icons/src/objectBrowser/showModules.png differ diff --git a/platform/icons/src/objectBrowser/showModules@2x.png b/platform/icons/src/objectBrowser/showModules@2x.png deleted file mode 100644 index 975916edf6a1..000000000000 Binary files a/platform/icons/src/objectBrowser/showModules@2x.png and /dev/null differ diff --git a/platform/icons/src/objectBrowser/showModules@2x_dark.png b/platform/icons/src/objectBrowser/showModules@2x_dark.png deleted file mode 100644 index 57d004850b05..000000000000 Binary files a/platform/icons/src/objectBrowser/showModules@2x_dark.png and /dev/null differ diff --git a/platform/icons/src/objectBrowser/showModules_dark.png b/platform/icons/src/objectBrowser/showModules_dark.png deleted file mode 100644 index 1d2e1c33e077..000000000000 Binary files a/platform/icons/src/objectBrowser/showModules_dark.png and /dev/null differ diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ShowModulesAction.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ShowModulesAction.java index f9072a6031c3..394438214007 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ShowModulesAction.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ShowModulesAction.java @@ -35,7 +35,7 @@ public abstract class ShowModulesAction extends ToggleAction { public ShowModulesAction(Project project) { super(IdeBundle.message("action.show.modules"), IdeBundle.message("action.description.show.modules"), - AllIcons.ObjectBrowser.ShowModules); + AllIcons.Actions.GroupByModule); myProject = project; } diff --git a/platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java b/platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java index 57632632fa8b..67bd00cdd187 100644 --- a/platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java +++ b/platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java @@ -594,7 +594,7 @@ abstract class TodoPanel extends SimpleToolWindowPanel implements OccurenceNavig private final class MyShowModulesAction extends ToggleAction { MyShowModulesAction() { - super(IdeBundle.message("action.group.by.modules"), null, AllIcons.ObjectBrowser.ShowModules); + super(IdeBundle.message("action.group.by.modules"), null, AllIcons.Actions.GroupByModule); } @Override diff --git a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ShowModulesAction.java b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ShowModulesAction.java index 2619e19f992e..f43df7459f27 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ShowModulesAction.java +++ b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ShowModulesAction.java @@ -27,7 +27,7 @@ public final class ShowModulesAction extends ToggleAction { public ShowModulesAction(final Runnable update) { super(IdeBundle.message("action.show.modules"), - IdeBundle.message("action.description.show.modules"), AllIcons.ObjectBrowser.ShowModules); + IdeBundle.message("action.description.show.modules"), AllIcons.Actions.GroupByModule); myUpdate = update; } diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java index 5f281d39ed8b..c6c6eebe8b0d 100644 --- a/platform/util/src/com/intellij/icons/AllIcons.java +++ b/platform/util/src/com/intellij/icons/AllIcons.java @@ -1378,7 +1378,11 @@ public class AllIcons { public static final Icon ShowEditorHighlighting = IconLoader.getIcon("/objectBrowser/showEditorHighlighting.png"); // 16x16 public static final Icon ShowLibraryContents = IconLoader.getIcon("/objectBrowser/showLibraryContents.png"); // 16x16 public static final Icon ShowMembers = IconLoader.getIcon("/objectBrowser/showMembers.png"); // 16x16 - public static final Icon ShowModules = IconLoader.getIcon("/objectBrowser/showModules.png"); // 16x16 + + /** @deprecated to be removed in IDEA 2020 - use AllIcons.Actions.GroupByModule */ + @SuppressWarnings("unused") + @Deprecated + public static final Icon ShowModules = IconLoader.getIcon("/actions/GroupByModule.svg"); // 16x16 public static final Icon SortByType = IconLoader.getIcon("/objectBrowser/sortByType.png"); // 16x16 public static final Icon Sorted = IconLoader.getIcon("/objectBrowser/sorted.svg"); // 16x16 public static final Icon SortedByUsage = IconLoader.getIcon("/objectBrowser/sortedByUsage.png"); // 16x16 diff --git a/platform/util/src/com/intellij/openapi/util/DeprecatedDuplicatesIconPathPatcher.java b/platform/util/src/com/intellij/openapi/util/DeprecatedDuplicatesIconPathPatcher.java index 9f37f3fe1234..8f781ac033fd 100644 --- a/platform/util/src/com/intellij/openapi/util/DeprecatedDuplicatesIconPathPatcher.java +++ b/platform/util/src/com/intellij/openapi/util/DeprecatedDuplicatesIconPathPatcher.java @@ -37,6 +37,9 @@ public class DeprecatedDuplicatesIconPathPatcher extends IconPathPatcher { ourDeprecatedIconsReplacements.put("/hierarchy/base.png", "AllIcons.Actions.Forward"); ourDeprecatedIconsReplacements.put("/hierarchy/base.svg", "AllIcons.Actions.Forward"); + ourDeprecatedIconsReplacements.put("/objectBrowser/showModules.png", "AllIcons.Actions.GroupByModule"); + ourDeprecatedIconsReplacements.put("/objectBrowser/showModules.svg", "AllIcons.Actions.GroupByModule"); + ourDeprecatedIconsReplacements.put("/toolbar/folders.png", "AllIcons.Actions.GroupByPackage"); ourDeprecatedIconsReplacements.put("/toolbar/folders.svg", "AllIcons.Actions.GroupByPackage");