GNOME.org
 

[gcompris/gcomprixogoo] Fixed many errors in paintings.

commit ecd12d75772d36ff9f52c7651f4c14c81804b026
Author: Bruno Coudoin <bruno coudoin free fr>
Date:   Thu Dec 31 02:10:00 2009 +0100

    Fixed many errors in paintings.
    
    Mainly missing entries in the data set and the Makefile.am

 .../resources/paintings/Makefile.am                |   46 ++++++++++++++------
 .../resources/paintings/board1_10.xml.in           |    1 +
 .../resources/paintings/board1_11.xml.in           |    1 +
 .../resources/paintings/board1_12.xml.in           |    1 +
 .../resources/paintings/board1_2.xml.in            |    1 +
 .../resources/paintings/board1_3.xml.in            |    1 +
 .../resources/paintings/board1_4.xml.in            |    1 +
 .../resources/paintings/board1_5.xml.in            |    1 +
 .../resources/paintings/board1_6.xml.in            |    1 +
 .../resources/paintings/board1_7.xml.in            |    1 +
 .../resources/paintings/board1_8.xml.in            |    1 +
 .../resources/paintings/board1_9.xml.in            |    1 +
 .../resources/paintings/board2_0.xml.in            |    1 +
 .../resources/paintings/board2_1.xml.in            |    1 +
 .../resources/paintings/board2_2.xml.in            |    1 +
 .../resources/paintings/board2_3.xml.in            |    1 +
 .../resources/paintings/board3_1.xml.in            |    6 +-
 17 files changed, 50 insertions(+), 17 deletions(-)
---
diff --git a/src/paintings-activity/resources/paintings/Makefile.am b/src/paintings-activity/resources/paintings/Makefile.am
index a8a197c..5bea234 100644
--- a/src/paintings-activity/resources/paintings/Makefile.am
+++ b/src/paintings-activity/resources/paintings/Makefile.am
@@ -84,12 +84,6 @@ img_DATA = \
 	Botticelli_Venus_d2.png \
 	Botticelli_Venus_d3.png \
 	Botticelli_Venus_d4.png \
-	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 \
 	EjiriSuruga_a1.png \
 	EjiriSuruga_a2.png \
 	EjiriSuruga_a3.png \
@@ -206,14 +200,6 @@ img_DATA = \
 	HokusaiWomanHoldingFan_c1.png \
 	HokusaiWomanHoldingFan_c2.png \
 	HokusaiWomanHoldingFan_c3.png \
-	kandinky_1.png \
-	kandinky_2.png \
-	kandinky_3.png \
-	kandinky_4.png \
-	kandinky_5.png \
-	kandinky_6.png \
-	kandinky_7.png \
-	kandinky_8.png \
 	KazusaSeaRoute_a1.png \
 	KazusaSeaRoute_a2.png \
 	KazusaSeaRoute_a3.png \
@@ -263,6 +249,38 @@ img_DATA = \
 	Michelangelo_Pieta_c2.png \
 	Michelangelo_Pieta_c3.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 \
diff --git a/src/paintings-activity/resources/paintings/board1_10.xml.in b/src/paintings-activity/resources/paintings/board1_10.xml.in
index b89a8bb..50dcace 100644
--- a/src/paintings-activity/resources/paintings/board1_10.xml.in
+++ b/src/paintings-activity/resources/paintings/board1_10.xml.in
@@ -2,6 +2,7 @@
 <ShapeGame><!-- Created with GComprisShapegame gimp script -->
 <title color_skin="gcompris/text button" color_background_skin="gcompris/shadow" justification="GTK_JUSTIFY_CENTER" x="405" y="495">
 <name>Ryogoku</name></title>
+<shape name="A1" pixmapfile="paintings/HokusaiBridge_a1.png" position="0" x="138.5" y="106.0"/>
 <shape name="B1" pixmapfile="paintings/HokusaiBridge_b1.png" position="0" x="269.0" y="106.0"/>
 <shape name="C1" pixmapfile="paintings/HokusaiBridge_c1.png" position="0" x="414.0" y="94.0"/>
 <shape name="D1" pixmapfile="paintings/HokusaiBridge_d1.png" position="0" x="546.0" y="106.0"/>
