X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fwidgets%2Finfo_area.py;h=e348048208faf89b74ce209cc3567a8bd7347e43;hb=16d8d61da7f44b155f74e60e9062c248c50958e6;hp=0c5bd0afebcc21dc4782e310d9539837bf7383b3;hpb=a351c6c8a07779878dc5dd598e28cd06f6622529;p=naja.git diff --git a/naja/widgets/info_area.py b/naja/widgets/info_area.py index 0c5bd0a..e348048 100644 --- a/naja/widgets/info_area.py +++ b/naja/widgets/info_area.py @@ -20,12 +20,12 @@ from naja.widgets.text import TextBoxWidget, TextWidget HINTS = { - ACT: ("Choose an action using the Up/Down keys.\n" - "Press Enter to execute the action."), - EXAMINE: "Select a tile to examine using the arrow keys.", + ACT: "Choose an action using {NORTH,SOUTH} keys.\n" + "Press {RETURN} to execute it.", + EXAMINE: "Browse the tiles with {NORTH,SOUTH,EAST,WEST} keys.", } -HINT_LEGAL_MOVE = "\nPress Return to move to this tile." +HINT_LEGAL_MOVE = "\nPress {RETURN} to move to this tile." TITLES = { ACT: "Choose an Action", @@ -54,13 +54,6 @@ class InfoAreaWidget(Widget): y_offset = 0 pos = lambda: (INFO_LEFT_PADDING, y_offset) - # Top title - title = TextWidget( - pos(), TITLES[self.state.gameboard.player_mode], - colour=PALETTE.WHITE) - title.render(self.surface) - y_offset += title.surface.get_rect().height - 4 - # Bits bits_text = ''.join('1' if bit in self.card.bitwise_operand else '0' for bit in reversed(range(8))) @@ -68,9 +61,12 @@ class InfoAreaWidget(Widget): bits_text = '%s %s' % ( bits_text, bit_glyphs(self.card.bitwise_operand)) card_bits = TextBoxWidget( - pos(), bits_text, box_width=box_width, - colour=PALETTE.LIGHT_TURQUOISE, bg_colour=PALETTE.BLACK) - card_bits.render(self.surface) + (0, 0), bits_text, padding=4, centre=True, + colour=PALETTE.WHITE, border=2, + bg_colour=PALETTE.BLACK, border_colour=PALETTE.BLUE, + box_width=box_width) + card_bits.prepare() + self.surface.blit(card_bits.surface, pos()) y_offset += card_bits.surface.get_rect().height + 4 # Actions @@ -85,8 +81,9 @@ class InfoAreaWidget(Widget): hint = TextBoxWidget( (0, 0), hint_text, padding=4, - box_width=box_width, - border=2, border_colour=PALETTE.GREY) + colour=PALETTE.WHITE, border=2, + bg_colour=PALETTE.BLACK, border_colour=PALETTE.BLUE, + box_width=box_width) hint.prepare() y_offset = (INFO_SIZE[1] - hint.surface.get_rect().height - BIT_SIZE[1] - 2)