Scenes get a Container for widgets

[naja.git] / naja / scenes / menu.py

diff --git a/naja/scenes/menu.py b/naja/scenes/menu.py
index 96c8c7a5677e8374458a1f2d1694d0209f6d274a..46b2b3b13eab19a19e18ea17d8a9f8ea4c1b2998 100644 (file)
--- a/naja/scenes/menu.py
+++ b/naja/scenes/menu.py
@@ -8,20 +8,34 @@ from naja.scenes.scene import Scene
 from naja.widgets.text import TextWidget
 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):
-        super(MenuScene, self).__init__()
-        self.widgets.append(TextWidget((10, 10), 'Haai', fontsize=32,
-                            colour='white'))
+    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
 
-    def handle_event(self, ev):
-        if ev.type == pgl.KEYUP and ev.key in (pgl.K_q, pgl.K_ESCAPE):
-            QuitGameEvent.post()
-            return
-        if ev.type == pgl.KEYUP and ev.key is pgl.K_RETURN:
-            credits_menu = CreditsScene()
-            SceneChangeEvent.post(credits_menu)
-            return
+    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)