GNOME.org
 

gcompris r3404 - in branches/gcomprixogoo: . src/babymatch-activity src/gcompris src/geo_country-activity/resources/geo_country src/geo_country-activity/resources/geo_country/argentina src/geo_country-activity/resources/geo_country/france src/geo_country-activity/resources/geo_country/germany src/geo_country-activity/resources/geo_country/norway src/geo_country-activity/resources/geo_country/poland src/geo_country-activity/resources/geo_country/turkey src/paintings-activity/resources/paintings

Author: bcoudoin
Date: Sun May  4 17:12:50 2008
New Revision: 3404
URL: http://svn.gnome.org/viewvc/gcompris?rev=3404&view=rev

Log:
	2 New paintings from Marc Levivier (malev free fr):
	Arcimboldo Spring
	Arcimboldo Librarian


Added:
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/Arcimboldo_Librarian_a1.png   (contents, props changed)
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/Arcimboldo_Librarian_a2.png   (contents, props changed)
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/Arcimboldo_Librarian_a3.png   (contents, props changed)
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/Arcimboldo_Librarian_b1.png   (contents, props changed)
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/Arcimboldo_Librarian_b2.png   (contents, props changed)
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/Arcimboldo_Librarian_b3.png   (contents, props changed)
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/Arcimboldo_Librarian_c1.png   (contents, props changed)
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/Arcimboldo_Librarian_c2.png   (contents, props changed)
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/Arcimboldo_Librarian_c3.png   (contents, props changed)
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/Arcimboldo_Spring_a1.png   (contents, props changed)
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/Arcimboldo_Spring_a2.png   (contents, props changed)
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/Arcimboldo_Spring_a3.png   (contents, props changed)
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/Arcimboldo_Spring_b1.png   (contents, props changed)
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/Arcimboldo_Spring_b2.png   (contents, props changed)
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/Arcimboldo_Spring_b3.png   (contents, props changed)
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/board1_1.xml.in
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/board1_2.xml.in
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/board1_3.xml.in
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/kandinky_1.png   (contents, props changed)
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/kandinky_2.png   (contents, props changed)
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/kandinky_3.png   (contents, props changed)
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/kandinky_4.png   (contents, props changed)
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/kandinky_5.png   (contents, props changed)
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/kandinky_6.png   (contents, props changed)
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/kandinky_7.png   (contents, props changed)
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/kandinky_8.png   (contents, props changed)
Removed:
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/puzzle1.png
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/puzzle2.png
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/puzzle3.png
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/puzzle4.png
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/puzzle5.png
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/puzzle6.png
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/puzzle7.png
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/puzzle8.png
Modified:
   branches/gcomprixogoo/ChangeLog
   branches/gcomprixogoo/configure.in
   branches/gcomprixogoo/src/babymatch-activity/shapegame.c
   branches/gcomprixogoo/src/gcompris/bar.c
   branches/gcomprixogoo/src/geo_country-activity/resources/geo_country/Makefile.am
   branches/gcomprixogoo/src/geo_country-activity/resources/geo_country/argentina/Makefile.am
   branches/gcomprixogoo/src/geo_country-activity/resources/geo_country/france/Makefile.am
   branches/gcomprixogoo/src/geo_country-activity/resources/geo_country/germany/Makefile.am
   branches/gcomprixogoo/src/geo_country-activity/resources/geo_country/norway/Makefile.am
   branches/gcomprixogoo/src/geo_country-activity/resources/geo_country/poland/Makefile.am
   branches/gcomprixogoo/src/geo_country-activity/resources/geo_country/turkey/Makefile.am
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/Makefile.am
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/board2_0.xml.in
   branches/gcomprixogoo/src/paintings-activity/resources/paintings/board3_1.xml.in

