gcompris r3483 - in branches/gcomprixogoo/src: gcompris reversecount-activity reversecount-activity/resources/reversecount

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Mon Aug  4 23:24:11 2008
New Revision: 3483
URL: http://svn.gnome.org/viewvc/gcompris?rev=3483&view=rev

Log:
now the bar is completly hidden at bonus time, not only
its buttons.

reversecount now has its internal ok button.



Modified:
   branches/gcomprixogoo/src/gcompris/bar.c
   branches/gcomprixogoo/src/reversecount-activity/resources/reversecount/dice0.svgz
   branches/gcomprixogoo/src/reversecount-activity/reversecount.c

Modified: branches/gcomprixogoo/src/gcompris/bar.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/bar.c	(original)
+++ branches/gcomprixogoo/src/gcompris/bar.c	Mon Aug  4 23:24:11 2008
@@ -491,33 +491,14 @@
 
   if(hide)
     {
-      if(exit_item)
-	g_object_set(exit_item,
-		     "visibility", GOO_CANVAS_ITEM_INVISIBLE, NULL);
-      g_object_set(home_item,
-		   "visibility", GOO_CANVAS_ITEM_INVISIBLE, NULL);
-      g_object_set(level_item,
-		   "visibility", GOO_CANVAS_ITEM_INVISIBLE, NULL);
-      g_object_set(ok_item,
-		   "visibility", GOO_CANVAS_ITEM_INVISIBLE, NULL);
-      g_object_set(help_item,
+      g_object_set(rootitem,
 		   "visibility", GOO_CANVAS_ITEM_INVISIBLE, NULL);
-      g_object_set(repeat_item,
-		   "visibility", GOO_CANVAS_ITEM_INVISIBLE, NULL);
-      if(config_item)
-	g_object_set(config_item,
-		     "visibility", GOO_CANVAS_ITEM_INVISIBLE, NULL);
-      g_object_set(about_item,
-		   "visibility", GOO_CANVAS_ITEM_INVISIBLE, NULL);
-
-      _force_bar_down();
+      //      _force_bar_down();
     }
   else
     {
-      g_object_set(home_item,
+      g_object_set(rootitem,
 		   "visibility", GOO_CANVAS_ITEM_VISIBLE, NULL);
-      gc_bar_set(current_flags);
-
     }
 
 }

Modified: branches/gcomprixogoo/src/reversecount-activity/resources/reversecount/dice0.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	Mon Aug  4 23:24:11 2008
@@ -150,7 +150,7 @@
     end_board,
     is_our_board,
     key_press,
-    process_ok,
+    NULL,
     set_level,
     NULL,
     NULL,
@@ -202,7 +202,7 @@
       gcomprisBoard->maxlevel=7;
       gcomprisBoard->sublevel=1;
       gcomprisBoard->number_of_sublevel=1; /* Go to next level after this number of 'play' */
-      gc_bar_set(GC_BAR_LEVEL|GC_BAR_OK);
+      gc_bar_set(GC_BAR_LEVEL);
 
       reversecount_next_level();
 
@@ -439,14 +439,14 @@
 
 
   block_width =  BOARDWIDTH/number_of_item_x;
-  block_height = BOARDHEIGHT/number_of_item_y;
+  block_height = (BOARDHEIGHT-BARHEIGHT/2)/number_of_item_y;
 
   /* Timer is not requested */
-  if(properties->timer>0)
+  if(properties->timer > 0)
     {
       errors = number_of_dices + 4 - (MIN(properties->timer, 4));
       create_clock(BOARDWIDTH - block_width - 100,
-		   BOARDHEIGHT - block_height - 100,
+		   BOARDHEIGHT - block_height - 100 - BARHEIGHT/2,
 		   errors) ;
     }
   else
@@ -454,6 +454,7 @@
       errors = -1;
     }
 
+  // Ice blocks
   svg_handle = gc_rsvg_load("reversecount/iceblock.svgz");
   RsvgDimensionData rsvg_dimension;
   rsvg_handle_get_dimensions (svg_handle, &rsvg_dimension);
@@ -468,13 +469,14 @@
       goo_canvas_item_translate(item, i, j);
       goo_canvas_item_scale(item, xratio, yratio);
 
-      j=BOARDHEIGHT-block_height;
+      j=BOARDHEIGHT-BARHEIGHT/2-block_height;
       item = goo_svg_item_new (boardRootItem, svg_handle, NULL);
       goo_canvas_item_translate(item, i, j);
       goo_canvas_item_scale(item, xratio, yratio);
     }
 
-  for(j=block_height; j<=BOARDHEIGHT-(block_height*2); j+=block_height)
+  for(j = block_height; j<=BOARDHEIGHT - (block_height*2) - BARHEIGHT/2;
+      j += block_height)
     {
       i = 0;
       item = goo_svg_item_new (boardRootItem, svg_handle, NULL);
@@ -535,6 +537,21 @@
     }
   g_object_unref(svg_handle);
 
+  // OK Button (Validation)
+  GdkPixbuf   *pixmap = NULL;
+  pixmap = gc_skin_pixmap_load("ok.png");
+  item = goo_canvas_image_new (boardRootItem,
+			       pixmap,
+			       dice_area_x -
+			       gdk_pixbuf_get_width(pixmap) - 15,
+			       block_height + 20,
+			       NULL);
+  g_signal_connect(item, "button_press_event",
+		   (GtkSignalFunc) process_ok, NULL);
+  gc_item_focus_init(item, NULL);
+  gdk_pixbuf_unref(pixmap);
+
+  // Tux
   tuxRootItem = goo_canvas_group_new (boardRootItem, NULL);
 
   svg_handle = gc_rsvg_load("reversecount/tux_top_south.svgz");
@@ -592,7 +609,7 @@
   int i,j;
 
   block_width  = BOARDWIDTH/number_of_item_x;
-  block_height = BOARDHEIGHT/number_of_item_y;
+  block_height = (BOARDHEIGHT-BARHEIGHT/2)/number_of_item_y;
 
   if(block < number_of_item_x)
     {
@@ -663,7 +680,7 @@
   GooCanvasBounds bounds;
 
   block_width  = BOARDWIDTH/number_of_item_x;
-  block_height = BOARDHEIGHT/number_of_item_y;
+  block_height = (BOARDHEIGHT-BARHEIGHT/2)/number_of_item_y;
 
   if(block < number_of_item_x)
     {