[gcompris] core, minor: added a bonus note to be used in musical actviities.



commit 26de48530957fac372b13f6901946df6843221cf
Author: Bruno Coudoin <bruno coudoin free fr>
Date:   Wed Aug 29 00:47:12 2012 +0200

    core, minor: added a bonus note to be used in musical actviities.

 boards/skins/gartoon/bonus/note_bad.png            |  Bin 0 -> 9019 bytes
 boards/skins/gartoon/bonus/note_good.png           |  Bin 0 -> 9539 bytes
 docs/C/python.xml                                  |    2 ++
 src/boards/py-mod-bonus.c                          |    3 ++-
 src/gcompris/bonus.c                               |    3 +++
 src/gcompris/bonus.h                               |    1 +
 .../resources/piano_composition/Makefile.am        |    2 --
 .../resources/piano_composition/happyNote.png      |  Bin 5739 -> 0 bytes
 .../resources/piano_composition/sadNote.png        |  Bin 5644 -> 0 bytes
 9 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/boards/skins/gartoon/bonus/note_bad.png b/boards/skins/gartoon/bonus/note_bad.png
new file mode 100644
index 0000000..eccc0fc
Binary files /dev/null and b/boards/skins/gartoon/bonus/note_bad.png differ
diff --git a/boards/skins/gartoon/bonus/note_good.png b/boards/skins/gartoon/bonus/note_good.png
new file mode 100644
index 0000000..3f5ed2f
Binary files /dev/null and b/boards/skins/gartoon/bonus/note_good.png differ
diff --git a/docs/C/python.xml b/docs/C/python.xml
index 3e7e402..67775e9 100644
--- a/docs/C/python.xml
+++ b/docs/C/python.xml
@@ -624,6 +624,8 @@ attribute is readeable and/or writable.</para>
 		<entry>BONUS_TUX</entry></row>
 	      <row><entry>gcompris.bonus.LION</entry>
 		<entry>BONUS_LION</entry></row>
+	      <row><entry>gcompris.bonus.NOTE</entry>
+		<entry>BONUS_NOTE</entry></row>
 	    </tbody>
 	  </tgroup>
 	</informaltable>
diff --git a/src/boards/py-mod-bonus.c b/src/boards/py-mod-bonus.c
index 19a5a84..37e0972 100644
--- a/src/boards/py-mod-bonus.c
+++ b/src/boards/py-mod-bonus.c
@@ -65,7 +65,8 @@ void python_gcompris_bonus_module_init(void)
   PyModule_AddIntConstant(module, "FLOWER", GC_BONUS_FLOWER );
   PyModule_AddIntConstant(module, "TUX",    GC_BONUS_TUX );
   PyModule_AddIntConstant(module, "GNU",    GC_BONUS_GNU );
-  PyModule_AddIntConstant(module, "GNU",    GC_BONUS_LION );
+  PyModule_AddIntConstant(module, "LION",    GC_BONUS_LION );
+  PyModule_AddIntConstant(module, "NOTE",    GC_BONUS_NOTE );
 
   /* GCBonusStatusList constants */
   PyModule_AddIntConstant(module, "LOOSE", GC_BOARD_LOOSE );
diff --git a/src/gcompris/bonus.c b/src/gcompris/bonus.c
index 6fc3ce6..19dbe84 100644
--- a/src/gcompris/bonus.c
+++ b/src/gcompris/bonus.c
@@ -119,6 +119,9 @@ gc_bonus_display(GCBonusStatusList gamewon, GCBonusList bonus_id)
   case GC_BONUS_LION :
     bonus_image("lion",gamewon);
     break;
+  case GC_BONUS_NOTE :
+    bonus_image("note",gamewon);
+    break;
   default :
     bonus_image("smiley",gamewon);
     break;
diff --git a/src/gcompris/bonus.h b/src/gcompris/bonus.h
index b82316b..24a65ce 100644
--- a/src/gcompris/bonus.h
+++ b/src/gcompris/bonus.h
@@ -34,6 +34,7 @@ typedef enum
   GC_BONUS_TUX,
   GC_BONUS_GNU,
   GC_BONUS_LION,
+  GC_BONUS_NOTE,
   GC_BONUS_LAST
 } GCBonusList;
 
diff --git a/src/piano_composition-activity/resources/piano_composition/Makefile.am b/src/piano_composition-activity/resources/piano_composition/Makefile.am
index 902f230..5ee63a0 100644
--- a/src/piano_composition-activity/resources/piano_composition/Makefile.am
+++ b/src/piano_composition-activity/resources/piano_composition/Makefile.am
@@ -11,14 +11,12 @@ img_DATA = \
 	flag.png \
 	gsoc2012.jpg \
 	halfNote.png \
-	happyNote.png \
 	keyboard.png \
 	load.png \
 	melodies.desktop.in \
 	mozart.jpg \
 	note_highlight.png \
 	quarterNote.png \
-	sadNote.png \
 	save.png \
 	trebleClef.png \
 	wholeNote.png



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