gcompris r3278 - in branches/gcomprixogoo: boards/skins/babytoy src/clickgame-activity/resources/clickgame src/enumerate-activity/resources/enumerate src/gcompris src/reversecount-activity src/reversecount-activity/resources/reversecount

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Sun Mar  2 20:35:46 2008
New Revision: 3278
URL: http://svn.gnome.org/viewvc/gcompris?rev=3278&view=rev

Log:
many fixes.
gcompris.c: fixed mixup of svg and png backgrounds
elephant_mer.svgz: fixed svg
bar_bg.png: remade, the old one had holes in it
board.c: force the bar to be over after the activty is started



Modified:
   branches/gcomprixogoo/boards/skins/babytoy/bar_bg.png
   branches/gcomprixogoo/src/clickgame-activity/resources/clickgame/Makefile.am
   branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/Makefile.am
   branches/gcomprixogoo/src/gcompris/bar.c
   branches/gcomprixogoo/src/gcompris/board.c
   branches/gcomprixogoo/src/gcompris/gcompris.c
   branches/gcomprixogoo/src/reversecount-activity/resources/reversecount/elephant_mer.svgz
   branches/gcomprixogoo/src/reversecount-activity/reversecount.c

Modified: branches/gcomprixogoo/boards/skins/babytoy/bar_bg.png
==============================================================================
Binary files. No diff available.

Modified: branches/gcomprixogoo/src/clickgame-activity/resources/clickgame/Makefile.am
==============================================================================
--- branches/gcomprixogoo/src/clickgame-activity/resources/clickgame/Makefile.am	(original)
+++ branches/gcomprixogoo/src/clickgame-activity/resources/clickgame/Makefile.am	Sun Mar  2 20:35:46 2008
@@ -1,5 +1,7 @@
 imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/clickgame
 img_DATA = \
+	QueenAngel_0.png \
+	QueenAngel_1.png \
 	blueking2_0.png \
 	blueking2_1.png \
 	butfish_0.png \
@@ -48,8 +50,12 @@
 	manta_1.png \
 	newf1_0.png \
 	newf1_1.png \
-	QueenAngel_0.png \
-	QueenAngel_1.png \
+	sea1.jpg \
+	sea2.jpg \
+	sea3.jpg \
+	sea4.jpg \
+	sea5.jpg \
+	sea6.jpg \
 	shark1_0.png \
 	shark1_1.png \
 	six_barred_0.png \

Modified: branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/Makefile.am
==============================================================================
--- branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/Makefile.am	(original)
+++ branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/Makefile.am	Sun Mar  2 20:35:46 2008
@@ -1,7 +1,25 @@
 imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/enumerate
 img_DATA = \
-	enumerate_answer_focus.png \
+	README \
+	baby_bottle.png \
+	banana.png \
+	bread_slice.png \
+	butter.png \
+	chocolate.png \
+	chocolate_cake.png \
+	cookie.png \
 	enumerate_answer.png \
-	enumerate_background.png
+	enumerate_answer_focus.png \
+	enumerate_background.png \
+	french_croissant.png \
+	grapefruit.png \
+	marmelade.png \
+	milk_cup.png \
+	milk_shake.png \
+	orange.png \
+	pear.png \
+	round_cookie.png \
+	suggar_box.png \
+	yahourt.png
 
 EXTRA_DIST = $(img_DATA)

Modified: branches/gcomprixogoo/src/gcompris/bar.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/bar.c	(original)
+++ branches/gcomprixogoo/src/gcompris/bar.c	Sun Mar  2 20:35:46 2008
@@ -270,6 +270,7 @@
 		    "pixbuf", pixmap,
 		    NULL);
       gdk_pixbuf_unref(pixmap);
+
     }
 
   current_level=gcomprisBoard->level;
@@ -478,6 +479,7 @@
       g_object_set(about_item,
 		   "visibility", GOO_CANVAS_ITEM_INVISIBLE, NULL);
 
+      _force_bar_down();
     }
   else
     {
@@ -487,7 +489,6 @@
 
     }
 
-  _force_bar_down();
 }
 
 /*-------------------------------------------------------------------------------*/
@@ -579,7 +580,7 @@
   bar_reset_sound_id();
 
   if(!bar_down_id)
-    bar_down_id = g_timeout_add (5000, (GtkFunction) _bar_down, NULL);
+    bar_down_id = g_timeout_add (3500, (GtkFunction) _bar_down, NULL);
 
   return FALSE;
 }

Modified: branches/gcomprixogoo/src/gcompris/board.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/board.c	(original)
+++ branches/gcomprixogoo/src/gcompris/board.c	Sun Mar  2 20:35:46 2008
@@ -366,6 +366,9 @@
       bp->start_board(gcomprisBoard);
       bp_data->playing = TRUE;
 
+      /* Force the bar to go on top of the activities canvas items */
+      gc_bar_hide (FALSE);
+
       return;
     }
 

Modified: branches/gcomprixogoo/src/gcompris/gcompris.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/gcompris.c	(original)
+++ branches/gcomprixogoo/src/gcompris/gcompris.c	Sun Mar  2 20:35:46 2008
@@ -535,12 +535,16 @@
     {
       if(backgroundimg)
 	goo_canvas_item_remove(backgroundimg);
+
+      backgroundimg = NULL;
       _set_svg_background(parent, file);
     }
   else
     {
       if(backgroundsvgimg)
 	goo_canvas_item_remove(backgroundsvgimg);
+
+      backgroundsvgimg = NULL;
       _set_pixmap_background(parent, file);
     }
 }

Modified: branches/gcomprixogoo/src/reversecount-activity/resources/reversecount/elephant_mer.svgz
==============================================================================
Binary files. No diff available.

Modified: branches/gcomprixogoo/src/reversecount-activity/reversecount.c
==============================================================================
--- branches/gcomprixogoo/src/reversecount-activity/reversecount.c	(original)
+++ branches/gcomprixogoo/src/reversecount-activity/reversecount.c	Sun Mar  2 20:35:46 2008
@@ -343,8 +343,6 @@
   gc_set_background(goo_canvas_get_root_item(gcomprisBoard->canvas),
 		    imageList[gcomprisBoard->level-1]);
 
-  gc_bar_set_level(gcomprisBoard);
-
   reversecount_destroy_all_items();
   gamewon = FALSE;
 
@@ -408,6 +406,9 @@
 
   /* Try the next level */
   reversecount_create_item(goo_canvas_get_root_item(gcomprisBoard->canvas));
+
+  gc_bar_set_level(gcomprisBoard);
+
 }
 /* ==================================== */
 /* Destroy all the items */
@@ -529,6 +530,7 @@
       g_signal_connect(item, "button_press_event",
 		       (GtkSignalFunc) item_event,
 		       val);
+      gc_item_focus_init(item, NULL);
     }
   g_object_unref(svg_handle);
 
@@ -766,6 +768,7 @@
   g_object_set (item,
 		"rsvg-handle", rsvg_handle,
 		NULL);
+  gc_item_focus_init(item, NULL);
   g_object_unref(rsvg_handle);
 
   g_free(str);