Commit faf6349e authored by Bruno Coudoin's avatar Bruno Coudoin

added missing gcompris-edit.desktop changed board plugin name fixed car

	* Makefile.am: added missing gcompris-edit.desktop
	* boards/billard.xml.in: changed board plugin name
	* boards/chronos/board3_0.xml.in: fixed car invention date
	* boards/chronos/board3_2.xml.in: fixed car invention date
	* boards/chronos/board3_4.xml.in: fixed car invention date
	* boards/melody.xml.in: changed board plugin name
	* boards/pythontest.xml.in: changed board plugin name
	* boards/redraw.xml.in: changed board plugin name
	* boards/redraw_symmetrical.xml.in: changed board plugin name
	* boards/sounds/Makefile.am: added it
	* boards/sounds/fr/Makefile.am:
	* boards/watercycle.xml.in:
	* configure.in: release 5.3.1, added italian
	* gcompris.spec.in: added italian voices
	* po/POTFILES.in: added missing files
	* src/boards/advanced_colors.c: (is_our_board): fixed missing static
	* src/boards/algebra.c: (key_press): -
	* src/boards/algebra_guesscount.c: (is_our_board): -
	* src/boards/canal_lock.c: (is_our_board): -
	* src/boards/chess.c: (is_our_board): -
	* src/boards/click_on_letter.c: (is_our_board): -
	* src/boards/clickgame.c: (clickgame_is_our_board): -
	* src/boards/clockgame.c: -
	* src/boards/colors.c: (is_our_board): -
	* src/boards/draw.c: (key_press): -
	* src/boards/enumerate.c: (key_press), (is_our_board): -
	* src/boards/erase.c: (is_our_board): -
	* src/boards/fifteen.c: (is_our_board): -
	* src/boards/gletters.c: (key_press): -
	* src/boards/hanoi.c: (is_our_board): -
	* src/boards/imageid.c: -
	* src/boards/leftright.c: (is_our_board): -
	* src/boards/machpuzzle.c: (is_our_board): -
	* src/boards/maze.c: (is_our_board): -
	* src/boards/memory.c: -
	* src/boards/menu.c: -
	* src/boards/missingletter.c: -
	* src/boards/money.c: -
	* src/boards/paratrooper.c: (key_press): -
	* src/boards/planegame.c: (key_press): -
	* src/boards/python.c: (pythonboard_pause), (pythonboard_end), -
	(pythonboard_is_our_board), (pythonboard_key_press), -
	(pythonboard_ok), (pythonboard_set_level), (pythonboard_config), -
	(pythonboard_repeat): -
	* src/boards/railroad.c: -
	* src/boards/read_colors.c: (is_our_board): -
	* src/boards/reading.c: -
	* src/boards/reversecount.c: -
	* src/boards/shapegame.c: (key_press): -
	* src/boards/smallnumbers.c: (key_press): -
	* src/boards/submarine.c: (is_our_board): -
	* src/boards/superbrain.c: (is_our_board): -
	* src/boards/target.c: (key_press), (is_our_board), -
	(display_windspeed): -
	* src/boards/traffic.c: (is_our_board): -
	* src/boards/wordsgame.c: (key_press): -
	* src/gcompris/Makefile.am: removed useless pluginenum.c and .h
	* src/gcompris/about.c: (gcompris_about_start):
	* src/gcompris/board.c: (init_plugins), (get_current_board_plugin),
	(board_check_file), (board_play), (board_stop): changed to include the work done by pluginenum.
	now use g_module instead of dl_open and plugins are loaded only when needed.
	Note that they are never unloaded yet.
	* src/gcompris/board.h: cleanup
	* src/gcompris/config.c: (gcompris_config_start):
	* src/gcompris/gameutil.c: (gcompris_read_xml_file),
	(selectMenuXML), (gcompris_load_menus): replaced scandir by readdir
	* src/gcompris/gcompris-board.h: added g_module items in our plugin struct
	* src/gcompris/gcompris.c: (board_widget_key_press_callback),
	(gcompris_get_locale), (gcompris_set_locale): use g_getenv instead of getenv
	* src/gcompris/gcompris.h: removed pluginenum.h
	* src/gcompris/pluginenum.c: removed. the code here is now included in boards.c
	* src/gcompris/pluginenum.h: removed. the code here is now included in boards.c
	* src/gcompris/properties.c: (gcompris_properties_new): use g_getenv instead of getenv
