gcompris r3567 - in branches/GCOMPRIS_8_3: . boards boards/babyshapes boards/babyshapes/Bosschaert_04 boards/babyshapes/Paul_Gauguin_006 boards/babyshapes/Pieter_Bruegel boards/babyshapes/Van_Gogh_0011 boards/babyshapes/lady_unicorn

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Sat Oct 11 22:04:43 2008
New Revision: 3567
URL: http://svn.gnome.org/viewvc/gcompris?rev=3567&view=rev

Log:
RELEASE 8.3.8
Synced with trunk 8.3.7


Added:
   branches/GCOMPRIS_8_3/boards/babyshapes/Bosschaert_04/
   branches/GCOMPRIS_8_3/boards/babyshapes/Bosschaert_04/1.png   (contents, props changed)
   branches/GCOMPRIS_8_3/boards/babyshapes/Bosschaert_04/2.png   (contents, props changed)
   branches/GCOMPRIS_8_3/boards/babyshapes/Bosschaert_04/3.png   (contents, props changed)
   branches/GCOMPRIS_8_3/boards/babyshapes/Bosschaert_04/4.png   (contents, props changed)
   branches/GCOMPRIS_8_3/boards/babyshapes/Bosschaert_04/5.png   (contents, props changed)
   branches/GCOMPRIS_8_3/boards/babyshapes/Bosschaert_04/6.png   (contents, props changed)
   branches/GCOMPRIS_8_3/boards/babyshapes/Bosschaert_04/background.png   (contents, props changed)
   branches/GCOMPRIS_8_3/boards/babyshapes/Paul_Gauguin_006/
   branches/GCOMPRIS_8_3/boards/babyshapes/Paul_Gauguin_006/background.png   (contents, props changed)
   branches/GCOMPRIS_8_3/boards/babyshapes/Paul_Gauguin_006/chien.png   (contents, props changed)
   branches/GCOMPRIS_8_3/boards/babyshapes/Paul_Gauguin_006/jeunes_filles.png   (contents, props changed)
   branches/GCOMPRIS_8_3/boards/babyshapes/Paul_Gauguin_006/statue.png   (contents, props changed)
   branches/GCOMPRIS_8_3/boards/babyshapes/Pieter_Bruegel/
   branches/GCOMPRIS_8_3/boards/babyshapes/Pieter_Bruegel/background.png   (contents, props changed)
   branches/GCOMPRIS_8_3/boards/babyshapes/Pieter_Bruegel/fillette.png   (contents, props changed)
   branches/GCOMPRIS_8_3/boards/babyshapes/Pieter_Bruegel/mur.png   (contents, props changed)
   branches/GCOMPRIS_8_3/boards/babyshapes/Pieter_Bruegel/musicien.png   (contents, props changed)
   branches/GCOMPRIS_8_3/boards/babyshapes/Pieter_Bruegel/service.png   (contents, props changed)
   branches/GCOMPRIS_8_3/boards/babyshapes/Van_Gogh_0011/
   branches/GCOMPRIS_8_3/boards/babyshapes/Van_Gogh_0011/1.png   (contents, props changed)
   branches/GCOMPRIS_8_3/boards/babyshapes/Van_Gogh_0011/2.png   (contents, props changed)
   branches/GCOMPRIS_8_3/boards/babyshapes/Van_Gogh_0011/3.png   (contents, props changed)
   branches/GCOMPRIS_8_3/boards/babyshapes/Van_Gogh_0011/4.png   (contents, props changed)
   branches/GCOMPRIS_8_3/boards/babyshapes/Van_Gogh_0011/5.png   (contents, props changed)
   branches/GCOMPRIS_8_3/boards/babyshapes/Van_Gogh_0011/background.png   (contents, props changed)
   branches/GCOMPRIS_8_3/boards/babyshapes/board8_0.xml.in
   branches/GCOMPRIS_8_3/boards/babyshapes/board8_1.xml.in
   branches/GCOMPRIS_8_3/boards/babyshapes/board8_2.xml.in
   branches/GCOMPRIS_8_3/boards/babyshapes/board8_3.xml.in
   branches/GCOMPRIS_8_3/boards/babyshapes/board8_4.xml.in
   branches/GCOMPRIS_8_3/boards/babyshapes/lady_unicorn/
   branches/GCOMPRIS_8_3/boards/babyshapes/lady_unicorn/1.png   (contents, props changed)
   branches/GCOMPRIS_8_3/boards/babyshapes/lady_unicorn/2.png   (contents, props changed)
   branches/GCOMPRIS_8_3/boards/babyshapes/lady_unicorn/3.png   (contents, props changed)
   branches/GCOMPRIS_8_3/boards/babyshapes/lady_unicorn/4.png   (contents, props changed)
   branches/GCOMPRIS_8_3/boards/babyshapes/lady_unicorn/5.png   (contents, props changed)
   branches/GCOMPRIS_8_3/boards/babyshapes/lady_unicorn/background.png   (contents, props changed)
