diff --git a/platform/lang-impl/src/com/intellij/application/options/CodeCompletion.form b/platform/lang-impl/src/com/intellij/application/options/CodeCompletion.form
index d2ad379b5095..fde3af664bf1 100644
--- a/platform/lang-impl/src/com/intellij/application/options/CodeCompletion.form
+++ b/platform/lang-impl/src/com/intellij/application/options/CodeCompletion.form
@@ -163,11 +163,12 @@
-
+
+
+
-
diff --git a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
index 4bbf9e05fdcd..08dd429b4b17 100644
--- a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
+++ b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
@@ -87,7 +87,7 @@ public abstract class DialogWrapper {
/**
* The shared instance of default border for dialog's content pane.
*/
- public static final Border ourDefaultBorder = BorderFactory.createEmptyBorder(8, 8, 8, 8);
+ public static final Border ourDefaultBorder = BorderFactory.createEmptyBorder(5, 8, 5, 5);
private float myHorizontalStretch = 1.0f;
private float myVerticalStretch = 1.0f;
diff --git a/platform/platform-api/src/com/intellij/ui/components/JBLabel.java b/platform/platform-api/src/com/intellij/ui/components/JBLabel.java
index dae48251e83e..ee69cf36d76a 100644
--- a/platform/platform-api/src/com/intellij/ui/components/JBLabel.java
+++ b/platform/platform-api/src/com/intellij/ui/components/JBLabel.java
@@ -20,15 +20,17 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
+import java.awt.*;
public class JBLabel extends JLabel {
- private UIUtil.Style myStyle = UIUtil.Style.REGULAR;
+ private UIUtil.ComponentStyle myComponentStyle = UIUtil.ComponentStyle.REGULAR;
+ private UIUtil.FontColor myFontColor = UIUtil.FontColor.NORMAL;
public JBLabel() {
}
- public JBLabel(@NotNull UIUtil.Style style) {
- setStyle(style);
+ public JBLabel(@NotNull UIUtil.ComponentStyle componentStyle) {
+ setComponentStyle(componentStyle);
}
public JBLabel(@Nullable Icon image) {
@@ -39,9 +41,9 @@ public class JBLabel extends JLabel {
super(text);
}
- public JBLabel(@NotNull String text, @NotNull UIUtil.Style style) {
+ public JBLabel(@NotNull String text, @NotNull UIUtil.ComponentStyle componentStyle) {
super(text);
- setStyle(style);
+ setComponentStyle(componentStyle);
}
public JBLabel(@NotNull String text, int horizontalAlignment) {
@@ -56,12 +58,26 @@ public class JBLabel extends JLabel {
super(text, icon, horizontalAlignment);
}
- public void setStyle(@NotNull UIUtil.Style style) {
- myStyle = style;
- UIUtil.applyStyle(style, this);
+ public void setComponentStyle(@NotNull UIUtil.ComponentStyle componentStyle) {
+ myComponentStyle = componentStyle;
+ UIUtil.applyStyle(componentStyle, this);
}
- public UIUtil.Style getStyle() {
- return myStyle;
+ public UIUtil.ComponentStyle getComponentStyle() {
+ return myComponentStyle;
+ }
+
+ public UIUtil.FontColor getFontColor() {
+ return myFontColor;
+ }
+
+ public void setFontColor(@NotNull UIUtil.FontColor fontColor) {
+ myFontColor = fontColor;
+ setForeground(null);
+ }
+
+ @Override
+ public void setForeground(Color fg) {
+ super.setForeground(UIUtil.getLabelFontColor(myFontColor));
}
}
diff --git a/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroListEditor.form b/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroListEditor.form
index a7a1454e8230..907c810e0f96 100644
--- a/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroListEditor.form
+++ b/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroListEditor.form
@@ -83,10 +83,11 @@
-
+
-
+
+
diff --git a/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java b/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java
index 13d86fda5d30..efb6e15dd6ae 100644
--- a/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java
+++ b/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java
@@ -253,7 +253,7 @@ public class BalloonImpl implements Disposable, Balloon, LightweightWindow, Posi
new AwtVisitor(myContent) {
@Override
public boolean visit(Component component) {
- UIUtil.applyStyle(UIUtil.Style.SMALL, component);
+ UIUtil.applyStyle(UIUtil.ComponentStyle.SMALL, component);
return false;
}
};
diff --git a/platform/util/src/com/intellij/util/ui/UIUtil.java b/platform/util/src/com/intellij/util/ui/UIUtil.java
index 7c144205fe6a..c32be464d388 100644
--- a/platform/util/src/com/intellij/util/ui/UIUtil.java
+++ b/platform/util/src/com/intellij/util/ui/UIUtil.java
@@ -69,15 +69,17 @@ public class UIUtil {
private static final String TABLE_DECORATION_KEY = "TABLE_DECORATION_KEY";
private static final Color DECORATED_ROW_BG_COLOR = new Color(242, 245, 249);
- public static void applyStyle(@NotNull Style style, @NotNull Component comp) {
+ public static void applyStyle(@NotNull ComponentStyle componentStyle, @NotNull Component comp) {
if (!(comp instanceof JComponent)) return;
JComponent c = (JComponent)comp;
if (isUnderAquaLookAndFeel()) {
- c.putClientProperty("JComponent.sizeVariant", style == Style.REGULAR ? "regular" : style == Style.SMALL ? "small" : "mini");
+ c.putClientProperty("JComponent.sizeVariant",
+ componentStyle == ComponentStyle.REGULAR ? "regular" : componentStyle == ComponentStyle.SMALL ? "small" : "mini");
} else {
- c.setFont(getFont(style == Style.REGULAR ? FontSize.NORMAL : style == Style.SMALL ? FontSize.SMALL : FontSize.MINI, c.getFont()));
+ c.setFont(getFont(
+ componentStyle == ComponentStyle.REGULAR ? FontSize.NORMAL : componentStyle == ComponentStyle.SMALL ? FontSize.SMALL : FontSize.MINI, c.getFont()));
}
Container p = c.getParent();
if (p != null) {
@@ -86,6 +88,9 @@ public class UIUtil {
}
public enum FontSize { NORMAL, SMALL, MINI }
+ public enum ComponentStyle {REGULAR, SMALL, MINI}
+ public enum FontColor {NORMAL, BRIGHTER}
+
public static final char MNEMONIC = 0x1B;
@NonNls public static final String HTML_MIME = "text/html";
@@ -268,21 +273,28 @@ public class UIUtil {
}
@NotNull
- public static Font getBorderFont(@NotNull UIUtil.FontSize size, boolean isBold) {
+ public static Font getBorderFont(@NotNull FontSize size, boolean isBold) {
Font defFont = getBorderFont();
- if (size == UIUtil.FontSize.SMALL) {
+ if (size == FontSize.SMALL) {
defFont = defFont.deriveFont(defFont.getSize() - 2f);
- if (isBold) {
- defFont = defFont.deriveFont(Font.BOLD);
- }
- return defFont;
+ }
+ if (size == FontSize.MINI) {
+ defFont = defFont.deriveFont(defFont.getSize() - 4f);
}
if (isBold) {
- return defFont.deriveFont(Font.BOLD);
+ defFont = defFont.deriveFont(Font.BOLD);
}
return defFont;
}
+ public static Color getLabelFontColor(FontColor fontColor) {
+ Color defColor = getLabelForeground();
+ if (fontColor == FontColor.BRIGHTER) {
+ return new Color(Math.min(defColor.getRed() + 50, 255), Math.min(defColor.getGreen() + 50, 255), Math.min(defColor.getBlue() + 50, 255));
+ }
+ return defColor;
+ }
+
public static Font getLabelFont() {
return UIManager.getFont("Label.font");
}
@@ -2368,8 +2380,6 @@ public class UIUtil {
return c instanceof JFrame || c instanceof JDialog || c instanceof JWindow || c instanceof JRootPane;
}
- public enum Style {REGULAR, SMALL, MINI}
-
public static Timer createNamedTimer(@NonNls @NotNull final String name, int delay, @NotNull ActionListener listener) {
return new Timer(delay, listener){
@Override
diff --git a/plugins/android/src/org/jetbrains/android/actions/CreateResourceDialog.form b/plugins/android/src/org/jetbrains/android/actions/CreateResourceDialog.form
index 734008d2f03e..efaa03fc30f8 100644
--- a/plugins/android/src/org/jetbrains/android/actions/CreateResourceDialog.form
+++ b/plugins/android/src/org/jetbrains/android/actions/CreateResourceDialog.form
@@ -68,7 +68,7 @@
-
+
diff --git a/plugins/android/src/org/jetbrains/android/actions/CreateResourceDirectoryDialog.form b/plugins/android/src/org/jetbrains/android/actions/CreateResourceDirectoryDialog.form
index cfddb01914ee..13ff3aa495d2 100644
--- a/plugins/android/src/org/jetbrains/android/actions/CreateResourceDirectoryDialog.form
+++ b/plugins/android/src/org/jetbrains/android/actions/CreateResourceDirectoryDialog.form
@@ -16,7 +16,7 @@
-
+
diff --git a/plugins/android/src/org/jetbrains/android/uipreview/EditConfigurationDialog.form b/plugins/android/src/org/jetbrains/android/uipreview/EditConfigurationDialog.form
index 7bf0adafdcd3..0ce695dc42af 100644
--- a/plugins/android/src/org/jetbrains/android/uipreview/EditConfigurationDialog.form
+++ b/plugins/android/src/org/jetbrains/android/uipreview/EditConfigurationDialog.form
@@ -13,20 +13,27 @@
+
+
+
-
+
+
+
+
+
-
+
diff --git a/plugins/github/src/org/jetbrains/plugins/github/ui/GithubLoginPanel.form b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubLoginPanel.form
index 218243985ea7..f49d8b000bdd 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/ui/GithubLoginPanel.form
+++ b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubLoginPanel.form
@@ -3,7 +3,7 @@
-
+
@@ -15,16 +15,13 @@
-
-
-
-
+
@@ -32,7 +29,7 @@
-
+
@@ -49,7 +46,6 @@
-
@@ -59,9 +55,6 @@
-
-
-
@@ -73,7 +66,7 @@
-
+
@@ -83,16 +76,12 @@
-
-
-
-
diff --git a/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSettingsPanel.form b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSettingsPanel.form
index bfa08dd66df5..e9abc4bf0eb4 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSettingsPanel.form
+++ b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSettingsPanel.form
@@ -3,7 +3,7 @@
-
+
@@ -21,7 +21,7 @@
-
+
@@ -29,7 +29,7 @@
-
+
@@ -73,7 +73,7 @@
-
+
@@ -89,7 +89,6 @@
-
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenEnvironmentForm.form b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenEnvironmentForm.form
index 489d2f9b65e1..8b85c839ece1 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenEnvironmentForm.form
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenEnvironmentForm.form
@@ -1,6 +1,6 @@
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.form b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.form
index 39c1082ef4c7..b5b70f229a4e 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.form
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.form
@@ -3,7 +3,7 @@
-
+
@@ -110,7 +110,6 @@
-