Modified: branches/gcomprixogoo/configure.in
==============================================================================
--- branches/gcomprixogoo/configure.in	(original)
+++ branches/gcomprixogoo/configure.in	Sun May  4 17:12:50 2008
@@ -672,8 +672,11 @@
 src/geo_country-activity/resources/Makefile
 src/geo_country-activity/resources/geo_country/Makefile
 src/geo_country-activity/resources/geo_country/argentina/Makefile
+src/geo_country-activity/resources/geo_country/brazil/Makefile
+src/geo_country-activity/resources/geo_country/canada/Makefile
 src/geo_country-activity/resources/geo_country/france/Makefile
 src/geo_country-activity/resources/geo_country/germany/Makefile
+src/geo_country-activity/resources/geo_country/mexico/Makefile
 src/geo_country-activity/resources/geo_country/norway/Makefile
 src/geo_country-activity/resources/geo_country/poland/Makefile
 src/geo_country-activity/resources/geo_country/turkey/Makefile

Modified: branches/gcomprixogoo/src/babymatch-activity/shapegame.c
==============================================================================
--- branches/gcomprixogoo/src/babymatch-activity/shapegame.c	(original)
+++ branches/gcomprixogoo/src/babymatch-activity/shapegame.c	Sun May  4 17:12:50 2008
@@ -1152,7 +1152,7 @@
 
       if(shape->type == SHAPE_TARGET)
 	{
-	  if(shape->placed == NULL)
+	  if(shape->placed != shape)
 	    done=FALSE;
 	}
     }

Modified: branches/gcomprixogoo/src/gcompris/bar.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/bar.c	(original)
+++ branches/gcomprixogoo/src/gcompris/bar.c	Sun May  4 17:12:50 2008
@@ -274,7 +274,7 @@
 
     }
 
-  current_level=gcomprisBoard->level;
+  current_level = gcomprisBoard->level;
 }
 
 
@@ -613,7 +613,7 @@
       if(event->button == 1)
 	{
 	  current_level++;
-	  if(gcomprisBoard && current_level>gcomprisBoard->maxlevel)
+	  if(gcomprisBoard && current_level > gcomprisBoard->maxlevel)
 	    current_level=1;
 	}
       else
@@ -626,23 +626,32 @@
 
       if(tmp!=current_level)
 	{
-	  gchar *str_number;
+	  /* Set the level first because it can set a different current_level */
+	  if(gcomprisBoard && gcomprisBoard->plugin->set_level != NULL)
+	    {
+	      gcomprisBoard->plugin->set_level(current_level);
+	    }
 
-	  gchar *number_str = g_strdup_printf("%d", current_level);
-	  gchar *current_level_str = gc_sound_alphabet(number_str);
-	  g_free(number_str);
+	  {
+	    /* Play the audio level number */
+	    gchar *number_str = g_strdup_printf("%d", current_level);
+
+	    if ( current_level < 10 )
+	      {
+		/* Set the number as unicode */
+		gchar *current_level_str = gc_sound_alphabet(number_str);
+		g_free(number_str);
+		number_str = current_level_str;
+	      }
 
-	  str_number = g_strdup_printf("voices/$LOCALE/alphabet/%s", current_level_str);
+	    gchar *audio_str = g_strdup_printf("voices/$LOCALE/alphabet/%s", number_str);
 
-	  gc_sound_play_ogg("voices/$LOCALE/misc/level.ogg", str_number, NULL);
+	    gc_sound_play_ogg("voices/$LOCALE/misc/level.ogg", audio_str, NULL);
 
-	  g_free(str_number);
-	  g_free(current_level_str);
+	    g_free(number_str);
+	    g_free(audio_str);
 
-	  if(gcomprisBoard && gcomprisBoard->plugin->set_level != NULL)
-	    {
-	      gcomprisBoard->plugin->set_level(current_level);
-	    }
+	  }
 	}
     }
   else if(!strcmp((char *)data, "back"))

