now puzzle is ordered now puzzle is ordered improved the edition mode.Now

       * boards/geography/board3_0.xml.in: now puzzle is ordered
       * boards/geography/board4_0.xml.in: now puzzle is ordered
       * src/boards/shapegame.c: (key_press), (shapegame_next_level),
        (item_event), (item_event_edition): improved the edition mode.Now enter
 'e' to enter edition.
         a dialog explain the keys. the 'd' key displays all the shape and let's
	 you move shape.
        This is a very big improvement over the old way of doing.
       * src/gcompris/gameutil.c: (gcompris_dialog): Fixed to use the skin path

2 files changed, 42 insertions, 43 deletions

diff --git a/boards/geography/board3_0.xml.in b/boards/geography/board3_0.xml.in
index 1d4a578..40d93cf 100644
--- a/boards/geography/board3_0.xml.in
+++ b/boards/geography/board3_0.xml.in
@@ -3,25 +3,23 @@
   <Title x="200" y="40" justification="GTK_JUSTIFY_CENTER">
     <_name>West Europe</_name>
   </Title>
-  <Shape name="E" pixmapfile="geography/europe/austria.png" sound="Undefined" x="540" y="76" zoomx="1" zoomy="1" position="0"/>
-  <Shape name="O" pixmapfile="geography/europe/belgium.png" sound="Undefined" x="385" y="203" zoomx="1" zoomy="1" position="0"/>
-  <Shape name="B" pixmapfile="geography/europe/denmark.png" sound="Undefined" x="169" y="453" zoomx="1" zoomy="1" position="0"/>
-  <Shape name="A" pixmapfile="geography/europe/finland.png" sound="Undefined" x="299" y="351" zoomx="1" zoomy="1" position="0"/>
-  <Shape name="D" pixmapfile="geography/europe/france.png" sound="Undefined" x="431" y="328" zoomx="1" zoomy="1" position="0"/>
-  <Shape name="H" pixmapfile="geography/europe/germany.png" sound="Undefined" x="69" y="79" zoomx="1" zoomy="1" position="0"/>
-  <Shape name="K" pixmapfile="geography/europe/greece.png" sound="Undefined" x="228" y="226" zoomx="1" zoomy="1" position="0"/>
-  <Shape name="F" pixmapfile="geography/europe/iceland.png" sound="Undefined" x="392" y="277" zoomx="1" zoomy="1" position="0"/>
-  <Shape name="R" pixmapfile="geography/europe/ireland.png" sound="Undefined" x="426" y="417" zoomx="1" zoomy="1" position="0"/>
-  <Shape name="I" pixmapfile="geography/europe/italy.png" sound="Undefined" x="370" y="341" zoomx="1" zoomy="1" position="0"/>
-  <Shape name="L" pixmapfile="geography/europe/luxembourg.png" sound="Undefined" x="567" y="473" zoomx="1" zoomy="1" position="0"/>
-  <Shape name="N" pixmapfile="geography/europe/netherland.png" sound="Undefined" x="340" y="296" zoomx="1" zoomy="1" position="0"/>
-  <Shape name="M" pixmapfile="geography/europe/norway.png" sound="Undefined" x="449" y="85" zoomx="1" zoomy="1" position="0"/>
-  <Shape name="C" pixmapfile="geography/europe/portugal.png" sound="Undefined" x="329" y="262" zoomx="1" zoomy="1" position="0"/>
-  <Shape name="P" pixmapfile="geography/europe/spain.png" sound="Undefined" x="320" y="286" zoomx="1" zoomy="1" position="0"/>
-  <Shape name="Q" pixmapfile="geography/europe/sweden.png" sound="Undefined" x="239" y="448" zoomx="1" zoomy="1" position="0"/>
-  <Shape name="J" pixmapfile="geography/europe/switz.png" sound="Undefined" x="455" y="120" zoomx="1" zoomy="1" position="0"/>
-  <Shape name="G" pixmapfile="geography/europe/united_kingdom.png" sound="Undefined" x="173" y="249" zoomx="1" zoomy="1" position="0"/>
-  <Shape name="Z" pixmapfile="geography/europe/europe.jpg" type="SHAPE_BACKGROUND"
-	 x="400" y="260" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="E" pixmapfile="geography/europe/austria.png" x="430" y="328" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="O" pixmapfile="geography/europe/belgium.png" x="322" y="286" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="B" pixmapfile="geography/europe/denmark.png" x="386" y="203" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="A" pixmapfile="geography/europe/finland.png" x="541" y="75" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="D" pixmapfile="geography/europe/france.png" x="299" y="351" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="H" pixmapfile="geography/europe/germany.png" x="392" y="277" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="F" pixmapfile="geography/europe/iceland.png" x="70" y="78" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="R" pixmapfile="geography/europe/ireland.png" x="173" y="249" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="I" pixmapfile="geography/europe/italy.png" x="426" y="417" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="L" pixmapfile="geography/europe/luxembourg.png" x="341" y="297" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="N" pixmapfile="geography/europe/netherland.png" x="329" y="261" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="M" pixmapfile="geography/europe/norway.png" x="449" y="85" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="C" pixmapfile="geography/europe/portugal.png" x="169" y="453" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="P" pixmapfile="geography/europe/spain.png" x="239" y="448" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="Q" pixmapfile="geography/europe/sweden.png" x="454" y="118" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="J" pixmapfile="geography/europe/switz.png" x="370" y="341" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="G" pixmapfile="geography/europe/united_kingdom.png" x="228" y="226" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="Z" pixmapfile="geography/europe/europe.jpg" type="SHAPE_BACKGROUND" x="400" y="260" zoomx="1" zoomy="1" position="0"/>
 </ShapeGame>
 
