diff options
| author | amartin <olpc@xo-05-28-21.localdomain> | 2007-08-31 05:25:21 (GMT) |
|---|---|---|
| committer | amartin <olpc@xo-05-28-21.localdomain> | 2007-08-31 05:25:21 (GMT) |
| commit | c72c8119c18fca5f277cb3efd61acead578cd4d0 (patch) | |
| tree | 58d69c906cd51ca1385db14608b36c01a43fe8f5 /Jam/Picker.py | |
| parent | 0696bd1e480debac4a9a134954767e2086e33241 (diff) | |
jam popups
Diffstat (limited to 'Jam/Picker.py')
| -rw-r--r-- | Jam/Picker.py | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/Jam/Picker.py b/Jam/Picker.py index f41f1b2..ad136da 100644 --- a/Jam/Picker.py +++ b/Jam/Picker.py @@ -39,7 +39,6 @@ class Picker( gtk.HBox ): self.pack_start( self.scrollLeft, False, False ) self.scrolledWindow = gtk.ScrolledWindow() - #self.scrolledWindow.modify_bg( gtk.STATE_NORMAL, self.colors["Bg_Active"] ) self.scrolledWindow.set_policy( gtk.POLICY_ALWAYS, gtk.POLICY_NEVER ) self.pack_start( self.scrolledWindow ) self.hadjustment = self.scrolledWindow.get_hadjustment() @@ -80,9 +79,9 @@ class Picker( gtk.HBox ): | gtk.gdk.LEAVE_NOTIFY_MASK | gtk.gdk.POINTER_MOTION_MASK | gtk.gdk.POINTER_MOTION_HINT_MASK ) - block.connect( "button-press-event", self.button_press ) - block.connect( "button-release-event", self.button_release ) - block.connect( "motion-notify-event", self.motion_notify ) + block.connect( "button-press-event", self.on_button_press ) + block.connect( "button-release-event", self.on_button_release ) + block.connect( "motion-notify-event", self.on_motion_notify ) block.data = data self.blocks.append( block ) @@ -141,14 +140,14 @@ class Picker( gtk.HBox ): else: self.scrollRight.set_sensitive( True ) - def button_press( self, widget, event ): + def on_button_press( self, widget, event ): pass - def button_release( self, widget, event ): - self.desktop.button_release( widget, event ) + def on_button_release( self, widget, event ): + self.desktop.on_button_release( widget, event ) - def motion_notify( self, widget, event ): - self.desktop.motion_notify( widget, event ) + def on_motion_notify( self, widget, event ): + self.desktop.on_motion_notify( widget, event ) class Instrument( Picker ): @@ -210,7 +209,7 @@ class Instrument( Picker ): return False - def button_press( self, widget, event ): + def on_button_press( self, widget, event ): walloc = widget.get_allocation() salloc = self.scrolledWindow.get_allocation() loc = ( walloc.x + salloc.x + event.x - self.hadjustment.get_value(), -1 ) @@ -268,7 +267,7 @@ class Drum( Picker ): Picker.addBlock( self, data, data["name"], block ) - def button_press( self, widget, event ): + def on_button_press( self, widget, event ): walloc = widget.get_allocation() salloc = self.scrolledWindow.get_allocation() loc = ( walloc.x + salloc.x + event.x - self.hadjustment.get_value(), -1 ) @@ -405,8 +404,7 @@ class Loop( Picker ): Picker.addBlock( self, data, data["name"], block ) - - def button_press( self, widget, event ): + def on_button_press( self, widget, event ): walloc = widget.get_allocation() salloc = self.scrolledWindow.get_allocation() loc = ( walloc.x + salloc.x + event.x - self.hadjustment.get_value(), -1 ) |