diff options
| author | Oli <olivier.belanger@umontreal.ca> | 2007-09-24 05:30:48 (GMT) |
|---|---|---|
| committer | Oli <olivier.belanger@umontreal.ca> | 2007-09-24 05:30:48 (GMT) |
| commit | 64ebdb2816d5e70873e717ce028689a100635daa (patch) | |
| tree | b89da0c28d36fedb6e83cb8edc69f313c2c15ffc /TamTamJam.activity/Jam/Toolbars.py | |
| parent | 1a3140d1dd8df2db367fd5142c8a586583268835 (diff) | |
| parent | 9d40d71e089f6db35c8aee0aa51f3f3b1e4ce87f (diff) | |
Merge branch 'master' of git+ssh://olipet@dev.laptop.org/git/projects/tamtam
Diffstat (limited to 'TamTamJam.activity/Jam/Toolbars.py')
| -rw-r--r-- | TamTamJam.activity/Jam/Toolbars.py | 38 |
1 files changed, 35 insertions, 3 deletions
diff --git a/TamTamJam.activity/Jam/Toolbars.py b/TamTamJam.activity/Jam/Toolbars.py index 30001ef..e3b255d 100644 --- a/TamTamJam.activity/Jam/Toolbars.py +++ b/TamTamJam.activity/Jam/Toolbars.py @@ -7,6 +7,8 @@ from gettext import gettext as _ from sugar.graphics.palette import Palette, WidgetInvoker from sugar.graphics.radiotoolbutton import RadioToolButton +from sugar.graphics.combobox import ComboBox +from sugar.graphics.toolcombobox import ToolComboBox import common.Config as Config @@ -25,7 +27,7 @@ class JamToolbar( gtk.Toolbar ): self.volumeAdjustment = gtk.Adjustment( 0.0, 0, 1.0, 0.1, 0.1, 0 ) self.volumeAdjustment.connect( 'value-changed', self.handleVolume ) self.volumeSlider = gtk.HScale( adjustment = self.volumeAdjustment ) - self.volumeSlider.set_size_request( 450, -1 ) + self.volumeSlider.set_size_request( 300, -1 ) self.volumeSlider.set_draw_value( False ) self._add_tooltip( self.volumeSlider, _("Master Volume") ) self._insert_widget( self.volumeSlider, -1 ) @@ -38,12 +40,37 @@ class JamToolbar( gtk.Toolbar ): self.tempoAdjustment = gtk.Adjustment( Config.PLAYER_TEMPO_LOWER, Config.PLAYER_TEMPO_LOWER, Config.PLAYER_TEMPO_UPPER+1, 10, 10, 0 ) self.tempoAdjustment.connect( 'value-changed', self.handleTempo ) self.tempoSlider = gtk.HScale( adjustment = self.tempoAdjustment ) - self.tempoSlider.set_size_request( 450, -1 ) + self.tempoSlider.set_size_request( 300, -1 ) self.tempoSlider.set_draw_value( False ) self._add_tooltip( self.tempoSlider, _("Tempo") ) self._insert_widget( self.tempoSlider, -1 ) self._insert_widget( self.tempoImg, -1 ) + self._insert_separator( True ) + + label = gtk.Label( _("Sync to:") ) + self.syncLabel = gtk.ToolItem() + self.syncLabel.add( label ) + self.insert( self.syncLabel, -1 ) + + self.comboBox = ComboBox() + self.comboBox.append_item( 1, _("1 Beat") ) + self.comboBox.append_item( 2, _("2 Beats") ) + self.comboBox.append_item( 3, _("3 Beats") ) + self.comboBox.append_item( 4, _("4 Beats") ) + self.comboBox.append_item( 5, _("5 Beats") ) + self.comboBox.append_item( 6, _("6 Beats") ) + self.comboBox.append_item( 7, _("7 Beats") ) + self.comboBox.append_item( 8, _("8 Beats") ) + self.comboBox.append_item( 9, _("9 Beats") ) + self.comboBox.append_item( 10, _("10 Beats") ) + self.comboBox.append_item( 11, _("11 Beats") ) + self.comboBox.append_item( 12, _("12 Beats") ) + self.comboBox.set_active( 4 - 1 ) # default 4 beats + self.comboBox.connect( "changed", self.changeSync ) + self.syncBox = ToolComboBox( self.comboBox ) + self.insert( self.syncBox, -1 ) + self.show_all() #def _add_palette( self, widget, palette, position = Palette.DEFAULT ): @@ -67,6 +94,12 @@ class JamToolbar( gtk.Toolbar ): separator.set_expand( expand ) self.insert( separator, -1 ) + def setSyncBeats( self, beats ): + self.comboBox.set_active( beats - 1 ) + + def changeSync( self, widget ): + self.owner._setSyncBeats( widget.get_active() + 1 ) + def mapRange( self, value, ilower, iupper, olower, oupper ): if value == iupper: return oupper @@ -126,4 +159,3 @@ class DesktopToolbar( gtk.Toolbar ): def setDesktop( self, widget, which ): if widget.get_active(): self.owner._setDesktop( which ) - |