GNOME.org
 

[gcompris] missingletter, reworked to use images from lang/words

commit a44ea4473bb44536bd556f216ac22a36fc241422
Author: Bruno Coudoin <bcoudoin gcompris net>
Date:   Sun Oct 20 16:08:15 2013 +0200

    missingletter, reworked to use images from lang/words

 .../resources/missing_letter/Makefile.am           |   12 ++++++------
 .../resources/missing_letter/apple.png             |    1 +
 .../resources/missing_letter/avion.png             |  Bin 12883 -> 0 bytes
 .../resources/missing_letter/ball.png              |    1 +
 .../resources/missing_letter/ballon.png            |  Bin 22158 -> 0 bytes
 .../resources/missing_letter/bed.png               |  Bin 4855 -> 51 bytes
 .../resources/missing_letter/board1.xml.in         |    4 ++--
 .../resources/missing_letter/board2.xml.in         |    6 +++---
 .../resources/missing_letter/board3.xml.in         |    2 +-
 .../resources/missing_letter/board4.xml.in         |   10 +++++-----
 .../resources/missing_letter/board5.xml.in         |   14 +++++++-------
 .../resources/missing_letter/cake.png              |  Bin 25569 -> 52 bytes
 .../resources/missing_letter/car.png               |  Bin 10973 -> 51 bytes
 .../resources/missing_letter/cartable.png          |  Bin 59035 -> 0 bytes
 .../resources/missing_letter/chien.png             |  Bin 34676 -> 0 bytes
 .../resources/missing_letter/dog.png               |    1 +
 .../resources/missing_letter/fish.png              |  Bin 18127 -> 52 bytes
 .../resources/missing_letter/house.png             |    1 +
 .../resources/missing_letter/maison.png            |  Bin 31108 -> 0 bytes
 .../resources/missing_letter/plane.png             |    1 +
 .../resources/missing_letter/pomme.png             |  Bin 15335 -> 0 bytes
 .../resources/missing_letter/school_bag.png        |    1 +
 22 files changed, 30 insertions(+), 24 deletions(-)
---
diff --git a/src/missing_letter-activity/resources/missing_letter/Makefile.am 
b/src/missing_letter-activity/resources/missing_letter/Makefile.am
index 7148bc3..7a36355 100644
--- a/src/missing_letter-activity/resources/missing_letter/Makefile.am
+++ b/src/missing_letter-activity/resources/missing_letter/Makefile.am
@@ -21,8 +21,8 @@ $(xml_DATA): %.xml: %.xml.in
 
 imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/missing_letter
 img_DATA = \
-       avion.png \
-       ballon.png \
+       plane.png \
+       ball.png \
        banana.png \
        bed.png \
        bottle.png \
@@ -30,12 +30,12 @@ img_DATA = \
        button_selected.png \
        cake.png \
        car.png \
-       cartable.png \
-       chien.png \
+       school_bag.png \
+       dog.png \
        fish.png \
-       maison.png \
+       house.png \
        missingletter-bg.jpg \
-       pomme.png
+       apple.png
 
 EXTRA_DIST = $(img_DATA) ${xml_in_files}
 CLEANFILES = $(xml_DATA)