diff --git a/src/paintings-activity/resources/paintings/board1_11.xml.in b/src/paintings-activity/resources/paintings/board1_11.xml.in
index 9b801f1..261dae4 100644
--- a/src/paintings-activity/resources/paintings/board1_11.xml.in
+++ b/src/paintings-activity/resources/paintings/board1_11.xml.in
@@ -2,6 +2,7 @@
 <ShapeGame><!-- Created with GComprisShapegame gimp script -->
 <title color_skin="gcompris/text button" color_background_skin="gcompris/shadow" justification="GTK_JUSTIFY_CENTER" x="405" y="495">
 <name>Poppies</name></title>
+<shape name="A1" pixmapfile="paintings/HokusaiPoppies_a1.png" position="0" x="140.5" y="91.5"/>
 <shape name="B1" pixmapfile="paintings/HokusaiPoppies_b1.png" position="0" x="269.5" y="82.0"/>
 <shape name="C1" pixmapfile="paintings/HokusaiPoppies_c1.png" position="0" x="413.0" y="82.0"/>
 <shape name="D1" pixmapfile="paintings/HokusaiPoppies_d1.png" position="0" x="544.0" y="91.5"/>
diff --git a/src/paintings-activity/resources/paintings/board1_12.xml.in b/src/paintings-activity/resources/paintings/board1_12.xml.in
index 0ab25b4..4af8236 100644
--- a/src/paintings-activity/resources/paintings/board1_12.xml.in
+++ b/src/paintings-activity/resources/paintings/board1_12.xml.in
@@ -2,6 +2,7 @@
 <ShapeGame><!-- Created with GComprisShapegame gimp script -->
 <title color_skin="gcompris/text button" color_background_skin="gcompris/shadow" justification="GTK_JUSTIFY_CENTER" x="405" y="495">
 <name>Kazusa</name></title>
+<shape name="A1" pixmapfile="paintings/KazusaSeaRoute_a1.png" position="0" x="144.0" y="82.0"/>
 <shape name="B1" pixmapfile="paintings/KazusaSeaRoute_b1.png" position="0" x="264.0" y="82.0"/>
 <shape name="C1" pixmapfile="paintings/KazusaSeaRoute_c1.png" position="0" x="401.5" y="82.0"/>
 <shape name="D1" pixmapfile="paintings/KazusaSeaRoute_d1.png" position="0" x="551.5" y="91.5"/>
diff --git a/src/paintings-activity/resources/paintings/board1_2.xml.in b/src/paintings-activity/resources/paintings/board1_2.xml.in
index dd8e300..f1e5a82 100644
--- a/src/paintings-activity/resources/paintings/board1_2.xml.in
+++ b/src/paintings-activity/resources/paintings/board1_2.xml.in
@@ -2,6 +2,7 @@
 <ShapeGame><!-- Created with GComprisShapegame gimp script -->
 <title color_skin="gcompris/text button" color_background_skin="gcompris/shadow" justification="GTK_JUSTIFY_CENTER" x="405" y="495">
 <_name>Giuseppe Arcimboldo, Spring - 1573</_name></title>
+<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"/>
diff --git a/src/paintings-activity/resources/paintings/board1_3.xml.in b/src/paintings-activity/resources/paintings/board1_3.xml.in
index c054001..b272440 100644
--- a/src/paintings-activity/resources/paintings/board1_3.xml.in
+++ b/src/paintings-activity/resources/paintings/board1_3.xml.in
@@ -2,6 +2,7 @@
 <ShapeGame><!-- Created with GComprisShapegame gimp script -->
 <title color_skin="gcompris/text button" color_background_skin="gcompris/shadow" justification="GTK_JUSTIFY_CENTER" x="405" y="495">
 <_name>Giuseppe Arcimboldo, The Librarian - 1566)</_name></title>