Modified: branches/gcomprixogoo/src/geo_country-activity/resources/geo_country/Makefile.am
==============================================================================
--- branches/gcomprixogoo/src/geo_country-activity/resources/geo_country/Makefile.am	(original)
+++ branches/gcomprixogoo/src/geo_country-activity/resources/geo_country/Makefile.am	Sun May  4 17:12:50 2008
@@ -1,7 +1,15 @@
-SUBDIRS = argentina france germany norway \
-	poland turkey
+SUBDIRS = \
+	argentina \
+	brazil \
+	canada \
+	france \
+	germany \
+	mexico \
+	norway \
+	poland \
+	turkey
 
-xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/geography_country
+xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/geo_country
 
 xml_in_files = \
 	board1_0.xml.in \

Modified: branches/gcomprixogoo/src/geo_country-activity/resources/geo_country/argentina/Makefile.am
==============================================================================
--- branches/gcomprixogoo/src/geo_country-activity/resources/geo_country/argentina/Makefile.am	(original)
+++ branches/gcomprixogoo/src/geo_country-activity/resources/geo_country/argentina/Makefile.am	Sun May  4 17:12:50 2008
@@ -1,4 +1,4 @@
-imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@//geography_country/argentina
+imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/geo_country/argentina
 img_DATA = \
 	argentina.png \
 	buenos_aires.png \

Modified: branches/gcomprixogoo/src/geo_country-activity/resources/geo_country/france/Makefile.am
==============================================================================
--- branches/gcomprixogoo/src/geo_country-activity/resources/geo_country/france/Makefile.am	(original)
+++ branches/gcomprixogoo/src/geo_country-activity/resources/geo_country/france/Makefile.am	Sun May  4 17:12:50 2008
@@ -1,4 +1,4 @@
-imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@//geography_country/france_region
+imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/geo_country/france
 img_DATA = \
 	alsace.png \
 	aquitaine.png \

Modified: branches/gcomprixogoo/src/geo_country-activity/resources/geo_country/germany/Makefile.am
==============================================================================
--- branches/gcomprixogoo/src/geo_country-activity/resources/geo_country/germany/Makefile.am	(original)
+++ branches/gcomprixogoo/src/geo_country-activity/resources/geo_country/germany/Makefile.am	Sun May  4 17:12:50 2008
@@ -1,4 +1,4 @@
-imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@//geography_country/germany_region
+imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/geo_country/germany
 img_DATA = \
 	back.png \
 	baden-wuerttemberg.png \

Modified: branches/gcomprixogoo/src/geo_country-activity/resources/geo_country/norway/Makefile.am
==============================================================================
--- branches/gcomprixogoo/src/geo_country-activity/resources/geo_country/norway/Makefile.am	(original)
+++ branches/gcomprixogoo/src/geo_country-activity/resources/geo_country/norway/Makefile.am	Sun May  4 17:12:50 2008
@@ -1,4 +1,4 @@
-imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@//geography_country/norway_counties
+imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@//geo_country/norway
 img_DATA = \
 	akershus.png \
 	aust-agder.png \

Modified: branches/gcomprixogoo/src/geo_country-activity/resources/geo_country/poland/Makefile.am
==============================================================================
--- branches/gcomprixogoo/src/geo_country-activity/resources/geo_country/poland/Makefile.am	(original)
+++ branches/gcomprixogoo/src/geo_country-activity/resources/geo_country/poland/Makefile.am	Sun May  4 17:12:50 2008
@@ -1,4 +1,4 @@
-imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@//geography_country/poland_voivodship
+imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/geo_country/poland
 img_DATA = \
 	dolnoslaskie.png \
 	kujawsko-pomorskie.png \

