gcompris r3494 - in branches/gcomprixogoo/src: algorithm-activity awele-activity ballcatch-activity chess_computer-activity clockgame-activity gcompris imageid-activity missing_letter-activity wordprocessor-activity

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Thu Aug 14 13:17:48 2008
New Revision: 3494
URL: http://svn.gnome.org/viewvc/gcompris?rev=3494&view=rev

Log:
adapted activities to suit the new bar.


Modified:
   branches/gcomprixogoo/src/algorithm-activity/algorithm.py
   branches/gcomprixogoo/src/awele-activity/awele.c
   branches/gcomprixogoo/src/ballcatch-activity/ballcatch.py
   branches/gcomprixogoo/src/chess_computer-activity/chess.c
   branches/gcomprixogoo/src/clockgame-activity/clockgame.c
   branches/gcomprixogoo/src/gcompris/bar.c
   branches/gcomprixogoo/src/imageid-activity/imageid.c
   branches/gcomprixogoo/src/missing_letter-activity/missingletter.c
   branches/gcomprixogoo/src/wordprocessor-activity/wordprocessor.c

Modified: branches/gcomprixogoo/src/algorithm-activity/algorithm.py
==============================================================================
--- branches/gcomprixogoo/src/algorithm-activity/algorithm.py	(original)
+++ branches/gcomprixogoo/src/algorithm-activity/algorithm.py	Thu Aug 14 13:17:48 2008
@@ -167,7 +167,7 @@
     self.qm = goocanvas.Text(parent = self.rootitem,
                              text = "?",
                              x = self.place*self.distance+30+self.leftx,
-                             y = 170,
+                             y = 165,
                              fill_color_rgba = 0x000000ffL,
                              font = gcompris.skin.get_font("gcompris/board/huge bold"))
 

Modified: branches/gcomprixogoo/src/awele-activity/awele.c
==============================================================================
--- branches/gcomprixogoo/src/awele-activity/awele.c	(original)
+++ branches/gcomprixogoo/src/awele-activity/awele.c	Thu Aug 14 13:17:48 2008
@@ -28,9 +28,9 @@
 /* This is a global Y offset that can be use to move the
  * whole activity drawing up or down
  */
-#define OFFSET_Y 45
+#define OFFSET_Y 35
 
-#define Y_BOUTONS 412-OFFSET_Y
+#define Y_BOUTONS 322+OFFSET_Y
 
 char errorMsg[30];
 AWALE *staticAwale;
@@ -361,7 +361,7 @@
     int x, y;
 
     x = 35;
-    y = 190 - OFFSET_Y;
+    y = 100 + OFFSET_Y;
     goo_canvas_text_new (boardRootItem,
 			 _("NORTH"),
 			 (double) x,
@@ -373,7 +373,7 @@
 			 NULL);
 
     x = 765;
-    y = 295 - OFFSET_Y;
+    y = 205 + OFFSET_Y;
     goo_canvas_text_new (boardRootItem,
 			 _("SOUTH"),
 			 (double) x,
@@ -485,7 +485,7 @@
 	goo_canvas_text_new (boardRootItem,
 			     buffer,
 			     (caseCoord[i] + 45),
-			     ((i < 6) ? 378 : 94) - OFFSET_Y,
+			     ((i < 6) ? 288 : 4) + OFFSET_Y,
 			     -1,
 			     GTK_ANCHOR_CENTER,
 			     "font", "sans 20",
@@ -509,7 +509,7 @@
 	goo_canvas_text_new (boardRootItem,
 			     buffer,
 			     x1,
-			     246 - OFFSET_Y,
+			     156 + OFFSET_Y,
 			     -1,
 			     GTK_ANCHOR_CENTER,
 			     "font", "sans 24",
@@ -539,7 +539,7 @@
   graphsElt->msg = goo_canvas_text_new (boardRootItem,
 					_("Choose a house"),
 					(double) 400,
-					(double) 500 - OFFSET_Y,
+					(double) 410 + OFFSET_Y,
 					-1,
 					GTK_ANCHOR_CENTER,
 					"font", "sans 20",
@@ -617,10 +617,10 @@
 				  graphsElt->pixbufBeans[k],
 				  caseCoord[i] + g_random_int() % 50,
 				  (((i <
-				     6) ? 260 :
-				    130) +
+				     6) ? 170 :
+				    40) +
 				   g_random_int() %
-				   60) - OFFSET_Y,
+				   60) + OFFSET_Y,
 				  NULL);
 
 	  graphsElt->ptBeansHoleLink[idxTabBeans].hole = i;
