Bah, c'n'était pas si compliqué tout compte fait :-).

[minwii.git] / src / app / widgets / home.py

diff --git a/src/app/widgets/home.py b/src/app/widgets/home.py
index e1e09f1..1aa74d3 100755 (executable)
--- a/src/app/widgets/home.py
+++ b/src/app/widgets/home.py
@@ -15,7 +15,7 @@ from pgu.gui import CLICK
 from pgu.gui import QUIT
 from pgu.gui import CHANGE
 import pygame
 from pgu.gui import QUIT
 from pgu.gui import CHANGE
 import pygame

-from gui.constants import reversedReadabilityDict, modeDict
+from globals import PLAYING_MODES

 from songfilebrowser import FileOpenDialog
 import os.path
 
 from songfilebrowser import FileOpenDialog
 import os.path
 


@@ -53,9 +53,9 @@ class Home(Table) :
         # choix du niveau
         self.tr()
         self.td(self.createLabel("Niveau :"))
         # choix du niveau
         self.tr()
         self.td(self.createLabel("Niveau :"))

-        self.modeSelect = Select('easy')
-        for key in modeDict.keys() :
-            self.modeSelect.add(self.createLabel(reversedReadabilityDict[key]),key)
+        self.modeSelect = Select('EASY')
+        for k, caption in PLAYING_MODES :
+            self.modeSelect.add(self.createLabel(caption), k)

         self.td(self.modeSelect,colspan=3)
 
         self.tr()
         self.td(self.modeSelect,colspan=3)
 
         self.tr()


@@ -80,7 +80,7 @@ class Home(Table) :
         self.tr()
         self.quitButton = Button(self.createLabel("Quitter"))
         self.td(self.quitButton)
         self.tr()
         self.quitButton = Button(self.createLabel("Quitter"))
         self.td(self.quitButton)

-        self.playButton = Button(self.createLabel("Jouer"))
+        self.playButton = Button(self.createLabel("Jouer"), disabled=True)

         self.td(self.playButton,colspan=3)
 
         self.tr()
         self.td(self.playButton,colspan=3)
 
         self.tr()


@@ -88,9 +88,15 @@ class Home(Table) :
     
     def _initLocalListeners(self) :
         self.browseButton.connect(CLICK, self.open_file_browser)
     
     def _initLocalListeners(self) :
         self.browseButton.connect(CLICK, self.open_file_browser)

-        self.quitButton.connect(CLICK, self._exitHome)
+        self.quitButton.connect(CLICK, self._exitApp)
+        self.playButton.connect(CLICK, self._exitHome)
+    
+    def _exitApp(self, data=None) :
+        self.returnValue = False
+        self.send(QUIT)

     
     def _exitHome(self, data=None) :
     
     def _exitHome(self, data=None) :

+        self.returnValue = True

         self.send(QUIT)
     
     def createLabel(self,text,font = None):
         self.send(QUIT)
     
     def createLabel(self,text,font = None):


@@ -108,6 +114,7 @@ class Home(Table) :
     def handle_file_browser_closed(self, dlg) :
         if dlg.value and os.path.isfile(dlg.value):
             self.songFile = dlg.value
     def handle_file_browser_closed(self, dlg) :
         if dlg.value and os.path.isfile(dlg.value):
             self.songFile = dlg.value

+            self.playButton.disabled = False

     
 
     
\ No newline at end of file
     
 
     
\ No newline at end of file