Modified: branches/gcomprixogoo/src/geo_country-activity/resources/geo_country/turkey/Makefile.am
==============================================================================
--- branches/gcomprixogoo/src/geo_country-activity/resources/geo_country/turkey/Makefile.am	(original)
+++ branches/gcomprixogoo/src/geo_country-activity/resources/geo_country/turkey/Makefile.am	Sun May  4 17:12:50 2008
@@ -1,4 +1,4 @@
-imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@//geography_country/turkey_district
+imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/geo_country/turkey
 img_DATA = \
 	adana.png \
 	adiyaman.png \

Added: branches/gcomprixogoo/src/paintings-activity/resources/paintings/Arcimboldo_Librarian_a1.png
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/src/paintings-activity/resources/paintings/Arcimboldo_Librarian_a2.png
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/src/paintings-activity/resources/paintings/Arcimboldo_Librarian_a3.png
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/src/paintings-activity/resources/paintings/Arcimboldo_Librarian_b1.png
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/src/paintings-activity/resources/paintings/Arcimboldo_Librarian_b2.png
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/src/paintings-activity/resources/paintings/Arcimboldo_Librarian_b3.png
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/src/paintings-activity/resources/paintings/Arcimboldo_Librarian_c1.png
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/src/paintings-activity/resources/paintings/Arcimboldo_Librarian_c2.png
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/src/paintings-activity/resources/paintings/Arcimboldo_Librarian_c3.png
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/src/paintings-activity/resources/paintings/Arcimboldo_Spring_a1.png
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/src/paintings-activity/resources/paintings/Arcimboldo_Spring_a2.png
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/src/paintings-activity/resources/paintings/Arcimboldo_Spring_a3.png
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/src/paintings-activity/resources/paintings/Arcimboldo_Spring_b1.png
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/src/paintings-activity/resources/paintings/Arcimboldo_Spring_b2.png
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/src/paintings-activity/resources/paintings/Arcimboldo_Spring_b3.png
==============================================================================
Binary file. No diff available.

Modified: branches/gcomprixogoo/src/paintings-activity/resources/paintings/Makefile.am
==============================================================================
--- branches/gcomprixogoo/src/paintings-activity/resources/paintings/Makefile.am	(original)
+++ branches/gcomprixogoo/src/paintings-activity/resources/paintings/Makefile.am	Sun May  4 17:12:50 2008
@@ -3,6 +3,9 @@
 
 xml_in_files = \
 	board1_0.xml.in \
+	board1_1.xml.in \
+	board1_2.xml.in \
+	board1_3.xml.in \
 	board2_0.xml.in \
 	board2_1.xml.in \
 	board2_2.xml.in \
@@ -25,52 +28,21 @@
 
 imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/paintings
 img_DATA = \
