gcompris r3275 - in branches/gcomprixogoo/src: algebra_by-activity chat-activity gcompris paratrooper-activity

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Wed Feb 27 21:08:00 2008
New Revision: 3275
URL: http://svn.gnome.org/viewvc/gcompris?rev=3275&view=rev

Log:
adapted some more activities to suit the moving bar


Modified:
   branches/gcomprixogoo/src/algebra_by-activity/algebra.c
   branches/gcomprixogoo/src/chat-activity/chat.py
   branches/gcomprixogoo/src/gcompris/bar.c
   branches/gcomprixogoo/src/paratrooper-activity/paratrooper.c

Modified: branches/gcomprixogoo/src/algebra_by-activity/algebra.c
==============================================================================
--- branches/gcomprixogoo/src/algebra_by-activity/algebra.c	(original)
+++ branches/gcomprixogoo/src/algebra_by-activity/algebra.c	Wed Feb 27 21:08:00 2008
@@ -393,9 +393,6 @@
 static void algebra_next_level()
 {
 
-  gc_bar_set_level(gcomprisBoard);
-  gc_score_set(gcomprisBoard->sublevel);
-
   algebra_destroy_all_items();
 
   boardRootItem = \
@@ -410,6 +407,9 @@
   /* Try the next level */
   algebra_create_item(boardRootItem);
 
+  gc_bar_set_level(gcomprisBoard);
+  gc_score_set(gcomprisBoard->sublevel);
+
 }
 
 

Modified: branches/gcomprixogoo/src/chat-activity/chat.py
==============================================================================
--- branches/gcomprixogoo/src/chat-activity/chat.py	(original)
+++ branches/gcomprixogoo/src/chat-activity/chat.py	Wed Feb 27 21:08:00 2008
@@ -65,7 +65,7 @@
     self.global_area_sw.set_shadow_type(gtk.SHADOW_ETCHED_OUT)
 
     w = gcompris.BOARD_WIDTH - 240.0
-    h = gcompris.BOARD_HEIGHT - 100.0
+    h = gcompris.BOARD_HEIGHT - 140.0
     y = 20.0 # The upper limit of the text boxes
     x  = 20.0
 
@@ -96,7 +96,7 @@
     self.friend_area_sw.set_shadow_type(gtk.SHADOW_ETCHED_OUT)
 
     w = 160.0
-    h = gcompris.BOARD_HEIGHT - 200.0
+    h = gcompris.BOARD_HEIGHT - 240.0
     y = 20.0 # The upper limit of the text boxes
     x = gcompris.BOARD_WIDTH - w - 20.0
 
@@ -137,7 +137,7 @@
     self.channel = gtk.Entry()
     w = 160.0
     h = 30.0
-    y = gcompris.BOARD_HEIGHT - 140.0
+    y = gcompris.BOARD_HEIGHT - 180.0
     x = x
 
 
@@ -171,7 +171,7 @@
     x = 20.0
     w = gcompris.BOARD_WIDTH - x * 2
     h = 30.0
-    y = gcompris.BOARD_HEIGHT - 60.0
+    y = gcompris.BOARD_HEIGHT - 110.0
 
 
     goocanvas.Widget(
@@ -217,12 +217,12 @@
     # There is a problem with GTK widgets, they are not covered by the help
     # We hide/show them here
     if(pause):
-      self.global_area_tv.props.hide()
-      self.global_area_sw.props.hide()
-      self.friend_area_tv.props.hide()
-      self.friend_area_sw.props.hide()
-      self.entry.props.hide()
-      self.channel.props.hide()
+      self.global_area_tv.hide()
+      self.global_area_sw.hide()
+      self.friend_area_tv.hide()
+      self.friend_area_sw.hide()
+      self.entry.hide()
+      self.channel.hide()
     else:
       self.global_area_tv.show()
       self.global_area_sw.show()

Modified: branches/gcomprixogoo/src/gcompris/bar.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/bar.c	(original)
+++ branches/gcomprixogoo/src/gcompris/bar.c	Wed Feb 27 21:08:00 2008
@@ -250,6 +250,7 @@
   char *str = NULL;
   GdkPixbuf *pixmap = NULL;
 
+  goo_canvas_item_raise(rootitem, NULL);
   /* Non yet initialized : Something Wrong */
   if(level_item==NULL)
     {
@@ -288,6 +289,7 @@
 void
 gc_bar_set_repeat_icon (GdkPixbuf *pixmap)
 {
+  goo_canvas_item_raise(rootitem, NULL);
   /* Non yet initialized : Something Wrong */
   if(level_item==NULL)
     {

Modified: branches/gcomprixogoo/src/paratrooper-activity/paratrooper.c
==============================================================================
--- branches/gcomprixogoo/src/paratrooper-activity/paratrooper.c	(original)
+++ branches/gcomprixogoo/src/paratrooper-activity/paratrooper.c	Wed Feb 27 21:08:00 2008
@@ -615,6 +615,7 @@
 		      "rsvg-handle", svg_handle,
 		      NULL);
 
+	gc_item_focus_init(paratrooperItem.paratrooper, NULL);
 	g_object_unref(svg_handle);
 
 	paratrooperItem.status = TUX_FLYING;