[gcompris] geography: removed sublevels, now each map has its own level, easier to navigate in them.

From: Bruno Coudoin <bcoudoin src gnome org>
To: commits-list gnome org
Cc:
Subject: [gcompris] geography: removed sublevels, now each map has its own level, easier to navigate in them.
Date: Sun, 17 Jun 2012 15:55:32 +0000 (UTC)
commit 99282e83172a39c8f2887333ebff75e412bb79f2
Author: Bruno Coudoin <bruno coudoin free fr>
Date:   Sun Jun 17 16:56:04 2012 +0200

    geography: removed sublevels, now each map has its own level, easier to navigate in them.

 .../resources/geography/Makefile.am                |    9 +-
 .../resources/geography/board2_1.xml.in            |   50 -----
 .../resources/geography/board3_0.xml.in            |   71 +++----
 .../resources/geography/board4_0.xml.in            |  194 ++++++--------------
 .../geography/{board3_1.xml.in => board5_0.xml.in} |    0
 .../resources/geography/board6_0.xml.in            |  141 ++++++++++++++
 .../geography/{board4_1.xml.in => board7_0.xml.in} |    0
 .../geography/{board4_2.xml.in => board8_0.xml.in} |    0
 8 files changed, 233 insertions(+), 232 deletions(-)
---
diff --git a/src/geography-activity/resources/geography/Makefile.am b/src/geography-activity/resources/geography/Makefile.am
index a9a2360..908ec9e 100644
--- a/src/geography-activity/resources/geography/Makefile.am
+++ b/src/geography-activity/resources/geography/Makefile.am
@@ -5,12 +5,12 @@ xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/geography
 xml_in_files = \
 	board1_0.xml.in \
 	board2_0.xml.in \
-	board2_1.xml.in \
 	board3_0.xml.in \
-	board3_1.xml.in \
 	board4_0.xml.in \
-	board4_1.xml.in \
-	board4_2.xml.in
+	board5_0.xml.in \
+	board6_0.xml.in \
+	board7_0.xml.in \
+	board8_0.xml.in
 
 xml_DATA = $(xml_in_files:.xml.in=.xml)
 
@@ -23,3 +23,4 @@ $(xml_DATA): %.xml: %.xml.in
 	sed -e "s/\(<\{1\}\/*\)_/\1/g" $< > $@
 
 EXTRA_DIST = ${xml_in_files}
+CLEANFILES = $(xml_DATA)
diff --git a/src/geography-activity/resources/geography/board3_0.xml.in b/src/geography-activity/resources/geography/board3_0.xml.in
index 5a23420..989f98b 100644
--- a/src/geography-activity/resources/geography/board3_0.xml.in
+++ b/src/geography-activity/resources/geography/board3_0.xml.in
@@ -1,59 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeGame>
-  <Title x="270" y="40" justification="GTK_JUSTIFY_CENTER">
-    <_name>Western Europe</_name>
+  <Title x="600" y="495" justification="GTK_JUSTIFY_CENTER">
+    <_name>South America</_name>
   </Title>
-  <Shape name="E" pixmapfile="geography/europe/austria.png" x="443" y="328" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/austria.ogg">
-        <_tooltip>Austria</_tooltip>
+  <Shape name="A" pixmapfile="geography/southamerica/argentina.png" x="410" y="380" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/argentina.ogg">
+        <_tooltip>Argentina</_tooltip>
   </Shape>
-  <Shape name="O" pixmapfile="geography/europe/belgium.png" x="335" y="286" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/belgium.ogg">
-        <_tooltip>Belgium</_tooltip>
+  <Shape name="B" pixmapfile="geography/southamerica/bolivia.png" x="390" y="224" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/bolivia.ogg">
+        <_tooltip>Bolivia</_tooltip>
   </Shape>
