Merge lp:~xnox/unity-greeter/off-the-grid into lp:unity-greeter

[Dimitri John Ledkov]

Use logo-generator, to override /stock/ logo with an uptodate one.

I've fetched the ubuntu logo svg transparent mask from design.ubuntu.com, and trimmed to have no padding.
Then I've applied all the grid layout metrics and the logo exclusion areas metrics.
And finally, i've extended the logo with pango rendered logo-version strapline, fetched from a gsettings key.
Surprisingly, we don't have a tool that will print "16.04 LTS" (when one is running it, regardless if it's in development or became stable). I'll file a separate bug about it against ubuntu-distro-info.
Anyone, with this branch it means that we simply need to change default key and rebuild the package.
(Or we can add a gsettings key override to e.g. base-files package which consolidates most of the files that need to have "current ubuntu version strings and identifiers").

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1123
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~xnox/unity-greeter/off-the-grid/+merge/205896/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/33/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-armhf-ci/16

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

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

Robert, I forget but I seem to recall there was a reason we couldn't auto-generate the words?

[Iain Lane (laney)]

Notwithstanding ↑, we agreed on #ubuntu-desktop to generate this at build-time. Thus the gsettings key goes away.

There's a wishlist item to have ubuntu-distro-info able to support the text (it almost can currently with -r), so we can do `ubuntu-distro-info -C trusty -r' or something. But that's not essential - having to change the string would be fine.

review: Needs Fixing

[Dimitri John Ledkov (xnox)]

I had a quick chat about this with seb, and he'd prefer image was generated
at buildtime instead of using a dconf key. I believe the metrics are
correct (including proper glyths of LT in ubuntu font) I'll generate stand
alone logo for lightdm and about computer and get them validated with
design next time I'm in the office.
On 12 Feb 2014 15:09, "Michael Terry" <email address hidden> wrote:

> Robert, I forget but I seem to recall there was a reason we couldn't
> auto-generate the words?
> --
> https://code.launchpad.net/~xnox/unity-greeter/off-the-grid/+merge/205896
> You are the owner of lp:~xnox/unity-greeter/off-the-grid.
>

[Robert Ancell (robert-ancell)]

> Robert, I forget but I seem to recall there was a reason we couldn't auto-
> generate the words?

I think it was just that the layout got quite complicated and design didn't specify anything other than "use this image".

[lp:~xnox/unity-greeter/off-the-grid]

1124. By Dimitri John Ledkov on 2014-02-18

Use logo-generator, to override /stock/ logo with an uptodate one.

[Dimitri John Ledkov (xnox)]

I've now done the logo-generator as a standalone binary, which is executed from debian/rules to override the stock logo with an up-to-date one.

Patch for distro-info is submitted to bdrung to print requested release string, need to fix it up. So until distro-info is available the string is passed via debian/rules.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1124
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~xnox/unity-greeter/off-the-grid/+merge/205896/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/34/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-armhf-ci/17

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

review: Needs Fixing (continuous-integration)

[Robert Ancell (robert-ancell)]

review: Approve

[Robert Ancell (robert-ancell)]