diff --git a/boards/geography/board4_0.xml.in b/boards/geography/board4_0.xml.in
index a42769f..ed1c59d 100644
--- a/boards/geography/board4_0.xml.in
+++ b/boards/geography/board4_0.xml.in
@@ -1,29 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeGame>
-  <Title x="600" y="495" justification="GTK_JUSTIFY_CENTER">
+  <Title x="200" y="40" justification="GTK_JUSTIFY_CENTER">
     <_name>East Europe</_name>
   </Title>
-  <Shape name="A" pixmapfile="geography/europe/albania.png" x="150" y="150"  zoomx="1" zoomy="1" position="0"/>
-  <Shape name="B" pixmapfile="geography/europe/belarus.png" x="150" y="150"  zoomx="1" zoomy="1" position="0"/>
-  <Shape name="C" pixmapfile="geography/europe/bosnia_herzegovina.png" x="150" y="150"  zoomx="1" zoomy="1" position="0"/>
-  <Shape name="D" pixmapfile="geography/europe/bulgaria.png" x="150" y="150"  zoomx="1" zoomy="1" position="0"/>
-  <Shape name="E" pixmapfile="geography/europe/croatia.png" x="150" y="150"  zoomx="1" zoomy="1" position="0"/>
-  <Shape name="F" pixmapfile="geography/europe/cyprus.png" x="150" y="150"  zoomx="1" zoomy="1" position="0"/>
-  <Shape name="G" pixmapfile="geography/europe/czech.png" x="150" y="150"  zoomx="1" zoomy="1" position="0"/>
-  <Shape name="H" pixmapfile="geography/europe/estonia.png" x="150" y="150"  zoomx="1" zoomy="1" position="0"/>
-  <Shape name="I" pixmapfile="geography/europe/hungary.png" x="150" y="150"  zoomx="1" zoomy="1" position="0"/>
-  <Shape name="J" pixmapfile="geography/europe/latvia.png" x="150" y="150"  zoomx="1" zoomy="1" position="0"/>
-  <Shape name="K" pixmapfile="geography/europe/lithuania.png" x="150" y="150"  zoomx="1" zoomy="1" position="0"/>
-  <Shape name="L" pixmapfile="geography/europe/macedonia.png" x="150" y="150"  zoomx="1" zoomy="1" position="0"/>
-  <Shape name="M" pixmapfile="geography/europe/moldova.png" x="150" y="150"  zoomx="1" zoomy="1" position="0"/>
-  <Shape name="N" pixmapfile="geography/europe/poland.png" x="150" y="150"  zoomx="1" zoomy="1" position="0"/>
-  <Shape name="O" pixmapfile="geography/europe/romania.png" x="150" y="150"  zoomx="1" zoomy="1" position="0"/>
-  <Shape name="P" pixmapfile="geography/europe/russia.png" x="150" y="150"  zoomx="1" zoomy="1" position="0"/>
-  <Shape name="Q" pixmapfile="geography/europe/serbia_montenegro.png" x="150" y="150"  zoomx="1" zoomy="1" position="0"/>
-  <Shape name="R" pixmapfile="geography/europe/slovakia.png" x="150" y="150"  zoomx="1" zoomy="1" position="0"/>
-  <Shape name="S" pixmapfile="geography/europe/slovenia.png" x="150" y="150"  zoomx="1" zoomy="1" position="0"/>
-  <Shape name="T" pixmapfile="geography/europe/turkey.png" x="150" y="150"  zoomx="1" zoomy="1" position="0"/>
-  <Shape name="U" pixmapfile="geography/europe/ukraine.png" x="150" y="150"  zoomx="1" zoomy="1" position="0"/>
-  <Shape name="V" pixmapfile="geography/europe/europe.jpg" type="SHAPE_BACKGROUND"
+  <Shape name="A" pixmapfile="geography/europe/albania.png" x="522" y="431" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="B" pixmapfile="geography/europe/belarus.png" x="594" y="239" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="C" pixmapfile="geography/europe/bosnia_herzegovina.png" x="487" y="388" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="D" pixmapfile="geography/europe/bulgaria.png" x="584" y="404" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="E" pixmapfile="geography/europe/croatia.png" x="471" y="375" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="F" pixmapfile="geography/europe/cyprus.png" x="700" y="521" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="G" pixmapfile="geography/europe/czech.png" x="453" y="296" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="H" pixmapfile="geography/europe/estonia.png" x="545" y="167" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="I" pixmapfile="geography/europe/hungary.png" x="505" y="335" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="J" pixmapfile="geography/europe/latvia.png" x="548" y="193" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="K" pixmapfile="geography/europe/lithuania.png" x="541" y="218" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="L" pixmapfile="geography/europe/macedonia.png" x="541" y="421" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="M" pixmapfile="geography/europe/moldova.png" x="613" y="339" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="N" pixmapfile="geography/europe/poland.png" x="490" y="264" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="O" pixmapfile="geography/europe/romania.png" x="575" y="355" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="P" pixmapfile="geography/europe/russia.png" x="648" y="189" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="Q" pixmapfile="geography/europe/serbia_montenegro.png" x="527" y="385" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="R" pixmapfile="geography/europe/slovakia.png" x="505" y="313" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="S" pixmapfile="geography/europe/slovenia.png" x="449" y="351" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="T" pixmapfile="geography/europe/turkey.png" x="694" y="466" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="U" pixmapfile="geography/europe/ukraine.png" x="643" y="318" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="V" pixmapfile="geography/europe/greece.png" x="567" y="472" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="Z" pixmapfile="geography/europe/europe.jpg" type="SHAPE_BACKGROUND"
 	 x="400" y="260" zoomx="1" zoomy="1" position="0"/>
 </ShapeGame>