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

5 files changed, 27 insertions, 14 deletions

diff --git a/GUI/Core/ThemeWidgets.py b/GUI/Core/ThemeWidgets.py
index 86f3c9c..23b54e7 100644
--- a/GUI/Core/ThemeWidgets.py
+++ b/GUI/Core/ThemeWidgets.py
@@ -52,10 +52,10 @@ widget "*%s*" style "scale_style"
         return False
 
     def set_snap( self, snap ):
-	if snap: self.snap = 1/snap
-	else: self.snap = False
-	self.expose(self, event=None)
-        
+        if snap: self.snap = 1/snap
+        else: self.snap = False
+        self.queue_draw()
+    
     def expose( self, widget, event ):
         
         style = self.get_style()
@@ -136,9 +136,9 @@ widget "*%s*" style "scale_style"
         return False
 
     def set_snap( self, snap ):
-	if snap: self.snap = 1/snap
-	else: self.snap = False
-	self.expose(self, event=None)
+        if snap: self.snap = 1/snap
+        else: self.snap = False
+        self.queue_draw()
     
     def expose( self, widget, event ):
         
diff --git a/GUI/StandalonePlayer.py b/GUI/StandalonePlayer.py
index 52e0a40..9d80f61 100755
--- a/GUI/StandalonePlayer.py
+++ b/GUI/StandalonePlayer.py
@@ -45,6 +45,7 @@ class StandAlonePlayer( gtk.EventBox ):
         self.tooltips = gtk.Tooltips()
 
         self.creditsOpen = False
+        self.recstate = False
         
         self.mainWindowBox = gtk.HBox()
         self.leftBox = gtk.VBox()
@@ -192,12 +193,12 @@ class StandAlonePlayer( gtk.EventBox ):
         self.tooltips.set_tip(generationDrumBtn3,Tooltips.AFRI)
         
         #Transport Button Box
-	self.seqRecordButton = ImageToggleButton(GUIConstants.IMAGE_ROOT + 'record2.png', GUIConstants.IMAGE_ROOT + 'record2sel.png')
-	self.seqRecordButton.connect('clicked', self.rythmPlayer.handleRecordButton )
+        self.seqRecordButton = ImageToggleButton(GUIConstants.IMAGE_ROOT + 'record2.png', GUIConstants.IMAGE_ROOT + 'record2sel.png')
+        self.seqRecordButton.connect('clicked', self.rythmPlayer.handleRecordButton )
 
         self.playStopButton = ImageToggleButton(GUIConstants.IMAGE_ROOT + 'play.png', GUIConstants.IMAGE_ROOT + 'stop.png')
         self.playStopButton.connect('clicked' , self.handlePlayButton)
-	transportBox.pack_start(self.seqRecordButton)
+        transportBox.pack_start(self.seqRecordButton)
         transportBox.pack_start(self.playStopButton)
         self.tooltips.set_tip(self.seqRecordButton,Tooltips.SEQ)
         self.tooltips.set_tip(self.playStopButton,Tooltips.PLAY)
@@ -245,6 +246,7 @@ class StandAlonePlayer( gtk.EventBox ):
             
             micBtn.connect('clicked', self.handleInstrumentButtonClick, n)
             micRecBtn.connect('clicked', self.handleMicButtonClick, n)
+            micRecBtn.connect('pressed', self.handleRecButtonPress, micBtn)
             
             vbox1.add(micRecBtn)
             vbox1.add(micBtn)
@@ -260,6 +262,7 @@ class StandAlonePlayer( gtk.EventBox ):
             
             synthBtn.connect('clicked', self.handleInstrumentButtonClick, n)
             synthRecBtn.connect('clicked', self.handleSynthButtonClick, n)
+            synthRecBtn.connect('pressed', self.handleRecButtonPress, synthBtn)
             
             vbox2.add(synthRecBtn)
             vbox2.add(synthBtn)
@@ -268,14 +271,19 @@ class StandAlonePlayer( gtk.EventBox ):
         self.leftBox.add(hbox)
     
     def recordStateButton( self, state ):
-	self.seqRecordButton.set_active( state )
+        self.seqRecordButton.set_active( state )
 
     def handleInstrumentButtonClick(self , widget , instrument):
-        if widget.get_active() == True:
+        if widget.get_active() == True and self.recstate == False:
             self.setInstrument(instrument)
             self.playInstrumentNote(instrument)         
         
+    def handleRecButtonPress(self, widget, recBtn):
+        self.recstate = True
+        recBtn.set_active(True)
+        
     def handleMicButtonClick(self , widget , data):
+        self.recstate = False
         self.setInstrument(data)
         if data == 'mic1':
             self.csnd.micRecording(7)
@@ -289,6 +297,8 @@ class StandAlonePlayer( gtk.EventBox ):
             return
     
     def handleSynthButtonClick(self , widget , data):
+        self.recstate = False
+        self.setInstrument(data)
         if data == 'lab1':
             self.synthLabWindow1.show_all()
         elif data == 'lab2':
diff --git a/GUI/SynthLab/SynthLabParametersWindow.py b/GUI/SynthLab/SynthLabParametersWindow.py
index 4418949..4418949 100755..100644
--- a/GUI/SynthLab/SynthLabParametersWindow.py
+++ b/GUI/SynthLab/SynthLabParametersWindow.py
diff --git a/TamTam.py b/TamTam.py
index 74e9bd7..1df2c49 100755
--- a/TamTam.py
+++ b/TamTam.py
@@ -83,7 +83,10 @@ class TamTam(Activity):
     def __init__(self):
 
         Activity.__init__(self)
-
+        
+        color = gtk.gdk.color_parse('#FFFFFF')
+        self.modify_bg(gtk.STATE_NORMAL, color)
+        
         self.tamtam = StandAlonePlayer(csnd)
         self.connect('focus_in_event',self.handleFocusIn)
         self.connect('focus_out_event',self.handleFocusOut)
diff --git a/activity/activity.info b/activity/activity.info
index f734b3f..9ed7469 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -3,4 +3,4 @@ name = TamTam
 service_name = org.laptop.TamTam
 icon = activity-tamtam
 exec = sugar-activity-factory TamTam.TamTam
-activity_version = 10
+activity_version = 11