Merge branch 'master' of git+ssh://olipet@dev.laptop.org/git/projects/tamtam

3 files changed, 54 insertions, 33 deletions

diff --git a/miniTamTam/MiniSequencer.py b/miniTamTam/MiniSequencer.py
index 887b4cf..4182af9 100644
--- a/miniTamTam/MiniSequencer.py
+++ b/miniTamTam/MiniSequencer.py
@@ -33,13 +33,13 @@ class MiniSequencer:
         gobject.source_remove( self.playBackTimeout )
         self.playState = 0
 
-    def handleRecordButton( self, widget, event ):
+    def handleRecordButton( self, widget, data ):
         if not self.startLooking:
             if 1: #widget.get_active() == True:
                 self.beats = [i*4 for i in range(self.beat)]
                 self.upBeats = [i+2 for i in self.beats]
                 self.realTick = [i for i in range(self.beat*4)]
-                if event.button == 1:
+                if data:
                     self.clearSequencer()
                 self.startLooking = 1
                 self.startPlayback()
diff --git a/miniTamTam/miniTamTamMain.py b/miniTamTam/miniTamTamMain.py
index d5de27a..7640f32 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
@@ -47,7 +48,7 @@ class miniTamTamMain(SubActivity):
     
     def __init__(self, activity, set_mode):
         SubActivity.__init__(self, set_mode)
-
+    
         self.activity = activity
 
 
@@ -105,7 +106,7 @@ class miniTamTamMain(SubActivity):
         
         
         self.drawInstrumentButtons()
-        self.drawSliders()
+        #self.drawSliders()
         self.drawGeneration()
         self.show_all()
         if 'a good idea' == True:
@@ -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 )
        
@@ -227,7 +231,7 @@ class miniTamTamMain(SubActivity):
         mainLowBox.pack_start(mainSliderBox)
         mainLowBox.pack_start(transportBox)
         
-        #self.masterVBox.pack_start(mainLowBox)        
+        self.masterVBox.pack_start(mainLowBox)        
         
     def drawGeneration( self ):
 
@@ -419,6 +423,7 @@ class miniTamTamMain(SubActivity):
         (s4, o4) = commands.getstatusoutput("rm " + Config.PREF_DIR + "/tempMic.wav") 
         self.micTimeout = gobject.timeout_add(200, self.loadMicInstrument, mic)
         self.instrumentPanel.set_activeInstrument(mic,True)
+        self.setInstrument(mic)
         
     def synthRec(self,lab):
         if self.synthLabWindow != None:
@@ -431,7 +436,7 @@ class miniTamTamMain(SubActivity):
         self.synthLabWindow.show_all()
 
     def recordStateButton( self, state ):
-        self.activity._miniToolbar.keyboardRecButton.set_active( state )       
+        self._recordToolbar.keyboardRecButton.set_active( state )       
         
     def synthLabWindowOpen(self):
         return self.synthLabWindow != None  and self.synthLabWindow.get_property('visible')
@@ -566,15 +571,15 @@ class miniTamTamMain(SubActivity):
         self.loop.adjustLoopVolume(instrumentVolume)
         self.sequencer.adjustSequencerVolume(instrumentVolume)
         img = int(self.scale(self.instVolume,100,0,0,4.9))
-        self.activity._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.activity._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._playToolbar.reverbSliderImgRight.set_from_file(Config.IMAGE_ROOT + 'reverb' + str(img) + '.png')
         self.keyboardStandAlone.setReverb(self.reverb)
 
     def handleVolumeSlider(self, adj):
@@ -612,8 +617,8 @@ class miniTamTamMain(SubActivity):
         
     def handleGenerateBtn(self , widget , data=None):
         self.regenerate()
-        if not self.activity._miniToolbar.playButton.get_active():
-            self.activity._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..6ef33be 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,32 +82,56 @@ 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.micRec1Button = ToolButton('micrec1')
+        self.micRec1Button = ToolButton('rec1')
         self.micRec1Button.connect('clicked',self.miniTamTam.micRec,'mic1')
         self.insert(self.micRec1Button, -1)
         self.micRec1Button.show()
         self.micRec1Button.set_tooltip(_('Record microphone into slot 1'))
         
-        self.micRec2Button = ToolButton('micrec2')
+        self.micRec2Button = ToolButton('rec2')
         self.micRec2Button.connect('clicked',self.miniTamTam.micRec,'mic2')
         self.insert(self.micRec2Button, -1)
         self.micRec2Button.show()
         self.micRec2Button.set_tooltip(_('Record microphone into slot 2'))
         
-        self.micRec3Button = ToolButton('micrec3')
+        self.micRec3Button = ToolButton('rec3')
         self.micRec3Button.connect('clicked',self.miniTamTam.micRec,'mic3')
         self.insert(self.micRec3Button, -1)
         self.micRec3Button.show()
         self.micRec3Button.set_tooltip(_('Record microphone into slot 3'))
         
-        self.micRec4Button = ToolButton('micrec4')
+        self.micRec4Button = ToolButton('rec4')
         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'))
+        
+        _insertSeparator()
+        _insertSeparator()
+        
+        self.keyboardRecButton = ToggleToolButton('keyrec')
+        self.keyboardRecButton.connect('clicked', self.miniTamTam.sequencer.handleRecordButton, True)
+        self.insert(self.keyboardRecButton, -1)
+        self.keyboardRecButton.show()
+        self.keyboardRecButton.set_tooltip(_('Click to record a loop'))
+        
+        self.keyboardRecOverButton = ToggleToolButton('overrec')
+        self.keyboardRecOverButton.connect('clicked', self.miniTamTam.sequencer.handleRecordButton, False)
+        self.insert(self.keyboardRecOverButton, -1)
+        self.keyboardRecOverButton.show()
+        self.keyboardRecOverButton.set_tooltip(_('Click to add a loop'))
\ No newline at end of file