summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/graphics/gui/colors.xml3
-rw-r--r--data/themes/blacknblack/colors.xml3
-rw-r--r--data/themes/blackwood/colors.xml3
-rw-r--r--data/themes/enchilado/colors.xml3
-rw-r--r--data/themes/golden-delicious/colors.xml18
-rw-r--r--data/themes/jewelry/colors.xml18
-rw-r--r--data/themes/mana/colors.xml3
-rw-r--r--data/themes/pink/colors.xml3
-rw-r--r--data/themes/unity/colors.xml3
-rw-r--r--data/themes/wood/colors.xml3
-rw-r--r--src/gui/theme.cpp6
-rw-r--r--src/gui/theme.h6
-rw-r--r--src/gui/widgets/tabs/chat/battletab.cpp1
13 files changed, 73 insertions, 0 deletions
diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml
index 978dbbe8c..9c029899a 100644
--- a/data/graphics/gui/colors.xml
+++ b/data/graphics/gui/colors.xml
@@ -25,6 +25,9 @@
<color id="TAB" color="#000000" />
<color id="TAB_HIGHLIGHTED" color="#000000" />
<color id="TAB_SELECTED" color="#000000" />
+ <color id="BATTLE_CHAT_TAB" color="#000000" />
+ <color id="BATTLE_CHAT_TAB_HIGHLIGHTED" color="#000000" />
+ <color id="BATTLE_CHAT_TAB_SELECTED" color="#000000" />
<color id="TEXTBOX" color="#000000" />
<color id="TEXTFIELD" color="#000000" />
<color id="WINDOW" color="#000000" />
diff --git a/data/themes/blacknblack/colors.xml b/data/themes/blacknblack/colors.xml
index 15da730ac..fe8faea7f 100644
--- a/data/themes/blacknblack/colors.xml
+++ b/data/themes/blacknblack/colors.xml
@@ -25,6 +25,9 @@
<color id="TAB" color="#13f00d" />
<color id="TAB_HIGHLIGHTED" color="#13f00d" />
<color id="TAB_SELECTED" color="#13f00d" />
+ <color id="BATTLE_CHAT_TAB" color="#13f00d" />
+ <color id="BATTLE_CHAT_TAB_HIGHLIGHTED" color="#13f00d" />
+ <color id="BATTLE_CHAT_TAB_SELECTED" color="#13f00d" />
<color id="TEXTBOX" color="#ffffff" />
<color id="TEXTFIELD" color="#ffffff" />
<color id="WINDOW" color="#ffffff" />
diff --git a/data/themes/blackwood/colors.xml b/data/themes/blackwood/colors.xml
index 964429a0d..829c3e089 100644
--- a/data/themes/blackwood/colors.xml
+++ b/data/themes/blackwood/colors.xml
@@ -25,6 +25,9 @@
<color id="TAB" color="#000000" />
<color id="TAB_HIGHLIGHTED" color="#000000" />
<color id="TAB_SELECTED" color="#000000" />
+ <color id="BATTLE_CHAT_TAB" color="#000000" />
+ <color id="BATTLE_CHAT_TAB_HIGHLIGHTED" color="#000000" />
+ <color id="BATTLE_CHAT_TAB_SELECTED" color="#000000" />
<color id="TEXTBOX" color="#000000" />
<color id="TEXTFIELD" color="#000000" />
<color id="WINDOW" color="#000000" />
diff --git a/data/themes/enchilado/colors.xml b/data/themes/enchilado/colors.xml
index 500c0b023..5a3387e3f 100644
--- a/data/themes/enchilado/colors.xml
+++ b/data/themes/enchilado/colors.xml
@@ -25,6 +25,9 @@
<color id="TAB" color="#000000" />
<color id="TAB_HIGHLIGHTED" color="#000000" />
<color id="TAB_SELECTED" color="#000000" />
+ <color id="BATTLE_CHAT_TAB" color="#000000" />
+ <color id="BATTLE_CHAT_TAB_HIGHLIGHTED" color="#000000" />
+ <color id="BATTLE_CHAT_TAB_SELECTED" color="#000000" />
<color id="TEXTBOX" color="#000000" />
<color id="TEXTFIELD" color="#000000" />
<color id="WINDOW" color="#000000" />
diff --git a/data/themes/golden-delicious/colors.xml b/data/themes/golden-delicious/colors.xml
index e141ceef1..e973fc65c 100644
--- a/data/themes/golden-delicious/colors.xml
+++ b/data/themes/golden-delicious/colors.xml
@@ -33,6 +33,12 @@
<color id="TAB_HIGHLIGHTED_OUTLINE" color="#63450a" />
<color id="TAB_SELECTED" color="#f8eacf" />
<color id="TAB_SELECTED_OUTLINE" color="#63450a" />
+ <color id="BATTLE_CHAT_TAB" color="#efd7a7" />
+ <color id="BATTLE_CHAT_TAB_OUTLINE" color="#473005" />
+ <color id="BATTLE_CHAT_TAB_HIGHLIGHTED" color="#f8eacf" />
+ <color id="BATTLE_CHAT_TAB_HIGHLIGHTED_OUTLINE" color="#63450a" />
+ <color id="BATTLE_CHAT_TAB_SELECTED" color="#f8eacf" />
+ <color id="BATTLE_CHAT_TAB_SELECTED_OUTLINE" color="#63450a" />
<color id="TABLE_BACKGROUND" color="#23201f" />
<color id="TEXTBOX" color="#e8d8aa" />
<color id="TEXTFIELD" color="#F8F0CA" />
@@ -146,6 +152,12 @@
<color id="TAB_HIGHLIGHTED_OUTLINE" color="#63450a" />
<color id="TAB_SELECTED" color="#f8eacf" />
<color id="TAB_SELECTED_OUTLINE" color="#63450a" />
+ <color id="BATTLE_CHAT_TAB" color="#efd7a7" />
+ <color id="BATTLE_CHAT_TAB_OUTLINE" color="#473005" />
+ <color id="BATTLE_CHAT_TAB_HIGHLIGHTED" color="#f8eacf" />
+ <color id="BATTLE_CHAT_TAB_HIGHLIGHTED_OUTLINE" color="#63450a" />
+ <color id="BATTLE_CHAT_TAB_SELECTED" color="#f8eacf" />
+ <color id="BATTLE_CHAT_TAB_SELECTED_OUTLINE" color="#63450a" />
<color id="TAB_FLASH" color="#a7ff2a" />
<color id="TAB_FLASH_OUTLINE" color="#142200" />
<color id="TAB_PLAYER_FLASH" color="#ff96f6" />
@@ -306,6 +318,12 @@
<color id="TAB_HIGHLIGHTED_OUTLINE" color="#000000" />
<color id="TAB_SELECTED" color="#f8eacf" />
<color id="TAB_SELECTED_OUTLINE" color="#000000" />
+ <color id="BATTLE_CHAT_TAB" color="#efd7a7" />
+ <color id="BATTLE_CHAT_TAB_OUTLINE" color="#000000" />
+ <color id="BATTLE_CHAT_TAB_HIGHLIGHTED" color="#f8eacf" />
+ <color id="BATTLE_CHAT_TAB_HIGHLIGHTED_OUTLINE" color="#000000" />
+ <color id="BATTLE_CHAT_TAB_SELECTED" color="#f8eacf" />
+ <color id="BATTLE_CHAT_TAB_SELECTED_OUTLINE" color="#000000" />
<color id="TEXTBOX" color="#808080" />
<color id="TEXTFIELD" color="#808080" />
<color id="WINDOW" color="#f1d9a9" />
diff --git a/data/themes/jewelry/colors.xml b/data/themes/jewelry/colors.xml
index eb268a4be..477ad1e9b 100644
--- a/data/themes/jewelry/colors.xml
+++ b/data/themes/jewelry/colors.xml
@@ -32,6 +32,12 @@
<color id="TAB_HIGHLIGHTED_OUTLINE" color="#63450a" />
<color id="TAB_SELECTED" color="#f8eacf" />
<color id="TAB_SELECTED_OUTLINE" color="#63450a" />
+ <color id="BATTLE_CHAT_TAB" color="#efd7a7" />
+ <color id="BATTLE_CHAT_TAB_OUTLINE" color="#473005" />
+ <color id="BATTLE_CHAT_TAB_HIGHLIGHTED" color="#f8eacf" />
+ <color id="BATTLE_CHAT_TAB_HIGHLIGHTED_OUTLINE" color="#63450a" />
+ <color id="BATTLE_CHAT_TAB_SELECTED" color="#f8eacf" />
+ <color id="BATTLE_CHAT_TAB_SELECTED_OUTLINE" color="#63450a" />
<color id="TEXTBOX" color="#000000" />
<color id="TEXTFIELD" color="#000000" />
<color id="WINDOW" color="#f1d9a9" />
@@ -146,6 +152,12 @@
<color id="TAB_HIGHLIGHTED_OUTLINE" color="#63450a" />
<color id="TAB_SELECTED" color="#f8eacf" />
<color id="TAB_SELECTED_OUTLINE" color="#63450a" />
+ <color id="BATTLE_CHAT_TAB" color="#efd7a7" />
+ <color id="BATTLE_CHAT_TAB_OUTLINE" color="#473005" />
+ <color id="BATTLE_CHAT_TAB_HIGHLIGHTED" color="#f8eacf" />
+ <color id="BATTLE_CHAT_TAB_HIGHLIGHTED_OUTLINE" color="#63450a" />
+ <color id="BATTLE_CHAT_TAB_SELECTED" color="#f8eacf" />
+ <color id="BATTLE_CHAT_TAB_SELECTED_OUTLINE" color="#63450a" />
<color id="TAB_FLASH" color="#a7ff2a" />
<color id="TAB_FLASH_OUTLINE" color="#142200" />
<color id="TAB_PLAYER_FLASH" color="#ff96f6" />
@@ -330,6 +342,12 @@
<color id="TAB_HIGHLIGHTED_OUTLINE" color="#000000" />
<color id="TAB_SELECTED" color="#f8eacf" />
<color id="TAB_SELECTED_OUTLINE" color="#000000" />
+ <color id="BATTLE_CHAT_TAB" color="#efd7a7" />
+ <color id="BATTLE_CHAT_TAB_OUTLINE" color="#000000" />
+ <color id="BATTLE_CHAT_TAB_HIGHLIGHTED" color="#f8eacf" />
+ <color id="BATTLE_CHAT_TAB_HIGHLIGHTED_OUTLINE" color="#000000" />
+ <color id="BATTLE_CHAT_TAB_SELECTED" color="#f8eacf" />
+ <color id="BATTLE_CHAT_TAB_SELECTED_OUTLINE" color="#000000" />
<color id="TEXTBOX" color="#000000" />
<color id="TEXTFIELD" color="#000000" />
<color id="WINDOW" color="#f1d9a9" />
diff --git a/data/themes/mana/colors.xml b/data/themes/mana/colors.xml
index fd778fd0d..253b75640 100644
--- a/data/themes/mana/colors.xml
+++ b/data/themes/mana/colors.xml
@@ -25,6 +25,9 @@
<color id="TAB" color="#000000" />
<color id="TAB_HIGHLIGHTED" color="#000000" />
<color id="TAB_SELECTED" color="#000000" />
+ <color id="BATTLE_CHAT_TAB" color="#000000" />
+ <color id="BATTLE_CHAT_TAB_HIGHLIGHTED" color="#000000" />
+ <color id="BATTLE_CHAT_TAB_SELECTED" color="#000000" />
<color id="TEXTBOX" color="#000000" />
<color id="TEXTFIELD" color="#000000" />
<color id="WINDOW" color="#000000" />
diff --git a/data/themes/pink/colors.xml b/data/themes/pink/colors.xml
index 7d2aa9e45..ad8459575 100644
--- a/data/themes/pink/colors.xml
+++ b/data/themes/pink/colors.xml
@@ -25,6 +25,9 @@
<color id="TAB" color="#FF32FF" />
<color id="TAB_HIGHLIGHTED" color="#FF32FF" />
<color id="TAB_SELECTED" color="#FF32FF" />
+ <color id="BATTLE_CHAT_TAB" color="#FF32FF" />
+ <color id="BATTLE_CHAT_TAB_HIGHLIGHTED" color="#FF32FF" />
+ <color id="BATTLE_CHAT_TAB_SELECTED" color="#FF32FF" />
<color id="TEXTBOX" color="#FF00FF" />
<color id="TEXTFIELD" color="#FF00FF" />
<color id="WINDOW" color="#FF00FF" />
diff --git a/data/themes/unity/colors.xml b/data/themes/unity/colors.xml
index a3b4e6cac..4b717c1a7 100644
--- a/data/themes/unity/colors.xml
+++ b/data/themes/unity/colors.xml
@@ -24,6 +24,9 @@
<color id="TAB" color="#E0E0E0" />
<color id="TAB_HIGHLIGHTED" color="#E0E0E0" />
<color id="TAB_SELECTED" color="#E0E0E0" />
+ <color id="BATTLE_CHAT_TAB" color="#E0E0E0" />
+ <color id="BATTLE_CHAT_TAB_HIGHLIGHTED" color="#E0E0E0" />
+ <color id="BATTLE_CHAT_TAB_SELECTED" color="#E0E0E0" />
<color id="TEXTBOX" color="#E0E0E0" />
<color id="TEXTFIELD" color="#E0E0E0" />
<color id="WINDOW" color="#E0E0E0" />
diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml
index 058766a17..ba6c713da 100644
--- a/data/themes/wood/colors.xml
+++ b/data/themes/wood/colors.xml
@@ -25,6 +25,9 @@
<color id="TAB" color="#000000" />
<color id="TAB_HIGHLIGHTED" color="#000000" />
<color id="TAB_SELECTED" color="#000000" />
+ <color id="BATTLE_CHAT_TAB" color="#000000" />
+ <color id="BATTLE_CHAT_TAB_HIGHLIGHTED" color="#000000" />
+ <color id="BATTLE_CHAT_TAB_SELECTED" color="#000000" />
<color id="TEXTBOX" color="#000000" />
<color id="TEXTFIELD" color="#000000" />
<color id="WINDOW" color="#000000" />
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index a584f446a..e52e80ed0 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -679,6 +679,8 @@ static int readColorType(const std::string &type)
"TEXTFIELD_OUTLINE",
"WINDOW",
"WINDOW_OUTLINE",
+ "BATTLE_CHAT_TAB",
+ "BATTLE_CHAT_TAB_OUTLINE",
"PARTY_CHAT_TAB",
"PARTY_CHAT_TAB_OUTLINE",
"PARTY_SOCIAL_TAB",
@@ -689,6 +691,8 @@ static int readColorType(const std::string &type)
"GUILD_SOCIAL_TAB_OUTLINE",
"GM_CHAT_TAB",
"GM_CHAT_TAB_OUTLINE",
+ "BATTLE_CHAT_TAB_HIGHLIGHTED",
+ "BATTLE_CHAT_TAB_HIGHLIGHTED_OUTLINE",
"PARTY_CHAT_TAB_HIGHLIGHTED",
"PARTY_CHAT_TAB_HIGHLIGHTED_OUTLINE",
"PARTY_SOCIAL_TAB_HIGHLIGHTED",
@@ -699,6 +703,8 @@ static int readColorType(const std::string &type)
"GUILD_SOCIAL_TAB_HIGHLIGHTED_OUTLINE",
"GM_CHAT_TAB_HIGHLIGHTED",
"GM_CHAT_TAB_HIGHLIGHTED_OUTLINE",
+ "BATTLE_CHAT_TAB_SELECTED",
+ "BATTLE_CHAT_TAB_SELECTED_OUTLINE",
"PARTY_CHAT_TAB_SELECTED",
"PARTY_CHAT_TAB_SELECTED_OUTLINE",
"PARTY_SOCIAL_TAB_SELECTED",
diff --git a/src/gui/theme.h b/src/gui/theme.h
index 708d12202..6e63e05e6 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -139,6 +139,8 @@ class Theme final : public Palette,
TEXTFIELD_OUTLINE,
WINDOW,
WINDOW_OUTLINE,
+ BATTLE_CHAT_TAB,
+ BATTLE_CHAT_TAB_OUTLINE,
PARTY_CHAT_TAB,
PARTY_CHAT_TAB_OUTLINE,
PARTY_SOCIAL_TAB,
@@ -149,6 +151,8 @@ class Theme final : public Palette,
GUILD_SOCIAL_TAB_OUTLINE,
GM_CHAT_TAB,
GM_CHAT_TAB_OUTLINE,
+ BATTLE_CHAT_TAB_HIGHLIGHTED,
+ BATTLE_CHAT_TAB_HIGHLIGHTED_OUTLINE,
PARTY_CHAT_TAB_HIGHLIGHTED,
PARTY_CHAT_TAB_HIGHLIGHTED_OUTLINE,
PARTY_SOCIAL_TAB_HIGHLIGHTED,
@@ -159,6 +163,8 @@ class Theme final : public Palette,
GUILD_SOCIAL_TAB_HIGHLIGHTED_OUTLINE,
GM_CHAT_TAB_HIGHLIGHTED,
GM_CHAT_TAB_HIGHLIGHTED_OUTLINE,
+ BATTLE_CHAT_TAB_SELECTED,
+ BATTLE_CHAT_TAB_SELECTED_OUTLINE,
PARTY_CHAT_TAB_SELECTED,
PARTY_CHAT_TAB_SELECTED_OUTLINE,
PARTY_SOCIAL_TAB_SELECTED,
diff --git a/src/gui/widgets/tabs/chat/battletab.cpp b/src/gui/widgets/tabs/chat/battletab.cpp
index c9672965f..73fc3802e 100644
--- a/src/gui/widgets/tabs/chat/battletab.cpp
+++ b/src/gui/widgets/tabs/chat/battletab.cpp
@@ -35,6 +35,7 @@ BattleTab::BattleTab(const Widget2 *const widget) :
// TRANSLATORS: battle chat tab name
ChatTab(widget, _("Battle"), "", "#Battle", ChatTabType::BATTLE)
{
+ setTabColors(Theme::BATTLE_CHAT_TAB);
if (config.getBoolValue("showChatHistory"))
loadFromLogFile("#Battle");
}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-07 05:09:32 +0000