gcompris r3688 - in branches/gcomprixogoo: boards/skins/babytoy boards/skins/gartoon src/hanoi-activity src/hanoi_real-activity

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Sun Jan 18 22:36:46 2009
New Revision: 3688
URL: http://svn.gnome.org/viewvc/gcompris?rev=3688&view=rev

Log:
removed shapelabel


Removed:
   branches/gcomprixogoo/boards/skins/babytoy/gcompris-shapelabel.png
   branches/gcomprixogoo/boards/skins/gartoon/gcompris-shapelabel.png
Modified:
   branches/gcomprixogoo/src/hanoi-activity/hanoi.c
   branches/gcomprixogoo/src/hanoi_real-activity/hanoi_real.c

Modified: branches/gcomprixogoo/src/hanoi-activity/hanoi.c
==============================================================================
--- branches/gcomprixogoo/src/hanoi-activity/hanoi.c	(original)
+++ branches/gcomprixogoo/src/hanoi-activity/hanoi.c	Sun Jan 18 22:36:46 2009
@@ -313,7 +313,6 @@
   guint color_to_place;
   guint used_colors[NUMBER_OF_COLOR];
   guint w;
-  GdkPixbuf *pixmap = NULL;
 
   boardRootItem = \
     goo_canvas_group_new (parent,
@@ -322,25 +321,20 @@
 
   if (gcomprisBoard->level == 1)
     {
-      pixmap = gc_skin_pixmap_load("gcompris-shapelabel.png");
-      if(pixmap) {
-        item = goo_canvas_image_new (boardRootItem,
-                                     pixmap,
-                                     10,
-                                     BOARDHEIGHT - 110,
-                                     NULL);
-        goo_canvas_item_scale(item,
-                              (double)(BOARDWIDTH-20)/gdk_pixbuf_get_width(pixmap),
-                              1);
-        gdk_pixbuf_unref(pixmap);
-      }
+      item = goo_canvas_svg_new (boardRootItem,
+				 gc_skin_rsvg_get(),
+				 "svg-id", "#BAR_BG",
+				 NULL);
+      SET_ITEM_LOCATION_CENTER(item,
+			       BOARDWIDTH/2,
+			       50);
 
       goo_canvas_text_new (boardRootItem,
                            _("Build the same tower in the empty area as the one you see on the right-hand side."),
-                           (double) BOARDWIDTH/2,
-                           (double) BOARDHEIGHT - 100,
+                           BOARDWIDTH/2,
+                           50,
                            -1,
-                           GTK_ANCHOR_NORTH,
+                           GTK_ANCHOR_CENTER,
                            "font", gc_skin_font_board_medium,
                            "fill_color_rgba", gc_skin_color_text_button,
                            NULL);

Modified: branches/gcomprixogoo/src/hanoi_real-activity/hanoi_real.c
==============================================================================
--- branches/gcomprixogoo/src/hanoi_real-activity/hanoi_real.c	(original)
+++ branches/gcomprixogoo/src/hanoi_real-activity/hanoi_real.c	Sun Jan 18 22:36:46 2009
@@ -260,25 +260,20 @@
   boardRootItem = goo_canvas_group_new (goo_canvas_get_root_item(gcomprisBoard->canvas),
 					NULL);
 
-  pixmap = gc_skin_pixmap_load("gcompris-shapelabel.png");
-  if(pixmap) {
-    item = goo_canvas_image_new (boardRootItem,
-				 pixmap,
-				 10,
-				 BOARDHEIGHT - 110,
-				 NULL);
-    goo_canvas_item_scale(item,
-			  (double)(BOARDWIDTH - 20)/gdk_pixbuf_get_width(pixmap),
-			  1);
-    gdk_pixbuf_unref(pixmap);
-  }
+  item = goo_canvas_svg_new (boardRootItem,
+			     gc_skin_rsvg_get(),
+			     "svg-id", "#BAR_BG",
+			     NULL);
+  SET_ITEM_LOCATION_CENTER(item,
+			   BOARDWIDTH/2,
+			   BOARDHEIGHT - 100);
 
   goo_canvas_text_new (boardRootItem,
 		       _("Move the entire stack to the right peg, one disc at a time"),
 		       BOARDWIDTH/2,
 		       BOARDHEIGHT - 100,
 		       -1,
-		       GTK_ANCHOR_NORTH,
+		       GTK_ANCHOR_CENTER,
 		       "font", gc_skin_font_board_medium,
 		       "fill_color_rgba", gc_skin_color_text_button,
 		       "alignment", PANGO_ALIGN_CENTER,