From 59d8a18fb6f351e2a18a507bd992129c6fce0eb3 Mon Sep 17 00:00:00 2001 From: Kirill Kirichenko Date: Fri, 7 Sep 2018 16:48:49 +0300 Subject: [PATCH] IDEA-197316 refresh and remove outdated arrows icons in /general --- .../VisibilityModifierChooser.java | 4 +- .../src/com/intellij/util/PlatformIcons.java | 2 +- .../general/arrowDown.png | Bin .../general/arrowDown@2x.png | Bin .../general/arrowDown@2x_dark.png | Bin .../general/arrowDown_dark.png | Bin .../general/arrowDown_white.png | Bin .../general/arrowDown_white@2x.png | Bin .../general/combo.png | Bin .../general/combo2.png | Bin .../general/combo2@2x.png | Bin .../general/combo2@2x_dark.png | Bin .../general/combo2_dark.png | Bin .../general/combo3.png | Bin .../general/combo3@2x.png | Bin .../general/combo3@2x_dark.png | Bin .../general/combo3_dark.png | Bin .../general/combo@2x.png | Bin .../general/comboArrow.png | Bin .../general/comboArrow@2x.png | Bin .../general/comboArrow@2x_dark.png | Bin .../general/comboArrowDown.png | Bin .../general/comboArrowDown@2x.png | Bin .../general/comboArrowDown@2x_dark.png | Bin .../general/comboArrowDown_dark.png | Bin .../general/comboArrowLeft.png | Bin .../general/comboArrowLeft@2x.png | Bin .../general/comboArrowLeft@2x_dark.png | Bin .../general/comboArrowLeftPassive.png | Bin .../general/comboArrowLeftPassive@2x.png | Bin .../general/comboArrowLeftPassive@2x_dark.png | Bin .../general/comboArrowLeftPassive_dark.png | Bin .../general/comboArrowLeft_dark.png | Bin .../general/comboArrowRight.png | Bin .../general/comboArrowRight@2x.png | Bin .../general/comboArrowRight@2x_dark.png | Bin .../general/comboArrowRightPassive.png | Bin .../general/comboArrowRightPassive@2x.png | Bin .../comboArrowRightPassive@2x_dark.png | Bin .../general/comboArrowRightPassive_dark.png | Bin .../general/comboArrowRight_dark.png | Bin .../general/comboArrow_dark.png | Bin .../general/comboBoxButtonArrow.png | Bin .../general/comboBoxButtonArrow@2x.png | Bin .../general/splitCenterH.png | Bin .../general/splitCenterH@2x.png | Bin .../general/splitCenterH@2x_dark.png | Bin .../general/splitCenterH_dark.png | Bin .../general/splitCenterV.png | Bin .../general/splitCenterV@2x.png | Bin .../general/splitCenterV@2x_dark.png | Bin .../general/splitCenterV_dark.png | Bin .../general/splitDown.png | Bin .../general/splitDown@2x.png | Bin .../general/splitDown@2x_dark.png | Bin .../general/splitDown_dark.png | Bin .../general/splitLeft.png | Bin .../general/splitLeft@2x.png | Bin .../general/splitLeft@2x_dark.png | Bin .../general/splitLeft_dark.png | Bin .../general/splitRight.png | Bin .../general/splitRight@2x.png | Bin .../general/splitRight@2x_dark.png | Bin .../general/splitRight_dark.png | Bin .../general/splitUp.png | Bin .../general/splitUp@2x.png | Bin .../general/splitUp@2x_dark.png | Bin .../general/splitUp_dark.png | Bin platform/icons/src/actions/icon-robots.txt | 9 +- platform/icons/src/general/arrowDown.svg | 3 + platform/icons/src/general/arrowDownSmall.svg | 3 + .../icons/src/general/arrowDownSmall_dark.svg | 3 + platform/icons/src/general/arrowDown_dark.svg | 3 + platform/icons/src/general/arrowLeft.svg | 3 + platform/icons/src/general/arrowLeft_dark.svg | 3 + platform/icons/src/general/arrowRight.svg | 3 + .../icons/src/general/arrowRight_dark.svg | 3 + .../icons/src/general/arrowSplitCenterH.svg | 6 + .../src/general/arrowSplitCenterH_dark.svg | 6 + .../icons/src/general/arrowSplitCenterV.svg | 6 + .../src/general/arrowSplitCenterV_dark.svg | 6 + platform/icons/src/general/arrowUp.svg | 3 + platform/icons/src/general/arrowUp_dark.svg | 3 + platform/icons/src/general/icon-robots.txt | 17 +++ .../actions/ShowUsagesTableCellRenderer.java | 5 +- .../com/intellij/tools/ToolEditorDialog.java | 4 +- .../actionSystem/ex/ComboBoxAction.java | 5 +- .../com/intellij/openapi/ui/JBPopupMenu.java | 6 +- .../openapi/ui/ThreeComponentsSplitter.java | 8 +- .../ui/components/JBComboBoxLabel.java | 2 +- .../ide/plugins/PluginManagerMain.java | 4 +- .../intellij/ide/ui/laf/LafManagerImpl.java | 2 +- .../ide/ui/laf/darcula/darcula.properties | 2 +- .../ide/ui/laf/intellijlaf.properties | 2 +- .../ide/ui/laf/intellijlaf_native.properties | 2 +- .../openapi/wm/impl/content/ComboIcon.java | 2 +- .../openapi/wm/impl/content/MoreIcon.java | 5 +- .../impl/welcomeScreen/FlatWelcomeFrame.java | 2 +- .../com/intellij/ui/HideableDecorator.java | 2 +- .../ui/SplitterWithSecondHideable.java | 7 +- .../intellij/ui/components/JBMovePanel.java | 8 +- .../util/src/com/intellij/icons/AllIcons.java | 126 ++++++++++++++---- .../src/com/intellij/openapi/ui/Splitter.java | 6 +- .../util/src/com/intellij/util/ui/JBUI.java | 4 +- .../editor/panels/code/IpnbCodePanel.java | 2 +- 105 files changed, 222 insertions(+), 70 deletions(-) rename platform/icons/{src => compatibilityResources}/general/arrowDown.png (100%) rename platform/icons/{src => compatibilityResources}/general/arrowDown@2x.png (100%) rename platform/icons/{src => compatibilityResources}/general/arrowDown@2x_dark.png (100%) rename platform/icons/{src => compatibilityResources}/general/arrowDown_dark.png (100%) rename platform/icons/{src => compatibilityResources}/general/arrowDown_white.png (100%) rename platform/icons/{src => compatibilityResources}/general/arrowDown_white@2x.png (100%) rename platform/icons/{src => compatibilityResources}/general/combo.png (100%) rename platform/icons/{src => compatibilityResources}/general/combo2.png (100%) rename platform/icons/{src => compatibilityResources}/general/combo2@2x.png (100%) rename platform/icons/{src => compatibilityResources}/general/combo2@2x_dark.png (100%) rename platform/icons/{src => compatibilityResources}/general/combo2_dark.png (100%) rename platform/icons/{src => compatibilityResources}/general/combo3.png (100%) rename platform/icons/{src => compatibilityResources}/general/combo3@2x.png (100%) rename platform/icons/{src => compatibilityResources}/general/combo3@2x_dark.png (100%) rename platform/icons/{src => compatibilityResources}/general/combo3_dark.png (100%) rename platform/icons/{src => compatibilityResources}/general/combo@2x.png (100%) rename platform/icons/{src => compatibilityResources}/general/comboArrow.png (100%) rename platform/icons/{src => compatibilityResources}/general/comboArrow@2x.png (100%) rename platform/icons/{src => compatibilityResources}/general/comboArrow@2x_dark.png (100%) rename platform/icons/{src => compatibilityResources}/general/comboArrowDown.png (100%) rename platform/icons/{src => compatibilityResources}/general/comboArrowDown@2x.png (100%) rename platform/icons/{src => compatibilityResources}/general/comboArrowDown@2x_dark.png (100%) rename platform/icons/{src => compatibilityResources}/general/comboArrowDown_dark.png (100%) rename platform/icons/{src => compatibilityResources}/general/comboArrowLeft.png (100%) rename platform/icons/{src => compatibilityResources}/general/comboArrowLeft@2x.png (100%) rename platform/icons/{src => compatibilityResources}/general/comboArrowLeft@2x_dark.png (100%) rename platform/icons/{src => compatibilityResources}/general/comboArrowLeftPassive.png (100%) rename platform/icons/{src => compatibilityResources}/general/comboArrowLeftPassive@2x.png (100%) rename platform/icons/{src => compatibilityResources}/general/comboArrowLeftPassive@2x_dark.png (100%) rename platform/icons/{src => compatibilityResources}/general/comboArrowLeftPassive_dark.png (100%) rename platform/icons/{src => compatibilityResources}/general/comboArrowLeft_dark.png (100%) rename platform/icons/{src => compatibilityResources}/general/comboArrowRight.png (100%) rename platform/icons/{src => compatibilityResources}/general/comboArrowRight@2x.png (100%) rename platform/icons/{src => compatibilityResources}/general/comboArrowRight@2x_dark.png (100%) rename platform/icons/{src => compatibilityResources}/general/comboArrowRightPassive.png (100%) rename platform/icons/{src => compatibilityResources}/general/comboArrowRightPassive@2x.png (100%) rename platform/icons/{src => compatibilityResources}/general/comboArrowRightPassive@2x_dark.png (100%) rename platform/icons/{src => compatibilityResources}/general/comboArrowRightPassive_dark.png (100%) rename platform/icons/{src => compatibilityResources}/general/comboArrowRight_dark.png (100%) rename platform/icons/{src => compatibilityResources}/general/comboArrow_dark.png (100%) rename platform/icons/{src => compatibilityResources}/general/comboBoxButtonArrow.png (100%) rename platform/icons/{src => compatibilityResources}/general/comboBoxButtonArrow@2x.png (100%) rename platform/icons/{src => compatibilityResources}/general/splitCenterH.png (100%) rename platform/icons/{src => compatibilityResources}/general/splitCenterH@2x.png (100%) rename platform/icons/{src => compatibilityResources}/general/splitCenterH@2x_dark.png (100%) rename platform/icons/{src => compatibilityResources}/general/splitCenterH_dark.png (100%) rename platform/icons/{src => compatibilityResources}/general/splitCenterV.png (100%) rename platform/icons/{src => compatibilityResources}/general/splitCenterV@2x.png (100%) rename platform/icons/{src => compatibilityResources}/general/splitCenterV@2x_dark.png (100%) rename platform/icons/{src => compatibilityResources}/general/splitCenterV_dark.png (100%) rename platform/icons/{src => compatibilityResources}/general/splitDown.png (100%) rename platform/icons/{src => compatibilityResources}/general/splitDown@2x.png (100%) rename platform/icons/{src => compatibilityResources}/general/splitDown@2x_dark.png (100%) rename platform/icons/{src => compatibilityResources}/general/splitDown_dark.png (100%) rename platform/icons/{src => compatibilityResources}/general/splitLeft.png (100%) rename platform/icons/{src => compatibilityResources}/general/splitLeft@2x.png (100%) rename platform/icons/{src => compatibilityResources}/general/splitLeft@2x_dark.png (100%) rename platform/icons/{src => compatibilityResources}/general/splitLeft_dark.png (100%) rename platform/icons/{src => compatibilityResources}/general/splitRight.png (100%) rename platform/icons/{src => compatibilityResources}/general/splitRight@2x.png (100%) rename platform/icons/{src => compatibilityResources}/general/splitRight@2x_dark.png (100%) rename platform/icons/{src => compatibilityResources}/general/splitRight_dark.png (100%) rename platform/icons/{src => compatibilityResources}/general/splitUp.png (100%) rename platform/icons/{src => compatibilityResources}/general/splitUp@2x.png (100%) rename platform/icons/{src => compatibilityResources}/general/splitUp@2x_dark.png (100%) rename platform/icons/{src => compatibilityResources}/general/splitUp_dark.png (100%) create mode 100644 platform/icons/src/general/arrowDown.svg create mode 100644 platform/icons/src/general/arrowDownSmall.svg create mode 100644 platform/icons/src/general/arrowDownSmall_dark.svg create mode 100644 platform/icons/src/general/arrowDown_dark.svg create mode 100644 platform/icons/src/general/arrowLeft.svg create mode 100644 platform/icons/src/general/arrowLeft_dark.svg create mode 100644 platform/icons/src/general/arrowRight.svg create mode 100644 platform/icons/src/general/arrowRight_dark.svg create mode 100644 platform/icons/src/general/arrowSplitCenterH.svg create mode 100644 platform/icons/src/general/arrowSplitCenterH_dark.svg create mode 100644 platform/icons/src/general/arrowSplitCenterV.svg create mode 100644 platform/icons/src/general/arrowSplitCenterV_dark.svg create mode 100644 platform/icons/src/general/arrowUp.svg create mode 100644 platform/icons/src/general/arrowUp_dark.svg diff --git a/java/java-impl/src/com/intellij/codeInspection/unusedSymbol/VisibilityModifierChooser.java b/java/java-impl/src/com/intellij/codeInspection/unusedSymbol/VisibilityModifierChooser.java index f95fecc8f388..e9d0173e7320 100644 --- a/java/java-impl/src/com/intellij/codeInspection/unusedSymbol/VisibilityModifierChooser.java +++ b/java/java-impl/src/com/intellij/codeInspection/unusedSymbol/VisibilityModifierChooser.java @@ -48,8 +48,8 @@ public class VisibilityModifierChooser extends JLabel implements UserActivityPro @NotNull Consumer modifierChangedConsumer, @NotNull String[] modifiers) { myCanBeEnabled = canBeEnabled; - setIcon(AllIcons.General.Combo2); - setDisabledIcon(AllIcons.General.Combo2); + setIcon(AllIcons.General.ArrowDown); + setDisabledIcon(AllIcons.General.ArrowDown); setIconTextGap(0); setHorizontalTextPosition(SwingConstants.LEFT); myCurrentModifier = modifier; diff --git a/platform/core-api/src/com/intellij/util/PlatformIcons.java b/platform/core-api/src/com/intellij/util/PlatformIcons.java index 84bbd3fd7e6a..e129118caf26 100644 --- a/platform/core-api/src/com/intellij/util/PlatformIcons.java +++ b/platform/core-api/src/com/intellij/util/PlatformIcons.java @@ -93,7 +93,7 @@ public interface PlatformIcons { Icon UP_DOWN_ARROWS = AllIcons.Ide.UpDown; - Icon COMBOBOX_ARROW_ICON = AllIcons.General.ComboArrow; + Icon COMBOBOX_ARROW_ICON = AllIcons.General.ArrowDown; Icon EXPORT_ICON = AllIcons.ToolbarDecorator.Export; Icon IMPORT_ICON = AllIcons.ToolbarDecorator.Import; diff --git a/platform/icons/src/general/arrowDown.png b/platform/icons/compatibilityResources/general/arrowDown.png similarity index 100% rename from platform/icons/src/general/arrowDown.png rename to platform/icons/compatibilityResources/general/arrowDown.png diff --git a/platform/icons/src/general/arrowDown@2x.png b/platform/icons/compatibilityResources/general/arrowDown@2x.png similarity index 100% rename from platform/icons/src/general/arrowDown@2x.png rename to platform/icons/compatibilityResources/general/arrowDown@2x.png diff --git a/platform/icons/src/general/arrowDown@2x_dark.png b/platform/icons/compatibilityResources/general/arrowDown@2x_dark.png similarity index 100% rename from platform/icons/src/general/arrowDown@2x_dark.png rename to platform/icons/compatibilityResources/general/arrowDown@2x_dark.png diff --git a/platform/icons/src/general/arrowDown_dark.png b/platform/icons/compatibilityResources/general/arrowDown_dark.png similarity index 100% rename from platform/icons/src/general/arrowDown_dark.png rename to platform/icons/compatibilityResources/general/arrowDown_dark.png diff --git a/platform/icons/src/general/arrowDown_white.png b/platform/icons/compatibilityResources/general/arrowDown_white.png similarity index 100% rename from platform/icons/src/general/arrowDown_white.png rename to platform/icons/compatibilityResources/general/arrowDown_white.png diff --git a/platform/icons/src/general/arrowDown_white@2x.png b/platform/icons/compatibilityResources/general/arrowDown_white@2x.png similarity index 100% rename from platform/icons/src/general/arrowDown_white@2x.png rename to platform/icons/compatibilityResources/general/arrowDown_white@2x.png diff --git a/platform/icons/src/general/combo.png b/platform/icons/compatibilityResources/general/combo.png similarity index 100% rename from platform/icons/src/general/combo.png rename to platform/icons/compatibilityResources/general/combo.png diff --git a/platform/icons/src/general/combo2.png b/platform/icons/compatibilityResources/general/combo2.png similarity index 100% rename from platform/icons/src/general/combo2.png rename to platform/icons/compatibilityResources/general/combo2.png diff --git a/platform/icons/src/general/combo2@2x.png b/platform/icons/compatibilityResources/general/combo2@2x.png similarity index 100% rename from platform/icons/src/general/combo2@2x.png rename to platform/icons/compatibilityResources/general/combo2@2x.png diff --git a/platform/icons/src/general/combo2@2x_dark.png b/platform/icons/compatibilityResources/general/combo2@2x_dark.png similarity index 100% rename from platform/icons/src/general/combo2@2x_dark.png rename to platform/icons/compatibilityResources/general/combo2@2x_dark.png diff --git a/platform/icons/src/general/combo2_dark.png b/platform/icons/compatibilityResources/general/combo2_dark.png similarity index 100% rename from platform/icons/src/general/combo2_dark.png rename to platform/icons/compatibilityResources/general/combo2_dark.png diff --git a/platform/icons/src/general/combo3.png b/platform/icons/compatibilityResources/general/combo3.png similarity index 100% rename from platform/icons/src/general/combo3.png rename to platform/icons/compatibilityResources/general/combo3.png diff --git a/platform/icons/src/general/combo3@2x.png b/platform/icons/compatibilityResources/general/combo3@2x.png similarity index 100% rename from platform/icons/src/general/combo3@2x.png rename to platform/icons/compatibilityResources/general/combo3@2x.png diff --git a/platform/icons/src/general/combo3@2x_dark.png b/platform/icons/compatibilityResources/general/combo3@2x_dark.png similarity index 100% rename from platform/icons/src/general/combo3@2x_dark.png rename to platform/icons/compatibilityResources/general/combo3@2x_dark.png diff --git a/platform/icons/src/general/combo3_dark.png b/platform/icons/compatibilityResources/general/combo3_dark.png similarity index 100% rename from platform/icons/src/general/combo3_dark.png rename to platform/icons/compatibilityResources/general/combo3_dark.png diff --git a/platform/icons/src/general/combo@2x.png b/platform/icons/compatibilityResources/general/combo@2x.png similarity index 100% rename from platform/icons/src/general/combo@2x.png rename to platform/icons/compatibilityResources/general/combo@2x.png diff --git a/platform/icons/src/general/comboArrow.png b/platform/icons/compatibilityResources/general/comboArrow.png similarity index 100% rename from platform/icons/src/general/comboArrow.png rename to platform/icons/compatibilityResources/general/comboArrow.png diff --git a/platform/icons/src/general/comboArrow@2x.png b/platform/icons/compatibilityResources/general/comboArrow@2x.png similarity index 100% rename from platform/icons/src/general/comboArrow@2x.png rename to platform/icons/compatibilityResources/general/comboArrow@2x.png diff --git a/platform/icons/src/general/comboArrow@2x_dark.png b/platform/icons/compatibilityResources/general/comboArrow@2x_dark.png similarity index 100% rename from platform/icons/src/general/comboArrow@2x_dark.png rename to platform/icons/compatibilityResources/general/comboArrow@2x_dark.png diff --git a/platform/icons/src/general/comboArrowDown.png b/platform/icons/compatibilityResources/general/comboArrowDown.png similarity index 100% rename from platform/icons/src/general/comboArrowDown.png rename to platform/icons/compatibilityResources/general/comboArrowDown.png diff --git a/platform/icons/src/general/comboArrowDown@2x.png b/platform/icons/compatibilityResources/general/comboArrowDown@2x.png similarity index 100% rename from platform/icons/src/general/comboArrowDown@2x.png rename to platform/icons/compatibilityResources/general/comboArrowDown@2x.png diff --git a/platform/icons/src/general/comboArrowDown@2x_dark.png b/platform/icons/compatibilityResources/general/comboArrowDown@2x_dark.png similarity index 100% rename from platform/icons/src/general/comboArrowDown@2x_dark.png rename to platform/icons/compatibilityResources/general/comboArrowDown@2x_dark.png diff --git a/platform/icons/src/general/comboArrowDown_dark.png b/platform/icons/compatibilityResources/general/comboArrowDown_dark.png similarity index 100% rename from platform/icons/src/general/comboArrowDown_dark.png rename to platform/icons/compatibilityResources/general/comboArrowDown_dark.png diff --git a/platform/icons/src/general/comboArrowLeft.png b/platform/icons/compatibilityResources/general/comboArrowLeft.png similarity index 100% rename from platform/icons/src/general/comboArrowLeft.png rename to platform/icons/compatibilityResources/general/comboArrowLeft.png diff --git a/platform/icons/src/general/comboArrowLeft@2x.png b/platform/icons/compatibilityResources/general/comboArrowLeft@2x.png similarity index 100% rename from platform/icons/src/general/comboArrowLeft@2x.png rename to platform/icons/compatibilityResources/general/comboArrowLeft@2x.png diff --git a/platform/icons/src/general/comboArrowLeft@2x_dark.png b/platform/icons/compatibilityResources/general/comboArrowLeft@2x_dark.png similarity index 100% rename from platform/icons/src/general/comboArrowLeft@2x_dark.png rename to platform/icons/compatibilityResources/general/comboArrowLeft@2x_dark.png diff --git a/platform/icons/src/general/comboArrowLeftPassive.png b/platform/icons/compatibilityResources/general/comboArrowLeftPassive.png similarity index 100% rename from platform/icons/src/general/comboArrowLeftPassive.png rename to platform/icons/compatibilityResources/general/comboArrowLeftPassive.png diff --git a/platform/icons/src/general/comboArrowLeftPassive@2x.png b/platform/icons/compatibilityResources/general/comboArrowLeftPassive@2x.png similarity index 100% rename from platform/icons/src/general/comboArrowLeftPassive@2x.png rename to platform/icons/compatibilityResources/general/comboArrowLeftPassive@2x.png diff --git a/platform/icons/src/general/comboArrowLeftPassive@2x_dark.png b/platform/icons/compatibilityResources/general/comboArrowLeftPassive@2x_dark.png similarity index 100% rename from platform/icons/src/general/comboArrowLeftPassive@2x_dark.png rename to platform/icons/compatibilityResources/general/comboArrowLeftPassive@2x_dark.png diff --git a/platform/icons/src/general/comboArrowLeftPassive_dark.png b/platform/icons/compatibilityResources/general/comboArrowLeftPassive_dark.png similarity index 100% rename from platform/icons/src/general/comboArrowLeftPassive_dark.png rename to platform/icons/compatibilityResources/general/comboArrowLeftPassive_dark.png diff --git a/platform/icons/src/general/comboArrowLeft_dark.png b/platform/icons/compatibilityResources/general/comboArrowLeft_dark.png similarity index 100% rename from platform/icons/src/general/comboArrowLeft_dark.png rename to platform/icons/compatibilityResources/general/comboArrowLeft_dark.png diff --git a/platform/icons/src/general/comboArrowRight.png b/platform/icons/compatibilityResources/general/comboArrowRight.png similarity index 100% rename from platform/icons/src/general/comboArrowRight.png rename to platform/icons/compatibilityResources/general/comboArrowRight.png diff --git a/platform/icons/src/general/comboArrowRight@2x.png b/platform/icons/compatibilityResources/general/comboArrowRight@2x.png similarity index 100% rename from platform/icons/src/general/comboArrowRight@2x.png rename to platform/icons/compatibilityResources/general/comboArrowRight@2x.png diff --git a/platform/icons/src/general/comboArrowRight@2x_dark.png b/platform/icons/compatibilityResources/general/comboArrowRight@2x_dark.png similarity index 100% rename from platform/icons/src/general/comboArrowRight@2x_dark.png rename to platform/icons/compatibilityResources/general/comboArrowRight@2x_dark.png diff --git a/platform/icons/src/general/comboArrowRightPassive.png b/platform/icons/compatibilityResources/general/comboArrowRightPassive.png similarity index 100% rename from platform/icons/src/general/comboArrowRightPassive.png rename to platform/icons/compatibilityResources/general/comboArrowRightPassive.png diff --git a/platform/icons/src/general/comboArrowRightPassive@2x.png b/platform/icons/compatibilityResources/general/comboArrowRightPassive@2x.png similarity index 100% rename from platform/icons/src/general/comboArrowRightPassive@2x.png rename to platform/icons/compatibilityResources/general/comboArrowRightPassive@2x.png diff --git a/platform/icons/src/general/comboArrowRightPassive@2x_dark.png b/platform/icons/compatibilityResources/general/comboArrowRightPassive@2x_dark.png similarity index 100% rename from platform/icons/src/general/comboArrowRightPassive@2x_dark.png rename to platform/icons/compatibilityResources/general/comboArrowRightPassive@2x_dark.png diff --git a/platform/icons/src/general/comboArrowRightPassive_dark.png b/platform/icons/compatibilityResources/general/comboArrowRightPassive_dark.png similarity index 100% rename from platform/icons/src/general/comboArrowRightPassive_dark.png rename to platform/icons/compatibilityResources/general/comboArrowRightPassive_dark.png diff --git a/platform/icons/src/general/comboArrowRight_dark.png b/platform/icons/compatibilityResources/general/comboArrowRight_dark.png similarity index 100% rename from platform/icons/src/general/comboArrowRight_dark.png rename to platform/icons/compatibilityResources/general/comboArrowRight_dark.png diff --git a/platform/icons/src/general/comboArrow_dark.png b/platform/icons/compatibilityResources/general/comboArrow_dark.png similarity index 100% rename from platform/icons/src/general/comboArrow_dark.png rename to platform/icons/compatibilityResources/general/comboArrow_dark.png diff --git a/platform/icons/src/general/comboBoxButtonArrow.png b/platform/icons/compatibilityResources/general/comboBoxButtonArrow.png similarity index 100% rename from platform/icons/src/general/comboBoxButtonArrow.png rename to platform/icons/compatibilityResources/general/comboBoxButtonArrow.png diff --git a/platform/icons/src/general/comboBoxButtonArrow@2x.png b/platform/icons/compatibilityResources/general/comboBoxButtonArrow@2x.png similarity index 100% rename from platform/icons/src/general/comboBoxButtonArrow@2x.png rename to platform/icons/compatibilityResources/general/comboBoxButtonArrow@2x.png diff --git a/platform/icons/src/general/splitCenterH.png b/platform/icons/compatibilityResources/general/splitCenterH.png similarity index 100% rename from platform/icons/src/general/splitCenterH.png rename to platform/icons/compatibilityResources/general/splitCenterH.png diff --git a/platform/icons/src/general/splitCenterH@2x.png b/platform/icons/compatibilityResources/general/splitCenterH@2x.png similarity index 100% rename from platform/icons/src/general/splitCenterH@2x.png rename to platform/icons/compatibilityResources/general/splitCenterH@2x.png diff --git a/platform/icons/src/general/splitCenterH@2x_dark.png b/platform/icons/compatibilityResources/general/splitCenterH@2x_dark.png similarity index 100% rename from platform/icons/src/general/splitCenterH@2x_dark.png rename to platform/icons/compatibilityResources/general/splitCenterH@2x_dark.png diff --git a/platform/icons/src/general/splitCenterH_dark.png b/platform/icons/compatibilityResources/general/splitCenterH_dark.png similarity index 100% rename from platform/icons/src/general/splitCenterH_dark.png rename to platform/icons/compatibilityResources/general/splitCenterH_dark.png diff --git a/platform/icons/src/general/splitCenterV.png b/platform/icons/compatibilityResources/general/splitCenterV.png similarity index 100% rename from platform/icons/src/general/splitCenterV.png rename to platform/icons/compatibilityResources/general/splitCenterV.png diff --git a/platform/icons/src/general/splitCenterV@2x.png b/platform/icons/compatibilityResources/general/splitCenterV@2x.png similarity index 100% rename from platform/icons/src/general/splitCenterV@2x.png rename to platform/icons/compatibilityResources/general/splitCenterV@2x.png diff --git a/platform/icons/src/general/splitCenterV@2x_dark.png b/platform/icons/compatibilityResources/general/splitCenterV@2x_dark.png similarity index 100% rename from platform/icons/src/general/splitCenterV@2x_dark.png rename to platform/icons/compatibilityResources/general/splitCenterV@2x_dark.png diff --git a/platform/icons/src/general/splitCenterV_dark.png b/platform/icons/compatibilityResources/general/splitCenterV_dark.png similarity index 100% rename from platform/icons/src/general/splitCenterV_dark.png rename to platform/icons/compatibilityResources/general/splitCenterV_dark.png diff --git a/platform/icons/src/general/splitDown.png b/platform/icons/compatibilityResources/general/splitDown.png similarity index 100% rename from platform/icons/src/general/splitDown.png rename to platform/icons/compatibilityResources/general/splitDown.png diff --git a/platform/icons/src/general/splitDown@2x.png b/platform/icons/compatibilityResources/general/splitDown@2x.png similarity index 100% rename from platform/icons/src/general/splitDown@2x.png rename to platform/icons/compatibilityResources/general/splitDown@2x.png diff --git a/platform/icons/src/general/splitDown@2x_dark.png b/platform/icons/compatibilityResources/general/splitDown@2x_dark.png similarity index 100% rename from platform/icons/src/general/splitDown@2x_dark.png rename to platform/icons/compatibilityResources/general/splitDown@2x_dark.png diff --git a/platform/icons/src/general/splitDown_dark.png b/platform/icons/compatibilityResources/general/splitDown_dark.png similarity index 100% rename from platform/icons/src/general/splitDown_dark.png rename to platform/icons/compatibilityResources/general/splitDown_dark.png diff --git a/platform/icons/src/general/splitLeft.png b/platform/icons/compatibilityResources/general/splitLeft.png similarity index 100% rename from platform/icons/src/general/splitLeft.png rename to platform/icons/compatibilityResources/general/splitLeft.png diff --git a/platform/icons/src/general/splitLeft@2x.png b/platform/icons/compatibilityResources/general/splitLeft@2x.png similarity index 100% rename from platform/icons/src/general/splitLeft@2x.png rename to platform/icons/compatibilityResources/general/splitLeft@2x.png diff --git a/platform/icons/src/general/splitLeft@2x_dark.png b/platform/icons/compatibilityResources/general/splitLeft@2x_dark.png similarity index 100% rename from platform/icons/src/general/splitLeft@2x_dark.png rename to platform/icons/compatibilityResources/general/splitLeft@2x_dark.png diff --git a/platform/icons/src/general/splitLeft_dark.png b/platform/icons/compatibilityResources/general/splitLeft_dark.png similarity index 100% rename from platform/icons/src/general/splitLeft_dark.png rename to platform/icons/compatibilityResources/general/splitLeft_dark.png diff --git a/platform/icons/src/general/splitRight.png b/platform/icons/compatibilityResources/general/splitRight.png similarity index 100% rename from platform/icons/src/general/splitRight.png rename to platform/icons/compatibilityResources/general/splitRight.png diff --git a/platform/icons/src/general/splitRight@2x.png b/platform/icons/compatibilityResources/general/splitRight@2x.png similarity index 100% rename from platform/icons/src/general/splitRight@2x.png rename to platform/icons/compatibilityResources/general/splitRight@2x.png diff --git a/platform/icons/src/general/splitRight@2x_dark.png b/platform/icons/compatibilityResources/general/splitRight@2x_dark.png similarity index 100% rename from platform/icons/src/general/splitRight@2x_dark.png rename to platform/icons/compatibilityResources/general/splitRight@2x_dark.png diff --git a/platform/icons/src/general/splitRight_dark.png b/platform/icons/compatibilityResources/general/splitRight_dark.png similarity index 100% rename from platform/icons/src/general/splitRight_dark.png rename to platform/icons/compatibilityResources/general/splitRight_dark.png diff --git a/platform/icons/src/general/splitUp.png b/platform/icons/compatibilityResources/general/splitUp.png similarity index 100% rename from platform/icons/src/general/splitUp.png rename to platform/icons/compatibilityResources/general/splitUp.png diff --git a/platform/icons/src/general/splitUp@2x.png b/platform/icons/compatibilityResources/general/splitUp@2x.png similarity index 100% rename from platform/icons/src/general/splitUp@2x.png rename to platform/icons/compatibilityResources/general/splitUp@2x.png diff --git a/platform/icons/src/general/splitUp@2x_dark.png b/platform/icons/compatibilityResources/general/splitUp@2x_dark.png similarity index 100% rename from platform/icons/src/general/splitUp@2x_dark.png rename to platform/icons/compatibilityResources/general/splitUp@2x_dark.png diff --git a/platform/icons/src/general/splitUp_dark.png b/platform/icons/compatibilityResources/general/splitUp_dark.png similarity index 100% rename from platform/icons/src/general/splitUp_dark.png rename to platform/icons/compatibilityResources/general/splitUp_dark.png diff --git a/platform/icons/src/actions/icon-robots.txt b/platform/icons/src/actions/icon-robots.txt index e2087e7f7471..51526b699694 100644 --- a/platform/icons/src/actions/icon-robots.txt +++ b/platform/icons/src/actions/icon-robots.txt @@ -9,7 +9,7 @@ deprecated: createPatch.png; to be removed in IDEA 2020 deprecated: delete.png -> /actions/cancel.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Cancel deprecated: diffPreview.png -> /actions/diff.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Diff deprecated: diffWithCurrent.png -> /actions/diff.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Diff -deprecated: down.png -> /general/splitDown.png; to be removed in IDEA 2020 - use AllIcons.General.SplitDown +deprecated: down.png -> /general/arrowDown.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowDown deprecated: erDiagram.png; to be removed in IDEA 2020 - use J2EEIcons.ErDiagram deprecated: exclude.png -> /general/remove.svg; to be removed in IDEA 2020 - use AllIcons.General.Remove deprecated: export.png -> /toolbarDecorator/export.svg; to be removed in IDEA 2020 - use AllIcons.ToolbarDecorator.Export @@ -18,7 +18,7 @@ deprecated: filter_small.png -> /general/filter.svg; to be removed in IDEA 2020 deprecated: findPlain.png -> /actions/find.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Find deprecated: findWhite.png; to be removed in IDEA 2020 deprecated: get.png -> /actions/download.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Download -deprecated: left.png -> /general/splitLeft.png; to be removed in IDEA 2020 - use AllIcons.General.SplitLeft +deprecated: left.png -> /general/arrowLeft.png; to be removed in IDEA 2020 - use AllIcons.General.ArrowLeft deprecated: menu-find.png -> /actions/find.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Find deprecated: menu-help.png -> /actions/help.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Help deprecated: menu-replace.png -> /actions/replace.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Replace @@ -32,11 +32,12 @@ deprecated: realIntentionOffBulb.png; to be removed in IDEA 2020 deprecated: reset.png -> /actions/rollback.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Rollback deprecated: reset-to-default.png -> /actions/rollback.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Rollback deprecated: Reset_to_empty.png -> /actions/uninstall.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Uninstall -deprecated: right.png; to be removed in IDEA 2020 - use AllIcons.General.SplitRight +deprecated: right.png -> /general/arrowRight.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowRight deprecated: showChangesOnly.png -> /actions/preview.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Preview deprecated: showViewer.png deprecated: sortAsc.png -> /actions/moveUp.svg; to be removed in IDEA 2020 - use AllIcons.Actions.MoveUp deprecated: sortDesc.png -> /actions/moveDown.svg; to be removed in IDEA 2020 - use AllIcons.Actions.MoveDown 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/splitUp.png; to be removed in IDEA 2020 - use AllIcons.General.SplitUp +deprecated: up.png -> /general/arrowUp.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowUp + diff --git a/platform/icons/src/general/arrowDown.svg b/platform/icons/src/general/arrowDown.svg new file mode 100644 index 000000000000..09459114c95a --- /dev/null +++ b/platform/icons/src/general/arrowDown.svg @@ -0,0 +1,3 @@ + + + diff --git a/platform/icons/src/general/arrowDownSmall.svg b/platform/icons/src/general/arrowDownSmall.svg new file mode 100644 index 000000000000..48cb419db07b --- /dev/null +++ b/platform/icons/src/general/arrowDownSmall.svg @@ -0,0 +1,3 @@ + + + diff --git a/platform/icons/src/general/arrowDownSmall_dark.svg b/platform/icons/src/general/arrowDownSmall_dark.svg new file mode 100644 index 000000000000..d93bdffeeb52 --- /dev/null +++ b/platform/icons/src/general/arrowDownSmall_dark.svg @@ -0,0 +1,3 @@ + + + diff --git a/platform/icons/src/general/arrowDown_dark.svg b/platform/icons/src/general/arrowDown_dark.svg new file mode 100644 index 000000000000..51324f9deb13 --- /dev/null +++ b/platform/icons/src/general/arrowDown_dark.svg @@ -0,0 +1,3 @@ + + + diff --git a/platform/icons/src/general/arrowLeft.svg b/platform/icons/src/general/arrowLeft.svg new file mode 100644 index 000000000000..ca5b37c77147 --- /dev/null +++ b/platform/icons/src/general/arrowLeft.svg @@ -0,0 +1,3 @@ + + + diff --git a/platform/icons/src/general/arrowLeft_dark.svg b/platform/icons/src/general/arrowLeft_dark.svg new file mode 100644 index 000000000000..5fa24cc91cae --- /dev/null +++ b/platform/icons/src/general/arrowLeft_dark.svg @@ -0,0 +1,3 @@ + + + diff --git a/platform/icons/src/general/arrowRight.svg b/platform/icons/src/general/arrowRight.svg new file mode 100644 index 000000000000..354818ad20b9 --- /dev/null +++ b/platform/icons/src/general/arrowRight.svg @@ -0,0 +1,3 @@ + + + diff --git a/platform/icons/src/general/arrowRight_dark.svg b/platform/icons/src/general/arrowRight_dark.svg new file mode 100644 index 000000000000..0e7e082a018f --- /dev/null +++ b/platform/icons/src/general/arrowRight_dark.svg @@ -0,0 +1,3 @@ + + + diff --git a/platform/icons/src/general/arrowSplitCenterH.svg b/platform/icons/src/general/arrowSplitCenterH.svg new file mode 100644 index 000000000000..e1fdfb65ed21 --- /dev/null +++ b/platform/icons/src/general/arrowSplitCenterH.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/platform/icons/src/general/arrowSplitCenterH_dark.svg b/platform/icons/src/general/arrowSplitCenterH_dark.svg new file mode 100644 index 000000000000..916a18173657 --- /dev/null +++ b/platform/icons/src/general/arrowSplitCenterH_dark.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/platform/icons/src/general/arrowSplitCenterV.svg b/platform/icons/src/general/arrowSplitCenterV.svg new file mode 100644 index 000000000000..16e2f9e674ee --- /dev/null +++ b/platform/icons/src/general/arrowSplitCenterV.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/platform/icons/src/general/arrowSplitCenterV_dark.svg b/platform/icons/src/general/arrowSplitCenterV_dark.svg new file mode 100644 index 000000000000..f03d94a2eaec --- /dev/null +++ b/platform/icons/src/general/arrowSplitCenterV_dark.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/platform/icons/src/general/arrowUp.svg b/platform/icons/src/general/arrowUp.svg new file mode 100644 index 000000000000..167638a38311 --- /dev/null +++ b/platform/icons/src/general/arrowUp.svg @@ -0,0 +1,3 @@ + + + diff --git a/platform/icons/src/general/arrowUp_dark.svg b/platform/icons/src/general/arrowUp_dark.svg new file mode 100644 index 000000000000..a5d6e4f93ce7 --- /dev/null +++ b/platform/icons/src/general/arrowUp_dark.svg @@ -0,0 +1,3 @@ + + + diff --git a/platform/icons/src/general/icon-robots.txt b/platform/icons/src/general/icon-robots.txt index 27b953e1d9b5..c0bbfae0a08a 100644 --- a/platform/icons/src/general/icon-robots.txt +++ b/platform/icons/src/general/icon-robots.txt @@ -1,8 +1,19 @@ +deprecated: arrowDown_white.png -> /general/arrowDown.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowDown deprecated: autohideOff.png -> /general/pin_tab.svg; to be removed in IDEA 2020 - AllIcons.General.Pin_tab deprecated: autohideOffInactive.png -> /general/pin_tab.svg; to be removed in IDEA 2020 - AllIcons.General.Pin_tab deprecated: autohideOffPressed.png -> /general/pin_tab.svg; to be removed in IDEA 2020 - AllIcons.General.Pin_tab deprecated: collapseAll.png -> /actions/collapseall.svg; to be removed in IDEA 2020 - AllIcons.Actions.Collapseall deprecated: collapseAllHover.png -> /actions/collapseall.svg; to be removed in IDEA 2020 - AllIcons.Actions.Collapseall +deprecated: combo.png -> /general/arrowDown.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowDown +deprecated: combo2.png -> /general/arrowDown.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowDown +deprecated: combo3.png -> /general/arrowDown.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowDown +deprecated: comboArrow.png -> /general/arrowDown.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowDown +deprecated: comboArrowDown.png -> /general/arrowDownSmall.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowDownSmall +deprecated: comboArrowLeft.png -> /general/arrowLeft.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowLeft +deprecated: comboArrowLeftPassive.png -> /general/arrowLeft.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowLeft +deprecated: comboArrowRight.png -> /general/arrowRight.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowRight +deprecated: comboArrowRightPassive.png -> /general/arrowRight.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowRight +deprecated: comboBoxButtonArrow.png -> /general/arrowDown.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowDown deprecated: configurableDefault.png; to be removed in IDEA 2020 deprecated: Configure.png -> /general/settings.svg; to be removed in IDEA 2020 - AllIcons.General.Settings deprecated: createNewProject.png -> /welcome/createNewProject.svg; to be removed in IDEA 2020 - use AllIcons.Welcome.CreateNewProject @@ -29,4 +40,10 @@ deprecated: projectSettings.png -> /general/gearPlain.svg; to be removed in IDEA deprecated: readHelp.png -> /actions/help.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Help deprecated: recursive.png -> /actions/showAsTree.svg; to be removed in IDEA 2020 - use AllIcons.Actions.ShowAsTree deprecated: secondaryGroup.png -> /general/gearPlain.svg; to be removed in IDEA 2020 - use AllIcons.General.GearPlain +deprecated: splitCenterH.png -> /general/arrowSplitCenterH.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowSplitCenterH +deprecated: splitCenterV.png -> /general/arrowSplitCenterV.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowSplitCenterV +deprecated: splitUp.png -> /general/arrowUp.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowUp +deprecated: splitDown.png -> /general/arrowDown.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowDown +deprecated: splitLeft.png -> /general/arrowLeft.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowLeft +deprecated: splitRight.png -> /general/arrowRight.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowRight deprecated: uninstallPlugin.png; to be removed in IDEA 2020 diff --git a/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesTableCellRenderer.java b/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesTableCellRenderer.java index 40d0e8714d21..b1ae2f6e4b61 100644 --- a/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesTableCellRenderer.java +++ b/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesTableCellRenderer.java @@ -19,6 +19,7 @@ package com.intellij.find.actions; import com.intellij.icons.AllIcons; import com.intellij.openapi.editor.colors.EditorColorsManager; import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.newvfs.VfsPresentationUtil; import com.intellij.psi.search.SearchScope; @@ -160,7 +161,9 @@ class ShowUsagesTableCellRenderer implements TableCellRenderer { if (isOriginUsage && column == USAGE_TEXT_COL) { SimpleColoredComponent origin = new SimpleColoredComponent(); origin.setIconTextGap(JBUI.scale(5)); // for this particular icon it looks better - origin.setIcon(isSelected ? slightlyDifferentColor(AllIcons.General.ComboArrowLeftPassive) : AllIcons.General.ComboArrowLeftPassive); + + Icon arrowLeftIcon = ObjectUtils.assertNotNull(IconLoader.getDisabledIcon(AllIcons.General.ArrowLeft)); + origin.setIcon(isSelected ? slightlyDifferentColor(arrowLeftIcon) : arrowLeftIcon); // use attributes of "line number" to show "Current" word SimpleTextAttributes attributes = text.length == 0 ? SimpleTextAttributes.REGULAR_ATTRIBUTES.derive(-1, new Color(0x808080), null, null) : diff --git a/platform/lang-impl/src/com/intellij/tools/ToolEditorDialog.java b/platform/lang-impl/src/com/intellij/tools/ToolEditorDialog.java index c3d28f632fb2..f9995d3f7afb 100644 --- a/platform/lang-impl/src/com/intellij/tools/ToolEditorDialog.java +++ b/platform/lang-impl/src/com/intellij/tools/ToolEditorDialog.java @@ -135,8 +135,8 @@ public class ToolEditorDialog extends DialogWrapper { private void createUIComponents() { myOutputFilterField = new RawCommandLineEditor(OUTPUT_FILTERS_SPLITTER, OUTPUT_FILTERS_JOINER); - myAdvancedOptionsSeparator = new AbstractTitledSeparatorWithIcon(AllIcons.General.SplitRight, - AllIcons.General.SplitDown, + myAdvancedOptionsSeparator = new AbstractTitledSeparatorWithIcon(AllIcons.General.ArrowRight, + AllIcons.General.ArrowDown, "Advanced Options") { @Override protected RefreshablePanel createPanel() { diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java index 2b6cb9a779bb..4bae39d28c88 100644 --- a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java +++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java @@ -46,9 +46,8 @@ public abstract class ComboBoxAction extends AnAction implements CustomComponent } return myWin10ComboDropTriangleIcon; } - Icon icon = UIUtil.isUnderDarcula() ? AllIcons.General.ComboArrow : AllIcons.General.ComboBoxButtonArrow; - if (myIcon != icon) { - myIcon = icon; + if (myIcon != AllIcons.General.ArrowDown) { + myIcon = AllIcons.General.ArrowDown; myDisabledIcon = IconLoader.getDisabledIcon(myIcon); } return enabled ? myIcon : myDisabledIcon; diff --git a/platform/platform-api/src/com/intellij/openapi/ui/JBPopupMenu.java b/platform/platform-api/src/com/intellij/openapi/ui/JBPopupMenu.java index d3010173c6da..4ce1b2f771cd 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/JBPopupMenu.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/JBPopupMenu.java @@ -196,7 +196,7 @@ public class JBPopupMenu extends JPopupMenu { g.setColor(dim[i]); g.drawLine(0, i, myTarget.getWidth(), i); } - AllIcons.General.SplitUp.paintIcon(myTarget, g, myTarget.getWidth() / 2 - AllIcons.General.SplitUp.getIconWidth() / 2, 0); + AllIcons.General.ArrowUp.paintIcon(myTarget, g, myTarget.getWidth() / 2 - AllIcons.General.ArrowUp.getIconWidth() / 2, 0); } if (super.preferredLayoutSize(myTarget).height - getMaxHeight() - myShift > 0) { for (int i = 0; i < dim.length; i++) { @@ -204,8 +204,8 @@ public class JBPopupMenu extends JPopupMenu { g.drawLine(0, myTarget.getHeight() - i, myTarget.getWidth(), myTarget.getHeight() - i); } - AllIcons.General.SplitDown.paintIcon(myTarget, g, myTarget.getWidth() / 2 - AllIcons.General.SplitDown.getIconWidth() / 2, - myTarget.getHeight() - AllIcons.General.SplitDown.getIconHeight()); + AllIcons.General.ArrowDown.paintIcon(myTarget, g, myTarget.getWidth() / 2 - AllIcons.General.ArrowDown.getIconWidth() / 2, + myTarget.getHeight() - AllIcons.General.ArrowDown.getIconHeight()); } } diff --git a/platform/platform-api/src/com/intellij/openapi/ui/ThreeComponentsSplitter.java b/platform/platform-api/src/com/intellij/openapi/ui/ThreeComponentsSplitter.java index 2854af98328c..629b9ac4d3d8 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/ThreeComponentsSplitter.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/ThreeComponentsSplitter.java @@ -687,11 +687,11 @@ public class ThreeComponentsSplitter extends JPanel implements Disposable { int xMask = isVerticalSplit ? 1 : 0; int yMask = isVerticalSplit ? 0 : 1; - Icon glueIcon = isVerticalSplit ? AllIcons.General.SplitGlueV : AllIcons.General.SplitCenterH; + Icon glueIcon = isVerticalSplit ? AllIcons.General.SplitGlueV : AllIcons.General.ArrowSplitCenterH; int glueFill = isVerticalSplit ? GridBagConstraints.VERTICAL : GridBagConstraints.HORIZONTAL; add(new JLabel(glueIcon), new GridBagConstraints(0, 0, 1, 1, 0, 0, isVerticalSplit ? GridBagConstraints.EAST : GridBagConstraints.NORTH, glueFill, new Insets(0, 0, 0, 0), 0, 0)); - JLabel splitDownlabel = new JLabel(isVerticalSplit ? AllIcons.General.SplitDown : AllIcons.General.SplitRight); + JLabel splitDownlabel = new JLabel(isVerticalSplit ? AllIcons.General.ArrowDown : AllIcons.General.ArrowRight); splitDownlabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); splitDownlabel.setToolTipText(isVerticalSplit ? UIBundle.message("splitter.down.tooltip.text") : UIBundle .message("splitter.right.tooltip.text")); @@ -718,7 +718,7 @@ public class ThreeComponentsSplitter extends JPanel implements Disposable { // add(new JLabel(glueIcon), new GridBagConstraints(2 * xMask, 2 * yMask, 1, 1, 0, 0, GridBagConstraints.CENTER, glueFill, new Insets(0, 0, 0, 0), 0, 0)); - JLabel splitCenterlabel = new JLabel(isVerticalSplit ? AllIcons.General.SplitCenterV : AllIcons.General.SplitCenterH); + JLabel splitCenterlabel = new JLabel(isVerticalSplit ? AllIcons.General.ArrowSplitCenterV : AllIcons.General.ArrowSplitCenterH); splitCenterlabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); splitCenterlabel.setToolTipText(UIBundle.message("splitter.center.tooltip.text")); new ClickListener() { @@ -733,7 +733,7 @@ public class ThreeComponentsSplitter extends JPanel implements Disposable { add(new JLabel(glueIcon), new GridBagConstraints(4 * xMask, 4 * yMask, 1, 1, 0, 0, GridBagConstraints.CENTER, glueFill, new Insets(0, 0, 0, 0), 0, 0)); // - JLabel splitUpLabel = new JLabel(isVerticalSplit ? AllIcons.General.SplitUp : AllIcons.General.SplitLeft); + JLabel splitUpLabel = new JLabel(isVerticalSplit ? AllIcons.General.ArrowUp : AllIcons.General.ArrowLeft); splitUpLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); splitUpLabel.setToolTipText(isVerticalSplit ? UIBundle.message("splitter.up.tooltip.text") : UIBundle .message("splitter.left.tooltip.text")); diff --git a/platform/platform-api/src/com/intellij/ui/components/JBComboBoxLabel.java b/platform/platform-api/src/com/intellij/ui/components/JBComboBoxLabel.java index 7023774d0dc4..bccfcea41425 100644 --- a/platform/platform-api/src/com/intellij/ui/components/JBComboBoxLabel.java +++ b/platform/platform-api/src/com/intellij/ui/components/JBComboBoxLabel.java @@ -46,7 +46,7 @@ public class JBComboBoxLabel extends JPanel { } public void setSelectionIcon() { - myIcon.setIcon(AllIcons.General.Combo); + myIcon.setIcon(AllIcons.General.ArrowDown); } @Override diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java index a573844dff74..81f8defc3b61 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java @@ -73,8 +73,8 @@ import java.awt.event.MouseEvent; import java.io.FileNotFoundException; import java.io.IOException; import java.net.URL; -import java.util.*; import java.util.List; +import java.util.*; import java.util.stream.Collectors; import static com.intellij.openapi.util.text.StringUtil.isEmptyOrSpaces; @@ -174,7 +174,7 @@ public abstract class PluginManagerMain implements Disposable { JLabel mySortLabel = new JLabel(); mySortLabel.setForeground(UIUtil.getLabelDisabledForeground()); mySortLabel.setBorder(JBUI.Borders.empty(1, 1, 1, 5)); - mySortLabel.setIcon(AllIcons.General.SplitDown); + mySortLabel.setIcon(AllIcons.General.ArrowDown); mySortLabel.setHorizontalTextPosition(SwingConstants.LEADING); header.add(mySortLabel, BorderLayout.EAST); myTablePanel.add(header, BorderLayout.NORTH); diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java index 625053a6e89e..732074e90800 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java @@ -564,7 +564,7 @@ public final class LafManagerImpl extends LafManager implements PersistentStateC if (UIUtil.isUnderWin10LookAndFeel()) { uiDefaults.put("Menu.arrowIcon", new Win10MenuArrowIcon()); } else if ((SystemInfo.isLinux || SystemInfo.isWindows) && (UIUtil.isUnderIntelliJLaF() || UIUtil.isUnderDarcula())) { - uiDefaults.put("Menu.arrowIcon", new DefaultMenuArrowIcon(AllIcons.General.SplitRight)); + uiDefaults.put("Menu.arrowIcon", new DefaultMenuArrowIcon(AllIcons.General.ArrowRight)); } uiDefaults.put("MenuItem.background", UIManager.getColor("Menu.background")); diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties index e1d47a9fa499..34c8403b8378 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties @@ -60,7 +60,7 @@ Label.selectedForeground=BBBBBB TableHeaderUI=com.intellij.ide.ui.laf.darcula.DarculaTableHeaderUI Table.gridColor=2c2c2c -Table.ascendingSortIcon=AllIcons.General.SplitUp +Table.ascendingSortIcon=AllIcons.General.ArrowUp Table.descendingSortIcon=AllIcons.General.SplitDown Table.cellNoFocusBorder=4,4,4,4 Table.focusSelectedCellHighlightBorder=com.intellij.ide.ui.laf.darcula.DarculaTableSelectedCellHighlightBorder diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf.properties b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf.properties index 6189e54bb464..b5eece51e2c1 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf.properties +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf.properties @@ -55,7 +55,7 @@ Label.selectedForeground=000000 TableHeaderUI=com.intellij.ide.ui.laf.darcula.DarculaTableHeaderUI Table.gridColor=dddddd -Table.ascendingSortIcon=AllIcons.General.SplitUp +Table.ascendingSortIcon=AllIcons.General.ArrowUp Table.descendingSortIcon=AllIcons.General.SplitDown Table.background=ffffff Table.cellNoFocusBorder=4,4,4,4 diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_native.properties b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_native.properties index 986971a95784..7997cf8ecdcf 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_native.properties +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_native.properties @@ -51,7 +51,7 @@ link.visited.foreground=016cc1 ScrollBarUI=com.intellij.ui.components.JBScrollBar TableHeaderUI=com.intellij.ide.ui.laf.darcula.DarculaTableHeaderUI Table.gridColor=dddddd -Table.ascendingSortIcon=AllIcons.General.SplitUp +Table.ascendingSortIcon=AllIcons.General.ArrowUp Table.descendingSortIcon=AllIcons.General.SplitDown Table.background=ffffff Table.cellNoFocusBorder=4,4,4,4 diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ComboIcon.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ComboIcon.java index e64be3ec7773..c40fa78e318a 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ComboIcon.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ComboIcon.java @@ -22,7 +22,7 @@ import java.awt.*; public abstract class ComboIcon { - private final ActiveIcon myIcon = new ActiveIcon(AllIcons.General.Combo2); + private final ActiveIcon myIcon = new ActiveIcon(AllIcons.General.ArrowDown); public void paintIcon(final Component c, final Graphics g) { myIcon.setActive(isActive()); diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/MoreIcon.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/MoreIcon.java index e86c0b89f68e..562163f38f2c 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/MoreIcon.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/MoreIcon.java @@ -17,6 +17,7 @@ package com.intellij.openapi.wm.impl.content; import com.intellij.icons.AllIcons; import com.intellij.openapi.ui.popup.ActiveIcon; +import com.intellij.openapi.util.IconLoader; import javax.swing.*; import java.awt.*; @@ -24,9 +25,9 @@ import java.awt.*; public abstract class MoreIcon { private final ActiveIcon myLeft = - new ActiveIcon(AllIcons.General.ComboArrowLeft, AllIcons.General.ComboArrowLeftPassive); + new ActiveIcon(AllIcons.General.ArrowLeft, IconLoader.getDisabledIcon(AllIcons.General.ArrowLeft)); private final ActiveIcon myRight = - new ActiveIcon(AllIcons.General.ComboArrowRight, AllIcons.General.ComboArrowRightPassive); + new ActiveIcon(AllIcons.General.ArrowRight, IconLoader.getDisabledIcon(AllIcons.General.ArrowRight)); protected final int myGap = 2; protected boolean myLeftPainted; diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java index 45f2a52395dd..fc743da9fa7b 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java @@ -807,7 +807,7 @@ public class FlatWelcomeFrame extends JFrame implements IdeFrame, Disposable, Ac } private static JLabel createArrow(final ActionLink link) { - JLabel arrow = new JLabel(AllIcons.General.Combo3); + JLabel arrow = new JLabel(AllIcons.General.ArrowDown); arrow.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); arrow.setVerticalAlignment(SwingConstants.BOTTOM); new ClickListener() { diff --git a/platform/platform-impl/src/com/intellij/ui/HideableDecorator.java b/platform/platform-impl/src/com/intellij/ui/HideableDecorator.java index 72f08f184bbc..746f5070f414 100644 --- a/platform/platform-impl/src/com/intellij/ui/HideableDecorator.java +++ b/platform/platform-impl/src/com/intellij/ui/HideableDecorator.java @@ -67,7 +67,7 @@ public class HideableDecorator { } private void updateIcon() { - Icon icon = myOn ? AllIcons.General.SplitDown : AllIcons.General.SplitRight; + Icon icon = myOn ? AllIcons.General.ArrowDown : AllIcons.General.ArrowRight; myTitledSeparator.getLabel().setIcon(icon); myTitledSeparator.getLabel().setDisabledIcon(IconLoader.getTransparentIcon(icon, 0.5f)); } diff --git a/platform/platform-impl/src/com/intellij/ui/SplitterWithSecondHideable.java b/platform/platform-impl/src/com/intellij/ui/SplitterWithSecondHideable.java index 19e761662cd8..e61331c8c87f 100644 --- a/platform/platform-impl/src/com/intellij/ui/SplitterWithSecondHideable.java +++ b/platform/platform-impl/src/com/intellij/ui/SplitterWithSecondHideable.java @@ -18,7 +18,9 @@ package com.intellij.ui; import com.intellij.openapi.ui.Divider; import com.intellij.openapi.ui.PseudoSplitter; import com.intellij.openapi.ui.Splitter; +import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vcs.changes.RefreshablePanel; +import com.intellij.util.ObjectUtils; import com.intellij.util.ui.JBUI; import com.intellij.util.ui.JBUI.Panels; import com.intellij.util.ui.MouseEventHandler; @@ -28,7 +30,8 @@ import javax.swing.*; import java.awt.*; import java.awt.event.MouseEvent; -import static com.intellij.icons.AllIcons.General.*; +import static com.intellij.icons.AllIcons.General.ArrowDownSmall; +import static com.intellij.icons.AllIcons.General.ArrowRight; public abstract class SplitterWithSecondHideable { public interface OnOffListener { @@ -92,7 +95,7 @@ public abstract class SplitterWithSecondHideable { private class MyTitledSeparator extends AbstractTitledSeparatorWithIcon { MyTitledSeparator(@NotNull String separatorText, boolean vertical) { - super(ComboArrowRight, vertical ? ComboArrowDown : ComboArrowRightPassive, separatorText); + super(ArrowRight, vertical ? ArrowDownSmall : ObjectUtils.assertNotNull(IconLoader.getDisabledIcon(ArrowRight)), separatorText); } @Override diff --git a/platform/platform-impl/src/com/intellij/ui/components/JBMovePanel.java b/platform/platform-impl/src/com/intellij/ui/components/JBMovePanel.java index 374261ea7abd..e39b678cbb26 100644 --- a/platform/platform-impl/src/com/intellij/ui/components/JBMovePanel.java +++ b/platform/platform-impl/src/com/intellij/ui/components/JBMovePanel.java @@ -312,7 +312,7 @@ public class JBMovePanel extends JBPanel { private class LeftAction extends AnAction { LeftAction() { - getTemplatePresentation().setIcon(AllIcons.General.SplitLeft); + getTemplatePresentation().setIcon(AllIcons.General.ArrowLeft); } @Override @@ -324,7 +324,7 @@ public class JBMovePanel extends JBPanel { private class RightAction extends AnAction { RightAction() { - getTemplatePresentation().setIcon(AllIcons.General.SplitRight); + getTemplatePresentation().setIcon(AllIcons.General.ArrowRight); } @Override @@ -360,7 +360,7 @@ public class JBMovePanel extends JBPanel { private class UpAction extends AnAction { UpAction() { - getTemplatePresentation().setIcon(AllIcons.General.SplitUp); + getTemplatePresentation().setIcon(AllIcons.General.ArrowUp); } @Override @@ -372,7 +372,7 @@ public class JBMovePanel extends JBPanel { private class DownAction extends AnAction { DownAction() { - getTemplatePresentation().setIcon(AllIcons.General.SplitDown); + getTemplatePresentation().setIcon(AllIcons.General.ArrowDown); } @Override diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java index ad92d12b6243..a35aae682921 100644 --- a/platform/util/src/com/intellij/icons/AllIcons.java +++ b/platform/util/src/com/intellij/icons/AllIcons.java @@ -194,10 +194,10 @@ public class AllIcons { @Deprecated public static final Icon DiffWithCurrent = AllIcons.Actions.Diff; - /** @deprecated to be removed in IDEA 2020 - use AllIcons.General.SplitDown */ + /** @deprecated to be removed in IDEA 2020 - use AllIcons.General.ArrowDown */ @SuppressWarnings("unused") @Deprecated - public static final Icon Down = AllIcons.General.SplitDown; + public static final Icon Down = AllIcons.General.ArrowDown; /** @deprecated to be removed in IDEA 2020 - use J2EEIcons.ErDiagram */ @SuppressWarnings("unused") @@ -238,10 +238,10 @@ public class AllIcons { @Deprecated public static final Icon Get = AllIcons.Actions.Download; - /** @deprecated to be removed in IDEA 2020 - use AllIcons.General.SplitLeft */ + /** @deprecated to be removed in IDEA 2020 - use AllIcons.General.ArrowLeft */ @SuppressWarnings("unused") @Deprecated - public static final Icon Left = AllIcons.General.SplitLeft; + public static final Icon Left = AllIcons.General.ArrowLeft; /** @deprecated to be removed in IDEA 2020 - use AllIcons.Actions.Find */ @SuppressWarnings("unused") @@ -308,10 +308,10 @@ public class AllIcons { @Deprecated public static final Icon Reset_to_empty = AllIcons.Actions.Uninstall; - /** @deprecated to be removed in IDEA 2020 - use AllIcons.General.SplitRight */ + /** @deprecated to be removed in IDEA 2020 - use AllIcons.General.ArrowRight */ @SuppressWarnings("unused") @Deprecated - public static final Icon Right = AllIcons.General.SplitRight; + public static final Icon Right = AllIcons.General.ArrowRight; /** @deprecated to be removed in IDEA 2020 - use AllIcons.Actions.Preview */ @SuppressWarnings("unused") @@ -342,10 +342,10 @@ public class AllIcons { @Deprecated public static final Icon SynchronizeFS = AllIcons.Actions.Refresh; - /** @deprecated to be removed in IDEA 2020 - use AllIcons.General.SplitUp */ + /** @deprecated to be removed in IDEA 2020 - use AllIcons.General.ArrowUp */ @SuppressWarnings("unused") @Deprecated - public static final Icon UP = AllIcons.General.SplitUp; + public static final Icon UP = AllIcons.General.ArrowUp; } @@ -785,8 +785,13 @@ public class AllIcons { public static final Icon Add = IconLoader.getIcon("/general/add.svg"); // 16x16 public static final Icon AddFavoritesList = IconLoader.getIcon("/general/addFavoritesList.svg"); // 16x16 public static final Icon AddJdk = IconLoader.getIcon("/general/addJdk.svg"); // 16x16 - public static final Icon ArrowDown = IconLoader.getIcon("/general/arrowDown.png"); // 7x6 - public static final Icon ArrowDown_white = IconLoader.getIcon("/general/arrowDown_white.png"); // 7x6 + public static final Icon ArrowDown = IconLoader.getIcon("/general/arrowDown.svg"); // 16x16 + public static final Icon ArrowDownSmall = IconLoader.getIcon("/general/arrowDownSmall.svg"); // 9x5 + public static final Icon ArrowLeft = IconLoader.getIcon("/general/arrowLeft.svg"); // 16x16 + public static final Icon ArrowRight = IconLoader.getIcon("/general/arrowRight.svg"); // 16x16 + public static final Icon ArrowSplitCenterH = IconLoader.getIcon("/general/arrowSplitCenterH.svg"); // 16x16 + public static final Icon ArrowSplitCenterV = IconLoader.getIcon("/general/arrowSplitCenterV.svg"); // 16x16 + public static final Icon ArrowUp = IconLoader.getIcon("/general/arrowUp.svg"); // 16x16 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 @@ -798,16 +803,6 @@ public class AllIcons { public static final Icon Bullet = IconLoader.getIcon("/general/bullet.png"); // 16x16 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 Combo = IconLoader.getIcon("/general/combo.png"); // 16x16 - public static final Icon Combo2 = IconLoader.getIcon("/general/combo2.png"); // 16x16 - public static final Icon Combo3 = IconLoader.getIcon("/general/combo3.png"); // 16x16 - public static final Icon ComboArrow = IconLoader.getIcon("/general/comboArrow.png"); // 16x16 - public static final Icon ComboArrowDown = IconLoader.getIcon("/general/comboArrowDown.png"); // 9x5 - public static final Icon ComboArrowLeft = IconLoader.getIcon("/general/comboArrowLeft.png"); // 5x9 - public static final Icon ComboArrowLeftPassive = IconLoader.getIcon("/general/comboArrowLeftPassive.png"); // 5x9 - public static final Icon ComboArrowRight = IconLoader.getIcon("/general/comboArrowRight.png"); // 5x9 - public static final Icon ComboArrowRightPassive = IconLoader.getIcon("/general/comboArrowRightPassive.png"); // 5x9 - public static final Icon ComboBoxButtonArrow = IconLoader.getIcon("/general/comboBoxButtonArrow.png"); // 16x16 public static final Icon ComboUpPassive = IconLoader.getIcon("/general/comboUpPassive.png"); // 16x16 public static final Icon ContextHelp = IconLoader.getIcon("/general/contextHelp.png"); // 16x16 public static final Icon CopyHovered = IconLoader.getIcon("/general/copyHovered.svg"); // 16x16 @@ -904,14 +899,8 @@ public class AllIcons { public static final Icon Show_to_implement = IconLoader.getIcon("/general/show_to_implement.png"); // 16x16 public static final Icon Show_to_override = IconLoader.getIcon("/general/show_to_override.png"); // 16x16 public static final Icon SmallConfigurableVcs = IconLoader.getIcon("/general/smallConfigurableVcs.png"); // 16x16 - public static final Icon SplitCenterH = IconLoader.getIcon("/general/splitCenterH.png"); // 7x7 - public static final Icon SplitCenterV = IconLoader.getIcon("/general/splitCenterV.png"); // 6x7 - public static final Icon SplitDown = IconLoader.getIcon("/general/splitDown.png"); // 7x7 public static final Icon SplitGlueH = IconLoader.getIcon("/general/splitGlueH.png"); // 6x17 public static final Icon SplitGlueV = IconLoader.getIcon("/general/splitGlueV.png"); // 17x6 - public static final Icon SplitLeft = IconLoader.getIcon("/general/splitLeft.png"); // 7x7 - public static final Icon SplitRight = IconLoader.getIcon("/general/splitRight.png"); // 7x7 - public static final Icon SplitUp = IconLoader.getIcon("/general/splitUp.png"); // 7x7 public static final Icon Tab_white_center = IconLoader.getIcon("/general/tab-white-center.png"); // 1x17 public static final Icon Tab_white_left = IconLoader.getIcon("/general/tab-white-left.png"); // 4x17 public static final Icon Tab_white_right = IconLoader.getIcon("/general/tab-white-right.png"); // 4x17 @@ -936,6 +925,11 @@ public class AllIcons { public static final Icon ZoomIn = IconLoader.getIcon("/general/zoomIn.svg"); // 16x16 public static final Icon ZoomOut = IconLoader.getIcon("/general/zoomOut.svg"); // 16x16 + /** @deprecated to be removed in IDEA 2020 - use AllIcons.General.ArrowDown */ + @SuppressWarnings("unused") + @Deprecated + public static final Icon ArrowDown_white = AllIcons.General.ArrowDown; + /** @deprecated to be removed in IDEA 2020 - AllIcons.General.Pin_tab */ @SuppressWarnings("unused") @Deprecated @@ -961,6 +955,56 @@ public class AllIcons { @Deprecated public static final Icon CollapseAllHover = IconLoader.getIcon("/actions/collapseall.svg"); // 16x16 + /** @deprecated to be removed in IDEA 2020 - use AllIcons.General.ArrowDown */ + @SuppressWarnings("unused") + @Deprecated + public static final Icon Combo = AllIcons.General.ArrowDown; + + /** @deprecated to be removed in IDEA 2020 - use AllIcons.General.ArrowDown */ + @SuppressWarnings("unused") + @Deprecated + public static final Icon Combo2 = AllIcons.General.ArrowDown; + + /** @deprecated to be removed in IDEA 2020 - use AllIcons.General.ArrowDown */ + @SuppressWarnings("unused") + @Deprecated + public static final Icon Combo3 = AllIcons.General.ArrowDown; + + /** @deprecated to be removed in IDEA 2020 - use AllIcons.General.ArrowDown */ + @SuppressWarnings("unused") + @Deprecated + public static final Icon ComboArrow = AllIcons.General.ArrowDown; + + /** @deprecated to be removed in IDEA 2020 - use AllIcons.General.ArrowDownSmall */ + @SuppressWarnings("unused") + @Deprecated + public static final Icon ComboArrowDown = AllIcons.General.ArrowDownSmall; + + /** @deprecated to be removed in IDEA 2020 - use AllIcons.General.ArrowLeft */ + @SuppressWarnings("unused") + @Deprecated + public static final Icon ComboArrowLeft = AllIcons.General.ArrowLeft; + + /** @deprecated to be removed in IDEA 2020 - use AllIcons.General.ArrowLeft */ + @SuppressWarnings("unused") + @Deprecated + public static final Icon ComboArrowLeftPassive = AllIcons.General.ArrowLeft; + + /** @deprecated to be removed in IDEA 2020 - use AllIcons.General.ArrowRight */ + @SuppressWarnings("unused") + @Deprecated + public static final Icon ComboArrowRight = AllIcons.General.ArrowRight; + + /** @deprecated to be removed in IDEA 2020 - use AllIcons.General.ArrowRight */ + @SuppressWarnings("unused") + @Deprecated + public static final Icon ComboArrowRightPassive = AllIcons.General.ArrowRight; + + /** @deprecated to be removed in IDEA 2020 - use AllIcons.General.ArrowDown */ + @SuppressWarnings("unused") + @Deprecated + public static final Icon ComboBoxButtonArrow = AllIcons.General.ArrowDown; + /** @deprecated to be removed in IDEA 2020 */ @SuppressWarnings("unused") @Deprecated @@ -1091,6 +1135,36 @@ public class AllIcons { @Deprecated public static final Icon SecondaryGroup = AllIcons.General.GearPlain; + /** @deprecated to be removed in IDEA 2020 - use AllIcons.General.ArrowSplitCenterH */ + @SuppressWarnings("unused") + @Deprecated + public static final Icon SplitCenterH = AllIcons.General.ArrowSplitCenterH; + + /** @deprecated to be removed in IDEA 2020 - use AllIcons.General.ArrowSplitCenterV */ + @SuppressWarnings("unused") + @Deprecated + public static final Icon SplitCenterV = AllIcons.General.ArrowSplitCenterV; + + /** @deprecated to be removed in IDEA 2020 - use AllIcons.General.ArrowDown */ + @SuppressWarnings("unused") + @Deprecated + public static final Icon SplitDown = AllIcons.General.ArrowDown; + + /** @deprecated to be removed in IDEA 2020 - use AllIcons.General.ArrowLeft */ + @SuppressWarnings("unused") + @Deprecated + public static final Icon SplitLeft = AllIcons.General.ArrowLeft; + + /** @deprecated to be removed in IDEA 2020 - use AllIcons.General.ArrowRight */ + @SuppressWarnings("unused") + @Deprecated + public static final Icon SplitRight = AllIcons.General.ArrowRight; + + /** @deprecated to be removed in IDEA 2020 - use AllIcons.General.ArrowUp */ + @SuppressWarnings("unused") + @Deprecated + public static final Icon SplitUp = AllIcons.General.ArrowUp; + /** @deprecated to be removed in IDEA 2020 */ @SuppressWarnings("unused") @Deprecated diff --git a/platform/util/src/com/intellij/openapi/ui/Splitter.java b/platform/util/src/com/intellij/openapi/ui/Splitter.java index 3fb5db334449..516b6f9c3918 100644 --- a/platform/util/src/com/intellij/openapi/ui/Splitter.java +++ b/platform/util/src/com/intellij/openapi/ui/Splitter.java @@ -558,7 +558,7 @@ public class Splitter extends JPanel implements Splittable { int leftInsetArrow = 0; int leftInsetIcon = 1; - JLabel splitDownLabel = new JLabel(isVerticalSplit ? AllIcons.General.SplitDown : AllIcons.General.SplitRight); + JLabel splitDownLabel = new JLabel(isVerticalSplit ? AllIcons.General.ArrowDown : AllIcons.General.ArrowRight); splitDownLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); splitDownLabel.setToolTipText(isVerticalSplit ? UIBundle.message("splitter.down.tooltip.text") : UIBundle .message("splitter.right.tooltip.text")); @@ -577,7 +577,7 @@ public class Splitter extends JPanel implements Splittable { new GridBagConstraints(2 * xMask, 2 * yMask, 1, 1, 0, 0, GridBagConstraints.CENTER, glueFill, new Insets(0, leftInsetIcon, 0, 0), 0, 0)); JLabel splitCenterLabel = - new JLabel(isVerticalSplit ? AllIcons.General.SplitCenterV : AllIcons.General.SplitCenterH); + new JLabel(isVerticalSplit ? AllIcons.General.ArrowSplitCenterV : AllIcons.General.ArrowSplitCenterH); splitCenterLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); splitCenterLabel.setToolTipText(UIBundle.message("splitter.center.tooltip.text")); new ClickListener() { @@ -594,7 +594,7 @@ public class Splitter extends JPanel implements Splittable { new GridBagConstraints(4 * xMask, 4 * yMask, 1, 1, 0, 0, GridBagConstraints.CENTER, glueFill, new Insets(0, leftInsetIcon, 0, 0), 0, 0)); // - JLabel splitUpLabel = new JLabel(isVerticalSplit ? AllIcons.General.SplitUp : AllIcons.General.SplitLeft); + JLabel splitUpLabel = new JLabel(isVerticalSplit ? AllIcons.General.ArrowUp : AllIcons.General.ArrowLeft); splitUpLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); splitUpLabel.setToolTipText(isVerticalSplit ? UIBundle.message("splitter.up.tooltip.text") : UIBundle .message("splitter.left.tooltip.text")); diff --git a/platform/util/src/com/intellij/util/ui/JBUI.java b/platform/util/src/com/intellij/util/ui/JBUI.java index 1d8a251e7d83..1fe046c7e19a 100644 --- a/platform/util/src/com/intellij/util/ui/JBUI.java +++ b/platform/util/src/com/intellij/util/ui/JBUI.java @@ -1642,8 +1642,8 @@ public class JBUI { @NotNull public static Icon comboTabIcon(boolean hovered) { - return hovered ? getIcon("ToolWindow.header.comboButton.hovered.icon", AllIcons.General.ComboArrow) - : getIcon("ToolWindow.header.comboButton.icon", AllIcons.General.ComboArrow); + return hovered ? getIcon("ToolWindow.header.comboButton.hovered.icon", AllIcons.General.ArrowDown) + : getIcon("ToolWindow.header.comboButton.icon", AllIcons.General.ArrowDown); } } diff --git a/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/code/IpnbCodePanel.java b/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/code/IpnbCodePanel.java index baf6e2130fa6..164fbf9943ec 100644 --- a/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/code/IpnbCodePanel.java +++ b/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/code/IpnbCodePanel.java @@ -219,7 +219,7 @@ public class IpnbCodePanel extends IpnbEditablePanel { private JPanel createToggleBar(OnePixelSplitter splitter) { final JPanel panel = new JPanel(new BorderLayout()); - final JLabel label = new JLabel(AllIcons.General.SplitDown); + final JLabel label = new JLabel(AllIcons.General.ArrowDown); panel.setBackground(IpnbEditorUtil.getBackground()); label.setBackground(IpnbEditorUtil.getBackground()); panel.add(label, BorderLayout.CENTER);