-	bazille_rampart_1.jpg \
-	bazille_rampart_2.jpg \
-	bazille_rampart_3.jpg \
-	bazille_rampart_4.jpg \
-	bazille_rampart_5.jpg \
-	bazille_rampart_6.jpg \
-	cassat_summertime_1.jpg \
-	cassat_summertime_2.jpg \
-	cassat_summertime_3.jpg \
-	cassat_summertime_4.jpg \
-	cassat_summertime_5.jpg \
-	cassat_summertime_6.jpg \
-	gogh_auvert_1.jpg \
-	gogh_auvert_2.jpg \
-	gogh_auvert_3.jpg \
-	gogh_auvert_4.jpg \
-	gogh_auvert_5.jpg \
-	gogh_auvert_6.jpg \
-	degas_class-dance_1.png \
-	degas_class-dance_2.png \
-	degas_class-dance_3.png \
-	degas_class-dance_4.png \
-	degas_class-dance_5.png \
-	degas_class-dance_6.png \
-	puzzle1.png \
-	puzzle2.png \
-	puzzle3.png \
-	puzzle4.png \
-	puzzle5.png \
-	puzzle6.png \
-	puzzle7.png \
-	puzzle8.png \
-	renoir-filles_piano-1.png \
-	renoir-filles_piano-2.png \
-	renoir-filles_piano-3.png \
-	renoir-filles_piano-4.png \
-	renoir-filles_piano-5.png \
-	renoir-filles_piano-6.png \
-	renoir-filles_piano-7.png \
-	renoir-filles_piano-8.png \
-	renoir-moulin_de_la_galette-1.png \
-	renoir-moulin_de_la_galette-2.png \
-	renoir-moulin_de_la_galette-3.png \
-	renoir-moulin_de_la_galette-4.png \
-	renoir-moulin_de_la_galette-5.png \
-	renoir-moulin_de_la_galette-6.png \
+	Arcimboldo_Librarian_a1.png \
+	Arcimboldo_Librarian_a2.png \
+	Arcimboldo_Librarian_a3.png \
+	Arcimboldo_Librarian_b1.png \
+	Arcimboldo_Librarian_b2.png \
+	Arcimboldo_Librarian_b3.png \
+	Arcimboldo_Librarian_c1.png \
+	Arcimboldo_Librarian_c2.png \
+	Arcimboldo_Librarian_c3.png \
+	Arcimboldo_Spring_a1.png \
+	Arcimboldo_Spring_a2.png \
+	Arcimboldo_Spring_a3.png \
+	Arcimboldo_Spring_b1.png \
+	Arcimboldo_Spring_b2.png \
+	Arcimboldo_Spring_b3.png \
 	Botticelli_Primaver_a1.png \
 	Botticelli_Primaver_a2.png \
 	Botticelli_Primaver_a3.png \
@@ -126,7 +98,53 @@
 	Michelangelo_Pieta_c1.png \
 	Michelangelo_Pieta_c2.png \
 	Michelangelo_Pieta_c3.png \
-	Michelangelo_Pieta_c4.png
+	Michelangelo_Pieta_c4.png \
+	bazille_rampart_1.jpg \
+	bazille_rampart_2.jpg \
+	bazille_rampart_3.jpg \
+	bazille_rampart_4.jpg \
+	bazille_rampart_5.jpg \
+	bazille_rampart_6.jpg \
+	cassat_summertime_1.jpg \
+	cassat_summertime_2.jpg \
+	cassat_summertime_3.jpg \
+	cassat_summertime_4.jpg \
+	cassat_summertime_5.jpg \
+	cassat_summertime_6.jpg \
+	degas_class-dance_1.png \
+	degas_class-dance_2.png \
+	degas_class-dance_3.png \
+	degas_class-dance_4.png \
+	degas_class-dance_5.png \
+	degas_class-dance_6.png \
+	gogh_auvert_1.jpg \
+	gogh_auvert_2.jpg \
+	gogh_auvert_3.jpg \
+	gogh_auvert_4.jpg \
+	gogh_auvert_5.jpg \
+	gogh_auvert_6.jpg \
+	kandinky_1.png \
+	kandinky_2.png \
+	kandinky_3.png \
+	kandinky_4.png \
+	kandinky_5.png \
+	kandinky_6.png \
+	kandinky_7.png \
+	kandinky_8.png \
+	renoir-filles_piano-1.png \
+	renoir-filles_piano-2.png \
+	renoir-filles_piano-3.png \
+	renoir-filles_piano-4.png \
+	renoir-filles_piano-5.png \
+	renoir-filles_piano-6.png \
+	renoir-filles_piano-7.png \
+	renoir-filles_piano-8.png \
+	renoir-moulin_de_la_galette-1.png \
+	renoir-moulin_de_la_galette-2.png \
+	renoir-moulin_de_la_galette-3.png \
+	renoir-moulin_de_la_galette-4.png \
+	renoir-moulin_de_la_galette-5.png \
+	renoir-moulin_de_la_galette-6.png
 
 EXTRA_DIST = $(img_DATA) ${xml_in_files}
 CLEANFILES = $(xml_DATA)

