move to darcula package + small fixes

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;

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);

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

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;

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;

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;

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;
 

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

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

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;

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;

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;

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;