Unity Greeter

Merge lp:~robert-ancell/unity-greeter/show-hostname into lp:unity-greeter

  1. show-hostname
  2. Merge into trunk
Proposed by Robert Ancell
Status: Merged
Approved by: Robert Ancell
Approved revision: 1019
Merged at revision: 1131
Proposed branch: lp:~robert-ancell/unity-greeter/show-hostname
Merge into: lp:unity-greeter
Diff against target: 77 lines (+21/-12)
4 files modified
data/com.canonical.unity-greeter.gschema.xml (+4/-0)
src/main-window.vala (+1/-0)
src/menubar.vala (+15/-12)
src/settings.vala (+1/-0)
To merge this branch: bzr merge lp:~robert-ancell/unity-greeter/show-hostname
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Robert Ancell Approve
Review via email: mp+194645@code.launchpad.net

Commit message

Add option to disable hostname in login screen

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1017
http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/24/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-armhf-ci/7

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-greeter-ci/24/rebuild

review: Approve (continuous-integration)
Revision history for this message
Robert Ancell (robert-ancell) wrote :

No-one else is checking these MPs...

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-greeter-autolanding/12/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3779
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-amd64-autolanding/4/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-armhf-autolanding/4

review: Needs Fixing (continuous-integration)
lp:~robert-ancell/unity-greeter/show-hostname updated
1018. By Robert Ancell

Merge with trunk

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1018
http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/26/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-amd64-ci/9/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-armhf-ci/9

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-greeter-ci/26/rebuild

review: Needs Fixing (continuous-integration)
lp:~robert-ancell/unity-greeter/show-hostname updated
1019. By Robert Ancell

Kick Jenkins

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1019
http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/31/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-armhf-ci/14

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-greeter-ci/31/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/com.canonical.unity-greeter.gschema.xml'
--- data/com.canonical.unity-greeter.gschema.xml 2013-10-03 13:59:34 +0000
+++ data/com.canonical.unity-greeter.gschema.xml 2014-01-17 20:00:51 +0000
@@ -17,6 +17,10 @@
17 <default>true</default>17 <default>true</default>
18 <summary>Whether to draw an overlay grid</summary>18 <summary>Whether to draw an overlay grid</summary>
19 </key>19 </key>
20 <key name="show-hostname" type="b">
21 <default>true</default>
22 <summary>Whether to show the hostname in the menubar</summary>
23 </key>
20 <key name="logo" type="s">24 <key name="logo" type="s">
21 <default>'/usr/share/unity-greeter/logo.png'</default>25 <default>'/usr/share/unity-greeter/logo.png'</default>
22 <summary>Logo file to use</summary>26 <summary>Logo file to use</summary>
2327
=== modified file 'src/main-window.vala'
--- src/main-window.vala 2013-11-13 04:28:36 +0000
+++ src/main-window.vala 2014-01-17 20:00:51 +0000
@@ -113,6 +113,7 @@
113 hbox.add (align);113 hbox.add (align);
114114
115 back_button = new FlatButton ();115 back_button = new FlatButton ();
116 back_button.get_accessible ().set_name (_("Back"));
116 back_button.focus_on_click = false;117 back_button.focus_on_click = false;
117 var image = new Gtk.Image.from_file (Path.build_filename (Config.PKGDATADIR, "arrow_left.png", null));118 var image = new Gtk.Image.from_file (Path.build_filename (Config.PKGDATADIR, "arrow_left.png", null));
118 image.show ();119 image.show ();
119120
=== modified file 'src/menubar.vala'
--- src/menubar.vala 2013-10-03 13:59:34 +0000
+++ src/menubar.vala 2014-01-17 20:00:51 +0000
@@ -122,19 +122,22 @@
122122
123 pack_direction = Gtk.PackDirection.RTL;123 pack_direction = Gtk.PackDirection.RTL;
124124
125 var label = new Gtk.Label (Posix.utsname ().nodename);125 if (UGSettings.get_boolean (UGSettings.KEY_SHOW_HOSTNAME))
126 label.show ();126 {
127 var hostname_item = new Gtk.MenuItem ();127 var label = new Gtk.Label (Posix.utsname ().nodename);
128 hostname_item.add (label);128 label.show ();
129 hostname_item.sensitive = false;129 var hostname_item = new Gtk.MenuItem ();
130 hostname_item.right_justified = true;130 hostname_item.add (label);
131 hostname_item.show ();131 hostname_item.sensitive = false;
132 append (hostname_item);132 hostname_item.right_justified = true;
133 hostname_item.show ();
134 append (hostname_item);
133135
134 /* Hack to get a label showing on the menubar */136 /* Hack to get a label showing on the menubar */
135 label.ensure_style ();137 label.ensure_style ();
136 var fg = label.get_style_context ().get_color (Gtk.StateFlags.NORMAL);138 var fg = label.get_style_context ().get_color (Gtk.StateFlags.NORMAL);
137 label.override_color (Gtk.StateFlags.INSENSITIVE, fg);139 label.override_color (Gtk.StateFlags.INSENSITIVE, fg);
140 }
138141
139 /* Prevent dragging the window by the menubar */142 /* Prevent dragging the window by the menubar */
140 try143 try
141144
=== modified file 'src/settings.vala'
--- src/settings.vala 2013-09-20 18:28:43 +0000
+++ src/settings.vala 2014-01-17 20:00:51 +0000
@@ -24,6 +24,7 @@
24 public static const string KEY_BACKGROUND_COLOR = "background-color";24 public static const string KEY_BACKGROUND_COLOR = "background-color";
25 public static const string KEY_DRAW_USER_BACKGROUNDS = "draw-user-backgrounds";25 public static const string KEY_DRAW_USER_BACKGROUNDS = "draw-user-backgrounds";
26 public static const string KEY_DRAW_GRID = "draw-grid";26 public static const string KEY_DRAW_GRID = "draw-grid";
27 public static const string KEY_SHOW_HOSTNAME = "show-hostname";
27 public static const string KEY_LOGO = "logo";28 public static const string KEY_LOGO = "logo";
28 public static const string KEY_BACKGROUND_LOGO = "background-logo";29 public static const string KEY_BACKGROUND_LOGO = "background-logo";
29 public static const string KEY_THEME_NAME = "theme-name";30 public static const string KEY_THEME_NAME = "theme-name";

Subscribers

People subscribed via source and target branches