Added: branches/gcomprixogoo/src/paintings-activity/resources/paintings/board1_1.xml.in
==============================================================================
--- (empty file)
+++ branches/gcomprixogoo/src/paintings-activity/resources/paintings/board1_1.xml.in	Sun May  4 17:12:50 2008
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ShapeGame>
+  <Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
+	 x="405" y="495" zoomx="1" zoomy="1" position="0"/>
+  <Title x="405" y="495" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button">
+    <_name> Pierre-Auguste Renoir, Le Moulin de la Galette - 1876</_name>
+  </Title>
+  <Shape name="F" pixmapfile="paintings/renoir-moulin_de_la_galette-6.png" x="599" y="360" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="B" pixmapfile="paintings/renoir-moulin_de_la_galette-2.png" x="425" y="150" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="A" pixmapfile="paintings/renoir-moulin_de_la_galette-1.png" x="230" y="150" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="C" pixmapfile="paintings/renoir-moulin_de_la_galette-3.png" x="600" y="173" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="E" pixmapfile="paintings/renoir-moulin_de_la_galette-5.png" x="405" y="340" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="D" pixmapfile="paintings/renoir-moulin_de_la_galette-4.png" x="210" y="340" zoomx="1" zoomy="1" position="0"/>
+</ShapeGame>

Added: branches/gcomprixogoo/src/paintings-activity/resources/paintings/board1_2.xml.in
==============================================================================
--- (empty file)
+++ branches/gcomprixogoo/src/paintings-activity/resources/paintings/board1_2.xml.in	Sun May  4 17:12:50 2008
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ShapeGame><!-- Created with GComprisShapegame gimp script -->
+<title color_skin="gcompris/text button" justification="GTK_JUSTIFY_CENTER" x="405" y="495">
+<_name>Giuseppe Arcimboldo, Spring - 1573</_name></title>
+<Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" position="0" type="SHAPE_BACKGROUND" x="405" y="495"/>
+<shape name="A1" pixmapfile="paintings/Arcimboldo_Spring_a1.png" position="0" x="317.0" y="138.0"/>
+<shape name="B1" pixmapfile="paintings/Arcimboldo_Spring_b1.png" position="0" x="465.5" y="123.5"/>
+<shape name="A2" pixmapfile="paintings/Arcimboldo_Spring_a2.png" position="0" x="317.0" y="260.5"/>
+<shape name="B2" pixmapfile="paintings/Arcimboldo_Spring_b2.png" position="0" x="465.5" y="261.0"/>
+<shape name="A3" pixmapfile="paintings/Arcimboldo_Spring_a3.png" position="0" x="335.0" y="383.0"/>
+<shape name="B3" pixmapfile="paintings/Arcimboldo_Spring_b3.png" position="0" x="483.0" y="397.0"/>
+</ShapeGame>

Added: branches/gcomprixogoo/src/paintings-activity/resources/paintings/board1_3.xml.in
==============================================================================
--- (empty file)
+++ branches/gcomprixogoo/src/paintings-activity/resources/paintings/board1_3.xml.in	Sun May  4 17:12:50 2008
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ShapeGame><!-- Created with GComprisShapegame gimp script -->
+<title color_skin="gcompris/text button" justification="GTK_JUSTIFY_CENTER" x="405" y="495">
+<_name>Giuseppe Arcimboldo, The Librarian - 1566)</_name></title>
+<Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" position="0" type="SHAPE_BACKGROUND" x="405" y="495"/>
+<shape name="A1" pixmapfile="paintings/Arcimboldo_Librarian_a1.png" position="0" x="312.5" y="123.5"/>
+<shape name="B1" pixmapfile="paintings/Arcimboldo_Librarian_b1.png" position="0" x="400.5" y="138.0"/>
+<shape name="C1" pixmapfile="paintings/Arcimboldo_Librarian_c1.png" position="0" x="489.5" y="123.5"/>
+<shape name="A2" pixmapfile="paintings/Arcimboldo_Librarian_a2.png" position="0" x="301.5" y="261.0"/>
+<shape name="B2" pixmapfile="paintings/Arcimboldo_Librarian_b2.png" position="0" x="401.5" y="260.5"/>
+<shape name="C2" pixmapfile="paintings/Arcimboldo_Librarian_c2.png" position="0" x="499.0" y="246.5"/>
+<shape name="A3" pixmapfile="paintings/Arcimboldo_Librarian_a3.png" position="0" x="312.0" y="397.0"/>
+<shape name="B3" pixmapfile="paintings/Arcimboldo_Librarian_b3.png" position="0" x="400.5" y="383.0"/>
+<shape name="C3" pixmapfile="paintings/Arcimboldo_Librarian_c3.png" position="0" x="489.5" y="383.0"/>
+</ShapeGame>

