aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/logo-bare.pngbin1234 -> 3371 bytes
-rw-r--r--data/logo-bare.svg100
-rw-r--r--debian/control2
-rw-r--r--src/logo-generator.vala13
4 files changed, 108 insertions, 7 deletions
diff --git a/data/logo-bare.png b/data/logo-bare.png
index 0e44a97..663bac0 100644
--- a/data/logo-bare.png
+++ b/data/logo-bare.png
Binary files differ
diff --git a/data/logo-bare.svg b/data/logo-bare.svg
new file mode 100644
index 0000000..0620269
--- /dev/null
+++ b/data/logo-bare.svg
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="470.7738"
+ height="210.26215"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.5 r10040"
+ sodipodi:docname="logo-bare.svg"
+ inkscape:export-filename="/home/mike/MyDocuments/4projects/arctica-upstream/arctica-greeter.upstream/arctica-greeter/data/logo-bare.png"
+ inkscape:export-xdpi="18.73"
+ inkscape:export-ydpi="18.73">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.46477892"
+ inkscape:cx="391.54635"
+ inkscape:cy="-380.2376"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:window-width="956"
+ inkscape:window-height="1041"
+ inkscape:window-x="0"
+ inkscape:window-y="18"
+ inkscape:window-maximized="0" />
+ <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></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-33.970784,-772.30859)">
+ <text
+ xml:space="preserve"
+ style="font-size:97.97971344px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Cabin;-inkscape-font-specification:Cabin"
+ x="566.74701"
+ y="840.24817"
+ id="text2985"
+ sodipodi:linespacing="125%"
+ transform="scale(0.90951716,1.0994845)"><tspan
+ sodipodi:role="line"
+ x="566.74701"
+ y="840.24817"
+ id="tspan2991"
+ style="font-size:156.76754761px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:end;text-anchor:end;fill:#b3b3b3;font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold">Arctica</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Cabin;-inkscape-font-specification:Cabin"
+ x="124.84286"
+ y="820.93359"
+ id="text2997"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan2999"
+ x="124.84286"
+ y="820.93359"
+ style="font-size:64px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#b3b3b3;font-family:Droid Sans;-inkscape-font-specification:Droid Sans">The</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Cabin;-inkscape-font-specification:Cabin"
+ x="259.9072"
+ y="981.88715"
+ id="text3001"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3003"
+ x="259.9072"
+ y="981.88715"
+ style="font-size:70px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#b3b3b3;font-family:Droid Sans;-inkscape-font-specification:Droid Sans">Greeter</tspan></text>
+ </g>
+</svg>
diff --git a/debian/control b/debian/control
index 24423b3..a1c3b7b 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: at-spi2-core,
dbus-x11,
debhelper (>= 9),
dh-autoreconf,
- fonts-cantarell,
+ fonts-droid,
gnome-common,
gnome-settings-daemon-dev,
libcanberra-dev,
diff --git a/src/logo-generator.vala b/src/logo-generator.vala
index 14cde0d..50f9091 100644
--- a/src/logo-generator.vala
+++ b/src/logo-generator.vala
@@ -22,21 +22,22 @@ public class Main : Object
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.ImageSurface surface = new Cairo.ImageSurface (Cairo.Format.ARGB32, 245, 44);
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());
+ context.set_source_rgb (0.7, 0.7, 0.7);
+ context.translate (logo.get_width() + 0.1*logo.get_height(), logo.get_height());
+ context.move_to (10, -24);
var font_description = new Pango.FontDescription();
- font_description.set_family("Cantarell");
- font_description.set_size((int)(0.75*logo.get_height() * Pango.SCALE));
+ font_description.set_family("Droid Sans");
+ font_description.set_size((int)(0.4*logo.get_height() * Pango.SCALE));
var layout = Pango.cairo_create_layout (context);
layout.set_font_description (font_description);
+ layout.set_spacing (10);
layout.set_text (text, -1);
Pango.cairo_show_layout_line(context, layout.get_line(0));