diff --git a/community-resources/src/idea/IdeaApplicationInfo.xml b/community-resources/src/idea/IdeaApplicationInfo.xml index 22d5c616bac0..e99d21cf4c23 100644 --- a/community-resources/src/idea/IdeaApplicationInfo.xml +++ b/community-resources/src/idea/IdeaApplicationInfo.xml @@ -4,7 +4,7 @@ - + diff --git a/platform/platform-impl/src/com/intellij/ide/actions/AboutDialog.java b/platform/platform-impl/src/com/intellij/ide/actions/AboutDialog.java index ebc6a994c3ca..2c37fa367136 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/AboutDialog.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/AboutDialog.java @@ -284,7 +284,8 @@ public class AboutDialog extends JDialog { public void render(int indentX, int indentY, List lines) throws OverflowException { x = indentX; y = indentY; - g2.setColor(Color.white); //todo[kb] move to ApplicationInfo.xml + ApplicationInfoEx appInfo = (ApplicationInfoEx)ApplicationInfo.getInstance(); + g2.setColor(appInfo.getAboutForeground()); for (int i = 0; i < lines.size(); i++) { AboutBoxLine line = lines.get(i); final String s = line.getText(); diff --git a/platform/platform-impl/src/com/intellij/openapi/application/ex/ApplicationInfoEx.java b/platform/platform-impl/src/com/intellij/openapi/application/ex/ApplicationInfoEx.java index 12cf9a12453a..0f59f64bb033 100644 --- a/platform/platform-impl/src/com/intellij/openapi/application/ex/ApplicationInfoEx.java +++ b/platform/platform-impl/src/com/intellij/openapi/application/ex/ApplicationInfoEx.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -94,6 +94,8 @@ public abstract class ApplicationInfoEx extends ApplicationInfo { public abstract String getMacKeymapUrl(); + public abstract Color getAboutForeground(); + public interface UpdateUrls { String getCheckingUrl(); String getPatchesUrl(); diff --git a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java index 1c93b3849f38..fc39f7044666 100644 --- a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java @@ -50,6 +50,7 @@ public class ApplicationInfoImpl extends ApplicationInfoEx implements JDOMExtern private String myCompanyName = "JetBrains s.r.o."; private String myCompanyUrl = "http://www.jetbrains.com/"; private Color myProgressColor = null; + private Color myAboutForeground = Color.black; private Icon myProgressTailIcon = null; private int myProgressY = 350; @@ -103,6 +104,7 @@ public class ApplicationInfoImpl extends ApplicationInfoEx implements JDOMExtern @NonNls private static final String ATTRIBUTE_URL = "url"; @NonNls private static final String ATTRIBUTE_TEXT_COLOR = "textcolor"; @NonNls private static final String ATTRIBUTE_PROGRESS_COLOR = "progressColor"; + @NonNls private static final String ATTRIBUTE_ABOUT_FOREGROUND_COLOR = "foreground"; @NonNls private static final String ATTRIBUTE_PROGRESS_Y = "progressY"; @NonNls private static final String ATTRIBUTE_PROGRESS_TAIL_ICON = "progressTailIcon"; @NonNls private static final String ELEMENT_ABOUT = "about"; @@ -326,6 +328,11 @@ public class ApplicationInfoImpl extends ApplicationInfoEx implements JDOMExtern return myMacKeymapUrl; } + @Override + public Color getAboutForeground() { + return myAboutForeground; + } + public String getFullApplicationName() { @NonNls StringBuilder buffer = new StringBuilder(); buffer.append(getVersionName()); @@ -444,6 +451,11 @@ public class ApplicationInfoImpl extends ApplicationInfoEx implements JDOMExtern Element aboutLogoElement = parentNode.getChild(ELEMENT_ABOUT); if (aboutLogoElement != null) { myAboutImageUrl = aboutLogoElement.getAttributeValue(ATTRIBUTE_URL); + + String v = aboutLogoElement.getAttributeValue(ATTRIBUTE_ABOUT_FOREGROUND_COLOR); + if (v != null) { + myAboutForeground = parseColor(v); + } } Element iconElement = parentNode.getChild(ELEMENT_ICON);