<seb128> robert_ancell, hey, xnox pinged around eod for Laney and he said he would have a look tomorrow, but I'm sure he's going to be fine if you ack it

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file '.bzrignore'
--- .bzrignore	2012-09-04 09:47:10 +0000
+++ .bzrignore	2014-02-18 17:58:03 +0000
@@ -20,6 +20,8 @@
 src/*.c
 src/unity_greeter_vala.stamp
 src/unity-greeter
+src/logo-generator
+src/logo_generator_vala.stamp
 tests/*.c
 tests/unity_greeter_test_vala.stamp
 tests/unity-greeter-test

=== added file 'data/logo-bare.png'
Binary files data/logo-bare.png	1970-01-01 00:00:00 +0000 and data/logo-bare.png	2014-02-18 17:58:03 +0000 differ
=== modified file 'debian/rules'
--- debian/rules	2013-06-26 07:25:01 +0000
+++ debian/rules	2014-02-18 17:58:03 +0000
@@ -8,3 +8,15 @@
 override_dh_autoreconf:
 	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
 
+
+override_dh_auto_build:
+	dh_auto_build
+	./src/logo-generator --logo data/logo-bare.png --text '14.04 LTS' --output logo.png
+
+override_dh_auto_install:
+	dh_auto_install
+	cp logo.png debian/unity-greeter/usr/share/unity-greeter/logo.png
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f logo.png

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2013-11-12 03:45:00 +0000
+++ src/Makefile.am	2014-02-18 17:58:03 +0000
@@ -1,6 +1,7 @@
 # -*- Mode: Automake; indent-tabs-mode: t; tab-width: 4 -*-
 
 sbin_PROGRAMS = unity-greeter
+noinst_PROGRAMS = logo-generator
 
 unity_greeter_SOURCES = \
 	config.vapi \
@@ -34,6 +35,8 @@
 	user-list.vala \
 	user-prompt-box.vala
 
+logo_generator_SOURCES = logo-generator.vala
+
 unity_greeter_CFLAGS = \
 	$(UNITY_GREETER_CFLAGS) \
 	-w \
@@ -44,6 +47,8 @@
 	-DPKGDATADIR=\""$(pkgdatadir)"\" \
 	-DINDICATORDIR=\""$(INDICATORDIR)"\"
 
+logo_generator_CFLAGS = $(unity_greeter_CFLAGS)
+
 unity_greeter_VALAFLAGS = \
 	--pkg posix \
 	--pkg gtk+-3.0 \
@@ -56,10 +61,14 @@
 	--pkg pixman-1 \
 	--target-glib 2.32
 
+logo_generator_VALAFLAGS = $(unity_greeter_VALAFLAGS)
+
 unity_greeter_LDADD = \
 	$(UNITY_GREETER_LIBS) \
 	-lm
 
+logo_generator_LDADD = $(unity_greeter_LDADD)
+
 unity_greeter_vala.stamp: $(top_srcdir)/config.h
 
 DISTCLEANFILES = \

=== added file 'src/logo-generator.vala'
--- src/logo-generator.vala	1970-01-01 00:00:00 +0000
+++ src/logo-generator.vala	2014-02-18 17:58:03 +0000
@@ -0,0 +1,46 @@
+public class Main : Object
+{
+
+    private static string? file = null;
+    private static string? text = null;
+    private static string? result = null;
+    private const OptionEntry[] options = { 
+	{"logo", 0, 0, OptionArg.FILENAME, ref file, "Path to logo", "LOGO"},
+	{"text", 0, 0, OptionArg.STRING, ref text, "Sublogo text", "TEXT"},
+	{"output", 0, 0, OptionArg.FILENAME, ref result, "Path to rendered output", "OUTPUT"},
+	{null}
+    };
+
+    public static int main(string[] args) {
+	try {
+	    var opt_context = new OptionContext ("- OptionContext example");
+	    opt_context.set_help_enabled (true);
+	    opt_context.add_main_entries (options, null);
+	    opt_context.parse (ref args);
+	} catch (OptionError e) {    
+	    stdout.printf ("error: %s\n", e.message);
+	    stdout.printf ("Run '%s --help' to see a full list of available command line options.\n", args[0]);
+	    return 0;
+	}
+	Cairo.ImageSurface surface = new Cairo.ImageSurface (Cairo.Format.ARGB32, 245, 43);
+	Cairo.Context context = new Cairo.Context (surface);
+	context.translate (42, 11);
+	Cairo.ImageSurface logo = new Cairo.ImageSurface.from_png (file);
+	context.set_source_surface (logo, 0, 0);
+	context.paint();
+
+	context.set_source_rgba (1, 1, 1, 1);
+	context.translate (logo.get_width() + 0.25*logo.get_height(), logo.get_height());
+
+	var font_description = new Pango.FontDescription();
+	font_description.set_family("Ubuntu");
+	font_description.set_size((int)(0.75*logo.get_height() * Pango.SCALE));
+	var layout = Pango.cairo_create_layout (context);
+	layout.set_font_description (font_description);
+	layout.set_text (text, -1);
+	Pango.cairo_show_layout_line(context, layout.get_line(0));
+
+	surface.write_to_png(result);
+	return 0;
+    }
+}