diff --git a/src/missing_letter-activity/resources/missing_letter/apple.png 
b/src/missing_letter-activity/resources/missing_letter/apple.png
new file mode 120000
index 0000000..2f46e4b
--- /dev/null
+++ b/src/missing_letter-activity/resources/missing_letter/apple.png
@@ -0,0 +1 @@
+../../../lang-activity/resources/lang/words/apple.png
\ No newline at end of file
diff --git a/src/missing_letter-activity/resources/missing_letter/ball.png 
b/src/missing_letter-activity/resources/missing_letter/ball.png
new file mode 120000
index 0000000..2427e89
--- /dev/null
+++ b/src/missing_letter-activity/resources/missing_letter/ball.png
@@ -0,0 +1 @@
+../../../lang-activity/resources/lang/words/ball.png
\ No newline at end of file
diff --git a/src/missing_letter-activity/resources/missing_letter/bed.png 
b/src/missing_letter-activity/resources/missing_letter/bed.png
deleted file mode 100644
index 80d16c1..0000000
Binary files a/src/missing_letter-activity/resources/missing_letter/bed.png and /dev/null differ
diff --git a/src/missing_letter-activity/resources/missing_letter/bed.png 
b/src/missing_letter-activity/resources/missing_letter/bed.png
new file mode 120000
index 0000000..fccc6ac
--- /dev/null
+++ b/src/missing_letter-activity/resources/missing_letter/bed.png
@@ -0,0 +1 @@
+../../../lang-activity/resources/lang/words/bed.png
\ No newline at end of file
diff --git a/src/missing_letter-activity/resources/missing_letter/board1.xml.in 
b/src/missing_letter-activity/resources/missing_letter/board1.xml.in
index b58477f..9c2bb1a 100644
--- a/src/missing_letter-activity/resources/missing_letter/board1.xml.in
+++ b/src/missing_letter-activity/resources/missing_letter/board1.xml.in
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <missing_letter>
   <Board>
-       <pixmapfile>missing_letter/avion.png</pixmapfile>
+       <pixmapfile>missing_letter/plane.png</pixmapfile>
        <_data>plane/_lane/p/g/d</_data>
   </Board>
   <Board>
-       <pixmapfile>missing_letter/chien.png</pixmapfile>
+       <pixmapfile>missing_letter/dog.png</pixmapfile>
        <_data>dog/_og/d/p/q</_data>
   </Board>
   <Board>
diff --git a/src/missing_letter-activity/resources/missing_letter/board2.xml.in 
b/src/missing_letter-activity/resources/missing_letter/board2.xml.in
index 9be0350..2cdc153 100644
--- a/src/missing_letter-activity/resources/missing_letter/board2.xml.in
+++ b/src/missing_letter-activity/resources/missing_letter/board2.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <missing_letter>
   <Board>
-       <pixmapfile>missing_letter/cartable.png</pixmapfile>
+       <pixmapfile>missing_letter/school_bag.png</pixmapfile>
        <_data>bag/b_g/a/o/i</_data>
   </Board>
   <Board>
@@ -9,11 +9,11 @@
        <_data>banana/b_nana/a/o/i</_data>
   </Board>
   <Board>
-       <pixmapfile>missing_letter/maison.png</pixmapfile>
+       <pixmapfile>missing_letter/house.png</pixmapfile>
        <_data>house/hous_/e/a/i</_data>
   </Board>
   <Board>
-       <pixmapfile>missing_letter/pomme.png</pixmapfile>
+       <pixmapfile>missing_letter/apple.png</pixmapfile>
        <_data>apple/_pple/a/i/o</_data>
   </Board>
 </missing_letter>
diff --git a/src/missing_letter-activity/resources/missing_letter/board3.xml.in 
b/src/missing_letter-activity/resources/missing_letter/board3.xml.in
index 77e7241..d05abca 100644
--- a/src/missing_letter-activity/resources/missing_letter/board3.xml.in
+++ b/src/missing_letter-activity/resources/missing_letter/board3.xml.in
@@ -13,7 +13,7 @@
        <_data>cake/_ake/c/p/d/k</_data>
   </Board>
   <Board>
-       <pixmapfile>missing_letter/ballon.png</pixmapfile>
+       <pixmapfile>missing_letter/ball.png</pixmapfile>
        <_data>ball/_all/b/p/d/m</_data>
   </Board>
 </missing_letter>
diff --git a/src/missing_letter-activity/resources/missing_letter/board4.xml.in 
b/src/missing_letter-activity/resources/missing_letter/board4.xml.in
index 0ab3748..9e918b7 100644
--- a/src/missing_letter-activity/resources/missing_letter/board4.xml.in
+++ b/src/missing_letter-activity/resources/missing_letter/board4.xml.in
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <missing_letter>
   <Board>
