Author: akv
Date: 2010-02-13 01:28:01 +0100 (Sat, 13 Feb 2010)
New Revision: 3192
Added:
trunk/plugins/output-flickr/flickr-logo.svg
Modified:
trunk/plugins/output-flickr/Makefile.am
trunk/plugins/output-flickr/output-flickr.c
Log:
Added flickr logo to flicker exporter.
Modified: trunk/plugins/output-flickr/Makefile.am
===================================================================
--- trunk/plugins/output-flickr/Makefile.am 2010-02-13 00:27:11 UTC (rev
3191)
+++ trunk/plugins/output-flickr/Makefile.am 2010-02-13 00:28:01 UTC (rev
3192)
@@ -1,4 +1,4 @@
-plugindir = $(libdir)/rawstudio/plugins
+plugindir = $(libdir)
AM_CFLAGS =\
-Wall\
@@ -20,3 +20,7 @@
output_flickr_la_LIBADD = @PACKAGE_LIBS@
output_flickr_la_LDFLAGS = -module -avoid-version -L/usr/lib -lflickcurl
output_flickr_la_SOURCES = output-flickr.c output-flickr.h
+
+plugin_DATA = flickr-logo.svg
+
+EXTRA_DIST = $(plugin_DATA)
\ No newline at end of file
Added: trunk/plugins/output-flickr/flickr-logo.svg
===================================================================
--- trunk/plugins/output-flickr/flickr-logo.svg (rev 0)
+++ trunk/plugins/output-flickr/flickr-logo.svg 2010-02-13 00:28:01 UTC (rev
3192)
@@ -0,0 +1,96 @@
+<?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";
+ version="1.0"
+ width="400"
+ height="121.14429"
+ viewBox="0 0 439.46267 121.14351"
+ id="Layer_1"
+ xml:space="preserve"
+ style="overflow:visible"
+ inkscape:version="0.47pre4 r22446"
+ sodipodi:docname="flickr-logo.svg"><metadata
+ id="metadata15"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage";
/></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1280"
+ inkscape:window-height="726"
+ id="namedview13"
+ showgrid="false"
+ inkscape:zoom="1.0444078"
+ inkscape:cx="257.0835"
+ inkscape:cy="75.945544"
+ inkscape:window-x="0"
+ inkscape:window-y="25"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="Layer_1" /><defs
+ id="defs26"><inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 77.860504 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="514.16699 : 77.860504 : 1"
+ inkscape:persp3d-origin="257.0835 : 51.907003 : 1"
+ id="perspective17" /></defs>
+
+<g
+ transform="matrix(0.85470805,0,0,0.85470805,0,-7.6819629)"
+ id="g2403">
+ <g
+ id="g2405">
+ <path
+ d="m 20.591,73.837 -20.591,0 0,-25.351 21.173,0 0,-6.436 C 21.173,10.865
35.353,0 63.324,0 70.9,0 76.727,1.207 81.194,2.013 L 79.058,26.96 c
-2.913,-1.006 -5.827,-1.61 -11.071,-1.61 -8.935,0 -12.432,6.438 -12.432,16.7 l
0,6.437 24.863,0 0,25.351 -24.863,0 0,79.467 -34.964,0 0,-79.468 z"
+ id="path2407"
+ style="fill:#0063db" />
+ <rect
+ width="34.964001"
+ height="150.88901"
+ x="98.675003"
+ y="2.415"
+ id="rect2409"
+ style="fill:#0063db" />
+ <rect
+ width="34.965"
+ height="26.556999"
+ x="163.552"
+ y="4.829"
+ id="rect2411"
+ style="fill:#0063db" />
+ <rect
+ width="34.965"
+ height="104.817"
+ x="163.552"
+ y="48.486"
+ id="rect2413"
+ style="fill:#0063db" />
+ <path
+ d="m 303.604,78.462 c -6.41,-4.021 -12.82,-5.833 -21.173,-5.833 -15.151,0
-26.806,10.864 -26.806,28.972 0,16.699 13.598,27.561 28.749,27.561 7.965,0
15.93,-1.809 21.756,-5.029 l 0.777,26.959 c -8.742,3.02 -19.23,4.629
-28.554,4.629 -33.412,0 -58.857,-20.119 -58.857,-54.723 0,-34.806
25.445,-54.924 58.857,-54.924 10.49,0 19.812,1.811 27.777,5.834 l -2.526,26.554
z"
+ id="path2415"
+ style="fill:#0063db" />
+ <polygon
+ points="385.965,48.486 424.231,48.486 389.073,96.569 427.145,153.304
384.799,153.304 356.829,101.399 356.44,101.399 356.44,153.304 321.477,153.304
321.477,2.415 321.477,2.415 356.44,2.415 356.44,92.548 356.829,92.548 "
+ id="polygon2417"
+ style="fill:#0063db" />
+ <path
+ d="m 512.417,77.456 c -3.885,-1.205 -7.771,-1.205 -11.848,-1.205 -16.316,0
-25.447,12.271 -25.447,32.793 l 0,44.26 -34.963,0 0,-104.818 31.855,0 0,19.314
0.389,0 c 6.02,-13.279 14.762,-21.728 29.914,-21.728 4.076,0 8.35,0.603
11.85,1.206 l -1.75,30.178 z"
+ id="path2419"
+ style="fill:#ff0084" />
+
+
+ </g>
+</g></svg>
\ No newline at end of file
Modified: trunk/plugins/output-flickr/output-flickr.c
===================================================================
--- trunk/plugins/output-flickr/output-flickr.c 2010-02-13 00:27:11 UTC (rev
3191)
+++ trunk/plugins/output-flickr/output-flickr.c 2010-02-13 00:28:01 UTC (rev
3192)
@@ -70,6 +70,7 @@
enum
{
PROP_0,
+ PROP_LOGO,
PROP_JPEG_QUALITY,
PROP_FILENAME, /* Required for a output plugin - not in use */
PROP_TITLE,
@@ -83,6 +84,7 @@
static void get_property (GObject * object, guint property_id, GValue * value,
GParamSpec * pspec);
static void set_property (GObject * object, guint property_id, const GValue *
value, GParamSpec * pspec);
static gboolean execute (RSOutput * output, RSFilter * filter);
+GtkWidget * get_logo_widget(RSFlickr *flickr);
G_MODULE_EXPORT void rs_plugin_load (RSPlugin * plugin)
{
@@ -152,6 +154,13 @@
_("Visible to
Family"), FALSE,
G_PARAM_READWRITE));
+ g_object_class_install_property (object_class,
+ PROP_LOGO, g_param_spec_object ("Logo",
+
"logo",
+
"Logo",
+
GTK_TYPE_WIDGET,
+
G_PARAM_READABLE));
+
output_class->execute = execute;
output_class->display_name = _("Upload photo to Flickr");
}
@@ -193,6 +202,9 @@
case PROP_IS_FAMILY:
g_value_set_boolean (value, flickr->is_family);
break;
+ case PROP_LOGO:
+ g_value_set_object(value, get_logo_widget(flickr));
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
@@ -467,3 +479,13 @@
return TRUE;
}
+
+GtkWidget *
+get_logo_widget(RSFlickr *flickr)
+{
+ GtkWidget *box = gtk_vbox_new(TRUE, 2);
+ GtkWidget *logo =
gtk_image_new_from_file(g_build_filename(PACKAGE_DATA_DIR, PACKAGE,
"/plugins/flickr-logo.svg", NULL));
+
+ gtk_box_pack_start (GTK_BOX (box), logo, FALSE, FALSE, 2);
+ return box;
+}
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
