Merge lp:~khadgaray/unity-greeter/default-background-color into lp:unity-greeter

[Ritesh Khadgaray]

lp# 969059 - Default background colour hardcoded to #2C001E

[Robert Ancell (robert-ancell)]

Thanks Ritesh!

review: Approve

=== modified file 'data/com.canonical.unity-greeter.gschema.xml'
--- data/com.canonical.unity-greeter.gschema.xml	2012-03-01 14:17:05 +0000
+++ data/com.canonical.unity-greeter.gschema.xml	2012-04-16 08:38:20 +0000
@@ -5,6 +5,10 @@
       <default>'/usr/share/backgrounds/warty-final-ubuntu.png'</default>
       <summary>Background file to use, either an image path or a color (e.g. #772953)</summary>
     </key>
+    <key name="background-color" type="s">
+      <default>'#2C001E'</default>
+      <summary>Background color (e.g. #772953), set before wallpaper is seen</summary>
+    </key>
     <key name="draw-user-backgrounds" type="b">
       <default>true</default>
       <summary>Whether to draw user backgrounds</summary>

=== modified file 'src/background.vala'
--- src/background.vala	2012-04-03 18:00:30 +0000
+++ src/background.vala	2012-04-16 08:38:20 +0000
@@ -227,7 +227,7 @@
         GRID,
     }
 
-    public string default_background {get; set; default = "#2C001E";}
+    public string default_background {get; set; default = UGSettings.get_string (UGSettings.KEY_BACKGROUND_COLOR);}
     public string? current_background {get; set; default = null;}
     public bool draw_grid {get; set; default = true;}
     public double alpha {get; private set; default = 1.0;}

=== modified file 'src/main-window.vala'
--- src/main-window.vala	2012-03-13 14:27:50 +0000
+++ src/main-window.vala	2012-04-16 08:38:20 +0000
@@ -37,7 +37,7 @@
         add_accel_group (accel_group);
 
         var bg_color = Gdk.RGBA ();
-        bg_color.parse ("#2C001E");
+        bg_color.parse (UGSettings.get_string (UGSettings.KEY_BACKGROUND_COLOR));
         override_background_color (Gtk.StateFlags.NORMAL, bg_color);
         get_accessible ().set_name (_("Login Screen"));
         has_resize_grip = false;

=== modified file 'src/settings.vala'
--- src/settings.vala	2012-03-01 14:17:05 +0000
+++ src/settings.vala	2012-04-16 08:38:20 +0000
@@ -21,6 +21,7 @@
 public class UGSettings
 {
     public static const string KEY_BACKGROUND = "background";
+    public static const string KEY_BACKGROUND_COLOR = "background-color";
     public static const string KEY_DRAW_USER_BACKGROUNDS = "draw-user-backgrounds";
     public static const string KEY_DRAW_GRID = "draw-grid";
     public static const string KEY_LOGO = "logo";