Commit 8c7c11f1 authored by Bruno Coudoin's avatar Bruno Coudoin

completed about box. Rework of the help system

parent 7107b256
2002-01-02 Bruno Coudoin <bruno.coudoin@free.fr>
* src/gcompris/about.c: completed the about box
* src/gcompris/gcompris.c: disabled gnome crash dialog in full screen
* xml-i18n: replaced all references to xml-i18n by the newer intltool
2002-01-06 Christophe Merlet <redfox@eikonex.org>
* src/boards/clickgame.c, src/boards/draw.c, src/boards/menu.c,
......
......@@ -8,7 +8,6 @@ icon_DATA = gcompris.png
Gamesdir=$(datadir)/gnome/apps/Games
Games_in_files = gcompris.desktop.in
Games_DATA = $(Games_in_files:.desktop.in=.desktop)
@XML_I18N_MERGE_DESKTOP_RULE@
Menudir=$(prefix)/lib/menu
Menu_DATA=gcompris
......@@ -19,9 +18,9 @@ EXTRA_DIST = \
$(Menu_DATA) \
gcompris.spec.in \
gcompris.spec \
xml-i18n-extract.in \
xml-i18n-merge.in \
xml-i18n-update.in
intltool-extract.in \
intltool-merge.in \
intltool-update.in
install-data-local:
@$(NORMAL_INSTALL)
......
......@@ -69,10 +69,6 @@ DATADIRNAME = @DATADIRNAME@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
EXEEXT = @EXEEXT@
GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_CONFIG = @GCONF_CONFIG@
GCONF_LIBS = @GCONF_LIBS@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
GDK_PIXBUF_CONFIG = @GDK_PIXBUF_CONFIG@
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
......@@ -101,6 +97,20 @@ INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
INTLOBJS = @INTLOBJS@
INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
LIBICONV = @LIBICONV@
LIBTOOL = @LIBTOOL@
......@@ -126,10 +136,6 @@ STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XML_I18N_EXTRACT = @XML_I18N_EXTRACT@
XML_I18N_MERGE = @XML_I18N_MERGE@
XML_I18N_TOOLS_PERL = @XML_I18N_TOOLS_PERL@
XML_I18N_UPDATE = @XML_I18N_UPDATE@
XPM_LIBS = @XPM_LIBS@
ZVT_LIBS = @ZVT_LIBS@
cflags_set = @cflags_set@
......@@ -148,7 +154,7 @@ Games_DATA = $(Games_in_files:.desktop.in=.desktop)
Menudir = $(prefix)/lib/menu
Menu_DATA = gcompris
EXTRA_DIST = $(Games_DATA) $(icon_DATA) $(Menu_DATA) gcompris.spec.in gcompris.spec xml-i18n-extract.in xml-i18n-merge.in xml-i18n-update.in
EXTRA_DIST = $(Games_DATA) $(icon_DATA) $(Menu_DATA) gcompris.spec.in gcompris.spec intltool-extract.in intltool-merge.in intltool-update.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
......@@ -503,7 +509,6 @@ all-am all installdirs-am installdirs mostlyclean-generic \
distclean-generic clean-generic maintainer-clean-generic clean \
mostlyclean distclean maintainer-clean
@XML_I18N_MERGE_DESKTOP_RULE@
install-data-local:
@$(NORMAL_INSTALL)
......
......@@ -14,12 +14,11 @@
* Add an independant server side software that can control gcompris
behaviour and record the student scoring. It must also include
authentication.
* Add of a board dedicated to dynamicaly change of locale.
This will make gcompris usefull for foreing language teaching.
authentication. Already got a name for that : schoolbus
* Add a board to set the current date on a calendar with date/month/year
and season (Have fun with season and I18N ;)
* Add a board for child identification.
\ No newline at end of file
* Add a board for child identification.
* use gnome-vfs to package boards in a unique file
......@@ -214,95 +214,85 @@ esac
])
define([HACK_SUBST], defn([AC_SUBST]))
# serial 1 AC_PROG_XML_I18N_TOOLS
AC_DEFUN(AC_PROG_XML_I18N_TOOLS,
dnl AC_PROG_INTLTOOL([MINIMUM-VERSION])
# serial 1 AC_PROG_INTLTOOL
AC_DEFUN(AC_PROG_INTLTOOL,
[
dnl This is a hack - we use the expansion of AC_SUBST instead of
dnl AC_SUBST itself to avoid automake putting
dnl XML_I18N_MERGE_OAF_RULE = @XML_I18N_MERGE_OAF_RULE@
dnl in all the Makefile.in's, because that will blow up when substituted.
XML_I18N_MERGE_OAF_RULE='\%.oaf : \%.oaf.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
$(top_builddir)/xml-i18n-merge -o $(top_srcdir)/po $< [$]*.oaf'
HACK_SUBST(XML_I18N_MERGE_OAF_RULE)
XML_I18N_MERGE_SERVER_RULE='\%.server : \%.server.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
$(top_builddir)/xml-i18n-merge -o $(top_srcdir)/po $< [$]*.server'
HACK_SUBST(XML_I18N_MERGE_SERVER_RULE)
dnl same deal
XML_I18N_MERGE_KEYS_RULE='\%.keys : \%.keys.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
$(top_builddir)/xml-i18n-merge -k $(top_srcdir)/po $< [$]*.keys'
HACK_SUBST(XML_I18N_MERGE_KEYS_RULE)
dnl same deal
XML_I18N_MERGE_DESKTOP_RULE='\%.desktop : \%.desktop.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
$(top_builddir)/xml-i18n-merge -d $(top_srcdir)/po $< [$]*.desktop'
HACK_SUBST(XML_I18N_MERGE_DESKTOP_RULE)
dnl same deal
XML_I18N_MERGE_DIRECTORY_RULE='\%.directory : \%.directory.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
$(top_builddir)/xml-i18n-merge -d $(top_srcdir)/po $< [$]*.directory'
HACK_SUBST(XML_I18N_MERGE_DIRECTORY_RULE)
dnl same deal
XML_I18N_MERGE_SOUNDLIST_RULE='\%.soundlist : \%.soundlist.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
$(top_builddir)/xml-i18n-merge -d $(top_srcdir)/po $< [$]*.soundlist'
HACK_SUBST(XML_I18N_MERGE_SOUNDLIST_RULE)
dnl same deal
XML_I18N_MERGE_PONG_RULE='\%.pong : \%.pong.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
$(top_builddir)/xml-i18n-merge -x $(top_srcdir)/po $< [$]*.pong'
HACK_SUBST(XML_I18N_MERGE_PONG_RULE)
dnl same deal
XML_I18N_MERGE_XML_RULE='\%.xml : \%.xml.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
$(top_builddir)/xml-i18n-merge -x $(top_srcdir)/po $< [$]*.xml'
HACK_SUBST(XML_I18N_MERGE_XML_RULE)
# Always use our own xml-i18n-tools.
XML_I18N_EXTRACT='$(top_builddir)/xml-i18n-extract'
AC_SUBST(XML_I18N_EXTRACT)dnl
XML_I18N_MERGE='$(top_builddir)/xml-i18n-merge'
AC_SUBST(XML_I18N_MERGE)dnl
XML_I18N_UPDATE='$(top_builddir)/xml-i18n-update'
AC_SUBST(XML_I18N_UPDATE)dnl
AC_PATH_PROG(XML_I18N_TOOLS_PERL, perl)
if test -z "$XML_I18N_TOOLS_PERL"; then
AC_MSG_ERROR([perl not found; required for xml-i18n-tools])
INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u'
INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u'
INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -k -u'
INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -o -p'
INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u'
INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -o -u'
INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u'
INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u'
INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u'
INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u'
AC_SUBST(INTLTOOL_DESKTOP_RULE)
AC_SUBST(INTLTOOL_DIRECTORY_RULE)
AC_SUBST(INTLTOOL_KEYS_RULE)
AC_SUBST(INTLTOOL_OAF_RULE)
AC_SUBST(INTLTOOL_PONG_RULE)
AC_SUBST(INTLTOOL_SERVER_RULE)
AC_SUBST(INTLTOOL_SHEET_RULE)
AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
AC_SUBST(INTLTOOL_XML_RULE)
AC_SUBST(INTLTOOL_CAVES_RULE)
# Use the tools built into the package, not the ones that are installed.
INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
AC_SUBST(INTLTOOL_EXTRACT)
AC_SUBST(INTLTOOL_MERGE)
AC_SUBST(INTLTOOL_UPDATE)
AC_PATH_PROG(INTLTOOL_PERL, perl)
if test -z "$INTLTOOL_PERL"; then
AC_MSG_ERROR([perl not found; required for intltool])
fi
if test -z "`$XML_I18N_TOOLS_PERL -v | fgrep '5.' 2> /dev/null`"; then
AC_MSG_ERROR([perl 5.x required for xml-i18n-tools])
if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
AC_MSG_ERROR([perl 5.x required for intltool])
fi
dnl manually sed perl in so people don't have to put the xml-i18n-tools scripts in their
dnl AC_OUTPUT
dnl manually sed perl in so people don't have to put the intltool scripts in AC_OUTPUT
AC_OUTPUT_COMMANDS([
sed -e "s:@XML_I18N_TOOLS_PERL@:${XML_I18N_TOOLS_PERL}:;" < ${srcdir}/xml-i18n-extract.in > xml-i18n-extract;
chmod ugo+x xml-i18n-extract;
chmod u+w xml-i18n-extract;
sed -e "s:@XML_I18N_TOOLS_PERL@:${XML_I18N_TOOLS_PERL}:;" < ${srcdir}/xml-i18n-merge.in > xml-i18n-merge;
chmod ugo+x xml-i18n-merge;
chmod u+w xml-i18n-merge;
sed -e "s:@XML_I18N_TOOLS_PERL@:${XML_I18N_TOOLS_PERL}:;" < ${srcdir}/xml-i18n-update.in > xml-i18n-update;
chmod ugo+x xml-i18n-update;
chmod u+w xml-i18n-update;
], XML_I18N_TOOLS_PERL=${XML_I18N_TOOLS_PERL})
# Redirect the config.log output again, so that the ltconfig log is not
# clobbered by the next message.
exec 5>>./config.log
])
dnl old names
AC_DEFUN(AM_PROG_XML_I18N_TOOLS, [indir([AC_PROG_XML_I18N_TOOLS])])dnl
sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/intltool-extract.in > intltool-extract.out
if cmp -s intltool-extract intltool-extract.out 2>/dev/null; then
rm -f intltool-extract.out
else
mv -f intltool-extract.out intltool-extract
fi
chmod ugo+x intltool-extract
chmod u+w intltool-extract
sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/intltool-merge.in > intltool-merge.out
if cmp -s intltool-merge intltool-merge.out 2>/dev/null; then
rm -f intltool-merge.out
else
mv -f intltool-merge.out intltool-merge
fi
chmod ugo+x intltool-merge
chmod u+w intltool-merge
sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/intltool-update.in > intltool-update.out
if cmp -s intltool-update intltool-update.out 2>/dev/null; then
rm -f intltool-update.out
else
mv -f intltool-update.out intltool-update
fi
chmod ugo+x intltool-update
chmod u+w intltool-update
], INTLTOOL_PERL=${INTLTOOL_PERL})
])
# libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
......@@ -4475,91 +4465,6 @@ int main ()
rm -f conf.gdk_pixbuftest
])
dnl AM_PATH_GCONF([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
dnl Test for GCONF, and define GCONF_CFLAGS and GCONF_LIBS
dnl
AC_DEFUN(AM_PATH_GCONF,
[dnl
dnl Get the cflags and libraries from the gconf-config script
dnl
AC_ARG_WITH(gconf-prefix,[ --with-gconf-prefix=PFX Prefix where GCONF is installed (optional)],
gconf_config_prefix="$withval", gconf_config_prefix="")
AC_ARG_WITH(gconf-exec-prefix,[ --with-gconf-exec-prefix=PFX Exec prefix where GCONF is installed (optional)],
gconf_config_exec_prefix="$withval", gconf_config_exec_prefix="")
AC_ARG_ENABLE(gconftest, [ --disable-gconftest Do not try to compile and run a test GCONF program],
, enable_gconftest=yes)
gconf_config_args="$gconf_config_args"
if test x$gconf_config_exec_prefix != x ; then
gconf_config_args="$gconf_config_args --exec-prefix=$gconf_config_exec_prefix"
if test x${GCONF_CONFIG+set} != xset ; then
GCONF_CONFIG=$gconf_config_exec_prefix/bin/gconf-config
fi
fi
if test x$gconf_config_prefix != x ; then
gconf_config_args="$gconf_config_args --prefix=$gconf_config_prefix"
if test x${GCONF_CONFIG+set} != xset ; then
GCONF_CONFIG=$gconf_config_prefix/bin/gconf-config
fi
fi
AC_PATH_PROG(GCONF_CONFIG, gconf-config, no)
min_gconf_version=ifelse([$1], , 0.5, $1)
AC_MSG_CHECKING(for GCONF - version >= $min_gconf_version)
no_gconf=""
if test "$GCONF_CONFIG" = "no" ; then
no_gconf=yes
else
GCONF_CFLAGS="`$GCONF_CONFIG $gconf_config_args --cflags $4`"
GCONF_LIBS="`$GCONF_CONFIG $gconf_config_args --libs $4`"
gconf_config_major_version=`$GCONF_CONFIG $gconf_config_args --version | \
sed -e 's,^[[^0-9.]]*,,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
gconf_config_minor_version=`$GCONF_CONFIG $gconf_config_args --version | \
sed -e 's,^[[^0-9.]]*,,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
gconf_config_micro_version=`$GCONF_CONFIG $gconf_config_args --version | \
sed -e 's,^[[^0-9\.]]*,,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
fi
if test "x$no_gconf" = x ; then
AC_MSG_RESULT(yes)
ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
if test "$GCONF_CONFIG" = "no" ; then
echo "*** The gconf-config script installed by GCONF could not be found"
echo "*** If GCONF was installed in PREFIX, make sure PREFIX/bin is in"
echo "*** your path, or set the GCONF_CONFIG environment variable to the"
echo "*** full path to gconf-config."
else
:
fi
GCONF_CFLAGS=""
GCONF_LIBS=""
ifelse([$3], , :, [$3])
fi
AC_SUBST(GCONF_CFLAGS)
AC_SUBST(GCONF_LIBS)
rm -f conf.gconftest
])
dnl AM_GCONF_SOURCE
dnl Define GCONF_SCHEMA_CONFIG_SOURCE
dnl
AC_DEFUN(AM_GCONF_SOURCE,
[
if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
GCONF_SCHEMA_CONFIG_SOURCE=`gconftool --get-default-source`
else
GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
fi
AC_ARG_WITH(gconf-source,
[ --with-gconf-source=sourceaddress Where to install schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",)
AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
AC_MSG_RESULT("Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation")
])
# Macro to add for using GNU gettext.
# Ulrich Drepper <drepper@cygnus.com>, 1995.
#
......
This diff is collapsed.
dnl Process this file with autoconf to produce a configure script.
AC_INIT(configure.in)
AM_INIT_AUTOMAKE(gcompris, 0.9.7)
AM_INIT_AUTOMAKE(gcompris, 1.0.0Pre1)
AM_CONFIG_HEADER(config.h)
AC_PROG_CC
AM_PROG_CC_STDC
AC_HEADER_STDC
AM_PROG_XML_I18N_TOOLS
AC_PROG_INTLTOOL
AM_DISABLE_STATIC
AM_PROG_LIBTOOL
......@@ -19,11 +19,10 @@ AM_ACLOCAL_INCLUDE(macros)
GNOME_INIT
AC_ISC_POSIX
GNOME_COMPILE_WARNINGS
GNOME_COMPILE_WARNINGS(maximum)
GNOME_X_CHECKS
GNOME_XML_CHECK
AM_PATH_GDK_PIXBUF
AM_PATH_GCONF
dnl Add the languages which your application supports here.
ALL_LINGUAS="az de el es fi fr it nl pt_BR ru sv lt"
......
......@@ -69,10 +69,6 @@ DATADIRNAME = @DATADIRNAME@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
EXEEXT = @EXEEXT@
GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_CONFIG = @GCONF_CONFIG@
GCONF_LIBS = @GCONF_LIBS@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
GDK_PIXBUF_CONFIG = @GDK_PIXBUF_CONFIG@
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
......@@ -101,6 +97,20 @@ INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
INTLOBJS = @INTLOBJS@
INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
LIBICONV = @LIBICONV@
LIBTOOL = @LIBTOOL@
......@@ -126,10 +136,6 @@ STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XML_I18N_EXTRACT = @XML_I18N_EXTRACT@
XML_I18N_MERGE = @XML_I18N_MERGE@
XML_I18N_TOOLS_PERL = @XML_I18N_TOOLS_PERL@
XML_I18N_UPDATE = @XML_I18N_UPDATE@
XPM_LIBS = @XPM_LIBS@
ZVT_LIBS = @ZVT_LIBS@
cflags_set = @cflags_set@
......
......@@ -111,34 +111,48 @@ Note that the descriptions are internationalized which means translated in a tar
@item
Control bar
Control bar:
@cindex Control bar
The control bar is always present in GCompris. This icons are contextual which means that when an icon is not meaningfull in a specific contect, it is disabled (NOT YET IMPLEMENTED).
The control bar is always present in GCompris. This icons are contextual which means that when an icon is not meaningfull in a specific contect, it is simply not displayed.
The control bar contains the icons from left to right:
@enumerate
@item
Help (NOT YET IMPLEMENTED)
Help:
@cindex Icon Help
In some case, a board can be too complex to be described in the @dfn{Board description area}. In this case this will provide access to the additionnal instructions.
@item
Level
Level:
@cindex Icon Level
Some boards provide different level. The number of levels is board dependant.
@item
OK
OK:
@cindex Icon OK
Some boards do not automatically detect that the child has finish the given task. Clicking here is similar to entering @key{RET} on the keyboard and thus the @key{RET} key is a shortcut.
@item
End
End:
@cindex Icon End
End the current board if any, otherwise Exit GCompris.
When entered at the board menu level, it will create a dialog window to confirm the Exit of GCompris.
@cindex Exiting from GCompris
@item
About:
@cindex Icon About
Display the about box for gcompris with the version number, the author, the licence and links to online resources.
@cindex About GCompris
@item
Configure:
@cindex Icon Configure
Display the configuration box for gcompris. Configuration can be done at gcompris level when no boards is selected.
If a board is selected, it can provides configuration options.
Configuration is persistent and saved in the gnome file in the user home directory under .gnome/gcompris.
@cindex Configuring GCompris
@end enumerate
@end enumerate
......@@ -226,13 +240,6 @@ of were he/she is in the board. This value must be in the range
Set the max value of the progress bar.
@item
@code{void gcompris_bar_set_message (const gchar *message);}
Display a message in the status bar.
@end itemize
So when you create a board, you must include gcompris/plugin.h to have
access to those methods (this is already included in gcompris/gcompris.h).
......@@ -248,6 +255,8 @@ implementation methods.
The BoardPlugin structure must provide callbaks to at
least:
@end itemize
@itemize @bullet
@item
......
......@@ -69,10 +69,6 @@ DATADIRNAME = @DATADIRNAME@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
EXEEXT = @EXEEXT@
GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_CONFIG = @GCONF_CONFIG@
GCONF_LIBS = @GCONF_LIBS@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
GDK_PIXBUF_CONFIG = @GDK_PIXBUF_CONFIG@
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
......@@ -101,6 +97,20 @@ INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
INTLOBJS = @INTLOBJS@
INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
LIBICONV = @LIBICONV@
LIBTOOL = @LIBTOOL@
......@@ -126,10 +136,6 @@ STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XML_I18N_EXTRACT = @XML_I18N_EXTRACT@
XML_I18N_MERGE = @XML_I18N_MERGE@
XML_I18N_TOOLS_PERL = @XML_I18N_TOOLS_PERL@
XML_I18N_UPDATE = @XML_I18N_UPDATE@
XPM_LIBS = @XPM_LIBS@
ZVT_LIBS = @ZVT_LIBS@
cflags_set = @cflags_set@
......
......@@ -3,7 +3,7 @@
%define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
%define prefix /usr
Summary: GCompris / I Have Inderstood.
Summary: GCompris / I Have Understood.
Name: gcompris
Version: %ver
Release: %rel
......@@ -28,6 +28,7 @@ Today several Boards are implemented:
* Puzzle game with famous paintings
* Drive Plane to catch clouds in increasing number
* Balance the scales
* And much more ...
The Game is included in the Gnome Desktop under the Game menu.
......@@ -102,7 +103,39 @@ xml-i18n-tools, gdk-pixbuf doivent
- configure.in: Changed to use local relative pixmaps and sounds
instead of gnome api
- src/*.c: Changed to use relative pixmaps and sounds
%package sounds-fr
Summary: French sounds for GCompris
Group: Amusements/Games
Requires: %name = %version
%description sounds-fr
French sounds for gcompris.
%package sounds-es
Summary: Spanish sounds for GCompris
Group: Amusements/Games
Requires: %name = %version
%description sounds-es
Spanish sounds for gcompris.
%package sounds-de
Summary: German sounds for GCompris
Group: Amusements/Games
Requires: %name = %version
%description sounds-de
German sounds for gcompris.
%package sounds-en
Summary: English sounds for GCompris
Group: Amusements/Games
Requires: %name = %version
%description sounds-en
English sounds for gcompris.
%prep
%setup -q
......@@ -140,10 +173,38 @@ rm -rf $RPM_BUILD_ROOT
%{prefix}/share/gnome/apps/Games/*
%{prefix}/share/pixmaps/*
%{prefix}/share/gcompris/sounds/*
%{prefix}/share/gcompris/boards/*
%{prefix}/share/gcompris/boards/sounds/*.ogg
%{prefix}/share/gcompris/boards/algebra_guesscount/*
%{prefix}/share/gcompris/boards/babymatch/*
%{prefix}/share/gcompris/boards/babyshapes/*
%{prefix}/share/gcompris/boards/boardicons/*
%{prefix}/share/gcompris/boards/clockgame/*
%{prefix}/share/gcompris/boards/CVS/*
%{prefix}/share/gcompris/boards/draw/*
%{prefix}/share/gcompris/boards/fishes/*
%{prefix}/share/gcompris/boards/flags/*
%{prefix}/share/gcompris/boards/gcompris/*
%{prefix}/share/gcompris/boards/imageid/*
%{prefix}/share/gcompris/boards/imagename/*
%{prefix}/share/gcompris/boards/missing_letter/*
%{prefix}/share/gcompris/boards/paintings/*
%{prefix}/share/gcompris/boards/railroad/*
%{prefix}/share/gcompris/boards/reading/*
%{prefix}/share/gcompris/boards/scales/*
%{prefix}/share/gcompris/boards/wordsgame/*
%{prefix}/lib/gcompris/*
%{prefix}/share/locale/*/*/*
%{prefix}/share/gnome/help/gcompris/*/*
%{prefix}/lib/menu/*
%files sounds-de
%{prefix}/share/gcompris/boards/sounds/fr
%files sounds-en
%{prefix}/share/gcompris/boards/sounds/fr
%files sounds-es
%{prefix}/share/gcompris/boards/sounds/fr
%files sounds-fr
%{prefix}/share/gcompris/boards/sounds/fr
#!@XML_I18N_TOOLS_PERL@ -w
#!@INTLTOOL_PERL@ -w
# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*-
#
# The XML Translation Extractor
# The Intltool Message Extractor
#
# Copyright (C) 2000 Free Software Foundation.
# Copyright (C) 2000-2001 Free Software Foundation.
#
# This library is free software; you can redistribute it and/or
# Intltool is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation; either version 2 of the
# License, or (at your option) any later version.
#
# This script is distributed in the hope that it will be useful,
# Intltool is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this library; if not, write to the Free Software
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
#
# Authors: Kenneth Christiansen <kenneth@gnu.org>
# Darin Adler <darin@eazel.com>
# Darin Adler <darin@bentspoon.com>
#
## Release information
my $PROGRAM = "xml-i18n-extract";
my $PACKAGE = "xml-i18n-tools";
my $VERSION = "0.9";
## Script options - Enable by setting value to 1
my $ENABLE_INI = "1"; ## desktop and alike files
my $ENABLE_KEYS = "1"; ## mimetype descriptions
my $ENABLE_GLADE = "1"; ## glade files
my $ENABLE_XML = "1"; ## generic xml files
my $PROGRAM = "intltool-extract";
my $PACKAGE = "intltool";
my $VERSION = "0.13";
## Loaded modules
use strict;
......@@ -55,6 +54,9 @@ my $gettext_type = "";
my $input;
my %messages = ();
## Use this instead of \w for XML files to handle more possible characters.
my $w = "[-A-Za-z0-9._:]";
## Always print first
$| = 1;
......@@ -62,7 +64,7 @@ $| = 1;
GetOptions (
"type=s" => \$TYPE_ARG,
"local|l" => \$LOCAL_ARG,
"help|h|?" => \$HELP_ARG,
"help|h" => \$HELP_ARG,
"version|v" => \$VERSION_ARG,
"update" => \$UPDATE_ARG,
"quiet|q" => \$QUIET_ARG,
......@@ -145,7 +147,6 @@ sub help{
## Sub for printing error messages
sub error{
# print "xml-i18n-extract: invalid option @ARGV\n";
print "Try `${PROGRAM} --help' for more information.\n";
exit;
}
......@@ -176,121 +177,110 @@ sub convert($) {
$input = <IN>;
}
&type_ini;
&type_keys;
&type_xml;
&type_glade;
&type_ini if $gettext_type eq "ini";
&type_keys if $gettext_type eq "keys";
&type_xml if $gettext_type eq "xml";
&type_glade if $gettext_type eq "glade";
&type_scheme if $gettext_type eq "scheme";
}
sub type_ini {
sub entity_decode
{
local ($_) = @_;
if ($ENABLE_INI) {
### For generic translatable desktop files ###
if ($gettext_type eq "ini"){
s/&apos;/'/g; # '
s/&gt;/>/g;
s/&lt;/</g;
s/&quot;/"/g; # "
s/&amp;/&/g;
while ($input =~ /^_.*=(.*)$/mg) {