X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fscenes%2Fmenu.py;h=6b4152df59401eabd0d34cd31e255a81d4643dfc;hb=a6261f51a91485805fe7ebd3d85ea20a257f798f;hp=46b2b3b13eab19a19e18ea17d8a9f8ea4c1b2998;hpb=5331699e9ab927608ad9fa6841de85a30b1c42b1;p=naja.git

diff --git a/naja/scenes/menu.py b/naja/scenes/menu.py
index 46b2b3b..6b4152d 100644
--- a/naja/scenes/menu.py
+++ b/naja/scenes/menu.py
@@ -6,6 +6,7 @@ import pygame.locals as pgl
 
 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,29 +14,24 @@ from naja.events import SceneChangeEvent
 
 
 class MenuScene(Scene):
-
     def __init__(self, state):
         super(MenuScene, self).__init__(state)
-        self.add(TextWidget((10, 10), 'Game', fontsize=32, colour='white'))
-        self.add(TextWidget((10, 40), 'Credits', fontsize=32, colour='white'))
-        self.add(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_scene_event(self, ev):
         if ev.type == pgl.KEYDOWN:
             if ev.key in (pgl.K_q, pgl.K_ESCAPE):
                 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)