parent a1e7a05c
2004-03-13 Bruno coudoin <bruno.coudoin@free.fr>
* Makefile.am: added missing gcompris-edit.desktop
* boards/billard.xml.in: changed board plugin name
* boards/chronos/board3_0.xml.in: fixed car invention date
* boards/chronos/board3_2.xml.in: fixed car invention date
* boards/chronos/board3_4.xml.in: fixed car invention date
* boards/geography/Makefile.am: added france_region
* boards/geography/board5_0.xml.in: France region created by J.Ph. Ayanides
* boards/geography/france_region/alsace.png: France region created by J.Ph. Ayanides
* boards/geography/france_region/aquitaine.png: -
* boards/geography/france_region/auvergne.png: -
* boards/geography/france_region/basse-normandie.png: -
* boards/geography/france_region/bourgogne.png: -
* boards/geography/france_region/bretagne.png: -
* boards/geography/france_region/centre.png: -
* boards/geography/france_region/champagne-ardenne.png: -
* boards/geography/france_region/corse.png: -
* boards/geography/france_region/france-regions.png: -
* boards/geography/france_region/franche-conte.png: -
* boards/geography/france_region/haute-normandie.png: -
* boards/geography/france_region/ile-de-france.png: -
* boards/geography/france_region/languedoc-roussillon.png: -
* boards/geography/france_region/limousin.png: -
* boards/geography/france_region/lorraine.png: -
* boards/geography/france_region/midi-pyrenees.png: -
* boards/geography/france_region/nord-pas-de-calais.png: -
* boards/geography/france_region/pays-de-la-loire.png: -
* boards/geography/france_region/picardie.png: -
* boards/geography/france_region/poitou-charentes.png: -
* boards/geography/france_region/provence-alpes-cote_d_azur.png: -
* boards/geography/france_region/rhone-alpes.png: -
* boards/melody.xml.in: changed board plugin name
* boards/pythontest.xml.in: changed board plugin name
* boards/redraw.xml.in: changed board plugin name
* boards/redraw_symmetrical.xml.in: changed board plugin name
* boards/sounds/Makefile.am: added it
* boards/sounds/fr/Makefile.am:
* boards/sounds/fr/france_region/.cvsignore: France region created by J.Ph. Ayanides
* boards/sounds/fr/france_region/Makefile.am: -
* boards/sounds/fr/france_region/alsace.ogg: -
* boards/sounds/fr/france_region/aquitaine.ogg: -
* boards/sounds/fr/france_region/auvergne.ogg: -
* boards/sounds/fr/france_region/basse-normandie.ogg: -
* boards/sounds/fr/france_region/bourgogne.ogg: -
* boards/sounds/fr/france_region/bretagne.ogg: -
* boards/sounds/fr/france_region/centre.ogg: -
* boards/sounds/fr/france_region/champagne-ardenne.ogg: -
* boards/sounds/fr/france_region/corse.ogg: -
* boards/sounds/fr/france_region/franche-conte.ogg: -
* boards/sounds/fr/france_region/gcompris_franceregion_fr.assetml.in: -
* boards/sounds/fr/france_region/haute-normandie.ogg: -
* boards/sounds/fr/france_region/ile-de-france.ogg: -
* boards/sounds/fr/france_region/languedoc-roussillon.ogg: -
* boards/sounds/fr/france_region/limousin.ogg: -
* boards/sounds/fr/france_region/lorraine.ogg: -
* boards/sounds/fr/france_region/midi-pyrenees.ogg: -
* boards/sounds/fr/france_region/nord-pas-de-calais.ogg: -
* boards/sounds/fr/france_region/pays-de-la-loire.ogg: -
* boards/sounds/fr/france_region/picardie.ogg: -
* boards/sounds/fr/france_region/poitou-charentes.ogg: -
* boards/sounds/fr/france_region/provence-alpes-cote_d_azur.ogg: -
* boards/sounds/fr/france_region/rhone-alpes.ogg: -
* boards/sounds/it/.cvsignore: Italian sounds created by Francesco Agrusti
* boards/sounds/it/Makefile.am: -
* boards/sounds/it/alphabet/.cvsignore: -
* boards/sounds/it/alphabet/1.ogg: -
* boards/sounds/it/alphabet/10.ogg: -
* boards/sounds/it/alphabet/11.ogg: -
* boards/sounds/it/alphabet/12.ogg: -
* boards/sounds/it/alphabet/13.ogg: -
* boards/sounds/it/alphabet/14.ogg: -
* boards/sounds/it/alphabet/15.ogg: -
* boards/sounds/it/alphabet/16.ogg: -
* boards/sounds/it/alphabet/17.ogg: -
* boards/sounds/it/alphabet/18.ogg: -
* boards/sounds/it/alphabet/19.ogg: -
* boards/sounds/it/alphabet/2.ogg: -
* boards/sounds/it/alphabet/20.ogg: -
* boards/sounds/it/alphabet/3.ogg: -
* boards/sounds/it/alphabet/4.ogg: -
* boards/sounds/it/alphabet/5.ogg: -
* boards/sounds/it/alphabet/6.ogg: -
* boards/sounds/it/alphabet/7.ogg: -
* boards/sounds/it/alphabet/8.ogg: -
* boards/sounds/it/alphabet/9.ogg: -
* boards/sounds/it/alphabet/Makefile.am: -
* boards/sounds/it/alphabet/a.ogg: -
* boards/sounds/it/alphabet/b.ogg: -
* boards/sounds/it/alphabet/c.ogg: -
* boards/sounds/it/alphabet/d.ogg: -
* boards/sounds/it/alphabet/e.ogg: -
* boards/sounds/it/alphabet/f.ogg: -
* boards/sounds/it/alphabet/g.ogg: -
* boards/sounds/it/alphabet/gcompris_alphabet_it.assetml.in: -
* boards/sounds/it/alphabet/h.ogg: -
* boards/sounds/it/alphabet/i.ogg: -
* boards/sounds/it/alphabet/j.ogg: -
* boards/sounds/it/alphabet/k.ogg: -
* boards/sounds/it/alphabet/l.ogg: -
* boards/sounds/it/alphabet/m.ogg: -
* boards/sounds/it/alphabet/n.ogg: -
* boards/sounds/it/alphabet/o.ogg: -
* boards/sounds/it/alphabet/p.ogg: -
* boards/sounds/it/alphabet/q.ogg: -
* boards/sounds/it/alphabet/r.ogg: -
* boards/sounds/it/alphabet/s.ogg: -
* boards/sounds/it/alphabet/t.ogg: -
* boards/sounds/it/alphabet/u.ogg: -
* boards/sounds/it/alphabet/v.ogg: -
* boards/sounds/it/alphabet/w.ogg: -
* boards/sounds/it/alphabet/x.ogg: -
* boards/sounds/it/alphabet/y.ogg: -
* boards/sounds/it/alphabet/z.ogg: -
* boards/sounds/it/colors/.cvsignore: -
* boards/sounds/it/colors/Makefile.am: -
* boards/sounds/it/colors/black.ogg: -
* boards/sounds/it/colors/blue.ogg: -
* boards/sounds/it/colors/brown.ogg: -
* boards/sounds/it/colors/gcompris_colors_it.assetml.in: -
* boards/sounds/it/colors/green.ogg: -
* boards/sounds/it/colors/grey.ogg: -
* boards/sounds/it/colors/orange.ogg: -
* boards/sounds/it/colors/pink.ogg: -
* boards/sounds/it/colors/purple.ogg: -
* boards/sounds/it/colors/red.ogg: -
* boards/sounds/it/colors/white.ogg: -
* boards/sounds/it/colors/yellow.ogg: -
* boards/sounds/it/geography/.cvsignore: -
* boards/sounds/it/geography/Makefile.am: -
* boards/sounds/it/geography/alaska.ogg: -
* boards/sounds/it/geography/albania.ogg: -
* boards/sounds/it/geography/argentina.ogg: -
* boards/sounds/it/geography/austria.ogg: -
* boards/sounds/it/geography/bahamas.ogg: -
* boards/sounds/it/geography/belarus.ogg: -
* boards/sounds/it/geography/belgium.ogg: -
* boards/sounds/it/geography/bolivia.ogg: -
* boards/sounds/it/geography/bosnia_herzegovina.ogg: -
* boards/sounds/it/geography/brazil.ogg: -
* boards/sounds/it/geography/bulgaria.ogg: -
* boards/sounds/it/geography/canada.ogg: -
* boards/sounds/it/geography/chile.ogg: -
* boards/sounds/it/geography/colombia.ogg: -
* boards/sounds/it/geography/costa_rica.ogg: -
* boards/sounds/it/geography/croatia.ogg: -
* boards/sounds/it/geography/cuba.ogg: -
* boards/sounds/it/geography/cyprus.ogg: -
* boards/sounds/it/geography/czech.ogg: -
* boards/sounds/it/geography/denmark.ogg: -
* boards/sounds/it/geography/dominican_republic.ogg: -
* boards/sounds/it/geography/ecuador.ogg: -
* boards/sounds/it/geography/estonia.ogg: -
* boards/sounds/it/geography/finland.ogg: -
* boards/sounds/it/geography/french_guiana.ogg: -
* boards/sounds/it/geography/gcompris_geography_it.assetml.in: -
* boards/sounds/it/geography/greece.ogg: -
* boards/sounds/it/geography/greenland.ogg: -
* boards/sounds/it/geography/guatemala.ogg: -
* boards/sounds/it/geography/guyana.ogg: -
* boards/sounds/it/geography/haiti.ogg: -
* boards/sounds/it/geography/honduras.ogg: -
* boards/sounds/it/geography/hungary.ogg: -
* boards/sounds/it/geography/iceland.ogg: -
* boards/sounds/it/geography/ireland.ogg: -
* boards/sounds/it/geography/italy.ogg: -
* boards/sounds/it/geography/jamaica.ogg: -
* boards/sounds/it/geography/latvia.ogg: -
* boards/sounds/it/geography/lithuania.ogg: -
* boards/sounds/it/geography/luxembourg.ogg: -
* boards/sounds/it/geography/macedonia.ogg: -
* boards/sounds/it/geography/mexico.ogg: -
* boards/sounds/it/geography/moldova.ogg: -
* boards/sounds/it/geography/netherland.ogg: -
* boards/sounds/it/geography/nicaragua.ogg: -
* boards/sounds/it/geography/norway.ogg: -
* boards/sounds/it/geography/panama.ogg: -
* boards/sounds/it/geography/paraguay.ogg: -
* boards/sounds/it/geography/peru.ogg: -
* boards/sounds/it/geography/poland.ogg: -
* boards/sounds/it/geography/portugal.ogg: -
* boards/sounds/it/geography/romania.ogg: -
* boards/sounds/it/geography/russia.ogg: -
* boards/sounds/it/geography/salvador.ogg: -
* boards/sounds/it/geography/serbia_montenegro.ogg: -
* boards/sounds/it/geography/slovakia.ogg: -
* boards/sounds/it/geography/slovenia.ogg: -
* boards/sounds/it/geography/spain.ogg: -
* boards/sounds/it/geography/suriname.ogg: -
* boards/sounds/it/geography/sweden.ogg: -
* boards/sounds/it/geography/switz.ogg: -
* boards/sounds/it/geography/turkey.ogg: -
* boards/sounds/it/geography/ukraine.ogg: -
* boards/sounds/it/geography/united_kingdom.ogg: -
* boards/sounds/it/geography/uruguay.ogg: -
* boards/sounds/it/geography/usa.ogg: -
* boards/sounds/it/geography/venezuela.ogg: -
* boards/sounds/it/misc/.cvsignore: -
* boards/sounds/it/misc/Makefile.am: -
* boards/sounds/it/misc/back.ogg: -
* boards/sounds/it/misc/by.ogg: -
* boards/sounds/it/misc/click_on_letter.ogg: -
* boards/sounds/it/misc/congratulation.ogg: -
* boards/sounds/it/misc/equal.ogg: -
* boards/sounds/it/misc/gcompris_misc_it.assetml.in: -
* boards/sounds/it/misc/good.ogg: -
* boards/sounds/it/misc/great.ogg: -
* boards/sounds/it/misc/help.ogg: -
* boards/sounds/it/misc/level.ogg: -
* boards/sounds/it/misc/minus.ogg: -
* boards/sounds/it/misc/ok.ogg: -
* boards/sounds/it/misc/outof.ogg: -
* boards/sounds/it/misc/plus.ogg: -
* boards/sounds/it/misc/quit.ogg: -
* boards/sounds/it/misc/super.ogg: -
* boards/sounds/it/misc/welcome.ogg: -
* boards/watercycle.xml.in:
* configure.in: release 5.3.1, added italian
* gcompris.spec.in: added italian voices
* po/POTFILES.in: added missing files
* src/boards/advanced_colors.c: (is_our_board): fixed missing static
* src/boards/algebra.c: (key_press): -
* src/boards/algebra_guesscount.c: (is_our_board): -
* src/boards/canal_lock.c: (is_our_board): -
* src/boards/chess.c: (is_our_board): -
* src/boards/click_on_letter.c: (is_our_board): -
* src/boards/clickgame.c: (clickgame_is_our_board): -
* src/boards/clockgame.c: -
* src/boards/colors.c: (is_our_board): -
* src/boards/draw.c: (key_press): -
* src/boards/enumerate.c: (key_press), (is_our_board): -
* src/boards/erase.c: (is_our_board): -
* src/boards/fifteen.c: (is_our_board): -
* src/boards/gletters.c: (key_press): -
* src/boards/hanoi.c: (is_our_board): -
* src/boards/imageid.c: -
* src/boards/leftright.c: (is_our_board): -
* src/boards/machpuzzle.c: (is_our_board): -
* src/boards/maze.c: (is_our_board): -
* src/boards/memory.c: -
* src/boards/menu.c: -
* src/boards/missingletter.c: -
* src/boards/money.c: -
* src/boards/paratrooper.c: (key_press): -
* src/boards/planegame.c: (key_press): -
* src/boards/python.c: (pythonboard_pause), (pythonboard_end), -
(pythonboard_is_our_board), (pythonboard_key_press), -
(pythonboard_ok), (pythonboard_set_level), (pythonboard_config), -
(pythonboard_repeat): -
* src/boards/railroad.c: -
* src/boards/read_colors.c: (is_our_board): -
* src/boards/reading.c: -
* src/boards/reversecount.c: -
* src/boards/shapegame.c: (key_press): -
* src/boards/smallnumbers.c: (key_press): -
* src/boards/submarine.c: (is_our_board): -
* src/boards/superbrain.c: (is_our_board): -
* src/boards/target.c: (key_press), (is_our_board), -
(display_windspeed): -
* src/boards/traffic.c: (is_our_board): -
* src/boards/wordsgame.c: (key_press): -
* src/gcompris/Makefile.am: removed useless pluginenum.c and .h
* src/gcompris/about.c: (gcompris_about_start):
* src/gcompris/board.c: (init_plugins), (get_current_board_plugin),
(board_check_file), (board_play), (board_stop): changed to include the work done by pluginenum.
now use g_module instead of dl_open and plugins are loaded only when needed.
Note that they are never unloaded yet.
* src/gcompris/board.h: cleanup
* src/gcompris/config.c: (gcompris_config_start):
* src/gcompris/gameutil.c: (gcompris_read_xml_file),
(selectMenuXML), (gcompris_load_menus): replaced scandir by readdir
* src/gcompris/gcompris-board.h: added g_module items in our plugin struct
* src/gcompris/gcompris.c: (board_widget_key_press_callback),
(gcompris_get_locale), (gcompris_set_locale): use g_getenv instead of getenv
* src/gcompris/gcompris.h: removed pluginenum.h
* src/gcompris/pluginenum.c: removed. the code here is now included in boards.c
* src/gcompris/pluginenum.h: removed. the code here is now included in boards.c
* src/gcompris/properties.c: (gcompris_properties_new): use g_getenv instead of getenv
2004-03-03 Bruno coudoin <bruno.coudoin@free.fr>
* boards/chronos/board3_0.xml.in: missing files for the new transportation board
......
......@@ -40,7 +40,7 @@ dist-hook:
fi
CLEANFILES = core-translation-report gcompris.desktop gcompris.spec
CLEANFILES = core-translation-report gcompris.desktop gcompris-edit.desktop gcompris.spec
clean-local:
rm -f intltool-extract intltool-merge intltool-update
......
......@@ -2,7 +2,7 @@
<GCompris>
<Board
name="billard"
type="minigolf"
type="machpuzzle"
section="/computer/."
icon="boardicons/billard.png"
difficulty="1"
......
......@@ -13,7 +13,7 @@ http://www.wikipedia.org</_name>
<Shape name="A" pixmapfile="chronos/images/viking_boat.png" sound="Undefined" x="212" y="91" zoomx="1" zoomy="1" position="0"/>
<Title x="212" y="170" justification="GTK_JUSTIFY_CENTER"><_name>VIII Century</_name></Title>
<Shape name="C" pixmapfile="gcompris/misc/car.png" sound="Undefined" x="540" y="418" zoomx="1" zoomy="1" position="0"/>
<Title x="540" y="470" justification="GTK_JUSTIFY_CENTER"><name>1889</name></Title>
<Title x="540" y="470" justification="GTK_JUSTIFY_CENTER"><name>1769</name></Title>
<Shape name="G" pixmapfile="gcompris/misc/tuxloco.png" sound="Undefined" x="420" y="241" zoomx="1" zoomy="1" position="0"/>
<Title x="420" y="310" justification="GTK_JUSTIFY_CENTER"><name>1758</name></Title>
</ShapeGame>
......@@ -7,7 +7,7 @@
<Shape name="B" pixmapfile="gcompris/misc/bicycle.png" sound="Undefined" x="167" y="307" zoomx="1" zoomy="1" position="0"/>
<Title x="167" y="360" justification="GTK_JUSTIFY_CENTER"><name>1790</name></Title>
<Shape name="C" pixmapfile="gcompris/misc/car.png" sound="Undefined" x="602" y="315" zoomx="1" zoomy="1" position="0"/>
<Title x="602" y="370" justification="GTK_JUSTIFY_CENTER"><name>1889</name></Title>
<Title x="602" y="370" justification="GTK_JUSTIFY_CENTER"><name>1769</name></Title>
<Shape name="E" pixmapfile="gcompris/misc/tuxplane.png" sound="Undefined" x="377" y="168" zoomx="1" zoomy="1" position="0"/>
<Title x="377" y="220" justification="GTK_JUSTIFY_CENTER"><name>1880</name></Title>
</ShapeGame>
......
......@@ -9,6 +9,6 @@
<Shape name="E" pixmapfile="gcompris/misc/tuxplane.png" sound="Undefined" x="474" y="114" zoomx="1" zoomy="1" position="0"/>
<Title x="474" y="170" justification="GTK_JUSTIFY_CENTER"><name>1880</name></Title>
<Shape name="C" pixmapfile="gcompris/misc/car.png" sound="Undefined" x="625" y="284" zoomx="1" zoomy="1" position="0"/>
<Title x="625" y="350" justification="GTK_JUSTIFY_CENTER"><name>1889</name></Title>
<Title x="625" y="350" justification="GTK_JUSTIFY_CENTER"><name>1769</name></Title>
</ShapeGame>
......@@ -2,7 +2,7 @@
<GCompris>
<Board
name="melody"
type="pythonboard:melody"
type="python:melody"
section="/experience/."
difficulty="2"
icon="boardicons/melody.png"
......
......@@ -2,7 +2,7 @@
<GCompris>
<Board
name="pythontest"
type="pythonboard:pythontest"
type="python:pythontest"
section="/."
icon="boardicons/python.png"
difficulty="0"
......
......@@ -2,7 +2,7 @@
<GCompris>
<Board
name="redraw"
type="pythonboard:redraw"
type="python:redraw"
section="/fun/."
mode="normal"
difficulty="3"
......
......@@ -2,7 +2,7 @@
<GCompris>
<Board
name="redraw"
type="pythonboard"
type="python:redraw"
section="/fun/."
mode="symmetrical"
difficulty="4"
......
SUBDIRS = de en es fr pt
SUBDIRS = de en es fr it pt
SUBDIRS = alphabet colors geography misc
SUBDIRS = alphabet colors france_region geography misc
......@@ -2,7 +2,7 @@
<GCompris>
<Board
name="watercycle"
type="pythonboard:watercycle"
type="python:watercycle"
section="/experience/."
difficulty="3"
icon="boardicons/watercycle.png"
......
dnl Process this file with autoconf to produce a configure script.
AC_INIT(src/gcompris/gcompris.c)
AM_INIT_AUTOMAKE(gcompris, 5.2)
AM_INIT_AUTOMAKE(gcompris, 5.3.1)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
......@@ -251,6 +251,7 @@ AC_SUBST(ASSETML_DIR)
AC_DEFINE_UNQUOTED(ASSETML_DIR, "${myprefix}/${DATADIRNAME}/${ASSETML_DIR}", [Global assetml directory])
dnl assetml version management
# DE
VERSION_VOICES_ALPHABET_DE=1.0
AC_SUBST(VERSION_VOICES_ALPHABET_DE)
......@@ -263,6 +264,7 @@ AC_SUBST(VERSION_VOICES_GEOGRAPHY_DE)
VERSION_VOICES_MISC_DE=1.0
AC_SUBST(VERSION_VOICES_MISC_DE)
# EN
VERSION_VOICES_ALPHABET_EN=1.0
AC_SUBST(VERSION_VOICES_ALPHABET_EN)
......@@ -275,6 +277,7 @@ AC_SUBST(VERSION_VOICES_GEOGRAPHY_EN)
VERSION_VOICES_MISC_EN=1.0
AC_SUBST(VERSION_VOICES_MISC_EN)
# ES
VERSION_VOICES_ALPHABET_ES=1.0
AC_SUBST(VERSION_VOICES_ALPHABET_ES)
......@@ -287,6 +290,7 @@ AC_SUBST(VERSION_VOICES_GEOGRAPHY_ES)
VERSION_VOICES_MISC_ES=1.0
AC_SUBST(VERSION_VOICES_MISC_ES)
# FR
VERSION_VOICES_ALPHABET_FR=1.0
AC_SUBST(VERSION_VOICES_ALPHABET_FR)
......@@ -299,6 +303,23 @@ AC_SUBST(VERSION_VOICES_GEOGRAPHY_FR)
VERSION_VOICES_MISC_FR=1.0
AC_SUBST(VERSION_VOICES_MISC_FR)
VERSION_VOICES_FRANCE_REGIONS_FR=1.0
AC_SUBST(VERSION_VOICES_FRANCE_REGIONS_FR)
# IT
VERSION_VOICES_ALPHABET_IT=1.0
AC_SUBST(VERSION_VOICES_ALPHABET_IT)
VERSION_VOICES_COLORS_IT=1.0
AC_SUBST(VERSION_VOICES_COLORS_IT)
VERSION_VOICES_GEOGRAPHY_IT=1.0
AC_SUBST(VERSION_VOICES_GEOGRAPHY_IT)
VERSION_VOICES_MISC_IT=1.0
AC_SUBST(VERSION_VOICES_MISC_IT)
# PT
VERSION_VOICES_ALPHABET_PT=1.0
AC_SUBST(VERSION_VOICES_ALPHABET_PT)
......@@ -366,8 +387,14 @@ boards/sounds/es/misc/Makefile
boards/sounds/fr/Makefile
boards/sounds/fr/alphabet/Makefile
boards/sounds/fr/colors/Makefile
boards/sounds/fr/france_region/Makefile
boards/sounds/fr/geography/Makefile
boards/sounds/fr/misc/Makefile
boards/sounds/it/Makefile
boards/sounds/it/alphabet/Makefile
boards/sounds/it/colors/Makefile
boards/sounds/it/geography/Makefile
boards/sounds/it/misc/Makefile
boards/sounds/pt/Makefile
boards/sounds/pt/alphabet/Makefile
boards/sounds/pt/colors/Makefile
......
......@@ -196,6 +196,47 @@ Version: @VERSION_VOICES_MISC_FR@
%description -n assetml-voices-misc-fr
Miscelaneous voices in French
%package -n assetml-voices-france-regions-fr
Summary: Voices of names of the French Regions in French
Group: Amusements/Games
Version: @VERSION_VOICES_FRANCE_REGIONS_FR@
%description -n assetml-voices-france-regions-fr
Voices of names of the French Regions in French
%package -n assetml-voices-alphabet-it
Summary: Alphabet voices in Italian
Group: Amusements/Games
Version: @VERSION_VOICES_ALPHABET_IT@
%description -n assetml-voices-alphabet-it
Alphabet voices in Italian
%package -n assetml-voices-colors-it
Summary: Colors voices in Italian
Group: Amusements/Games
Version: @VERSION_VOICES_COLORS_IT@
%description -n assetml-voices-colors-it
Colors voices in Italian
%package -n assetml-voices-geography-it
Summary: Country name voices in Italian
Group: Amusements/Games
Version: @VERSION_VOICES_GEOGRAPHY_IT@
%description -n assetml-voices-geography-it
Country name voices in Italian
%package -n assetml-voices-misc-it
Summary: Miscelaneous voices in Italian
Group: Amusements/Games
Version: @VERSION_VOICES_MISC_IT@
%description -n assetml-voices-misc-it
Miscelaneous voices in Italian
%package -n assetml-voices-alphabet-pt
Summary: Alphabet voices in Portuguese
......@@ -382,6 +423,32 @@ rm -rf $RPM_BUILD_ROOT
%{prefix}/share/gcompris/boards/sounds/fr/misc
%{prefix}/share/@ASSETML_DIR@/gcompris_misc_fr.assetml
%files -n assetml-voices-france-regions-fr
%defattr(-, root, root)
%{prefix}/share/gcompris/boards/sounds/fr/france_region
%{prefix}/share/@ASSETML_DIR@/gcompris_franceregion_fr.assetml
%files -n assetml-voices-alphabet-it
%defattr(-, root, root)
%{prefix}/share/gcompris/boards/sounds/it/alphabet
%{prefix}/share/@ASSETML_DIR@/gcompris_alphabet_it.assetml
%files -n assetml-voices-colors-it
%defattr(-, root, root)
%{prefix}/share/gcompris/boards/sounds/it/colors
%{prefix}/share/@ASSETML_DIR@/gcompris_colors_it.assetml
%files -n assetml-voices-geography-it
%defattr(-, root, root)
%{prefix}/share/gcompris/boards/sounds/it/geography
%{prefix}/share/@ASSETML_DIR@/gcompris_geography_it.assetml
%files -n assetml-voices-misc-it
%defattr(-, root, root)
%{prefix}/share/gcompris/boards/sounds/it/misc
%{prefix}/share/@ASSETML_DIR@/gcompris_misc_it.assetml
%files -n assetml-voices-alphabet-pt
%defattr(-, root, root)
......
......@@ -41,6 +41,11 @@ boards/chess_partyend.xml.in
boards/chronos.xml.in
boards/chronos/board1_0.xml.in
boards/chronos/board2_0.xml.in
boards/chronos/board3_0.xml.in
boards/chronos/board3_1.xml.in
boards/chronos/board3_2.xml.in
boards/chronos/board3_3.xml.in
boards/chronos/board3_4.xml.in
boards/click_on_letter.xml.in
boards/clickgame.xml.in
boards/clockgame.xml.in
......
......@@ -28,8 +28,8 @@
#define SOUNDLISTFILE PACKAGE
GcomprisBoard *gcomprisBoard = NULL;
gboolean board_paused = TRUE;
static GcomprisBoard *gcomprisBoard = NULL;
static gboolean board_paused = TRUE;
static void start_board (GcomprisBoard *agcomprisBoard);
static void pause_board (gboolean pause);
......@@ -79,7 +79,7 @@ static int color_x1 = 199, color_x2 = 582;
static int color_y1 = 47, color_y2 = 133;
/* Description of this plugin */
BoardPlugin menu_bp =
static BoardPlugin menu_bp =
{
NULL,
NULL,
......@@ -182,7 +182,7 @@ static void set_level (guint level) {
/* =====================================================================
*
* =====================================================================*/
gboolean is_our_board (GcomprisBoard *gcomprisBoard) {
static gboolean is_our_board (GcomprisBoard *gcomprisBoard) {
if (gcomprisBoard) {
if(g_strcasecmp(gcomprisBoard->type, "advanced_colors")==0) {
/* Set the plugin entry */
......
/* gcompris - algebra.c
*
* Time-stamp: <2004/01/27 00:38:42 bcoudoin>
* Time-stamp: <2004/03/10 23:15:42 bcoudoin>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -72,7 +72,7 @@ static void pause_board (gboolean pause);
static void end_board (void);
static gboolean is_our_board (GcomprisBoard *gcomprisBoard);
static void set_level (guint level);
gint key_press(guint keyval);
static gint key_press(guint keyval);
static void process_ok(void);
static GnomeCanvasItem *algebra_create_item(GnomeCanvasGroup *parent);
......@@ -90,7 +90,7 @@ static void set_focus_item(ToBeFoundItem *toBeFoundItem, gboolean status);
static void init_operation(void);
/* Description of this plugin */
BoardPlugin menu_bp =
static BoardPlugin menu_bp =
{
NULL,
NULL,
......@@ -217,7 +217,7 @@ set_level (guint level)
}
}
gint key_press(guint keyval)
static gint key_press(guint keyval)
{
guint c;
gboolean stop = FALSE;
......@@ -349,7 +349,7 @@ gint key_press(guint keyval)
gboolean
static gboolean
is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
......
......@@ -25,8 +25,8 @@
#define SOUNDLISTFILE PACKAGE
GcomprisBoard *gcomprisBoard = NULL;
gboolean board_paused = TRUE;
static GcomprisBoard *gcomprisBoard = NULL;
static gboolean board_paused = TRUE;
static void start_board (GcomprisBoard *agcomprisBoard);
static void pause_board (gboolean pause);
......@@ -136,7 +136,7 @@ static int generate_numbers();
static int token_result();
/* Description of this plugin */
BoardPlugin menu_bp =
static BoardPlugin menu_bp =
{
NULL,
NULL,
......@@ -245,7 +245,7 @@ static void set_level (guint level) {
}
/* ==================================== */
gboolean is_our_board (GcomprisBoard *gcomprisBoard) {
static gboolean is_our_board (GcomprisBoard *gcomprisBoard) {
if (gcomprisBoard) {
if(g_strcasecmp(gcomprisBoard->type, "algebra_guesscount")==0) {
/* Set the plugin entry */
......
......@@ -51,8 +51,8 @@
#define CANALLOCK_HEIGHT_MAX SUBCANAL_HEIGHT
#define CANALLOCK_HEIGHT_MIN 15
GcomprisBoard *gcomprisBoard = NULL;
gboolean board_paused = TRUE;
static GcomprisBoard *gcomprisBoard = NULL;
static gboolean board_paused = TRUE;
static void start_board (GcomprisBoard *agcomprisBoard);
static void pause_board (gboolean pause);
......@@ -106,7 +106,7 @@ static void update_water();
static void toggle_lock(GnomeCanvasItem *item);
/* Description of this plugin */
BoardPlugin menu_bp =
static BoardPlugin menu_bp =
{
NULL,
NULL,
......@@ -210,7 +210,7 @@ static void set_level (guint level)
}
}
/* ======================================= */
gboolean is_our_board (GcomprisBoard *gcomprisBoard)
static gboolean is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
{
......
......@@ -35,8 +35,8 @@
#define SOUNDLISTFILE PACKAGE
GcomprisBoard *gcomprisBoard = NULL;
gboolean board_paused = TRUE;
static GcomprisBoard *gcomprisBoard = NULL;
static gboolean board_paused = TRUE;
static void start_board (GcomprisBoard *agcomprisBoard);
static void pause_board (gboolean pause);
......@@ -130,7 +130,7 @@ static void write_child (GIOChannel *write_chan,
static int stop_child (pid_t childpid);
/* Description of this plugin */
BoardPlugin menu_bp =
static BoardPlugin menu_bp =
{
NULL,
NULL,
......@@ -286,7 +286,7 @@ static void set_level (guint level)
}
}
/* ======================================= */
gboolean is_our_board (GcomprisBoard *gcomprisBoard)
static gboolean is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
{
......
......@@ -25,8 +25,8 @@
#define SOUNDLISTFILE PACKAGE
GcomprisBoard *gcomprisBoard = NULL;
gboolean board_paused = TRUE;
static GcomprisBoard *gcomprisBoard = NULL;
static gboolean board_paused = TRUE;
static void start_board (GcomprisBoard *agcomprisBoard);
static void pause_board (gboolean pause);
......@@ -66,7 +66,7 @@ static int right_position;
static char right_letter[2] = "";
/* Description of this plugin */
BoardPlugin menu_bp =
static BoardPlugin menu_bp =
{
NULL,
NULL,
......@@ -171,7 +171,7 @@ static void set_level (guint level)
}
}
/* ======================================= */
gboolean is_our_board (GcomprisBoard *gcomprisBoard)
static gboolean is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
{
......
/* gcompris - clickgame.c
*
* Time-stamp: <2003/12/06 04:19:19 bcoudoin>
* Time-stamp: <2004/03/13 00:57:56 bcoudoin>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -79,7 +79,7 @@ static double speed = 0.0;
static double imageZoom = 0.0;
/* Description of this plugin */
BoardPlugin clickgame_bp =
static BoardPlugin clickgame_bp =
{
NULL,