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

Proposed by Ritesh Khadgaray on 2012-04-16
Status: Merged
Merge reported by: Robert Ancell
Merged at revision: not available
Proposed branch: lp:~khadgaray/unity-greeter/default-background-color
Merge into: lp:unity-greeter
Diff against target: 52 lines (+7/-2)
4 files modified
data/com.canonical.unity-greeter.gschema.xml (+4/-0)
src/background.vala (+1/-1)
src/main-window.vala (+1/-1)
src/settings.vala (+1/-0)
To merge this branch: bzr merge lp:~khadgaray/unity-greeter/default-background-color
Reviewer Review Type Date Requested Status
Robert Ancell 2012-04-16 Approve on 2012-04-17
Review via email: mp+102067@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Robert Ancell (robert-ancell) wrote :

Thanks Ritesh!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/com.canonical.unity-greeter.gschema.xml'
2--- data/com.canonical.unity-greeter.gschema.xml 2012-03-01 14:17:05 +0000
3+++ data/com.canonical.unity-greeter.gschema.xml 2012-04-16 08:38:20 +0000
4@@ -5,6 +5,10 @@
5 <default>'/usr/share/backgrounds/warty-final-ubuntu.png'</default>
6 <summary>Background file to use, either an image path or a color (e.g. #772953)</summary>
7 </key>
8+ <key name="background-color" type="s">
9+ <default>'#2C001E'</default>
10+ <summary>Background color (e.g. #772953), set before wallpaper is seen</summary>
11+ </key>
12 <key name="draw-user-backgrounds" type="b">
13 <default>true</default>
14 <summary>Whether to draw user backgrounds</summary>
15
16=== modified file 'src/background.vala'
17--- src/background.vala 2012-04-03 18:00:30 +0000
18+++ src/background.vala 2012-04-16 08:38:20 +0000
19@@ -227,7 +227,7 @@
20 GRID,
21 }
22
23- public string default_background {get; set; default = "#2C001E";}
24+ public string default_background {get; set; default = UGSettings.get_string (UGSettings.KEY_BACKGROUND_COLOR);}
25 public string? current_background {get; set; default = null;}
26 public bool draw_grid {get; set; default = true;}
27 public double alpha {get; private set; default = 1.0;}
28
29=== modified file 'src/main-window.vala'
30--- src/main-window.vala 2012-03-13 14:27:50 +0000
31+++ src/main-window.vala 2012-04-16 08:38:20 +0000
32@@ -37,7 +37,7 @@
33 add_accel_group (accel_group);
34
35 var bg_color = Gdk.RGBA ();
36- bg_color.parse ("#2C001E");
37+ bg_color.parse (UGSettings.get_string (UGSettings.KEY_BACKGROUND_COLOR));
38 override_background_color (Gtk.StateFlags.NORMAL, bg_color);
39 get_accessible ().set_name (_("Login Screen"));
40 has_resize_grip = false;
41
42=== modified file 'src/settings.vala'
43--- src/settings.vala 2012-03-01 14:17:05 +0000
44+++ src/settings.vala 2012-04-16 08:38:20 +0000
45@@ -21,6 +21,7 @@
46 public class UGSettings
47 {
48 public static const string KEY_BACKGROUND = "background";
49+ public static const string KEY_BACKGROUND_COLOR = "background-color";
50 public static const string KEY_DRAW_USER_BACKGROUNDS = "draw-user-backgrounds";
51 public static const string KEY_DRAW_GRID = "draw-grid";
52 public static const string KEY_LOGO = "logo";

Subscribers

People subscribed via source and target branches