diff options
| author | Oli <olivier.belanger@umontreal.ca> | 2007-07-20 06:36:31 (GMT) |
|---|---|---|
| committer | Oli <olivier.belanger@umontreal.ca> | 2007-07-20 06:36:31 (GMT) |
| commit | b5111a01f4a5697b32d372d3c34dc4a26002b783 (patch) | |
| tree | 852799a96f73338761f906b5b9b571d580c32d17 /miniTamTam | |
| parent | f6f0d2b4c9bada14c172d6318a2477063375aca7 (diff) | |
| parent | 2c6281e196f139710a7f840d23a624611672e960 (diff) | |
Merge branch 'master' of git+ssh://olipet@dev.laptop.org/git/projects/tamtam
Diffstat (limited to 'miniTamTam')
| -rw-r--r-- | miniTamTam/RythmGenerator.py | 2 | ||||
| -rw-r--r-- | miniTamTam/miniTamTamMain.py | 3 | ||||
| -rw-r--r-- | miniTamTam/miniToolbars.py | 17 |
3 files changed, 19 insertions, 3 deletions
diff --git a/miniTamTam/RythmGenerator.py b/miniTamTam/RythmGenerator.py index 59c5746..70d9720 100644 --- a/miniTamTam/RythmGenerator.py +++ b/miniTamTam/RythmGenerator.py @@ -45,7 +45,7 @@ def generator( instrument, nbeats, density, regularity, reverbSend ): def pageGenerate( regularity, drumPitch ): barLength = Config.TICKS_PER_BEAT * nbeats - print 'pageGenerate drumPitch[0] ', drumPitch[0] + #print 'pageGenerate drumPitch[0] ', drumPitch[0] currentInstrument = Instrument.KIT[instrument][ Config.KIT_ELEMENT[ drumPitch[0] ]].name rythmSequence = makeRythm.drumRythmSequence(currentInstrument, nbeats, density, regularity) diff --git a/miniTamTam/miniTamTamMain.py b/miniTamTam/miniTamTamMain.py index 33a314c..308b0f8 100644 --- a/miniTamTam/miniTamTamMain.py +++ b/miniTamTam/miniTamTamMain.py @@ -145,10 +145,13 @@ class miniTamTamMain(SubActivity): # Toolbar self.activity.activity_toolbar.share.show() + if self.activity.activity_toolbar.helpButton: + self.activity.activity_toolbar.helpButton.hide() 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.activity.toolbox.set_current_toolbar(1) self._playToolbar.show() self._recordToolbar.show() diff --git a/miniTamTam/miniToolbars.py b/miniTamTam/miniToolbars.py index 9ff4df4..3f4e192 100644 --- a/miniTamTam/miniToolbars.py +++ b/miniTamTam/miniToolbars.py @@ -96,7 +96,7 @@ class recordToolbar(gtk.Toolbar): self.toolbox = toolbox self.miniTamTam = miniTamTam - + self.micRec1Button = ToolButton('rec1') self.micRec1Button.connect('clicked',self.miniTamTam.micRec,'mic1') self.insert(self.micRec1Button, -1) @@ -123,6 +123,10 @@ class recordToolbar(gtk.Toolbar): _insertSeparator() _insertSeparator() + _insertSeparator() + _insertSeparator() + _insertSeparator() + _insertSeparator() self.keyboardRecButton = ToggleToolButton('keyrec') self.keyboardRecButton.connect('clicked', self.miniTamTam.sequencer.handleRecordButton, True) @@ -134,4 +138,13 @@ class recordToolbar(gtk.Toolbar): self.keyboardRecOverButton.connect('clicked', self.miniTamTam.sequencer.handleOverButton, False) self.insert(self.keyboardRecOverButton, -1) self.keyboardRecOverButton.show() - self.keyboardRecOverButton.set_tooltip(_('Click to add a loop'))
\ No newline at end of file + self.keyboardRecOverButton.set_tooltip(_('Click to add a loop')) + + _insertSeparator() + _insertSeparator() + + self.loopSetButton = ToggleToolButton('loop') + #self.loopSetButton.connect('clicked', self.miniTamTam.changeme) + self.insert(self.loopSetButton, -1) + self.loopSetButton.show() + self.loopSetButton.set_tooltip(_('Add new sound'))
\ No newline at end of file |