Modified:
   branches/GCOMPRIS_8_3/ChangeLog
   branches/GCOMPRIS_8_3/Makefile.am
   branches/GCOMPRIS_8_3/boards/babyshapes.xml.in
   branches/GCOMPRIS_8_3/boards/babyshapes/Makefile.am

Modified: branches/GCOMPRIS_8_3/Makefile.am
==============================================================================
--- branches/GCOMPRIS_8_3/Makefile.am	(original)
+++ branches/GCOMPRIS_8_3/Makefile.am	Sat Oct 11 22:04:43 2008
@@ -56,7 +56,7 @@
 	gnome2-macros/gnome-deprecated-macros.m4 \
 	README.mingw README.translators README.windows \
 	config.h.mingw.in Makefile.mingw.in global_win32.mak gcompris.ico gc_admin.ico gcompris-uninstal.ico \
-	gcompris-installer.nsi.in
+	gcompris-installer.nsi.in gcompris-installer.nsi
 
 
 distcore = $(PACKAGE)-core-$(VERSION)

Modified: branches/GCOMPRIS_8_3/boards/babyshapes.xml.in
==============================================================================
--- branches/GCOMPRIS_8_3/boards/babyshapes.xml.in	(original)
+++ branches/GCOMPRIS_8_3/boards/babyshapes.xml.in	Sat Oct 11 22:04:43 2008
@@ -11,7 +11,12 @@
 	 <_title>Complete the puzzle</_title>
 	 <_description>Drag and Drop the shapes on their respective targets</_description>
 	 <_prerequisite>Good mouse-control</_prerequisite>
-	<_credit>The dog is provided by Andre Connes and released under the GPL</_credit>
+	<_credit xml:space="preserve">The dog is provided by Andre Connes and released under the GPL.
+Artist: Gauguin, Paul. Title Arearea. Licence: Public Domain. Source: http://commons.wikimedia.org/wiki/Image:Paul_Gauguin_006.jpg
+Artist: Bruegel d. Ã. Title: Bauernhochzeit. Licence: Public Domain. Source: http://commons.wikimedia.org/wiki/Image:Pieter_Bruegel_d._Ã._011.jpg
+Description: The Lady and the Unicorn (tapestries). Author: Pierre-Emmanuel Malissin et frÃdÃric Valdes. Licence: Free but requires the site and author. Source: http://www.galerie.roi-president.com
+Artist: Vincent van Gogh. Title: Bedroom in Arles. Licence: Public Domain. Source: http://commons.wikimedia.org/wiki/Image:Vincent_Van_Gogh_0011.jpg
+Artist: Ambrosius Bosschaert. Title: The Elder. Licence: Public Domain. Source: http://commons.wikimedia.org/wiki/Image:Ambrosius_Bosschaert,_the_Elder_04.jpg</_credit>
 	<_manual>Complete the puzzle by dragging each piece from the set of pieces on the left, to the matching space in the puzzle.</_manual>
   </Board>
 </GCompris>

Added: branches/GCOMPRIS_8_3/boards/babyshapes/Bosschaert_04/1.png
==============================================================================
Binary file. No diff available.

Added: branches/GCOMPRIS_8_3/boards/babyshapes/Bosschaert_04/2.png
==============================================================================
Binary file. No diff available.

