Commit 1b4c28d2 authored by Yves Combe's avatar Yves Combe

reorganise menus suppress -d filter option in menu.c add --experimental

reorganise menus
suppress -d filter option in menu.c
add --experimental
probably some boards will disappears (if typo in xml.in
section).
pass version to 7.29 to force reread xml
parent 3e2a6553
2006-01-18 Yves Combe <yves@ycombe.net>
reorganise menus
suppress -d filter option in menu.c
add --experimental
probably some boards will disappears (if typo in xml.in section).
pass version to 7.29 to force reread xml
* boards/Makefile.am:
* boards/advanced_colors.xml.in:
* boards/algebra_by.xml.in:
* boards/algebra_group.xml.in:
* boards/algebra_guesscount.xml.in:
* boards/algebra_minus.xml.in:
* boards/algebra_plus.xml.in:
* boards/algebramenu.xml.in:
* boards/algorithm.xml.in:
* boards/awele.xml.in:
* boards/babymatch.xml.in:
* boards/babyshapes.xml.in:
* boards/ballcatch.xml.in:
* boards/bargame.xml.in:
* boards/billard.xml.in:
* boards/boardicons/boards.png:
* boards/boardicons/discovery.png:
* boards/boardicons/ear.png:
* boards/boardicons/eye_colors.png:
* boards/boardicons/geometry.png:
* boards/boardicons/keyboard.png:
* boards/boardicons/math.png:
* boards/boardicons/memory_elephant.png:
* boards/boardicons/miscelaneous.png:
* boards/boardicons/numeration.png:
* boards/boardicons/puzzles.png:
* boards/boardicons/strategy.png:
* boards/boardicons/tangram.png:
* boards/boardicons/warning.png:
* boards/boards.xml.in:
* boards/chess.xml.in:
* boards/chess_computer.xml.in:
* boards/chess_movelearn.xml.in:
* boards/chess_partyend.xml.in:
* boards/chronos.xml.in:
* boards/clockgame.xml.in:
* boards/colors.xml.in:
* boards/colors_group.xml.in:
* boards/computer.xml.in:
* boards/connect4.xml.in:
* boards/crane.xml.in:
* boards/discovery.xml.in:
* boards/doubleentry.xml.in:
* boards/draw.xml.in:
* boards/electric.xml.in:
* boards/enumerate.xml.in:
* boards/experience.xml.in:
* boards/experimental.xml.in:
* boards/fifteen.xml.in:
* boards/fun.xml.in:
* boards/geography.xml.in:
* boards/geometry.xml.in:
* boards/gletters.xml.in:
* boards/gnumch-equality.xml.in:
* boards/gnumch-factors.xml.in:
* boards/gnumch-inequality.xml.in:
* boards/gnumch-multiples.xml.in:
* boards/gnumch-primes.xml.in:
* boards/gnumchmenu.xml.in:
* boards/gtans.xml.in:
* boards/guessnumber.xml.in:
* boards/hanoi.xml.in:
* boards/hanoi_real.xml.in:
* boards/hexagon.xml.in:
* boards/keyboard.xml.in:
* boards/leftright.xml.in:
* boards/math.xml.in:
* boards/maze.xml.in:
* boards/maze2DRelative.xml.in:
* boards/maze3D.xml.in:
* boards/mazeInvisible.xml.in:
* boards/mazeMenu.xml.in:
* boards/melody.xml.in:
* boards/memory.xml.in:
* boards/memory_group.xml.in:
* boards/memory_sound.xml.in:
* boards/memory_sound_tux.xml.in:
* boards/memory_tux.xml.in:
* boards/miscelaneous.xml.in:
* boards/money.xml.in:
* boards/money_cents.xml.in:
* boards/mosaic.xml.in:
* boards/mouse.xml.in:
* boards/numeration.xml.in:
* boards/paintings.xml.in:
* boards/planegame.xml.in:
* boards/puzzle.xml.in:
* boards/pythontest.xml.in:
* boards/railroad.xml.in:
* boards/read_colors.xml.in:
* boards/reading.xml.in:
* boards/redraw.xml.in:
* boards/redraw_symmetrical.xml.in:
* boards/reversecount.xml.in:
* boards/scalesboard.xml.in:
* boards/smallnumbers.xml.in:
* boards/smallnumbers2.xml.in:
* boards/sound_group.xml.in:
* boards/strategy.xml.in:
* boards/sudoku.xml.in:
* boards/superbrain.xml.in:
* boards/tangram.xml.in:
* boards/target.xml.in:
* boards/traffic.xml.in:
* boards/wordsgame.xml.in:
* src/boards/menu.c: (display_board_icon):
* src/gcompris/gcompris.c: (gcompris_init):
* src/gcompris/properties.c: (gcompris_properties_new):
* src/gcompris/properties.h:
2006-01-17 Bruno coudoin <bruno.coudoin@free.fr>
Ported electric to rely on python 2.3 instead of 2.4
......
......@@ -8,99 +8,106 @@ xml_in_files = \
algebra_by.xml.in \
algebra_group.xml.in \
algebra_guesscount.xml.in \
algebramenu.xml.in \
algebra_minus.xml.in \
algebra_plus.xml.in \
algebramenu.xml.in \
algorithm.xml.in \
anim.xml.in \
awele.xml.in \
babymatch.xml.in \
babyshapes.xml.in \
ballcatch.xml.in \
bargame.xml.in \
billard.xml.in \
ballcatch.xml.in \
boards.xml.in \
canal_lock.xml.in \
chess.xml.in \
chess_computer.xml.in \
chess_movelearn.xml.in \
chess_partyend.xml.in \
chess.xml.in \
chronos.xml.in \
click_on_letter.xml.in \
clickgame.xml.in \
click_on_letter.xml.in \
clockgame.xml.in \
colors.xml.in \
crane.xml.in \
colors_group.xml.in \
colors.xml.in \
computer.xml.in \
connect4.xml.in \
crane.xml.in \
discovery.xml.in \
doubleentry.xml.in \
draw.xml.in \
electric.xml.in \
enumerate.xml.in \
erase.xml.in \
erase_clic.xml.in \
erase_double_clic.xml.in \
erase.xml.in \
experience.xml.in \
experimental.xml.in \
fifteen.xml.in \
followline.xml.in \
fun.xml.in \
geography.xml.in \
geometry.xml.in \
gletters.xml.in \
gnumch-equality.xml.in \
gnumch-factors.xml.in \
gnumch-inequality.xml.in \
gnumchmenu.xml.in \
gnumch-multiples.xml.in \
gnumch-primes.xml.in \
gnumchmenu.xml.in \
gletters.xml.in \
gtans.xml.in \
guessnumber.xml.in \
hanoi.xml.in \
hanoi_real.xml.in \
hanoi.xml.in \
hexagon.xml.in \
imageid.xml.in \
imagename.xml.in \
keyboard.xml.in \
leftright.xml.in \
login.xml.in \
maze.xml.in \
math.xml.in \
maze2DRelative.xml.in \
maze3D.xml.in \
mazeInvisible.xml.in \
mazeMenu.xml.in \
maze.xml.in \
melody.xml.in \
memory.xml.in \
memory_group.xml.in \
memory_tux.xml.in \
memory_sound.xml.in \
memory_sound_tux.xml.in \
memory_sound.xml.in \
memory_tux.xml.in \
memory.xml.in \
menu.xml.in \
miscelaneous.xml.in \
missing_letter.xml.in \
money_cents.xml.in \
money.xml.in \
mosaic.xml.in \
money_cents.xml.in \
mouse.xml.in \
numeration.xml.in \
paintings.xml.in \
paratrooper.xml.in \
planegame.xml.in \
puzzle.xml.in \
pythontest.xml.in \
railroad.xml.in \
railroad.xml.in \
read_colors.xml.in \
reading.xml.in \
readingh.xml.in \
readingv.xml.in \
redraw.xml.in \
reading.xml.in \
redraw_symmetrical.xml.in \
redraw.xml.in \
reversecount.xml.in \
searace.xml.in \
searace1player.xml.in \
scalesboard.xml.in \
smallnumbers.xml.in \
searace1player.xml.in \
searace.xml.in \
smallnumbers2.xml.in \
smallnumbers.xml.in \
sound_group.xml.in \
strategy.xml.in \
submarine.xml.in \
superbrain.xml.in \
sudoku.xml.in \
superbrain.xml.in \
tangram.xml.in \
target.xml.in \
traffic.xml.in \
tuxpaint.xml.in \
......
......@@ -3,7 +3,7 @@
<Board
name="advanced_colors"
type="advanced_colors"
section="/fun/colors_group"
section="/discovery/colors_group"
mode="*"
difficulty="6"
icon="boardicons/advanced_colors.png"
......
......@@ -3,7 +3,7 @@
<Board
name="algebra_by"
type="algebra"
section="/algebramenu/algebra_group"
section="/math/algebramenu/algebra_group"
mode="*"
difficulty="3"
icon="boardicons/algebra_by.png"
......
......@@ -3,7 +3,7 @@
<Board
name="algebra_group"
type="menu"
section="/algebramenu"
section="/math/algebramenu"
icon="boardicons/algebra_group.png"
author="">
<_title>Go to Algebra activities</_title>
......
......@@ -3,7 +3,7 @@
<Board
name="algebra_guesscount"
type="algebra_guesscount"
section="/algebramenu"
section="/math/algebramenu"
difficulty="3"
icon="boardicons/algebra_guesscount.png"
author="Pascal Georges (pascal.georges1@free.fr)"
......
......@@ -3,7 +3,7 @@
<Board
name="algebra_minus"
type="algebra"
section="/algebramenu/algebra_group"
section="/math/algebramenu/algebra_group"
mode="-"
difficulty="2"
icon="boardicons/algebra_minus.png"
......
......@@ -3,7 +3,7 @@
<Board
name="algebra_plus"
type="algebra"
section="/algebramenu/algebra_group"
section="/math/algebramenu/algebra_group"
mode="+"
difficulty="1"
icon="boardicons/algebra_plus.png"
......
......@@ -3,10 +3,10 @@
<Board
name="algebramenu"
type="menu"
section="/"
section="/math"
icon="boardicons/algebramenu.png"
author="">
<_title>Go to Math activities</_title>
<_description>Left-click the mouse on an activity to select it.</_description>
<_title>Go to calculation activities</_title>
<_description>Various calculation activities.</_description>
</Board>
</GCompris>
......@@ -3,7 +3,7 @@
<Board
name="algorithm"
type="python:algorithm"
section="/experience"
section="/discovery/miscelaneous"
difficulty="2"
icon="boardicons/algorithm.png"
author="Christof Petig and Ingo Konrad"
......
......@@ -3,7 +3,7 @@
<Board
name="awele"
type="awele"
section="/boards"
section="/experimental"
difficulty="2"
icon="boardicons/awele.png"
author="Frédéric Mazzarol"
......
......@@ -3,7 +3,7 @@
<Board
name="babymatch"
type="shapegame"
section="/computer"
section="/discovery/miscelaneous"
icon="boardicons/babymatch.png"
difficulty="1"
author="Bruno Coudoin (bruno.coudoin@free.fr)"
......
......@@ -3,7 +3,7 @@
<Board
name="babyshapes"
type="shapegame"
section="/computer"
section="/discovery/miscelaneous"
icon="boardicons/babyshapes.png"
difficulty="1"
author="Bruno Coudoin (bruno.coudoin@free.fr) / Andre Connes (andre.connes@toulouse.iufm.fr)"
......
......@@ -3,7 +3,7 @@
<Board
name="ballcatch"
type="python:ballcatch"
section="/computer"
section="/computer/keyboard"
icon="boardicons/ballcatch.png"
difficulty="1"
author="Bruno Coudoin (bruno.coudoin@free.fr)"
......
......@@ -3,7 +3,7 @@
<Board
name="bargame"
type="python:bargame"
section="/boards"
section="/strategy"
difficulty="2"
icon="boardicons/bargame.png"
author="Yves Combe"
......
......@@ -3,7 +3,7 @@
<Board
name="billard"
type="machpuzzle"
section="/computer"
section="/fun"
icon="boardicons/foot.png"
difficulty="1"
author="Bruno Coudoin (bruno.coudoin@free.fr)"
......
......@@ -3,7 +3,7 @@
<Board
name="chess"
type="menu"
section="/boards"
section="/strategy"
icon="boardicons/chess.png"
author="">
<_title>Practice chess</_title>
......
......@@ -3,7 +3,7 @@
<Board
name="chess_computer"
type="chess"
section="/boards/chess"
section="/strategy/chess"
mode="computer"
icon="boardicons/chess_computer.png"
difficulty="2"
......
......@@ -3,7 +3,7 @@
<Board
name="chess_movelearn"
type="chess"
section="/boards/chess"
section="/strategy/chess"
mode="movelearn"
icon="boardicons/chess_movelearn.png"
difficulty="2"
......
......@@ -3,7 +3,7 @@
<Board
name="chess_partyend"
type="chess"
section="/boards/chess"
section="/strategy/chess"
mode="partyend"
icon="boardicons/chess_partyend.png"
difficulty="2"
......
......@@ -3,7 +3,7 @@
<Board
name="chronos"
type="shapegame"
section="/fun"
section="/discovery/miscelaneous"
icon="boardicons/chronos.png"
mandatory_sound_file="chronos/space/1.ogg"
difficulty="1"
......
......@@ -3,7 +3,7 @@
<Board
name="clockgame"
type="clockgame"
section="/fun"
section="/discovery/miscelaneous"
icon="boardicons/clockgame.png"
difficulty="2"
author="Bruno Coudoin (bruno.coudoin@free.fr)"
......
<?xml version="1.0" encoding="UTF-8"?>
<GCompris>
<Board
name="colors1"
name="colors"
type="colors"
section="/fun/colors_group"
section="/discovery/colors_group"
mode="*"
difficulty="1"
icon="boardicons/colors.png"
......
......@@ -3,10 +3,10 @@
<Board
name="colors_group"
type="menu"
section="/fun"
icon="boardicons/colors.png"
section="/discovery"
icon="boardicons/eye_colors.png"
author="">
<_title>Go to Color activities</_title>
<_description>Left-click the mouse on an activity to select it.</_description>
<_description>Colors based activities.</_description>
</Board>
</GCompris>
......@@ -7,6 +7,6 @@
icon="boardicons/computer.png"
author="">
<_title>Discover the Computer</_title>
<_description>Left-click the mouse on an activity to select it.</_description>
<_description>Play with computers devices.</_description>
</Board>
</GCompris>
<?xml version="1.0" encoding="UTF-8"?>
<GCompris>
<Board type="python:connect4"
section="/boards"
section="/strategy"
name="connect4"
icon="boardicons/connect4.png"
difficulty="2"
......
......@@ -3,7 +3,7 @@
<Board
name="crane"
type="crane"
section="/boards"
section="/puzzles"
icon="boardicons/crane.png"
difficulty="2"
mode="normal"
......
<?xml version="1.0" encoding="UTF-8"?>
<GCompris>
<Board
name="boards"
name="discovery"
type="menu"
section="/"
icon="boardicons/boards.png"
icon="boardicons/discovery.png"
author="">
<_title>Go to board-based activities</_title>
<_description>Left-click the mouse on an activity to select it.</_description>
<_title>Go to discovery activities</_title>
<_description>Colors, sounds, memory...</_description>
</Board>
</GCompris>
......@@ -3,7 +3,7 @@
<Board
name="doubleentry"
type="shapegame"
section="/algebramenu"
section="/discovery/miscelaneous"
icon="boardicons/doubleentry.png"
difficulty="2"
author="Bruno Coudoin (bruno.coudoin@free.fr)"
......
......@@ -3,7 +3,7 @@
<Board
name="draw"
type="python:anim"
section="/fun"
section="/math/geometry"
icon="boardicons/draw.png"
mode="draw"
difficulty="2"
......
......@@ -3,7 +3,7 @@
<Board
name="electric"
type="python:electric"
section="/experience"
section="/experimental"
icon="boardicons/electric.png"
difficulty="5"
author="Bruno Coudoin (bruno.coudoin@free.fr)"
......
......@@ -3,7 +3,7 @@
<Board
name="enumerate"
type="enumerate"
section="/algebramenu"
section="/math/numeration"
icon="boardicons/enumerate.png"
difficulty="1"
author="Bruno Coudoin (bruno.coudoin@free.fr)">
......
......@@ -7,6 +7,6 @@
icon="boardicons/experience.png"
author="">
<_title>Go to experiential activities</_title>
<_description>Left-click the mouse on an activity to select it.</_description>
<_description>Various physical based activities.</_description>
</Board>
</GCompris>
<?xml version="1.0" encoding="UTF-8"?>
<GCompris>
<Board
name="experimental"
type="menu"
section="/"
icon="boardicons/warning.png"
difficulty="0"
author="">
<_title>Go to Experimental activities</_title>
<_description>Run gcompris -d 0 to see this menu.</_description>
</Board>
</GCompris>
......@@ -3,7 +3,7 @@
<Board
name="fifteen"
type="fifteen"
section="/boards"
section="/puzzles"
icon="boardicons/fifteen.png"
difficulty="5"
author="Bruno Coudoin (bruno.coudoin@free.fr)"
......
......@@ -7,6 +7,6 @@
icon="boardicons/fun.png"
author="">
<_title>Go to Amusement activities</_title>
<_description>Left-click the mouse on an activity to select it.</_description>
<_description>Various fun activities.</_description>
</Board>
</GCompris>
......@@ -3,7 +3,7 @@
<Board
name="geography"
type="shapegame"
section="/fun"
section="/discovery/miscelaneous"
icon="boardicons/globe.png"
mandatory_sound_file="peru.ogg"
mandatory_sound_dataset="gcompris geography"
......
<?xml version="1.0" encoding="UTF-8"?>
<GCompris>
<Board
name="geometry"
type="menu"
section="/math"
icon="boardicons/geometry.png"
author="">
<_title>Geometry</_title>
<_description>Geometry activities.</_description>
</Board>
</GCompris>
......@@ -3,7 +3,7 @@
<Board
name="gletters"
type="gletters"
section="/computer"
section="/computer/keyboard"
icon="boardicons/gletters.png"
difficulty="1"
author="Bruno Coudoin (bruno.coudoin@free.fr)"
......
......@@ -3,7 +3,7 @@
<Board
name="gnumch-equality"
type="python:gnumch"
section="/algebramenu/gnumchmenu"
section="/math/algebramenu/gnumchmenu"
difficulty="3"
icon="boardicons/gnumch-equal.png"
author="Joe Neeman (spuzzzzzzz@gmail.com)"
......
......@@ -3,7 +3,7 @@
<Board
name="gnumch-factors"
type="python:gnumch"
section="/algebramenu/gnumchmenu"
section="/math/algebramenu/gnumchmenu"
difficulty="5"
icon="boardicons/gnumch-factors.png"
author="Joe Neeman (spuzzzzzzz@gmail.com)"
......
......@@ -3,7 +3,7 @@
<Board
name="gnumch-inequality"
type="python:gnumch"
section="/algebramenu/gnumchmenu"
section="/math/algebramenu/gnumchmenu"
difficulty="3"
icon="boardicons/gnumch-inequal.png"
author="Joe Neeman (spuzzzzzzz@gmail.com)"
......
......@@ -3,7 +3,7 @@
<Board
name="gnumch-multiples"
type="python:gnumch"
section="/algebramenu/gnumchmenu"
section="/math/algebramenu/gnumchmenu"
difficulty="3"
icon="boardicons/gnumch-multiples.png"
author="Joe Neeman (spuzzzzzzz@gmail.com)"
......
......@@ -3,7 +3,7 @@
<Board
name="gnumch-primes"
type="python:gnumch"
section="/algebramenu/gnumchmenu"
section="/math/algebramenu/gnumchmenu"
difficulty="6"
icon="boardicons/gnumch-primes.png"
author="Joe Neeman (spuzzzzzzz@gmail.com)"
......
......@@ -3,10 +3,10 @@
<Board
name="gnumchmenu"
type="menu"
section="/algebramenu"
section="/math/algebramenu"
icon="boardicons/gnumch.png"
author="">