Modified: branches/gcomprixogoo/src/paintings-activity/resources/paintings/board2_0.xml.in
==============================================================================
--- branches/gcomprixogoo/src/paintings-activity/resources/paintings/board2_0.xml.in	(original)
+++ branches/gcomprixogoo/src/paintings-activity/resources/paintings/board2_0.xml.in	Sun May  4 17:12:50 2008
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ShapeGame>
-  <Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
-	 x="405" y="495" zoomx="1" zoomy="1" position="0"/>
-  <Title x="405" y="495" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button">
-    <_name> Pierre-Auguste Renoir, Le Moulin de la Galette - 1876</_name>
-  </Title>
-  <Shape name="F" pixmapfile="paintings/renoir-moulin_de_la_galette-6.png" x="599" y="360" zoomx="1" zoomy="1" position="0"/>
-  <Shape name="B" pixmapfile="paintings/renoir-moulin_de_la_galette-2.png" x="425" y="150" zoomx="1" zoomy="1" position="0"/>
-  <Shape name="A" pixmapfile="paintings/renoir-moulin_de_la_galette-1.png" x="230" y="150" zoomx="1" zoomy="1" position="0"/>
-  <Shape name="C" pixmapfile="paintings/renoir-moulin_de_la_galette-3.png" x="600" y="173" zoomx="1" zoomy="1" position="0"/>
-  <Shape name="E" pixmapfile="paintings/renoir-moulin_de_la_galette-5.png" x="405" y="340" zoomx="1" zoomy="1" position="0"/>
-  <Shape name="D" pixmapfile="paintings/renoir-moulin_de_la_galette-4.png" x="210" y="340" zoomx="1" zoomy="1" position="0"/>
+<ShapeGame><!-- Created with GComprisShapegame gimp script -->
+<title color_skin="gcompris/text button" justification="GTK_JUSTIFY_CENTER" x="405" y="495">
+<name>Michel-Ange: pieta</name></title>
+<Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" position="0" type="SHAPE_BACKGROUND" x="405" y="495"/>
+<shape name="A1" pixmapfile="paintings/Michelangelo_Pieta_a1.png" position="0" x="260.5" y="75.5"/>
+<shape name="B1" pixmapfile="paintings/Michelangelo_Pieta_b1.png" position="0" x="400.0" y="75.5"/>
+<shape name="C1" pixmapfile="paintings/Michelangelo_Pieta_c1.png" position="0" x="539.5" y="75.5"/>
+<shape name="A2" pixmapfile="paintings/Michelangelo_Pieta_a2.png" position="0" x="244.0" y="198.5"/>
+<shape name="B2" pixmapfile="paintings/Michelangelo_Pieta_b2.png" position="0" x="384.0" y="186.0"/>
+<shape name="C2" pixmapfile="paintings/Michelangelo_Pieta_c2.png" position="0" x="539.5" y="186.0"/>
+<shape name="A3" pixmapfile="paintings/Michelangelo_Pieta_a3.png" position="0" x="260.5" y="322.5"/>
+<shape name="B3" pixmapfile="paintings/Michelangelo_Pieta_b3.png" position="0" x="416.5" y="323.5"/>
+<shape name="C3" pixmapfile="paintings/Michelangelo_Pieta_c3.png" position="0" x="555.5" y="323.5"/>
+<shape name="A4" pixmapfile="paintings/Michelangelo_Pieta_a4.png" position="0" x="244.0" y="432.5"/>
+<shape name="B4" pixmapfile="paintings/Michelangelo_Pieta_b4.png" position="0" x="384.0" y="444.5"/>
+<shape name="C4" pixmapfile="paintings/Michelangelo_Pieta_c4.png" position="0" x="539.5" y="444.5"/>
 </ShapeGame>

