gcompris r3486 - in branches/gcomprixogoo/src: advanced_colors-activity colors-activity maze-activity memory-activity mosaic-activity

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Wed Aug  6 22:26:22 2008
New Revision: 3486
URL: http://svn.gnome.org/viewvc/gcompris?rev=3486&view=rev

Log:
more updates to adapt activities to the new bar


Modified:
   branches/gcomprixogoo/src/advanced_colors-activity/advanced_colors.c
   branches/gcomprixogoo/src/colors-activity/colors.c
   branches/gcomprixogoo/src/maze-activity/maze.c
   branches/gcomprixogoo/src/memory-activity/memory.c
   branches/gcomprixogoo/src/mosaic-activity/mosaic.py

Modified: branches/gcomprixogoo/src/advanced_colors-activity/advanced_colors.c
==============================================================================
--- branches/gcomprixogoo/src/advanced_colors-activity/advanced_colors.c	(original)
+++ branches/gcomprixogoo/src/advanced_colors-activity/advanced_colors.c	Wed Aug  6 22:26:22 2008
@@ -136,8 +136,8 @@
 
     gc_bar_set(GC_BAR_LEVEL);
     gc_score_start(SCORESTYLE_NOTE,
-		   BOARDWIDTH - 220,
-		   BOARDHEIGHT - 50,
+		   BOARDWIDTH - 195,
+		   BOARDHEIGHT - 30,
 		   gcomprisBoard->number_of_sublevel);
 
     gamewon = FALSE;

Modified: branches/gcomprixogoo/src/colors-activity/colors.c
==============================================================================
--- branches/gcomprixogoo/src/colors-activity/colors.c	(original)
+++ branches/gcomprixogoo/src/colors-activity/colors.c	Wed Aug  6 22:26:22 2008
@@ -346,22 +346,12 @@
 
       goo_canvas_text_new (boardRootItem,
 			   str,
-			   (double) BOARDWIDTH/2+2,
-			   (double) BOARDHEIGHT-25+2,
-			   -1,
-			   GTK_ANCHOR_CENTER,
-			   "font", gc_skin_font_board_huge_bold,
-			   "fill-color", "black",
-			   NULL);
-
-      goo_canvas_text_new (boardRootItem,
-			   str,
 			   (double) BOARDWIDTH/2,
-			   (double) BOARDHEIGHT-25,
+			   (double) 10,
 			   -1,
 			   GTK_ANCHOR_CENTER,
-			   "font", gc_skin_font_board_huge_bold,
-			   "fill-color", "blue",
+			   "font", gc_skin_font_subtitle,
+			   "fill-color", "black",
 			   NULL);
       g_free(str);
     }

Modified: branches/gcomprixogoo/src/maze-activity/maze.c
==============================================================================
--- branches/gcomprixogoo/src/maze-activity/maze.c	(original)
+++ branches/gcomprixogoo/src/maze-activity/maze.c	Wed Aug  6 22:26:22 2008
@@ -33,7 +33,7 @@
 #define BASE_X1 50
 #define BASE_Y1 50
 #define BASE_X2 800
-#define BASE_Y2 500
+#define BASE_Y2 470
 
 #define LINE_COLOR "white"
 
@@ -357,7 +357,7 @@
     {
       breedte=13;
       hoogte=8;
-      cellsize=60;
+      cellsize=55;
       buffer=6;
       board_border_x=(int) (BASE_X2-breedte*cellsize)/2;
       board_border_y=(int) (BASE_Y2-hoogte*cellsize)/2;
@@ -512,7 +512,7 @@
   warning_item = goo_canvas_text_new (boardRootItem,
 				      message,
 				      (double) BOARDWIDTH/2,
-				      (double) BOARDHEIGHT-20,
+				      (double) BOARDHEIGHT-BARHEIGHT-25,
 				      -1,
 				      GTK_ANCHOR_CENTER,
 				      "font", gc_skin_font_board_small,

Modified: branches/gcomprixogoo/src/memory-activity/memory.c
==============================================================================
--- branches/gcomprixogoo/src/memory-activity/memory.c	(original)
+++ branches/gcomprixogoo/src/memory-activity/memory.c	Wed Aug  6 22:26:22 2008
@@ -111,9 +111,9 @@
 
 /* Define the page area where memory cards can be displayed for CARD MODE */
 #define BASE_CARD_X1 50
-#define BASE_CARD_Y1 50
+#define BASE_CARD_Y1 40
 #define BASE_CARD_X2 790
-#define BASE_CARD_Y2 500
+#define BASE_CARD_Y2 470
 #define BASE_CARD_X1_TUX 200
 
 /* Define the page area where memory cards can be displayed for SOUND MODE */

Modified: branches/gcomprixogoo/src/mosaic-activity/mosaic.py
==============================================================================
--- branches/gcomprixogoo/src/mosaic-activity/mosaic.py	(original)
+++ branches/gcomprixogoo/src/mosaic-activity/mosaic.py	Wed Aug  6 22:26:22 2008
@@ -191,10 +191,10 @@
       goocanvas.Text(
         parent = self.rootitem,
         x=gcompris.BOARD_WIDTH/2,
-        y=gcompris.BOARD_HEIGHT - 30,
-        font=gcompris.skin.get_font("gcompris/title"),
+        y = self.palette_y - 20,
+        font=gcompris.skin.get_font("gcompris/subtitle"),
         text=(text),
-        fill_color="white",
+        fill_color="black",
         anchor=gtk.ANCHOR_CENTER
         )