Fix bug in text box widget and multiline strings with markup

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

diff --git a/naja/scenes/menu.py b/naja/scenes/menu.py
index 6819810be1e5d253fdca03baefb9505e825cb634..327bb0b371f6222883d9370d68f4e469170fec4a 100644 (file)
--- a/naja/scenes/menu.py
+++ b/naja/scenes/menu.py
@@ -4,28 +4,65 @@ Main menu scene.
 
 import pygame.locals as pgl
 
+from naja.constants import KEYS, PALETTE
+from naja.events import SceneChangeEvent, QuitGameEvent
 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.events import SceneChangeEvent
+from naja.scenes.game import GameScene
+from naja.scenes.load_save import LoadGameScene, SaveGameScene
+from naja.scenes.new_game import NewGameScene
+from naja.widgets.selector import SelectorWidget
+from naja.widgets.text import TextWidget
 
 
 class MenuScene(Scene):
+    def __init__(self, state):
+        super(MenuScene, self).__init__(state)
+        selector = SelectorWidget()
+        self.add(selector)
+        y_offset = 0
+
+        y_offset += 50
+        resume = TextWidget(
+            (100, y_offset), 'Resume Game', colour=PALETTE.WHITE,
+            unselectable_colour=PALETTE.GREY)
+        resume.add_callback('click', self.scene_callback(GameScene))
+        resume.set_selectable_callback(lambda: state is not None)
+        selector.add(resume)
+
+        y_offset += 50
+        new = TextWidget((100, y_offset), 'New Game', colour=PALETTE.WHITE)
+        new.add_callback('click', self.scene_callback(NewGameScene))
+        selector.add(new)
+
+        y_offset += 50
+        load = TextWidget((100, y_offset), 'Load', colour=PALETTE.WHITE)
+        load.add_callback('click', self.scene_callback(LoadGameScene))
+        selector.add(load)
+
+        y_offset += 50
+        save = TextWidget(
+            (100, y_offset), 'Save', colour=PALETTE.WHITE,
+            unselectable_colour=PALETTE.GREY)
+        save.add_callback('click', self.scene_callback(SaveGameScene))
+        save.set_selectable_callback(lambda: state is not None)
+        selector.add(save)
+
+        y_offset += 50
+        credits = TextWidget((100, y_offset), 'Credits', colour=PALETTE.WHITE)
+        credits.add_callback('click', self.scene_callback(CreditsScene))
+        selector.add(credits)
+
+        y_offset += 50
+        quit = TextWidget((100, y_offset), 'Quit', colour=PALETTE.WHITE)
+        quit.add_callback('click', lambda event: QuitGameEvent.post())
+        selector.add(quit)
+
+    def scene_callback(self, scene_class):
+        return lambda event: SceneChangeEvent.post(scene_class)
 
-    def __init__(self):
-        super(MenuScene, self).__init__()
-        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'))
-
-    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