diff --git a/platform/icons/src/general/icon-robots.txt b/platform/icons/src/general/icon-robots.txt index 35f00e5dc593..6a39d41036ab 100644 --- a/platform/icons/src/general/icon-robots.txt +++ b/platform/icons/src/general/icon-robots.txt @@ -8,6 +8,7 @@ deprecated: ijLogo.png; to be removed in IDEA 2020 deprecated: importProject.png -> /toolbarDecorator/import.svg; to be removed in IDEA 2020 - use AllIcons.ToolbarDecorator.Import deprecated: jdk.png; to be removed in IDEA 2020 deprecated: keymap.png; to be removed in IDEA 2020 +deprecated: openProject.png -> /actions/menu-open.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Menu_open deprecated: packagesTab.png -> /nodes/copyOfFolder.svg; to be removed in IDEA 2020 - use AllIcons.Nodes.CopyOfFolder deprecated: progress.png; to be removed in IDEA 2020 deprecated: projectSettings.png -> /general/gearPlain.svg; to be removed in IDEA 2020 - use AllIcons.General.GearPlain diff --git a/platform/icons/src/general/openProject.png b/platform/icons/src/general/openProject.png index 0ec9a4f90d43..044483bedfa9 100644 Binary files a/platform/icons/src/general/openProject.png and b/platform/icons/src/general/openProject.png differ diff --git a/platform/icons/src/general/openProject@2x.png b/platform/icons/src/general/openProject@2x.png deleted file mode 100644 index fc746899d022..000000000000 Binary files a/platform/icons/src/general/openProject@2x.png and /dev/null differ diff --git a/platform/icons/src/welcome/icon-robots.txt b/platform/icons/src/welcome/icon-robots.txt index 1eb55a82c728..87fd4c424adc 100644 --- a/platform/icons/src/welcome/icon-robots.txt +++ b/platform/icons/src/welcome/icon-robots.txt @@ -1,2 +1,3 @@ deprecated: CreateNewProjectfromExistingFiles.png -> /toolbarDecorator/import.svg; to be removed in IDEA 2020 - use AllIcons.ToolbarDecorator.Import deprecated: importProject.png -> /toolbarDecorator/import.svg; to be removed in IDEA 2020 - use AllIcons.ToolbarDecorator.Import +deprecated: openProject.png -> /actions/menu-open.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Menu_open diff --git a/platform/icons/src/welcome/openProject.png b/platform/icons/src/welcome/openProject.png index b8b43ec947e1..044483bedfa9 100644 Binary files a/platform/icons/src/welcome/openProject.png and b/platform/icons/src/welcome/openProject.png differ diff --git a/platform/icons/src/welcome/openProject@2x.png b/platform/icons/src/welcome/openProject@2x.png deleted file mode 100644 index 9db08c9dea38..000000000000 Binary files a/platform/icons/src/welcome/openProject@2x.png and /dev/null differ diff --git a/platform/platform-impl/src/com/intellij/ide/actions/OpenFileAction.java b/platform/platform-impl/src/com/intellij/ide/actions/OpenFileAction.java index 517c36567022..39933f426e7a 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/OpenFileAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/OpenFileAction.java @@ -79,7 +79,7 @@ public class OpenFileAction extends AnAction implements DumbAware { @Override public void update(@NotNull AnActionEvent e) { if (NewWelcomeScreen.isNewWelcomeScreen(e)) { - e.getPresentation().setIcon(AllIcons.Welcome.OpenProject); + e.getPresentation().setIcon(AllIcons.Actions.Menu_open); } } diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java index 218dafecd9bd..92608c4f24b3 100644 --- a/platform/util/src/com/intellij/icons/AllIcons.java +++ b/platform/util/src/com/intellij/icons/AllIcons.java @@ -755,7 +755,11 @@ public class AllIcons { public static final Icon NotificationWarning = IconLoader.getIcon("/general/notificationWarning.png"); // 24x24 public static final Icon OpenDisk = IconLoader.getIcon("/general/openDisk.svg"); // 16x16 public static final Icon OpenDiskHover = IconLoader.getIcon("/general/openDiskHover.svg"); // 16x16 - public static final Icon OpenProject = IconLoader.getIcon("/general/openProject.png"); // 32x32 + + /** @deprecated to be removed in IDEA 2020 - use AllIcons.Actions.Menu_open */ + @SuppressWarnings("unused") + @Deprecated + public static final Icon OpenProject = IconLoader.getIcon("/actions/menu-open.svg"); // 16x16 public static final Icon OverridenMethod = IconLoader.getIcon("/general/overridenMethod.png"); // 10x14 public static final Icon OverridingMethod = IconLoader.getIcon("/general/overridingMethod.png"); // 10x14 @@ -1695,7 +1699,11 @@ public class AllIcons { @SuppressWarnings("unused") @Deprecated public static final Icon ImportProject = IconLoader.getIcon("/toolbarDecorator/import.svg"); // 16x16 - public static final Icon OpenProject = IconLoader.getIcon("/welcome/openProject.png"); // 16x16 + + /** @deprecated to be removed in IDEA 2020 - use AllIcons.Actions.Menu_open */ + @SuppressWarnings("unused") + @Deprecated + public static final Icon OpenProject = IconLoader.getIcon("/actions/menu-open.svg"); // 16x16 public static class Project { public static final Icon Remove_hover = IconLoader.getIcon("/welcome/project/remove-hover.png"); // 10x10 diff --git a/platform/util/src/com/intellij/openapi/util/DeprecatedDuplicatesIconPathPatcher.java b/platform/util/src/com/intellij/openapi/util/DeprecatedDuplicatesIconPathPatcher.java index 9a728a05b150..8ec0868609c0 100644 --- a/platform/util/src/com/intellij/openapi/util/DeprecatedDuplicatesIconPathPatcher.java +++ b/platform/util/src/com/intellij/openapi/util/DeprecatedDuplicatesIconPathPatcher.java @@ -37,6 +37,11 @@ public class DeprecatedDuplicatesIconPathPatcher extends IconPathPatcher { ourDeprecatedIconsReplacements.put("/debugger/readHelp.png", "AllIcons.Actions.Help"); ourDeprecatedIconsReplacements.put("/debugger/readHelp.svg", "AllIcons.Actions.Help"); + ourDeprecatedIconsReplacements.put("/general/openProject.png", "AllIcons.Actions.Menu_open"); + ourDeprecatedIconsReplacements.put("/general/openProject.svg", "AllIcons.Actions.Menu_open"); + ourDeprecatedIconsReplacements.put("/welcome/openProject.png", "AllIcons.Actions.Menu_open"); + ourDeprecatedIconsReplacements.put("/welcome/openProject.svg", "AllIcons.Actions.Menu_open"); + ourDeprecatedIconsReplacements.put("/debugger/threadStates/io.png", "AllIcons.Actions.Menu_saveall"); ourDeprecatedIconsReplacements.put("/debugger/threadStates/io.svg", "AllIcons.Actions.Menu_saveall"); diff --git a/python/ide/src/META-INF/pycharm-core.xml b/python/ide/src/META-INF/pycharm-core.xml index 849fa0051f8e..1afa5e3e847c 100644 --- a/python/ide/src/META-INF/pycharm-core.xml +++ b/python/ide/src/META-INF/pycharm-core.xml @@ -112,7 +112,7 @@ - + diff --git a/resources/src/idea/RichPlatformActions.xml b/resources/src/idea/RichPlatformActions.xml index aa8f4af61cec..3453bbf7055f 100644 --- a/resources/src/idea/RichPlatformActions.xml +++ b/resources/src/idea/RichPlatformActions.xml @@ -373,7 +373,7 @@ - +