gcompris r3676 - in branches/gcomprixogoo: boards/skins/babytoy boards/skins/gartoon src/babymatch-activity src/boards src/mosaic-activity src/mosaic-activity/resources/mosaic src/railroad-activity src/tangram-activity

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Fri Jan 16 22:59:38 2009
New Revision: 3676
URL: http://svn.gnome.org/viewvc/gcompris?rev=3676&view=rev

Log:
one more batch of skin svg rework


Added:
   branches/gcomprixogoo/src/mosaic-activity/resources/mosaic/button_checked.png   (props changed)
      - copied unchanged from r3668, /branches/gcomprixogoo/boards/skins/gartoon/button_checked.png
Removed:
   branches/gcomprixogoo/boards/skins/babytoy/button_backward.png
   branches/gcomprixogoo/boards/skins/babytoy/button_checked.png
   branches/gcomprixogoo/boards/skins/babytoy/button_forward.png
   branches/gcomprixogoo/boards/skins/babytoy/button_redo.png
   branches/gcomprixogoo/boards/skins/babytoy/button_unchecked.png
   branches/gcomprixogoo/boards/skins/gartoon/button_backward.png
   branches/gcomprixogoo/boards/skins/gartoon/button_checked.png
   branches/gcomprixogoo/boards/skins/gartoon/button_forward.png
   branches/gcomprixogoo/boards/skins/gartoon/button_redo.png
   branches/gcomprixogoo/boards/skins/gartoon/button_unchecked.png
Modified:
   branches/gcomprixogoo/src/babymatch-activity/shapegame.c
   branches/gcomprixogoo/src/boards/menu2.c
   branches/gcomprixogoo/src/mosaic-activity/mosaic.py
   branches/gcomprixogoo/src/mosaic-activity/resources/mosaic/Makefile.am
   branches/gcomprixogoo/src/railroad-activity/railroad.c
   branches/gcomprixogoo/src/tangram-activity/gtans_interface.c

Modified: branches/gcomprixogoo/src/babymatch-activity/shapegame.c
==============================================================================
--- branches/gcomprixogoo/src/babymatch-activity/shapegame.c	(original)
+++ branches/gcomprixogoo/src/babymatch-activity/shapegame.c	Fri Jan 16 22:59:38 2009
@@ -600,7 +600,6 @@
 add_shape_to_list_of_shapes(Shape *shape)
 {
   GooCanvasItem *item;
-  GdkPixbuf   *pixmap = NULL;
   GooCanvasItem *shape_list_group_root = NULL;
   double ICON_GAP    = 5.0;
   double ICON_HEIGHT = (double)(shapeBox.h / shapeBox.nb_shape_y) - ICON_GAP;
@@ -613,14 +612,14 @@
   /* If the first list is full, add the previous/forward buttons          */
   if(g_hash_table_size(shapelist_table) == (shapeBox.nb_shape_x * shapeBox.nb_shape_y))
     {
-      pixmap = gc_skin_pixmap_load("button_backward.png");
       previous_shapelist_item = \
-	goo_canvas_image_new (shape_list_root_item,
-			      pixmap,
-			      shapeBox.x + (shapeBox.w/2) -
-			      gdk_pixbuf_get_width(pixmap) - 2,
-			      shapeBox.y + shapeBox.h,
+	goo_canvas_svg_new (shape_list_root_item,
+			      gc_skin_rsvg_get(),
+			      "svg-id", "#PREVIOUS",
 			      NULL);
+      SET_ITEM_LOCATION(previous_shapelist_item,
+			shapeBox.x - 5,
+			shapeBox.y + shapeBox.h);
 
       g_signal_connect(previous_shapelist_item,
 		       "button_press_event",
@@ -628,21 +627,21 @@
 		       "previous_shapelist");
       gc_item_focus_init(previous_shapelist_item, NULL);
 
-      gdk_pixbuf_unref(pixmap);
-
-      pixmap = gc_skin_pixmap_load("button_forward.png");
       next_shapelist_item = \
-	goo_canvas_image_new (shape_list_root_item,
-			      pixmap,
-			      shapeBox.x + (shapeBox.w/2) + 2,
-			      shapeBox.y + shapeBox.h,
-			      NULL);
+	goo_canvas_svg_new (shape_list_root_item,
+			    gc_skin_rsvg_get(),
+			    "svg-id", "#NEXT",
+			    NULL);
+
+      SET_ITEM_LOCATION(next_shapelist_item,
+			shapeBox.x + shapeBox.w / 2,
+			shapeBox.y + shapeBox.h);
 
       g_signal_connect(next_shapelist_item, "button_press_event",
 		       (GtkSignalFunc) item_event_ok,
 		       "next_shapelist");
       gc_item_focus_init(next_shapelist_item, NULL);
-      gdk_pixbuf_unref(pixmap);
+
       g_object_set (next_shapelist_item, "visibility",
 		    GOO_CANVAS_ITEM_INVISIBLE, NULL);
 

Modified: branches/gcomprixogoo/src/boards/menu2.c
==============================================================================
--- branches/gcomprixogoo/src/boards/menu2.c	(original)
+++ branches/gcomprixogoo/src/boards/menu2.c	Fri Jan 16 22:59:38 2009
@@ -786,20 +786,17 @@
 	}
       else
 	{
-	  pixmap = gc_skin_pixmap_load("button_forward.png");
-	  ratio = get_ratio(pixmap, top_arrow_size);
-
 	  item = \
-	    goo_canvas_image_new (parent,
-				  pixmap,
-				  0, 0,
-				  NULL);
-
-	  goo_canvas_item_translate(item,
-				    current_top_x,
-				    current_top_y + top_arrow_size);
-	  goo_canvas_item_scale(item, ratio, ratio);
-	  gdk_pixbuf_unref(pixmap);
+	    goo_canvas_svg_new (parent,
+				gc_skin_rsvg_get(),
+				"svg-id", "#MENUICON",
+				"pointer-events", GOO_CANVAS_EVENTS_NONE,
+				NULL);
+
+	  SET_ITEM_LOCATION(item,
+			    current_top_x,
+			    current_top_y + top_arrow_size);
+	  //	  goo_canvas_item_scale(item, ratio, ratio);
 
 	  current_top_x += top_arrow_size + top_int_x;
 	}

Modified: branches/gcomprixogoo/src/mosaic-activity/mosaic.py
==============================================================================
--- branches/gcomprixogoo/src/mosaic-activity/mosaic.py	(original)
+++ branches/gcomprixogoo/src/mosaic-activity/mosaic.py	Fri Jan 16 22:59:38 2009
@@ -236,7 +236,7 @@
       # Create the check button to show the selected color
       self.checked_color_item = goocanvas.Image(
         parent = self.rootitem,
-        pixbuf = gcompris.utils.load_pixmap(gcompris.skin.image_to_skin("button_checked.png")) )
+        pixbuf = gcompris.utils.load_pixmap("mosaic/button_checked.png") );
 
       self.checked_color_item.props.visibility = goocanvas.ITEM_INVISIBLE
 

Modified: branches/gcomprixogoo/src/mosaic-activity/resources/mosaic/Makefile.am
==============================================================================
--- branches/gcomprixogoo/src/mosaic-activity/resources/mosaic/Makefile.am	(original)
+++ branches/gcomprixogoo/src/mosaic-activity/resources/mosaic/Makefile.am	Fri Jan 16 22:59:38 2009
@@ -1,6 +1,7 @@
 imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/mosaic
 img_DATA = \
 	mosaic_bg.png \
-	mosaic_palette.png
+	mosaic_palette.png \
+        button_checked.png
 
 EXTRA_DIST = $(img_DATA)

Modified: branches/gcomprixogoo/src/railroad-activity/railroad.c
==============================================================================
--- branches/gcomprixogoo/src/railroad-activity/railroad.c	(original)
+++ branches/gcomprixogoo/src/railroad-activity/railroad.c	Fri Jan 16 22:59:38 2009
@@ -187,7 +187,7 @@
       } else {
 	gc_bar_set(GC_BAR_LEVEL|GC_BAR_REPEAT);
       }
