From a88b02402ef2919e297dbacc88b23caee635ffb6 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 12 Oct 2014 16:36:44 +0300 Subject: Add own battle chat tab colors. --- data/graphics/gui/colors.xml | 3 +++ data/themes/blacknblack/colors.xml | 3 +++ data/themes/blackwood/colors.xml | 3 +++ data/themes/enchilado/colors.xml | 3 +++ data/themes/golden-delicious/colors.xml | 18 ++++++++++++++++++ data/themes/jewelry/colors.xml | 18 ++++++++++++++++++ data/themes/mana/colors.xml | 3 +++ data/themes/pink/colors.xml | 3 +++ data/themes/unity/colors.xml | 3 +++ data/themes/wood/colors.xml | 3 +++ src/gui/theme.cpp | 6 ++++++ src/gui/theme.h | 6 ++++++ src/gui/widgets/tabs/chat/battletab.cpp | 1 + 13 files changed, 73 insertions(+) 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 @@ + + + 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 @@ + + + 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 @@ + + + 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 @@ + + + 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 @@ + + + + + + @@ -146,6 +152,12 @@ + + + + + + @@ -306,6 +318,12 @@ + + + + + + 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 @@ + + + + + + @@ -146,6 +152,12 @@ + + + + + + @@ -330,6 +342,12 @@ + + + + + + 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 @@ + + + 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 @@ + + + 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 @@ + + + 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 @@ + + + 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"); } -- cgit v1.2.3-70-g09d2