+<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"/>
diff --git a/src/paintings-activity/resources/paintings/board1_4.xml.in b/src/paintings-activity/resources/paintings/board1_4.xml.in
index 852565b..4f67fad 100644
--- a/src/paintings-activity/resources/paintings/board1_4.xml.in
+++ b/src/paintings-activity/resources/paintings/board1_4.xml.in
@@ -2,6 +2,7 @@
 <ShapeGame><!-- Created with GComprisShapegame gimp script -->
 <title color_skin="gcompris/text button" color_background_skin="gcompris/shadow" justification="GTK_JUSTIFY_CENTER" x="405" y="495">
 <name>Oiran</name></title>
+<shape name="A1" pixmapfile="paintings/HokusaiOiranKamuro_a1.png" position="0" x="343.0" y="129.0"/>
 <shape name="B1" pixmapfile="paintings/HokusaiOiranKamuro_b1.png" position="0" x="473.5" y="129.0"/>
 <shape name="A2" pixmapfile="paintings/HokusaiOiranKamuro_a2.png" position="0" x="343.0" y="260.5"/>
 <shape name="B2" pixmapfile="paintings/HokusaiOiranKamuro_b2.png" position="0" x="473.5" y="260.5"/>
diff --git a/src/paintings-activity/resources/paintings/board1_5.xml.in b/src/paintings-activity/resources/paintings/board1_5.xml.in
index 70d38a9..62cc976 100644
--- a/src/paintings-activity/resources/paintings/board1_5.xml.in
+++ b/src/paintings-activity/resources/paintings/board1_5.xml.in
@@ -2,6 +2,7 @@
 <ShapeGame><!-- Created with GComprisShapegame gimp script -->
 <title color_skin="gcompris/text button" color_background_skin="gcompris/shadow" justification="GTK_JUSTIFY_CENTER" x="405" y="495">
 <_name>Woman holding a fan</_name></title>
+<shape name="A1" pixmapfile="paintings/HokusaiWomanHoldingFan_a1.png" position="0" x="300.0" y="113.5"/>
 <shape name="B1" pixmapfile="paintings/HokusaiWomanHoldingFan_b1.png" position="0" x="401.5" y="129.0"/>
 <shape name="C1" pixmapfile="paintings/HokusaiWomanHoldingFan_c1.png" position="0" x="500.5" y="113.5"/>
 <shape name="A2" pixmapfile="paintings/HokusaiWomanHoldingFan_a2.png" position="0" x="300.0" y="261.0"/>
diff --git a/src/paintings-activity/resources/paintings/board1_6.xml.in b/src/paintings-activity/resources/paintings/board1_6.xml.in
index 115a276..426a1f7 100644
--- a/src/paintings-activity/resources/paintings/board1_6.xml.in
+++ b/src/paintings-activity/resources/paintings/board1_6.xml.in
@@ -2,6 +2,7 @@
 <ShapeGame><!-- Created with GComprisShapegame gimp script -->
 <title color_skin="gcompris/text button" color_background_skin="gcompris/shadow" justification="GTK_JUSTIFY_CENTER" x="405" y="495">
 <name>Ejiri</name></title>
+<shape name="A1" pixmapfile="paintings/EjiriSuruga_a1.png" position="0" x="173.0" y="113.5"/>
 <shape name="B1" pixmapfile="paintings/EjiriSuruga_b1.png" position="0" x="335.5" y="113.5"/>
 <shape name="C1" pixmapfile="paintings/EjiriSuruga_c1.png" position="0" x="483.5" y="113.5"/>
 <shape name="D1" pixmapfile="paintings/EjiriSuruga_d1.png" position="0" x="628.5" y="129.0"/>
diff --git a/src/paintings-activity/resources/paintings/board1_7.xml.in b/src/paintings-activity/resources/paintings/board1_7.xml.in
index 8c2699c..466b1af 100644
--- a/src/paintings-activity/resources/paintings/board1_7.xml.in
+++ b/src/paintings-activity/resources/paintings/board1_7.xml.in
@@ -2,6 +2,7 @@
 <ShapeGame><!-- Created with GComprisShapegame gimp script -->
 <title color_skin="gcompris/text button" color_background_skin="gcompris/shadow" justification="GTK_JUSTIFY_CENTER" x="405" y="495">
 <name>Ejiri</name></title>