-  <Shape name="B" pixmapfile="geography/europe/denmark.png" x="399" y="203" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/denmark.ogg">
-        <_tooltip>Denmark</_tooltip>
+  <Shape name="C" pixmapfile="geography/southamerica/brazil.png" x="453" y="203" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/brazil.ogg">
+        <_tooltip>Brazil</_tooltip>
   </Shape>
-  <Shape name="A" pixmapfile="geography/europe/finland.png" x="554" y="75" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/finland.ogg">
-        <_tooltip>Finland</_tooltip>
+  <Shape name="D" pixmapfile="geography/southamerica/chile.png" x="375" y="369" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/chile.ogg">
+        <_tooltip>Chile</_tooltip>
   </Shape>
-  <Shape name="D" pixmapfile="geography/europe/france.png" x="312" y="351" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/france.ogg">
-        <_tooltip>France</_tooltip>
+  <Shape name="E" pixmapfile="geography/southamerica/colombia.png" x="314" y="81" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/colombia.ogg">
+        <_tooltip>Colombia</_tooltip>
   </Shape>
-  <Shape name="H" pixmapfile="geography/europe/germany.png" x="405" y="277" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/germany.ogg">
-        <_tooltip>Germany</_tooltip>
+  <Shape name="F" pixmapfile="geography/southamerica/ecuador.png" x="279" y="128" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/ecuador.ogg">
+        <_tooltip>Ecuador</_tooltip>
   </Shape>
-  <Shape name="F" pixmapfile="geography/europe/iceland.png" x="141" y="54" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/iceland.ogg">
-        <_tooltip>Iceland</_tooltip>
+  <Shape name="G" pixmapfile="geography/southamerica/french_guiana.png" x="454" y="77" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/french_guiana.ogg">
+        <_tooltip>French Guiana</_tooltip>
   </Shape>
-  <Shape name="R" pixmapfile="geography/europe/ireland.png" x="186" y="249" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/ireland.ogg">
-        <_tooltip>Ireland</_tooltip>
+  <Shape name="H" pixmapfile="geography/southamerica/guyana.png" x="413" y="72" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/guyana.ogg">
+        <_tooltip>Guyana</_tooltip>
   </Shape>
-  <Shape name="I" pixmapfile="geography/europe/italy.png" x="439" y="417" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/italy.ogg">
-        <_tooltip>Italy</_tooltip>
+  <Shape name="I" pixmapfile="geography/southamerica/panama.png" x="263" y="54" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/panama.ogg">
+        <_tooltip>Panama</_tooltip>
   </Shape>
-  <Shape name="L" pixmapfile="geography/europe/luxembourg.png" type="SHAPE_BACKGROUND" x="354" y="298" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/luxembourg.ogg">
-        <_tooltip>Luxembourg</_tooltip>
+  <Shape name="J" pixmapfile="geography/southamerica/paraguay.png" x="428" y="270" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/paraguay.ogg">
+        <_tooltip>Paraguay</_tooltip>
   </Shape>
-  <Shape name="N" pixmapfile="geography/europe/netherland.png" x="342" y="261" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/netherland.ogg">
-        <_tooltip>The Netherlands</_tooltip>
+  <Shape name="K" pixmapfile="geography/southamerica/peru.png" x="305" y="178" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/peru.ogg">
+        <_tooltip>Peru</_tooltip>
   </Shape>
-  <Shape name="M" pixmapfile="geography/europe/norway.png" x="462" y="85" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/norway.ogg">
-        <_tooltip>Norway</_tooltip>
+  <Shape name="L" pixmapfile="geography/southamerica/suriname.png" x="434" y="77" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/suriname.ogg">
+        <_tooltip>Suriname</_tooltip>
   </Shape>
-  <Shape name="C" pixmapfile="geography/europe/portugal.png" x="182" y="453" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/portugal.ogg">
-        <_tooltip>Portugal</_tooltip>
+  <Shape name="M" pixmapfile="geography/southamerica/uruguay.png" x="452" y="333" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/uruguay.ogg">
+        <_tooltip>Uruguay</_tooltip>
   </Shape>
