Merge lp:~profzoom/lightdm-gtk-greeter/add-mate-badge into lp:~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk

[Doug Torrance]

Hello!

This patch adds a MATE session badge to LightDM GTK+ Greeter. I'm proposing this addition at the request of the Ubuntu MATE packagers [1].

Thanks!
Doug Torrance

[1] https://code.launchpad.net/~profzoom/ubuntu/vivid/mate-session-manager/mate-session-manager-fix-1393010/+merge/241874

[Simon Steinbeiß (ochosi)]

Hi!

First of all thanks for the merge-request. It's a good idea to add a Mate badge to the greeter.
However, the icon you proposed is not ideal:
 * file-size is 10-times as big as any other badge (clean up the svg)
 * the icon is blurry (the lines are not aligned on the grid)

As soon as that's cleaned up, I'm happy to merge it in. If you don't know how to go about doing this, I can help you, but it might take a week or so until I get to it, I'm quite busy atm.

review: Needs Fixing

[Doug Torrance (profzoom)]

Thanks for the review! I'll try and clean it up.

[lp:~profzoom/lightdm-gtk-greeter/add-mate-badge]

312. By Doug Torrance on 2014-12-02

Modified MATE badge; clearer and smaller filesize.

[Doug Torrance (profzoom)]

I've worked on the MATE badge a bit more, and now it's much smaller (1.9 kB) and less blurry.

Also, would there be any interest in adding a Window Maker badge?

[Simon Steinbeiß (ochosi)]

Thanks for updating the icon – that's much better! :) I could imagine it could be a little optimized in terms of aligning the lines of the circle and the rectangle on the grid.

I'm totally open to including more/new badges, however I don't use Window Maker nor do I have it installed for testing, so I'd have to rely on you that the badge-name is correct.

[lp:~profzoom/lightdm-gtk-greeter/add-mate-badge]

313. By Doug Torrance on 2014-12-03

Align lines to grid in MATE badge.

314. By Doug Torrance on 2014-12-03

Add Window Maker badge.

[Doug Torrance (profzoom)]

I'm still a relative newbie to Inkscape, but I think everything is aligned nicely to the grid now.

I also went ahead and pushed a Window Maker badge. I've tested it and the name is correct.

[Simon Steinbeiß (ochosi)]

Well done, Doug! Both badges are fine, just checked them. I'll try to merge them asap unless someone else beats me to it.

review: Approve

[Simon Steinbeiß (ochosi)]

Just as a note for future MRs: please re-submit a merge-request with a clean branch so that we don't pollute the bzr history with "failed attempts", if you know what I mean ;)
I pushed the two badges to the repo directly in your name. Thanks again for the MR.

[Doug Torrance (profzoom)]

Thanks for the note -- I'll keep that in mind for the future.

[Daniel Holbach (dholbach)]

Hum... should they go into unity-greeter-badges maybe? Which licenses are the icons under? Wherever it's supposed to be added, can somebody add a d/changelog entry?

review: Needs Fixing

[Martin Wimpress  (flexiondotorg)]

dolhack, Ubuntu MATE use lightdm-gtk-greeter. I can't use unity-greeter since it pulls in practically all on Unity and GNOME3.

The MATE badge is GPL. I can't comment on the Window Maker badge.

[Daniel Holbach (dholbach)]

Ok. I just remembered there was some "badges" package somewhere. Looks like it wasn't the right one.

Which GPL? d/copyright is already a bit crowded, but it should be the place where this is defined.

review: Needs Information

[Martin Wimpress  (flexiondotorg)]

The MATE icon theme is distributed under the terms of either GNU LGPL v.3 or Creative Commons BY-SA 3.0 license.

[Daniel Holbach (dholbach)]

That should be documented in d/copyright then.

[Doug Torrance (profzoom)]

The Window Maker icon is based on [1], which was released into the public domain (CC0).

[1] http://commons.wikimedia.org/wiki/File:GNUstep_logo.svg

[Simon Steinbeiß (ochosi)]

