gcompris r3589 - in branches/gcomprixogoo/src: algebra_by-activity anim-activity babymatch-activity ballcatch-activity bargame-activity chat-activity chess_computer-activity click_on_letter-activity connect4-activity drawnumber-activity electric-activity geo_country-activity/resources/geo_country gnumch-equality-activity guessnumber-activity missing_letter-activity money-activity paintings-activity/resources/paintings readingh-activity redraw-activity reversecount-activity searace-activity submarine-activity target-activity watercycle-activity

From: bcoudoin svn gnome org
To: svn-commits-list gnome org
Subject: gcompris r3589 - in branches/gcomprixogoo/src: algebra_by-activity anim-activity babymatch-activity ballcatch-activity bargame-activity chat-activity chess_computer-activity click_on_letter-activity connect4-activity drawnumber-activity electric-activity geo_country-activity/resources/geo_country gnumch-equality-activity guessnumber-activity missing_letter-activity money-activity paintings-activity/resources/paintings readingh-activity redraw-activity reversecount-activity searace-activity submarine-activity target-activity watercycle-activity
Date: Sat, 1 Nov 2008 22:56:35 +0000 (UTC)
Author: bcoudoin
Date: Sat Nov  1 22:56:35 2008
New Revision: 3589
URL: http://svn.gnome.org/viewvc/gcompris?rev=3589&view=rev

Log:
better adjustement of the bar in all activities


Modified:
   branches/gcomprixogoo/src/algebra_by-activity/algebra.c
   branches/gcomprixogoo/src/anim-activity/anim.py
   branches/gcomprixogoo/src/babymatch-activity/shapegame.c
   branches/gcomprixogoo/src/ballcatch-activity/ballcatch.py
   branches/gcomprixogoo/src/bargame-activity/bargame.py
   branches/gcomprixogoo/src/chat-activity/chat.py
   branches/gcomprixogoo/src/chess_computer-activity/chess.c
   branches/gcomprixogoo/src/click_on_letter-activity/click_on_letter.c
   branches/gcomprixogoo/src/connect4-activity/connect4.py
   branches/gcomprixogoo/src/drawnumber-activity/drawnumber.py
   branches/gcomprixogoo/src/electric-activity/electric.py
   branches/gcomprixogoo/src/geo_country-activity/resources/geo_country/board8_0.xml.in
   branches/gcomprixogoo/src/gnumch-equality-activity/gnumch.py
   branches/gcomprixogoo/src/guessnumber-activity/guessnumber.py
   branches/gcomprixogoo/src/missing_letter-activity/missingletter.c
   branches/gcomprixogoo/src/money-activity/money.c
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/Makefile.am
   branches/gcomprixogoo/src/readingh-activity/reading.c
   branches/gcomprixogoo/src/redraw-activity/redraw.py
   branches/gcomprixogoo/src/reversecount-activity/reversecount.c
   branches/gcomprixogoo/src/searace-activity/searace.py
   branches/gcomprixogoo/src/submarine-activity/submarine.c
   branches/gcomprixogoo/src/target-activity/target.c
   branches/gcomprixogoo/src/watercycle-activity/watercycle.py

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	Sat Nov  1 22:56:35 2008
@@ -175,6 +175,7 @@
 			   BOARDHEIGHT - 50,
 			   gcomprisBoard->number_of_sublevel);
       gc_bar_set(GC_BAR_LEVEL);
+      gc_bar_location(10, -1, 0.8);
 
       /* TRANSLATORS: Put here the mathematical operators '+-x/' for  your language. */
       operators=_("+-ÃÃ");

Modified: branches/gcomprixogoo/src/anim-activity/anim.py
==============================================================================
--- branches/gcomprixogoo/src/anim-activity/anim.py	(original)
+++ branches/gcomprixogoo/src/anim-activity/anim.py	Sat Nov  1 22:56:35 2008
@@ -147,8 +147,8 @@
     #
     # Drawing area is editing image area
     # Palying area is playing map
