gcompris r3378 - in branches/gcomprixogoo: boards/flags boards/skins/gartoon src/gcompris

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Mon Apr 14 01:26:51 2008
New Revision: 3378
URL: http://svn.gnome.org/viewvc/gcompris?rev=3378&view=rev

Log:
changed flags to be in svg. all flags taken from wikipedia.


Added:
   branches/gcomprixogoo/boards/flags/af.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/am.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/ar_TN.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/az.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/be.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/bg.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/ch.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/cs.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/da.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/de.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/dk.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/dz.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/el.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/en.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/en_CA.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/en_GB.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/es.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/eu.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/fa.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/fi.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/fr.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/ga.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/gu.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/he.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/hi.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/hr.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/hu.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/id.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/it.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/ja.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/ka.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/ko.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/lt.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/mk.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/ml.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/mr.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/ms.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/nb.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/ne.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/nl.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/nn.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/pa.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/pl.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/pt.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/pt_BR.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/ro.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/ru.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/rw.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/sk.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/sl.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/so.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/sq.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/sr.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/sv.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/ta.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/th.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/tr.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/ur.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/vi.svgz   (contents, props changed)
   branches/gcomprixogoo/boards/flags/zh.svgz   (contents, props changed)
Removed:
   branches/gcomprixogoo/boards/flags/cu.png
   branches/gcomprixogoo/boards/flags/ee.png
   branches/gcomprixogoo/boards/flags/il.png
   branches/gcomprixogoo/boards/flags/is.png
   branches/gcomprixogoo/boards/flags/jp.png
   branches/gcomprixogoo/boards/flags/mx.png
   branches/gcomprixogoo/boards/flags/se.png
   branches/gcomprixogoo/boards/flags/si.png
   branches/gcomprixogoo/boards/flags/uk.png
   branches/gcomprixogoo/boards/flags/uy.png
   branches/gcomprixogoo/boards/flags/yu.png
Modified:
   branches/gcomprixogoo/boards/skins/gartoon/skin.xml
   branches/gcomprixogoo/src/gcompris/config.c

Added: branches/gcomprixogoo/boards/flags/af.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/am.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/ar_TN.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/az.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/be.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/bg.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/ch.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/cs.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/da.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/de.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/dk.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/dz.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/el.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/en.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/en_CA.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/en_GB.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/es.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/eu.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/fa.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/fi.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/fr.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/ga.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/gu.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/he.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/hi.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/hr.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/hu.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/id.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/it.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/ja.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/ka.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/ko.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/lt.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/mk.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/ml.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/mr.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/ms.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/nb.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/ne.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/nl.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/nn.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/pa.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/pl.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/pt.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/pt_BR.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/ro.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/ru.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/rw.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/sk.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/sl.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/so.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/sq.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/sr.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/sv.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/ta.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/th.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/tr.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/ur.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/vi.svgz
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/boards/flags/zh.svgz
==============================================================================
Binary file. No diff available.

Modified: branches/gcomprixogoo/boards/skins/gartoon/skin.xml
==============================================================================
--- branches/gcomprixogoo/boards/skins/gartoon/skin.xml	(original)
+++ branches/gcomprixogoo/boards/skins/gartoon/skin.xml	Mon Apr 14 01:26:51 2008
@@ -10,7 +10,7 @@
     <color  id="gcompris/shadow"         rgba="0XFFFFFFFF"/>
     <color  id="gcompris/imageselectbg"  rgba="0X6280d9FF"/>
 
-    <color  id="gcompris/helpbg"         rgba="0Xe8e7e2FF"/>
+    <color  id="gcompris/helpbg"         rgba="0Xf3eacdFF"/>
     <color  id="gcompris/helpfg"         rgba="0X000000FF"/>
     <color  id="gcompris/helpselect"     rgba="0X34682aFF"/>
     <color  id="gcompris/helpunselect"   rgba="0X4252ffFF"/>

Modified: branches/gcomprixogoo/src/gcompris/config.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/config.c	(original)
+++ branches/gcomprixogoo/src/gcompris/config.c	Mon Apr 14 01:26:51 2008
@@ -49,6 +49,9 @@
 #define Y_GAP	45
 
 static gboolean is_displayed			= FALSE;
+static gint x_flag_start;
+static gint y_flag_start;
+
 
 #define SOUNDLISTFILE PACKAGE
 
@@ -160,7 +163,6 @@
   gint y_start = 0;
   gint x_start = 0;
   gint x_text_start = 0;
-  gint x_flag_start = 0;
   gint y = 0;
   GooCanvasItem *item, *item2;
   RsvgHandle *svg_handle = NULL;
@@ -210,11 +212,10 @@
 
   display_previous_next(x_start, y_start, "locale_previous", "locale_next");
 
-  item_locale_flag = goo_canvas_image_new (rootitem,
-					   NULL,
-					   (double) x_flag_start,
-					   (double) y_start - gdk_pixbuf_get_width(pixmap_checked)/2,
-					   NULL);
+  item_locale_flag = goo_svg_item_new (rootitem,
+				       rsvg_handle_new(),
+				       NULL);
+  y_flag_start = y_start - gdk_pixbuf_get_width(pixmap_checked)/2;
 
   /* Display a bad icon if this locale is not available */
   pixmap   = gc_skin_pixmap_load("mini_bad.png");
@@ -568,7 +569,6 @@
 set_locale_flag(gchar *locale)
 {
   gchar *filename;
-  GdkPixbuf *pixmap = NULL;
 
   if(locale == NULL)
     return;
@@ -580,29 +580,42 @@
   }
 
   /* First try to find a flag for the long locale name */
-  filename = gc_file_find_absolute("flags/%.5s.png", locale);
+  filename = gc_file_find_absolute("flags/%.5s.svgz", locale);
 
   /* Not found, Try now with the short locale name */
   if(!filename) {
-    filename = gc_file_find_absolute("flags/%.2s.png", locale);
+    filename = gc_file_find_absolute("flags/%.2s.svgz", locale);
   }
 
   if(filename)
     {
-      pixmap = gc_net_load_pixmap(filename);
+      RsvgHandle *svg_handle;
+      RsvgDimensionData dimension;
+
+      svg_handle = gc_rsvg_load(filename);
+      rsvg_handle_get_dimensions(svg_handle, &dimension);
+
+      /* Calc the ratio to display it */
+      double xratio =  200.0  / dimension.width;
+      goo_canvas_item_set_transform(item_locale_flag, NULL);
+      goo_canvas_item_scale(item_locale_flag,
+			    xratio, xratio);
+      goo_canvas_item_translate(item_locale_flag,
+				(x_flag_start + 260) / xratio,
+				(y_flag_start + 40) / xratio);
 
       g_object_set (item_locale_flag,
-		    "pixbuf", pixmap,
+		    "rsvg-handle", svg_handle,
 		    NULL);
 
-      gdk_pixbuf_unref(pixmap);
+      g_object_unref(svg_handle);
       g_free(filename);
     }
   else
     {
       /* No flags */
       g_object_set (item_locale_flag,
-		    "pixbuf", NULL,
+		    "rsvg-handle", rsvg_handle_new(),
 		    NULL);
     }