Commit 2ca4e647 authored by Bruno Coudoin's avatar Bruno Coudoin

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
parent d52fcb2c
2004-02-17 Bruno coudoin <bruno.coudoin@free.fr>
* 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 <bruno.coudoin@free.fr>
* boards/sounds/es/geography/alaska.ogg: *.ogg created by M. en T.E. Alejandro Diaz Infante 2004 / GPL
......
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 \
......
<?xml version="1.0" encoding="UTF-8"?>
<GCompris>
<Board
name="chronos"
type="shapegame"
section="/fun/."
icon="boardicons/chronos.png"
mandatory_sound_file="chronos/space/1.ogg"
difficulty="1"
author="José Jorge (jjorge@free.fr)"
boarddir="chronos">
<_title>Chronos</_title>
<_description>Drag and Drop the items to organize the story</_description>
<_manual>Pick the pictures on the left and put them on the red points</_manual>
<_goal>Order the pictures to tell the story</_goal>
<_prerequisite>Tell a short story</_prerequisite>
<_credit>Moon photo comes from NASA\n
Space sounds from Tuxpaint and Vegastrike</_credit>
</Board>
</GCompris>
xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/chronos
xml_in_files = \
board1_0.xml.in
xml_DATA = $(xml_in_files:.xml.in=.xml)
@INTLTOOL_XML_RULE@
<?xml version="1.0" encoding="UTF-8"?>
<ShapeGame>
<Title x="600" y="495" justification="GTK_JUSTIFY_CENTER">
<_name>Moonwalker</_name>
</Title>
<Shape name="A" pixmapfile="chronos/space/1.jpg" x="230" y="150" zoomx="1" zoomy="1" position="0" sound="chronos/space/1"/>
<Title x="250" y="150" justification="GTK_JUSTIFY_CENTER"><name>1</name></Title>
<Shape name="B" pixmapfile="chronos/space/2.jpg" x="595" y="150" zoomx="1" zoomy="1" position="0" sound="chronos/space/2"/>
<Title x="615" y="150" justification="GTK_JUSTIFY_CENTER"><name>2</name></Title>
<Shape name="C" pixmapfile="chronos/space/3.jpg" x="230" y="375" zoomx="1" zoomy="1" position="0" sound="chronos/space/3"/>
<Title x="250" y="375" justification="GTK_JUSTIFY_CENTER"><name>3</name></Title>
<Shape name="D" pixmapfile="chronos/space/4.jpg" x="595" y="375" zoomx="1" zoomy="1" position="0" sound="chronos/space/2"/>
<Title x="615" y="375" justification="GTK_JUSTIFY_CENTER"><name>4</name></Title>
<Shape name="1" pixmapfile="chronos/space/bg.jpg" type="SHAPE_BACKGROUND"
x="425" y="260" zoomx="1" zoomy="1" position="0"/>
</ShapeGame>
<?xml version="1.0" encoding="UTF-8"?>
<GCompris>
<Skin>
<!-- Defines the gcompris colors -->
<color id="gcompris/title" rgba="0x606E0000"/>
<color id="gcompris/text button" rgba="0x505E0000"/>
<color id="gcompris/content" rgba="0x404E0000"/>
<color id="gcompris/subtitle" rgba="0x707E0000"/>
<!-- Defines the main gcompris fonts -->
<font id="gcompris/title" name="Sans 20"/>
<font id="gcompris/subtitle" name="Sans 16"/>
<font id="gcompris/content" name="Sans 12"/>
<!-- Defines the gcompris boards fonts -->
<font id="gcompris/board/tiny" name="Sans 10"/>
<font id="gcompris/board/small" name="Sans 12"/>
<font id="gcompris/board/medium" name="Sans 14"/>
<font id="gcompris/board/big" name="Sans 16"/>
<font id="gcompris/board/big bold" name="Sans bold 16"/>
<font id="gcompris/board/fixed" name="Fixed 12"/>
<font id="gcompris/board/title" name="Sans 20"/>
<font id="gcompris/board/title bold" name="Sans bold 20"/>
<font id="gcompris/board/huge" name="Sans 28"/>
<font id="gcompris/board/huge bold" name="Sans bold 28"/>
<!-- Here you may define some other properties that will -->
<!-- affect a particular game. -->
<!-- For example, in futur, the colors of the canal lock game will be -->
<!-- customisable with some lines like: -->
<!-- <color id="canal_lock/canal color" rgba="0x0010FFFF"/>-->
<!-- <color id="canal_lock/lock color" rgba="0x8cc679FF"/>-->
<!-- <color id="canal_lock/lock color h" rgba="0x71A65FFF"/>-->
<!-- <color id="canal_lock/canal lock color" rgba="0xd1cd0cFF"/>-->
<!-- <color id="canal_lock/canal lock color h" rgba="0xf1ed1cFF"/>-->
<!-- <color id="canal_lock/ground color" rgba="0x9b5f5aFF"/>-->
<color id="pythontest/circle in" rgba="0x8080FFFF"/>
<color id="pythontest/circle out" rgba="0xFFFFFFFF"/>
<color id="pythontest/line" rgba="0xFFFF40FF"/>
<color id="erase/rectangle in" rgba="0x507cc9CC"/>
<color id="erase/rectangle out" rgba="0X1ECECEFF"/>
<color id="erase/rectangle in2" rgba="0x8bb0f999"/>
<color id="erase/rectangle out2" rgba="0X0E0E0EFF"/>
<color id="erase/rectangle in3" rgba="0xc1d4f466"/>
<color id="erase/rectangle out3" rgba="0XFFFFFFFF"/>
</Skin>
</GCompris>
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
......
......@@ -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/*
......
......@@ -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
......
/* 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);
......
......@@ -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
......
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