gcompris r3399 - in branches/GCOMPRIS_8_3: . boards/geography_country boards/geography_country/canada_region boards/geography_country/mexico

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Sat May  3 16:54:50 2008
New Revision: 3399
URL: http://svn.gnome.org/viewvc/gcompris?rev=3399&view=rev

Log:
	Merged from trunk 3396
	- Added mexican geography map by Little_Bear (jorge.diaz on gmail.com)
	- Fixed canadian map that was too much on the left so that buttons
	  was not easily accessible.


Added:
   branches/GCOMPRIS_8_3/boards/geography_country/board9_0.xml.in
      - copied unchanged from r3396, /trunk/boards/geography_country/board9_0.xml.in
   branches/GCOMPRIS_8_3/boards/geography_country/mexico/
      - copied from r3396, /trunk/boards/geography_country/mexico/
Modified:
   branches/GCOMPRIS_8_3/ChangeLog
   branches/GCOMPRIS_8_3/boards/geography_country/Makefile.am
   branches/GCOMPRIS_8_3/boards/geography_country/board8_0.xml.in
   branches/GCOMPRIS_8_3/boards/geography_country/canada_region/background.png

Modified: branches/GCOMPRIS_8_3/boards/geography_country/Makefile.am
==============================================================================
--- branches/GCOMPRIS_8_3/boards/geography_country/Makefile.am	(original)
+++ branches/GCOMPRIS_8_3/boards/geography_country/Makefile.am	Sat May  3 16:54:50 2008
@@ -11,7 +11,8 @@
 	board5_2.xml.in \
 	board6_0.xml.in \
 	board7_0.xml.in \
-	board8_0.xml.in 
+	board8_0.xml.in \
+	board9_0.xml.in
 
 xml_DATA = $(xml_in_files:.xml.in=.xml)
 

Modified: branches/GCOMPRIS_8_3/boards/geography_country/board8_0.xml.in
==============================================================================
--- branches/GCOMPRIS_8_3/boards/geography_country/board8_0.xml.in	(original)
+++ branches/GCOMPRIS_8_3/boards/geography_country/board8_0.xml.in	Sat May  3 16:54:50 2008
@@ -2,13 +2,13 @@
 <ShapeGame><!-- Created with GComprisShapegame gimp script -->
 <title justification="GTK_JUSTIFY_CENTER" x="600" y="495">
 <name>Regions of Canada</name></title>
-<shape name="Prince Edward Island" pixmapfile="geography_country/canada_region/prince_edward_island.png" position="0" sound="sounds/$LOCALE/geography/canada_region/Prince Edward Island.ogg" x="682.0" y="388.5">
+<shape name="Prince Edward Island" pixmapfile="geography_country/canada_region/prince_edward_island.png" position="0" sound="sounds/$LOCALE/geography/canada_region/Prince_Edward_Island.ogg" x="682.0" y="388.5">
 <tooltip>Prince Edward Island</tooltip></shape>
-<shape name="Nova Scotia" pixmapfile="geography_country/canada_region/nova_scotia.png" position="0" sound="sounds/$LOCALE/geography/canada_region/Nova Scotia.ogg" x="693.0" y="401.0">
+<shape name="Nova Scotia" pixmapfile="geography_country/canada_region/nova_scotia.png" position="0" sound="sounds/$LOCALE/geography/canada_region/Nova_Scotia.ogg" x="693.0" y="401.0">
 <tooltip>Nova Scotia</tooltip></shape>
-<shape name="New Brunswick" pixmapfile="geography_country/canada_region/new_brunswick.png" position="0" sound="sounds/$LOCALE/geography/canada_region/New Brunswick.ogg" x="650.5" y="399.5">
+<shape name="New Brunswick" pixmapfile="geography_country/canada_region/new_brunswick.png" position="0" sound="sounds/$LOCALE/geography/canada_region/New_Brunswick.ogg" x="650.5" y="399.5">
 <tooltip>New Brunswick</tooltip></shape>
-<shape name="Newfoundland and Labrador" pixmapfile="geography_country/canada_region/newfoundland_and_labrador.png" position="0" sound="sounds/$LOCALE/geography/canada_region/Newfoundland and Labrador.ogg" x="676.5" y="311.5">
+<shape name="Newfoundland and Labrador" pixmapfile="geography_country/canada_region/newfoundland_and_labrador.png" position="0" sound="sounds/$LOCALE/geography/canada_region/Newfoundland_and_Labrador.ogg" x="676.5" y="311.5">
 <tooltip>Newfoundland and Labrador</tooltip></shape>
 <shape name="Quebec" pixmapfile="geography_country/canada_region/quebec.png" position="0" sound="sounds/$LOCALE/geography/canada_region/Quebec.ogg" x="585.0" y="346.5">
 <tooltip>Quebec</tooltip></shape>
@@ -22,12 +22,12 @@
 <tooltip>Alberta</tooltip></shape>
 <shape name="Nunavut" pixmapfile="geography_country/canada_region/nunavut.png" position="0" sound="sounds/$LOCALE/geography/canada_region/Nunavut.ogg" x="390.0" y="163.0">
 <tooltip>Nunavut</tooltip></shape>
-<shape name="Northwest Territories" pixmapfile="geography_country/canada_region/northwest_territories.png" position="0" sound="sounds/$LOCALE/geography/canada_region/Northwest Territories.ogg" x="228.5" y="192.5">
+<shape name="Northwest Territories" pixmapfile="geography_country/canada_region/northwest_territories.png" position="0" sound="sounds/$LOCALE/geography/canada_region/Northwest_Territories.ogg" x="228.5" y="192.5">
 <tooltip>Northwest Territories</tooltip></shape>
-<shape name="British Columbia" pixmapfile="geography_country/canada_region/british_columbia.png" position="0" sound="sounds/$LOCALE/geography/canada_region/British Columbia.ogg" x="114.5" y="308.5">
+<shape name="British Columbia" pixmapfile="geography_country/canada_region/british_columbia.png" position="0" sound="sounds/$LOCALE/geography/canada_region/British_Columbia.ogg" x="114.5" y="308.5">
 <tooltip>British Columbia</tooltip></shape>
 <shape name="Yukon" pixmapfile="geography_country/canada_region/yukon.png" position="0" sound="sounds/$LOCALE/geography/canada_region/Yukon.ogg" x="107.5" y="196.0">
 <tooltip>Yukon</tooltip></shape>
-<shape name="background" pixmapfile="geography_country/canada_region/background.png" position="0" sound="sounds/$LOCALE/geography/canada_region/background.ogg" type="SHAPE_BACKGROUND" x="399.5" y="260.0">
+<shape name="background" pixmapfile="geography_country/canada_region/background.png" position="0" sound="sounds/$LOCALE/geography/canada_region/background.ogg" type="SHAPE_BACKGROUND" x="412" y="260.0">
 <tooltip>background</tooltip></shape>
 </ShapeGame>

Modified: branches/GCOMPRIS_8_3/boards/geography_country/canada_region/background.png
==============================================================================
Binary files. No diff available.