GitLab repository storage has been migrated to hashed layout. Please contact Infrastructure team if you notice any issues with repositories or hooks.

Commit 3ea1e3f4 authored by Bruno Coudoin's avatar Bruno Coudoin

many changes

parent 7444b9d6
......@@ -68,6 +68,10 @@ 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@
......@@ -75,22 +79,6 @@ GENCAT = @GENCAT@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@
GNOMEUI_LIBS = @GNOMEUI_LIBS@
GNOME_APPLETS_LIBS = @GNOME_APPLETS_LIBS@
GNOME_CAPPLET_LIBS = @GNOME_CAPPLET_LIBS@
GNOME_CONFIG = @GNOME_CONFIG@
GNOME_INCLUDEDIR = @GNOME_INCLUDEDIR@
GNOME_LIBDIR = @GNOME_LIBDIR@
GNOME_LIBS = @GNOME_LIBS@
GNOME_XML_LIB = @GNOME_XML_LIB@
GNOME_XML_LIBS = @GNOME_XML_LIBS@
GNORBA_CFLAGS = @GNORBA_CFLAGS@
GNORBA_LIBS = @GNORBA_LIBS@
GTKXMHTML_LIBS = @GTKXMHTML_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_CONFIG = @GTK_CONFIG@
GTK_LIBS = @GTK_LIBS@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
......@@ -104,17 +92,12 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
ORBIT_CFLAGS = @ORBIT_CFLAGS@
ORBIT_CONFIG = @ORBIT_CONFIG@
ORBIT_IDL = @ORBIT_IDL@
ORBIT_LIBS = @ORBIT_LIBS@
PACKAGE = @PACKAGE@
PACKAGE_DATA_DIR = @PACKAGE_DATA_DIR@
PACKAGE_HELP_DIR = @PACKAGE_HELP_DIR@
PACKAGE_SOUNDS_DIR = @PACKAGE_SOUNDS_DIR@
POFILES = @POFILES@
POSUB = @POSUB@
PTHREAD_LIB = @PTHREAD_LIB@
RANLIB = @RANLIB@
STRIP = @STRIP@
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
......@@ -124,10 +107,6 @@ 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@
cxxflags_set = @cxxflags_set@
plugindir = @plugindir@
SUBDIRS = gcompris boards
......@@ -144,9 +123,9 @@ GZIP_ENV = --best
all: all-redirect
.SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile
cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
......@@ -245,6 +224,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = src
distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
......
......@@ -19,7 +19,7 @@ lib_LTLIBRARIES = \
librailroad.la \
liberase.la \
liblocale.la \
libalgebra_guesscount.la
libalgebra_guesscount.la
libdir = $(plugindir)
INCLUDES = -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -I..
......
......@@ -67,6 +67,10 @@ 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@
......@@ -86,6 +90,7 @@ GNOME_XML_LIB = @GNOME_XML_LIB@
GNOME_XML_LIBS = @GNOME_XML_LIBS@
GNORBA_CFLAGS = @GNORBA_CFLAGS@
GNORBA_LIBS = @GNORBA_LIBS@
GTKHTML_LIBS = @GTKHTML_LIBS@
GTKXMHTML_LIBS = @GTKXMHTML_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_CONFIG = @GTK_CONFIG@
......@@ -129,7 +134,7 @@ cflags_set = @cflags_set@
cxxflags_set = @cxxflags_set@
plugindir = @plugindir@
lib_LTLIBRARIES = libmenu.la libclickgame.la libalgebra.la libclockgame.la libshapegame.la libwordsgame.la libgletters.la libplanegame.la libsmallnumbers.la libparatrooper.la libreading.la libmemory.la libdraw.la libimageid.la libmissingletter.la libclick_on_letter.la librailroad.la liberase.la liblocale.la libalgebra_guesscount.la
lib_LTLIBRARIES = libmenu.la libclickgame.la libalgebra.la libclockgame.la libshapegame.la libwordsgame.la libgletters.la libplanegame.la libsmallnumbers.la libparatrooper.la libreading.la libmemory.la libdraw.la libimageid.la libmissingletter.la libclick_on_letter.la librailroad.la liberase.la liblocale.la libalgebra_guesscount.la
libdir = $(plugindir)
......@@ -298,6 +303,12 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = gtar
GZIP_ENV = --best
DEP_FILES = .deps/algebra.P .deps/algebra_guesscount.P \
.deps/click_on_letter.P .deps/clickgame.P .deps/clockgame.P \
.deps/draw.P .deps/erase.P .deps/gletters.P .deps/imageid.P \
.deps/locale.P .deps/memory.P .deps/menu.P .deps/missingletter.P \
.deps/paratrooper.P .deps/planegame.P .deps/railroad.P .deps/reading.P \
.deps/shapegame.P .deps/smallnumbers.P .deps/wordsgame.P
SOURCES = $(libmenu_la_SOURCES) $(libclickgame_la_SOURCES) $(libalgebra_la_SOURCES) $(libclockgame_la_SOURCES) $(libshapegame_la_SOURCES) $(libwordsgame_la_SOURCES) $(libgletters_la_SOURCES) $(libplanegame_la_SOURCES) $(libsmallnumbers_la_SOURCES) $(libparatrooper_la_SOURCES) $(libreading_la_SOURCES) $(libmemory_la_SOURCES) $(libdraw_la_SOURCES) $(libimageid_la_SOURCES) $(libmissingletter_la_SOURCES) $(libclick_on_letter_la_SOURCES) $(librailroad_la_SOURCES) $(liberase_la_SOURCES) $(liblocale_la_SOURCES) $(libalgebra_guesscount_la_SOURCES)
OBJECTS = $(libmenu_la_OBJECTS) $(libclickgame_la_OBJECTS) $(libalgebra_la_OBJECTS) $(libclockgame_la_OBJECTS) $(libshapegame_la_OBJECTS) $(libwordsgame_la_OBJECTS) $(libgletters_la_OBJECTS) $(libplanegame_la_OBJECTS) $(libsmallnumbers_la_OBJECTS) $(libparatrooper_la_OBJECTS) $(libreading_la_OBJECTS) $(libmemory_la_OBJECTS) $(libdraw_la_OBJECTS) $(libimageid_la_OBJECTS) $(libmissingletter_la_OBJECTS) $(libclick_on_letter_la_OBJECTS) $(librailroad_la_OBJECTS) $(liberase_la_OBJECTS) $(liblocale_la_OBJECTS) $(libalgebra_guesscount_la_OBJECTS)
......@@ -305,9 +316,9 @@ all: all-redirect
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .obj .s
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/boards/Makefile
cd $(top_srcdir) && $(AUTOMAKE) --gnu src/boards/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
......@@ -337,9 +348,6 @@ uninstall-libLTLIBRARIES:
$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
done
.c.o:
$(COMPILE) -c $<
# FIXME: We should only use cygpath when building on Windows,
# and only if it is available.
.c.obj:
......@@ -362,9 +370,6 @@ distclean-compile:
maintainer-clean-compile:
.c.lo:
$(LIBTOOL) --mode=compile $(COMPILE) -c $<
.s.lo:
$(LIBTOOL) --mode=compile $(COMPILE) -c $<
......@@ -475,6 +480,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = src/boards
distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/boards/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
......@@ -485,6 +495,38 @@ distdir: $(DISTFILES)
|| cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-include $(DEP_FILES)
mostlyclean-depend:
clean-depend:
distclean-depend:
-rm -rf .deps
maintainer-clean-depend:
%.o: %.c
@echo '$(COMPILE) -c $<'; \
$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
@-cp .deps/$(*F).pp .deps/$(*F).P; \
tr ' ' '\012' < .deps/$(*F).pp \
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
>> .deps/$(*F).P; \
rm .deps/$(*F).pp
%.lo: %.c
@echo '$(LTCOMPILE) -c $<'; \
$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
@-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
< .deps/$(*F).pp > .deps/$(*F).P; \
tr ' ' '\012' < .deps/$(*F).pp \
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
>> .deps/$(*F).P; \
rm -f .deps/$(*F).pp
info-am:
info: info-am
dvi-am:
......@@ -522,27 +564,27 @@ distclean-generic:
maintainer-clean-generic:
mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \
mostlyclean-libtool mostlyclean-tags \
mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
mostlyclean-generic
mostlyclean: mostlyclean-am
clean-am: clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \
clean-generic mostlyclean-am
clean-depend clean-generic mostlyclean-am
clean: clean-am
distclean-am: distclean-libLTLIBRARIES distclean-compile \
distclean-libtool distclean-tags distclean-generic \
clean-am
distclean-libtool distclean-tags distclean-depend \
distclean-generic clean-am
-rm -f libtool
distclean: distclean-am
maintainer-clean-am: maintainer-clean-libLTLIBRARIES \
maintainer-clean-compile maintainer-clean-libtool \
maintainer-clean-tags maintainer-clean-generic \
distclean-am
maintainer-clean-tags maintainer-clean-depend \
maintainer-clean-generic distclean-am
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
......@@ -554,12 +596,13 @@ uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
distclean-compile clean-compile maintainer-clean-compile \
mostlyclean-libtool distclean-libtool clean-libtool \
maintainer-clean-libtool tags mostlyclean-tags distclean-tags \
clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
check-am installcheck-am installcheck install-exec-am install-exec \
install-data-am install-data install-am install uninstall-am uninstall \
all-redirect all-am all installdirs mostlyclean-generic \
distclean-generic clean-generic maintainer-clean-generic clean \
mostlyclean distclean maintainer-clean
clean-tags maintainer-clean-tags distdir mostlyclean-depend \
distclean-depend clean-depend maintainer-clean-depend info-am info \
dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
install-exec install-data-am install-data install-am install \
uninstall-am uninstall all-redirect all-am all installdirs \
mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
$(GNOME_LIBDIR) $(GNOMEUI_LIBS) \
$(GNOME_XML_LIB) $(INTLLIBS) \
......
......@@ -553,6 +553,7 @@ static GnomeCanvasItem *algebra_create_item(GnomeCanvasGroup *parent)
guint first_operand, second_operand;
char *first_operand_str = NULL;
char *second_operand_str = NULL;
char *audioOperand = NULL;
guint longuest;
double x_align;
double x, y;
......@@ -645,15 +646,19 @@ static GnomeCanvasItem *algebra_create_item(GnomeCanvasGroup *parent)
{
case PLUSSIGNFILE:
expected_result = g_strdup_printf("%d", first_operand+second_operand);
audioOperand = "plus";
break;
case MINUSSIGNFILE:
expected_result = g_strdup_printf("%d", first_operand-second_operand);
audioOperand = "minus";
break;
case BYSIGNFILE:
expected_result = g_strdup_printf("%d", first_operand*second_operand);
audioOperand = "by";
break;
case DIVIDESIGNFILE:
expected_result = g_strdup_printf("%d", first_operand/second_operand);
audioOperand = "outof";
break;
default:
g_error("Bad Operation");
......@@ -665,6 +670,9 @@ static GnomeCanvasItem *algebra_create_item(GnomeCanvasGroup *parent)
strlen(expected_result)+2),
y_firstline, expected_result, TRUE);
gcompris_play_ogg(first_operand_str, audioOperand , second_operand_str, "equal", NULL);
g_free(first_operand_str);
g_free(second_operand_str);
......
This diff is collapsed.
/* gcompris - clickgame.c
*
* Time-stamp: <2001/12/10 00:01:07 bruno>
* Time-stamp: <2001/12/19 00:35:20 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -247,24 +247,23 @@ clickgame_help ()
clickgame_pause(TRUE);
gcompris_help_start(N_("Practice the computer mouse"),
N_("\
Goal:\n\
In this game, the children will discover the computer mouse\n\
The goal is just to click with the left mouse button on the moving fish.\n\
\n\
Credits:\n\
Fish are taken from the Unix utility xfishtank.\n\
Images are taken from the National Undersearch Research Program (NURP) Collection\n\
at http://www.photolib.noaa.gov\n\
All images credit bellongs to the OAR/National Undersea Research Program (NURP)\n\
Except for the first image that also credits the University of North Carolina at Wilmington\n\
In the gcompris level order, images information is:\n\
Location: Tropical Atlantic Ocean, Florida Keys (image nur00523)\n\
Photographer: D. Kesling\n\
Location: Florida Keys (image nur03006)\n\
Location: Unknown (image nur03505)\n\
Location: Unknown (image nur03010)\n\
Location: Unknown (image nur03011)\n\
Location: Unknown (image nur03013)\n"));
<b>Goal:</b>
In this game, the children will discover the computer mouse
The goal is just to click with the left mouse button on the moving fish.
<p>
<b>Credits:</b>
Fish are taken from the Unix utility xfishtank.<br>
Images are taken from the National Undersearch Research Program (NURP) Collection
at <a href=\"http://www.photolib.noaa.gov\">http://www.photolib.noaa.gov</a>
<br>All images credit bellongs to the OAR/National Undersea Research Program (NURP)
Except for the first image that also credits the University of North Carolina at Wilmington
In the gcompris level order, images information is:
<li>Location: Tropical Atlantic Ocean, Florida Keys (image nur00523) Photographer: D. Kesling
<li>Location: Florida Keys (image nur03006)</li>
<li>Location: Unknown (image nur03505)</li>
<li>Location: Unknown (image nur03010)</li>
<li>Location: Unknown (image nur03011)</li>
<li>Location: Unknown (image nur03013)</li>"));
}
}
......
......@@ -204,16 +204,16 @@ help ()
pause_board(TRUE);
gcompris_help_start(N_("Free vector drawing tool"),
N_("\
Goal:\n\
In this game, the children will be able to freely draw.\n\
The goal is just to discover how he can create pretty looking drawings based on\n\
basic shapes: rectangles, ellipses and lines.\n\
\n\
Usage:\n\
On the left select a drawing tool, on the bottom select a color then click\n\
on the white area and drag to create a new shape.\n\
To go faster, you can use the middle mouse button to delete an object\n\
or the right button to move an object.\n\
<b>Goal:</b>
In this game, the children will be able to freely draw.
The goal is just to discover how he can create pretty looking drawings based on
basic shapes: rectangles, ellipses and lines.
<br>
<b>Usage:</b>
On the left select a drawing tool, on the bottom select a color then click
on the white area and drag to create a new shape.
To go faster, you can use the middle mouse button to delete an object
or the right button to move an object.
"));
}
......@@ -549,7 +549,7 @@ color_event(GnomeCanvasItem *item, GdkEvent *event, gchar *color)
case 1:
currentColor = color;
highlight_color_item(item);
gcompris_play_ogg(color, NULL);
break;
default:
break;
......
......@@ -51,10 +51,19 @@ static int number_of_item = 0;
static int number_of_item_x = 0;
static int number_of_item_y = 0;
static char* image_files[] = {"bear001.jpg","malaybear002.jpg",
"polabear011.jpg","spectbear001.jpg","joybear001.jpg",
"polarbear001.jpg","joybear002.jpg","poolbears001.jpg"};
#define ANIMAL_FILES 8
// List of images to use in the game
static gchar *imageList[] =
{
"gcompris/animals/bear001.jpg",
"gcompris/animals/malaybear002.jpg",
"gcompris/animals/polabear011.jpg",
"gcompris/animals/spectbear001.jpg",
"gcompris/animals/joybear001.jpg",
"gcompris/animals/polarbear001.jpg",
"gcompris/animals/joybear002.jpg",
"gcompris/animals/poolbears001.jpg"
};
#define NUMBER_OF_IMAGES 8
/* Description of this plugin */
BoardPlugin menu_bp =
......@@ -116,8 +125,6 @@ static void start_board (GcomprisBoard *agcomprisBoard)
if(agcomprisBoard!=NULL)
{
gcomprisBoard=agcomprisBoard;
gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas),
"gcompris/gcompris-bg.jpg");
gcomprisBoard->level=1;
gcomprisBoard->maxlevel=2;
gcomprisBoard->sublevel=1;
......@@ -172,6 +179,10 @@ gboolean is_our_board (GcomprisBoard *gcomprisBoard)
/* set initial values for the next level */
static void erase_next_level()
{
gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas),
imageList[RAND(0, NUMBER_OF_IMAGES-1)]);
gcompris_bar_set_level(gcomprisBoard);
erase_destroy_all_items();
......@@ -197,10 +208,7 @@ static void erase_destroy_all_items()
static GnomeCanvasItem *erase_create_item(GnomeCanvasGroup *parent)
{
int i,j;
int object_x, object_y;
GnomeCanvasItem *item = NULL;
GdkPixbuf *pixmap = NULL;
gchar *str;
boardRootItem = GNOME_CANVAS_GROUP(
gnome_canvas_item_new (gnome_canvas_root(gcomprisBoard->canvas),
......@@ -210,24 +218,6 @@ static GnomeCanvasItem *erase_create_item(GnomeCanvasGroup *parent)
NULL));
str = g_strdup_printf("gcompris/animals/%s", image_files[RAND(0,ANIMAL_FILES-1)]);
gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas),str);
/* Place randomly an object to add fun */
/*
pixmap = gcompris_load_pixmap("gcompris/misc/tuxplane.png");
object_x = (rand()%(BOARDWIDTH-gdk_pixbuf_get_width(pixmap)));
object_y = (rand()%(BOARDHEIGHT-gdk_pixbuf_get_height(pixmap)));
item = gnome_canvas_item_new (boardRootItem,
gnome_canvas_pixbuf_get_type (),
"pixbuf", pixmap,
"x", (double) object_x,
"y", (double) object_y,
"width", (double) gdk_pixbuf_get_width(pixmap),
"height", (double) gdk_pixbuf_get_height(pixmap),
NULL);
gdk_pixbuf_unref(pixmap);
*/
number_of_item = 0;
for(i=0; i<BOARDWIDTH; i+=BOARDWIDTH/number_of_item_x)
......
/* gcompris - menu.c
*
* Time-stamp: <2001/12/09 23:40:31 bruno>
* Time-stamp: <2001/12/23 23:41:28 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -207,31 +207,33 @@ menu_help ()
menu_pause(TRUE);
gcompris_help_start(N_("GCompris Help"),
N_("\
Goal:
<b>Goal:</b>
<p>
GCompris is an educational games that provides different activities to
children starting at 3.
<p>
To use it, a simple click on an icon brings you to a board or a menu.
<p>
At the bottom of the screen, you have the gcompris control bar.
<p>
From right to left, bellow is the meaning of the icons. Note that these
icons are displayed only when available in a board:
Home - Back to previous menu or exit gcompris if no more
Thumb - OK, confirm your answer
Dice - The current level is displayed. Click on it to select another level
Question Mark - The help
Music note - Ask gcompris to repeat the question
<li>Home - Back to previous menu or exit gcompris if no more</li>
<li>Thumb - OK, confirm your answer</li>
<li>Dice - The current level is displayed. Click on it to select another level</li>
<li>Question Mark - The help</li>
<li>Music note - Ask gcompris to repeat the question</li>
<p>
The stars means:
1 Star - 3 to 4 years old
2 Stars - 5 to 6 years old
3 Stars - 7 to 8 years old
Credits:
<li>1 Star - 3 to 4 years old</li>
<li>2 Stars - 5 to 6 years old</li>
<li>3 Stars - 7 to 8 years old</li>
<p>
<b>Credits:</b>
Author: Bruno Coudoin
Contribution: Pascal Georges
Graphics: Renaud Blanchard
Music: Djilali Sebihi
"));
}
}
......
/* gcompris - paratrooper.c
*
* Time-stamp: <2001/12/03 23:35:25 bruno>
* Time-stamp: <2001/12/19 01:48:13 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -365,13 +365,13 @@ help ()
pause_board(TRUE);
gcompris_help_start(N_("The paratrooper game"),
N_("\
Goal:\n\
In this game, the children will try to make Tux the paratrooper lands safely on the\n\
fishing boat. He/She needs to take care of the wind side and speed.\n\
\n\
Usage:\n\
<b>Goal:</b>
In this game, the children will try to make Tux the paratrooper lands safely on the
fishing boat. He/She needs to take care of the wind side and speed.
<br>
<b>Usage:</b>
Click on any keyboard key to let Tux jump. Another keypress will open the
'parachute'.\n
'parachute'.
"));
}
......
/* gcompris - shapegame.c
*
* Time-stamp: <2001/12/14 00:47:21 bruno>
* Time-stamp: <2001/12/16 20:37:22 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -175,7 +175,7 @@ static void start_board (GcomprisBoard *agcomprisBoard)
gcompris_bar_set(GCOMPRIS_BAR_LEVEL|GCOMPRIS_BAR_OK);
gcomprisBoard->number_of_sublevel=6;
gcomprisBoard->sublevel = 1;
gcomprisBoard->sublevel = 0;
shapegame_next_level();
......@@ -204,7 +204,7 @@ set_level (guint level)
if(gcomprisBoard!=NULL)
{
gcomprisBoard->level=level;
gcomprisBoard->sublevel=1;
gcomprisBoard->sublevel=0;
shapegame_next_level();
}
}
......@@ -269,9 +269,12 @@ static void shapegame_next_level()
PACKAGE_DATA_DIR, gcomprisBoard->boarddir,
gcomprisBoard->level, gcomprisBoard->sublevel);
printf("1 gcomprisBoard->level %d filename=%s\n", gcomprisBoard->level, filename);
while(!g_file_exists(filename)
&& ((gcomprisBoard->level != 1) || (gcomprisBoard->sublevel!=0)))
{
printf("2 gcomprisBoard->level %d\n", gcomprisBoard->level);
/* Try the next level */
gcomprisBoard->sublevel=gcomprisBoard->number_of_sublevel;
if(!increment_sublevel())
......@@ -281,6 +284,7 @@ static void shapegame_next_level()
filename = g_strdup_printf("%s/%s/board%d_%d.xml",
PACKAGE_DATA_DIR, gcomprisBoard->boarddir,
gcomprisBoard->level, gcomprisBoard->sublevel);
printf("3 gcomprisBoard->level %d filename=%s\n", gcomprisBoard->level, filename);
}
read_xml_file(filename);
......@@ -647,10 +651,13 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, Shape *shape)
{
case SHAPE_TARGET:
gnome_canvas_item_hide(item);
gcompris_set_image_focus(item, FALSE);
if( shape->icon_shape!=NULL)
{
item = shape->icon_shape->item;
gnome_canvas_item_show(item);
gcompris_set_image_focus(item, TRUE);
shape->icon_shape=NULL;
}
break;
......@@ -667,7 +674,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, Shape *shape)
fleur = gdk_cursor_new(GDK_FLEUR);
/* In order to have our item above the others, I need to reparent it */
gnome_canvas_item_reparent (item, shape_root_item);
gnome_canvas_item_reparent (item, (GnomeCanvasGroup *)shape_root_item);
gnome_canvas_item_raise_to_top(item);
gnome_canvas_item_grab(item,
......@@ -712,7 +719,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, Shape *shape)
gnome_canvas_item_ungrab(item, event->button.time);
dragging = FALSE;
gnome_canvas_item_reparent (item, shape_list_root_item);
gnome_canvas_item_reparent (item, (GnomeCanvasGroup *)shape_list_root_item);
targetshape = find_closest_shape(item_x, item_y, 1000);
if(targetshape!=NULL)
......
......@@ -2,7 +2,7 @@
INCLUDES = \
-I$(top_srcdir)/intl \
$(GNOME_INCLUDEDIR)
$(GNOME_INCLUDEDIR) $(GCONF_CFLAGS)
bin_PROGRAMS = gcompris
......@@ -21,5 +21,6 @@ gcompris_SOURCES = \
gcompris_LDADD = \
$(GNOME_LIBDIR) $(GNOMEUI_LIBS) \
$(GNOME_XML_LIB) $(INTLLIBS) \
$(GDK_PIXBUF_LIBS)
$(GDK_PIXBUF_LIBS) \
$(GCONF_LIBS) $(GTKHTML_LIBS)
......@@ -68,6 +68,10 @@ 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@
......@@ -87,6 +91,7 @@ GNOME_XML_LIB = @GNOME_XML_LIB@
GNOME_XML_LIBS = @GNOME_XML_LIBS@
GNORBA_CFLAGS = @GNORBA_CFLAGS@
GNORBA_LIBS = @GNORBA_LIBS@
GTKHTML_LIBS = @GTKHTML_LIBS@
GTKXMHTML_LIBS = @GTKXMHTML_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_CONFIG = @GTK_CONFIG@
......@@ -130,7 +135,7 @@ cflags_set = @cflags_set@
cxxflags_set = @cxxflags_set@
plugindir = @plugindir@
INCLUDES = -I$(top_srcdir)/intl $(GNOME_INCLUDEDIR)
INCLUDES = -I$(top_srcdir)/intl $(GNOME_INCLUDEDIR) $(GCONF_CFLAGS)
bin_PROGRAMS = gcompris
......@@ -138,7 +143,7 @@ bin_PROGRAMS = gcompris
gcompris_SOURCES = pixbuf_util.c pixbuf_util.h gcompris.c gcompris.h gcompris-board.h properties.c properties.h gameutil.c gameutil.h bar.c help.c plugin.h pluginenum.c pluginenum.h board.h board.c bonus.c bonus.h score.c score.h
gcompris_LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(GNOME_XML_LIB) $(INTLLIBS) $(GDK_PIXBUF_LIBS)
gcompris_LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(GNOME_XML_LIB) $(INTLLIBS) $(GDK_PIXBUF_LIBS) $(GCONF_LIBS) $(GTKHTML_LIBS)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../config.h
......@@ -168,6 +173,9 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = gtar
GZIP_ENV = --best
DEP_FILES = .deps/bar.P .deps/board.P .deps/bonus.P .deps/gameutil.P \
.deps/gcompris.P .deps/help.P .deps/pixbuf_util.P .deps/pluginenum.P \
.deps/properties.P .deps/score.P
SOURCES = $(gcompris_SOURCES)
OBJECTS = $(gcompris_OBJECTS)
......@@ -175,9 +183,9 @@ all: all-redirect
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .obj .s
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/gcompris/Makefile
cd $(top_srcdir) && $(AUTOMAKE) --gnu src/gcompris/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
......@@ -207,9 +215,6 @@ uninstall-binPROGRAMS:
rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
done