From 2ca4e6470125f02779dc1bb30ea6104e24ca9c43 Mon Sep 17 00:00:00 2001 From: Bruno Coudoin Date: Mon, 16 Feb 2004 23:44:40 +0000 Subject: chronos added by Jose. linha verde theme added by Jose * configure.in: release 5.2 * gcompris.spec.in: added new sounds * po/POTFILES.in: added chronos * src/gcompris/gameutil.c: (gcompris_load_pixmap): changed to display a dialog box instead of a direct exit when an image is missing. * src/gcompris/log.c: (gcompris_log_end): fixed to compile with old gcc --- diff --git a/ChangeLog b/ChangeLog index 3507046..7d6993b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,66 @@ +2004-02-17 Bruno coudoin + + * boards/Makefile.am: added chronos by Jose Jorge + * boards/chronos.xml.in: + * boards/chronos/Makefile.am: + * boards/chronos/bg.jpg: + * boards/chronos/board1_0.xml.in: + * boards/chronos/space/1.jpg: + * boards/chronos/space/2.jpg: + * boards/chronos/space/3.jpg: + * boards/chronos/space/4.jpg: + * boards/chronos/space/bg.jpg: + * boards/skins/linha_verde/about.png: Added lina-verde theme by Jose Jorge + * boards/skins/linha_verde/bad.png: + * boards/skins/linha_verde/bar_bg.jpg: + * boards/skins/linha_verde/button.png: + * boards/skins/linha_verde/button_backward.png: + * boards/skins/linha_verde/button_checked.png: + * boards/skins/linha_verde/button_exit.png: + * boards/skins/linha_verde/button_forward.png: + * boards/skins/linha_verde/button_large.png: + * boards/skins/linha_verde/button_large2.png: + * boards/skins/linha_verde/button_large_selected.png: + * boards/skins/linha_verde/button_redo.png: + * boards/skins/linha_verde/button_reload.png: + * boards/skins/linha_verde/button_selected.png: + * boards/skins/linha_verde/button_small.png: + * boards/skins/linha_verde/button_style2.png: + * boards/skins/linha_verde/button_unchecked.png: + * boards/skins/linha_verde/button_up.png: + * boards/skins/linha_verde/button_up_selected.png: + * boards/skins/linha_verde/config.png: + * boards/skins/linha_verde/dialogbox.png: + * boards/skins/linha_verde/gcompris-bg.jpg: + * boards/skins/linha_verde/gcompris-init.jpg: + * boards/skins/linha_verde/gcompris-shapebg.jpg: + * boards/skins/linha_verde/help.png: + * boards/skins/linha_verde/help_bg.png: + * boards/skins/linha_verde/home.png: + * boards/skins/linha_verde/images_selector_bg.png: + * boards/skins/linha_verde/level1.png: + * boards/skins/linha_verde/level2.png: + * boards/skins/linha_verde/level3.png: + * boards/skins/linha_verde/level4.png: + * boards/skins/linha_verde/level5.png: + * boards/skins/linha_verde/level6.png: + * boards/skins/linha_verde/level7.png: + * boards/skins/linha_verde/level8.png: + * boards/skins/linha_verde/level9.png: + * boards/skins/linha_verde/ok.png: + * boards/skins/linha_verde/repeat.png: + * boards/skins/linha_verde/skin.xml: + * boards/skins/linha_verde/voice.png: + * boards/skins/linha_verde/voice_bad.png: + * boards/sounds/chronos/space/1.ogg: added for chronos by Jose. + * boards/sounds/chronos/space/2.ogg: + * boards/sounds/chronos/space/3.ogg: + * configure.in: release 5.2 + * gcompris.spec.in: added new sounds + * po/POTFILES.in: added chronos + * src/gcompris/gameutil.c: (gcompris_load_pixmap): changed to display a dialog box instead of a direct exit when an image is missing. + * src/gcompris/log.c: (gcompris_log_end): fixed to compile with old gcc + 2004-02-11 Bruno coudoin * boards/sounds/es/geography/alaska.ogg: *.ogg created by M. en T.E. Alejandro Diaz Infante 2004 / GPL diff --git a/boards/Makefile.am b/boards/Makefile.am index c11807a..c7ccd91 100644 --- a/boards/Makefile.am +++ b/boards/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = read_colors advanced_colors babymatch babyshapes flags imageid imagename missing_letter paintings scales doubleentry geography sounds +SUBDIRS = read_colors advanced_colors babymatch babyshapes flags imageid imagename missing_letter paintings scales doubleentry geography sounds chronos xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@ @@ -18,6 +18,7 @@ xml_in_files = \ chess_computer.xml.in \ chess_movelearn.xml.in \ chess_partyend.xml.in \ + chronos.xml.in \ clickgame.xml.in \ clockgame.xml.in \ computer.xml.in \ diff --git a/boards/chronos.xml.in b/boards/chronos.xml.in new file mode 100644 index 0000000..3b062c4 --- /dev/null +++ b/boards/chronos.xml.in @@ -0,0 +1,21 @@ + + + + <_title>Chronos + <_description>Drag and Drop the items to organize the story + <_manual>Pick the pictures on the left and put them on the red points + <_goal>Order the pictures to tell the story + <_prerequisite>Tell a short story + <_credit>Moon photo comes from NASA\n + Space sounds from Tuxpaint and Vegastrike + + + diff --git a/boards/chronos/Makefile.am b/boards/chronos/Makefile.am new file mode 100644 index 0000000..2eda93c --- /dev/null +++ b/boards/chronos/Makefile.am @@ -0,0 +1,12 @@ + +xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/chronos + +xml_in_files = \ + board1_0.xml.in + +xml_DATA = $(xml_in_files:.xml.in=.xml) + +@INTLTOOL_XML_RULE@ + + + diff --git a/boards/chronos/bg.jpg b/boards/chronos/bg.jpg new file mode 100644 index 0000000..0a1f7eb --- /dev/null +++ b/boards/chronos/bg.jpg Binary files differ diff --git a/boards/chronos/board1_0.xml.in b/boards/chronos/board1_0.xml.in new file mode 100644 index 0000000..84e63ad --- /dev/null +++ b/boards/chronos/board1_0.xml.in @@ -0,0 +1,18 @@ + + + + + <_name>Moonwalker</_name> + + + <name>1</name> + + <name>2</name> + + <name>3</name> + + <name>4</name> + + + diff --git a/boards/chronos/space/1.jpg b/boards/chronos/space/1.jpg new file mode 100644 index 0000000..2b8c9e5 --- /dev/null +++ b/boards/chronos/space/1.jpg Binary files differ diff --git a/boards/chronos/space/2.jpg b/boards/chronos/space/2.jpg new file mode 100644 index 0000000..3c0edf4 --- /dev/null +++ b/boards/chronos/space/2.jpg Binary files differ diff --git a/boards/chronos/space/3.jpg b/boards/chronos/space/3.jpg new file mode 100644 index 0000000..5dfb93e --- /dev/null +++ b/boards/chronos/space/3.jpg Binary files differ diff --git a/boards/chronos/space/4.jpg b/boards/chronos/space/4.jpg new file mode 100644 index 0000000..4fe5af6 --- /dev/null +++ b/boards/chronos/space/4.jpg Binary files differ diff --git a/boards/chronos/space/bg.jpg b/boards/chronos/space/bg.jpg new file mode 100644 index 0000000..d02eefb --- /dev/null +++ b/boards/chronos/space/bg.jpg Binary files differ diff --git a/boards/skins/linha_verde/about.png b/boards/skins/linha_verde/about.png new file mode 100644 index 0000000..0959d72 --- /dev/null +++ b/boards/skins/linha_verde/about.png Binary files differ diff --git a/boards/skins/linha_verde/bad.png b/boards/skins/linha_verde/bad.png new file mode 100644 index 0000000..e4ff5d9 --- /dev/null +++ b/boards/skins/linha_verde/bad.png Binary files differ diff --git a/boards/skins/linha_verde/bar_bg.jpg b/boards/skins/linha_verde/bar_bg.jpg new file mode 100644 index 0000000..3aee777 --- /dev/null +++ b/boards/skins/linha_verde/bar_bg.jpg Binary files differ diff --git a/boards/skins/linha_verde/button.png b/boards/skins/linha_verde/button.png new file mode 100644 index 0000000..ede4f0e --- /dev/null +++ b/boards/skins/linha_verde/button.png Binary files differ diff --git a/boards/skins/linha_verde/button_backward.png b/boards/skins/linha_verde/button_backward.png new file mode 100644 index 0000000..63e2051 --- /dev/null +++ b/boards/skins/linha_verde/button_backward.png Binary files differ diff --git a/boards/skins/linha_verde/button_checked.png b/boards/skins/linha_verde/button_checked.png new file mode 100644 index 0000000..88e8e30 --- /dev/null +++ b/boards/skins/linha_verde/button_checked.png Binary files differ diff --git a/boards/skins/linha_verde/button_exit.png b/boards/skins/linha_verde/button_exit.png new file mode 100644 index 0000000..2c776c1 --- /dev/null +++ b/boards/skins/linha_verde/button_exit.png Binary files differ diff --git a/boards/skins/linha_verde/button_forward.png b/boards/skins/linha_verde/button_forward.png new file mode 100644 index 0000000..b3e1a5e --- /dev/null +++ b/boards/skins/linha_verde/button_forward.png Binary files differ diff --git a/boards/skins/linha_verde/button_large.png b/boards/skins/linha_verde/button_large.png new file mode 100644 index 0000000..8748f93 --- /dev/null +++ b/boards/skins/linha_verde/button_large.png Binary files differ diff --git a/boards/skins/linha_verde/button_large2.png b/boards/skins/linha_verde/button_large2.png new file mode 100644 index 0000000..f17b7ff --- /dev/null +++ b/boards/skins/linha_verde/button_large2.png Binary files differ diff --git a/boards/skins/linha_verde/button_large_selected.png b/boards/skins/linha_verde/button_large_selected.png new file mode 100644 index 0000000..a7a156f --- /dev/null +++ b/boards/skins/linha_verde/button_large_selected.png Binary files differ diff --git a/boards/skins/linha_verde/button_redo.png b/boards/skins/linha_verde/button_redo.png new file mode 100644 index 0000000..23cabb7 --- /dev/null +++ b/boards/skins/linha_verde/button_redo.png Binary files differ diff --git a/boards/skins/linha_verde/button_reload.png b/boards/skins/linha_verde/button_reload.png new file mode 100644 index 0000000..21a9cf0 --- /dev/null +++ b/boards/skins/linha_verde/button_reload.png Binary files differ diff --git a/boards/skins/linha_verde/button_selected.png b/boards/skins/linha_verde/button_selected.png new file mode 100644 index 0000000..e8e0aca --- /dev/null +++ b/boards/skins/linha_verde/button_selected.png Binary files differ diff --git a/boards/skins/linha_verde/button_small.png b/boards/skins/linha_verde/button_small.png new file mode 100644 index 0000000..586bf58 --- /dev/null +++ b/boards/skins/linha_verde/button_small.png Binary files differ diff --git a/boards/skins/linha_verde/button_style2.png b/boards/skins/linha_verde/button_style2.png new file mode 100644 index 0000000..c497861 --- /dev/null +++ b/boards/skins/linha_verde/button_style2.png Binary files differ diff --git a/boards/skins/linha_verde/button_unchecked.png b/boards/skins/linha_verde/button_unchecked.png new file mode 100644 index 0000000..e650163 --- /dev/null +++ b/boards/skins/linha_verde/button_unchecked.png Binary files differ diff --git a/boards/skins/linha_verde/button_up.png b/boards/skins/linha_verde/button_up.png new file mode 100644 index 0000000..7a517df --- /dev/null +++ b/boards/skins/linha_verde/button_up.png Binary files differ diff --git a/boards/skins/linha_verde/button_up_selected.png b/boards/skins/linha_verde/button_up_selected.png new file mode 100644 index 0000000..dee08fb --- /dev/null +++ b/boards/skins/linha_verde/button_up_selected.png Binary files differ diff --git a/boards/skins/linha_verde/config.png b/boards/skins/linha_verde/config.png new file mode 100644 index 0000000..1b6289e --- /dev/null +++ b/boards/skins/linha_verde/config.png Binary files differ diff --git a/boards/skins/linha_verde/dialogbox.png b/boards/skins/linha_verde/dialogbox.png new file mode 100644 index 0000000..e61e680 --- /dev/null +++ b/boards/skins/linha_verde/dialogbox.png Binary files differ diff --git a/boards/skins/linha_verde/gcompris-bg.jpg b/boards/skins/linha_verde/gcompris-bg.jpg new file mode 100644 index 0000000..c0d06a7 --- /dev/null +++ b/boards/skins/linha_verde/gcompris-bg.jpg Binary files differ diff --git a/boards/skins/linha_verde/gcompris-init.jpg b/boards/skins/linha_verde/gcompris-init.jpg new file mode 100644 index 0000000..3580765 --- /dev/null +++ b/boards/skins/linha_verde/gcompris-init.jpg Binary files differ diff --git a/boards/skins/linha_verde/gcompris-shapebg.jpg b/boards/skins/linha_verde/gcompris-shapebg.jpg new file mode 100644 index 0000000..5f9acee --- /dev/null +++ b/boards/skins/linha_verde/gcompris-shapebg.jpg Binary files differ diff --git a/boards/skins/linha_verde/help.png b/boards/skins/linha_verde/help.png new file mode 100644 index 0000000..c8eec7e --- /dev/null +++ b/boards/skins/linha_verde/help.png Binary files differ diff --git a/boards/skins/linha_verde/help_bg.png b/boards/skins/linha_verde/help_bg.png new file mode 100644 index 0000000..34a17da --- /dev/null +++ b/boards/skins/linha_verde/help_bg.png Binary files differ diff --git a/boards/skins/linha_verde/home.png b/boards/skins/linha_verde/home.png new file mode 100644 index 0000000..b8facce --- /dev/null +++ b/boards/skins/linha_verde/home.png Binary files differ diff --git a/boards/skins/linha_verde/images_selector_bg.png b/boards/skins/linha_verde/images_selector_bg.png new file mode 100644 index 0000000..e54e7f3 --- /dev/null +++ b/boards/skins/linha_verde/images_selector_bg.png Binary files differ diff --git a/boards/skins/linha_verde/level1.png b/boards/skins/linha_verde/level1.png new file mode 100644 index 0000000..3a4edb1 --- /dev/null +++ b/boards/skins/linha_verde/level1.png Binary files differ diff --git a/boards/skins/linha_verde/level2.png b/boards/skins/linha_verde/level2.png new file mode 100644 index 0000000..5e044f7 --- /dev/null +++ b/boards/skins/linha_verde/level2.png Binary files differ diff --git a/boards/skins/linha_verde/level3.png b/boards/skins/linha_verde/level3.png new file mode 100644 index 0000000..be4cd08 --- /dev/null +++ b/boards/skins/linha_verde/level3.png Binary files differ diff --git a/boards/skins/linha_verde/level4.png b/boards/skins/linha_verde/level4.png new file mode 100644 index 0000000..12b1a90 --- /dev/null +++ b/boards/skins/linha_verde/level4.png Binary files differ diff --git a/boards/skins/linha_verde/level5.png b/boards/skins/linha_verde/level5.png new file mode 100644 index 0000000..150dd02 --- /dev/null +++ b/boards/skins/linha_verde/level5.png Binary files differ diff --git a/boards/skins/linha_verde/level6.png b/boards/skins/linha_verde/level6.png new file mode 100644 index 0000000..e88e07e --- /dev/null +++ b/boards/skins/linha_verde/level6.png Binary files differ diff --git a/boards/skins/linha_verde/level7.png b/boards/skins/linha_verde/level7.png new file mode 100644 index 0000000..5f691ae --- /dev/null +++ b/boards/skins/linha_verde/level7.png Binary files differ diff --git a/boards/skins/linha_verde/level8.png b/boards/skins/linha_verde/level8.png new file mode 100644 index 0000000..7c26c1a --- /dev/null +++ b/boards/skins/linha_verde/level8.png Binary files differ diff --git a/boards/skins/linha_verde/level9.png b/boards/skins/linha_verde/level9.png new file mode 100644 index 0000000..89712da --- /dev/null +++ b/boards/skins/linha_verde/level9.png Binary files differ diff --git a/boards/skins/linha_verde/ok.png b/boards/skins/linha_verde/ok.png new file mode 100644 index 0000000..7ac6fd6 --- /dev/null +++ b/boards/skins/linha_verde/ok.png Binary files differ diff --git a/boards/skins/linha_verde/repeat.png b/boards/skins/linha_verde/repeat.png new file mode 100644 index 0000000..3099338 --- /dev/null +++ b/boards/skins/linha_verde/repeat.png Binary files differ diff --git a/boards/skins/linha_verde/skin.xml b/boards/skins/linha_verde/skin.xml new file mode 100644 index 0000000..8aaed43 --- /dev/null +++ b/boards/skins/linha_verde/skin.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/boards/skins/linha_verde/voice.png b/boards/skins/linha_verde/voice.png new file mode 100644 index 0000000..72a372d --- /dev/null +++ b/boards/skins/linha_verde/voice.png Binary files differ diff --git a/boards/skins/linha_verde/voice_bad.png b/boards/skins/linha_verde/voice_bad.png new file mode 100644 index 0000000..680e4cd --- /dev/null +++ b/boards/skins/linha_verde/voice_bad.png Binary files differ diff --git a/boards/sounds/chronos/space/1.ogg b/boards/sounds/chronos/space/1.ogg new file mode 100644 index 0000000..826095f --- /dev/null +++ b/boards/sounds/chronos/space/1.ogg Binary files differ diff --git a/boards/sounds/chronos/space/2.ogg b/boards/sounds/chronos/space/2.ogg new file mode 100644 index 0000000..bc8722a --- /dev/null +++ b/boards/sounds/chronos/space/2.ogg Binary files differ diff --git a/boards/sounds/chronos/space/3.ogg b/boards/sounds/chronos/space/3.ogg new file mode 100644 index 0000000..e558d1c --- /dev/null +++ b/boards/sounds/chronos/space/3.ogg Binary files differ diff --git a/configure.in b/configure.in index b5693d6..40258d5 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(src/gcompris/gcompris.c) -AM_INIT_AUTOMAKE(gcompris, 5.1) +AM_INIT_AUTOMAKE(gcompris, 5.2) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE @@ -336,6 +336,7 @@ boards/Makefile boards/advanced_colors/Makefile boards/babymatch/Makefile boards/babyshapes/Makefile +boards/chronos/Makefile boards/doubleentry/Makefile boards/flags/Makefile boards/geography/Makefile diff --git a/gcompris.spec.in b/gcompris.spec.in index 5c769ce..acb108b 100644 --- a/gcompris.spec.in +++ b/gcompris.spec.in @@ -291,6 +291,7 @@ rm -rf $RPM_BUILD_ROOT %dir %{prefix}/share/gcompris/boards/sounds %{prefix}/share/gcompris/boards/sounds/*.ogg %{prefix}/share/gcompris/boards/sounds/melody/*.ogg +%{prefix}/share/gcompris/boards/sounds/chronos/space/*.ogg %{prefix}/share/gcompris/boards/sounds/HOWTO_ENCODE %{prefix}/share/applications/* %{prefix}/share/gnome/help/* diff --git a/po/POTFILES.in b/po/POTFILES.in index d53005f..eafcfc4 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -38,6 +38,7 @@ boards/chess.xml.in boards/chess_computer.xml.in boards/chess_movelearn.xml.in boards/chess_partyend.xml.in +boards/chronos.xml.in boards/click_on_letter.xml.in boards/clickgame.xml.in boards/clockgame.xml.in diff --git a/src/gcompris/gameutil.c b/src/gcompris/gameutil.c index ea4a1f9..85c68de 100644 --- a/src/gcompris/gameutil.c +++ b/src/gcompris/gameutil.c @@ -1,6 +1,6 @@ /* gcompris - gameutil.c * - * Time-stamp: <2004/02/07 02:42:55 bcoudoin> + * Time-stamp: <2004/02/16 00:38:50 bcoudoin> * * Copyright (C) 2000 Bruno Coudoin * @@ -121,7 +121,15 @@ GdkPixbuf *gcompris_load_pixmap(char *pixmapfile) filename = g_strdup_printf("%s/%s", PACKAGE_DATA_DIR, pixmapfile); if (!g_file_test ((filename), G_FILE_TEST_EXISTS)) { - g_error (_("Couldn't find file %s !"), filename); + g_warning (_("Couldn't find file %s !"), filename); + + char *str = g_strdup_printf("%s\n%s\n%s\n%s", + _("Couldn't find file"), + pixmapfile, + _("This activity is incomplete."), + _("Exit it and report\nus the problem")); + gcompris_dialog (str, NULL); + g_free(str); } pixmap = gdk_pixbuf_new_from_file (filename, NULL); diff --git a/src/gcompris/log.c b/src/gcompris/log.c index 1f3f7f3..10e0337 100644 --- a/src/gcompris/log.c +++ b/src/gcompris/log.c @@ -149,11 +149,12 @@ void gcompris_log_end (GcomprisBoard *gcomprisBoard, gchar *status) { time_t end_time = time(NULL); double duration = difftime(end_time,start_time); + struct tm *tp; + if(gcomprisBoard_set != gcomprisBoard) return; /* and convert it to UTC or local time representation */ - struct tm *tp; if (USE_UTC) tp = gmtime(&start_time); else -- cgit v0.9.1