Commit bd5add87 authored by Bruno Coudoin's avatar Bruno Coudoin

updated icons, added drop shadow. Improved backgrounds images

parent c02b4759
......@@ -31,6 +31,8 @@ xml_in_files = \
maze3D.xml.in \
memory.xml.in \
menu.xml.in \
money.xml.in \
money_cents.xml.in \
paintings.xml.in \
paratrooper.xml.in \
planegame.xml.in \
......
......@@ -16,4 +16,6 @@
<Data filename="doubleentry.xml"/>
<Data filename="target.xml"/>
<Data filename="reversecount.xml"/>
<Data filename="money.xml"/>
<Data filename="money_cents.xml"/>
</GCompris>
boards/boardicons/algebra_group.png

10.5 KB | W: | H:

boards/boardicons/algebra_group.png

13.3 KB | W: | H:

boards/boardicons/algebra_group.png
boards/boardicons/algebra_group.png
boards/boardicons/algebra_group.png
boards/boardicons/algebra_group.png
  • 2-up
  • Swipe
  • Onion skin
boards/boardicons/algebramenu.png

10.9 KB | W: | H:

boards/boardicons/algebramenu.png

13.6 KB | W: | H:

boards/boardicons/algebramenu.png
boards/boardicons/algebramenu.png
boards/boardicons/algebramenu.png
boards/boardicons/algebramenu.png
  • 2-up
  • Swipe
  • Onion skin
boards/boardicons/babymatch.png

4.11 KB | W: | H:

boards/boardicons/babymatch.png

5.93 KB | W: | H:

boards/boardicons/babymatch.png
boards/boardicons/babymatch.png
boards/boardicons/babymatch.png
boards/boardicons/babymatch.png
  • 2-up
  • Swipe
  • Onion skin
boards/boardicons/boards.png

3.21 KB | W: | H:

boards/boardicons/boards.png

4.02 KB | W: | H:

boards/boardicons/boards.png
boards/boardicons/boards.png
boards/boardicons/boards.png
boards/boardicons/boards.png
  • 2-up
  • Swipe
  • Onion skin
boards/boardicons/book.png

7.97 KB | W: | H:

boards/boardicons/book.png

7.38 KB | W: | H:

boards/boardicons/book.png
boards/boardicons/book.png
boards/boardicons/book.png
boards/boardicons/book.png
  • 2-up
  • Swipe
  • Onion skin
boards/boardicons/canal_lock.png

5.71 KB | W: | H:

boards/boardicons/canal_lock.png

8.19 KB | W: | H:

boards/boardicons/canal_lock.png
boards/boardicons/canal_lock.png
boards/boardicons/canal_lock.png
boards/boardicons/canal_lock.png
  • 2-up
  • Swipe
  • Onion skin
boards/boardicons/clickgame.png

11.5 KB | W: | H:

boards/boardicons/clickgame.png

13.3 KB | W: | H:

boards/boardicons/clickgame.png
boards/boardicons/clickgame.png
boards/boardicons/clickgame.png
boards/boardicons/clickgame.png
  • 2-up
  • Swipe
  • Onion skin
boards/boardicons/computer.png

7.62 KB | W: | H:

boards/boardicons/computer.png

7.52 KB | W: | H:

boards/boardicons/computer.png
boards/boardicons/computer.png
boards/boardicons/computer.png
boards/boardicons/computer.png
  • 2-up
  • Swipe
  • Onion skin
boards/boardicons/doubleentry.png

2.31 KB | W: | H:

boards/boardicons/doubleentry.png

4.45 KB | W: | H:

boards/boardicons/doubleentry.png
boards/boardicons/doubleentry.png
boards/boardicons/doubleentry.png
boards/boardicons/doubleentry.png
  • 2-up
  • Swipe
  • Onion skin
boards/boardicons/draw.png

5.1 KB | W: | H:

boards/boardicons/draw.png

5.53 KB | W: | H:

boards/boardicons/draw.png
boards/boardicons/draw.png
boards/boardicons/draw.png
boards/boardicons/draw.png
  • 2-up
  • Swipe
  • Onion skin
boards/boardicons/enumerate.png

