diff options
| author | Nat <natcl@hotmail.com> | 2007-08-24 22:30:45 (GMT) |
|---|---|---|
| committer | Nat <natcl@hotmail.com> | 2007-08-24 22:30:45 (GMT) |
| commit | d87a4d57e074047eb7e71d6297a7f7e518aefa9f (patch) | |
| tree | ad2aefca25658f60dda394a36db89cf2c58017a5 /Edit | |
| parent | f511350c9d931c302af21e224acf2a02d53e398c (diff) | |
Bug fix
Diffstat (limited to 'Edit')
| -rw-r--r-- | Edit/MainWindow.py | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/Edit/MainWindow.py b/Edit/MainWindow.py index bdf38f2..be92129 100644 --- a/Edit/MainWindow.py +++ b/Edit/MainWindow.py @@ -249,6 +249,8 @@ class MainWindow( SubActivity ): self.GUI["2drumPalette"] = instrumentPalette(_('Track 5 Volume'), 4, self) self.GUI["2drumButton"].set_palette(self.GUI["2drumPalette"]) self.GUI["2drumButton"].connect("toggled", self.pickDrum) + self.GUI["2drumButton"].connect('enter-notify-event', self.blockFocus) + self.GUI["2drumButton"].connect('leave-notify-event', self.unblockFocus) self.GUI["2drumBox"].pack_start( self.GUI["2drumButton"] ) self.GUI["2instrumentPanel"].pack_start( self.GUI["2drumBox"] ) self.GUI["2page"].pack_start( self.GUI["2instrumentPanel"], False ) @@ -965,6 +967,14 @@ class MainWindow( SubActivity ): #self.GUI["2instrument" + str(i+1) + "muteButton"].set_active(False) self.GUI["2instrument" + str(i+1) + "Palette"].muteButton.set_active(False) self.updatePagesPlaying() + + def blockFocus(self, widget = None, data = None): + self.activity.handler_block(self.activity.focusInHandler) + self.activity.handler_block(self.activity.focusOutHandler) + + def unblockFocus(self, widget = None, data = None): + self.activity.handler_unblock(self.activity.focusInHandler) + self.activity.handler_unblock(self.activity.focusOutHandler) #----------------------------------- # generation functions @@ -2063,7 +2073,10 @@ class instrumentPalette(Palette): self.muteButton.set_active(True) self.tooltips.set_tip(self.muteButton, _('Left click to mute, right click to solo')) - self.volumeSliderAdj = gtk.Adjustment(Config.DEFAULT_VOLUME, 0, 100, 1, 1, 0) + if self.trackID < 4: + exec "self.volumeSliderAdj = self.edit.GUI['2instrument%svolumeAdjustment']" % str(self.trackID+1) + else: + self.volumeSliderAdj = self.edit.GUI["2drumvolumeAdjustment"] self.volumeSliderAdj.connect( "value-changed", self.edit.handleTrackVolume, self.trackID) self.volumeSlider = gtk.HScale(adjustment = self.volumeSliderAdj) self.volumeSlider.set_size_request(250, -1) |