Merge branch 'master' of git+ssh://ctpug.org.za/naja

diff --git a/naja/engine.py b/naja/engine.py
index 32c139f8a56f17427b0a426bdb3b1e2fe3ec338d..f17f9c221d17e758cb6b063399b492b30534f2ff 100644 (file)
--- a/naja/engine.py
+++ b/naja/engine.py
@@ -22,6 +22,7 @@ class Engine(object):
                 elif SceneChangeEvent.matches(ev):
                     self.change_scene(ev.scene)
                 else:
+                    print(ev.type)
                     self._scene.handle_event(ev)
             self._scene.render(self._surface)
             pygame.display.flip()

diff --git a/naja/scenes/credits.py b/naja/scenes/credits.py
new file mode 100644 (file)
index 0000000..3f592df
--- /dev/null
+++ b/naja/scenes/credits.py
@@ -0,0 +1,30 @@
+"""
+Main menu scene.
+"""
+
+import pygame.locals as pgl
+
+from naja.scenes.scene import Scene
+from naja.widgets.text import TextWidget
+from naja.events import SceneChangeEvent
+
+class CreditsScene(Scene):
+
+    base_menu = None
+
+    def __init__(self):
+        super(CreditsScene, self).__init__()
+        self.widgets.append(TextWidget((60, 10), 'Credits', fontsize=32,
+                            colour='white'))
+        self.widgets.append(TextWidget((60, 30),
+                                       'Your mom\n'
+                                       'A stranger', fontsize=32,
+                            colour='white'))
+
+
+    def handle_event(self, ev):
+        if ev.type == pgl.KEYUP and ev.key in (pgl.K_q, pgl.K_ESCAPE):
+            from naja.scenes.menu import MenuScene
+            menu_scene = MenuScene()
+            SceneChangeEvent.post(menu_scene)
+            return

diff --git a/naja/scenes/menu.py b/naja/scenes/menu.py
index 771cf33318cd8b227b0a534ac9fc06939036291d..96c8c7a5677e8374458a1f2d1694d0209f6d274a 100644 (file)
--- a/naja/scenes/menu.py
+++ b/naja/scenes/menu.py
@@ -7,7 +7,8 @@ import pygame.locals as pgl
 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
 
 class MenuScene(Scene):
 
@@ -20,3 +21,7 @@ class MenuScene(Scene):
         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