13.5 KB | W: | H:

boards/boardicons/enumerate.png

15.2 KB | W: | H:

boards/boardicons/enumerate.png
boards/boardicons/enumerate.png
boards/boardicons/enumerate.png
boards/boardicons/enumerate.png
  • 2-up
  • Swipe
  • Onion skin
boards/boardicons/erase.png

5.12 KB | W: | H:

boards/boardicons/erase.png

7.57 KB | W: | H:

boards/boardicons/erase.png
boards/boardicons/erase.png
boards/boardicons/erase.png
boards/boardicons/erase.png
  • 2-up
  • Swipe
  • Onion skin
boards/boardicons/fun.png

11 KB | W: | H:

boards/boardicons/fun.png

11.1 KB | W: | H:

boards/boardicons/fun.png
boards/boardicons/fun.png
boards/boardicons/fun.png
boards/boardicons/fun.png
  • 2-up
  • Swipe
  • Onion skin
boards/boardicons/helicogame.png

8.1 KB | W: | H:

boards/boardicons/helicogame.png

11.6 KB | W: | H:

boards/boardicons/helicogame.png
boards/boardicons/helicogame.png
boards/boardicons/helicogame.png
boards/boardicons/helicogame.png
  • 2-up
  • Swipe
  • Onion skin
boards/boardicons/maze.png

402 Bytes | W: | H:

boards/boardicons/maze.png

1.45 KB | W: | H:

boards/boardicons/maze.png
boards/boardicons/maze.png
boards/boardicons/maze.png
boards/boardicons/maze.png
  • 2-up
  • Swipe
  • Onion skin
boards/boardicons/reading.png

5.47 KB | W: | H:

boards/boardicons/reading.png

7.42 KB | W: | H:

boards/boardicons/reading.png
boards/boardicons/reading.png
boards/boardicons/reading.png
boards/boardicons/reading.png
  • 2-up
  • Swipe
  • Onion skin
boards/boardicons/readingh.png

5.43 KB | W: | H:

boards/boardicons/readingh.png

7.29 KB | W: | H:

boards/boardicons/readingh.png
boards/boardicons/readingh.png
boards/boardicons/readingh.png
boards/boardicons/readingh.png
  • 2-up
  • Swipe
  • Onion skin
boards/boardicons/reversecount.png

9.39 KB | W: | H:

boards/boardicons/reversecount.png

11.6 KB | W: | H:

boards/boardicons/reversecount.png
boards/boardicons/reversecount.png
boards/boardicons/reversecount.png
boards/boardicons/reversecount.png
  • 2-up
  • Swipe
  • Onion skin
boards/boardicons/scalesicon.png

5.65 KB | W: | H:

boards/boardicons/scalesicon.png

8.13 KB | W: | H:

boards/boardicons/scalesicon.png
boards/boardicons/scalesicon.png
boards/boardicons/scalesicon.png
boards/boardicons/scalesicon.png
  • 2-up
  • Swipe
  • Onion skin
boards/boardicons/target.png

2.75 KB | W: | H:

boards/boardicons/target.png

4.53 KB | W: | H:

boards/boardicons/target.png
boards/boardicons/target.png
boards/boardicons/target.png
boards/boardicons/target.png
  • 2-up
  • Swipe
  • Onion skin
boards/boardicons/wordsgame.png

9.55 KB | W: | H:

boards/boardicons/wordsgame.png

11.4 KB | W: | H:

boards/boardicons/wordsgame.png
boards/boardicons/wordsgame.png
boards/boardicons/wordsgame.png
boards/boardicons/wordsgame.png
  • 2-up
  • Swipe
  • Onion skin
boards/gcompris/gcompris-init.jpg

15 KB | W: | H:

boards/gcompris/gcompris-init.jpg

22.8 KB | W: | H:

boards/gcompris/gcompris-init.jpg
boards/gcompris/gcompris-init.jpg
boards/gcompris/gcompris-init.jpg
boards/gcompris/gcompris-init.jpg
  • 2-up
  • Swipe
  • Onion skin
