gcompris r3253 - in branches/gcomprixogoo: boards/skins/babytoy boards/skins/gartoon src/gcompris

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Sat Feb 16 01:36:38 2008
New Revision: 3253
URL: http://svn.gnome.org/viewvc/gcompris?rev=3253&view=rev

Log:
use the svg help dialog


Added:
   branches/gcomprixogoo/boards/skins/babytoy/dialog_help.svgz
      - copied unchanged from r3248, /branches/gcomprixogoo/boards/skins/babytoy/help_bg.svgz
   branches/gcomprixogoo/boards/skins/gartoon/dialog_help.svgz
      - copied unchanged from r3248, /branches/gcomprixogoo/boards/skins/gartoon/help_bg.svgz
Removed:
   branches/gcomprixogoo/boards/skins/babytoy/help_bg.png
   branches/gcomprixogoo/boards/skins/babytoy/help_bg.svgz
   branches/gcomprixogoo/boards/skins/gartoon/help_bg.svgz
Modified:
   branches/gcomprixogoo/src/gcompris/about.c
   branches/gcomprixogoo/src/gcompris/config.c
   branches/gcomprixogoo/src/gcompris/gcompris_confirm.c
   branches/gcomprixogoo/src/gcompris/help.c

Modified: branches/gcomprixogoo/src/gcompris/about.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/about.c	(original)
+++ branches/gcomprixogoo/src/gcompris/about.c	Sat Feb 16 01:36:38 2008
@@ -45,6 +45,7 @@
   gint y = 0;
   GooCanvasItem *item, *item2;
   gint plane_y;
+  RsvgHandle *svg_handle = NULL;
 
   static gchar *content =
     N_("Author: Bruno Coudoin\n"
@@ -68,15 +69,15 @@
   rootitem = goo_canvas_group_new (goo_canvas_get_root_item(gc_get_canvas()),
 				   NULL);
 
-  pixmap = gc_skin_pixmap_load("help_bg.png");
-  y_start = (BOARDHEIGHT - gdk_pixbuf_get_height(pixmap))/2;
-  x_start = (BOARDWIDTH - gdk_pixbuf_get_width(pixmap))/2;
-  item = goo_canvas_image_new (rootitem,
-			       pixmap,
-			       x_start,
-			       y_start);
-  y = BOARDHEIGHT - (BOARDHEIGHT - gdk_pixbuf_get_height(pixmap))/2;
-  gdk_pixbuf_unref(pixmap);
+  svg_handle = gc_skin_rsvg_load("dialog_help.svgz");
+  RsvgDimensionData dimension;
+  rsvg_handle_get_dimensions(svg_handle, &dimension);
+  x_start = (BOARDWIDTH - dimension.width)/2;
+  y_start = (BOARDHEIGHT - dimension.height)/2;
+  item = goo_svg_item_new (rootitem, svg_handle, NULL);
+  goo_canvas_item_translate(item, x_start, y_start);
+  y = y_start + dimension.height;
+  g_object_unref (svg_handle);
 
   goo_canvas_text_new (rootitem,
 		       _("About GCompris"),

Modified: branches/gcomprixogoo/src/gcompris/config.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/config.c	(original)
+++ branches/gcomprixogoo/src/gcompris/config.c	Sat Feb 16 01:36:38 2008
@@ -161,6 +161,7 @@
   gint x_flag_start = 0;
   gint y = 0;
   GooCanvasItem *item, *item2;
+  RsvgHandle *svg_handle = NULL;
 
   /* Pause the board */
   gc_board_pause(TRUE);
@@ -173,16 +174,15 @@
   rootitem = goo_canvas_group_new (goo_canvas_get_root_item(gc_get_canvas()),
 				   NULL);
 
-  pixmap = gc_skin_pixmap_load("help_bg.png");
-  y_start = (BOARDHEIGHT - gdk_pixbuf_get_height(pixmap))/2;
-  x_start = (BOARDWIDTH - gdk_pixbuf_get_width(pixmap))/2;
-  item = goo_canvas_image_new (rootitem,
-			       pixmap,
-			       (double) x_start,
-			       (double) y_start,
-			       NULL);
-  y = BOARDHEIGHT - (BOARDHEIGHT - gdk_pixbuf_get_height(pixmap))/2;
-  gdk_pixbuf_unref(pixmap);
+  svg_handle = gc_skin_rsvg_load("dialog_help.svgz");
+  RsvgDimensionData dimension;
+  rsvg_handle_get_dimensions(svg_handle, &dimension);
+  x_start = (BOARDWIDTH - dimension.width)/2;
+  y_start = (BOARDHEIGHT - dimension.height)/2;
+  item = goo_svg_item_new (rootitem, svg_handle, NULL);
+  goo_canvas_item_translate(item, x_start, y_start);
+  y = y_start + dimension.height;
+  g_object_unref (svg_handle);
 
   goo_canvas_text_new (rootitem,
 		       _("GCompris Configuration"),

Modified: branches/gcomprixogoo/src/gcompris/gcompris_confirm.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/gcompris_confirm.c	(original)
+++ branches/gcomprixogoo/src/gcompris/gcompris_confirm.c	Sat Feb 16 01:36:38 2008
@@ -195,7 +195,7 @@
   rootitem = goo_canvas_group_new (goo_canvas_get_root_item(gc_get_canvas()),
 				   NULL);
 
-  svg_handle = gc_skin_rsvg_load("help_bg.svgz");
+  svg_handle = gc_skin_rsvg_load("dialog_help.svgz");
   item = goo_svg_item_new (rootitem, svg_handle, NULL);
 
   RsvgDimensionData dimension;

Modified: branches/gcomprixogoo/src/gcompris/help.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/help.c	(original)
+++ branches/gcomprixogoo/src/gcompris/help.c	Sat Feb 16 01:36:38 2008
@@ -96,6 +96,7 @@
   gint x_start = 0;
   gchar   *name = NULL;
   gchar   *text_to_display = NULL;
+  RsvgHandle *svg_handle = NULL;
 
   if(rootitem)
     return;
@@ -111,16 +112,17 @@
   rootitem = goo_canvas_group_new (goo_canvas_get_root_item(gc_get_canvas()),
 				   NULL);
 
-  pixmap = gc_skin_pixmap_load("help_bg.png");
-  y_start = (BOARDHEIGHT - gdk_pixbuf_get_height(pixmap))/2;
-  x_start = (BOARDWIDTH - gdk_pixbuf_get_width(pixmap))/2;
-  item = goo_canvas_image_new (rootitem,
-			       pixmap,
-			       x_start,
-			       y_start,
-			       NULL);
-  y = BOARDHEIGHT - (BOARDHEIGHT - gdk_pixbuf_get_height(pixmap))/2;
-  gdk_pixbuf_unref(pixmap);
+  svg_handle = gc_skin_rsvg_load("dialog_help.svgz");
+
+  RsvgDimensionData dimension;
+  rsvg_handle_get_dimensions(svg_handle, &dimension);
+  x_start = (BOARDWIDTH - dimension.width)/2;
+  y_start = (BOARDHEIGHT - dimension.height)/2;
+
+  item = goo_svg_item_new (rootitem, svg_handle, NULL);
+  goo_canvas_item_translate(item, x_start, y_start);
+  y = y_start + dimension.height;
+  g_object_unref (svg_handle);
 
   y_start += 14;
   if(gcomprisBoard->section && gcomprisBoard->name) {