diff options
70 files changed, 276 insertions, 52 deletions
@@ -1,3 +1,84 @@ +2006-07-16 Bruno coudoin <bruno.coudoin@free.fr> + + - Added missing French audio voices by Zohra Coudoin + Released under GPL + + * Makefile.mingw: deleted + * Makefile.mingw.in: created based on Makefile.mingw to include @VERSION@ + * boards/Makefile.am: + * boards/clickgame.xml.in: + * boards/clickgame/nur00523.jpg: moved from boards/gcompris/ + * boards/clickgame/nur03006.jpg: + * boards/clickgame/nur03010.jpg: + * boards/clickgame/nur03011.jpg: + * boards/clickgame/nur03013.jpg: + * boards/clickgame/nur03505.jpg: + * boards/gcompris/nur00523.jpg: + * boards/gcompris/nur03006.jpg: + * boards/gcompris/nur03010.jpg: + * boards/gcompris/nur03011.jpg: + * boards/gcompris/nur03013.jpg: + * boards/gcompris/nur03505.jpg: + * boards/geography/board4_2.xml.in: fixed zambia.png reference (was broken link) + * boards/menu.xml.in: + * boards/skins/gartoon/mini_bad.png: rotate to make it more like it's bad + * boards/sounds/fr/colors/pink.ogg: + * boards/sounds/fr/geography/albania.ogg: + * boards/sounds/fr/geography/austria.ogg: + * boards/sounds/fr/geography/belarus.ogg: + * boards/sounds/fr/geography/belgium.ogg: + * boards/sounds/fr/geography/bosnia_herzegovina.ogg: + * boards/sounds/fr/geography/bulgaria.ogg: + * boards/sounds/fr/geography/croatia.ogg: + * boards/sounds/fr/geography/cyprus.ogg: + * boards/sounds/fr/geography/czech.ogg: + * boards/sounds/fr/geography/denmark.ogg: + * boards/sounds/fr/geography/estonia.ogg: + * boards/sounds/fr/geography/finland.ogg: + * boards/sounds/fr/geography/france.ogg: + * boards/sounds/fr/geography/germany.ogg: + * boards/sounds/fr/geography/greece.ogg: + * boards/sounds/fr/geography/hungary.ogg: + * boards/sounds/fr/geography/ireland.ogg: + * boards/sounds/fr/geography/italy.ogg: + * boards/sounds/fr/geography/latvia.ogg: + * boards/sounds/fr/geography/lithuania.ogg: + * boards/sounds/fr/geography/luxembourg.ogg: + * boards/sounds/fr/geography/macedonia.ogg: + * boards/sounds/fr/geography/moldova.ogg: + * boards/sounds/fr/geography/netherland.ogg: + * boards/sounds/fr/geography/norway.ogg: + * boards/sounds/fr/geography/poland.ogg: + * boards/sounds/fr/geography/portugal.ogg: + * boards/sounds/fr/geography/romania.ogg: + * boards/sounds/fr/geography/russia.ogg: + * boards/sounds/fr/geography/serbia_montenegro.ogg: + * boards/sounds/fr/geography/slovakia.ogg: + * boards/sounds/fr/geography/slovenia.ogg: + * boards/sounds/fr/geography/spain.ogg: + * boards/sounds/fr/geography/sweden.ogg: + * boards/sounds/fr/geography/switz.ogg: + * boards/sounds/fr/geography/tt: + * boards/sounds/fr/geography/turkey.ogg: + * boards/sounds/fr/geography/ukraine.ogg: + * boards/sounds/fr/geography/united_kingdom.ogg: + * boards/sounds/fr/misc/awesome.ogg: + * boards/sounds/fr/misc/check_answer.ogg: + * boards/sounds/fr/misc/fantastic.ogg: + * boards/sounds/fr/misc/perfect.ogg: + * boards/sounds/fr/misc/waytogo.ogg: + * configure.in: + * docs/gcompris2spip.pl: + * gcompris-edit.desktop.in: moved edit menu in the same section as GCompris. + * gcompris-installer.nsi: + * gcompris-installer.nsi.in: now will get version automatically + * gcompris-uninstal.ico: remade, not sure yet it will be accepted by the installer + * po/POTFILES.in: removed menu2.xml.in + * src/boards/shapegame.c: (shapegame_init_canvas), (item_event): now the tooltip is always + locate in the lower left to avoid hidding the map. + * src/gcompris/config.c: (set_locale_flag): fixed to display no flags if none found + * src/gcompris/gcompris.c: replaced display_resource by display-resource + 2006-07-14 Bruno coudoin <bruno.coudoin@free.fr> - Fixed location and name of many voices diff --git a/Makefile.mingw b/Makefile.mingw index 8a76efe..46b1789 100644 --- a/Makefile.mingw +++ b/Makefile.mingw @@ -4,7 +4,7 @@ # Description: Top Makefile for win32 (mingw) port of GCompris # -VERSION = "7.4" +VERSION = "8.0BETA2" pkgdatadir = gcompris diff --git a/Makefile.mingw.in b/Makefile.mingw.in new file mode 100644 index 0000000..1aff33d --- /dev/null +++ b/Makefile.mingw.in @@ -0,0 +1,122 @@ +# Makefile.mingw +# +# Author: Bruno Coudoin (from GAIM example) +# Description: Top Makefile for win32 (mingw) port of GCompris +# + +VERSION = "@VERSION@" + +pkgdatadir = gcompris + +GCOMPRIS_SRC = ./src/gcompris +GCOMPRIS_BOARDS = ./src/boards +GCOMPRIS_INSTALL_DIR = ./win32-install-dir + +GTK_TOP := /gtk +GNUWIN32_TOP := /gnuwin32 +LIBXML2_TOP := /libxml2 +SDL_TOP := /sdl +CANVAS_TOP := /gnomecanvas +GNUCHESS_TOP := /gnuchess + +MAKENSIS := "/c/Program Files/NSIS/makensis.exe" + +# These will be copied in the win32-install-dir ready to be packaged. +NEEDED_DLLS = $(GNUCHESS_TOP)/bin/pthreadGC.dll \ + $(GNUCHESS_TOP)/bin/libreadline.dll \ + $(GTK_TOP)/bin/gspawn-win32-helper.exe \ + $(GNUCHESS_TOP)/bin/gnuchess.exe \ + $(GNUWIN32_TOP)/bin/popt1.dll \ + $(GNUWIN32_TOP)/bin/libintl-2.dll \ + $(GNUWIN32_TOP)/bin/libiconv-2.dll \ + $(CANVAS_TOP)/bin/libgnomecanvas-2-0.dll \ + $(SDL_TOP)/bin/SDL.dll \ + $(SDL_TOP)/bin/SDL_mixer.dll \ + $(LIBXML2_TOP)/bin/libxml2.dll \ + $(GTK_TOP)/bin/freetype6.dll \ + $(GTK_TOP)/bin/intl.dll \ + $(GTK_TOP)/bin/libart_lgpl_2-2.dll \ + $(GTK_TOP)/bin/freetype6.dll \ + $(GTK_TOP)/bin/libart_lgpl_2-2.dll \ + $(GTK_TOP)/bin/libgdk-win32-2.0-0.dll \ + $(GTK_TOP)/bin/libgdk_pixbuf-2.0-0.dll \ + $(GTK_TOP)/bin/libglib-2.0-0.dll \ + $(GTK_TOP)/bin/libgmodule-2.0-0.dll \ + $(GTK_TOP)/bin/libgobject-2.0-0.dll \ + $(GTK_TOP)/bin/libpango-1.0-0.dll \ + $(GTK_TOP)/bin/libpangowin32-1.0-0.dll \ + $(GTK_TOP)/bin/libpangoft2-1.0-0.dll \ + $(GTK_TOP)/bin/libgtk-win32-2.0-0.dll \ + $(GTK_TOP)/bin/libatk-1.0-0.dll \ + $(GTK_TOP)/bin/libfontconfig-1.dll \ + $(GTK_TOP)/bin/zlib1.dll \ + $(GTK_TOP)/bin/libgthread-2.0-0.dll \ + $(GTK_TOP)/expat/bin/xmlparse.dll \ + $(GTK_TOP)/expat/bin/xmltok.dll \ + $(GTK_TOP)/bin/iconv.dll \ + $(GTK_TOP)/bin/intl.dll \ + $(GTK_TOP)/bin/libpng12.dll \ + $(GTK_TOP)/bin/jpeg62.dll + +NEEDED_FILES = README \ + COPYING \ + COPYING \ + Changelog + +## +## + +all: + cp config.h.mingw config.h + $(MAKE) -C $(GCOMPRIS_BOARDS) -f Makefile.mingw + $(MAKE) -C $(GCOMPRIS_SRC) -f Makefile.mingw + + +install: all + mkdir -p $(GCOMPRIS_INSTALL_DIR)/share + $(MAKE) -C $(GCOMPRIS_BOARDS) -f Makefile.mingw install + $(MAKE) -C $(GCOMPRIS_SRC) -f Makefile.mingw install + +# Copy mandratory files for the package in the package directory +prepack: + mkdir -p $(GCOMPRIS_INSTALL_DIR)/GTK + cp $(NEEDED_DLLS) $(GCOMPRIS_INSTALL_DIR) + cp $(NEEDED_FILES) $(GCOMPRIS_INSTALL_DIR) + cp -r $(GTK_TOP)/etc $(GCOMPRIS_INSTALL_DIR) + mkdir -p $(GCOMPRIS_INSTALL_DIR)/GTK/share + cp -r $(GTK_TOP)/share/themes $(GCOMPRIS_INSTALL_DIR)/share + mkdir -p $(GCOMPRIS_INSTALL_DIR)/lib + cp -r $(GTK_TOP)/lib/locale $(GCOMPRIS_INSTALL_DIR)/lib + cp -r $(GTK_TOP)/lib/gtk-2.0 $(GCOMPRIS_INSTALL_DIR)/lib + cp -r $(GTK_TOP)/lib/pango $(GCOMPRIS_INSTALL_DIR)/lib + + +installer: + $(MAKENSIS) gcompris-installer.nsi + +clean: + $(MAKE) -C $(GCOMPRIS_SRC) -f Makefile.mingw clean + $(MAKE) -C $(GCOMPRIS_BOARDS) -f Makefile.mingw clean + rm -rf config.h + rm -rf gcompris*.exe + +# +# Run this on Linux to prepare datadir for windows +# +prep: + mkdir -p $(GCOMPRIS_INSTALL_DIR)/share/$(pkgdatadir)/boards + cd boards ; tar cf - --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude "Makefile" --exclude "Makefile.am" --exclude CVS --exclude .xvpics --exclude "*.assetml" * | ( cd ../$(GCOMPRIS_INSTALL_DIR)/share/$(pkgdatadir)/boards ; tar xf -) ; cd .. ; + @echo "-------------------------------------------------------------------------------" + @echo " WARNING: MAKE SURE TO HAVE RUN A MAKE INSTALL OF GCOMPRIS IN /USR/LOCAL FIRST" + @echo "-------------------------------------------------------------------------------" + mkdir -p $(GCOMPRIS_INSTALL_DIR)/share/locale + cp -r /usr/local/share/locale/* $(GCOMPRIS_INSTALL_DIR)/share/locale/ + @echo "Remove other .mo file not from gcompris" + find ./win32-install-dir/share/locale/ -name \*.mo | grep -v gcompris.mo | xargs rm -f + @echo "Grab installed assetml files" + cp -r /usr/local/share/assetml $(GCOMPRIS_INSTALL_DIR)/share/ + @echo "Copy pixmap" + mkdir $(GCOMPRIS_INSTALL_DIR)/share/pixmaps + cp gcompris.png $(GCOMPRIS_INSTALL_DIR)/share/pixmaps + @echo "Create the file gcompris-win-prepack.tar.gz" + tar -czf gcompris-win-prepack.tar.gz win32-install-dir nsis diff --git a/boards/Makefile.am b/boards/Makefile.am index 6709231..d88abb4 100644 --- a/boards/Makefile.am +++ b/boards/Makefile.am @@ -95,7 +95,6 @@ xml_in_files = \ memory_tux.xml.in \ memory.xml.in \ menu.xml.in \ - menu2.xml.in \ miscelaneous.xml.in \ missing_letter.xml.in \ money_cents.xml.in \ diff --git a/boards/clickgame.xml.in b/boards/clickgame.xml.in index 326c98d..2fe5318 100644 --- a/boards/clickgame.xml.in +++ b/boards/clickgame.xml.in @@ -25,6 +25,7 @@ Location: Unknown (image nur03505) Location: Unknown (image nur03010) Location: Unknown (image nur03011) Location: Unknown (image nur03013)</_credit> + <resource>clickgame</resource> </Board> <Data directory=""/> </GCompris> diff --git a/boards/gcompris/nur00523.jpg b/boards/clickgame/nur00523.jpg Binary files differindex dce0a1d..dce0a1d 100644 --- a/boards/gcompris/nur00523.jpg +++ b/boards/clickgame/nur00523.jpg diff --git a/boards/gcompris/nur03006.jpg b/boards/clickgame/nur03006.jpg Binary files differindex a1b360d..a1b360d 100644 --- a/boards/gcompris/nur03006.jpg +++ b/boards/clickgame/nur03006.jpg diff --git a/boards/gcompris/nur03010.jpg b/boards/clickgame/nur03010.jpg Binary files differindex 8f51102..8f51102 100644 --- a/boards/gcompris/nur03010.jpg +++ b/boards/clickgame/nur03010.jpg diff --git a/boards/gcompris/nur03011.jpg b/boards/clickgame/nur03011.jpg Binary files differindex c49a51e..c49a51e 100644 --- a/boards/gcompris/nur03011.jpg +++ b/boards/clickgame/nur03011.jpg diff --git a/boards/gcompris/nur03013.jpg b/boards/clickgame/nur03013.jpg Binary files differindex 6baad60..6baad60 100644 --- a/boards/gcompris/nur03013.jpg +++ b/boards/clickgame/nur03013.jpg diff --git a/boards/gcompris/nur03505.jpg b/boards/clickgame/nur03505.jpg Binary files differindex 9685248..9685248 100644 --- a/boards/gcompris/nur03505.jpg +++ b/boards/clickgame/nur03505.jpg diff --git a/boards/geography/board4_2.xml.in b/boards/geography/board4_2.xml.in index 8153daa..c011231 100644 --- a/boards/geography/board4_2.xml.in +++ b/boards/geography/board4_2.xml.in @@ -137,7 +137,7 @@ <Shape name="tunisie" pixmapfile="geography/afrique/tunisia.png" sound="sounds/$LOCALE/geography/tunisia.ogg" x="433" y="33" zoomx="1" zoomy="1" position="0"> <_tooltip>Tunisia</_tooltip> </Shape> -<Shape name="zambie" pixmapfile="geography/afrique/zambie.png" sound="sounds/$LOCALE/geography/zambia.ogg" x="549" y="363" zoomx="1" zoomy="1" position="0"> +<Shape name="zambie" pixmapfile="geography/afrique/zambia.png" sound="sounds/$LOCALE/geography/zambia.ogg" x="549" y="363" zoomx="1" zoomy="1" position="0"> <_tooltip>Zambia</_tooltip> </Shape> <Shape name="zimbabwe" pixmapfile="geography/afrique/zimbabwe.png" sound="sounds/$LOCALE/geography/zimbabwe.ogg" x="555" y="403" zoomx="1" zoomy="1" position="0"> diff --git a/boards/menu.xml.in b/boards/menu.xml.in index 9d8dec9..7ee0a31 100644 --- a/boards/menu.xml.in +++ b/boards/menu.xml.in @@ -24,5 +24,6 @@ The following icons are displayed from right to left. The stars show suitable age groups for each game: 1, 2 or 3 simple stars - from 2 to 6 years old 1, 2 or 3 complex stars - 7 years and up</_manual> + <resource>skins/gartoon</resource> </Board> </GCompris> diff --git a/boards/menu2.xml.in b/boards/menu2.xml.in deleted file mode 100644 index 58b8cba..0000000 --- a/boards/menu2.xml.in +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<GCompris> - <Board - name="menu2" - type="menu2" - section="nowhere" - icon="" - author=""> - <_title>GCompris Main Menu</_title> - <_description>Left-click the mouse on an activity to select it.</_description> - <_prerequisite>GCompris is a collection of educational games that provides for children from 2 years old with different activities.</_prerequisite> - <_goal>The goal of gcompris is to provide a free alternative to popular proprietary edutainment software</_goal> - <_manual xml:space="preserve">A simple click on an icon brings you to an activity or a menu of activities. -At the bottom of the screen is the gcompris control bar. -The following icons are displayed from right to left. -(note that each icon is displayed only if available in the current activity) - Home - Back to previous menu or exit gcompris if at the top - Thumb - OK. Confirm your answer - Dice - Display the current level. Click to select another level - Music note - Repeat the question - Question Mark - Help - Tool - The configuration menu - Tux Plane - About game -The stars, show suitable age groups for each game: - 1, 2 or 3 simple stars - 2 to 6 years old - 1, 2 or 3 complex stars - From 7 years old</_manual> - </Board> -</GCompris> diff --git a/boards/skins/gartoon/mini_bad.png b/boards/skins/gartoon/mini_bad.png Binary files differindex 8b4ca9e..99a3477 100644 --- a/boards/skins/gartoon/mini_bad.png +++ b/boards/skins/gartoon/mini_bad.png diff --git a/boards/sounds/fr/colors/pink.ogg b/boards/sounds/fr/colors/pink.ogg Binary files differnew file mode 100644 index 0000000..e28e57a --- /dev/null +++ b/boards/sounds/fr/colors/pink.ogg diff --git a/boards/sounds/fr/geography/albania.ogg b/boards/sounds/fr/geography/albania.ogg Binary files differnew file mode 100644 index 0000000..63b9dbf --- /dev/null +++ b/boards/sounds/fr/geography/albania.ogg diff --git a/boards/sounds/fr/geography/austria.ogg b/boards/sounds/fr/geography/austria.ogg Binary files differnew file mode 100644 index 0000000..e7ceaca --- /dev/null +++ b/boards/sounds/fr/geography/austria.ogg diff --git a/boards/sounds/fr/geography/belarus.ogg b/boards/sounds/fr/geography/belarus.ogg Binary files differnew file mode 100644 index 0000000..274fff7 --- /dev/null +++ b/boards/sounds/fr/geography/belarus.ogg diff --git a/boards/sounds/fr/geography/belgium.ogg b/boards/sounds/fr/geography/belgium.ogg Binary files differnew file mode 100644 index 0000000..bddea00 --- /dev/null +++ b/boards/sounds/fr/geography/belgium.ogg diff --git a/boards/sounds/fr/geography/bosnia_herzegovina.ogg b/boards/sounds/fr/geography/bosnia_herzegovina.ogg Binary files differnew file mode 100644 index 0000000..eb69b91 --- /dev/null +++ b/boards/sounds/fr/geography/bosnia_herzegovina.ogg diff --git a/boards/sounds/fr/geography/bulgaria.ogg b/boards/sounds/fr/geography/bulgaria.ogg Binary files differnew file mode 100644 index 0000000..02cd94a --- /dev/null +++ b/boards/sounds/fr/geography/bulgaria.ogg diff --git a/boards/sounds/fr/geography/croatia.ogg b/boards/sounds/fr/geography/croatia.ogg Binary files differnew file mode 100644 index 0000000..13bb9ac --- /dev/null +++ b/boards/sounds/fr/geography/croatia.ogg diff --git a/boards/sounds/fr/geography/cyprus.ogg b/boards/sounds/fr/geography/cyprus.ogg Binary files differnew file mode 100644 index 0000000..400c274 --- /dev/null +++ b/boards/sounds/fr/geography/cyprus.ogg diff --git a/boards/sounds/fr/geography/czech.ogg b/boards/sounds/fr/geography/czech.ogg Binary files differnew file mode 100644 index 0000000..09adcf0 --- /dev/null +++ b/boards/sounds/fr/geography/czech.ogg diff --git a/boards/sounds/fr/geography/denmark.ogg b/boards/sounds/fr/geography/denmark.ogg Binary files differnew file mode 100644 index 0000000..f92fc06 --- /dev/null +++ b/boards/sounds/fr/geography/denmark.ogg diff --git a/boards/sounds/fr/geography/estonia.ogg b/boards/sounds/fr/geography/estonia.ogg Binary files differnew file mode 100644 index 0000000..91ac6a9 --- /dev/null +++ b/boards/sounds/fr/geography/estonia.ogg diff --git a/boards/sounds/fr/geography/finland.ogg b/boards/sounds/fr/geography/finland.ogg Binary files differnew file mode 100644 index 0000000..6f90f34 --- /dev/null +++ b/boards/sounds/fr/geography/finland.ogg diff --git a/boards/sounds/fr/geography/france.ogg b/boards/sounds/fr/geography/france.ogg Binary files differnew file mode 100644 index 0000000..b54e9da --- /dev/null +++ b/boards/sounds/fr/geography/france.ogg diff --git a/boards/sounds/fr/geography/germany.ogg b/boards/sounds/fr/geography/germany.ogg Binary files differnew file mode 100644 index 0000000..5e3fcbd --- /dev/null +++ b/boards/sounds/fr/geography/germany.ogg diff --git a/boards/sounds/fr/geography/greece.ogg b/boards/sounds/fr/geography/greece.ogg Binary files differnew file mode 100644 index 0000000..cf6a4b3 --- /dev/null +++ b/boards/sounds/fr/geography/greece.ogg diff --git a/boards/sounds/fr/geography/hungary.ogg b/boards/sounds/fr/geography/hungary.ogg Binary files differnew file mode 100644 index 0000000..2c2eebb --- /dev/null +++ b/boards/sounds/fr/geography/hungary.ogg diff --git a/boards/sounds/fr/geography/ireland.ogg b/boards/sounds/fr/geography/ireland.ogg Binary files differnew file mode 100644 index 0000000..77adc45 --- /dev/null +++ b/boards/sounds/fr/geography/ireland.ogg diff --git a/boards/sounds/fr/geography/italy.ogg b/boards/sounds/fr/geography/italy.ogg Binary files differnew file mode 100644 index 0000000..277315b --- /dev/null +++ b/boards/sounds/fr/geography/italy.ogg diff --git a/boards/sounds/fr/geography/latvia.ogg b/boards/sounds/fr/geography/latvia.ogg Binary files differnew file mode 100644 index 0000000..620b648 --- /dev/null +++ b/boards/sounds/fr/geography/latvia.ogg diff --git a/boards/sounds/fr/geography/lithuania.ogg b/boards/sounds/fr/geography/lithuania.ogg Binary files differnew file mode 100644 index 0000000..0b47876 --- /dev/null +++ b/boards/sounds/fr/geography/lithuania.ogg diff --git a/boards/sounds/fr/geography/luxembourg.ogg b/boards/sounds/fr/geography/luxembourg.ogg Binary files differnew file mode 100644 index 0000000..365ca6c --- /dev/null +++ b/boards/sounds/fr/geography/luxembourg.ogg diff --git a/boards/sounds/fr/geography/macedonia.ogg b/boards/sounds/fr/geography/macedonia.ogg Binary files differnew file mode 100644 index 0000000..0fc702c --- /dev/null +++ b/boards/sounds/fr/geography/macedonia.ogg diff --git a/boards/sounds/fr/geography/moldova.ogg b/boards/sounds/fr/geography/moldova.ogg Binary files differnew file mode 100644 index 0000000..e6b2bb6 --- /dev/null +++ b/boards/sounds/fr/geography/moldova.ogg diff --git a/boards/sounds/fr/geography/netherland.ogg b/boards/sounds/fr/geography/netherland.ogg Binary files differnew file mode 100644 index 0000000..257db2b --- /dev/null +++ b/boards/sounds/fr/geography/netherland.ogg diff --git a/boards/sounds/fr/geography/norway.ogg b/boards/sounds/fr/geography/norway.ogg Binary files differnew file mode 100644 index 0000000..cb23737 --- /dev/null +++ b/boards/sounds/fr/geography/norway.ogg diff --git a/boards/sounds/fr/geography/poland.ogg b/boards/sounds/fr/geography/poland.ogg Binary files differnew file mode 100644 index 0000000..e000249 --- /dev/null +++ b/boards/sounds/fr/geography/poland.ogg diff --git a/boards/sounds/fr/geography/portugal.ogg b/boards/sounds/fr/geography/portugal.ogg Binary files differnew file mode 100644 index 0000000..e70cfc2 --- /dev/null +++ b/boards/sounds/fr/geography/portugal.ogg diff --git a/boards/sounds/fr/geography/romania.ogg b/boards/sounds/fr/geography/romania.ogg Binary files differnew file mode 100644 index 0000000..00e6e03 --- /dev/null +++ b/boards/sounds/fr/geography/romania.ogg diff --git a/boards/sounds/fr/geography/russia.ogg b/boards/sounds/fr/geography/russia.ogg Binary files differnew file mode 100644 index 0000000..a787b5b --- /dev/null +++ b/boards/sounds/fr/geography/russia.ogg diff --git a/boards/sounds/fr/geography/serbia_montenegro.ogg b/boards/sounds/fr/geography/serbia_montenegro.ogg Binary files differnew file mode 100644 index 0000000..037185a --- /dev/null +++ b/boards/sounds/fr/geography/serbia_montenegro.ogg diff --git a/boards/sounds/fr/geography/slovakia.ogg b/boards/sounds/fr/geography/slovakia.ogg Binary files differnew file mode 100644 index 0000000..672bc60 --- /dev/null +++ b/boards/sounds/fr/geography/slovakia.ogg diff --git a/boards/sounds/fr/geography/slovenia.ogg b/boards/sounds/fr/geography/slovenia.ogg Binary files differnew file mode 100644 index 0000000..349f0ef --- /dev/null +++ b/boards/sounds/fr/geography/slovenia.ogg diff --git a/boards/sounds/fr/geography/spain.ogg b/boards/sounds/fr/geography/spain.ogg Binary files differnew file mode 100644 index 0000000..e374020 --- /dev/null +++ b/boards/sounds/fr/geography/spain.ogg diff --git a/boards/sounds/fr/geography/sweden.ogg b/boards/sounds/fr/geography/sweden.ogg Binary files differnew file mode 100644 index 0000000..29eebf3 --- /dev/null +++ b/boards/sounds/fr/geography/sweden.ogg diff --git a/boards/sounds/fr/geography/switz.ogg b/boards/sounds/fr/geography/switz.ogg Binary files differnew file mode 100644 index 0000000..1a334d7 --- /dev/null +++ b/boards/sounds/fr/geography/switz.ogg diff --git a/boards/sounds/fr/geography/tt b/boards/sounds/fr/geography/tt new file mode 100644 index 0000000..6527f02 --- /dev/null +++ b/boards/sounds/fr/geography/tt @@ -0,0 +1,39 @@ +? albania.ogg +? austria.ogg +? belarus.ogg +? belgium.ogg +? bosnia_herzegovina.ogg +? bulgaria.ogg +? croatia.ogg +? cyprus.ogg +? czech.ogg +? denmark.ogg +? estonia.ogg +? finland.ogg +? france.ogg +? germany.ogg +? greece.ogg +? hungary.ogg +? ireland.ogg +? italy.ogg +? latvia.ogg +? lithuania.ogg +? luxembourg.ogg +? macedonia.ogg +? moldova.ogg +? netherland.ogg +? norway.ogg +? poland.ogg +? portugal.ogg +? romania.ogg +? russia.ogg +? serbia_montenegro.ogg +? slovakia.ogg +? slovenia.ogg +? spain.ogg +? sweden.ogg +? switz.ogg +? tt +? turkey.ogg +? ukraine.ogg +? united_kingdom.ogg diff --git a/boards/sounds/fr/geography/turkey.ogg b/boards/sounds/fr/geography/turkey.ogg Binary files differnew file mode 100644 index 0000000..a1e516c --- /dev/null +++ b/boards/sounds/fr/geography/turkey.ogg diff --git a/boards/sounds/fr/geography/ukraine.ogg b/boards/sounds/fr/geography/ukraine.ogg Binary files differnew file mode 100644 index 0000000..3e70c1f --- /dev/null +++ b/boards/sounds/fr/geography/ukraine.ogg diff --git a/boards/sounds/fr/geography/united_kingdom.ogg b/boards/sounds/fr/geography/united_kingdom.ogg Binary files differnew file mode 100644 index 0000000..9d8641c --- /dev/null +++ b/boards/sounds/fr/geography/united_kingdom.ogg diff --git a/boards/sounds/fr/misc/awesome.ogg b/boards/sounds/fr/misc/awesome.ogg Binary files differnew file mode 100644 index 0000000..957d2c6 --- /dev/null +++ b/boards/sounds/fr/misc/awesome.ogg diff --git a/boards/sounds/fr/misc/check_answer.ogg b/boards/sounds/fr/misc/check_answer.ogg Binary files differnew file mode 100644 index 0000000..859d401 --- /dev/null +++ b/boards/sounds/fr/misc/check_answer.ogg diff --git a/boards/sounds/fr/misc/fantastic.ogg b/boards/sounds/fr/misc/fantastic.ogg Binary files differnew file mode 100644 index 0000000..b985ea5 --- /dev/null +++ b/boards/sounds/fr/misc/fantastic.ogg diff --git a/boards/sounds/fr/misc/perfect.ogg b/boards/sounds/fr/misc/perfect.ogg Binary files differnew file mode 100644 index 0000000..9168853 --- /dev/null +++ b/boards/sounds/fr/misc/perfect.ogg diff --git a/boards/sounds/fr/misc/waytogo.ogg b/boards/sounds/fr/misc/waytogo.ogg Binary files differnew file mode 100644 index 0000000..9e78ab3 --- /dev/null +++ b/boards/sounds/fr/misc/waytogo.ogg diff --git a/configure.in b/configure.in index 7109b5c..03df258 100644 --- a/configure.in +++ b/configure.in @@ -107,7 +107,7 @@ fi LDFLAGS="${LDFLAGS} ${XF86VM_LIBS}" dnl Add the languages which your application supports here. -ALL_LINGUAS="am ar az bg ca cs da de el en_CA en_GB es et eu fi fr ga gu he hi hr hu it ka lt mk ml mr ms nb ne nl nn pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sv th tr vi wa zh_CN zh_TW" +ALL_LINGUAS="am ar az bg ca cs da de el en_CA en_GB es et eu fi fr ga gu he hi hr hu it ka lt mk ml mr ms nb ne nl nn pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sv ta th tr vi wa zh_CN zh_TW" dnl GCompris needs to know which locale are supported AC_SUBST(ALL_LINGUAS) @@ -440,6 +440,8 @@ AC_SUBST(CFLAGS) dnl Autoconf output AC_OUTPUT([ gcompris.spec +Makefile.mingw +gcompris-installer.nsi Makefile src/Makefile src/gcompris/Makefile diff --git a/docs/gcompris2spip.pl b/docs/gcompris2spip.pl index 63fe5bd..d0f50b0 100755 --- a/docs/gcompris2spip.pl +++ b/docs/gcompris2spip.pl @@ -86,6 +86,7 @@ my %sections = ( "sr", 0, 'sr@Latn', 0, "sv", 0, + "ta", 154, "th", 0, "tr", 0, "vi", 116, @@ -142,6 +143,7 @@ my %rubriques = ( "sr", 0, 'sr@Latn', 0, "sv", 0, + "ta", 155, "th", 0, "tr", 0, "vi", 117, @@ -199,6 +201,7 @@ my %rubriques_all = ( "sr", 0, 'sr@Latn', 0, "sv", 0, + "ta", 156, "th", 0, "tr", 0, "vi", 118, diff --git a/gcompris-edit.desktop.in b/gcompris-edit.desktop.in index 7be149d..c202b9b 100644 --- a/gcompris-edit.desktop.in +++ b/gcompris-edit.desktop.in @@ -6,7 +6,7 @@ Exec=gcompris -a Icon=gcompris-edit.png Terminal=0 Type=Application -Categories=GNOME;Application;Game; +Categories=GNOME;Application;Education; StartupNotify=true X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gcompris diff --git a/gcompris-installer.nsi b/gcompris-installer.nsi.in index 9cf396e..f089d74 100644 --- a/gcompris-installer.nsi +++ b/gcompris-installer.nsi.in @@ -18,7 +18,7 @@ Var STARTUP_RUN_KEY ;The name var is set in .onInit Name $name -!define GCOMPRIS_VERSION "7.4BETA2" +!define GCOMPRIS_VERSION "@VERSION@" OutFile "gcompris-${GCOMPRIS_VERSION}.exe" @@ -49,7 +49,7 @@ SetDateSave on ;Modern UI Configuration !define MUI_ICON ".\gcompris.ico" - !define MUI_UNICON ".\gcompris.ico" + !define MUI_UNICON ".\gcompris-uninstall.ico" !define MUI_WELCOMEFINISHPAGE_BITMAP ".\nsis\gcompris-intro.bmp" !define MUI_HEADERIMAGE !define MUI_HEADERIMAGE_BITMAP ".\nsis\gcompris-header.bmp" diff --git a/gcompris-uninstal.ico b/gcompris-uninstal.ico Binary files differindex 77210b0..891a271 100644 --- a/gcompris-uninstal.ico +++ b/gcompris-uninstal.ico diff --git a/po/POTFILES.in b/po/POTFILES.in index bae34a4..7a6feac 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -151,7 +151,6 @@ boards/memory_sound.xml.in boards/memory_sound_tux.xml.in boards/memory_tux.xml.in boards/menu.xml.in -boards/menu2.xml.in boards/miscelaneous.xml.in boards/missing_letter.xml.in boards/missing_letter/board1.xml.in diff --git a/src/boards/clickgame.c b/src/boards/clickgame.c index da57e8a..39b4d37 100644 --- a/src/boards/clickgame.c +++ b/src/boards/clickgame.c @@ -1,6 +1,6 @@ /* gcompris - clickgame.c * - * Time-stamp: <2005/10/10 00:21:56 bruno> + * Time-stamp: <2006/07/16 19:19:54 bruno> * * Copyright (C) 2000 Bruno Coudoin * @@ -160,7 +160,6 @@ static void clickgame_pause (gboolean pause) */ static void clickgame_start (GcomprisBoard *agcomprisBoard) { - gint i; gchar *str; gchar *filename; GDir *dir; @@ -283,27 +282,27 @@ static void clickgame_next_level() { case 1: gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), - "gcompris/nur00523.jpg"); + "clickgame/nur00523.jpg"); break; case 2: gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), - "gcompris/nur03006.jpg"); + "clickgame/nur03006.jpg"); break; case 3: gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), - "gcompris/nur03011.jpg"); + "clickgame/nur03011.jpg"); break; case 4: gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), - "gcompris/nur03010.jpg"); + "clickgame/nur03010.jpg"); break; case 5: gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), - "gcompris/nur03013.jpg"); + "clickgame/nur03013.jpg"); break; default: gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), - "gcompris/nur03505.jpg"); + "clickgame/nur03505.jpg"); } gcompris_bar_set_level(gcomprisBoard); diff --git a/src/boards/shapegame.c b/src/boards/shapegame.c index f66e99e..0190c62 100644 --- a/src/boards/shapegame.c +++ b/src/boards/shapegame.c @@ -1,6 +1,6 @@ /* gcompris - shapegame.c * - * Time-stamp: <2006/04/04 00:05:12 bruno> + * Time-stamp: <2006/07/15 03:27:12 bruno> * * Copyright (C) 2000 Bruno Coudoin * @@ -676,8 +676,8 @@ static void shapegame_init_canvas(GnomeCanvasGroup *parent) tooltip_root_item = GNOME_CANVAS_GROUP( gnome_canvas_item_new (parent, gnome_canvas_group_get_type (), - "x", (double)gcomprisBoard->width/SHAPE_BOX_WIDTH_RATIO + 60, - "y", (double)0, + "x", (double)10, + "y", (double)gcomprisBoard->height-70, NULL) ); @@ -1009,9 +1009,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, Shape *shape) { case GDK_ENTER_NOTIFY: if(shape->tooltip && shape->type == SHAPE_ICON) { - gnome_canvas_item_set(GNOME_CANVAS_ITEM(tooltip_root_item), - "y", shape->y, - NULL); + gnome_canvas_item_raise_to_top(tooltip_root_item); /* WARNING: This should not be needed but if I don't do it, it's not refreshed */ gnome_canvas_item_set(GNOME_CANVAS_ITEM(tooltip_bg_item), "y", 0.0, diff --git a/src/gcompris/config.c b/src/gcompris/config.c index 24ef64a..da1e397 100644 --- a/src/gcompris/config.c +++ b/src/gcompris/config.c @@ -1,6 +1,6 @@ /* gcompris - config.c * - * Time-stamp: <2006/07/10 23:40:02 bruno> + * Time-stamp: <2006/07/15 02:58:38 bruno> * * Copyright (C) 2000-2003 Bruno Coudoin * @@ -106,6 +106,7 @@ static gchar *linguas[] = { "sr@Latn_YU.ISO-8859-2", N_("Serbian (Latin)"), "sr_YU.UTF-8", N_("Serbian"), "sv_FI.UTF-8", N_("Swedish"), + "ta_IN.UTF-8", N_("Tamil"), "th_TH.UTF-8", N_("Thai"), "tr_TR.UTF-8", N_("Turkish"), "vi_VN.UTF-8", N_("Vietnamese"), @@ -596,6 +597,13 @@ static void set_locale_flag(gchar *locale) gdk_pixbuf_unref(pixmap); g_free(filename); } + else + { + /* No flags */ + gnome_canvas_item_set (item_locale_flag, + "pixbuf", NULL, + NULL); + } /* Check wether or not the locale is available */ #ifdef WIN32 diff --git a/src/gcompris/gcompris.c b/src/gcompris/gcompris.c index 92939b3..af0d240 100644 --- a/src/gcompris/gcompris.c +++ b/src/gcompris/gcompris.c @@ -170,7 +170,7 @@ static struct poptOption options[] = { N_("Disable the quit button"), NULL}, {"disable-config",'\0', POPT_ARG_NONE, &popt_no_config, 0, N_("Disable the config button"), NULL}, - {"display_resource",'\0', POPT_ARG_NONE, &popt_display_resource, 0, + {"display-resource",'\0', POPT_ARG_NONE, &popt_display_resource, 0, N_("Display the resources on stdout based on the selected activities"), NULL}, #ifndef WIN32 /* Not supported on windows */ POPT_AUTOHELP |