+<shape name="A1" pixmapfile="paintings/GreatWave_a1.png" position="0" x="154.0" y="129.0"/>
 <shape name="B1" pixmapfile="paintings/GreatWave_b1.png" position="0" x="300.5" y="113.5"/>
 <shape name="C1" pixmapfile="paintings/GreatWave_c1.png" position="0" x="484.0" y="129.0"/>
 <shape name="D1" pixmapfile="paintings/GreatWave_d1.png" position="0" x="645.5" y="113.5"/>
diff --git a/src/paintings-activity/resources/paintings/board1_8.xml.in b/src/paintings-activity/resources/paintings/board1_8.xml.in
index dc23fef..632a145 100644
--- a/src/paintings-activity/resources/paintings/board1_8.xml.in
+++ b/src/paintings-activity/resources/paintings/board1_8.xml.in
@@ -2,6 +2,7 @@
 <ShapeGame><!-- Created with GComprisShapegame gimp script -->
 <title color_skin="gcompris/text button" color_background_skin="gcompris/shadow" justification="GTK_JUSTIFY_CENTER" x="405" y="495">
 <name>Inokashira</name></title>
+<shape name="A1" pixmapfile="paintings/HiroshigeInokashiraSnow_a1.png" position="0" x="141.5" y="106.0"/>
 <shape name="B1" pixmapfile="paintings/HiroshigeInokashiraSnow_b1.png" position="0" x="295.5" y="106.0"/>
 <shape name="C1" pixmapfile="paintings/HiroshigeInokashiraSnow_c1.png" position="0" x="470.5" y="106.0"/>
 <shape name="D1" pixmapfile="paintings/HiroshigeInokashiraSnow_d1.png" position="0" x="641.5" y="106.0"/>
diff --git a/src/paintings-activity/resources/paintings/board1_9.xml.in b/src/paintings-activity/resources/paintings/board1_9.xml.in
index dca2dc8..0535ec2 100644
--- a/src/paintings-activity/resources/paintings/board1_9.xml.in
+++ b/src/paintings-activity/resources/paintings/board1_9.xml.in
@@ -2,6 +2,7 @@
 <ShapeGame><!-- Created with GComprisShapegame gimp script -->
 <title color_skin="gcompris/text button" color_background_skin="gcompris/shadow" justification="GTK_JUSTIFY_CENTER" x="405" y="495">
 <name>Fishes</name></title>
+<shape name="A1" pixmapfile="paintings/HiroshigeHorsePrawns_a1.png" position="0" x="151.0" y="88.5"/>
 <shape name="B1" pixmapfile="paintings/HiroshigeHorsePrawns_b1.png" position="0" x="309.5" y="88.5"/>
 <shape name="C1" pixmapfile="paintings/HiroshigeHorsePrawns_c1.png" position="0" x="491.5" y="88.5"/>
 <shape name="D1" pixmapfile="paintings/HiroshigeHorsePrawns_d1.png" position="0" x="667.5" y="88.5"/>
diff --git a/src/paintings-activity/resources/paintings/board2_0.xml.in b/src/paintings-activity/resources/paintings/board2_0.xml.in
index 9bc4a57..5287851 100644
--- a/src/paintings-activity/resources/paintings/board2_0.xml.in
+++ b/src/paintings-activity/resources/paintings/board2_0.xml.in
@@ -2,6 +2,7 @@
 <ShapeGame><!-- Created with GComprisShapegame gimp script -->
 <title color_skin="gcompris/text button" color_background_skin="gcompris/shadow" justification="GTK_JUSTIFY_CENTER" x="405" y="495">
 <name>Michel-Ange: pieta</name></title>
+<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"/>
diff --git a/src/paintings-activity/resources/paintings/board2_1.xml.in b/src/paintings-activity/resources/paintings/board2_1.xml.in
index 782b552..0967a03 100644
--- a/src/paintings-activity/resources/paintings/board2_1.xml.in
+++ b/src/paintings-activity/resources/paintings/board2_1.xml.in
@@ -2,6 +2,7 @@
 <ShapeGame><!-- Created with GComprisShapegame gimp script -->
 <title color_skin="gcompris/text button" color_background_skin="gcompris/shadow" justification="GTK_JUSTIFY_CENTER" x="405" y="495">
 <_name>Botticelli, Primavera - 1482</_name></title>
