Merge lp:~mjs7231/do/force-classic-window into lp:do

[MShepanski]

Adds a boolean gconf option named ForceClassicWindow. This will force GnomeDo to use the ClassicWindow class when rendering the main UI. I found this is actually a better alternative to running compisited when in Virtualbox Seamless mode.

There is no UI option for this in the Gnome-Do preferences. I noticed the preference options change when running in ClassicWindow() mode, thus I thought this option is pretty too low level to be tinkering with in that area.

[lp:~mjs7231/do/force-classic-window]

1373. By MShepanski on 2012-02-20

Add gconf option to force classic window

=== modified file 'Do/src/CorePreferences.cs'
--- Do/src/CorePreferences.cs	2010-12-04 09:56:11 +0000
+++ Do/src/CorePreferences.cs	2012-02-20 04:46:23 +0000
@@ -35,11 +35,13 @@
 		const string QuietStartKey = "QuietStart";
 		const string StartAtLoginKey = "StartAtLogin";
 		const string AlwaysShowResultsKey = "AlwaysShowResults";
+		const string ForceClassicWindowKey = "ForceClassicWindow";
 
 		const string ThemeDefaultValue = "Classic";
 		const bool QuietStartDefaultValue = false;
 		const bool StartAtLoginDefaultValue = false;
 		const bool AlwaysShowResultsDefaultValue = false;
+		const bool ForceClassicWindowDefaultValue = false;
 		const string TextModeKeybindingDefaultValue = "period";
 		const string SummonKeybindingDefaultValue = "<Super>space";
 
@@ -91,6 +93,11 @@
 			set { if (AlwaysShowResults != value) Preferences.Set (AlwaysShowResultsKey, value); }
 		}
 		
+		public bool ForceClassicWindow {
+			get { return Preferences.Get (ForceClassicWindowKey, ForceClassicWindowDefaultValue); }
+			set { if (ForceClassicWindow != value) Preferences.Set (ForceClassicWindowKey, value); }
+		}
+		
 		static bool HasOption (string option)
 		{
 			return Env.GetCommandLineArgs ().Contains (option);
 
=== modified file 'Do/src/Do.Core/Controller.cs'
--- Do/src/Do.Core/Controller.cs	2012-02-05 10:43:22 +0000
+++ Do/src/Do.Core/Controller.cs	2012-02-20 04:46:23 +0000
@@ -218,7 +218,7 @@
 			
 			Orientation = ControlOrientation.Vertical;
 
-			if (Screen.Default.IsComposited) {
+			if ((Screen.Default.IsComposited) && (!Do.Preferences.ForceClassicWindow)) {
 				window = InterfaceManager.MaybeGetInterfaceNamed (themeName) ?? new ClassicWindow ();
 			} else {
 				window = new ClassicWindow ();
 
=== modified file 'data/gnome-do.schemas.in'
--- data/gnome-do.schemas.in	2010-12-04 09:56:11 +0000
+++ data/gnome-do.schemas.in	2012-02-20 04:46:23 +0000
@@ -70,5 +70,17 @@
       </locale>
     </schema>
 
+    <schema>
+      <key>/schemas/apps/gnome-do/preferences/Do/CorePreferences/ForceClassicWindow</key>
+      <applyto>/apps/gnome-do/preferences/Do/CorePreferences/ForceClassicWindow</applyto>
+      <owner>gnome-do</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+         <short>Force classic window</short>
+         <long>Force classic window rendering (disable composite rendering).</long>
+      </locale>
+    </schema>
+
   </schemalist>
 </gconfschemafile>