-      gc_bar_location(BOARDWIDTH-160, 3, 0.7);
+      gc_bar_location(BOARDWIDTH-200, 3, 0.6);
 
       railroad_next_level();
 

Modified: branches/gcomprixogoo/src/tangram-activity/gtans_interface.c
==============================================================================
--- branches/gcomprixogoo/src/tangram-activity/gtans_interface.c	(original)
+++ branches/gcomprixogoo/src/tangram-activity/gtans_interface.c	Fri Jan 16 22:59:38 2009
@@ -87,30 +87,27 @@
   /* Gcompris */
   /* add here buttons */
 
-  GdkPixbuf   *pixmap_l = NULL;
-  GdkPixbuf   *pixmap_r = NULL;
   GdkPixbuf   *pixmap_show = NULL;
   GdkPixbuf   *pixmap_outline = NULL;
   GdkPixbuf   *pixmap_symetry = NULL;
   GooCanvasItem *previous_figure, *next_figure;
   GooCanvasItem *show_figure, *outline_figure, *symetry;
 
-  pixmap_l = gc_skin_pixmap_load("button_backward.png");
-
-  pixmap_r = gc_skin_pixmap_load("button_forward.png");
-
-  previous_figure = goo_canvas_image_new (rootitem,
-					  pixmap_l,
-					  X_BASE_SMALLAREA,
-					  Y_BASE_SMALLAREA + WIDTH_SMALLAREA + 20,
-					   NULL);
-
-  next_figure = goo_canvas_image_new (rootitem,
-				      pixmap_r,
-				      X_BASE_SMALLAREA + WIDTH_SMALLAREA -
-				      gdk_pixbuf_get_width (pixmap_r),
-				      Y_BASE_SMALLAREA + WIDTH_SMALLAREA + 20,
-				       NULL);
+  previous_figure = goo_canvas_svg_new (rootitem,
+					gc_skin_rsvg_get(),
+					"svg-id", "#PREVIOUS",
+					NULL);
+  SET_ITEM_LOCATION_CENTER(previous_figure,
+			   X_BASE_SMALLAREA,
+			   Y_BASE_SMALLAREA + WIDTH_SMALLAREA + 30);
+
+  next_figure = goo_canvas_svg_new (rootitem,
+				    gc_skin_rsvg_get(),
+				    "svg-id", "#NEXT",
+				    NULL);
+  SET_ITEM_LOCATION_CENTER(next_figure,
+			   X_BASE_SMALLAREA + WIDTH_SMALLAREA,
+			   Y_BASE_SMALLAREA + WIDTH_SMALLAREA + 30);
 
 
   g_signal_connect(previous_figure, "button_press_event",