+<shape name="A1" pixmapfile="paintings/Botticelli_Primaver_a1.png" position="0" x="159.5" y="103.5"/>
 <shape name="B1" pixmapfile="paintings/Botticelli_Primaver_b1.png" position="0" x="331.0" y="103.5"/>
 <shape name="C1" pixmapfile="paintings/Botticelli_Primaver_c1.png" position="0" x="506.0" y="103.5"/>
 <shape name="D1" pixmapfile="paintings/Botticelli_Primaver_d1.png" position="0" x="659.0" y="91.5"/>
diff --git a/src/paintings-activity/resources/paintings/board2_2.xml.in b/src/paintings-activity/resources/paintings/board2_2.xml.in
index dd40145..bfb66c9 100644
--- a/src/paintings-activity/resources/paintings/board2_2.xml.in
+++ b/src/paintings-activity/resources/paintings/board2_2.xml.in
@@ -2,6 +2,7 @@
 <ShapeGame><!-- Created with GComprisShapegame gimp script -->
 <title color_skin="gcompris/text button" color_background_skin="gcompris/shadow" justification="GTK_JUSTIFY_CENTER" x="405" y="495">
 <_name>Caravage, Rest on the Flight into Egypt - 1597</_name></title>
+<shape name="A1" pixmapfile="paintings/Le_Caravage_Egypte_a1.png" position="0" x="198.0" y="75.5"/>
 <shape name="B1" pixmapfile="paintings/Le_Caravage_Egypte_b1.png" position="0" x="380.5" y="88.5"/>
 <shape name="C1" pixmapfile="paintings/Le_Caravage_Egypte_c1.png" position="0" x="582.5" y="75.5"/>
 <shape name="A2" pixmapfile="paintings/Le_Caravage_Egypte_a2.png" position="0" x="219.0" y="185.5"/>
diff --git a/src/paintings-activity/resources/paintings/board2_3.xml.in b/src/paintings-activity/resources/paintings/board2_3.xml.in
index 8951c14..80230eb 100644
--- a/src/paintings-activity/resources/paintings/board2_3.xml.in
+++ b/src/paintings-activity/resources/paintings/board2_3.xml.in
@@ -2,6 +2,7 @@
 <ShapeGame><!-- Created with GComprisShapegame gimp script -->
 <title color_skin="gcompris/text button" color_background_skin="gcompris/shadow" justification="GTK_JUSTIFY_CENTER" x="405" y="495">
 <_name>Botticelli, The Birth of Venus - 1482â??1486</_name></title>
+<shape name="A1" pixmapfile="paintings/Botticelli_Venus_a1.png" position="0" x="141.5" y="98.5"/>
 <shape name="B1" pixmapfile="paintings/Botticelli_Venus_b1.png" position="0" x="295.5" y="98.5"/>
 <shape name="C1" pixmapfile="paintings/Botticelli_Venus_c1.png" position="0" x="488.5" y="98.5"/>
 <shape name="D1" pixmapfile="paintings/Botticelli_Venus_d1.png" position="0" x="659.0" y="110.0"/>
diff --git a/src/paintings-activity/resources/paintings/board3_1.xml.in b/src/paintings-activity/resources/paintings/board3_1.xml.in
index 029773f..080e613 100644
--- a/src/paintings-activity/resources/paintings/board3_1.xml.in
+++ b/src/paintings-activity/resources/paintings/board3_1.xml.in
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeGame>
-  <Title x="405" y="485" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button" color_background_skin="gcompris/shadow">
+  <Title x="405" y="435" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button" color_background_skin="gcompris/shadow">
     <_name>Kandinsky, Wassily, Composition VIII - 1923</_name>
   </Title>
-  <Title x="405" y="505" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button" color_background_skin="gcompris/shadow">
+  <Title x="405" y="470" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button" color_background_skin="gcompris/shadow">
     <_name>Oil on canvas, 140 x 201 cm; Solomon R. Guggenheim Museum, New York</_name>
   </Title>
   <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="E" pixmapfile="paintings/kandinky_5.png" x="148" 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"/>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]