From 58b4f0bc45f9b866899db035664378969e583b01 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 8 Sep 2012 13:47:59 +0300 Subject: Add new colors for party and guild tabs. For party tabs: PARTY_CHAT_TAB_HIGHLIGHTED, PARTY_SOCIAL_TAB_HIGHLIGHTED, PARTY_CHAT_TAB_SELECTED, PARTY_SOCIAL_TAB_SELECTED For guild tabs: GUILD_CHAT_TAB_HIGHLIGHTED, GUILD_SOCIAL_TAB_HIGHLIGHTED, GUILD_CHAT_TAB_SELECTED, GUILD_SOCIAL_TAB_SELECTED --- src/gui/socialwindow.cpp | 8 ++++++++ src/gui/theme.cpp | 8 ++++++++ src/gui/theme.h | 8 ++++++++ src/gui/widgets/guildchattab.cpp | 4 ++++ src/net/ea/gui/guildtab.cpp | 4 ++++ src/net/ea/gui/partytab.cpp | 4 ++++ 6 files changed, 36 insertions(+) (limited to 'src') diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp index c7bc1b5f1..217f08642 100644 --- a/src/gui/socialwindow.cpp +++ b/src/gui/socialwindow.cpp @@ -140,6 +140,10 @@ public: setCaption(_("Guild")); setTabColor(&Theme::getThemeColor(Theme::GUILD_SOCIAL_TAB)); + setHighlightedTabColor(&Theme::getThemeColor( + Theme::GUILD_SOCIAL_TAB_HIGHLIGHTED)); + setSelectedTabColor(&Theme::getThemeColor( + Theme::GUILD_SOCIAL_TAB_SELECTED)); mList = new AvatarListBox(guild); mScroll = new ScrollArea(mList, showBackground, @@ -296,6 +300,10 @@ public: setCaption(_("Party")); setTabColor(&Theme::getThemeColor(Theme::PARTY_SOCIAL_TAB)); + setHighlightedTabColor(&Theme::getThemeColor( + Theme::PARTY_SOCIAL_TAB_HIGHLIGHTED)); + setSelectedTabColor(&Theme::getThemeColor( + Theme::PARTY_SOCIAL_TAB_SELECTED)); mList = new AvatarListBox(party); mScroll = new ScrollArea(mList, showBackground, diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index ccb033e78..dd9e616b7 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -694,6 +694,14 @@ static int readColorType(const std::string &type) "PARTY_SOCIAL_TAB", "GUILD_CHAT_TAB", "GUILD_SOCIAL_TAB", + "PARTY_CHAT_TAB_HIGHLIGHTED", + "PARTY_SOCIAL_TAB_HIGHLIGHTED", + "GUILD_CHAT_TAB_HIGHLIGHTED", + "GUILD_SOCIAL_TAB_HIGHLIGHTED", + "PARTY_CHAT_TAB_SELECTED", + "PARTY_SOCIAL_TAB_SELECTED", + "GUILD_CHAT_TAB_SELECTED", + "GUILD_SOCIAL_TAB_SELECTED", "BACKGROUND", "BACKGROUND_GRAY", "SCROLLBAR_GRAY", diff --git a/src/gui/theme.h b/src/gui/theme.h index 546bab99a..a079f720c 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -186,6 +186,14 @@ class Theme : public Palette, public ConfigListener PARTY_SOCIAL_TAB, GUILD_CHAT_TAB, GUILD_SOCIAL_TAB, + PARTY_CHAT_TAB_HIGHLIGHTED, + PARTY_SOCIAL_TAB_HIGHLIGHTED, + GUILD_CHAT_TAB_HIGHLIGHTED, + GUILD_SOCIAL_TAB_HIGHLIGHTED, + PARTY_CHAT_TAB_SELECTED, + PARTY_SOCIAL_TAB_SELECTED, + GUILD_CHAT_TAB_SELECTED, + GUILD_SOCIAL_TAB_SELECTED, BACKGROUND, BACKGROUND_GRAY, SCROLLBAR_GRAY, diff --git a/src/gui/widgets/guildchattab.cpp b/src/gui/widgets/guildchattab.cpp index 39887ef7e..94c54afa4 100644 --- a/src/gui/widgets/guildchattab.cpp +++ b/src/gui/widgets/guildchattab.cpp @@ -42,6 +42,10 @@ GuildChatTab::GuildChatTab() : ChatTab(_("Guild")) { setTabColor(&Theme::getThemeColor(Theme::GUILD_CHAT_TAB)); + setHighlightedTabColor(&Theme::getThemeColor( + Theme::GUILD_CHAT_TAB_HIGHLIGHTED)); + setSelectedTabColor(&Theme::getThemeColor( + Theme::GUILD_CHAT_TAB_SELECTED)); } GuildChatTab::~GuildChatTab() diff --git a/src/net/ea/gui/guildtab.cpp b/src/net/ea/gui/guildtab.cpp index b41e69418..f48a3a4bf 100644 --- a/src/net/ea/gui/guildtab.cpp +++ b/src/net/ea/gui/guildtab.cpp @@ -49,6 +49,10 @@ GuildTab::GuildTab() : ChatTab(_("Guild")) { setTabColor(&Theme::getThemeColor(Theme::GUILD_CHAT_TAB)); + setHighlightedTabColor(&Theme::getThemeColor( + Theme::GUILD_CHAT_TAB_HIGHLIGHTED)); + setSelectedTabColor(&Theme::getThemeColor( + Theme::GUILD_CHAT_TAB_SELECTED)); } GuildTab::~GuildTab() diff --git a/src/net/ea/gui/partytab.cpp b/src/net/ea/gui/partytab.cpp index 9441f15b3..cc2c653b6 100644 --- a/src/net/ea/gui/partytab.cpp +++ b/src/net/ea/gui/partytab.cpp @@ -49,6 +49,10 @@ PartyTab::PartyTab() : ChatTab(_("Party")) { setTabColor(&Theme::getThemeColor(Theme::PARTY_CHAT_TAB)); + setHighlightedTabColor(&Theme::getThemeColor( + Theme::PARTY_CHAT_TAB_HIGHLIGHTED)); + setSelectedTabColor(&Theme::getThemeColor( + Theme::PARTY_CHAT_TAB_SELECTED)); } PartyTab::~PartyTab() -- cgit v1.2.3-60-g2f50