summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Dombrowski <stefan@uni-bonn.de>2010-10-13 17:32:41 +0200
committerStefan Dombrowski <stefan@uni-bonn.de>2010-10-13 17:32:41 +0200
commit1d16b34c14a3b2deff084757f2b583d54b4741ce (patch)
tree0d38186c896759b9c3d246a4def3d22fb8dbbd5b
parentc1b7d619971ea3dc7f644c86090a9ac518e44fb1 (diff)
downloadmana-client-1d16b34c14a3b2deff084757f2b583d54b4741ce.tar.gz
mana-client-1d16b34c14a3b2deff084757f2b583d54b4741ce.tar.bz2
mana-client-1d16b34c14a3b2deff084757f2b583d54b4741ce.tar.xz
mana-client-1d16b34c14a3b2deff084757f2b583d54b4741ce.zip
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
-rw-r--r--data/graphics/gui/colors.xml2
-rw-r--r--src/gui/socialwindow.cpp2
-rw-r--r--src/gui/theme.cpp2
-rw-r--r--src/gui/theme.h2
-rw-r--r--src/net/tmwa/gui/partytab.cpp2
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 @@
<color id="BUTTON" color="#000000" />
<color id="BUTTON_DISABLED" color="#333333" />
<color id="TAB" color="#000000" />
+ <color id="PARTY_CHAT_TAB" color="#f48055" />
+ <color id="PARTY_SOCIAL_TAB" color="#ff00d8" />
<color id="BACKGROUND" color="#ffffff" />
<color id="HIGHLIGHT" color="#c0c0c0" />
<color id="TAB_FLASH" color="#ff0000" effect="pulse" />
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()