summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/graphics/gui/colors.xml8
-rw-r--r--data/themes/blacknblack/colors.xml8
-rw-r--r--data/themes/blackwood/colors.xml8
-rw-r--r--data/themes/enchilado/colors.xml8
-rw-r--r--data/themes/mana/colors.xml8
-rw-r--r--data/themes/pink/colors.xml8
-rw-r--r--data/themes/unity/colors.xml8
-rw-r--r--data/themes/wood/colors.xml8
-rw-r--r--src/gui/socialwindow.cpp8
-rw-r--r--src/gui/theme.cpp8
-rw-r--r--src/gui/theme.h8
-rw-r--r--src/gui/widgets/guildchattab.cpp4
-rw-r--r--src/net/ea/gui/guildtab.cpp4
-rw-r--r--src/net/ea/gui/partytab.cpp4
14 files changed, 100 insertions, 0 deletions
diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml
index 59f089b46..98949696a 100644
--- a/data/graphics/gui/colors.xml
+++ b/data/graphics/gui/colors.xml
@@ -22,6 +22,14 @@
<color id="PARTY_SOCIAL_TAB" color="#f48055" />
<color id="GUILD_CHAT_TAB" color="#f48055" />
<color id="GUILD_SOCIAL_TAB" color="#f48055" />
+ <color id="PARTY_CHAT_TAB_HIGHLIGHTED" color="#f48055" />
+ <color id="PARTY_SOCIAL_TAB_HIGHLIGHTED" color="#f48055" />
+ <color id="GUILD_CHAT_TAB_HIGHLIGHTED" color="#f48055" />
+ <color id="GUILD_SOCIAL_TAB_HIGHLIGHTED" color="#f48055" />
+ <color id="PARTY_CHAT_TAB_SELECTED" color="#f48055" />
+ <color id="PARTY_SOCIAL_TAB_SELECTED" color="#f48055" />
+ <color id="GUILD_CHAT_TAB_SELECTED" color="#f48055" />
+ <color id="GUILD_SOCIAL_TAB_SELECTED" color="#f48055" />
<color id="BACKGROUND" color="#ffffff" />
<color id="BACKGROUND_GRAY" color="#404040" />
<color id="SCROLLBAR_GRAY" color="#000000" />
diff --git a/data/themes/blacknblack/colors.xml b/data/themes/blacknblack/colors.xml
index 018304ba0..b4f2382f8 100644
--- a/data/themes/blacknblack/colors.xml
+++ b/data/themes/blacknblack/colors.xml
@@ -22,6 +22,14 @@
<color id="PARTY_SOCIAL_TAB" color="#ff00d8" />
<color id="GUILD_CHAT_TAB" color="#ff00d8" />
<color id="GUILD_SOCIAL_TAB" color="#ff00d8" />
+ <color id="PARTY_CHAT_TAB_HIGHLIGHTED" color="#ff00d8" />
+ <color id="PARTY_SOCIAL_TAB_HIGHLIGHTED" color="#ff00d8" />
+ <color id="GUILD_CHAT_TAB_HIGHLIGHTED" color="#ff00d8" />
+ <color id="GUILD_SOCIAL_TAB_HIGHLIGHTED" color="#ff00d8" />
+ <color id="PARTY_CHAT_TAB_SELECTED" color="#ff00d8" />
+ <color id="PARTY_SOCIAL_TAB_SELECTED" color="#ff00d8" />
+ <color id="GUILD_CHAT_TAB_SELECTED" color="#ff00d8" />
+ <color id="GUILD_SOCIAL_TAB_SELECTED" color="#ff00d8" />
<color id="BACKGROUND" color="#000000" />
<color id="BACKGROUND_GRAY" color="#005000" />
<color id="SCROLLBAR_GRAY" color="#000000" />
diff --git a/data/themes/blackwood/colors.xml b/data/themes/blackwood/colors.xml
index d7043ac13..27293f1cb 100644
--- a/data/themes/blackwood/colors.xml
+++ b/data/themes/blackwood/colors.xml
@@ -22,6 +22,14 @@
<color id="PARTY_SOCIAL_TAB" color="#ff00d8" />
<color id="GUILD_CHAT_TAB" color="#ff00d8" />
<color id="GUILD_SOCIAL_TAB" color="#ff00d8" />
+ <color id="PARTY_CHAT_TAB_HIGHLIGHTED" color="#ff00d8" />
+ <color id="PARTY_SOCIAL_TAB_HIGHLIGHTED" color="#ff00d8" />
+ <color id="GUILD_CHAT_TAB_HIGHLIGHTED" color="#ff00d8" />
+ <color id="GUILD_SOCIAL_TAB_HIGHLIGHTED" color="#ff00d8" />
+ <color id="PARTY_CHAT_TAB_SELECTED" color="#ff00d8" />
+ <color id="PARTY_SOCIAL_TAB_SELECTED" color="#ff00d8" />
+ <color id="GUILD_CHAT_TAB_SELECTED" color="#ff00d8" />
+ <color id="GUILD_SOCIAL_TAB_SELECTED" color="#ff00d8" />
<color id="BACKGROUND" color="#ffffff" />
<color id="BACKGROUND_GRAY" color="#404040" />
<color id="SCROLLBAR_GRAY" color="#000000" />
diff --git a/data/themes/enchilado/colors.xml b/data/themes/enchilado/colors.xml
index 34024633b..86960ef64 100644
--- a/data/themes/enchilado/colors.xml
+++ b/data/themes/enchilado/colors.xml
@@ -22,6 +22,14 @@
<color id="PARTY_SOCIAL_TAB" color="#f48055" />
<color id="GUILD_CHAT_TAB" color="#f48055" />
<color id="GUILD_SOCIAL_TAB" color="#f48055" />
+ <color id="PARTY_CHAT_TAB_HIGHLIGHTED" color="#f48055" />
+ <color id="PARTY_SOCIAL_TAB_HIGHLIGHTED" color="#f48055" />
+ <color id="GUILD_CHAT_TAB_HIGHLIGHTED" color="#f48055" />
+ <color id="GUILD_SOCIAL_TAB_HIGHLIGHTED" color="#f48055" />
+ <color id="PARTY_CHAT_TAB_SELECTED" color="#f48055" />
+ <color id="PARTY_SOCIAL_TAB_SELECTED" color="#f48055" />
+ <color id="GUILD_CHAT_TAB_SELECTED" color="#f48055" />
+ <color id="GUILD_SOCIAL_TAB_SELECTED" color="#f48055" />
<color id="BACKGROUND" color="#ffffff" />
<color id="BACKGROUND_GRAY" color="#404040" />
<color id="SCROLLBAR_GRAY" color="#000000" />
diff --git a/data/themes/mana/colors.xml b/data/themes/mana/colors.xml
index d8086d2d3..3001db556 100644
--- a/data/themes/mana/colors.xml
+++ b/data/themes/mana/colors.xml
@@ -22,6 +22,14 @@
<color id="PARTY_SOCIAL_TAB" color="#ff00d8" />
<color id="GUILD_CHAT_TAB" color="#ff00d8" />
<color id="GUILD_SOCIAL_TAB" color="#ff00d8" />
+ <color id="PARTY_CHAT_TAB_HIGHLIGHTED" color="#f48055" />
+ <color id="PARTY_SOCIAL_TAB_HIGHLIGHTED" color="#ff00d8" />
+ <color id="GUILD_CHAT_TAB_HIGHLIGHTED" color="#ff00d8" />
+ <color id="GUILD_SOCIAL_TAB_HIGHLIGHTED" color="#ff00d8" />
+ <color id="PARTY_CHAT_TAB_SELECTED" color="#f48055" />
+ <color id="PARTY_SOCIAL_TAB_SELECTED" color="#ff00d8" />
+ <color id="GUILD_CHAT_TAB_SELECTED" color="#ff00d8" />
+ <color id="GUILD_SOCIAL_TAB_SELECTED" color="#ff00d8" />
<color id="BACKGROUND" color="#ffffff" />
<color id="BACKGROUND_GRAY" color="#404040" />
<color id="SCROLLBAR_GRAY" color="#000000" />
diff --git a/data/themes/pink/colors.xml b/data/themes/pink/colors.xml
index ee20dfb8f..0360a012c 100644
--- a/data/themes/pink/colors.xml
+++ b/data/themes/pink/colors.xml
@@ -22,6 +22,14 @@
<color id="PARTY_SOCIAL_TAB" color="#f48055" />
<color id="GUILD_CHAT_TAB" color="#f48055" />
<color id="GUILD_SOCIAL_TAB" color="#f48055" />
+ <color id="PARTY_CHAT_TAB_HIGHLIGHTED" color="#f48055" />
+ <color id="PARTY_SOCIAL_TAB_HIGHLIGHTED" color="#f48055" />
+ <color id="GUILD_CHAT_TAB_HIGHLIGHTED" color="#f48055" />
+ <color id="GUILD_SOCIAL_TAB_HIGHLIGHTED" color="#f48055" />
+ <color id="PARTY_CHAT_TAB_SELECTED" color="#f48055" />
+ <color id="PARTY_SOCIAL_TAB_SELECTED" color="#f48055" />
+ <color id="GUILD_CHAT_TAB_SELECTED" color="#f48055" />
+ <color id="GUILD_SOCIAL_TAB_SELECTED" color="#f48055" />
<color id="BACKGROUND" color="#ffffff" />
<color id="BACKGROUND_GRAY" color="#404040" />
<color id="SCROLLBAR_GRAY" color="#000000" />
diff --git a/data/themes/unity/colors.xml b/data/themes/unity/colors.xml
index c57feb282..a390bad8f 100644
--- a/data/themes/unity/colors.xml
+++ b/data/themes/unity/colors.xml
@@ -21,6 +21,14 @@
<color id="PARTY_SOCIAL_TAB" color="#E0E0E0" />
<color id="GUILD_CHAT_TAB" color="#E0E0E0" />
<color id="GUILD_SOCIAL_TAB" color="#E0E0E0" />
+ <color id="PARTY_CHAT_TAB_HIGHLIGHTED" color="#E0E0E0" />
+ <color id="PARTY_SOCIAL_TAB_HIGHLIGHTED" color="#E0E0E0" />
+ <color id="GUILD_CHAT_TAB_HIGHLIGHTED" color="#E0E0E0" />
+ <color id="GUILD_SOCIAL_TAB_HIGHLIGHTED" color="#E0E0E0" />
+ <color id="PARTY_CHAT_TAB_SELECTED" color="#E0E0E0" />
+ <color id="PARTY_SOCIAL_TAB_SELECTED" color="#E0E0E0" />
+ <color id="GUILD_CHAT_TAB_SELECTED" color="#E0E0E0" />
+ <color id="GUILD_SOCIAL_TAB_SELECTED" color="#E0E0E0" />
<color id="BACKGROUND" color="#4D4D4D" />
<color id="BACKGROUND_GRAY" color="#404040" />
<color id="SCROLLBAR_GRAY" color="#4D4D4D" />
diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml
index e0ec90c68..2f7c5917d 100644
--- a/data/themes/wood/colors.xml
+++ b/data/themes/wood/colors.xml
@@ -22,6 +22,14 @@
<color id="PARTY_SOCIAL_TAB" color="#c04000" />
<color id="GUILD_CHAT_TAB" color="#c04000" />
<color id="GUILD_SOCIAL_TAB" color="#c04000" />
+ <color id="PARTY_CHAT_TAB_HIGHLIGHTED" color="#c04000" />
+ <color id="PARTY_SOCIAL_TAB_HIGHLIGHTED" color="#c04000" />
+ <color id="GUILD_CHAT_TAB_HIGHLIGHTED" color="#c04000" />
+ <color id="GUILD_SOCIAL_TAB_HIGHLIGHTED" color="#c04000" />
+ <color id="PARTY_CHAT_TAB_SELECTED" color="#c04000" />
+ <color id="PARTY_SOCIAL_TAB_SELECTED" color="#c04000" />
+ <color id="GUILD_CHAT_TAB_SELECTED" color="#c04000" />
+ <color id="GUILD_SOCIAL_TAB_SELECTED" color="#c04000" />
<color id="BACKGROUND" color="#ffffff" />
<color id="BACKGROUND_GRAY" color="#404040" />
<color id="SCROLLBAR_GRAY" color="#000000" />
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()
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-01 04:47:09 +0000