[gcompris] gcompris music, pianokeyBindings no more need self

[Bruno Coudoin <bcoudoin src gnome org>]

commit f6729623dd4a049183f7188d5266d6461af9ce51
Author: Bruno Coudoin <bruno coudoin free fr>
Date:   Tue Sep 11 23:20:42 2012 +0200

    gcompris music, pianokeyBindings no more need self
    
    It was relying on the caller self having a given property.
    Fixed by passing the expected property directly

 src/piano_composition-activity/gcomprismusic.py    |   79 ++++++++++----------
 .../piano_composition.py                           |    6 +-
 src/play_piano-activity/play_piano.py              |    2 +-
 3 files changed, 45 insertions(+), 42 deletions(-)
---
diff --git a/src/piano_composition-activity/gcomprismusic.py b/src/piano_composition-activity/gcomprismusic.py
index d8657c1..ec262d3 100644
--- a/src/piano_composition-activity/gcomprismusic.py
+++ b/src/piano_composition-activity/gcomprismusic.py
@@ -1243,6 +1243,47 @@ class PianoKeyboard():
             x.remove()
         self.draw(self.width, self.height, self.key_callback)
 
+
+def pianokeyBindings(keyval, keyboard_click):
+    '''
+    nice key bindings for the piano keys
+    In your activity's key_press method, call this method and pass in
+    the keyval and your keyboard_click function
+
+    def key_press(self, keyval, commit_str, preedit_str):
+
+        utf8char = gtk.gdk.keyval_to_unicode(keyval)
+        self.keyboard.pianokeyBindings(keyval, self.keyboard_click)
+    '''
+
+    if keyval == 49:
+        keyboard_click(None, None, None, 1)
+    elif keyval == 50:
+        keyboard_click(None, None, None, 2)
+    elif keyval == 51:
+        keyboard_click(None, None, None, 3)
+    elif keyval == 52:
+        keyboard_click(None, None, None, 4)
+    elif keyval == 53:
+        keyboard_click(None, None, None, 5)
+    elif keyval == 54:
+        keyboard_click(None, None, None, 6)
+    elif keyval == 55:
+        keyboard_click(None, None, None, 7)
+    elif keyval == 56:
+        keyboard_click(None, None, None, 8)
+    elif keyval == gtk.keysyms.F1:
+        keyboard_click(None, None, None, -1)
+    elif keyval == gtk.keysyms.F2:
+        keyboard_click(None, None, None, -2)
+    elif keyval == gtk.keysyms.F3:
+        keyboard_click(None, None, None, -3)
+    elif keyval == gtk.keysyms.F4:
+        keyboard_click(None, None, None, -4)
+    elif keyval == gtk.keysyms.F5:
+        keyboard_click(None, None, None, -5)
+
+
 # ---------------------------------------------------------------------------
 #
 # General UTILITY FUNCTIONS
@@ -1353,44 +1394,6 @@ def textBox(text, x, y , rootitem, width=10000,
         return text, rect
     return text
 
-def pianokeyBindings(keyval, self):
-    '''
-    nice key bindings for the piano keys
-    In your activity's key_press method, call this method and pass in the keyval and self
-
-    def key_press(self, keyval, commit_str, preedit_str):
-
-        utf8char = gtk.gdk.keyval_to_unicode(keyval)
-        pianokeyBindings(keyval, self)
-    '''
-
-    if keyval == 49:
-        self.keyboard_click(None, None, None, 1)
-    elif keyval == 50:
-        self.keyboard_click(None, None, None, 2)
-    elif keyval == 51:
-        self.keyboard_click(None, None, None, 3)
-    elif keyval == 52:
-        self.keyboard_click(None, None, None, 4)
-    elif keyval == 53:
-        self.keyboard_click(None, None, None, 5)
-    elif keyval == 54:
-        self.keyboard_click(None, None, None, 6)
-    elif keyval == 55:
-        self.keyboard_click(None, None, None, 7)
-    elif keyval == 56:
-        self.keyboard_click(None, None, None, 8)
-    elif keyval == gtk.keysyms.F1:
-        self.keyboard_click(None, None, None, -1)
-    elif keyval == gtk.keysyms.F2:
-        self.keyboard_click(None, None, None, -2)
-    elif keyval == gtk.keysyms.F3:
-        self.keyboard_click(None, None, None, -3)
-    elif keyval == gtk.keysyms.F4:
-        self.keyboard_click(None, None, None, -4)
-    elif keyval == gtk.keysyms.F5:
-        self.keyboard_click(None, None, None, -5)
-
 def eraseUserPrompt(x,y,z,self):
     self.text.remove()
     self.yesButton.remove()
diff --git a/src/piano_composition-activity/piano_composition.py b/src/piano_composition-activity/piano_composition.py
index da6900a..f3a9aa7 100644
--- a/src/piano_composition-activity/piano_composition.py
+++ b/src/piano_composition-activity/piano_composition.py
@@ -143,10 +143,10 @@ class Gcompris_piano_composition:
                                          self.rootitem, 0x9C2765FFL, 80)
 
         self.eraseNotesButton = textButton(220, 70, _("Erase Last Note"),
-                                           self.rootitem, 0x870047FFL, 100)
+                                           self.rootitem, 0xBF7D30FFL, 100)
 
         self.playCompositionButton = textButton(350, 70, _("Play Composition"),
-                                                self.rootitem, 0xE768ABFFL, 100)
+                                                self.rootitem, 0x104BA9FFL, 100)
 
         if (level > 2):
 
@@ -743,7 +743,7 @@ dialogue to\nenable the sound."), stop_board)
         elif keyval == gtk.keysyms.space:
             self.staff.playComposition()
         else:
-            pianokeyBindings(keyval, self)
+            pianokeyBindings(keyval, self.keyboard_click)
         return True
     def pause(self, x):
         pass
diff --git a/src/play_piano-activity/play_piano.py b/src/play_piano-activity/play_piano.py
index 27913eb..5a94ca3 100644
--- a/src/play_piano-activity/play_piano.py
+++ b/src/play_piano-activity/play_piano.py
@@ -225,7 +225,7 @@ class Gcompris_play_piano:
         elif keyval == gtk.keysyms.space:
             self.staff.playComposition()
         else:
-            pianokeyBindings(keyval, self)
+            pianokeyBindings(keyval, self.keyboard_click)
         return True
 
     def pause(self, pause):