[gcompris] lang activity: reworked the number level using images from wikicommons.



commit 9c4d7ffd569287ebb7d214d9b5828c79999a3db5
Author: Bruno Coudoin <bruno coudoin free fr>
Date:   Mon Apr 9 18:32:16 2012 +0200

    lang activity: reworked the number level using images from wikicommons.

 src/lang-activity/langFindit.py                    |    2 +-
 src/lang-activity/resources/lang/Makefile.am       |   23 +-
 src/lang-activity/resources/lang/lang.xml.in       |   40 +-
 .../resources/lang/numbers/10_litchis.jpg          |  Bin 0 -> 25039 bytes
 .../resources/lang/numbers/1_mango.jpg             |  Bin 0 -> 28759 bytes
 .../resources/lang/numbers/2_pears.jpg             |  Bin 0 -> 19287 bytes
 .../resources/lang/numbers/3_apples.jpg            |  Bin 0 -> 12922 bytes
 .../resources/lang/numbers/4_bananas.jpg           |  Bin 0 -> 15372 bytes
 .../resources/lang/numbers/5_lemons.jpg            |  Bin 0 -> 36006 bytes
 .../resources/lang/numbers/6_oranges.jpg           |  Bin 0 -> 34110 bytes
 .../resources/lang/numbers/7_strawberries.jpg      |  Bin 0 -> 28329 bytes
 .../resources/lang/numbers/8_guavas.jpg            |  Bin 0 -> 27656 bytes
 .../resources/lang/numbers/9_apricots.jpg          |  Bin 0 -> 43876 bytes
 .../resources/lang/numbers/README.txt              |    2 +
 .../resources/lang/numbers/banana.svg              | 6241 -------------
 src/lang-activity/resources/lang/numbers/empty.svg |   55 -
 src/lang-activity/resources/lang/numbers/lemon.svg | 2567 ------
 src/lang-activity/resources/lang/numbers/mango.svg |  932 --
 src/lang-activity/resources/lang/numbers/one.svg   |  783 --
 .../resources/lang/numbers/orange.svg              |  622 --
 src/lang-activity/resources/lang/numbers/peach.svg |  161 -
 src/lang-activity/resources/lang/numbers/pear.svg  | 3788 --------
 .../resources/lang/numbers/pineapples.svg          | 9126 --------------------
 .../resources/lang/numbers/raspberries.svg         | 5791 -------------
 .../resources/lang/numbers/strawberries.svg        | 3779 --------
 25 files changed, 33 insertions(+), 33879 deletions(-)
---
diff --git a/src/lang-activity/langFindit.py b/src/lang-activity/langFindit.py
index 02ada12..85faf2e 100644
--- a/src/lang-activity/langFindit.py
+++ b/src/lang-activity/langFindit.py
@@ -59,7 +59,7 @@ class SpotTarget:
                    itembg )
 
       # The text description
