diff options
author | amartin <olpc@xo-05-28-21.localdomain> | 2007-09-23 04:03:49 (GMT) |
---|---|---|
committer | amartin <olpc@xo-05-28-21.localdomain> | 2007-09-23 04:03:49 (GMT) |
commit | 567434c9a0f5cc1bb3bbec31dec969b1eb667407 (patch) | |
tree | bc5cf8e73aab256c9f3232c724a58b2455da9562 | |
parent | 0f7aa3a00e134af329c202693d0fbc35ee69bbc0 (diff) |
moved sync to combobox
-rw-r--r-- | TamTamJam.activity/Jam/JamMain.py | 2 | ||||
-rw-r--r-- | TamTamJam.activity/Jam/Toolbars.py | 68 | ||||
-rw-r--r-- | common/Resources/Desktops/desktop0 | 2 |
3 files changed, 37 insertions, 35 deletions
diff --git a/TamTamJam.activity/Jam/JamMain.py b/TamTamJam.activity/Jam/JamMain.py index e199654..1f63ead 100644 --- a/TamTamJam.activity/Jam/JamMain.py +++ b/TamTamJam.activity/Jam/JamMain.py @@ -1094,7 +1094,7 @@ class JamMain(gtk.EventBox): # Sync def setSyncBeats( self, beats ): - self.desktopToolbar.setSyncBeats( beats ) + self.jamToolbar.setSyncBeats( beats ) def _setSyncBeats( self, beats ): if beats == self.syncBeats: diff --git a/TamTamJam.activity/Jam/Toolbars.py b/TamTamJam.activity/Jam/Toolbars.py index 5a0caae..56678c4 100644 --- a/TamTamJam.activity/Jam/Toolbars.py +++ b/TamTamJam.activity/Jam/Toolbars.py @@ -27,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( 350, -1 ) self.volumeSlider.set_draw_value( False ) self._add_tooltip( self.volumeSlider, _("Master Volume") ) self._insert_widget( self.volumeSlider, -1 ) @@ -40,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( 350, -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 ): @@ -69,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 @@ -95,7 +126,7 @@ class DesktopToolbar( gtk.Toolbar ): self.owner = owner - # self._insert_separator( True ) + self._insert_separator( True ) self.desktop = [] @@ -105,7 +136,7 @@ class DesktopToolbar( gtk.Toolbar ): self.insert( btn, -1 ) self.desktop.append( btn ) - for i in range(2,9): + for i in range(2,11): btn = RadioToolButton( 'preset%d'%i, group = self.desktop[0] ) btn.connect( 'toggled', self.setDesktop, i-1 ) btn.set_tooltip( _('Desktop %d'%i) ) @@ -114,37 +145,8 @@ class DesktopToolbar( gtk.Toolbar ): 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 setSyncBeats( self, beats ): - self.comboBox.set_active( beats - 1 ) - - def changeSync( self, widget ): - self.owner._setSyncBeats( widget.get_active() + 1 ) - def _insert_separator( self, expand = False ): separator = gtk.SeparatorToolItem() separator.set_draw( False ) diff --git a/common/Resources/Desktops/desktop0 b/common/Resources/Desktops/desktop0 index 0dd6e68..00e1a5f 100644 --- a/common/Resources/Desktops/desktop0 +++ b/common/Resources/Desktops/desktop0 @@ -3798,4 +3798,4 @@ block_add Instrument False 291 328 False {'volume': 0.5, 'reverb': 0, 'name': 'r block_add Loop False 386 328 True {'beats': 4, 'regularity': 0.80000000000000004, 'id': 197, 'key': 20, 'name': 'loop04_0'} block_add Loop False 463 328 True {'beats': 2, 'regularity': 0.80000000000000004, 'id': 190, 'key': None, 'name': 'loop02_0'} block_add Loop False 517 328 True {'beats': 2, 'regularity': 0.80000000000000004, 'id': 189, 'key': None, 'name': 'loop02_0'} -sync_beats 4 +sync_beats 8 |