Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Coudoin <bcoudoin@src.gnome.org>2006-03-22 00:17:45 (GMT)
committer Bruno Coudoin <bcoudoin@src.gnome.org>2006-03-22 00:17:45 (GMT)
commit23b12cd6654691adcd1ccd3523b9d575f990eae0 (patch)
tree34f1a9a7ae023c10e12e56a69d3f52d85f859dc2
parenta06799bb8b84ba82bd7cd1bea60ea97c5adfef71 (diff)
By Anne and Erwan. Released under GPL.
* boards/gcompris/animals/donkey.jpg: By Anne and Erwan. Released under GPL. * boards/gcompris/animals/readme.txt: * boards/images/README: * boards/images/scenery2_background.png: remade Bruno drawing by Herve CHANAL. Released under GPL. * boards/skins/babytoy/gcompris-menu2bg.png: remade by Bruno based on Franck Doucet artwork * boards/skins/gartoon/gcompris-menu2bg.png: - * src/boards/erase.c: added the donkey. * src/boards/menu2.c: fixed coordinate to suit the new backgrounds * src/boards/python/admin/board_list.py: remove '/' from translation
-rw-r--r--ChangeLog14
-rw-r--r--boards/gcompris/animals/donkey.jpgbin0 -> 101579 bytes
-rw-r--r--boards/gcompris/animals/readme.txt3
-rw-r--r--boards/images/README1
-rw-r--r--boards/images/scenery2_background.pngbin12422 -> 66416 bytes
-rw-r--r--boards/skins/babytoy/gcompris-menu2bg.pngbin0 -> 79606 bytes
-rw-r--r--boards/skins/gartoon/gcompris-menu2bg.pngbin105351 -> 15885 bytes
-rw-r--r--src/boards/erase.c1
-rw-r--r--src/boards/menu2.c10
-rw-r--r--src/boards/python/admin/board_list.py2
10 files changed, 23 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index a7ab2c1..4b591e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-03-22 Bruno coudoin <bruno.coudoin@free.fr>
+
+ * boards/gcompris/animals/donkey.jpg: By Anne and Erwan. Released under GPL.
+ * boards/gcompris/animals/readme.txt:
+ * boards/images/README:
+ * boards/images/scenery2_background.png: remade Bruno drawing by Herve CHANAL. Released under GPL.
+ * boards/skins/babytoy/gcompris-menu2bg.png: remade by Bruno based on Franck Doucet artwork
+ * boards/skins/gartoon/gcompris-menu2bg.png: -
+ * src/boards/erase.c: added the donkey.
+ * src/boards/menu2.c: fixed coordinate to suit the new backgrounds
+ * src/boards/python/admin/board_list.py: remove '/' from translation
+
2006-03-22 Yves Combe <yves@ycombe.net>
fix [ 1451703 ] Learning Clock without refresh in time window
@@ -41,7 +53,7 @@
xc2006-03-14 Bruno coudoin <bruno.coudoin@free.fr>
- reviewed by: <delete if not using a buddy>
+ Added an animal image by Erwan Velu. Released under GPL.
* boards/gcompris/animals/black-headed-gull.jpg:
* src/boards/erase.c:
diff --git a/boards/gcompris/animals/donkey.jpg b/boards/gcompris/animals/donkey.jpg
new file mode 100644
index 0000000..f39f4ff
--- /dev/null
+++ b/boards/gcompris/animals/donkey.jpg
Binary files differ
diff --git a/boards/gcompris/animals/readme.txt b/boards/gcompris/animals/readme.txt
index 9597077..c2fb84d 100644
--- a/boards/gcompris/animals/readme.txt
+++ b/boards/gcompris/animals/readme.txt
@@ -13,7 +13,8 @@ Images following are released under GPL by LE BERRE Daniel <le.berred@free.fr>
Following images are from Erwan Velu and Anne Nicolas. Taken in Ireland,
released under the GPL:
-horses.jpg squirrel.jpg sheep_irish.jpg sheep_irish2.jpg cow.jpg
+horses.jpg squirrel.jpg sheep_irish.jpg sheep_irish2.jpg cow.jpg donkey.jpg
+black-headed-gull.jpg
Following images are from Julien Noel <julien.noel free fr>,
released under the GPL:
diff --git a/boards/images/README b/boards/images/README
index 514149a..3ea6c03 100644
--- a/boards/images/README
+++ b/boards/images/README
@@ -1,2 +1,3 @@
Images here were made by Bruno Coudoin and Franck Doucet.
Released under GPL.
+scenery2_background.png made by Herve CHANAL in 2006, Release under GPL.
diff --git a/boards/images/scenery2_background.png b/boards/images/scenery2_background.png
index caf3fc6..edbbbda 100644
--- a/boards/images/scenery2_background.png
+++ b/boards/images/scenery2_background.png
Binary files differ
diff --git a/boards/skins/babytoy/gcompris-menu2bg.png b/boards/skins/babytoy/gcompris-menu2bg.png
new file mode 100644
index 0000000..8df6dd9
--- /dev/null
+++ b/boards/skins/babytoy/gcompris-menu2bg.png
Binary files differ
diff --git a/boards/skins/gartoon/gcompris-menu2bg.png b/boards/skins/gartoon/gcompris-menu2bg.png
index 2dd3a14..527f0c3 100644
--- a/boards/skins/gartoon/gcompris-menu2bg.png
+++ b/boards/skins/gartoon/gcompris-menu2bg.png
Binary files differ
diff --git a/src/boards/erase.c b/src/boards/erase.c
index 9156f18..51d8b45 100644
--- a/src/boards/erase.c
+++ b/src/boards/erase.c
@@ -67,6 +67,7 @@ static gchar *imageList[] =
{
"gcompris/animals/bear001.jpg",
"gcompris/animals/black-headed-gull.jpg",
+ "gcompris/animals/donkey.jpg",
"gcompris/animals/elephanteauxgc.jpg",
"gcompris/animals/flamentrosegc.jpg",
"gcompris/animals/girafegc.jpg",
diff --git a/src/boards/menu2.c b/src/boards/menu2.c
index 9e3223b..30ded05 100644
--- a/src/boards/menu2.c
+++ b/src/boards/menu2.c
@@ -1,6 +1,6 @@
/* gcompris - menu2.c
*
- * Time-stamp: <2006/03/01 23:18:32 bruno>
+ * Time-stamp: <2006/03/21 23:52:35 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
@@ -94,21 +94,21 @@ GList *homeBoards = NULL;
#define P_H 480
#define T_X 175
-#define T_Y 5
+#define T_Y 10
#define T_W 550
#define T_H 55
#define T_INT_X 5
#define T_ARROW_SIZE 20
#define D_X 175
-#define D_Y 64
+#define D_Y 70
#define D_W 550
#define D_H 320
#define D_INT_X 50
#define D_INT_Y 5
-#define I_X 120
-#define I_Y 380
+#define I_X 140
+#define I_Y 400
#define I_W 600
#define I_H 125
diff --git a/src/boards/python/admin/board_list.py b/src/boards/python/admin/board_list.py
index d639da0..f41b6a3 100644
--- a/src/boards/python/admin/board_list.py
+++ b/src/boards/python/admin/board_list.py
@@ -233,7 +233,7 @@ class Board_list:
row_dict[''] = \
model.append(None,
[self.pixbuf_at_height('gcompris/misc/tuxplane.png', height),
- _('Main menu') + '\n' + _('/'),
+ _('Main menu') + '\n' + '/',
not board_cell[1].board_id in self.out_dict[self.active_profile.profile_id],
'%s/%s' % (board_cell[1].section,board_cell[1].name), self.pixbuf_configurable(board_cell[1])])