Hey Doug,
I think Daniel is right. Would you mind filing another MR adding the license information to d/copyright? Thanks in advance!

[Doug Torrance (profzoom)]

Sure, but where? There's no debian directory in lp:lightdm-gtk-greeter. I would think that ideally, I would submit a patch to the Debian maintainers. However, the Ubuntu package seems to have diverged from Debian (1.8.5-2 in sid, 1.9.0-0ubuntu1 in vivid). And neither package has incorporated these badges yet.

[Simon Steinbeiß (ochosi)]

@Doug, yeah, you're right. The greeter currently sucks a bit in terms of providing licensing information. We might add a LICENSE file at some point, then I'll go back here and add the information about the icons as well. Thanks anyway!

=== added file 'data/badges/mate_badge-symbolic.svg'
--- data/badges/mate_badge-symbolic.svg	1970-01-01 00:00:00 +0000
+++ data/badges/mate_badge-symbolic.svg	2014-12-03 14:05:50 +0000
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg2" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata id="metadata7">
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g id="layer2" display="none" transform="translate(0,-6)">
+  <rect id="rect4898" fill-rule="nonzero" height="22" width="22" y="0" x="0" fill="#333"/>
+ </g>
+ <g id="layer3" display="none" transform="translate(0,-6)">
+  <rect id="rect4126" fill-rule="nonzero" height="22" width="22" y="0" x="0" fill="#efebe7"/>
+ </g>
+ <g id="layer1" transform="matrix(1.0319689,0,0,1.0563566,-0.69397664,-6.778957)" stroke-miterlimit="4" stroke-width="0" fill="#bebebe">
+  <path id="path5070" fill-rule="evenodd" d="m1.6415,10.204,6.7832,3.7866-6.7832,3.7866z"/>
+  <path id="path5067" d="m15.208,13.991c0-3.658-3.131-6.6271-6.7834-6.6271-2.109,0-4.1361,1.0094-5.348,2.5503l0.85177,0.47616c1.034-1.2658,2.7359-2.0798,4.4963-2.0798,3.1115-1E-7,5.8141,2.5683,5.8141,5.6799,0,3.1115-2.7025,5.6799-5.8141,5.6799-1.7553,0-3.5475-0.92376-4.5815-2.183l-0.84886,0.47427c1.2122,1.5345,3.3264,2.6554,5.4304,2.6554,3.6524,0,6.7832-2.9686,6.7832-6.6266z"/>
+  <path id="path5648" d="m12.301,13.99c0-2.2361-1.64-3.7866-3.8761-3.7866-1.1905,0-2.0368,0.32699-2.7782,1.1454l0.8789,0.49036c0.55229-0.54547,1.065-0.68916,1.8993-0.68916,1.6896,0,2.9071,1.1392,2.9071,2.84s-1.2175,2.84-2.9071,2.84c-0.84982,0-1.4491-0.21841-2.0039-0.78193l-0.86824,0.48468c0.74137,0.81851,1.6817,1.2439,2.8722,1.2439,2.2361,0,3.8761-1.5505,3.8761-3.7866z"/>
+ </g>
+</svg>

=== added file 'data/badges/wmaker-common_badge-symbolic.svg'
--- data/badges/wmaker-common_badge-symbolic.svg	1970-01-01 00:00:00 +0000
+++ data/badges/wmaker-common_badge-symbolic.svg	2014-12-03 14:05:50 +0000
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
+<svg id="svg888" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata id="metadata10">
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <path id="path148" d="M8,1c-3.8429,0-7,3.157-7,7,0,1.77,0.9107,3.7715,2,5h3v-5h4v-5h3c-1.274-1.4009-2.959-2-5-2zm5,2c1.1245,1.2366,2,3.1982,2,5,0,3.8428-3.157,7-7,7-2.073,0-3.7242-0.56089-5-2h-2v2h14v-12h-2z" fill-rule="evenodd" stroke-width="1pt" fill="#bebebe"/>
+</svg>