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

diff --git a/naja/scenes/menu.py b/naja/scenes/menu.py
index 9a0fe71..91f858b 100644
--- a/naja/scenes/menu.py
+++ b/naja/scenes/menu.py
@@ -4,28 +4,35 @@ 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
 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'))
+        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):
-        if ev.type == pgl.KEYDOWN and ev.key in (pgl.K_q, pgl.K_ESCAPE):
-            QuitGameEvent.post()
-            return
-        if ev.type == pgl.KEYDOWN and ev.key is pgl.K_RETURN:
-            SceneChangeEvent.post(CreditsScene)
-            return
+    def handle_scene_event(self, ev):
+        if ev.type == pgl.KEYDOWN:
+            if ev.key in KEYS.QUIT:
+                QuitGameEvent.post()
+                return