Added: branches/GCOMPRIS_8_3/boards/babyshapes/Bosschaert_04/3.png
==============================================================================
Binary file. No diff available.

Added: branches/GCOMPRIS_8_3/boards/babyshapes/Bosschaert_04/4.png
==============================================================================
Binary file. No diff available.

Added: branches/GCOMPRIS_8_3/boards/babyshapes/Bosschaert_04/5.png
==============================================================================
Binary file. No diff available.

Added: branches/GCOMPRIS_8_3/boards/babyshapes/Bosschaert_04/6.png
==============================================================================
Binary file. No diff available.

Added: branches/GCOMPRIS_8_3/boards/babyshapes/Bosschaert_04/background.png
==============================================================================
Binary file. No diff available.

Modified: branches/GCOMPRIS_8_3/boards/babyshapes/Makefile.am
==============================================================================
--- branches/GCOMPRIS_8_3/boards/babyshapes/Makefile.am	(original)
+++ branches/GCOMPRIS_8_3/boards/babyshapes/Makefile.am	Sat Oct 11 22:04:43 2008
@@ -8,7 +8,12 @@
 	board4_0.xml.in \
 	board5_0.xml.in \
 	board6_0.xml.in \
-	board7_0.xml.in
+	board7_0.xml.in \
+	board8_0.xml.in \
+	board8_1.xml.in \
+	board8_2.xml.in \
+	board8_3.xml.in \
+	board8_4.xml.in
 
 xml_DATA = $(xml_in_files:.xml.in=.xml)
 

Added: branches/GCOMPRIS_8_3/boards/babyshapes/Paul_Gauguin_006/background.png
==============================================================================
Binary file. No diff available.

Added: branches/GCOMPRIS_8_3/boards/babyshapes/Paul_Gauguin_006/chien.png
==============================================================================
Binary file. No diff available.

Added: branches/GCOMPRIS_8_3/boards/babyshapes/Paul_Gauguin_006/jeunes_filles.png
==============================================================================
Binary file. No diff available.

Added: branches/GCOMPRIS_8_3/boards/babyshapes/Paul_Gauguin_006/statue.png
==============================================================================
Binary file. No diff available.

Added: branches/GCOMPRIS_8_3/boards/babyshapes/Pieter_Bruegel/background.png
==============================================================================
Binary file. No diff available.

Added: branches/GCOMPRIS_8_3/boards/babyshapes/Pieter_Bruegel/fillette.png
==============================================================================
Binary file. No diff available.

Added: branches/GCOMPRIS_8_3/boards/babyshapes/Pieter_Bruegel/mur.png
==============================================================================
Binary file. No diff available.

Added: branches/GCOMPRIS_8_3/boards/babyshapes/Pieter_Bruegel/musicien.png
==============================================================================
Binary file. No diff available.

Added: branches/GCOMPRIS_8_3/boards/babyshapes/Pieter_Bruegel/service.png
==============================================================================
Binary file. No diff available.

Added: branches/GCOMPRIS_8_3/boards/babyshapes/Van_Gogh_0011/1.png
==============================================================================
Binary file. No diff available.

Added: branches/GCOMPRIS_8_3/boards/babyshapes/Van_Gogh_0011/2.png
==============================================================================
Binary file. No diff available.

Added: branches/GCOMPRIS_8_3/boards/babyshapes/Van_Gogh_0011/3.png
==============================================================================
Binary file. No diff available.

Added: branches/GCOMPRIS_8_3/boards/babyshapes/Van_Gogh_0011/4.png
==============================================================================
Binary file. No diff available.

Added: branches/GCOMPRIS_8_3/boards/babyshapes/Van_Gogh_0011/5.png
==============================================================================
Binary file. No diff available.

Added: branches/GCOMPRIS_8_3/boards/babyshapes/Van_Gogh_0011/background.png
==============================================================================
Binary file. No diff available.

