summaryrefslogtreecommitdiff
path: root/aethyra.cbp
diff options
context:
space:
mode:
authorsniper <sniper@livecd.janhome.net>2009-03-11 15:35:54 +0100
committerIra Rice <irarice@gmail.com>2009-03-12 21:25:27 -0600
commit7d20381b7b9abdf0934ee0fbbb196c788ea93a0d (patch)
tree72e0eef30733d2928d9c0cf41090d3ea10a82e4f /aethyra.cbp
parent393c1085ed1cb24092778594d2945a39428e41ad (diff)
downloadmana-7d20381b7b9abdf0934ee0fbbb196c788ea93a0d.tar.gz
mana-7d20381b7b9abdf0934ee0fbbb196c788ea93a0d.tar.bz2
mana-7d20381b7b9abdf0934ee0fbbb196c788ea93a0d.tar.xz
mana-7d20381b7b9abdf0934ee0fbbb196c788ea93a0d.zip
Extending the internal handling of colors
The internal storage for colors was in the file color.h/color.cpp. It mainly managed the colors in the chat. The Color class was extended to be more generic now and it stores gcn::Color objects instead of integers now. A lot of new colortypes are now available, though not many of them are used for now, that will come in the next patches. The Color class was renamed to Palette and color.{h,cpp} to palette.{h,cpp} to better describe its purpose. The color config gui now lists the new colors, even changes them, but the result is not displayed properly for now.
Diffstat (limited to 'aethyra.cbp')
-rw-r--r--aethyra.cbp5
1 files changed, 3 insertions, 2 deletions
diff --git a/aethyra.cbp b/aethyra.cbp
index aa1737b7..b9e80430 100644
--- a/aethyra.cbp
+++ b/aethyra.cbp
@@ -132,8 +132,6 @@
<Unit filename="src\gui\chatinput.h" />
<Unit filename="src\gui\checkbox.cpp" />
<Unit filename="src\gui\checkbox.h" />
- <Unit filename="src\gui\color.cpp" />
- <Unit filename="src\gui\color.h" />
<Unit filename="src\gui\confirm_dialog.cpp" />
<Unit filename="src\gui\confirm_dialog.h" />
<Unit filename="src\gui\connection.cpp" />
@@ -191,6 +189,8 @@
<Unit filename="src\gui\npcstringdialog.h" />
<Unit filename="src\gui\ok_dialog.cpp" />
<Unit filename="src\gui\ok_dialog.h" />
+ <Unit filename="src\gui\palette.cpp" />
+ <Unit filename="src\gui\palette.h" />
<Unit filename="src\gui\passwordfield.cpp" />
<Unit filename="src\gui\passwordfield.h" />
<Unit filename="src\gui\playerbox.cpp" />
@@ -256,6 +256,7 @@
<Unit filename="src\gui\textbox.h" />
<Unit filename="src\gui\textfield.cpp" />
<Unit filename="src\gui\textfield.h" />
+ <Unit filename="src\gui\textrenderer.h" />
<Unit filename="src\gui\trade.cpp" />
<Unit filename="src\gui\trade.h" />
<Unit filename="src\gui\truetypefont.cpp" />