diff options
Diffstat (limited to 'Edit/MainWindow.py')
| -rw-r--r-- | Edit/MainWindow.py | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/Edit/MainWindow.py b/Edit/MainWindow.py index efb1ebc..9c268de 100644 --- a/Edit/MainWindow.py +++ b/Edit/MainWindow.py @@ -13,6 +13,8 @@ from Util.CSoundClient import new_csound_client from Util.InstrumentPanel import InstrumentPanel from Util.InstrumentPanel import DrumPanel from Util.CSoundNote import CSoundNote +from EditToolbars import mainToolbar +from gettext import gettext as _ from subprocess import Popen import time import os @@ -43,12 +45,20 @@ KEY_MAP_PIANO = Config.KEY_MAP_PIANO #----------------------------------- class MainWindow( SubActivity ): - def __init__( self, set_mode ): + def __init__( self, activity, set_mode ): self.csnd = new_csound_client() self.tooltips = gtk.Tooltips() + self.activity = activity for i in [6,7,8,9,10]: self.csnd.setTrackVolume(100, i) self.trackCount = 6 + + # Toolbar + self.activity.activity_toolbar.keep.show() + self._mainToolbar = mainToolbar(self.activity.toolbox, self) + self.activity.toolbox.add_toolbar(_('Compose'), self._mainToolbar) + self.activity.toolbox.set_current_toolbar(1) + self._mainToolbar.show() def init_data( ): TP.ProfileBegin("init_data") @@ -977,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() @@ -1064,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 ): |