From 1d16b34c14a3b2deff084757f2b583d54b4741ce Mon Sep 17 00:00:00 2001 From: Stefan Dombrowski Date: Wed, 13 Oct 2010 17:32:41 +0200 Subject: Adding theme colors for party tabs Following Rotonen's advise to "make anything and everything you can think of recolorable", a theme can now define colors for PARTY_CHAT_TAB and PARTY_SOCIAL_TAB. This was badly needed, because the requirements for a color of a chat tab and of a player name are quite different. TODO: When guild support gets enabled, then have a look at the colors for guilds. Reviewed-by: 4144 --- data/graphics/gui/colors.xml | 2 ++ src/gui/socialwindow.cpp | 2 +- src/gui/theme.cpp | 2 ++ src/gui/theme.h | 2 ++ src/net/tmwa/gui/partytab.cpp | 2 +- 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml index 546ad5ea..4a35d081 100644 --- a/data/graphics/gui/colors.xml +++ b/data/graphics/gui/colors.xml @@ -6,6 +6,8 @@ + + diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp index ec414836..d52e073c 100644 --- a/src/gui/socialwindow.cpp +++ b/src/gui/socialwindow.cpp @@ -184,7 +184,7 @@ public: { setCaption(party->getName()); - setTabColor(&Theme::getThemeColor(Theme::PARTY)); + setTabColor(&Theme::getThemeColor(Theme::PARTY_SOCIAL_TAB)); mList = new AvatarListBox(party); mScroll = new ScrollArea(mList); diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index f80fa272..3d0bd5d3 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -398,6 +398,8 @@ static int readColorType(const std::string &type) "BUTTON", "BUTTON_DISABLED", "TAB", + "PARTY_CHAT_TAB", + "PARTY_SOCIAL_TAB", "BACKGROUND", "HIGHLIGHT", "TAB_FLASH", diff --git a/src/gui/theme.h b/src/gui/theme.h index 6798bed5..3a5aa41a 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -127,6 +127,8 @@ class Theme : public Palette, public ConfigListener BUTTON, BUTTON_DISABLED, TAB, + PARTY_CHAT_TAB, + PARTY_SOCIAL_TAB, BACKGROUND, HIGHLIGHT, TAB_FLASH, diff --git a/src/net/tmwa/gui/partytab.cpp b/src/net/tmwa/gui/partytab.cpp index 03dadb04..b541c498 100644 --- a/src/net/tmwa/gui/partytab.cpp +++ b/src/net/tmwa/gui/partytab.cpp @@ -42,7 +42,7 @@ namespace TmwAthena { PartyTab::PartyTab() : ChatTab(_("Party")) { - setTabColor(&Theme::getThemeColor(Theme::PARTY)); + setTabColor(&Theme::getThemeColor(Theme::PARTY_CHAT_TAB)); } PartyTab::~PartyTab() -- cgit v1.2.3-70-g09d2