From ad54349fec3b4a221c17584d2a3ecbdce3cdeb5e Mon Sep 17 00:00:00 2001 From: Maxim Shafirov Date: Fri, 1 Oct 2010 20:28:54 +0400 Subject: [PATCH] Let's try with Monaco as default font on Macs, Patch UI defaults for CIDR: don't show toolbar, toolwindow buttons, action icons in menus. --- .../src/com/intellij/ide/ui/UISettings.java | 10 ++++++++++ .../editor/colors/impl/AbstractColorsScheme.java | 3 ++- .../src/DefaultColorSchemesManager.xml | 1 - 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/platform/platform-api/src/com/intellij/ide/ui/UISettings.java b/platform/platform-api/src/com/intellij/ide/ui/UISettings.java index ac0ab5c2635b..faf5a650cb18 100644 --- a/platform/platform-api/src/com/intellij/ide/ui/UISettings.java +++ b/platform/platform-api/src/com/intellij/ide/ui/UISettings.java @@ -97,10 +97,20 @@ public class UISettings implements PersistentStateComponent, Exporta /** Invoked by reflection */ public UISettings(){ + tweakPlatformDefaults(); myListenerList=new EventListenerList(); setSystemFontFaceAndSize(); } + private void tweakPlatformDefaults() { + // TODO: Make it pluggable + if ("CIDR".equalsIgnoreCase(System.getProperty("idea.platform.prefix"))) { + HIDE_TOOL_STRIPES = true; + SHOW_MAIN_TOOLBAR = false; + SHOW_ICONS_IN_MENUS = false; + } + } + /** * * @deprecated use {@link UISettings#addUISettingsListener(com.intellij.ide.ui.UISettingsListener, Disposable disposable)} instead diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java b/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java index c81dcb748153..a9a2ebc99e0b 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java @@ -26,6 +26,7 @@ import com.intellij.openapi.editor.markup.EffectType; import com.intellij.openapi.editor.markup.TextAttributes; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.InvalidDataException; +import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.WriteExternalException; import com.intellij.util.containers.HashMap; import gnu.trove.THashMap; @@ -53,7 +54,7 @@ public abstract class AbstractColorsScheme implements EditorColorsScheme { protected Map myColorsMap = new HashMap(); protected Map myAttributesMap = new HashMap(); - @NonNls private static final String DEFAULT_FONT_NAME = "Courier"; + @NonNls private static final String DEFAULT_FONT_NAME = SystemInfo.isMac ? "Monaco" : "Courier"; @NonNls private static final String EDITOR_FONT_NAME = "EDITOR_FONT_NAME"; @NonNls protected static final String SCHEME_NAME = "SCHEME_NAME"; protected DefaultColorSchemesManager myDefaultColorSchemesManager; diff --git a/platform/platform-resources/src/DefaultColorSchemesManager.xml b/platform/platform-resources/src/DefaultColorSchemesManager.xml index f25474c33e1c..4171f2d7fa02 100644 --- a/platform/platform-resources/src/DefaultColorSchemesManager.xml +++ b/platform/platform-resources/src/DefaultColorSchemesManager.xml @@ -2,7 +2,6 @@