From 8bf606bf53321b3a07745d92e29ace2c6daa68b6 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Tue, 18 Sep 2012 04:16:50 +0400 Subject: [PATCH] move to darcula package + small fixes --- .../com/intellij/ide/ui/AppearanceConfigurable.java | 2 +- .../src/com/intellij/ide/ui/laf/IdeaLaf.java | 2 +- .../src/com/intellij/ide/ui/laf/LafManagerImpl.java | 4 +++- .../ide/ui/laf/{ => darcula}/DarculaInstaller.java | 3 ++- .../intellij/ide/ui/laf/{ => darcula}/DarculaLaf.java | 4 +++- .../ui/laf/{ => darcula}/DarculaLookAndFeelInfo.java | 2 +- .../ide/ui/laf/{ => darcula}/DarculaUIUtil.java | 2 +- .../ide/ui/laf/{ => darcula}/darcula.properties | 11 ++++++++--- .../ide/ui/laf/{ => darcula}/darcula_linux.properties | 0 .../ide/ui/laf/{ => darcula}/darcula_mac.properties | 0 .../ui/laf/{ => darcula}/darcula_windows.properties | 2 +- .../{borders => darcula/ui}/DarculaButtonPainter.java | 4 ++-- .../laf/{borders => darcula/ui}/DarculaButtonUI.java | 2 +- .../{borders => darcula/ui}/DarculaCheckBoxUI.java | 4 ++-- .../{borders => darcula/ui}/DarculaRadioButtonUI.java | 4 ++-- 15 files changed, 28 insertions(+), 18 deletions(-) rename platform/platform-impl/src/com/intellij/ide/ui/laf/{ => darcula}/DarculaInstaller.java (95%) rename platform/platform-impl/src/com/intellij/ide/ui/laf/{ => darcula}/DarculaLaf.java (98%) rename platform/platform-impl/src/com/intellij/ide/ui/laf/{ => darcula}/DarculaLookAndFeelInfo.java (96%) rename platform/platform-impl/src/com/intellij/ide/ui/laf/{ => darcula}/DarculaUIUtil.java (96%) rename platform/platform-impl/src/com/intellij/ide/ui/laf/{ => darcula}/darcula.properties (81%) rename platform/platform-impl/src/com/intellij/ide/ui/laf/{ => darcula}/darcula_linux.properties (100%) rename platform/platform-impl/src/com/intellij/ide/ui/laf/{ => darcula}/darcula_mac.properties (100%) rename platform/platform-impl/src/com/intellij/ide/ui/laf/{ => darcula}/darcula_windows.properties (70%) rename platform/platform-impl/src/com/intellij/ide/ui/laf/{borders => darcula/ui}/DarculaButtonPainter.java (95%) rename platform/platform-impl/src/com/intellij/ide/ui/laf/{borders => darcula/ui}/DarculaButtonUI.java (96%) rename platform/platform-impl/src/com/intellij/ide/ui/laf/{borders => darcula/ui}/DarculaCheckBoxUI.java (98%) rename platform/platform-impl/src/com/intellij/ide/ui/laf/{borders => darcula/ui}/DarculaRadioButtonUI.java (97%) diff --git a/platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.java b/platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.java index 07a6c1c91bd9..aec78a771291 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.java @@ -16,7 +16,7 @@ package com.intellij.ide.ui; import com.intellij.ide.IdeBundle; -import com.intellij.ide.ui.laf.DarculaInstaller; +import com.intellij.ide.ui.laf.darcula.DarculaInstaller; import com.intellij.openapi.options.BaseConfigurable; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.ui.ComboBox; diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/IdeaLaf.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/IdeaLaf.java index b38b67663bdf..a90ea276869a 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/IdeaLaf.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/IdeaLaf.java @@ -30,7 +30,7 @@ import java.awt.*; /** * @author Konstantin Bulenkov */ -final class IdeaLaf extends MetalLookAndFeel { +public final class IdeaLaf extends MetalLookAndFeel { public void initComponentDefaults(UIDefaults defaults) { super.initComponentDefaults(defaults); LafManagerImpl.initInputMapDefaults(defaults); diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java index baae945ca031..529684d2f568 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java @@ -20,6 +20,8 @@ import com.intellij.ide.IdeBundle; import com.intellij.ide.ui.LafManager; import com.intellij.ide.ui.LafManagerListener; import com.intellij.ide.ui.UISettings; +import com.intellij.ide.ui.laf.darcula.DarculaLaf; +import com.intellij.ide.ui.laf.darcula.DarculaLookAndFeelInfo; import com.intellij.idea.StartupUtil; import com.intellij.notification.Notification; import com.intellij.notification.NotificationListener; @@ -672,7 +674,7 @@ public final class LafManagerImpl extends LafManager implements ApplicationCompo } @SuppressWarnings({"HardCodedStringLiteral"}) - static void initInputMapDefaults(UIDefaults defaults){ + public static void initInputMapDefaults(UIDefaults defaults){ // Make ENTER work in JTrees InputMap treeInputMap = (InputMap)defaults.get("Tree.focusInputMap"); if(treeInputMap!=null){ // it's really possible. For example, GTK+ doesn't have such map diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/DarculaInstaller.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaInstaller.java similarity index 95% rename from platform/platform-impl/src/com/intellij/ide/ui/laf/DarculaInstaller.java rename to platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaInstaller.java index 44f4ef098fef..cce1b58ba36d 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/DarculaInstaller.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaInstaller.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.ide.ui.laf; +package com.intellij.ide.ui.laf.darcula; +import com.intellij.ide.ui.laf.darcula.DarculaLaf; import com.intellij.openapi.application.ex.ApplicationManagerEx; import com.intellij.openapi.editor.colors.EditorColorsManager; import com.intellij.openapi.editor.colors.EditorColorsScheme; diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/DarculaLaf.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaLaf.java similarity index 98% rename from platform/platform-impl/src/com/intellij/ide/ui/laf/DarculaLaf.java rename to platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaLaf.java index d4d2d6bcd0d4..449e2dc54eab 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/DarculaLaf.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaLaf.java @@ -13,8 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.ide.ui.laf; +package com.intellij.ide.ui.laf.darcula; +import com.intellij.ide.ui.laf.IdeaLaf; +import com.intellij.ide.ui.laf.LafManagerImpl; import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.text.StringUtil; diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/DarculaLookAndFeelInfo.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaLookAndFeelInfo.java similarity index 96% rename from platform/platform-impl/src/com/intellij/ide/ui/laf/DarculaLookAndFeelInfo.java rename to platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaLookAndFeelInfo.java index 8a86baa67ff7..cf8492750b9b 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/DarculaLookAndFeelInfo.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaLookAndFeelInfo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.ide.ui.laf; +package com.intellij.ide.ui.laf.darcula; import com.intellij.ide.IdeBundle; import org.jetbrains.annotations.NonNls; diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/DarculaUIUtil.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaUIUtil.java similarity index 96% rename from platform/platform-impl/src/com/intellij/ide/ui/laf/DarculaUIUtil.java rename to platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaUIUtil.java index ce3a55aa0b92..1dc19e783498 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/DarculaUIUtil.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaUIUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.ide.ui.laf; +package com.intellij.ide.ui.laf.darcula; import com.intellij.util.ui.MacUIUtil; diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula.properties b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties similarity index 81% rename from platform/platform-impl/src/com/intellij/ide/ui/laf/darcula.properties rename to platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties index 1c9fe32465ba..ac009c0d23d2 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula.properties +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties @@ -10,6 +10,11 @@ Tree.textBackground=535353 #Tree.selectionBackground=BEBEBE #Tree.selectionForeground=535353 +EditorPane.background=535353 +EditorPane.inactiveBackground=535353 +EditorPane.foreground=eeeeee +EditorPane.inactiveForeground=eeeeee + #Lists List.background=535353 List.foreground=eeeeee @@ -51,11 +56,11 @@ TextPane.caretForeground=eeeeee CheckBox.background=535353 CheckBox.foreground=eeeeee -CheckBoxUI=com.intellij.ide.ui.laf.borders.DarculaCheckBoxUI +CheckBoxUI=com.intellij.ide.ui.laf.darcula.ui.DarculaCheckBoxUI RadioButton.foreground=eeeeee RadioButton.background=535353 -RadioButtonUI=com.intellij.ide.ui.laf.borders.DarculaRadioButtonUI +RadioButtonUI=com.intellij.ide.ui.laf.darcula.ui.DarculaRadioButtonUI StatusBar.topColor=2c2c2c StatusBar.top2Color=2c2c2c @@ -64,7 +69,7 @@ StatusBar.bottomColor=2c2c2c Button.foreground=eeeeee Button.background=535353 -Button.border=com.intellij.ide.ui.laf.borders.DarculaButtonPainter +Button.border=com.intellij.ide.ui.laf.darcula.ui.DarculaButtonPainter #ButtonUI=com.intellij.ide.ui.laf.borders.DarculaButtonUI MenuItem.acceleratorForeground=eeeeee diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula_linux.properties b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula_linux.properties similarity index 100% rename from platform/platform-impl/src/com/intellij/ide/ui/laf/darcula_linux.properties rename to platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula_linux.properties diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula_mac.properties b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula_mac.properties similarity index 100% rename from platform/platform-impl/src/com/intellij/ide/ui/laf/darcula_mac.properties rename to platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula_mac.properties diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula_windows.properties b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula_windows.properties similarity index 70% rename from platform/platform-impl/src/com/intellij/ide/ui/laf/darcula_windows.properties rename to platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula_windows.properties index 75eb2305015a..8a1da2f96b91 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula_windows.properties +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula_windows.properties @@ -1,4 +1,4 @@ -ButtonUI=com.intellij.ide.ui.laf.borders.DarculaButtonUI +ButtonUI=com.intellij.ide.ui.laf.darcula.ui.DarculaButtonUI Tree.line=909090 Tree.hash=909090 diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/borders/DarculaButtonPainter.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonPainter.java similarity index 95% rename from platform/platform-impl/src/com/intellij/ide/ui/laf/borders/DarculaButtonPainter.java rename to platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonPainter.java index aa22e904825a..6c4e03292e74 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/borders/DarculaButtonPainter.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonPainter.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.ide.ui.laf.borders; +package com.intellij.ide.ui.laf.darcula.ui; -import com.intellij.ide.ui.laf.DarculaUIUtil; +import com.intellij.ide.ui.laf.darcula.DarculaUIUtil; import com.intellij.openapi.ui.GraphicsConfig; import com.intellij.ui.Gray; import com.intellij.util.ui.JBInsets; diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/borders/DarculaButtonUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonUI.java similarity index 96% rename from platform/platform-impl/src/com/intellij/ide/ui/laf/borders/DarculaButtonUI.java rename to platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonUI.java index 0cc3f0162544..13faefbfefde 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/borders/DarculaButtonUI.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonUI.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.ide.ui.laf.borders; +package com.intellij.ide.ui.laf.darcula.ui; import javax.swing.*; import javax.swing.plaf.ComponentUI; diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/borders/DarculaCheckBoxUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaCheckBoxUI.java similarity index 98% rename from platform/platform-impl/src/com/intellij/ide/ui/laf/borders/DarculaCheckBoxUI.java rename to platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaCheckBoxUI.java index a613627d3f69..0ee953b5df32 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/borders/DarculaCheckBoxUI.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaCheckBoxUI.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.ide.ui.laf.borders; +package com.intellij.ide.ui.laf.darcula.ui; -import com.intellij.ide.ui.laf.DarculaUIUtil; +import com.intellij.ide.ui.laf.darcula.DarculaUIUtil; import com.intellij.openapi.ui.GraphicsConfig; import com.intellij.ui.Gray; import com.intellij.util.ui.EmptyIcon; diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/borders/DarculaRadioButtonUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaRadioButtonUI.java similarity index 97% rename from platform/platform-impl/src/com/intellij/ide/ui/laf/borders/DarculaRadioButtonUI.java rename to platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaRadioButtonUI.java index 95d296b8e814..fd40939d1604 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/borders/DarculaRadioButtonUI.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaRadioButtonUI.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.ide.ui.laf.borders; +package com.intellij.ide.ui.laf.darcula.ui; -import com.intellij.ide.ui.laf.DarculaUIUtil; +import com.intellij.ide.ui.laf.darcula.DarculaUIUtil; import com.intellij.openapi.ui.GraphicsConfig; import com.intellij.openapi.util.SystemInfo; import com.intellij.ui.Gray;