Modified: branches/gcomprixogoo/src/paintings-activity/resources/paintings/board3_1.xml.in
==============================================================================
--- branches/gcomprixogoo/src/paintings-activity/resources/paintings/board3_1.xml.in	(original)
+++ branches/gcomprixogoo/src/paintings-activity/resources/paintings/board3_1.xml.in	Sun May  4 17:12:50 2008
@@ -8,14 +8,14 @@
   <Title x="405" y="505" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button">
     <_name>Oil on canvas, 140 x 201 cm; Solomon R. Guggenheim Museum, New York</_name>
   </Title>
-  <Shape name="A" pixmapfile="paintings/kandinky.comp8/puzzle1.png" x="168" y="150" zoomx="1" zoomy="1" position="0"/>
-  <Shape name="B" pixmapfile="paintings/kandinky.comp8/puzzle2.png" x="335" y="150" zoomx="1" zoomy="1" position="0"/>
-  <Shape name="C" pixmapfile="paintings/kandinky.comp8/puzzle3.png" x="502" y="122" zoomx="1" zoomy="1" position="0"/>
-  <Shape name="D" pixmapfile="paintings/kandinky.comp8/puzzle4.png" x="648" y="122" zoomx="1" zoomy="1" position="0"/>
-  <Shape name="E" pixmapfile="paintings/kandinky.comp8/puzzle5.png" x="147" y="351" zoomx="1" zoomy="1" position="0"/>
-  <Shape name="F" pixmapfile="paintings/kandinky.comp8/puzzle6.png" x="315" y="351" zoomx="1" zoomy="1" position="0"/>
-  <Shape name="G" pixmapfile="paintings/kandinky.comp8/puzzle7.png" x="502" y="323" zoomx="1" zoomy="1" position="0"/>
-  <Shape name="H" pixmapfile="paintings/kandinky.comp8/puzzle8.png" x="648" y="323" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="A" pixmapfile="paintings/kandinky_1.png" x="168" y="150" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="B" pixmapfile="paintings/kandinky_2.png" x="335" y="150" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="C" pixmapfile="paintings/kandinky_3.png" x="502" y="122" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="D" pixmapfile="paintings/kandinky_4.png" x="648" y="122" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="E" pixmapfile="paintings/kandinky_5.png" x="147" y="351" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="F" pixmapfile="paintings/kandinky_6.png" x="315" y="351" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="G" pixmapfile="paintings/kandinky_7.png" x="502" y="323" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="H" pixmapfile="paintings/kandinky_8.png" x="648" y="323" zoomx="1" zoomy="1" position="0"/>
 </ShapeGame>
 
 

Added: branches/gcomprixogoo/src/paintings-activity/resources/paintings/kandinky_1.png
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/src/paintings-activity/resources/paintings/kandinky_2.png
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/src/paintings-activity/resources/paintings/kandinky_3.png
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/src/paintings-activity/resources/paintings/kandinky_4.png
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/src/paintings-activity/resources/paintings/kandinky_5.png
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/src/paintings-activity/resources/paintings/kandinky_6.png
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/src/paintings-activity/resources/paintings/kandinky_7.png
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/src/paintings-activity/resources/paintings/kandinky_8.png
==============================================================================
Binary file. No diff available.
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]