-  <Shape name="P" pixmapfile="geography/europe/spain.png" x="252" y="448" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/spain.ogg">
-        <_tooltip>Spain</_tooltip>
+  <Shape name="N" pixmapfile="geography/southamerica/venezuela.png" x="357" y="66" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/venezuela.ogg">
+        <_tooltip>Venezuela</_tooltip>
   </Shape>
-  <Shape name="Q" pixmapfile="geography/europe/sweden.png" x="467" y="118" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/sweden.ogg">
-        <_tooltip>Sweden</_tooltip>
-  </Shape>
-  <Shape name="J" pixmapfile="geography/europe/switz.png" x="383" y="341" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/switz.ogg">
-        <_tooltip>Switzerland</_tooltip>
-  </Shape>
-  <Shape name="G" pixmapfile="geography/europe/united_kingdom.png" x="241" y="226" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/united_kingdom.ogg">
-        <_tooltip>United Kingdom</_tooltip>
-  </Shape>
-  <Shape name="Z" pixmapfile="geography/europe/europe.png" type="SHAPE_BACKGROUND" x="450" y="260" zoomx="1" zoomy="1" position="0"/>
+  <Shape name="1" pixmapfile="geography/southamerica/south_america.png" type="SHAPE_BACKGROUND" x="420" y="260" zoomx="1" zoomy="1" position="0"/>
 </ShapeGame>
 
