diff options
author | Nat <natcl@hotmail.com> | 2007-07-19 16:35:29 (GMT) |
---|---|---|
committer | Nat <natcl@hotmail.com> | 2007-07-19 16:35:29 (GMT) |
commit | 1af282d79ba87022d6f34ba258c17c49eb9dce05 (patch) | |
tree | fe18faa55c89914edfc43dfc74c5d8ea16eb9c19 /miniTamTam | |
parent | fdb21c44cdac89070098c65371badcbe64f83161 (diff) |
Record toolbar
Diffstat (limited to 'miniTamTam')
-rw-r--r-- | miniTamTam/miniTamTamMain.py | 24 | ||||
-rw-r--r-- | miniTamTam/miniToolbars.py (renamed from miniTamTam/miniToolbar.py) | 35 |
2 files changed, 35 insertions, 24 deletions
diff --git a/miniTamTam/miniTamTamMain.py b/miniTamTam/miniTamTamMain.py index d23b1d9..aba34c8 100644 --- a/miniTamTam/miniTamTamMain.py +++ b/miniTamTam/miniTamTamMain.py @@ -19,7 +19,8 @@ Net = Util.Network # convinience assignment import Config -from miniTamTam.miniToolbar import miniToolbar +from miniTamTam.miniToolbars import playToolbar +from miniTamTam.miniToolbars import recordToolbar from Util.ThemeWidgets import * from Util.CSoundNote import CSoundNote from Util import NoteDB @@ -143,10 +144,13 @@ class miniTamTamMain(SubActivity): #------------------------------------------------------------------- # Toolbar - self._miniToolbar = miniToolbar(self.activity.toolbox, self) self.activity.activity_toolbar.share.show() - self.activity.toolbox.add_toolbar(_('Play'), self._miniToolbar) - self._miniToolbar.show() + self._playToolbar = playToolbar(self.activity.toolbox, self) + self._recordToolbar = recordToolbar(self.activity.toolbox, self) + self.activity.toolbox.add_toolbar(_('Play'), self._playToolbar) + self.activity.toolbox.add_toolbar(_('Record'), self._recordToolbar) + self._playToolbar.show() + self._recordToolbar.show() self.activity.connect( "shared", self.shared ) @@ -423,7 +427,7 @@ class miniTamTamMain(SubActivity): self.synthLabWindow.show_all() def recordStateButton( self, state ): - self._miniToolbar.keyboardRecButton.set_active( state ) + self._recordToolbar.keyboardRecButton.set_active( state ) def synthLabWindowOpen(self): return self.synthLabWindow != None and self.synthLabWindow.get_property('visible') @@ -558,15 +562,15 @@ class miniTamTamMain(SubActivity): self.loop.adjustLoopVolume(instrumentVolume) self.sequencer.adjustSequencerVolume(instrumentVolume) img = int(self.scale(self.instVolume,100,0,0,4.9)) - self._miniToolbar.balanceSliderImgLeft.set_from_file(Config.IMAGE_ROOT + 'dru' + str(img) + '.png') + self._playToolbar.balanceSliderImgLeft.set_from_file(Config.IMAGE_ROOT + 'dru' + str(img) + '.png') img2 = int(self.scale(self.instVolume,0,100,0,4.9)) - self._miniToolbar.balanceSliderImgRight.set_from_file(Config.IMAGE_ROOT + 'instr' + str(img2) + '.png') + self._playToolbar.balanceSliderImgRight.set_from_file(Config.IMAGE_ROOT + 'instr' + str(img2) + '.png') def handleReverbSlider(self, adj): self.reverb = adj.value self.drumFillin.setReverb( self.reverb ) img = int(self.scale(self.reverb,0,1,0,4)) - self.activity._miniToolbar.reverbSliderImgRight.set_from_file(Config.IMAGE_ROOT + 'reverb' + str(img) + '.png') + self.activity._playToolbar.reverbSliderImgRight.set_from_file(Config.IMAGE_ROOT + 'reverb' + str(img) + '.png') self.keyboardStandAlone.setReverb(self.reverb) def handleVolumeSlider(self, adj): @@ -604,8 +608,8 @@ class miniTamTamMain(SubActivity): def handleGenerateBtn(self , widget , data=None): self.regenerate() - if not self._miniToolbar.playButton.get_active(): - self._miniToolbar.playButton.set_active(True) + if not self._playToolbar.playButton.get_active(): + self._playToolbar.playButton.set_active(True) #this calls sends a 'clicked' event, #which might be connected to handlePlayButton diff --git a/miniTamTam/miniToolbar.py b/miniTamTam/miniToolbars.py index 717809b..02b93b1 100644 --- a/miniTamTam/miniToolbar.py +++ b/miniTamTam/miniToolbars.py @@ -7,11 +7,9 @@ from sugar.graphics.toolbutton import ToolButton from sugar.graphics.toggletoolbutton import ToggleToolButton from gettext import gettext as _ -class miniToolbar(gtk.Toolbar): - +class playToolbar(gtk.Toolbar): def __init__(self,toolbox, miniTamTam): gtk.Toolbar.__init__(self) - self.add_events(gtk.gdk.BUTTON_PRESS_MASK) def _insertSeparator(): self.separator = gtk.SeparatorToolItem() @@ -30,12 +28,6 @@ class miniToolbar(gtk.Toolbar): self.playButton.show() self.playButton.set_tooltip(_('Play / Stop')) - self.keyboardRecButton = ToggleToolButton('keyrec') - self.keyboardRecButton.connect('button-press-event', self.miniTamTam.sequencer.handleRecordButton) - self.insert(self.keyboardRecButton, -1) - self.keyboardRecButton.show() - self.keyboardRecButton.set_tooltip(_('Left click to record, right click to record on top')) - _insertSeparator() _insertSeparator() _insertSeparator() @@ -90,10 +82,26 @@ class miniToolbar(gtk.Toolbar): self.reverbSlider.show() self.reverbSliderTool.show() self.reverbSliderTool.set_tooltip(self.tooltips, _('Reverb')) + + +class recordToolbar(gtk.Toolbar): + def __init__(self,toolbox, miniTamTam): + gtk.Toolbar.__init__(self) - _insertSeparator() - _insertSeparator() - _insertSeparator() + def _insertSeparator(): + self.separator = gtk.SeparatorToolItem() + self.separator.set_draw(True) + self.insert(self.separator,-1) + self.separator.show() + + self.toolbox = toolbox + self.miniTamTam = miniTamTam + + self.keyboardRecButton = ToggleToolButton('keyrec') + self.keyboardRecButton.connect('button-press-event', self.miniTamTam.sequencer.handleRecordButton) + self.insert(self.keyboardRecButton, -1) + self.keyboardRecButton.show() + self.keyboardRecButton.set_tooltip(_('Left click to record, right click to record on top')) self.micRec1Button = ToolButton('micrec1') self.micRec1Button.connect('clicked',self.miniTamTam.micRec,'mic1') @@ -117,5 +125,4 @@ class miniToolbar(gtk.Toolbar): self.micRec4Button.connect('clicked',self.miniTamTam.micRec,'mic4') self.insert(self.micRec4Button, -1) self.micRec4Button.show() - self.micRec4Button.set_tooltip(('Record microphone into slot 4')) - + self.micRec4Button.set_tooltip(('Record microphone into slot 4'))
\ No newline at end of file |