......@@ -22,12 +22,12 @@ AC_SUBST(GCOMPRIS_LIBS)
dnl For embedded ogg player
dnl FIXME XIPH prefix are the one needed on Mandrake ?
dnl XIPH_PATH_OGG
dnl XIPH_PATH_AO
dnl XIPH_PATH_VORBIS
AM_PATH_OGG
AM_PATH_AO
AM_PATH_VORBIS
XIPH_PATH_OGG
XIPH_PATH_AO
XIPH_PATH_VORBIS
dnl AM_PATH_OGG
dnl AM_PATH_AO
dnl AM_PATH_VORBIS
AC_PROG_CC
AM_PROG_CC_STDC
......
......@@ -102,7 +102,7 @@ Barre de contr
@cindex Barre de contrôle
La barre de contrôle est toujours présente dans gcompris. Chaque icone est contextuelle, ce qui signifie quelle n'apparait que si elle est utilisable dans le contexte courrant.
The control bar contains the icons from left to right:
La barre de contrôle contient de gauche à droite :
@enumerate
@item
Aide:
......
......@@ -71,6 +71,8 @@ boards/memory.xml.in
boards/menu.xml.in
boards/missing_letter.xml.in
boards/missing_letter/board1.xml.in
boards/money.xml.in
boards/money_cents.xml.in
boards/paintings.xml.in
boards/paintings/board1_0.xml.in
boards/paintings/board2_0.xml.in
......@@ -133,6 +135,7 @@ src/boards/maze.c
src/boards/memory.c
src/boards/menu.c
src/boards/missingletter.c
src/boards/money.c
src/boards/paratrooper.c
src/boards/planegame.c
src/boards/railroad.c
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.9.7\n"
"POT-Creation-Date: 2002-12-14 23:54+0100\n"
"PO-Revision-Date: 2002-12-14 23:57+0100\n"
"PO-Revision-Date: 2002-12-23 13:18+0100\n"
"Last-Translator: Bruno Coudoin <bruno.coudoin@anfora.fr>\n"
"Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
"MIME-Version: 1.0\n"
......@@ -389,8 +389,8 @@ msgid ""
"With displayed numbers and operations, find the right combination to get the "
"right result"
msgstr ""
"Avec les nombres et les oprations affiches, trouve la bonne combinaison "
"pour arriver au rsultat"
"Avec les nombres et les oprations affiches,\n"
"trouve la bonne combinaison pour arriver au rsultat"
#: boards/algebra_minus.xml.in.h:1
msgid ""
......
......@@ -18,6 +18,7 @@ lib_LTLIBRARIES = \
libmemory.la \
libmenu.la \
libmissingletter.la \
libmoney.la \
libparatrooper.la \
libplanegame.la \
librailroad.la \
......@@ -262,5 +263,12 @@ libenumerate_la_LIBADD = @PTHREAD_LIB@
libenumerate_la_SOURCES = enumerate.c
libmoney_la_LDFLAGS = -module -avoid-version
libmoney_la_LIBADD = @PTHREAD_LIB@
$(GCOMPRIS_LIBS) \
$(GNOME_XML_LIB) $(INTLLIBS)
libmoney_la_SOURCES = money.c money_widget.c money_widget.h
EXTRA_DIST = README
......@@ -284,10 +284,6 @@ static void game_won()
static gint
item_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data)
{
double item_x, item_y;
item_x = event->button.x;
item_y = event->button.y;
gnome_canvas_item_w2i(item->parent, &item_x, &item_y);
if(board_paused)
return FALSE;
......
/* gcompris - menu.c
*
* Time-stamp: <2002/12/09 23:13:46 bruno>
* Time-stamp: <2002/12/24 17:57:55 lucette>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -236,7 +236,7 @@ static gboolean next_spot()
{
/* Initialisation case */
current_x = gcomprisBoard->width/MENU_PER_LINE;
current_y = gcomprisBoard->height/MENU_PER_LINE;
current_y = gcomprisBoard->height/MENU_PER_LINE - 40;
return(TRUE);
}
......@@ -382,7 +382,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, MenuItem *menuitem)
* just add again white here and it works again !!!! */
gnome_canvas_item_set (boardname_item,
"text", menuitem->board->title,
"fill_color", "white",
"fill_color", "blue",
NULL);
gnome_canvas_item_set (description_item,
"text", menuitem->board->description,
......@@ -436,7 +436,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, MenuItem *menuitem)
static void create_info_area(GnomeCanvasGroup *parent)
{
gint x = (double)gcomprisBoard->width/2;
gint y = 350;
gint y = 380;
boardname_item = \
gnome_canvas_item_new (parent,
......@@ -446,7 +446,7 @@ static void create_info_area(GnomeCanvasGroup *parent)
"x", (double) x,
"y", (double) y,
"anchor", GTK_ANCHOR_CENTER,
"fill_color", "white",
"fill_color", "blue",
NULL);
description_item = \
......@@ -455,9 +455,9 @@ static void create_info_area(GnomeCanvasGroup *parent)
"text", " ",
"font", FONT_BOARD_MEDIUM,
"x", (double) x,
"y", (double) y + 35,
"y", (double) y + 30,
"anchor", GTK_ANCHOR_NORTH,
"fill_color", "white",
"fill_color", "blue",
"justification", GTK_JUSTIFY_CENTER,
NULL);
......@@ -467,9 +467,9 @@ static void create_info_area(GnomeCanvasGroup *parent)
"text", " ",
"font", FONT_BOARD_TINY,
"x", (double) x,
"y", (double) y + 80,
"y", (double) y + 95,
"anchor", GTK_ANCHOR_NORTH,
"fill_color", "white",
"fill_color", "blue",
"justification", GTK_JUSTIFY_CENTER,
NULL);
......
......@@ -20,7 +20,6 @@
#define CURSOR_H
#include <gtk/gtk.h>
#include <gdk_imlib.h>
#include <stdio.h>
......
/* gcompris - gameutil.c
*
* Time-stamp: <2002/12/15 23:05:15 bruno>
* Time-stamp: <2002/12/23 13:42:33 lucette>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -251,9 +251,10 @@ gint gcompris_item_event_focus(GnomeCanvasItem *item, GdkEvent *event,
gchar *reactivate_newline(gchar *str)
{
gchar *newstr;
printf("reactivate_newline %s\n", str);
if(str==NULL)
return(NULL);
return NULL;
newstr = g_strcompress(str);
g_free(str);
......@@ -310,7 +311,8 @@ gcompris_add_xml_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child, Gcomp
|| !strcmp(lang, gcompris_get_locale())
|| !strncmp(lang, gcompris_get_locale(), 2)))
{
gcomprisBoard->title = xmlNodeListGetString(doc, xmlnode->xmlChildrenNode, 1);
gcomprisBoard->title = reactivate_newline(xmlNodeListGetString(doc,
xmlnode->xmlChildrenNode, 1));
}
/* get the description of the board */
......@@ -319,7 +321,8 @@ gcompris_add_xml_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child, Gcomp
!strcmp(lang, gcompris_get_locale())
|| !strncmp(lang, gcompris_get_locale(), 2)))
{
gcomprisBoard->description = xmlNodeListGetString(doc, xmlnode->xmlChildrenNode, 1);
gcomprisBoard->description = reactivate_newline(xmlNodeListGetString(doc,
xmlnode->xmlChildrenNode, 1));
}
/* get the help prerequisite help of the board */
......@@ -470,38 +473,6 @@ GcomprisBoard *gcompris_read_xml_file(char *fname)
return gcomprisBoard;
}
/* ==================================== */
/* translates UTF8 charset to iso Latin1 */
gchar * convertUTF8Toisolat1(gchar * text) {
gchar *retval;
gint i;
// this should never happen, it does often !!
if (text == NULL)
return NULL;
// retval = e_utf8_to_locale_string (text);
if(retval != NULL) {
g_free(text);
text = retval;
// if we find \n on 2 char, recreate a real \n
i=0;
while(text[i]!='\0')
{
if(text[i]=='\\' && text[i+1]=='n')
{
text[i]=' ';
text[i+1]='\n';
}
++i;
}
}
return text;
}
/* ======================================= */
void item_absolute_move(GnomeCanvasItem *item, int x, int y) {
double dx1, dy1, dx2, dy2;
......
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