diff --git a/platform/icons/src/actions/closeNew.png b/platform/icons/compatibilityResources/actions/closeNew.png similarity index 100% rename from platform/icons/src/actions/closeNew.png rename to platform/icons/compatibilityResources/actions/closeNew.png diff --git a/platform/icons/src/actions/closeNew@2x.png b/platform/icons/compatibilityResources/actions/closeNew@2x.png similarity index 100% rename from platform/icons/src/actions/closeNew@2x.png rename to platform/icons/compatibilityResources/actions/closeNew@2x.png diff --git a/platform/icons/src/actions/closeNew@2x_dark.png b/platform/icons/compatibilityResources/actions/closeNew@2x_dark.png similarity index 100% rename from platform/icons/src/actions/closeNew@2x_dark.png rename to platform/icons/compatibilityResources/actions/closeNew@2x_dark.png diff --git a/platform/icons/src/actions/closeNewHovered.png b/platform/icons/compatibilityResources/actions/closeNewHovered.png similarity index 100% rename from platform/icons/src/actions/closeNewHovered.png rename to platform/icons/compatibilityResources/actions/closeNewHovered.png diff --git a/platform/icons/src/actions/closeNewHovered@2x.png b/platform/icons/compatibilityResources/actions/closeNewHovered@2x.png similarity index 100% rename from platform/icons/src/actions/closeNewHovered@2x.png rename to platform/icons/compatibilityResources/actions/closeNewHovered@2x.png diff --git a/platform/icons/src/actions/closeNewHovered@2x_dark.png b/platform/icons/compatibilityResources/actions/closeNewHovered@2x_dark.png similarity index 100% rename from platform/icons/src/actions/closeNewHovered@2x_dark.png rename to platform/icons/compatibilityResources/actions/closeNewHovered@2x_dark.png diff --git a/platform/icons/src/actions/closeNewHovered_dark.png b/platform/icons/compatibilityResources/actions/closeNewHovered_dark.png similarity index 100% rename from platform/icons/src/actions/closeNewHovered_dark.png rename to platform/icons/compatibilityResources/actions/closeNewHovered_dark.png diff --git a/platform/icons/src/actions/closeNew_dark.png b/platform/icons/compatibilityResources/actions/closeNew_dark.png similarity index 100% rename from platform/icons/src/actions/closeNew_dark.png rename to platform/icons/compatibilityResources/actions/closeNew_dark.png diff --git a/platform/icons/src/actions/cross.png b/platform/icons/compatibilityResources/actions/cross.png similarity index 100% rename from platform/icons/src/actions/cross.png rename to platform/icons/compatibilityResources/actions/cross.png diff --git a/platform/icons/src/actions/cross@2x.png b/platform/icons/compatibilityResources/actions/cross@2x.png similarity index 100% rename from platform/icons/src/actions/cross@2x.png rename to platform/icons/compatibilityResources/actions/cross@2x.png diff --git a/platform/icons/src/actions/cross@2x_dark.png b/platform/icons/compatibilityResources/actions/cross@2x_dark.png similarity index 100% rename from platform/icons/src/actions/cross@2x_dark.png rename to platform/icons/compatibilityResources/actions/cross@2x_dark.png diff --git a/platform/icons/src/actions/cross_dark.png b/platform/icons/compatibilityResources/actions/cross_dark.png similarity index 100% rename from platform/icons/src/actions/cross_dark.png rename to platform/icons/compatibilityResources/actions/cross_dark.png diff --git a/platform/icons/src/general/balloonClose.png b/platform/icons/compatibilityResources/general/balloonClose.png similarity index 100% rename from platform/icons/src/general/balloonClose.png rename to platform/icons/compatibilityResources/general/balloonClose.png diff --git a/platform/icons/src/general/balloonClose@2x.png b/platform/icons/compatibilityResources/general/balloonClose@2x.png similarity index 100% rename from platform/icons/src/general/balloonClose@2x.png rename to platform/icons/compatibilityResources/general/balloonClose@2x.png diff --git a/platform/icons/src/general/comboUpPassive.png b/platform/icons/compatibilityResources/general/comboUpPassive.png similarity index 100% rename from platform/icons/src/general/comboUpPassive.png rename to platform/icons/compatibilityResources/general/comboUpPassive.png diff --git a/platform/icons/src/general/comboUpPassive@2x.png b/platform/icons/compatibilityResources/general/comboUpPassive@2x.png similarity index 100% rename from platform/icons/src/general/comboUpPassive@2x.png rename to platform/icons/compatibilityResources/general/comboUpPassive@2x.png diff --git a/platform/icons/src/modules/deleteContentFolder.png b/platform/icons/compatibilityResources/modules/deleteContentFolder.png similarity index 100% rename from platform/icons/src/modules/deleteContentFolder.png rename to platform/icons/compatibilityResources/modules/deleteContentFolder.png diff --git a/platform/icons/src/modules/deleteContentFolder@2x.png b/platform/icons/compatibilityResources/modules/deleteContentFolder@2x.png similarity index 100% rename from platform/icons/src/modules/deleteContentFolder@2x.png rename to platform/icons/compatibilityResources/modules/deleteContentFolder@2x.png diff --git a/platform/icons/src/modules/deleteContentFolder@2x_dark.png b/platform/icons/compatibilityResources/modules/deleteContentFolder@2x_dark.png similarity index 100% rename from platform/icons/src/modules/deleteContentFolder@2x_dark.png rename to platform/icons/compatibilityResources/modules/deleteContentFolder@2x_dark.png diff --git a/platform/icons/src/modules/deleteContentFolderRollover.png b/platform/icons/compatibilityResources/modules/deleteContentFolderRollover.png similarity index 100% rename from platform/icons/src/modules/deleteContentFolderRollover.png rename to platform/icons/compatibilityResources/modules/deleteContentFolderRollover.png diff --git a/platform/icons/src/modules/deleteContentFolderRollover@2x.png b/platform/icons/compatibilityResources/modules/deleteContentFolderRollover@2x.png similarity index 100% rename from platform/icons/src/modules/deleteContentFolderRollover@2x.png rename to platform/icons/compatibilityResources/modules/deleteContentFolderRollover@2x.png diff --git a/platform/icons/src/modules/deleteContentFolderRollover@2x_dark.png b/platform/icons/compatibilityResources/modules/deleteContentFolderRollover@2x_dark.png similarity index 100% rename from platform/icons/src/modules/deleteContentFolderRollover@2x_dark.png rename to platform/icons/compatibilityResources/modules/deleteContentFolderRollover@2x_dark.png diff --git a/platform/icons/src/modules/deleteContentFolderRollover_dark.png b/platform/icons/compatibilityResources/modules/deleteContentFolderRollover_dark.png similarity index 100% rename from platform/icons/src/modules/deleteContentFolderRollover_dark.png rename to platform/icons/compatibilityResources/modules/deleteContentFolderRollover_dark.png diff --git a/platform/icons/src/modules/deleteContentFolder_dark.png b/platform/icons/compatibilityResources/modules/deleteContentFolder_dark.png similarity index 100% rename from platform/icons/src/modules/deleteContentFolder_dark.png rename to platform/icons/compatibilityResources/modules/deleteContentFolder_dark.png diff --git a/platform/icons/src/modules/deleteContentRoot.png b/platform/icons/compatibilityResources/modules/deleteContentRoot.png similarity index 100% rename from platform/icons/src/modules/deleteContentRoot.png rename to platform/icons/compatibilityResources/modules/deleteContentRoot.png diff --git a/platform/icons/src/modules/deleteContentRoot@2x.png b/platform/icons/compatibilityResources/modules/deleteContentRoot@2x.png similarity index 100% rename from platform/icons/src/modules/deleteContentRoot@2x.png rename to platform/icons/compatibilityResources/modules/deleteContentRoot@2x.png diff --git a/platform/icons/src/modules/deleteContentRoot@2x_dark.png b/platform/icons/compatibilityResources/modules/deleteContentRoot@2x_dark.png similarity index 100% rename from platform/icons/src/modules/deleteContentRoot@2x_dark.png rename to platform/icons/compatibilityResources/modules/deleteContentRoot@2x_dark.png diff --git a/platform/icons/src/modules/deleteContentRootRollover.png b/platform/icons/compatibilityResources/modules/deleteContentRootRollover.png similarity index 100% rename from platform/icons/src/modules/deleteContentRootRollover.png rename to platform/icons/compatibilityResources/modules/deleteContentRootRollover.png diff --git a/platform/icons/src/modules/deleteContentRootRollover@2x.png b/platform/icons/compatibilityResources/modules/deleteContentRootRollover@2x.png similarity index 100% rename from platform/icons/src/modules/deleteContentRootRollover@2x.png rename to platform/icons/compatibilityResources/modules/deleteContentRootRollover@2x.png diff --git a/platform/icons/src/modules/deleteContentRootRollover@2x_dark.png b/platform/icons/compatibilityResources/modules/deleteContentRootRollover@2x_dark.png similarity index 100% rename from platform/icons/src/modules/deleteContentRootRollover@2x_dark.png rename to platform/icons/compatibilityResources/modules/deleteContentRootRollover@2x_dark.png diff --git a/platform/icons/src/modules/deleteContentRootRollover_dark.png b/platform/icons/compatibilityResources/modules/deleteContentRootRollover_dark.png similarity index 100% rename from platform/icons/src/modules/deleteContentRootRollover_dark.png rename to platform/icons/compatibilityResources/modules/deleteContentRootRollover_dark.png diff --git a/platform/icons/src/modules/deleteContentRoot_dark.png b/platform/icons/compatibilityResources/modules/deleteContentRoot_dark.png similarity index 100% rename from platform/icons/src/modules/deleteContentRoot_dark.png rename to platform/icons/compatibilityResources/modules/deleteContentRoot_dark.png diff --git a/platform/icons/src/actions/icon-robots.txt b/platform/icons/src/actions/icon-robots.txt index edf786e451ef..092ca0ace128 100644 --- a/platform/icons/src/actions/icon-robots.txt +++ b/platform/icons/src/actions/icon-robots.txt @@ -41,3 +41,6 @@ deprecated: sortDesc.png -> /actions/moveDown.svg; to be removed in IDEA 2020 - deprecated: submit1.png -> /actions/setDefault.svg; to be removed in IDEA 2020 - use AllIcons.Actions.SetDefault deprecated: synchronizeFS.png -> /actions/refresh.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Refresh deprecated: up.png -> /general/arrowUp.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowUp +deprecated: cross.png -> /actions/close.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Close +deprecated: closeNew.png -> /actions/close.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Close +deprecated: closeNewHovered.png -> /actions/closeHovered.svg; to be removed in IDEA 2020 - use AllIcons.Actions.CloseHovered diff --git a/platform/icons/src/general/icon-robots.txt b/platform/icons/src/general/icon-robots.txt index 7e45853785d2..6c02a74e1565 100644 --- a/platform/icons/src/general/icon-robots.txt +++ b/platform/icons/src/general/icon-robots.txt @@ -92,8 +92,10 @@ deprecated: tab_grey_left.png; to be removed in IDEA 2020 deprecated: tab_grey_left_inner.png; to be removed in IDEA 2020 deprecated: tab_grey_right.png; to be removed in IDEA 2020 deprecated: tab_grey_right_inner.png; to be removed in IDEA 2020 -deprecated: TemplateProjectSettings.png -> /general/settings.svg; to be removed in IDEA 2020 - AllIcons.General.Settings -deprecated: TemplateProjectStructure.png -> /general/projectStructure.svg; to be removed in IDEA 2020 - AllIcons.General.ProjectStructure +deprecated: TemplateProjectSettings.png -> /general/settings.svg; to be removed in IDEA 2020 - use AllIcons.General.Settings +deprecated: TemplateProjectStructure.png -> /general/projectStructure.svg; to be removed in IDEA 2020 - use AllIcons.General.ProjectStructure deprecated: uninstallPlugin.png; to be removed in IDEA 2020 deprecated: webSettings.png; to be removed in IDEA 2020 deprecated: passwordLock.png; to be removed in IDEA 2020 +deprecated: comboUpPassive.png; to be removed in IDEA 2020 +deprecated: balloonClose.png -> /ide/notification/close.svg; to be removed in IDEA 2020 - use AllIcons.Ide.Notification.Close diff --git a/platform/icons/src/modules/icon-robots.txt b/platform/icons/src/modules/icon-robots.txt index a0d4a099f3b7..b329ec7b5731 100644 --- a/platform/icons/src/modules/icon-robots.txt +++ b/platform/icons/src/modules/icon-robots.txt @@ -9,3 +9,7 @@ deprecated: sourceFolder.svg -> /nodes/package.svg; to be removed in IDEA 2020 - deprecated: testSourceFolder.svg -> /nodes/testSourceFolder.svg; to be removed in IDEA 2020 - use AllIcons.Nodes.TestSourceFolder deprecated: webRoot.svg -> /nodes/webFolder.svg; to be removed in IDEA 2020 - use AllIcons.Nodes.WebFolder deprecated: sources.svg; to be removed in IDEA 2020 +deprecated: deleteContentFolder.png -> /action/close.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Close +deprecated: deleteContentFolderRollover.png -> /action/closeHovered.svg; to be removed in IDEA 2020 - use AllIcons.Actions.CloseHovered +deprecated: deleteContentRoot.png -> /action/close.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Close +deprecated: deleteContentRootRollover.png -> /action/closeHovered.svg; to be removed in IDEA 2020 - use AllIcons.Actions.CloseHovered diff --git a/platform/lang-impl/src/com/intellij/find/SearchReplaceComponent.java b/platform/lang-impl/src/com/intellij/find/SearchReplaceComponent.java index 8ad82d466862..30ef87e782b5 100644 --- a/platform/lang-impl/src/com/intellij/find/SearchReplaceComponent.java +++ b/platform/lang-impl/src/com/intellij/find/SearchReplaceComponent.java @@ -156,7 +156,7 @@ public class SearchReplaceComponent extends EditorHeaderComponent implements Dat searchToolbarWrapper1.setHorizontalSizeReferent(replaceToolbarWrapper1); - JLabel closeLabel = new JLabel(null, AllIcons.Actions.Cross, SwingConstants.RIGHT); + JLabel closeLabel = new JLabel(null, AllIcons.Actions.Close, SwingConstants.RIGHT); closeLabel.setBorder(JBUI.Borders.empty(5)); closeLabel.setVerticalAlignment(SwingConstants.TOP); closeLabel.addMouseListener(new MouseAdapter() { diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ContentRootPanel.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ContentRootPanel.java index d6174674eed2..db66604637d7 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ContentRootPanel.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ContentRootPanel.java @@ -142,8 +142,8 @@ public abstract class ContentRootPanel extends JPanel { if (getContentEntry().getFile() == null) { headerLabel.setForeground(JBColor.RED); } - final IconActionComponent deleteIconComponent = new IconActionComponent(AllIcons.Modules.DeleteContentRoot, - AllIcons.Modules.DeleteContentRootRollover, + final IconActionComponent deleteIconComponent = new IconActionComponent(AllIcons.Actions.Close, + AllIcons.Actions.CloseHovered, ProjectBundle.message("module.paths.remove.content.tooltip"), () -> myCallback.deleteContentEntry()); final ResizingWrapper wrapper = new ResizingWrapper(headerLabel); @@ -247,7 +247,7 @@ public abstract class ContentRootPanel extends JPanel { else { tooltipText = ProjectBundle.message("module.paths.remove.tooltip"); } - return new IconActionComponent(AllIcons.Modules.DeleteContentFolder, AllIcons.Modules.DeleteContentFolderRollover, tooltipText, + return new IconActionComponent(AllIcons.Actions.Close, AllIcons.Actions.CloseHovered, tooltipText, () -> myCallback.deleteContentFolder(getContentEntry(), folder)); } diff --git a/platform/lang-impl/src/com/intellij/ui/debugger/extensions/FocusDebugger.java b/platform/lang-impl/src/com/intellij/ui/debugger/extensions/FocusDebugger.java index 5486b3f28753..8cdd66b6d564 100644 --- a/platform/lang-impl/src/com/intellij/ui/debugger/extensions/FocusDebugger.java +++ b/platform/lang-impl/src/com/intellij/ui/debugger/extensions/FocusDebugger.java @@ -17,7 +17,10 @@ package com.intellij.ui.debugger.extensions; import com.intellij.icons.AllIcons; -import com.intellij.openapi.actionSystem.*; +import com.intellij.openapi.actionSystem.ActionManager; +import com.intellij.openapi.actionSystem.AnAction; +import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.DefaultActionGroup; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.ui.Splitter; import com.intellij.ui.ColoredListCellRenderer; @@ -94,7 +97,7 @@ public class FocusDebugger implements UiDebuggerExtension, PropertyChangeListene class ClearAction extends AnAction { ClearAction() { - super("Clear", "", AllIcons.Actions.Cross); + super("Clear", "", AllIcons.Actions.Close); } @Override diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java index 7f44fc29a56e..aeba17ba73be 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java @@ -435,8 +435,8 @@ public final class EditorTabbedContainer implements Disposable, CloseAction.Clos @Override public void update(@NotNull final AnActionEvent e) { - e.getPresentation().setIcon(AllIcons.Actions.CloseNew); - e.getPresentation().setHoveredIcon(AllIcons.Actions.CloseNewHovered); + e.getPresentation().setIcon(AllIcons.Actions.Close); + e.getPresentation().setHoveredIcon(AllIcons.Actions.CloseHovered); e.getPresentation().setVisible(UISettings.getInstance().getShowCloseButton()); e.getPresentation().setText("Close. Alt-click to close others."); } diff --git a/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java b/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java index 56f32ff3cb34..4f592cc4b9da 100644 --- a/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java +++ b/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java @@ -1040,7 +1040,7 @@ public class BalloonImpl implements Balloon, IdeTooltip.Ui { } public Icon getCloseButton() { - return AllIcons.General.BalloonClose; + return AllIcons.Ide.Notification.Close; } @Override diff --git a/platform/platform-resources/src/idea/LangActions.xml b/platform/platform-resources/src/idea/LangActions.xml index 1ef8ca217e89..0ee81a473fa9 100644 --- a/platform/platform-resources/src/idea/LangActions.xml +++ b/platform/platform-resources/src/idea/LangActions.xml @@ -881,10 +881,10 @@ icon="AllIcons.Debugger.RestoreLayout"/> - - - - + + + + diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java index ad07b3978ef0..5e2502fc68c2 100644 --- a/platform/util/src/com/intellij/icons/AllIcons.java +++ b/platform/util/src/com/intellij/icons/AllIcons.java @@ -28,13 +28,10 @@ public class AllIcons { public static final Icon Clear = IconLoader.getIcon("/actions/clear.png"); // 16x16 public static final Icon Close = IconLoader.getIcon("/actions/close.svg"); // 16x16 public static final Icon CloseHovered = IconLoader.getIcon("/actions/closeHovered.svg"); // 16x16 - public static final Icon CloseNew = IconLoader.getIcon("/actions/closeNew.png"); // 16x16 - public static final Icon CloseNewHovered = IconLoader.getIcon("/actions/closeNewHovered.png"); // 16x16 public static final Icon Collapseall = IconLoader.getIcon("/actions/collapseall.svg"); // 16x16 public static final Icon Commit = IconLoader.getIcon("/actions/commit.svg"); // 16x16 public static final Icon Compile = IconLoader.getIcon("/actions/compile.svg"); // 16x16 public static final Icon Copy = IconLoader.getIcon("/actions/copy.svg"); // 16x16 - public static final Icon Cross = IconLoader.getIcon("/actions/cross.png"); // 12x12 public static final Icon DiagramDiff = IconLoader.getIcon("/actions/diagramDiff.svg"); // 16x16 public static final Icon Diff = IconLoader.getIcon("/actions/diff.svg"); // 16x16 public static final Icon DiffWithClipboard = IconLoader.getIcon("/actions/diffWithClipboard.svg"); // 16x16 @@ -168,6 +165,16 @@ public class AllIcons { @Deprecated public static final Icon CheckedGrey = AllIcons.Actions.Checked; + /** @deprecated to be removed in IDEA 2020 - use AllIcons.Actions.Close */ + @SuppressWarnings("unused") + @Deprecated + public static final Icon CloseNew = AllIcons.Actions.Close; + + /** @deprecated to be removed in IDEA 2020 - use AllIcons.Actions.CloseHovered */ + @SuppressWarnings("unused") + @Deprecated + public static final Icon CloseNewHovered = AllIcons.Actions.CloseHovered; + /** @deprecated to be removed in IDEA 2020 - use AllIcons.Actions.IntentionBulb */ @SuppressWarnings("unused") @Deprecated @@ -178,6 +185,11 @@ public class AllIcons { @Deprecated public static final Icon CreatePatch = IconLoader.getIcon("/actions/createPatch.png"); + /** @deprecated to be removed in IDEA 2020 - use AllIcons.Actions.Close */ + @SuppressWarnings("unused") + @Deprecated + public static final Icon Cross = AllIcons.Actions.Close; + /** @deprecated to be removed in IDEA 2020 - use AllIcons.Actions.Cancel */ @SuppressWarnings("unused") @Deprecated @@ -816,14 +828,12 @@ public class AllIcons { public static final Icon AutoscrollFromSource = IconLoader.getIcon("/general/autoscrollFromSource.svg"); // 16x16 public static final Icon AutoscrollToSource = IconLoader.getIcon("/general/autoscrollToSource.svg"); // 16x16 public static final Icon Balloon = IconLoader.getIcon("/general/balloon.svg"); // 16x16 - public static final Icon BalloonClose = IconLoader.getIcon("/general/balloonClose.png"); // 32x32 public static final Icon BalloonError = IconLoader.getIcon("/general/balloonError.svg"); // 16x16 public static final Icon BalloonInformation = IconLoader.getIcon("/general/balloonInformation.svg"); // 16x16 public static final Icon BalloonWarning = IconLoader.getIcon("/general/balloonWarning.svg"); // 16x16 public static final Icon BalloonWarning12 = IconLoader.getIcon("/general/balloonWarning12.svg"); // 12x12 public static final Icon CollapseComponent = IconLoader.getIcon("/general/collapseComponent.svg"); // 12x12 public static final Icon CollapseComponentHover = IconLoader.getIcon("/general/collapseComponentHover.svg"); // 12x12 - public static final Icon ComboUpPassive = IconLoader.getIcon("/general/comboUpPassive.png"); // 16x16 public static final Icon ContextHelp = IconLoader.getIcon("/general/contextHelp.svg"); // 16x16 public static final Icon CopyHovered = IconLoader.getIcon("/general/copyHovered.svg"); // 16x16 public static final Icon Divider = IconLoader.getIcon("/general/divider.svg"); // 2x19 @@ -927,6 +937,11 @@ public class AllIcons { @Deprecated public static final Icon AutohideOffPressed = IconLoader.getIcon("/general/pin_tab.svg"); // 16x16 + /** @deprecated to be removed in IDEA 2020 - use AllIcons.Ide.Notification.Close */ + @SuppressWarnings("unused") + @Deprecated + public static final Icon BalloonClose = AllIcons.Ide.Notification.Close; + /** @deprecated to be removed in IDEA 2020 */ @SuppressWarnings("unused") @Deprecated @@ -992,6 +1007,11 @@ public class AllIcons { @Deprecated public static final Icon ComboBoxButtonArrow = AllIcons.General.ArrowDown; + /** @deprecated to be removed in IDEA 2020 */ + @SuppressWarnings("unused") + @Deprecated + public static final Icon ComboUpPassive = IconLoader.getIcon("/general/comboUpPassive.png"); + /** @deprecated to be removed in IDEA 2020 */ @SuppressWarnings("unused") @Deprecated @@ -1377,15 +1397,15 @@ public class AllIcons { @Deprecated public static final Icon Tab_grey_right_inner = IconLoader.getIcon("/general/tab_grey_right_inner.png"); - /** @deprecated to be removed in IDEA 2020 - AllIcons.General.Settings */ + /** @deprecated to be removed in IDEA 2020 - use AllIcons.General.Settings */ @SuppressWarnings("unused") @Deprecated - public static final Icon TemplateProjectSettings = IconLoader.getIcon("/general/settings.svg"); // 16x16 + public static final Icon TemplateProjectSettings = AllIcons.General.Settings; - /** @deprecated to be removed in IDEA 2020 - AllIcons.General.ProjectStructure */ + /** @deprecated to be removed in IDEA 2020 - use AllIcons.General.ProjectStructure */ @SuppressWarnings("unused") @Deprecated - public static final Icon TemplateProjectStructure = IconLoader.getIcon("/general/projectStructure.svg"); // 16x16 + public static final Icon TemplateProjectStructure = AllIcons.General.ProjectStructure; /** @deprecated to be removed in IDEA 2020 */ @SuppressWarnings("unused") @@ -1694,10 +1714,6 @@ public class AllIcons { public final static class Modules { public static final Icon AddExcludedRoot = IconLoader.getIcon("/modules/addExcludedRoot.svg"); // 16x16 public static final Icon Annotation = IconLoader.getIcon("/modules/annotation.svg"); // 16x16 - public static final Icon DeleteContentFolder = IconLoader.getIcon("/modules/deleteContentFolder.png"); // 9x9 - public static final Icon DeleteContentFolderRollover = IconLoader.getIcon("/modules/deleteContentFolderRollover.png"); // 9x9 - public static final Icon DeleteContentRoot = IconLoader.getIcon("/modules/deleteContentRoot.png"); // 9x9 - public static final Icon DeleteContentRootRollover = IconLoader.getIcon("/modules/deleteContentRootRollover.png"); // 9x9 public static final Icon EditFolder = IconLoader.getIcon("/modules/editFolder.svg"); // 16x16 public static final Icon ExcludedGeneratedRoot = IconLoader.getIcon("/modules/excludedGeneratedRoot.svg"); // 16x16 public static final Icon ExcludeRoot = IconLoader.getIcon("/modules/excludeRoot.svg"); // 16x16 @@ -1728,6 +1744,26 @@ public class AllIcons { @Deprecated public static final Icon AddContentEntry = AllIcons.General.Add; + /** @deprecated to be removed in IDEA 2020 - use AllIcons.Actions.Close */ + @SuppressWarnings("unused") + @Deprecated + public static final Icon DeleteContentFolder = AllIcons.Actions.Close; + + /** @deprecated to be removed in IDEA 2020 - use AllIcons.Actions.CloseHovered */ + @SuppressWarnings("unused") + @Deprecated + public static final Icon DeleteContentFolderRollover = AllIcons.Actions.CloseHovered; + + /** @deprecated to be removed in IDEA 2020 - use AllIcons.Actions.Close */ + @SuppressWarnings("unused") + @Deprecated + public static final Icon DeleteContentRoot = AllIcons.Actions.Close; + + /** @deprecated to be removed in IDEA 2020 - use AllIcons.Actions.CloseHovered */ + @SuppressWarnings("unused") + @Deprecated + public static final Icon DeleteContentRootRollover = AllIcons.Actions.CloseHovered; + /** @deprecated to be removed in IDEA 2020 - use AllIcons.Actions.Edit */ @SuppressWarnings("unused") @Deprecated diff --git a/platform/util/src/com/intellij/util/ui/JBUI.java b/platform/util/src/com/intellij/util/ui/JBUI.java index 09f07f9702c8..0af5006d1d74 100644 --- a/platform/util/src/com/intellij/util/ui/JBUI.java +++ b/platform/util/src/com/intellij/util/ui/JBUI.java @@ -1646,8 +1646,8 @@ public class JBUI { @NotNull public static Icon closeTabIcon(boolean hovered) { - return hovered ? getIcon("ToolWindow.header.closeButton.hovered.icon", AllIcons.Actions.CloseNewHovered) - : getIcon("ToolWindow.header.closeButton.icon", AllIcons.Actions.CloseNew); + return hovered ? getIcon("ToolWindow.header.closeButton.hovered.icon", AllIcons.Actions.CloseHovered) + : getIcon("ToolWindow.header.closeButton.icon", AllIcons.Actions.Close); } @NotNull