gcompris r3577 - in branches/gcomprixogoo: . boards/skins/babytoy src/boards src/clockgame-activity src/gcompris

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Tue Oct 21 21:58:17 2008
New Revision: 3577
URL: http://svn.gnome.org/viewvc/gcompris?rev=3577&view=rev

Log:
preparation for 8.5PRE2


Modified:
   branches/gcomprixogoo/ChangeLog
   branches/gcomprixogoo/boards/skins/babytoy/skin.xml
   branches/gcomprixogoo/configure.in
   branches/gcomprixogoo/src/boards/menu2.c
   branches/gcomprixogoo/src/clockgame-activity/clockgame.c
   branches/gcomprixogoo/src/gcompris/bar.c

Modified: branches/gcomprixogoo/boards/skins/babytoy/skin.xml
==============================================================================
--- branches/gcomprixogoo/boards/skins/babytoy/skin.xml	(original)
+++ branches/gcomprixogoo/boards/skins/babytoy/skin.xml	Tue Oct 21 21:58:17 2008
@@ -65,7 +65,7 @@
     <color id="erase/rectangle in3"   rgba="0xf49a9a66"/>
     <color id="erase/rectangle out3"  rgba="0XFFFFFFFF"/>
     <color id="maze/wall color"       rgba="0x0000FFFF"/>
-    <color id="clockgame/text"        rgba="0xFFFFFFFF"/>
+    <color id="clockgame/text"        rgba="0Xc20200FF"/>
   </Skin>
 </GCompris>
 

Modified: branches/gcomprixogoo/configure.in
==============================================================================
--- branches/gcomprixogoo/configure.in	(original)
+++ branches/gcomprixogoo/configure.in	Tue Oct 21 21:58:17 2008
@@ -2,7 +2,7 @@
 
 AC_INIT(src/gcompris/gcompris.c)
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(gcompris, 8.5PRE1)
+AM_INIT_AUTOMAKE(gcompris, 8.5PRE2)
 AM_CONFIG_HEADER(config.h)
 
 # Internal libgoocanvas versioning

Modified: branches/gcomprixogoo/src/boards/menu2.c
==============================================================================
--- branches/gcomprixogoo/src/boards/menu2.c	(original)
+++ branches/gcomprixogoo/src/boards/menu2.c	Tue Oct 21 21:58:17 2008
@@ -227,8 +227,6 @@
       gc_bar_location (-1, -1, -1);
       gc_bar_set(GC_BAR_CONFIG|GC_BAR_ABOUT);
       gc_bar_set_level(gcomprisBoard);
-      /* FIXME: Bootstrap should not be needed */
-      gc_bar_location (-1, -1, -1);
 
 
       menuitems = g_new(MenuItems, 1);

Modified: branches/gcomprixogoo/src/clockgame-activity/clockgame.c
==============================================================================
--- branches/gcomprixogoo/src/clockgame-activity/clockgame.c	(original)
+++ branches/gcomprixogoo/src/clockgame-activity/clockgame.c	Tue Oct 21 21:58:17 2008
@@ -32,9 +32,7 @@
 static GooCanvasItem *hour_item;
 static GooCanvasItem *minute_item;
 static GooCanvasItem *digital_time_item;
-static GooCanvasItem *digital_time_item_s;
 static GooCanvasItem *time_to_find_item;
-static GooCanvasItem *time_to_find_item_s;
 
 static gboolean dragging = FALSE;
 static double drag_x, drag_y;
@@ -314,7 +312,6 @@
 
   currentTime.hour=hour;
   display_digital_time(digital_time_item, &currentTime);
-  display_digital_time(digital_time_item_s, &currentTime);
 }
 
 static void display_minute(guint minute)
@@ -349,7 +346,6 @@
 
   currentTime.minute=minute;
   display_digital_time(digital_time_item, &currentTime);
-  display_digital_time(digital_time_item_s, &currentTime);
 }
 
 static void display_second(guint second)
@@ -379,7 +375,6 @@
 
   currentTime.second=second;
   display_digital_time(digital_time_item, &currentTime);
-  display_digital_time(digital_time_item_s, &currentTime);
 }
 
 
@@ -474,18 +469,6 @@
   /* Create the text area for the digital time display */
   if(gcomprisBoard->level<4)
     {
-      digital_time_item_s =
-	goo_canvas_text_new (boardRootItem,
-			     "",
-			     (double) cx + 1.0,
-			     (double) cy +  needle_size/2 + 1.0,
-			     -1,
-			     GTK_ANCHOR_CENTER,
-			     "font", gc_skin_font_board_medium,
-			     "fill_color_rgba", 0xc4c4c4ff,
-			     NULL);
-      display_digital_time(digital_time_item_s, &currentTime);
-
       digital_time_item =
 	goo_canvas_text_new (boardRootItem,
 			     "",
@@ -500,7 +483,6 @@
     }
   else
     {
-      digital_time_item_s = NULL;
       digital_time_item = NULL;
     }
 
@@ -543,16 +525,6 @@
   /* Create the text area for the time to find display */
   goo_canvas_text_new (boardRootItem,
 		       _("Set the watch to:"),
-		       (double) BOARDWIDTH*0.17 + 1.0,
-		       (double) cy + needle_size +  needle_size / 3 - 30 + 1.0,
-		       -1,
-		       GTK_ANCHOR_CENTER,
-		       "font", gc_skin_font_board_small,
-		       "fill_color_rgba", gc_skin_color_shadow,
-		       NULL);
-
-  goo_canvas_text_new (boardRootItem,
-		       _("Set the watch to:"),
 		       (double) BOARDWIDTH*0.17,
 		       (double) cy + needle_size +  needle_size / 3 - 30,
 		       -1,
@@ -561,18 +533,6 @@
 		       "fill_color_rgba", gc_skin_get_color("clockgame/text"),
 		       NULL);
 
-  time_to_find_item_s = \
-    goo_canvas_text_new (boardRootItem,
-			 "",
-			 (double) BOARDWIDTH*0.17 + 1.0,
-			 (double) cy + needle_size +  needle_size / 3 + 1.0,
-			 -1,
-			 GTK_ANCHOR_CENTER,
-			 "font", gc_skin_font_board_big_bold,
-			 "fill_color_rgba", gc_skin_color_shadow,
-			 NULL);
-  display_digital_time(time_to_find_item_s, &timeToFind);
-
   time_to_find_item = \
     goo_canvas_text_new (boardRootItem,
 			 "",

Modified: branches/gcomprixogoo/src/gcompris/bar.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/bar.c	(original)
+++ branches/gcomprixogoo/src/gcompris/bar.c	Tue Oct 21 21:58:17 2008
@@ -259,6 +259,11 @@
                                       "home.png"));
 
   update_exit_button();
+
+  /* FIXME: Bootstrap for centering should not be needed */
+  gc_bar_set(GC_BAR_CONFIG|GC_BAR_ABOUT);
+  /* Set back the bar to it's original location */
+  gc_bar_location (-1, -1, -1);
   gc_bar_set(0);
 
   _hidden = FALSE;