X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fscenes%2Fmenu.py;h=91f858b0d6304ef62e55e6142c40e9737b66d5f0;hb=0cef06f581d48315a59a19ac06ca1d2be14cbb4c;hp=a73c2ecb498ff94d5d76a2e9bd7d06a08ff3fa82;hpb=baa600e7e8557e51c6deddff16988a5e1779f379;p=naja.git

diff --git a/naja/scenes/menu.py b/naja/scenes/menu.py
index a73c2ec..91f858b 100644
--- a/naja/scenes/menu.py
+++ b/naja/scenes/menu.py
@@ -4,8 +4,10 @@ Main menu scene.
 
 import pygame.locals as pgl
 
+from naja.constants import KEYS
 from naja.scenes.scene import Scene
 from naja.widgets.text import TextWidget
+from naja.widgets.selector import SelectorWidget
 from naja.events import QuitGameEvent
 from naja.scenes.credits import CreditsScene
 from naja.scenes.game import GameScene
@@ -13,32 +15,24 @@ from naja.events import SceneChangeEvent
 
 
 class MenuScene(Scene):
-
     def __init__(self, state):
         super(MenuScene, self).__init__(state)
-        self.widgets.append(TextWidget((10, 10), 'Game', fontsize=32,
-                            colour='white'))
-        self.widgets.append(TextWidget((10, 40), 'Credits', fontsize=32,
-                            colour='white'))
-        self.widgets.append(TextWidget((10, 70), 'Quit', fontsize=32,
-                            colour='white'))
-        self.pos = 0
+        selector = SelectorWidget()
+        self.add(selector)
+        run_game = TextWidget((100, 100), 'Game', fontsize=32, colour='white')
+        run_game.add_callback('click',
+                              lambda event: SceneChangeEvent.post(GameScene))
+        selector.add(run_game)
+        credits = TextWidget((100, 200), 'Credits', fontsize=32, colour='white')
+        credits.add_callback('click',
+                             lambda event: SceneChangeEvent.post(CreditsScene))
+        selector.add(credits)
+        quit = TextWidget((100, 300), 'Quit', fontsize=32, colour='white')
+        quit.add_callback('click', lambda event: QuitGameEvent.post())
+        selector.add(quit)
 
-    def handle_event(self, ev):
+    def handle_scene_event(self, ev):
         if ev.type == pgl.KEYDOWN:
-            if ev.key in (pgl.K_q, pgl.K_ESCAPE):
+            if ev.key in KEYS.QUIT:
                 QuitGameEvent.post()
                 return
-            if ev.key == pgl.K_DOWN:
-                self.pos = (self.pos + 1) % 3
-            elif ev.key == pgl.K_UP:
-                self.pos = (self.pos - 1) % 3
-            elif ev.key == pgl.K_RETURN:
-                if self.pos == 2:
-                    QuitGameEvent.post()
-                    return
-                elif self.pos == 0:
-                    scene = GameScene
-                elif self.pos == 1:
-                    scene = CreditsScene
-                SceneChangeEvent.post(scene)