From ee07ae74f0225d78ccb9c787b1685807e1eebb19 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@gmail.com>
Date: Wed, 4 Jun 2014 14:44:03 +0200
Subject: [PATCH] Terminal: Bug 435360 - [TERMINALS] [CSS] [Dark] Terminal view
 should integrate well into the Eclipse dark theme

Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
---
 .../org.eclipse.tm.terminal/build.properties  |  7 +++----
 ...rg.eclipse.tm.terminal.stylesheet.dark.css | 15 +++++++++++++++
 plugins/org.eclipse.tm.terminal/plugin.xml    | 19 +++++++++++++------
 .../TerminalPreferenceInitializer.java        |  7 +++----
 4 files changed, 34 insertions(+), 14 deletions(-)
 create mode 100644 plugins/org.eclipse.tm.terminal/css/org.eclipse.tm.terminal.stylesheet.dark.css

diff --git a/plugins/org.eclipse.tm.terminal/build.properties b/plugins/org.eclipse.tm.terminal/build.properties
index 4e15103613f..48cda7c3c5b 100644
--- a/plugins/org.eclipse.tm.terminal/build.properties
+++ b/plugins/org.eclipse.tm.terminal/build.properties
@@ -27,14 +27,13 @@ bin.includes = .,\
                about.properties,\
                tm32.png,\
                icons/,\
-               HelpContexts.xml
+               HelpContexts.xml,\
+               css/
                
 source.. = src/
 output.. = bin/
 src.includes = schema/,\
-               about.html,\
-               .settings/,\
-               build.properties
+               about.html
 javacSource=1.4
 javacTarget=1.4
                
diff --git a/plugins/org.eclipse.tm.terminal/css/org.eclipse.tm.terminal.stylesheet.dark.css b/plugins/org.eclipse.tm.terminal/css/org.eclipse.tm.terminal.stylesheet.dark.css
new file mode 100644
index 00000000000..cd50b799e79
--- /dev/null
+++ b/plugins/org.eclipse.tm.terminal/css/org.eclipse.tm.terminal.stylesheet.dark.css
@@ -0,0 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2014 vogella GmbH and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Lars Vogel <Lars.Vogel@gmail.com> - initial API and implementation
+ ******************************************************************************/
+
+IEclipsePreferences {
+	preferences:
+	"TerminalPrefInvertColors=true"
+}
diff --git a/plugins/org.eclipse.tm.terminal/plugin.xml b/plugins/org.eclipse.tm.terminal/plugin.xml
index e1dd04d0e2c..d9ea23975d4 100644
--- a/plugins/org.eclipse.tm.terminal/plugin.xml
+++ b/plugins/org.eclipse.tm.terminal/plugin.xml
@@ -229,21 +229,20 @@
             sequence="M3+ARROW_UP"/>
    </extension>
 
-   <extension
-         point="org.eclipse.ui.preferencePages">
+   <extension point="org.eclipse.ui.preferencePages">
       <page
             name="%terminal.preferences.name"
             class="org.eclipse.tm.internal.terminal.preferences.TerminalPreferencePage"
             id="org.eclipse.tm.terminal.TerminalPreferencePage">
       </page>
    </extension>
-   <extension
-         point="org.eclipse.core.runtime.preferences">
+
+   <extension point="org.eclipse.core.runtime.preferences">
       <initializer class="org.eclipse.tm.internal.terminal.preferences.TerminalPreferenceInitializer"/>
       <modifier class="org.eclipse.tm.internal.terminal.preferences.PreferenceModifyListener"/>
    </extension>
-   <extension
-         point="org.eclipse.ui.themes" id="terminal.font">
+
+   <extension point="org.eclipse.ui.themes" id="terminal.font">
       <fontDefinition
             defaultsTo="org.eclipse.jface.textfont"
             id="terminal.views.view.font.definition"
@@ -253,5 +252,13 @@
          </description>
       </fontDefinition>
    </extension>
+   
+<!-- Theme contributions -->   
+   <extension point="org.eclipse.e4.ui.css.swt.theme">
+      <stylesheet
+            uri="css/org.eclipse.tm.terminal.stylesheet.dark.css">
+            <themeid refid="org.eclipse.e4.ui.css.theme.e4_dark"/>
+      </stylesheet>
+   </extension>
 
 </plugin>
diff --git a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferenceInitializer.java b/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferenceInitializer.java
index 58f17c21318..6f54de48e44 100644
--- a/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferenceInitializer.java
+++ b/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferenceInitializer.java
@@ -24,8 +24,7 @@ public class TerminalPreferenceInitializer extends AbstractPreferenceInitializer
 	}
 
 	public void initializeDefaultPreferences() {
-		//DefaultScope.INSTANCE was only added in Eclipse 3.7 - we want to be compatible further back
-		IEclipsePreferences defaultPrefs = new DefaultScope().getNode(TerminalPlugin.PLUGIN_ID);
+		IEclipsePreferences defaultPrefs = DefaultScope.INSTANCE.getNode(TerminalPlugin.PLUGIN_ID);
 		defaultPrefs.putBoolean(ITerminalConstants.PREF_INVERT_COLORS, ITerminalConstants.DEFAULT_INVERT_COLORS);
 		defaultPrefs.putInt(ITerminalConstants.PREF_BUFFERLINES, ITerminalConstants.DEFAULT_BUFFERLINES);
         migrateTerminalPreferences();
@@ -36,10 +35,10 @@ public class TerminalPreferenceInitializer extends AbstractPreferenceInitializer
 	 */
 	public static void migrateTerminalPreferences() {
 		//InstanceScope.INSTANCE was only added in Eclipse 3.7 - we want to be compatible further back
-		IEclipsePreferences prefs = new InstanceScope().getNode(TerminalPlugin.PLUGIN_ID);
+		IEclipsePreferences prefs = InstanceScope.INSTANCE.getNode(TerminalPlugin.PLUGIN_ID);
 		if (!prefs.getBoolean(ITerminalConstants.PREF_HAS_MIGRATED, false)) {
 			prefs.putBoolean(ITerminalConstants.PREF_HAS_MIGRATED, true);
-			PreferenceModifyListener.migrateTerminalPreferences(new InstanceScope().getNode("")); //$NON-NLS-1$
+			PreferenceModifyListener.migrateTerminalPreferences(InstanceScope.INSTANCE.getNode("")); //$NON-NLS-1$
 		}
 	}