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

Conflicts:

	Edit/MainWindow.py

1 files changed, 6 insertions, 10 deletions

diff --git a/Edit/MainWindow.py b/Edit/MainWindow.py
index c3317f3..2814052 100644
--- a/Edit/MainWindow.py
+++ b/Edit/MainWindow.py
@@ -85,7 +85,7 @@ class MainWindow( SubActivity ):
             self.trackActive = [ 1 for i in range(Config.NUMBER_OF_TRACKS) ]
 
             self.pages_playing = []
-            self.journalCalled = False
+            self.journalCalled = True
 
             self.noteDB = NoteDB.NoteDB()
             TP.ProfileEnd("init_data")
@@ -539,8 +539,8 @@ class MainWindow( SubActivity ):
         self.pageAdd(instruments = instrumentsIds) 
         self.pageAdd(instruments = instrumentsIds) 
         self.pageAdd(instruments = instrumentsIds) 
-        self.tuneInterface.selectPages( [1,2,3,4] )
-        self.displayPage(1)
+        self.tuneInterface.selectPages( self.noteDB.getTune() )
+        self.displayPage( self.noteDB.getTune()[0] )
         self.generateMode = 'page' 
         self.generate( GenerationParameters() )
         
@@ -775,10 +775,7 @@ class MainWindow( SubActivity ):
         self.displayPage( id )
         
     def handleClose(self,widget):
-        if self.journalCalled:
-            gtk.main_quit()
-        else:
-            self.set_mode("welcome")
+        self.set_mode('quit')
 
     def onTimeout(self):
         self.updateFPS()
@@ -1460,10 +1457,9 @@ class MainWindow( SubActivity ):
                 self.GUI[string].set_value(self._data['track_volume'][i])
             ifile.close()
 
-            self.tuneInterface.selectPages( self.noteDB.tune )
-            #self.displayPage(1)
-
             self.noteDB.deletePages( oldPages ) 
+
+            self.tuneInterface.selectPages( self.noteDB.getTune() )
         except OSError,e:
             print 'ERROR: failed to open file %s for reading\n' % ofilename