Added: branches/GCOMPRIS_8_3/boards/babyshapes/board8_0.xml.in
==============================================================================
--- (empty file)
+++ branches/GCOMPRIS_8_3/boards/babyshapes/board8_0.xml.in	Sat Oct 11 22:04:43 2008
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ShapeGame><!-- Created with GComprisShapegame gimp script -->
+<title justification="GTK_JUSTIFY_CENTER" x="600" y="495">
+<_name>Gauguin, Arearea - 1892</_name></title>
+<shape name="Chien" pixmapfile="babyshapes/Paul_Gauguin_006/chien.png" position="0" x="259.5" y="413.5">
+</shape>
+<shape name="Jeunes_filles" pixmapfile="babyshapes/Paul_Gauguin_006/jeunes_filles.png" position="0"  x="504.0" y="240.0">
+</shape>
+<shape name="Statue" pixmapfile="babyshapes/Paul_Gauguin_006/statue.png" position="0"  x="204.0" y="76.5">
+</shape>
+<shape name="background" pixmapfile="babyshapes/Paul_Gauguin_006/background.png" position="0" type="SHAPE_BACKGROUND" x="399.5" y="260.0">
+<tooltip>background</tooltip></shape>
+</ShapeGame>

Added: branches/GCOMPRIS_8_3/boards/babyshapes/board8_1.xml.in
==============================================================================
--- (empty file)
+++ branches/GCOMPRIS_8_3/boards/babyshapes/board8_1.xml.in	Sat Oct 11 22:04:43 2008
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ShapeGame><!-- Created with GComprisShapegame gimp script -->
+<!-- Source http://commons.wikimedia.org/wiki/Image:Pieter_Bruegel_d._%C3%84._011.jpg -->
+<title justification="GTK_JUSTIFY_CENTER" x="600" y="495">
+<_name>Pieter Bruegel, Bauernhochzeit - 1568</_name></title>
+<shape name="service" pixmapfile="babyshapes/Pieter_Bruegel/service.png" position="0" x="533.0" y="324.0">
+</shape>
+<shape name="Mur" pixmapfile="babyshapes/Pieter_Bruegel/mur.png" position="0" x="664.5" y="81.5">
+</shape>
+<shape name="musicien" pixmapfile="babyshapes/Pieter_Bruegel/musicien.png" position="0" x="223.0" y="236.5">
+</shape>
+<shape name="Fillette" pixmapfile="babyshapes/Pieter_Bruegel/fillette.png" position="0" x="293.5" y="445.0">
+</shape>
+<shape name="background" pixmapfile="babyshapes/Pieter_Bruegel/background.png" position="0" type="SHAPE_BACKGROUND" x="399.5" y="260.0">
+<tooltip>background</tooltip></shape>
+</ShapeGame>

Added: branches/GCOMPRIS_8_3/boards/babyshapes/board8_2.xml.in
==============================================================================
--- (empty file)
+++ branches/GCOMPRIS_8_3/boards/babyshapes/board8_2.xml.in	Sat Oct 11 22:04:43 2008
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ShapeGame><!-- Created with GComprisShapegame gimp script -->
+<!-- Source http://commons.wikimedia.org/wiki/Image:Tapisserie_moyen-age_dame_licorne.JPG -->
+<title justification="GTK_JUSTIFY_CENTER" x="600" y="495">
+<_name>The Lady and the Unicorn - XVe century</_name></title>
+<shape name="5" pixmapfile="babyshapes/lady_unicorn/5.png" position="0" x="130.0" y="409.5">
+</shape>
+<shape name="4" pixmapfile="babyshapes/lady_unicorn/4.png" position="0"  x="247.0" y="338.0">
+</shape>
+<shape name="2" pixmapfile="babyshapes/lady_unicorn/2.png" position="0"  x="376.0" y="285.0">
+</shape>
+<shape name="3" pixmapfile="babyshapes/lady_unicorn/3.png" position="0"  x="540.5" y="440.0">
+</shape>
+<shape name="1" pixmapfile="babyshapes/lady_unicorn/1.png" position="0"  x="637.5" y="43.5">
+</shape>
+<shape name="background" pixmapfile="babyshapes/lady_unicorn/background.png" position="0" type="SHAPE_BACKGROUND" x="400.0" y="260.0">
+<tooltip>background</tooltip></shape>
+</ShapeGame>