-       <pixmapfile>missing_letter/avion.png</pixmapfile>
+       <pixmapfile>missing_letter/plane.png</pixmapfile>
        <_data>plane/p_ane/l/j/i/t</_data>
   </Board>
   <Board>
-       <pixmapfile>missing_letter/chien.png</pixmapfile>
+       <pixmapfile>missing_letter/dog.png</pixmapfile>
        <_data>dog/d_g/o/g/a/u</_data>
   </Board>
   <Board>
@@ -17,7 +17,7 @@
        <_data>car/_ar/c/k/b/u</_data>
   </Board>
   <Board>
-       <pixmapfile>missing_letter/cartable.png</pixmapfile>
+       <pixmapfile>missing_letter/school_bag.png</pixmapfile>
        <_data>satchel/_atchel/s/c/l/z</_data>
   </Board>
   <Board>
@@ -25,11 +25,11 @@
        <_data>banana/_anana/b/p/d/m</_data>
   </Board>
   <Board>
-       <pixmapfile>missing_letter/maison.png</pixmapfile>
+       <pixmapfile>missing_letter/house.png</pixmapfile>
        <_data>house/h_use/o/f/u/i</_data>
   </Board>
   <Board>
-       <pixmapfile>missing_letter/pomme.png</pixmapfile>
+       <pixmapfile>missing_letter/apple.png</pixmapfile>
        <_data>apple/appl_/e/h/a/i/o/u</_data>
   </Board>
 </missing_letter>
diff --git a/src/missing_letter-activity/resources/missing_letter/board5.xml.in 
b/src/missing_letter-activity/resources/missing_letter/board5.xml.in
index fabf9e7..2eb0896 100644
--- a/src/missing_letter-activity/resources/missing_letter/board5.xml.in
+++ b/src/missing_letter-activity/resources/missing_letter/board5.xml.in
@@ -13,15 +13,15 @@
        <_data>cake/c_ke/a/o/e/i/u/y</_data>
   </Board>
   <Board>
-       <pixmapfile>missing_letter/ballon.png</pixmapfile>
+       <pixmapfile>missing_letter/ball.png</pixmapfile>
        <_data>ball/b_ll/a/u/o/e/i/y</_data>
   </Board>
   <Board>
-       <pixmapfile>missing_letter/avion.png</pixmapfile>
+       <pixmapfile>missing_letter/plane.png</pixmapfile>
        <_data>plane/pl_ne/a/o/s/e/i/u/y</_data>
   </Board>
   <Board>
-       <pixmapfile>missing_letter/chien.png</pixmapfile>
+       <pixmapfile>missing_letter/dog.png</pixmapfile>
        <_data>dog/do_/g/p/q/q/k</_data>
   </Board>
   <Board>
@@ -33,7 +33,7 @@
        <_data>car/ca_/r/w/k/c/a</_data>
   </Board>
   <Board>
-       <pixmapfile>missing_letter/cartable.png</pixmapfile>
+       <pixmapfile>missing_letter/school_bag.png</pixmapfile>
        <_data>satchel/sa_chel/t/p/c/z/s/l</_data>
   </Board>
   <Board>
@@ -41,11 +41,11 @@
        <_data>banana/ba_ana/n/m/b/z/q</_data>
   </Board>
   <Board>
-       <pixmapfile>missing_letter/maison.png</pixmapfile>
+       <pixmapfile>missing_letter/house.png</pixmapfile>
        <_data>house/_ouse/h/e/j/z/p/s</_data>
   </Board>
   <Board>
-       <pixmapfile>missing_letter/pomme.png</pixmapfile>
+       <pixmapfile>missing_letter/apple.png</pixmapfile>
        <_data>apple/app_e/l/h/n/i/t</_data>
   </Board>
   <Board>
@@ -61,7 +61,7 @@
        <_data>cake/ca_e/k/q/c/r/z</_data>
   </Board>
   <Board>