@@ -807,8 +807,8 @@
 			"x", (double) caseCoord[i] +
 			g_random_int() % 50,
 			"y", (double) (((i <
-					 6) ? 260 : 130) +
-				       g_random_int() % 60 - OFFSET_Y),
+					 6) ? 170 : 40) +
+				       g_random_int() % 60 + OFFSET_Y),
 			NULL);
 
 	  ptBeansHoleLink[idxTabBeans].hole = i;

Modified: branches/gcomprixogoo/src/ballcatch-activity/ballcatch.py
==============================================================================
--- branches/gcomprixogoo/src/ballcatch-activity/ballcatch.py	(original)
+++ branches/gcomprixogoo/src/ballcatch-activity/ballcatch.py	Thu Aug 14 13:17:48 2008
@@ -52,7 +52,8 @@
     self.gcomprisBoard.sublevel=1
     self.gcomprisBoard.number_of_sublevel=1
     gcompris.bar_set(gcompris.BAR_LEVEL)
-    gcompris.set_background(self.gcomprisBoard.canvas.get_root_item(),"ballcatch/beach1.png")
+    gcompris.set_background(self.gcomprisBoard.canvas.get_root_item(),
+                            "ballcatch/beach1.png")
     gcompris.bar_set_level(self.gcomprisBoard)
 
 

Modified: branches/gcomprixogoo/src/chess_computer-activity/chess.c
==============================================================================
--- branches/gcomprixogoo/src/chess_computer-activity/chess.c	(original)
+++ branches/gcomprixogoo/src/chess_computer-activity/chess.c	Thu Aug 14 13:17:48 2008
@@ -60,8 +60,8 @@
 
 #define CHESSGC_BOARD_X	50
 #define CHESSGC_BOARD_Y	20
-#define SQUARE_WIDTH	60
-#define SQUARE_HEIGHT	60
+#define SQUARE_WIDTH	55
+#define SQUARE_HEIGHT	55
 #define WHITE_COLOR	0x9999FFFF
 #define BLACK_COLOR	0xFFFF99FF
 #define WHITE_COLOR_H	0x99FF99FF

Modified: branches/gcomprixogoo/src/clockgame-activity/clockgame.c
==============================================================================
--- branches/gcomprixogoo/src/clockgame-activity/clockgame.c	(original)
+++ branches/gcomprixogoo/src/clockgame-activity/clockgame.c	Thu Aug 14 13:17:48 2008
@@ -160,8 +160,8 @@
       gcomprisBoard->sublevel=1;
       gcomprisBoard->number_of_sublevel=3; /* Go to next level after this number of 'play' */
       gc_score_start(SCORESTYLE_NOTE,
-			   BOARDWIDTH - 220,
-			   BOARDHEIGHT - 70,
+			   BOARDWIDTH - 195,
+			   BOARDHEIGHT - 30,
 			   gcomprisBoard->number_of_sublevel);
       gc_bar_set(GC_BAR_LEVEL);
 

Modified: branches/gcomprixogoo/src/gcompris/bar.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/bar.c	(original)
+++ branches/gcomprixogoo/src/gcompris/bar.c	Thu Aug 14 13:17:48 2008
@@ -49,9 +49,9 @@
 				gchar *data);
 static void	 bar_reset_sound_id (void);
 static void	 setup_item_signals (GooCanvasItem *item, gchar* name);
