From: Neil <neil@dip.sun.ac.za>
Date: Thu, 15 May 2014 22:18:37 +0000 (+0200)
Subject: More PALETTE
X-Git-Tag: 0.1~246
X-Git-Url: https://git.ctpug.org.za/?p=naja.git;a=commitdiff_plain;h=25d1332b1c51c542a545ca937d195aef572228c4

More PALETTE
---

diff --git a/naja/widgets/info_area.py b/naja/widgets/info_area.py
index c92a0b0..c8c021a 100644
--- a/naja/widgets/info_area.py
+++ b/naja/widgets/info_area.py
@@ -48,14 +48,15 @@ class InfoAreaWidget(Widget):
         self.surface.fill((0, 0, 0))
         # Extract actions and such from the card
         title = TextWidget((0, 0), TITLES[self.state.gameboard.player_mode],
-                           colour=(255, 255, 255))
+                           colour=PALETTE.WHITE)
         title.render(self.surface)
         y_offset = title.surface.get_rect().height + 8
 
         # TODO: Make this better.
         bits_text = ''.join('1' if bit in self.card.bitwise_operand else '0'
                             for bit in reversed(range(8)))
-        card_bits = TextWidget((0, y_offset), bits_text, colour=(255, 255, 0))
+        card_bits = TextWidget((0, y_offset), bits_text,
+                               colour=PALETTE.LIGHT_TURQUOISE)
         card_bits.render(self.surface)
         y_offset += card_bits.surface.get_rect().height + 8
 
diff --git a/naja/widgets/text.py b/naja/widgets/text.py
index fb0c31f..0dea540 100644
--- a/naja/widgets/text.py
+++ b/naja/widgets/text.py
@@ -1,6 +1,6 @@
 import pygame
 
-from naja.constants import FONT, FONT_SIZE, EIGHT_BIT_SCALE
+from naja.constants import FONT, FONT_SIZE, EIGHT_BIT_SCALE, PALETTE
 from naja.resources import resources
 from naja.resources.mutators import EIGHT_BIT, blender
 from naja.utils import convert_colour
@@ -24,7 +24,7 @@ class TextWidget(Widget):
         self.text = text
         self.fontname = fontname or FONT
         self.fontsize = (fontsize or FONT_SIZE) // EIGHT_BIT_SCALE
-        self.colour = convert_colour(colour or (0, 0, 0))
+        self.colour = convert_colour(colour or PALETTE.BLACK)
 
     def render_line(self, text):
         text_surf = self.font.render(text, True, self.colour)
@@ -47,9 +47,9 @@ class TextBoxWidget(TextWidget):
         self.padding = kwargs.pop('padding', 5)
         self.border = kwargs.pop('border', 2)
         self.bg_colour = convert_colour(kwargs.pop('bg_colour',
-                                                   (255, 255, 255, 192)))
+                                                   PALETTE.LIGHT_VIOLET))
         self.border_colour = convert_colour(kwargs.pop('border_colour',
-                                                       (0, 0, 0)))
+                                                       PALETTE.BLACK))
         self.box_width = kwargs.pop('box_width', 0)
 
         super(TextBoxWidget, self).__init__(*args, **kwargs)