Commit 9896a52c authored by Bruno Coudoin's avatar Bruno Coudoin

Better ordering of the top level activity.

This patch forces the ordering of the top level activity group.
Now also the difficulty level does not appear on menu icons.
parent b1cb9c35
......@@ -5,6 +5,7 @@
type="menu"
section="/math/algebramenu"
icon="algebra_group.svg"
difficulty="2"
author="">
<_title>Go to Algebra activities</_title>
<_description>Left-click the mouse on an activity to select it.</_description>
......
......@@ -5,6 +5,7 @@
type="menu"
section="/math"
icon="algebramenu.svg"
difficulty="2"
author="">
<_title>Go to calculation activities</_title>
<_description>Various calculation activities.</_description>
......
<?xml version="1.0" encoding="UTF-8"?>
<GCompris>
<Board
<Board
name="computer"
type="menu"
type="menu"
section="/"
icon="computer.svg"
difficulty="1"
author="">
<_title>Discover the Computer</_title>
<_description>Play with computer peripherals.</_description>
......
......@@ -5,6 +5,7 @@
type="menu"
section="/"
icon="discovery.svg"
difficulty="2"
author="">
<_title>Go to discovery activities</_title>
<_description>Colors, sounds, memory...</_description>
......
......@@ -5,6 +5,7 @@
type="menu"
section="/"
icon="experience.svg"
difficulty="7"
author="">
<_title>Go to experiential activities</_title>
<_description>Various activities based on physical movement.</_description>
......
......@@ -5,6 +5,7 @@
type="menu"
section="/"
icon="fun.svg"
difficulty="4"
author="">
<_title>Go to Amusement activities</_title>
<_description>Various fun activities.</_description>
......
......@@ -5,6 +5,7 @@
type="menu"
section="/math"
icon="geometry.svg"
difficulty="3"
author="">
<_title>Geometry</_title>
<_description>Geometry activities.</_description>
......
......@@ -4,6 +4,7 @@
name="math"
type="menu"
section="/"
difficulty="5"
icon="math.svg"
author="">
<_title>Mathematics</_title>
......
......@@ -5,6 +5,7 @@
type="menu"
section="/discovery"
icon="miscelaneous.svg"
difficulty="2"
author="">
<_title>Miscellaneous activities</_title>
<_description>Time, Geography, ...</_description>
......
<?xml version="1.0" encoding="UTF-8"?>
<GCompris>
<Board
<Board
name="mouse"
type="menu"
type="menu"
section="/computer"
icon="mouse.svg"
difficulty="1"
author="">
<_title>Mouse-manipulation activities.</_title>
<_description>Various mouse-based activities (clicking, moving)</_description>
......
......@@ -5,6 +5,7 @@
type="menu"
section="/math"
icon="numeration.svg"
difficulty="1"
author="">
<_title>Numeration</_title>
<_description>Numeration activities.</_description>
......
......@@ -5,6 +5,7 @@
type="menu"
section="/"
icon="puzzles.svg"
difficulty="3"
author="">
<_title>Puzzles</_title>
<_description>Various puzzles.</_description>
......
......@@ -5,6 +5,7 @@
type="menu"
section="/"
icon="book.svg"
difficulty="6"
author="">
<_title>Go to the Reading activities</_title>
<_description>Reading activities.</_description>
......
......@@ -5,6 +5,7 @@
type="menu"
section="/"
icon="strategy.svg"
difficulty="8"
author="">
<_title>Strategy games</_title>
<_description>Strategy games like chess, connect4, ...</_description>
......
......@@ -485,17 +485,6 @@ static void menu_create_item(GooCanvasItem *parent, MenuItems *menuitems, Gcompr
NULL);
goo_canvas_item_scale(menu_button, ratio, ratio);
// display difficulty stars
if (board->difficulty != NULL)
{
difficulty = atoi(board->difficulty);
menu_difficulty_display(parent,
(double)current_x - pixmap_w/2 - 25,
(double)current_y - pixmap_h/2,
(double) 0.6,
difficulty);
}
// display board availability due to sound voice not present
if(board->mandatory_sound_file)
{
......@@ -537,6 +526,20 @@ static void menu_create_item(GooCanvasItem *parent, MenuItems *menuitems, Gcompr
current_x - pixmap_w/2 - 25,
current_y - pixmap_h/2);
}
else
{
// display difficulty stars
if (board->difficulty != NULL)
{
difficulty = atoi(board->difficulty);
menu_difficulty_display(parent,
(double)current_x - pixmap_w/2 - 25,
(double)current_y - pixmap_h/2,
(double) 0.6,
difficulty);
}
}
gdk_pixbuf_unref(menu_pixmap);
......
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