From fcfef16a56b65a282af59d3e7c47f94d9290ca78 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Sat, 9 Nov 2013 01:13:22 +0100 Subject: [PATCH] remove big JI sign --- .../src/idea/IdeaApplicationInfo.xml | 2 +- .../fileEditor/impl/EditorsSplitters.java | 16 ++++++++-------- .../intellij/openapi/wm/impl/IdePanePanel.java | 16 ++++++++++++---- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/community-resources/src/idea/IdeaApplicationInfo.xml b/community-resources/src/idea/IdeaApplicationInfo.xml index 1a80a08ec813..084236c06f0b 100644 --- a/community-resources/src/idea/IdeaApplicationInfo.xml +++ b/community-resources/src/idea/IdeaApplicationInfo.xml @@ -15,7 +15,7 @@ - + diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorsSplitters.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorsSplitters.java index 06a8f792b4ce..d29cbcbe7a15 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorsSplitters.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorsSplitters.java @@ -165,22 +165,22 @@ public class EditorsSplitters extends IdePanePanel { g.setFont(UIUtil.getLabelFont().deriveFont(isDarkBackground ? 24f : 20f)); final UIUtil.TextPainter painter = new UIUtil.TextPainter().withLineSpacing(1.5f); - painter.withShadow(true, new JBColor(Gray._200.withAlpha(100), Gray._0.withAlpha(200))); + painter.withShadow(true, new JBColor(Gray._200.withAlpha(100), Gray._0.withAlpha(255))); - painter.appendLine("No files are open").underlined(new JBColor(isDarkBackground ? Gray._210 : Gray._150, Gray._100)); + painter.appendLine("No files are open").underlined(new JBColor(Gray._150, Gray._180)); final Shortcut[] shortcuts = KeymapManager.getInstance().getActiveKeymap().getShortcuts(IdeActions.ACTION_SEARCH_EVERYWHERE); final String everywhere; if (shortcuts.length == 0) { - everywhere = "Search Everywhere with Double " + (SystemInfo.isMac ? MacKeymapUtil.SHIFT : "Shift"); + everywhere = "Search Everywhere with Double " + (SystemInfo.isMac ? MacKeymapUtil.SHIFT : "Shift"); } else { - everywhere = "Search Everywhere " + KeymapUtil.getShortcutsText(shortcuts); + everywhere = "Search Everywhere " + KeymapUtil.getShortcutsText(shortcuts); } - painter.appendLine(everywhere).smaller().withBullet(); + painter.appendLine(everywhere + "").smaller().withBullet(); if (!isProjectViewVisible()) { - painter.appendLine("Open Project View with " + KeymapUtil.getShortcutText(new KeyboardShortcut( - KeyStroke.getKeyStroke((SystemInfo.isMac ? "meta" : "alt") + " 1"), null))).smaller().withBullet(); + painter.appendLine("Open Project View with " + KeymapUtil.getShortcutText(new KeyboardShortcut( + KeyStroke.getKeyStroke((SystemInfo.isMac ? "meta" : "alt") + " 1"), null)) + "").smaller().withBullet(); } painter.appendLine("Open a file by name with " + getActionShortcutText("GotoFile")).smaller().withBullet() @@ -207,7 +207,7 @@ public class EditorsSplitters extends IdePanePanel { } } - return shortcutText; + return "" + shortcutText + ""; } public void writeExternal(final Element element) { diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdePanePanel.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdePanePanel.java index 5c4ced614496..d953b4df62e2 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdePanePanel.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdePanePanel.java @@ -15,11 +15,9 @@ */ package com.intellij.openapi.wm.impl; -import com.intellij.icons.AllIcons; import com.intellij.openapi.application.ex.ApplicationInfoEx; import com.intellij.openapi.util.IconLoader; import com.intellij.ui.components.JBPanel; -import com.intellij.util.PlatformUtils; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.Nullable; @@ -50,7 +48,7 @@ public class IdePanePanel extends JBPanel { @Nullable public static Icon getIdeBackgroundImage() { - return UIUtil.isUnderDarcula() && !PlatformUtils.isCidr() ? AllIcons.Frame_background : null; + return null; } @Nullable @@ -64,9 +62,19 @@ public class IdePanePanel extends JBPanel { return null; } + @Override + protected void paintCenterImage(Graphics g) { + final Icon image = getCenterImage(); + if (image != null) { + final int x = (getWidth() - image.getIconWidth()) / 2; + final int y = ((getHeight() - 222) / 2 - image.getIconHeight()) / 2; + image.paintIcon(this, g, x, y); + } + } + @Nullable public static Color getIdeBackgroundColor() { Color result = UIUtil.getSlightlyDarkerColor(UIUtil.getPanelBackground()); - return UIUtil.isUnderDarcula() ? result : UIUtil.getSlightlyDarkerColor(UIUtil.getSlightlyDarkerColor(result)); + return UIUtil.isUnderDarcula() ? new Color(40, 40, 41) : UIUtil.getSlightlyDarkerColor(UIUtil.getSlightlyDarkerColor(result)); } }