diff options
| -rw-r--r-- | Edit/MainWindow.py | 6 | ||||
| -rw-r--r-- | SynthLab/SynthLabWindow.py | 2 | ||||
| -rwxr-xr-x | TamTam.py | 4 | ||||
| -rw-r--r-- | miniTamTam/miniTamTamMain.py | 2 |
4 files changed, 5 insertions, 9 deletions
diff --git a/Edit/MainWindow.py b/Edit/MainWindow.py index 968ce6b..9c268de 100644 --- a/Edit/MainWindow.py +++ b/Edit/MainWindow.py @@ -987,8 +987,8 @@ class MainWindow( SubActivity ): self.displayPage( id ) def handleClose(self,widget): - self.set_mode('quit') - + self.activity.close() + def onTimeout(self): self.updateFPS() @@ -1074,7 +1074,7 @@ class MainWindow( SubActivity ): self.csnd.setTrackVolume(self._data["track_volume"][i], i) def handleTrackVolume( self, widget, track ): - self._data["track_volume"][track] = round( widget.get_value() ) + self._data["track_volume"][track] = round( widget.get_value() ) self.csnd.setTrackVolume(self._data["track_volume"][track], track) def getTrackInstrument( self, track ): diff --git a/SynthLab/SynthLabWindow.py b/SynthLab/SynthLabWindow.py index e238939..7c4ac42 100644 --- a/SynthLab/SynthLabWindow.py +++ b/SynthLab/SynthLabWindow.py @@ -293,7 +293,7 @@ class SynthLabWindow(SubActivity): def handleClose( self, widget, data ): if self.journalCalled: - self.set_mode('quit') + self.activity.close() return if self.instanceOpen: self.synthLabParametersWindow.destroy() @@ -113,10 +113,6 @@ class TamTam(Activity): def set_mode(self, mode, arg = None): if Config.DEBUG: print 'DEBUG: TamTam::set_mode from', self.mode, 'to', mode - if mode == 'quit': - self.close() # Save and cleanup - self.destroy() - if self.mode != None: self.modeList[ self.mode ].onDeactivate() if FAKE_ACTIVITY: diff --git a/miniTamTam/miniTamTamMain.py b/miniTamTam/miniTamTamMain.py index acbc464..c1725ac 100644 --- a/miniTamTam/miniTamTamMain.py +++ b/miniTamTam/miniTamTamMain.py @@ -428,7 +428,7 @@ class miniTamTamMain(SubActivity): self.playStopButton.set_active(False) self.sequencer.clearSequencer() self.csnd.loopClear() - self.set_mode('quit') + self.activity.close() def handleGenerationSlider(self, adj): img = int(adj.value * 7)+1 |