From: David Sharpe Date: Sun, 11 May 2014 19:59:04 +0000 (+0200) Subject: Bastard merge X-Git-Tag: 0.1~392 X-Git-Url: https://git.ctpug.org.za/?a=commitdiff_plain;h=d9ded620200ed74517f17f83f01313470ffca222;p=naja.git Bastard merge --- d9ded620200ed74517f17f83f01313470ffca222 diff --cc naja/scenes/credits.py index 05e2f7d,747dd01..920684c --- a/naja/scenes/credits.py +++ b/naja/scenes/credits.py @@@ -14,16 -15,11 +14,20 @@@ class CreditsScene(Scene) def __init__(self, state): super(CreditsScene, self).__init__(state) - self.widgets.append(TextWidget((120, 120), 'Credits', fontsize=32, - self.add(TextWidget((60, 10), 'Credits', fontsize=32, colour='white')) - self.add(TextWidget((60, 30), 'Your mom\nA stranger', fontsize=32, - colour='white')) ++ self.add(TextWidget((360, 160), 'Credits', fontsize=32, + colour='white')) - self.widgets.append(TextBoxWidget((120, 30), ++ self.add(TextBoxWidget((120, 30), + 'Your mom ' - 'A stranger \nA \nbag full of snakes', fontsize=32, ++ 'A stranger \n' ++ 'A \n' ++ 'bag full of snakes\n' ++ 'A host of really bored bronies\n' ++ 'And FIVE GOLDEN RIIIIINGS!', fontsize=32, + colour='white', padding=1, border=1, + bg_colour='black', border_colour='black', + box_width=100)) - def handle_event(self, ev): + def handle_scene_event(self, ev): if ev.type == pgl.KEYUP and ev.key in (pgl.K_q, pgl.K_ESCAPE): from naja.scenes.menu import MenuScene SceneChangeEvent.post(MenuScene) diff --cc naja/scenes/credits.py.orig index 0000000,0000000..116bcfd new file mode 100644 --- /dev/null +++ b/naja/scenes/credits.py.orig @@@ -1,0 -1,0 +1,36 @@@ ++""" ++Main menu scene. ++""" ++ ++import pygame.locals as pgl ++ ++from naja.scenes.scene import Scene ++from naja.widgets.text import TextWidget, TextBoxWidget ++from naja.events import SceneChangeEvent ++ ++class CreditsScene(Scene): ++ ++ base_menu = None ++ ++ def __init__(self, state): ++ super(CreditsScene, self).__init__(state) ++<<<<<<< HEAD ++ self.widgets.append(TextWidget((120, 120), 'Credits', fontsize=32, ++ colour='white')) ++ self.widgets.append(TextBoxWidget((120, 30), ++ 'Your mom ' ++ 'A stranger \nA \nbag full of snakes', fontsize=32, ++ colour='white', padding=1, border=1, ++ bg_colour='black', border_colour='black', ++ box_width=100)) ++======= ++ self.add(TextWidget((60, 10), 'Credits', fontsize=32, colour='white')) ++ self.add(TextWidget((60, 30), 'Your mom\nA stranger', fontsize=32, ++ colour='white')) ++>>>>>>> 4e27b4e10d7fd4f66097ece17a8c51b80233a363 ++ ++ def handle_scene_event(self, ev): ++ if ev.type == pgl.KEYUP and ev.key in (pgl.K_q, pgl.K_ESCAPE): ++ from naja.scenes.menu import MenuScene ++ SceneChangeEvent.post(MenuScene) ++ return