-    self.drawing_area = [124.0, 20.0, gcompris.BOARD_WIDTH - 15, gcompris.BOARD_HEIGHT - 90]
-    self.playing_area = [124.0, 20.0, gcompris.BOARD_WIDTH - 15, gcompris.BOARD_HEIGHT - 78]
+    self.drawing_area = [124.0, 20.0, gcompris.BOARD_WIDTH - 15, gcompris.BOARD_HEIGHT - 40]
+    self.playing_area = [124.0, 20.0, gcompris.BOARD_WIDTH - 15, gcompris.BOARD_HEIGHT - 40]
 
     # Global used for the select event
     #
@@ -194,7 +194,6 @@
     self.gcomprisBoard.sublevel=0
     self.gcomprisBoard.number_of_sublevel=0
 
-    gcompris.bar_set(0)
     gcompris.set_background(self.gcomprisBoard.canvas.get_root_item(),
                             gcompris.skin.image_to_skin("gcompris-bg.jpg"))
 
@@ -216,6 +215,8 @@
     self.draw_drawing_area(self.grid_step)
     self.draw_playing_area()
 
+    gcompris.bar_set(0)
+    gcompris.bar_location(10, -1, 0.6)
 
   def end(self):
     # stop the animation
@@ -812,7 +813,7 @@
       parent = self.rootitem,
       text = 1,
       x = x_left + minibutton_width + 14,
-      y = y_top,
+      y = y_top - 15,
       font = gcompris.skin.get_font("gcompris/board/medium"),
       fill_color = "white")
 

Modified: branches/gcomprixogoo/src/babymatch-activity/shapegame.c
==============================================================================
--- branches/gcomprixogoo/src/babymatch-activity/shapegame.c	(original)
+++ branches/gcomprixogoo/src/babymatch-activity/shapegame.c	Sat Nov  1 22:56:35 2008
@@ -256,6 +256,7 @@
       gcomprisBoard->maxlevel--;
 
       gc_bar_set(GC_BAR_CONFIG|GC_BAR_LEVEL);
+      gc_bar_location(10, -1, 0.6);
 
 
       gcomprisBoard->sublevel = 0;

Modified: branches/gcomprixogoo/src/ballcatch-activity/ballcatch.py
==============================================================================
--- branches/gcomprixogoo/src/ballcatch-activity/ballcatch.py	(original)
+++ branches/gcomprixogoo/src/ballcatch-activity/ballcatch.py	Sat Nov  1 22:56:35 2008
@@ -55,6 +55,7 @@
     gcompris.set_background(self.gcomprisBoard.canvas.get_root_item(),
                             "ballcatch/beach1.png")
     gcompris.bar_set_level(self.gcomprisBoard)
+    gcompris.bar_location(gcompris.BOARD_WIDTH - 160, -1, 0.7)
 
 
     self.ballinc    = 20        # Event loop timer for the ball move

Modified: branches/gcomprixogoo/src/bargame-activity/bargame.py
==============================================================================
--- branches/gcomprixogoo/src/bargame-activity/bargame.py	(original)
+++ branches/gcomprixogoo/src/bargame-activity/bargame.py	Sat Nov  1 22:56:35 2008
@@ -82,6 +82,7 @@
     else:
       gcompris.bar_set(gcompris.BAR_LEVEL|gcompris.BAR_REPEAT)
     gcompris.bar_set_level(self.gcomprisBoard)
