Commit ae093990 authored by Bruno Coudoin's avatar Bruno Coudoin

- Added missing French audio voices by Zohra Coudoin

	  Released under GPL

	* Makefile.mingw.in: created based on Makefile.mingw to include @VERSION@
	* boards/clickgame/nur00523.jpg: moved from boards/gcompris/
	* boards/geography/board4_2.xml.in: fixed zambia.png reference (was broken link)
	* boards/skins/gartoon/mini_bad.png: rotate to make it more like it's bad
	* gcompris-edit.desktop.in: moved edit menu in the same section as GCompris.
	* 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:
	* 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
parent e9a34962
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
......
......@@ -4,7 +4,7 @@
# Description: Top Makefile for win32 (mingw) port of GCompris
#
VERSION = "7.4"
VERSION = "8.0BETA2"
pkgdatadir = gcompris
......
# 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
......@@ -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 \
......
......@@ -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>
......@@ -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">
......
......@@ -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>
<?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>
boards/skins/gartoon/mini_bad.png

658 Bytes | W: | H:

boards/skins/gartoon/mini_bad.png

733 Bytes | W: | H:

boards/skins/gartoon/mini_bad.png
boards/skins/gartoon/mini_bad.png
boards/skins/gartoon/mini_bad.png
boards/skins/gartoon/mini_bad.png
  • 2-up
  • Swipe
  • Onion skin
? 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
......@@ -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
......
......@@ -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,
......
......@@ -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
......
......@@ -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"
......
gcompris-uninstal.ico

7.19 KB | W: | H:

gcompris-uninstal.ico

9.44 KB | W: | H:

gcompris-uninstal.ico
gcompris-uninstal.ico
gcompris-uninstal.ico
gcompris-uninstal.ico
  • 2-up
  • Swipe
  • Onion skin
......@@ -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
......
/* 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);
......
/* 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,
......
/* 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
......
......@@ -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
......
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