Added: branches/GCOMPRIS_8_3/boards/babyshapes/board8_3.xml.in
==============================================================================
--- (empty file)
+++ branches/GCOMPRIS_8_3/boards/babyshapes/board8_3.xml.in	Sat Oct 11 22:04:43 2008
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ShapeGame><!-- Created with GComprisShapegame gimp script -->
+<!-- Source http://commons.wikimedia.org/wiki/Image:Vincent_Van_Gogh_0011.jpg -->
+<title justification="GTK_JUSTIFY_CENTER" x="600" y="495">
+<_name>Vincent van Gogh, Bedroom in Arles - 1888</_name></title>
+<shape name="5" pixmapfile="babyshapes/Van_Gogh_0011/5.png" position="0"  x="525.0" y="280.0">
+</shape>
+<shape name="4" pixmapfile="babyshapes/Van_Gogh_0011/4.png" position="0"  x="511.0" y="44.0">
+</shape>
+<shape name="3" pixmapfile="babyshapes/Van_Gogh_0011/3.png" position="0"  x="394.5" y="80.0">
+</shape>
+<shape name="1" pixmapfile="babyshapes/Van_Gogh_0011/1.png" position="0"  x="238.5" y="227.0">
+</shape>
+<shape name="2" pixmapfile="babyshapes/Van_Gogh_0011/2.png" position="0"  x="133.0" y="315.0">
+</shape>
+<shape name="background" pixmapfile="babyshapes/Van_Gogh_0011/background.png" position="0"  type="SHAPE_BACKGROUND" x="399.5" y="260.0">
+<tooltip>background</tooltip></shape>
+</ShapeGame>

Added: branches/GCOMPRIS_8_3/boards/babyshapes/board8_4.xml.in
==============================================================================
--- (empty file)
+++ branches/GCOMPRIS_8_3/boards/babyshapes/board8_4.xml.in	Sat Oct 11 22:04:43 2008
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ShapeGame><!-- Created with GComprisShapegame gimp script -->
+<!-- Source http://commons.wikimedia.org/wiki/Image:Ambrosius_Bosschaert,_the_Elder_04.jpg -->
+<title justification="GTK_JUSTIFY_CENTER" x="600" y="495">
+<_name>Ambrosius Bosschaert, The Elder - 1614</_name></title>
+<shape name="6" pixmapfile="babyshapes/Bosschaert_04/6.png" position="0"  x="356.5" y="376.0">
+</shape>
+<shape name="5" pixmapfile="babyshapes/Bosschaert_04/5.png" position="0"  x="434.0" y="160.0">
+</shape>
+<shape name="4" pixmapfile="babyshapes/Bosschaert_04/4.png" position="0"  x="388.5" y="253.0">
+</shape>
+<shape name="3" pixmapfile="babyshapes/Bosschaert_04/3.png" position="0"  x="219.0" y="126.5">
+</shape>
+<shape name="2" pixmapfile="babyshapes/Bosschaert_04/2.png" position="0"  x="187.0" y="301.0">
+</shape>
+<shape name="1" pixmapfile="babyshapes/Bosschaert_04/1.png" position="0"  x="498.0" y="384.5">
+</shape>
+<shape name="background" pixmapfile="babyshapes/Bosschaert_04/background.png" position="0" type="SHAPE_BACKGROUND" x="400.0" y="260.0">
+<tooltip>background</tooltip></shape>
+</ShapeGame>

Added: branches/GCOMPRIS_8_3/boards/babyshapes/lady_unicorn/1.png
==============================================================================
Binary file. No diff available.

Added: branches/GCOMPRIS_8_3/boards/babyshapes/lady_unicorn/2.png
==============================================================================
Binary file. No diff available.

Added: branches/GCOMPRIS_8_3/boards/babyshapes/lady_unicorn/3.png
==============================================================================
Binary file. No diff available.

Added: branches/GCOMPRIS_8_3/boards/babyshapes/lady_unicorn/4.png
==============================================================================
Binary file. No diff available.

Added: branches/GCOMPRIS_8_3/boards/babyshapes/lady_unicorn/5.png
==============================================================================
Binary file. No diff available.

Added: branches/GCOMPRIS_8_3/boards/babyshapes/lady_unicorn/background.png
==============================================================================
Binary file. No diff available.