Commit 82c84627 authored by Bruno Coudoin's avatar Bruno Coudoin

preparation for 8.5PRE2

svn path=/branches/gcomprixogoo/; revision=3577
parent 20ce41ef
*** RELEASE 8.5PRE2 ***
2008-10-19 Bruno coudoin <bruno.coudoin@free.fr>
- synced translations with trunk
......
......@@ -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>
......@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
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
......
......@@ -227,8 +227,6 @@ static void menu_start (GcomprisBoard *agcomprisBoard)
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);
......
......@@ -32,9 +32,7 @@ static GooCanvasItem *second_item;
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 @@ static void display_hour(guint hour)
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 @@ static void display_minute(guint minute)
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 @@ static void display_second(guint second)
currentTime.second=second;
display_digital_time(digital_time_item, &currentTime);
display_digital_time(digital_time_item_s, &currentTime);
}
......@@ -474,18 +469,6 @@ clockgame_create_item(GooCanvasItem *parent)
/* 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 @@ clockgame_create_item(GooCanvasItem *parent)
}
else
{
digital_time_item_s = NULL;
digital_time_item = NULL;
}
......@@ -541,16 +523,6 @@ clockgame_create_item(GooCanvasItem *parent)
display_second(currentTime.second);
/* 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,
......@@ -561,18 +533,6 @@ clockgame_create_item(GooCanvasItem *parent)
"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,
"",
......
......@@ -259,6 +259,11 @@ void gc_bar_start (GooCanvas *theCanvas)
"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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment