From 6b6d627f2c95d29d576c90def4764869ea1fa2fb Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 29 Aug 2012 01:44:12 +0300 Subject: Add textbox own color. Parameter "TEXTBOX" in colors.xml --- data/graphics/gui/colors.xml | 1 + data/themes/blacknblack/colors.xml | 1 + data/themes/blackwood/colors.xml | 1 + data/themes/enchilado/colors.xml | 1 + data/themes/mana/colors.xml | 1 + data/themes/pink/colors.xml | 1 + data/themes/unity/colors.xml | 1 + data/themes/wood/colors.xml | 1 + src/gui/theme.cpp | 1 + src/gui/theme.h | 1 + src/gui/widgets/shoplistbox.cpp | 4 ++-- src/gui/widgets/textbox.cpp | 2 +- 12 files changed, 13 insertions(+), 3 deletions(-) diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml index 5314e891c..6d11adf56 100644 --- a/data/graphics/gui/colors.xml +++ b/data/graphics/gui/colors.xml @@ -12,6 +12,7 @@ + diff --git a/data/themes/blacknblack/colors.xml b/data/themes/blacknblack/colors.xml index 783c6b92a..5bfe0f103 100644 --- a/data/themes/blacknblack/colors.xml +++ b/data/themes/blacknblack/colors.xml @@ -12,6 +12,7 @@ + diff --git a/data/themes/blackwood/colors.xml b/data/themes/blackwood/colors.xml index a44187f9d..f57883f8c 100644 --- a/data/themes/blackwood/colors.xml +++ b/data/themes/blackwood/colors.xml @@ -12,6 +12,7 @@ + diff --git a/data/themes/enchilado/colors.xml b/data/themes/enchilado/colors.xml index c1e4fac69..a98ad1068 100644 --- a/data/themes/enchilado/colors.xml +++ b/data/themes/enchilado/colors.xml @@ -12,6 +12,7 @@ + diff --git a/data/themes/mana/colors.xml b/data/themes/mana/colors.xml index 67dd73975..b0668f1ff 100644 --- a/data/themes/mana/colors.xml +++ b/data/themes/mana/colors.xml @@ -12,6 +12,7 @@ + diff --git a/data/themes/pink/colors.xml b/data/themes/pink/colors.xml index e3ec74a47..301eacf2b 100644 --- a/data/themes/pink/colors.xml +++ b/data/themes/pink/colors.xml @@ -12,6 +12,7 @@ + diff --git a/data/themes/unity/colors.xml b/data/themes/unity/colors.xml index d9d66eb5d..717dffc13 100644 --- a/data/themes/unity/colors.xml +++ b/data/themes/unity/colors.xml @@ -11,6 +11,7 @@ + diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml index 63aa43a0a..80d619c29 100644 --- a/data/themes/wood/colors.xml +++ b/data/themes/wood/colors.xml @@ -12,6 +12,7 @@ + diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index ce439903b..cc9116cdd 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -668,6 +668,7 @@ static int readColorType(const std::string &type) "LISTBOX", "RADIOBUTTON", "TAB", + "TEXTBOX", "PARTY_CHAT_TAB", "PARTY_SOCIAL_TAB", "GUILD_CHAT_TAB", diff --git a/src/gui/theme.h b/src/gui/theme.h index dcafd75e6..9c89afc84 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -176,6 +176,7 @@ class Theme : public Palette, public ConfigListener LISTBOX, RADIOBUTTON, TAB, + TEXTBOX, PARTY_CHAT_TAB, PARTY_SOCIAL_TAB, GUILD_CHAT_TAB, diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp index 45b385255..2ee60d56f 100644 --- a/src/gui/widgets/shoplistbox.cpp +++ b/src/gui/widgets/shoplistbox.cpp @@ -55,7 +55,7 @@ ShopListBox::ShopListBox(gcn::ListModel *listModel): mBackgroundColor(Theme::getThemeColor(Theme::BACKGROUND)), mWarningColor(Theme::getThemeColor(Theme::SHOP_WARNING)) { - setForegroundColor(Theme::getThemeColor(Theme::TEXT)); + setForegroundColor(Theme::getThemeColor(Theme::LISTBOX)); } ShopListBox::ShopListBox(gcn::ListModel *listModel, ShopItems *shopListModel): @@ -69,7 +69,7 @@ ShopListBox::ShopListBox(gcn::ListModel *listModel, ShopItems *shopListModel): mBackgroundColor(Theme::getThemeColor(Theme::BACKGROUND)), mWarningColor(Theme::getThemeColor(Theme::SHOP_WARNING)) { - setForegroundColor(Theme::getThemeColor(Theme::TEXT)); + setForegroundColor(Theme::getThemeColor(Theme::LISTBOX)); } void ShopListBox::init() diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp index 048051bb9..06a24c68f 100644 --- a/src/gui/widgets/textbox.cpp +++ b/src/gui/widgets/textbox.cpp @@ -34,7 +34,7 @@ #include "debug.h" TextBox::TextBox() : - mTextColor(&Theme::getThemeColor(Theme::TEXT)) + mTextColor(&Theme::getThemeColor(Theme::TEXTBOX)) { setOpaque(false); setFrameSize(0); -- cgit v1.2.3-60-g2f50