Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/TamTamEdit.activity/Edit/MainWindow.py
diff options
context:
space:
mode:
authoramartin <olpc@xo-00-CE-12.localdomain>2007-11-02 19:05:32 (GMT)
committer amartin <olpc@xo-00-CE-12.localdomain>2007-11-02 19:05:32 (GMT)
commitf3d4e2574e557c9eee246b60cc4fa4cc0bb92ced (patch)
treecda526112ec1bc3ac55c629bf76862b76bad9a83 /TamTamEdit.activity/Edit/MainWindow.py
parentbf851c04d2cba26da3ddca90e9dda2c8610a4850 (diff)
parent492396fc762686d391df0c3aaf50edb85aa78b8d (diff)
merge
Diffstat (limited to 'TamTamEdit.activity/Edit/MainWindow.py')
-rw-r--r--TamTamEdit.activity/Edit/MainWindow.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/TamTamEdit.activity/Edit/MainWindow.py b/TamTamEdit.activity/Edit/MainWindow.py
index 215f9a6..223b4d2 100644
--- a/TamTamEdit.activity/Edit/MainWindow.py
+++ b/TamTamEdit.activity/Edit/MainWindow.py
@@ -51,6 +51,7 @@ class MainWindow( gtk.EventBox ):
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
@@ -102,7 +103,7 @@ class MainWindow( gtk.EventBox ):
self.trackActive = [ 1 for i in range(Config.NUMBER_OF_TRACKS) ]
self.pages_playing = []
- self.journalCalled = True
+ self.journalCalled = False
self.noteDB = NoteDB.NoteDB()
TP.ProfileEnd("init_data")
@@ -383,7 +384,8 @@ class MainWindow( gtk.EventBox ):
first = self.noteDB.addPage( -1, NoteDB.Page(4, instruments = instrumentsIds) )
self.displayPage( first )
- self.createNewTune( None )
+ if not self.journalCalled:
+ self.createNewTune( None )
# Toolbar
self._mainToolbar = mainToolbar(self.activity.toolbox, self)