diff --git a/src/geography-activity/resources/geography/board4_0.xml.in b/src/geography-activity/resources/geography/board4_0.xml.in
index 0497663..5a23420 100644
--- a/src/geography-activity/resources/geography/board4_0.xml.in
+++ b/src/geography-activity/resources/geography/board4_0.xml.in
@@ -1,141 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <ShapeGame>
-    <Title x="190" y="500" justification="GTK_JUSTIFY_CENTER">
-         <_name>Northern Africa</_name>
-    </Title>
-
-<Shape name="A" pixmapfile="geography/africa/algeria.png" sound="voices/$LOCALE/geography/algeria.ogg" x="286" y="150" position="0">
-	<_tooltip>Algeria</_tooltip>
-</Shape>
-
-<Shape name="B" pixmapfile="geography/africa/benin.png" sound="voices/$LOCALE/geography/benin.ogg" x="275" y="341" position="0">
-	<_tooltip>Benin</_tooltip>
-</Shape>
-
-<Shape name="C" pixmapfile="geography/africa/burkina_faso.png" sound="voices/$LOCALE/geography/burkina_faso.ogg" x="236" y="310" position="0">
-	<_tooltip>Burkina Faso</_tooltip>
-</Shape>
-
-<Shape name="D" pixmapfile="geography/africa/cameroon.png" sound="voices/$LOCALE/geography/cameroon.ogg" x="383" y="377" position="0">
-	<_tooltip>Cameroon</_tooltip>
-</Shape>
-
-<Shape name="E" pixmapfile="geography/africa/central_african_republic.png" sound="voices/$LOCALE/geography/central_african_republic.ogg" x="465" y="370" position="0">
-	<_tooltip>Central African Republic</_tooltip>
-</Shape>
-
-<Shape name="F" pixmapfile="geography/africa/chad.png" sound="voices/$LOCALE/geography/chad.ogg" x="446" y="281" position="0">
-	<_tooltip>Chad</_tooltip>
-</Shape>
-
-<Shape name="G" pixmapfile="geography/africa/djibouti.png" sound="voices/$LOCALE/geography/djibouti.ogg" x="684" y="324" position="0">
-	<_tooltip>Djibouti</_tooltip>
-</Shape>
-
-<Shape name="H" pixmapfile="geography/africa/egypt.png" sound="voices/$LOCALE/geography/egypt.ogg" x="559" y="164" position="0">
-	<_tooltip>Egypt</_tooltip>
-</Shape>
-
-<Shape name="I" pixmapfile="geography/africa/equatorial_guinea.png" sound="voices/$LOCALE/geography/equatorial_guinea.ogg" x="373" y="436" position="0">
-	<_tooltip>Equatorial Guinea</_tooltip>
-</Shape>
-
-<Shape name="J" pixmapfile="geography/africa/ethiopia.png" sound="voices/$LOCALE/geography/ethiopia.ogg" x="662" y="356" position="0">
-	<_tooltip>Ethiopia</_tooltip>
-</Shape>
-
-<Shape name="erytrea" pixmapfile="geography/africa/eritrea.png" sound="voices/$LOCALE/geography/eritrea.ogg" x="655" y="293" zoomx="1" zoomy="1" position="0">
-<_tooltip>Eritrea</_tooltip>
-</Shape>
-
-<Shape name="K" pixmapfile="geography/africa/gabon.png" sound="voices/$LOCALE/geography/gabon.ogg" x="388" y="462" position="0">
-	<_tooltip>Gabon</_tooltip>
-</Shape>
-
-<Shape name="L" pixmapfile="geography/africa/ganbia.png" sound="voices/$LOCALE/geography/gambia.ogg" x="101" y="290" position="0">
-	<_tooltip>Gambia</_tooltip>
-</Shape>
-
-<Shape name="M" pixmapfile="geography/africa/ghana.png" sound="voices/$LOCALE/geography/ghana.ogg" x="237" y="355" position="0">
-	<_tooltip>Ghana</_tooltip>
-</Shape>
-
-<Shape name="N" pixmapfile="geography/africa/guinea_bissau.png" sound="voices/$LOCALE/geography/guinea_bissau.ogg" x="103" y="306" position="0">
-	<_tooltip>Guinea Bissau</_tooltip>
-</Shape>
-
-<Shape name="O" pixmapfile="geography/africa/guinea.png" sound="voices/$LOCALE/geography/guinea.ogg" x="137" y="325" position="0">
-	<_tooltip>Guinea</_tooltip>
-</Shape>
-
-<Shape name="P" pixmapfile="geography/africa/ivory_coast.png" sound="voices/$LOCALE/geography/ivory_coast.ogg" x="192" y="356" position="0">
-	<_tooltip>Ivory Coast</_tooltip>
-</Shape>
-
-<Shape name="Q" pixmapfile="geography/africa/liberia.png" sound="voices/$LOCALE/geography/liberia.ogg" x="152" y="366" position="0">
-	<_tooltip>Liberia</_tooltip>
-</Shape>
-
-<Shape name="R" pixmapfile="geography/africa/libya.png" sound="voices/$LOCALE/geography/libya.ogg" x="432" y="173" position="0">
-	<_tooltip>Libya</_tooltip>
-</Shape>
-
-<Shape name="S" pixmapfile="geography/africa/mali.png" sound="voices/$LOCALE/geography/mali.ogg" x="219" y="250" position="0">
-	<_tooltip>Mali</_tooltip>
-</Shape>
-
-<Shape name="T" pixmapfile="geography/africa/mauritania.png" sound="voices/$LOCALE/geography/mauritania.ogg" x="161" y="211" position="0">
-	<_tooltip>Mauritania</_tooltip>
-</Shape>
-
-<Shape name="U" pixmapfile="geography/africa/moroco.png" sound="voices/$LOCALE/geography/moroco.ogg" x="212" y="101" position="0">
-	<_tooltip>Morocco</_tooltip>
-</Shape>
-
-<Shape name="V" pixmapfile="geography/africa/nigeria.png" sound="voices/$LOCALE/geography/nigeria.ogg" x="341" y="344" position="0">
-	<_tooltip>Nigeria</_tooltip>
-</Shape>
-
-<Shape name="W" pixmapfile="geography/africa/niger.png" sound="voices/$LOCALE/geography/niger.ogg" x="338" y="256" position="0">
-	<_tooltip>Niger</_tooltip>
-</Shape>
-
-<Shape name="X" pixmapfile="geography/africa/rwanda.png" sound="voices/$LOCALE/geography/rwanda.ogg" x="565" y="474" position="0">
-	<_tooltip>Rwanda</_tooltip>
-</Shape>
-
-<Shape name="Y" pixmapfile="geography/africa/senegal.png" sound="voices/$LOCALE/geography/senegal.ogg" x="106" y="277" position="0">
-	<_tooltip>Senegal</_tooltip>
-</Shape>
-
-<Shape name="Z" pixmapfile="geography/africa/sierra_leone.png" sound="voices/$LOCALE/geography/sierra_leone.ogg" x="133" y="340" position="0">
-	<_tooltip>Sierra Leone</_tooltip>
-</Shape>
-
-<Shape name="AA" pixmapfile="geography/africa/somalia.png" sound="voices/$LOCALE/geography/somalia.ogg" x="720" y="396" position="0">
-	<_tooltip>Somalia</_tooltip>
-</Shape>
-
-<Shape name="AB" pixmapfile="geography/africa/sudan.png" sound="voices/$LOCALE/geography/sudan.ogg" x="557" y="306" position="0">
-	<_tooltip>Sudan</_tooltip>
-</Shape>
-
-<Shape name="AC" pixmapfile="geography/africa/togo.png" sound="voices/$LOCALE/geography/togo.ogg" x="258" y="348" position="0">
-	<_tooltip>Togo</_tooltip>
-</Shape>
-
-<Shape name="AD" pixmapfile="geography/africa/tunisia.png" sound="voices/$LOCALE/geography/tunisia.ogg" x="367" y="92" position="0">
-	<_tooltip>Tunisia</_tooltip>
-</Shape>
-
-<Shape name="AE" pixmapfile="geography/africa/uganda.png" sound="voices/$LOCALE/geography/uganda.ogg" x="587" y="436" position="0">
-	<_tooltip>Uganda</_tooltip>
-</Shape>
-
-<Shape name="AF" pixmapfile="geography/africa/western_sahara.png" sound="voices/$LOCALE/geography/western_sahara.ogg" x="148" y="170" position="0">
-	<_tooltip>Western Sahara</_tooltip>
-</Shape>
-
-<Shape name="1" pixmapfile="geography/africa/north_africa.png" type="SHAPE_BACKGROUND" x="420" y="260" position="0"/>
+  <Title x="270" y="40" justification="GTK_JUSTIFY_CENTER">
+    <_name>Western Europe</_name>
+  </Title>
+  <Shape name="E" pixmapfile="geography/europe/austria.png" x="443" y="328" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/austria.ogg">
+        <_tooltip>Austria</_tooltip>
+  </Shape>
+  <Shape name="O" pixmapfile="geography/europe/belgium.png" x="335" y="286" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/belgium.ogg">
+        <_tooltip>Belgium</_tooltip>
+  </Shape>
+  <Shape name="B" pixmapfile="geography/europe/denmark.png" x="399" y="203" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/denmark.ogg">
+        <_tooltip>Denmark</_tooltip>
+  </Shape>
+  <Shape name="A" pixmapfile="geography/europe/finland.png" x="554" y="75" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/finland.ogg">
+        <_tooltip>Finland</_tooltip>
+  </Shape>
+  <Shape name="D" pixmapfile="geography/europe/france.png" x="312" y="351" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/france.ogg">
+        <_tooltip>France</_tooltip>
+  </Shape>
+  <Shape name="H" pixmapfile="geography/europe/germany.png" x="405" y="277" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/germany.ogg">
+        <_tooltip>Germany</_tooltip>
+  </Shape>
+  <Shape name="F" pixmapfile="geography/europe/iceland.png" x="141" y="54" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/iceland.ogg">
+        <_tooltip>Iceland</_tooltip>
+  </Shape>
+  <Shape name="R" pixmapfile="geography/europe/ireland.png" x="186" y="249" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/ireland.ogg">
+        <_tooltip>Ireland</_tooltip>
+  </Shape>
+  <Shape name="I" pixmapfile="geography/europe/italy.png" x="439" y="417" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/italy.ogg">
+        <_tooltip>Italy</_tooltip>
+  </Shape>
+  <Shape name="L" pixmapfile="geography/europe/luxembourg.png" type="SHAPE_BACKGROUND" x="354" y="298" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/luxembourg.ogg">
+        <_tooltip>Luxembourg</_tooltip>
+  </Shape>
+  <Shape name="N" pixmapfile="geography/europe/netherland.png" x="342" y="261" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/netherland.ogg">
+        <_tooltip>The Netherlands</_tooltip>
+  </Shape>
+  <Shape name="M" pixmapfile="geography/europe/norway.png" x="462" y="85" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/norway.ogg">
+        <_tooltip>Norway</_tooltip>
+  </Shape>
+  <Shape name="C" pixmapfile="geography/europe/portugal.png" x="182" y="453" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/portugal.ogg">
+        <_tooltip>Portugal</_tooltip>
+  </Shape>
+  <Shape name="P" pixmapfile="geography/europe/spain.png" x="252" y="448" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/spain.ogg">
+        <_tooltip>Spain</_tooltip>
+  </Shape>
+  <Shape name="Q" pixmapfile="geography/europe/sweden.png" x="467" y="118" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/sweden.ogg">
+        <_tooltip>Sweden</_tooltip>
+  </Shape>
+  <Shape name="J" pixmapfile="geography/europe/switz.png" x="383" y="341" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/switz.ogg">
+        <_tooltip>Switzerland</_tooltip>
+  </Shape>
+  <Shape name="G" pixmapfile="geography/europe/united_kingdom.png" x="241" y="226" zoomx="1" zoomy="1" position="0" sound="voices/$LOCALE/geography/united_kingdom.ogg">
+        <_tooltip>United Kingdom</_tooltip>
+  </Shape>
+  <Shape name="Z" pixmapfile="geography/europe/europe.png" type="SHAPE_BACKGROUND" x="450" y="260" zoomx="1" zoomy="1" position="0"/>
 </ShapeGame>
