summaryrefslogtreecommitdiff
path: root/src/gui/socialwindow.cpp
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2010-03-04 22:41:19 -0700
committerJared Adams <jaxad0127@gmail.com>2010-03-12 14:49:27 -0700
commit781b3c9f17708cc5fe08eb3c9ee38d596364d97c (patch)
tree833797c9b9168ab58864ffe4cf8ed028060e44a2 /src/gui/socialwindow.cpp
parent96b64757954f07d196599b3c1131a6603982c930 (diff)
downloadmana-client-781b3c9f17708cc5fe08eb3c9ee38d596364d97c.tar.gz
mana-client-781b3c9f17708cc5fe08eb3c9ee38d596364d97c.tar.bz2
mana-client-781b3c9f17708cc5fe08eb3c9ee38d596364d97c.tar.xz
mana-client-781b3c9f17708cc5fe08eb3c9ee38d596364d97c.zip
Split Palette into Theme and UserPalette
Themes can now control the colors they use. Colors in the Viewport (being names, particles, etc) can still be changed by the user. Also make ProgressBars more easily colored. DyePalette was made more flexible in the process. Also fixes comparing strings of different lengths insensitively. Reviewed-by: Thorbjørn Lindeijer
Diffstat (limited to 'src/gui/socialwindow.cpp')
-rw-r--r--src/gui/socialwindow.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp
index 5da8018c..904a710b 100644
--- a/src/gui/socialwindow.cpp
+++ b/src/gui/socialwindow.cpp
@@ -30,6 +30,7 @@
#include "gui/okdialog.h"
#include "gui/setup.h"
#include "gui/textdialog.h"
+#include "gui/theme.h"
#include "gui/widgets/avatarlistbox.h"
#include "gui/widgets/browserbox.h"
@@ -98,7 +99,7 @@ public:
{
setCaption(guild->getName());
- setTabColor(&guiPalette->getColor(Palette::GUILD));
+ setTabColor(&Theme::getThemeColor(Theme::GUILD));
mList = new AvatarListBox(guild);
mScroll = new ScrollArea(mList);
@@ -163,7 +164,7 @@ public:
{
setCaption(party->getName());
- setTabColor(&guiPalette->getColor(Palette::PARTY));
+ setTabColor(&Theme::getThemeColor(Theme::PARTY));
mList = new AvatarListBox(party);
mScroll = new ScrollArea(mList);