-      textx = 100
+      textx = 120
       item = goocanvas.Text(
           parent = rootitem,
           x = x + textx,
diff --git a/src/lang-activity/resources/lang/Makefile.am b/src/lang-activity/resources/lang/Makefile.am
index ef44191..6dd537c 100644
--- a/src/lang-activity/resources/lang/Makefile.am
+++ b/src/lang-activity/resources/lang/Makefile.am
@@ -16,19 +16,16 @@ $(xml_DATA): %.xml: %.xml.in
 
 imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/lang/numbers
 img_DATA = \
-	numbers/banana.svg \
-	numbers/empty.svg \
-	numbers/lemon.svg \
-	numbers/mango.svg \
-	numbers/one.svg \
-	numbers/orange.svg \
-	numbers/peach.svg \
-	numbers/pear.svg \
-	numbers/pineapples.svg \
-	numbers/raspberries.svg \
-	numbers/strawberries.svg
-
-
+	numbers/10_litchis.jpg \
+	numbers/1_mango.jpg \
+	numbers/2_pears.jpg \
+	numbers/3_apples.jpg \
+	numbers/4_bananas.jpg \
+	numbers/5_lemons.jpg \
+	numbers/6_oranges.jpg \
+	numbers/7_strawberries.jpg \
+	numbers/8_guavas.jpg \
+	numbers/9_apricots.jpg
 
 EXTRA_DIST = $(img_DATA) ${xml_in_files}
 CLEANFILES = $(xml_DATA)
diff --git a/src/lang-activity/resources/lang/lang.xml.in b/src/lang-activity/resources/lang/lang.xml.in
index ff798f2..2f1aff5 100644
--- a/src/lang-activity/resources/lang/lang.xml.in
+++ b/src/lang-activity/resources/lang/lang.xml.in
@@ -579,62 +579,62 @@
       <name>Numbers and fruit</name>
       <description></description>
       <Triplet>
-	<description>one apple</description>
-	<image>numbers/one.svg</image>
+	<description>One mango</description>
+	<image>numbers/1_mango.jpg</image>
 	<voice>alphabet/U0031.ogg</voice>
 	<c:type></c:type>
       </Triplet>
       <Triplet>
-	<description>two oranges</description>
-	<image>numbers/orange.svg</image>
+	<description>Two pears</description>
+	<image>numbers/2_pears.jpg</image>
 	<voice>alphabet/U0032.ogg</voice>
 	<c:type></c:type>
       </Triplet>
       <Triplet>
-	<description>three strawberries</description>
-	<image>numbers/strawberries.svg</image>
+	<description>Three apples</description>
+	<image>numbers/3_apples.jpg</image>
 	<voice>alphabet/U0033.ogg</voice>
 	<c:type></c:type>
       </Triplet>
       <Triplet>
-	<description>four lemons</description>
-	<image>numbers/lemon.svg</image>
+	<description>Four bananas</description>
+	<image>numbers/4_bananas.jpg</image>
 	<voice>alphabet/U0034.ogg</voice>
 	<c:type></c:type>
       </Triplet>
       <Triplet>
-	<description>five pears</description>
-	<image>numbers/pear.svg</image>
+	<description>Five lemons</description>
+	<image>numbers/5_lemons.jpg</image>
 	<voice>alphabet/U0035.ogg</voice>
 	<c:type></c:type>
       </Triplet>
       <Triplet>
-	<description>six bananas</description>
-	<image>numbers/banana.svg</image>
+	<description>Six oranges</description>
+	<image>numbers/6_oranges.jpg</image>
 	<voice>alphabet/U0036.ogg</voice>
 	<c:type></c:type>
       </Triplet>
       <Triplet>
-	<description>seven raspberries</description>
-	<image>numbers/raspberries.svg</image>
+	<description>Seven strawberries</description>
+	<image>numbers/7_strawberries.jpg</image>
 	<voice>alphabet/U0037.ogg</voice>
 	<c:type></c:type>
       </Triplet>
       <Triplet>
-	<description>eight pineapples</description>
-	<image>numbers/pineapples.svg</image>
+	<description>Eight guavas</description>
+	<image>numbers/8_guavas.jpg</image>
 	<voice>alphabet/U0038.ogg</voice>
 	<c:type></c:type>
       </Triplet>
       <Triplet>
-	<description>nine mangos</description>
-	<image>numbers/mango.svg</image>
+	<description>Nine apricots</description>
+	<image>numbers/9_apricots.jpg</image>
 	<voice>alphabet/U0039.ogg</voice>
 	<c:type></c:type>
       </Triplet>
       <Triplet>
-	<description>ten peaches</description>
-	<image>numbers/peach.svg</image>
+	<description>Ten litchis</description>
+	<image>numbers/10_litchis.jpg</image>
 	<voice>alphabet/10.ogg</voice>
 	<c:type></c:type>
       </Triplet>
diff --git a/src/lang-activity/resources/lang/numbers/10_litchis.jpg b/src/lang-activity/resources/lang/numbers/10_litchis.jpg
new file mode 100644
index 0000000..23f3696
Binary files /dev/null and b/src/lang-activity/resources/lang/numbers/10_litchis.jpg differ
diff --git a/src/lang-activity/resources/lang/numbers/1_mango.jpg b/src/lang-activity/resources/lang/numbers/1_mango.jpg
new file mode 100644
index 0000000..14a0b59
Binary files /dev/null and b/src/lang-activity/resources/lang/numbers/1_mango.jpg differ
diff --git a/src/lang-activity/resources/lang/numbers/2_pears.jpg b/src/lang-activity/resources/lang/numbers/2_pears.jpg
new file mode 100644
index 0000000..878ac51
Binary files /dev/null and b/src/lang-activity/resources/lang/numbers/2_pears.jpg differ
diff --git a/src/lang-activity/resources/lang/numbers/3_apples.jpg b/src/lang-activity/resources/lang/numbers/3_apples.jpg
new file mode 100644
index 0000000..c41841d
Binary files /dev/null and b/src/lang-activity/resources/lang/numbers/3_apples.jpg differ
diff --git a/src/lang-activity/resources/lang/numbers/4_bananas.jpg b/src/lang-activity/resources/lang/numbers/4_bananas.jpg
new file mode 100644
index 0000000..9d96695
Binary files /dev/null and b/src/lang-activity/resources/lang/numbers/4_bananas.jpg differ
diff --git a/src/lang-activity/resources/lang/numbers/5_lemons.jpg b/src/lang-activity/resources/lang/numbers/5_lemons.jpg
new file mode 100644
index 0000000..a0fdc20
Binary files /dev/null and b/src/lang-activity/resources/lang/numbers/5_lemons.jpg differ
diff --git a/src/lang-activity/resources/lang/numbers/6_oranges.jpg b/src/lang-activity/resources/lang/numbers/6_oranges.jpg
new file mode 100644
index 0000000..572e661
Binary files /dev/null and b/src/lang-activity/resources/lang/numbers/6_oranges.jpg differ
diff --git a/src/lang-activity/resources/lang/numbers/7_strawberries.jpg b/src/lang-activity/resources/lang/numbers/7_strawberries.jpg
new file mode 100644
index 0000000..9a0fe7c
Binary files /dev/null and b/src/lang-activity/resources/lang/numbers/7_strawberries.jpg differ
diff --git a/src/lang-activity/resources/lang/numbers/8_guavas.jpg b/src/lang-activity/resources/lang/numbers/8_guavas.jpg
new file mode 100644
index 0000000..024fb11
Binary files /dev/null and b/src/lang-activity/resources/lang/numbers/8_guavas.jpg differ
diff --git a/src/lang-activity/resources/lang/numbers/9_apricots.jpg b/src/lang-activity/resources/lang/numbers/9_apricots.jpg
new file mode 100644
index 0000000..7846f09
Binary files /dev/null and b/src/lang-activity/resources/lang/numbers/9_apricots.jpg differ
diff --git a/src/lang-activity/resources/lang/numbers/README.txt b/src/lang-activity/resources/lang/numbers/README.txt
new file mode 100644
index 0000000..a290549
--- /dev/null
+++ b/src/lang-activity/resources/lang/numbers/README.txt
@@ -0,0 +1,2 @@
+All images here commes from wikicommons:
+http://commons.wikimedia.org



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]