+    gcompris.bar_location(10, -1, 0.7)
 
     # Create persistent over levels root item canvas for the board
     self.rootitem_p = goocanvas.Group(

Modified: branches/gcomprixogoo/src/chat-activity/chat.py
==============================================================================
--- branches/gcomprixogoo/src/chat-activity/chat.py	(original)
+++ branches/gcomprixogoo/src/chat-activity/chat.py	Sat Nov  1 22:56:35 2008
@@ -54,6 +54,7 @@
 
   def start(self):
     gcompris.bar_set (0)
+    gcompris.bar_location(gcompris.BOARD_WIDTH - 160, -1, 0.6)
     gcompris.set_background(self.gcomprisBoard.canvas.get_root_item(),
                             gcompris.skin.image_to_skin("gcompris-bg.jpg"))
     self.rootitem = goocanvas.Group(parent =  self.gcomprisBoard.canvas.get_root_item())
@@ -65,7 +66,7 @@
     self.global_area_sw.set_shadow_type(gtk.SHADOW_ETCHED_OUT)
 
     w = gcompris.BOARD_WIDTH - 240.0
-    h = gcompris.BOARD_HEIGHT - 120.0
+    h = gcompris.BOARD_HEIGHT - 100.0
     y = 20.0 # The upper limit of the text boxes
     x  = 20.0
 
@@ -137,7 +138,7 @@
     self.channel = gtk.Entry()
     w = 160.0
     h = 30.0
-    y = gcompris.BOARD_HEIGHT - 180.0
+    y = gcompris.BOARD_HEIGHT - 160.0
     x = x
 
 
@@ -171,7 +172,7 @@
     x = 20.0
     w = gcompris.BOARD_WIDTH - x * 2
     h = 30.0
-    y = gcompris.BOARD_HEIGHT - 90.0
+    y = gcompris.BOARD_HEIGHT - 70.0
 
 
     goocanvas.Widget(

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	Sat Nov  1 22:56:35 2008
@@ -288,6 +288,7 @@
 	default:
 	  gc_bar_set(0);
 	}
+      gc_bar_location(BOARDWIDTH-200, -1, 0.7);
 
       if(start_child (gnuchess_bin, &read_chan,
 		      &write_chan, &gnuchess_pid)==FALSE)

Modified: branches/gcomprixogoo/src/click_on_letter-activity/click_on_letter.c
==============================================================================
--- branches/gcomprixogoo/src/click_on_letter-activity/click_on_letter.c	(original)
+++ branches/gcomprixogoo/src/click_on_letter-activity/click_on_letter.c	Sat Nov  1 22:56:35 2008
@@ -314,6 +314,7 @@
 {
   /* It must be set it for the warning dialogs */
   gc_bar_set(GC_BAR_CONFIG|GC_BAR_LEVEL|GC_BAR_REPEAT);
+  gc_bar_location(BOARDWIDTH-270, 5, 0.7);
 
   gc_bar_set_level(gcomprisBoard);
 

Modified: branches/gcomprixogoo/src/connect4-activity/connect4.py
==============================================================================
--- branches/gcomprixogoo/src/connect4-activity/connect4.py	(original)
+++ branches/gcomprixogoo/src/connect4-activity/connect4.py	Sat Nov  1 22:56:35 2008
@@ -67,6 +67,7 @@
             gcompris.bar_set_level(self.gcomprisBoard)
         else:
             board_bar = 0
+        gcompris.bar_location(gcompris.BOARD_WIDTH - 170, -1, 0.7)
         # Create our rootitem. We put each canvas item in it so at the end we
         # only have to kill it. The canvas deletes all the items it contains automaticaly.
         self.rootitem = goocanvas.Group(parent =  self.gcomprisBoard.canvas.get_root_item())

Modified: branches/gcomprixogoo/src/drawnumber-activity/drawnumber.py
==============================================================================
--- branches/gcomprixogoo/src/drawnumber-activity/drawnumber.py	(original)
+++ branches/gcomprixogoo/src/drawnumber-activity/drawnumber.py	Sat Nov  1 22:56:35 2008
@@ -47,6 +47,7 @@
     #Display and configuration of menu bar
     gcompris.bar_set(gcompris.BAR_LEVEL)
     gcompris.bar_set_level(self.gcomprisBoard)
+    gcompris.bar_location(gcompris.BOARD_WIDTH - 160, -1, 0.7)
 
     #Start of level 1
     self.set_level()

Modified: branches/gcomprixogoo/src/electric-activity/electric.py
==============================================================================
--- branches/gcomprixogoo/src/electric-activity/electric.py	(original)
+++ branches/gcomprixogoo/src/electric-activity/electric.py	Sat Nov  1 22:56:35 2008
@@ -74,6 +74,8 @@
 
     gcompris.bar_set_level(self.gcomprisBoard)
 
+    gcompris.bar_location(gcompris.BOARD_WIDTH - 160, -1, 0.7)
+
     gcompris.set_background(self.gcomprisBoard.canvas.get_root_item(),
                             gcompris.skin.image_to_skin("gcompris-bg.jpg"))
 

Modified: branches/gcomprixogoo/src/geo_country-activity/resources/geo_country/board8_0.xml.in
==============================================================================
--- branches/gcomprixogoo/src/geo_country-activity/resources/geo_country/board8_0.xml.in	(original)
+++ branches/gcomprixogoo/src/geo_country-activity/resources/geo_country/board8_0.xml.in	Sat Nov  1 22:56:35 2008
@@ -8,7 +8,7 @@
 <tooltip>Nova Scotia</tooltip></shape>
 <shape name="New Brunswick" pixmapfile="geo_country/canada/new_brunswick.png" position="0" sound="sounds/$LOCALE/geography/canada/New_Brunswick.ogg" x="650.5" y="399.5">
 <tooltip>New Brunswick</tooltip></shape>
-<shape name="Newfoundland and Labrador" pixmapfile="geo_country/canada/newfoundland_and_labrador.png" position="0" sound="sounds/$LOCALE/geography/canada/Newfoundland_and_Labrador.ogg" x="676.5" y="311.5">
+<shape name="Newfoundland and Labrador" pixmapfile="geo_country/canada/newfoundland_labrador.png" position="0" sound="sounds/$LOCALE/geography/canada/Newfoundland_and_Labrador.ogg" x="676.5" y="311.5">
 <tooltip>Newfoundland and Labrador</tooltip></shape>
 <shape name="Quebec" pixmapfile="geo_country/canada/quebec.png" position="0" sound="sounds/$LOCALE/geography/canada/Quebec.ogg" x="585.0" y="346.5">
 <tooltip>Quebec</tooltip></shape>

Modified: branches/gcomprixogoo/src/gnumch-equality-activity/gnumch.py
==============================================================================
--- branches/gcomprixogoo/src/gnumch-equality-activity/gnumch.py	(original)
+++ branches/gcomprixogoo/src/gnumch-equality-activity/gnumch.py	Sat Nov  1 22:56:35 2008
@@ -699,7 +699,6 @@
         self.board.number_of_sublevel = self.levelset.num_sublevels
         self.trog_wait = 1900
 
-        gcompris.bar_set(0)
         gcompris.set_background(self.board.canvas.get_root_item(),
                                 gcompris.skin.image_to_skin("gcompris-bg.jpg"))
         gcompris.bar_set_level(self.board)
@@ -798,6 +797,9 @@
         # the spare life
         self.muncher.spare.goocanvas.raise_(None)
 
+        gcompris.bar_set(0)
+        gcompris.bar_location(10, -1, 0.6)
+
         self.startGame()
 
     def show_trogwarning(self):

Modified: branches/gcomprixogoo/src/guessnumber-activity/guessnumber.py
==============================================================================
--- branches/gcomprixogoo/src/guessnumber-activity/guessnumber.py	(original)
+++ branches/gcomprixogoo/src/guessnumber-activity/guessnumber.py	Sat Nov  1 22:56:35 2008
@@ -86,6 +86,7 @@
     gcompris.bar_set(gcompris.BAR_LEVEL)
 
     gcompris.bar_set_level(self.gcomprisBoard)
+    gcompris.bar_location(gcompris.BOARD_WIDTH - 160, -1, 0.7)
 
     gcompris.set_background(self.gcomprisBoard.canvas.get_root_item(),
                             "guessnumber/cave.png")

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	Sat Nov  1 22:56:35 2008
@@ -171,6 +171,7 @@
       gcomprisBoard->maxlevel -= 2;
 
       gc_bar_set(GC_BAR_CONFIG | GC_BAR_LEVEL);
+      gc_bar_location(10, -1, 0.9);
 
       missing_letter_next_level();
 

Modified: branches/gcomprixogoo/src/money-activity/money.c
==============================================================================
--- branches/gcomprixogoo/src/money-activity/money.c	(original)
+++ branches/gcomprixogoo/src/money-activity/money.c	Sat Nov  1 22:56:35 2008
@@ -135,6 +135,7 @@
       gcomprisBoard->sublevel=1;
       gcomprisBoard->number_of_sublevel=10; /* Go to next level after this number of 'play' */
       gc_bar_set(GC_BAR_LEVEL);
+      gc_bar_location(BOARDWIDTH-200, -1, 0.7);
 
       /* Default mode */
       if(!gcomprisBoard->mode)

Modified: branches/gcomprixogoo/src/paintings-activity/resources/paintings/Makefile.am
==============================================================================
--- branches/gcomprixogoo/src/paintings-activity/resources/paintings/Makefile.am	(original)
+++ branches/gcomprixogoo/src/paintings-activity/resources/paintings/Makefile.am	Sat Nov  1 22:56:35 2008
@@ -6,6 +6,12 @@
 	board1_1.xml.in \
 	board1_2.xml.in \
 	board1_3.xml.in \
+	board1_4.xml.in \
+	board1_5.xml.in \
+	board1_6.xml.in \
+	board1_7.xml.in \
+	board1_8.xml.in \
+	board1_9.xml.in \
 	board2_0.xml.in \
 	board2_1.xml.in \
 	board2_2.xml.in \

Modified: branches/gcomprixogoo/src/readingh-activity/reading.c
==============================================================================
--- branches/gcomprixogoo/src/readingh-activity/reading.c	(original)
+++ branches/gcomprixogoo/src/readingh-activity/reading.c	Sat Nov  1 22:56:35 2008
@@ -188,6 +188,7 @@
       gcomprisBoard->level = 1;
       gcomprisBoard->maxlevel = 9;
       gc_bar_set(GC_BAR_CONFIG|GC_BAR_LEVEL);
+      gc_bar_location(BOARDWIDTH-240, -1, 0.7);
       PangoFontDescription *font_medium = pango_font_description_from_string(gc_skin_font_board_medium);
       font_size = PANGO_PIXELS(pango_font_description_get_size (font_medium));
       interline = (int) (1.5*font_size);

Modified: branches/gcomprixogoo/src/redraw-activity/redraw.py
==============================================================================
--- branches/gcomprixogoo/src/redraw-activity/redraw.py	(original)
+++ branches/gcomprixogoo/src/redraw-activity/redraw.py	Sat Nov  1 22:56:35 2008
@@ -103,6 +103,7 @@
     gcompris.set_background(self.gcomprisBoard.canvas.get_root_item(),
                             gcompris.skin.image_to_skin("gcompris-bg.jpg"))
     gcompris.bar_set_level(self.gcomprisBoard)
+    gcompris.bar_location(4, -1, 0.6)
 
     # Create our rootitem. We put each canvas item in it so at the end we
     # only have to kill it. The canvas deletes all the items it contains automaticaly.

Modified: branches/gcomprixogoo/src/reversecount-activity/reversecount.c
==============================================================================
--- branches/gcomprixogoo/src/reversecount-activity/reversecount.c	(original)
+++ branches/gcomprixogoo/src/reversecount-activity/reversecount.c	Sat Nov  1 22:56:35 2008
@@ -200,6 +200,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_location(10, -1, 0.7);
 
       reversecount_next_level();
 
@@ -434,14 +435,14 @@
 
 
   block_width =  BOARDWIDTH/number_of_item_x;
-  block_height = (BOARDHEIGHT-BARHEIGHT/2)/number_of_item_y;
+  block_height = (BOARDHEIGHT-BARHEIGHT)/number_of_item_y;
 
   /* Timer is not requested */
   if(properties->timer > 0)
     {
       errors = number_of_dices + 4 - (MIN(properties->timer, 4));
       create_clock(BOARDWIDTH - block_width - 100,
-		   BOARDHEIGHT - block_height - 100 - BARHEIGHT/2,
+		   BOARDHEIGHT - block_height - 100 - BARHEIGHT,
 		   errors) ;
     }
   else
@@ -464,13 +465,13 @@
       goo_canvas_item_translate(item, i, j);
       goo_canvas_item_scale(item, xratio, yratio);
 
-      j=BOARDHEIGHT-BARHEIGHT/2-block_height;
+      j=BOARDHEIGHT-BARHEIGHT-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) - BARHEIGHT/2;
+  for(j = block_height; j<=BOARDHEIGHT - (block_height*2) - BARHEIGHT;
       j += block_height)
     {
       i = 0;
@@ -604,7 +605,7 @@
   int i,j;
 
   block_width  = BOARDWIDTH/number_of_item_x;
-  block_height = (BOARDHEIGHT-BARHEIGHT/2)/number_of_item_y;
+  block_height = (BOARDHEIGHT-BARHEIGHT)/number_of_item_y;
 
   if(block < number_of_item_x)
     {
@@ -675,7 +676,7 @@
   GooCanvasBounds bounds;
 
   block_width  = BOARDWIDTH/number_of_item_x;
-  block_height = (BOARDHEIGHT-BARHEIGHT/2)/number_of_item_y;
+  block_height = (BOARDHEIGHT-BARHEIGHT)/number_of_item_y;
 
   if(block < number_of_item_x)
     {

Modified: branches/gcomprixogoo/src/searace-activity/searace.py
==============================================================================
--- branches/gcomprixogoo/src/searace-activity/searace.py	(original)
+++ branches/gcomprixogoo/src/searace-activity/searace.py	Sat Nov  1 22:56:35 2008
@@ -95,9 +95,6 @@
     # We display what's going on here
     self.statusitem = []
 
-    #print("Gcompris_searace __init__.")
-
-
   def start(self):
     self.gcomprisBoard.level=1
     self.gcomprisBoard.maxlevel=4
@@ -142,13 +139,16 @@
     pixmap = gcompris.utils.load_pixmap(gcompris.skin.image_to_skin("ok.png"))
     item = goocanvas.Image(parent = self.rootitem,
                            pixbuf = pixmap,
-                           x = gcompris.BOARD_WIDTH - pixmap.get_width() - 20,
-                           y = gcompris.BOARD_HEIGHT - pixmap.get_height() - 5
                            )
+    zoom = 0.7
+    item.scale(zoom, zoom)
+    item.set_properties(x = (gcompris.BOARD_WIDTH / 2 + 40) / zoom,
+                        y = (gcompris.BOARD_HEIGHT - 90) / zoom)
     item.connect("button_press_event", self.ok_event)
     gcompris.utils.item_focus_init(item, None)
 
     gcompris.bar_set_level(self.gcomprisBoard)
+    gcompris.bar_location(gcompris.BOARD_WIDTH/2 - 60, -1, 0.6)
 
 
   def end(self):
@@ -158,9 +158,6 @@
     # Remove the root item removes all the others inside it
     self.rootitem.remove()
 
-    #print("Gcompris_searace end.")
-
-
   def pause(self, pause):
 
     self.board_paused = pause
@@ -405,8 +402,8 @@
     self.left_boat.sw.set_shadow_type(gtk.SHADOW_ETCHED_OUT)
 
     w = 250.0
-    h = 100.0
-    y = 350.0 # The upper limit of the text boxes
+    h = 160.0
+    y = 355.0 # The upper limit of the text boxes
     x_left  = gcompris.BOARD_WIDTH/4 - 30
     x_right = (gcompris.BOARD_WIDTH/4)*3 + 30
 
@@ -480,7 +477,7 @@
       text="",
       font=gcompris.skin.get_font("gcompris/content"),
       x=gcompris.BOARD_WIDTH/2,
-      y=y-40,
+      y=y-12,
       fill_color_rgba=0X000a89FFL,
       anchor = gtk.ANCHOR_CENTER
       )

Modified: branches/gcomprixogoo/src/submarine-activity/submarine.c
==============================================================================
--- branches/gcomprixogoo/src/submarine-activity/submarine.c	(original)
+++ branches/gcomprixogoo/src/submarine-activity/submarine.c	Sat Nov  1 22:56:35 2008
@@ -266,6 +266,7 @@
     gcomprisBoard->maxlevel=3;
     gcomprisBoard->sublevel=1;
     gc_bar_set(GC_BAR_LEVEL);
+    gc_bar_location(0, -1, 0.6);
     submarine_next_level();
     gamewon = FALSE;
     pause_board(FALSE);

Modified: branches/gcomprixogoo/src/target-activity/target.c
==============================================================================
--- branches/gcomprixogoo/src/target-activity/target.c	(original)
+++ branches/gcomprixogoo/src/target-activity/target.c	Sat Nov  1 22:56:35 2008
@@ -320,6 +320,7 @@
 
   gc_bar_set(GC_BAR_LEVEL);
   gc_bar_set_level(gcomprisBoard);
+  gc_bar_location(BOARDWIDTH-200, -1, 0.8);
 
   target_destroy_all_items();
   gamewon = FALSE;

Modified: branches/gcomprixogoo/src/watercycle-activity/watercycle.py
==============================================================================
--- branches/gcomprixogoo/src/watercycle-activity/watercycle.py	(original)
+++ branches/gcomprixogoo/src/watercycle-activity/watercycle.py	Sat Nov  1 22:56:35 2008
@@ -32,9 +32,6 @@
   def __init__(self, gcomprisBoard):
     self.gcomprisBoard = gcomprisBoard
 
-    print("Gcompris_watercycle __init__.")
-
-
   def start(self):
     self.gcomprisBoard.level=1
     self.gcomprisBoard.maxlevel=1
@@ -55,6 +52,7 @@
     self.waterlevel_timer = 0
 
     gcompris.bar_set(0)
+    gcompris.bar_location(gcompris.BOARD_WIDTH - 140, -1, 0.7)
     gcompris.set_background(self.gcomprisBoard.canvas.get_root_item(),
                             "watercycle/background.png")
     gcompris.bar_set_level(self.gcomprisBoard)
@@ -289,8 +287,6 @@
     # Ready GO
     self.move_boat()
 
-    print("Gcompris_watercycle start.")
-
 
   def end(self):
     # Remove all the timer first
@@ -308,22 +304,19 @@
     # Remove the root item removes all the others inside it
     self.rootitem.remove()
 
-    print("Gcompris_watercycle end.")
-
 
   def ok(self):
-    print("Gcompris_watercycle ok.")
+    pass
 
 
   def repeat(self):
-    print("Gcompris_watercycle repeat.")
+    pass
 
 
   def config(self):
-    print("Gcompris_watercycle config.")
+    pass
 
   def key_press(self, keyval, commit_str, preedit_str):
-    print("got key %i" % keyval)
     return False
 
   # This is called each second to update to castle water level
@@ -475,10 +468,10 @@
       self.sun_direction = self.sun_direction * -1
 
   def pause(self, pause):
-    print("Gcompris_watercycle pause. %i" % pause)
+    pass
 
   def set_level(self, level):
-    print("Gcompris_watercycle set level. %i" % level)
+    pass
 
   def sun_item_event(self, widget, target, event=None):
     if event.type == gtk.gdk.BUTTON_PRESS:
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]