-       <pixmapfile>missing_letter/ballon.png</pixmapfile>
+       <pixmapfile>missing_letter/ball.png</pixmapfile>
        <_data>ball/bal_/l/h/s/z/t</_data>
   </Board>
 </missing_letter>
diff --git a/src/missing_letter-activity/resources/missing_letter/cake.png 
b/src/missing_letter-activity/resources/missing_letter/cake.png
deleted file mode 100644
index f8cceed..0000000
Binary files a/src/missing_letter-activity/resources/missing_letter/cake.png and /dev/null differ
diff --git a/src/missing_letter-activity/resources/missing_letter/cake.png 
b/src/missing_letter-activity/resources/missing_letter/cake.png
new file mode 120000
index 0000000..c6ce024
--- /dev/null
+++ b/src/missing_letter-activity/resources/missing_letter/cake.png
@@ -0,0 +1 @@
+../../../lang-activity/resources/lang/words/cake.png
\ No newline at end of file
diff --git a/src/missing_letter-activity/resources/missing_letter/car.png 
b/src/missing_letter-activity/resources/missing_letter/car.png
deleted file mode 100644
index de8128e..0000000
Binary files a/src/missing_letter-activity/resources/missing_letter/car.png and /dev/null differ
diff --git a/src/missing_letter-activity/resources/missing_letter/car.png 
b/src/missing_letter-activity/resources/missing_letter/car.png
new file mode 120000
index 0000000..a2bb217
--- /dev/null
+++ b/src/missing_letter-activity/resources/missing_letter/car.png
@@ -0,0 +1 @@
+../../../lang-activity/resources/lang/words/car.png
\ No newline at end of file
diff --git a/src/missing_letter-activity/resources/missing_letter/dog.png 
b/src/missing_letter-activity/resources/missing_letter/dog.png
new file mode 120000
index 0000000..adac4da
--- /dev/null
+++ b/src/missing_letter-activity/resources/missing_letter/dog.png
@@ -0,0 +1 @@
+../../../lang-activity/resources/lang/words/dog.png
\ No newline at end of file
diff --git a/src/missing_letter-activity/resources/missing_letter/fish.png 
b/src/missing_letter-activity/resources/missing_letter/fish.png
deleted file mode 100644
index a94cc02..0000000
Binary files a/src/missing_letter-activity/resources/missing_letter/fish.png and /dev/null differ
diff --git a/src/missing_letter-activity/resources/missing_letter/fish.png 
b/src/missing_letter-activity/resources/missing_letter/fish.png
new file mode 120000
index 0000000..9093a3e
--- /dev/null
+++ b/src/missing_letter-activity/resources/missing_letter/fish.png
@@ -0,0 +1 @@
+../../../lang-activity/resources/lang/words/fish.png
\ No newline at end of file
diff --git a/src/missing_letter-activity/resources/missing_letter/house.png 
b/src/missing_letter-activity/resources/missing_letter/house.png
new file mode 120000
index 0000000..65d80a9
--- /dev/null
+++ b/src/missing_letter-activity/resources/missing_letter/house.png
@@ -0,0 +1 @@
+../../../lang-activity/resources/lang/words/house.png
\ No newline at end of file
diff --git a/src/missing_letter-activity/resources/missing_letter/plane.png 
b/src/missing_letter-activity/resources/missing_letter/plane.png
new file mode 120000
index 0000000..8a4ffd9
--- /dev/null
+++ b/src/missing_letter-activity/resources/missing_letter/plane.png
@@ -0,0 +1 @@
+../../../lang-activity/resources/lang/words/plane.png
\ No newline at end of file
diff --git a/src/missing_letter-activity/resources/missing_letter/school_bag.png 
b/src/missing_letter-activity/resources/missing_letter/school_bag.png
new file mode 120000
index 0000000..e82b910
--- /dev/null
+++ b/src/missing_letter-activity/resources/missing_letter/school_bag.png
@@ -0,0 +1 @@
+../../../lang-activity/resources/lang/words/school_bag.png
\ No newline at end of file
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]