-static gboolean	 _bar_down(void *ignore);
+//static gboolean	 _bar_down(void *ignore);
 //static void	 _bar_up(void);
-static void	 _force_bar_down(void);
+//static void	 _force_bar_down(void);
 //static void	 _force_bar_up(char *data);
 static gint	 bar_play_sound (gchar *sound);
 
@@ -68,7 +68,7 @@
 static GooCanvasItem *rootitem = NULL;
 
 static gint sound_play_id = 0;
-static gint bar_down_id = 0;
+//static gint bar_down_id = 0;
 static gboolean _hidden;     /* Dialog boxes request a bar hide */
 static gboolean _barup;      /* The state of the bar */
 static gboolean _click_mode; /* Need to click on the bar to
@@ -231,7 +231,7 @@
   _hidden = FALSE;
   _click_mode = TRUE;
   _barup = TRUE;
-  _force_bar_down();
+  //  _force_bar_down();
 }
 
 
@@ -372,6 +372,7 @@
 		 "visibility", GOO_CANVAS_ITEM_INVISIBLE, NULL);
 }
 
+#if 0
 static gboolean
 _bar_down(void *ignore)
 {
@@ -419,7 +420,6 @@
 			  GOO_CANVAS_ANIMATE_FREEZE);
 }
 
-#if 0
 static void _force_bar_up(char *data)
 {
   bar_reset_sound_id();
@@ -561,8 +561,8 @@
 {
   bar_reset_sound_id();
 
-  if(!bar_down_id)
-    bar_down_id = g_timeout_add (HIDE_BAR_TIMOUT, (GtkFunction) _bar_down, NULL);
+  //  if(!bar_down_id)
+  //    bar_down_id = g_timeout_add (HIDE_BAR_TIMOUT, (GtkFunction) _bar_down, NULL);
 
   return FALSE;
 }

Modified: branches/gcomprixogoo/src/imageid-activity/imageid.c
==============================================================================
--- branches/gcomprixogoo/src/imageid-activity/imageid.c	(original)
+++ branches/gcomprixogoo/src/imageid-activity/imageid.c	Thu Aug 14 13:17:48 2008
@@ -245,8 +245,8 @@
 
   gc_score_end();
   gc_score_start(SCORESTYLE_NOTE,
-		 50,
-		 BOARDHEIGHT - 50,
+		 BOARDWIDTH - 195,
+		 BOARDHEIGHT - 30,
 		 gcomprisBoard->number_of_sublevel);
 
   gc_score_set(gcomprisBoard->sublevel);

Modified: branches/gcomprixogoo/src/missing_letter-activity/missingletter.c
==============================================================================
--- branches/gcomprixogoo/src/missing_letter-activity/missingletter.c	(original)
+++ branches/gcomprixogoo/src/missing_letter-activity/missingletter.c	Thu Aug 14 13:17:48 2008
@@ -242,8 +242,8 @@
 
   gc_score_end();
   gc_score_start(SCORESTYLE_NOTE,
-		 50,
-		 BOARDHEIGHT - 45,
+		 BOARDWIDTH - 195,
+		 BOARDHEIGHT - 30,
 		 gcomprisBoard->number_of_sublevel);
 
 

Modified: branches/gcomprixogoo/src/wordprocessor-activity/wordprocessor.c
==============================================================================
--- branches/gcomprixogoo/src/wordprocessor-activity/wordprocessor.c	(original)
+++ branches/gcomprixogoo/src/wordprocessor-activity/wordprocessor.c	Thu Aug 14 13:17:48 2008
@@ -166,7 +166,7 @@
 #define word_area_x1 120
 #define word_area_y1 20
 #define word_area_width 650
-#define word_area_height 415
+#define word_area_height 430
 
 #define combo_style_x1 5
 #define combo_style_width 105