+
diff --git a/src/geography-activity/resources/geography/board3_1.xml.in b/src/geography-activity/resources/geography/board5_0.xml.in
similarity index 100%
rename from src/geography-activity/resources/geography/board3_1.xml.in
rename to src/geography-activity/resources/geography/board5_0.xml.in
diff --git a/src/geography-activity/resources/geography/board6_0.xml.in b/src/geography-activity/resources/geography/board6_0.xml.in
new file mode 100644
index 0000000..0497663
--- /dev/null
+++ b/src/geography-activity/resources/geography/board6_0.xml.in
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<ShapeGame>
+    <Title x="190" y="500" justification="GTK_JUSTIFY_CENTER">
+         <_name>Northern Africa</_name>
+    </Title>
+
+<Shape name="A" pixmapfile="geography/africa/algeria.png" sound="voices/$LOCALE/geography/algeria.ogg" x="286" y="150" position="0">
+	<_tooltip>Algeria</_tooltip>
+</Shape>
+
+<Shape name="B" pixmapfile="geography/africa/benin.png" sound="voices/$LOCALE/geography/benin.ogg" x="275" y="341" position="0">
+	<_tooltip>Benin</_tooltip>
+</Shape>
+
+<Shape name="C" pixmapfile="geography/africa/burkina_faso.png" sound="voices/$LOCALE/geography/burkina_faso.ogg" x="236" y="310" position="0">
+	<_tooltip>Burkina Faso</_tooltip>
+</Shape>
+
+<Shape name="D" pixmapfile="geography/africa/cameroon.png" sound="voices/$LOCALE/geography/cameroon.ogg" x="383" y="377" position="0">
+	<_tooltip>Cameroon</_tooltip>
+</Shape>
+
+<Shape name="E" pixmapfile="geography/africa/central_african_republic.png" sound="voices/$LOCALE/geography/central_african_republic.ogg" x="465" y="370" position="0">
+	<_tooltip>Central African Republic</_tooltip>
+</Shape>
+
+<Shape name="F" pixmapfile="geography/africa/chad.png" sound="voices/$LOCALE/geography/chad.ogg" x="446" y="281" position="0">
+	<_tooltip>Chad</_tooltip>
+</Shape>
+
+<Shape name="G" pixmapfile="geography/africa/djibouti.png" sound="voices/$LOCALE/geography/djibouti.ogg" x="684" y="324" position="0">
+	<_tooltip>Djibouti</_tooltip>
+</Shape>
+
+<Shape name="H" pixmapfile="geography/africa/egypt.png" sound="voices/$LOCALE/geography/egypt.ogg" x="559" y="164" position="0">
+	<_tooltip>Egypt</_tooltip>
+</Shape>
+
+<Shape name="I" pixmapfile="geography/africa/equatorial_guinea.png" sound="voices/$LOCALE/geography/equatorial_guinea.ogg" x="373" y="436" position="0">
+	<_tooltip>Equatorial Guinea</_tooltip>
+</Shape>
+
+<Shape name="J" pixmapfile="geography/africa/ethiopia.png" sound="voices/$LOCALE/geography/ethiopia.ogg" x="662" y="356" position="0">
+	<_tooltip>Ethiopia</_tooltip>
+</Shape>
+
+<Shape name="erytrea" pixmapfile="geography/africa/eritrea.png" sound="voices/$LOCALE/geography/eritrea.ogg" x="655" y="293" zoomx="1" zoomy="1" position="0">
+<_tooltip>Eritrea</_tooltip>
+</Shape>
+
+<Shape name="K" pixmapfile="geography/africa/gabon.png" sound="voices/$LOCALE/geography/gabon.ogg" x="388" y="462" position="0">
+	<_tooltip>Gabon</_tooltip>
+</Shape>
+
+<Shape name="L" pixmapfile="geography/africa/ganbia.png" sound="voices/$LOCALE/geography/gambia.ogg" x="101" y="290" position="0">
+	<_tooltip>Gambia</_tooltip>
+</Shape>
+
+<Shape name="M" pixmapfile="geography/africa/ghana.png" sound="voices/$LOCALE/geography/ghana.ogg" x="237" y="355" position="0">
+	<_tooltip>Ghana</_tooltip>
+</Shape>
+
+<Shape name="N" pixmapfile="geography/africa/guinea_bissau.png" sound="voices/$LOCALE/geography/guinea_bissau.ogg" x="103" y="306" position="0">
+	<_tooltip>Guinea Bissau</_tooltip>
+</Shape>
+
+<Shape name="O" pixmapfile="geography/africa/guinea.png" sound="voices/$LOCALE/geography/guinea.ogg" x="137" y="325" position="0">
+	<_tooltip>Guinea</_tooltip>
+</Shape>
+
+<Shape name="P" pixmapfile="geography/africa/ivory_coast.png" sound="voices/$LOCALE/geography/ivory_coast.ogg" x="192" y="356" position="0">
+	<_tooltip>Ivory Coast</_tooltip>
+</Shape>
+
+<Shape name="Q" pixmapfile="geography/africa/liberia.png" sound="voices/$LOCALE/geography/liberia.ogg" x="152" y="366" position="0">
+	<_tooltip>Liberia</_tooltip>
+</Shape>
+
+<Shape name="R" pixmapfile="geography/africa/libya.png" sound="voices/$LOCALE/geography/libya.ogg" x="432" y="173" position="0">
+	<_tooltip>Libya</_tooltip>
+</Shape>
+
+<Shape name="S" pixmapfile="geography/africa/mali.png" sound="voices/$LOCALE/geography/mali.ogg" x="219" y="250" position="0">
+	<_tooltip>Mali</_tooltip>
+</Shape>
+
+<Shape name="T" pixmapfile="geography/africa/mauritania.png" sound="voices/$LOCALE/geography/mauritania.ogg" x="161" y="211" position="0">
+	<_tooltip>Mauritania</_tooltip>
+</Shape>
+
+<Shape name="U" pixmapfile="geography/africa/moroco.png" sound="voices/$LOCALE/geography/moroco.ogg" x="212" y="101" position="0">
+	<_tooltip>Morocco</_tooltip>
+</Shape>
+
+<Shape name="V" pixmapfile="geography/africa/nigeria.png" sound="voices/$LOCALE/geography/nigeria.ogg" x="341" y="344" position="0">
+	<_tooltip>Nigeria</_tooltip>
+</Shape>
+
+<Shape name="W" pixmapfile="geography/africa/niger.png" sound="voices/$LOCALE/geography/niger.ogg" x="338" y="256" position="0">
+	<_tooltip>Niger</_tooltip>
+</Shape>
+
+<Shape name="X" pixmapfile="geography/africa/rwanda.png" sound="voices/$LOCALE/geography/rwanda.ogg" x="565" y="474" position="0">
+	<_tooltip>Rwanda</_tooltip>
+</Shape>
+
+<Shape name="Y" pixmapfile="geography/africa/senegal.png" sound="voices/$LOCALE/geography/senegal.ogg" x="106" y="277" position="0">
+	<_tooltip>Senegal</_tooltip>
+</Shape>
+
+<Shape name="Z" pixmapfile="geography/africa/sierra_leone.png" sound="voices/$LOCALE/geography/sierra_leone.ogg" x="133" y="340" position="0">
+	<_tooltip>Sierra Leone</_tooltip>
+</Shape>
+
+<Shape name="AA" pixmapfile="geography/africa/somalia.png" sound="voices/$LOCALE/geography/somalia.ogg" x="720" y="396" position="0">
+	<_tooltip>Somalia</_tooltip>
+</Shape>
+
+<Shape name="AB" pixmapfile="geography/africa/sudan.png" sound="voices/$LOCALE/geography/sudan.ogg" x="557" y="306" position="0">
+	<_tooltip>Sudan</_tooltip>
+</Shape>
+
+<Shape name="AC" pixmapfile="geography/africa/togo.png" sound="voices/$LOCALE/geography/togo.ogg" x="258" y="348" position="0">
+	<_tooltip>Togo</_tooltip>
+</Shape>
+
+<Shape name="AD" pixmapfile="geography/africa/tunisia.png" sound="voices/$LOCALE/geography/tunisia.ogg" x="367" y="92" position="0">
+	<_tooltip>Tunisia</_tooltip>
+</Shape>
+
+<Shape name="AE" pixmapfile="geography/africa/uganda.png" sound="voices/$LOCALE/geography/uganda.ogg" x="587" y="436" position="0">
+	<_tooltip>Uganda</_tooltip>
+</Shape>
+
+<Shape name="AF" pixmapfile="geography/africa/western_sahara.png" sound="voices/$LOCALE/geography/western_sahara.ogg" x="148" y="170" position="0">
+	<_tooltip>Western Sahara</_tooltip>
+</Shape>
+
+<Shape name="1" pixmapfile="geography/africa/north_africa.png" type="SHAPE_BACKGROUND" x="420" y="260" position="0"/>
+</ShapeGame>
diff --git a/src/geography-activity/resources/geography/board4_1.xml.in b/src/geography-activity/resources/geography/board7_0.xml.in
similarity index 100%
rename from src/geography-activity/resources/geography/board4_1.xml.in
rename to src/geography-activity/resources/geography/board7_0.xml.in
diff --git a/src/geography-activity/resources/geography/board4_2.xml.in b/src/geography-activity/resources/geography/board8_0.xml.in
similarity index 100%
rename from src/geography-activity/resources/geography/board4_2.xml.in
rename to src/geography-activity/resources/geography/board8_0.xml.in
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]