more images by Franck Doucet especially the GNU bonus

	Changed the shapeboard data format to allow the passing of an image from the skins
	by using pixmapfile="skin:gcompris-shapelabel.png"
	changed all shapeboard that was usin gcompris-shapelabel and moved it to skins

	added the GNU bonus

	* boards/babymatch/board1_0.xml.in:
	* boards/babymatch/board2_0.xml.in:
	* boards/babymatch/board3_0.xml.in:
	* boards/babymatch/board4_0.xml.in:
	* boards/babymatch/board5_0.xml.in:
	* boards/babymatch/board6_0.xml.in:
	* boards/doubleentry/board3_0.xml.in:
	* boards/gcompris/bonus/gnu_bad.png:
	* boards/gcompris/bonus/gnu_good.png:
	* boards/gcompris/gcompris-shapelabel.jpg:
	* boards/gcompris/misc/glass.png:
	* boards/gcompris/misc/peer.png:
	* boards/imagename/board1_0.xml.in:
	* boards/imagename/board2_0.xml.in:
	* boards/imagename/board3_0.xml.in:
	* boards/imagename/board4_0.xml.in:
	* boards/imagename/board5_0.xml.in:
	* boards/imagename/board6_0.xml.in:
	* boards/money/money-bg.jpg:
	* boards/money/money-bg.png:
	* boards/paintings/board1_0.xml.in:
	* boards/paintings/board2_0.xml.in:
	* boards/paintings/board3_0.xml.in:
	* boards/paintings/board3_1.xml.in:
	* boards/paintings/board4_0.xml.in:
	* boards/paintings/board5_0.xml.in:
	* boards/paintings/board6_0.xml.in:
	* boards/scales/board1_0.xml.in:
	* boards/scales/board1_1.xml.in:
	* boards/scales/board1_2.xml.in:
	* boards/scales/board1_3.xml.in:
	* boards/scales/board1_4.xml.in:
	* boards/scales/board1_5.xml.in:
	* boards/scales/board2_0.xml.in:
	* boards/scales/board2_1.xml.in:
	* boards/scales/board2_2.xml.in:
	* boards/scales/board2_3.xml.in:
	* boards/scales/board2_4.xml.in:
	* boards/scales/board2_5.xml.in:
	* boards/scales/board3_0.xml.in:
	* boards/scales/board3_1.xml.in:
	* boards/scales/board3_2.xml.in:
	* boards/scales/board3_3.xml.in:
	* boards/scales/board3_4.xml.in:
	* boards/scales/board3_5.xml.in:
	* boards/skins/default/gcompris-shapelabel.png:
	* src/boards/colors.c: (process_ok_timeout): use the GNU bonus now
	* src/boards/money.c: (money_next_level): new background
	* src/boards/shapegame.c: (create_title), (add_xml_shape_to_data):
	* src/gcompris/bonus.c: (gcompris_display_bonus):
	* src/gcompris/bonus.h:
	* src/gcompris/skin.c: (gcompris_image_to_skin): do no more exit on error

7 files changed, 7 insertions, 7 deletions

diff --git a/boards/paintings/board1_0.xml.in b/boards/paintings/board1_0.xml.in
index 51a9f18..ecf7c99 100644
--- a/boards/paintings/board1_0.xml.in
+++ b/boards/paintings/board1_0.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeGame>
-  <Shape name="1" pixmapfile="gcompris/gcompris-shapelabel.jpg" type="SHAPE_BACKGROUND"
+  <Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
 	 x="405" y="495" zoomx="1" zoomy="1" position="0"/>
   <Title x="394" y="495" justification="GTK_JUSTIFY_CENTER">
     <_name>Edgar Degas, The Dancing Class - 1873-75</_name>
diff --git a/boards/paintings/board2_0.xml.in b/boards/paintings/board2_0.xml.in
index cf6ada9..268cb55 100644
--- a/boards/paintings/board2_0.xml.in
+++ b/boards/paintings/board2_0.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeGame>
-  <Shape name="1" pixmapfile="gcompris/gcompris-shapelabel.jpg" type="SHAPE_BACKGROUND"
+  <Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
 	 x="405" y="490" zoomx="1" zoomy="1" position="0"/>
   <Title x="405" y="490" justification="GTK_JUSTIFY_CENTER">
     <_name> Pierre-Auguste Renoir, Le Moulin de la Galette - 1876</_name>
diff --git a/boards/paintings/board3_0.xml.in b/boards/paintings/board3_0.xml.in
index 5c397d5..8c658f5 100644
--- a/boards/paintings/board3_0.xml.in
+++ b/boards/paintings/board3_0.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeGame>
-  <Shape name="1" pixmapfile="gcompris/gcompris-shapelabel.jpg" type="SHAPE_BACKGROUND"
+  <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">
     <_name> Pierre-Auguste Renoir, Girls At The Piano - 1892</_name>
diff --git a/boards/paintings/board3_1.xml.in b/boards/paintings/board3_1.xml.in
index 8c30cf1..8594fee 100644
--- a/boards/paintings/board3_1.xml.in
+++ b/boards/paintings/board3_1.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeGame>
-  <Shape name="1" pixmapfile="gcompris/gcompris-shapelabel.jpg" type="SHAPE_BACKGROUND"
+  <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="485" justification="GTK_JUSTIFY_CENTER">
     <_name>Kandinsky, Wassily, Composition VIII - 1923</_name>
diff --git a/boards/paintings/board4_0.xml.in b/boards/paintings/board4_0.xml.in
index 0d39801..f2a5bf3 100644
--- a/boards/paintings/board4_0.xml.in
+++ b/boards/paintings/board4_0.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeGame>
-  <Shape name="1" pixmapfile="gcompris/gcompris-shapelabel.jpg" type="SHAPE_BACKGROUND"
+  <Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
 	 x="405" y="460" zoomx="1" zoomy="1" position="0"/>
   <Title x="405" y="460" justification="GTK_JUSTIFY_CENTER">
     <_name>Bazille, The Ramparts at Aigues-Mortes - 1867</_name>
diff --git a/boards/paintings/board5_0.xml.in b/boards/paintings/board5_0.xml.in
index 4ac0a0c..082cff0 100644
--- a/boards/paintings/board5_0.xml.in
+++ b/boards/paintings/board5_0.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeGame>
-  <Shape name="1" pixmapfile="gcompris/gcompris-shapelabel.jpg" type="SHAPE_BACKGROUND"
+  <Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
 	 x="395" y="490" zoomx="1" zoomy="1" position="0"/>
   <Title x="395" y="490" justification="GTK_JUSTIFY_CENTER">
     <_name>Cassatt, Mary - Summertime - 1894</_name>
diff --git a/boards/paintings/board6_0.xml.in b/boards/paintings/board6_0.xml.in
index f908de4..2f632ee 100644
--- a/boards/paintings/board6_0.xml.in
+++ b/boards/paintings/board6_0.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeGame>
-  <Shape name="1" pixmapfile="gcompris/gcompris-shapelabel.jpg" type="SHAPE_BACKGROUND"
+  <Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
 	 x="395" y="495" zoomx="1" zoomy="1" position="0"/>
   <Title x="395" y="495" justification="GTK_JUSTIFY_CENTER">
     <_name>Vincent Van Gogh, Village Street in Auvers - 1890</_name>