From 12b59d229f700b6e1b2364407d83bebfc83df907 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 29 Aug 2012 01:33:26 +0300 Subject: Add listbox own color. Parameter "LISTBOX" 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/serverdialog.cpp | 2 +- src/gui/theme.cpp | 1 + src/gui/theme.h | 1 + src/gui/widgets/listbox.cpp | 2 +- 12 files changed, 12 insertions(+), 2 deletions(-) diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml index abd91c267..498179faa 100644 --- a/data/graphics/gui/colors.xml +++ b/data/graphics/gui/colors.xml @@ -9,6 +9,7 @@ + diff --git a/data/themes/blacknblack/colors.xml b/data/themes/blacknblack/colors.xml index 9d6d564c4..c8cce9ae7 100644 --- a/data/themes/blacknblack/colors.xml +++ b/data/themes/blacknblack/colors.xml @@ -9,6 +9,7 @@ + diff --git a/data/themes/blackwood/colors.xml b/data/themes/blackwood/colors.xml index b0acd4bd6..02b5cb57c 100644 --- a/data/themes/blackwood/colors.xml +++ b/data/themes/blackwood/colors.xml @@ -9,6 +9,7 @@ + diff --git a/data/themes/enchilado/colors.xml b/data/themes/enchilado/colors.xml index bd5af8103..dc00dc97b 100644 --- a/data/themes/enchilado/colors.xml +++ b/data/themes/enchilado/colors.xml @@ -9,6 +9,7 @@ + diff --git a/data/themes/mana/colors.xml b/data/themes/mana/colors.xml index 41c63a63f..aa46f45a6 100644 --- a/data/themes/mana/colors.xml +++ b/data/themes/mana/colors.xml @@ -9,6 +9,7 @@ + diff --git a/data/themes/pink/colors.xml b/data/themes/pink/colors.xml index 894ebe77f..1e30679cb 100644 --- a/data/themes/pink/colors.xml +++ b/data/themes/pink/colors.xml @@ -9,6 +9,7 @@ + diff --git a/data/themes/unity/colors.xml b/data/themes/unity/colors.xml index b84422328..9dd361324 100644 --- a/data/themes/unity/colors.xml +++ b/data/themes/unity/colors.xml @@ -8,6 +8,7 @@ + diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml index 1b8217749..dca2fc3b9 100644 --- a/data/themes/wood/colors.xml +++ b/data/themes/wood/colors.xml @@ -9,6 +9,7 @@ + diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp index ed682c487..93f0609ff 100644 --- a/src/gui/serverdialog.cpp +++ b/src/gui/serverdialog.cpp @@ -160,7 +160,7 @@ public: ServersListBox(ServersListModel *const model) : ListBox(model), mHighlightColor(Theme::getThemeColor(Theme::HIGHLIGHT)), - mTextColor(Theme::getThemeColor(Theme::TEXT)), + mTextColor(Theme::getThemeColor(Theme::LISTBOX)), mNotSupportedColor(Theme::getThemeColor( Theme::SERVER_VERSION_NOT_SUPPORTED)) { diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index e98534da8..bf811d3fb 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -665,6 +665,7 @@ static int readColorType(const std::string &type) "CHECKBOX", "DROPDOWN", "LABEL", + "LISTBOX", "TAB", "PARTY_CHAT_TAB", "PARTY_SOCIAL_TAB", diff --git a/src/gui/theme.h b/src/gui/theme.h index 01f8d1c3f..7705388fb 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -173,6 +173,7 @@ class Theme : public Palette, public ConfigListener CHECKBOX, DROPDOWN, LABEL, + LISTBOX, TAB, PARTY_CHAT_TAB, PARTY_SOCIAL_TAB, diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp index 46067df91..f11632675 100644 --- a/src/gui/widgets/listbox.cpp +++ b/src/gui/widgets/listbox.cpp @@ -45,7 +45,7 @@ ListBox::ListBox(gcn::ListModel *listModel): mHighlightColor(Theme::getThemeColor(Theme::HIGHLIGHT)), mDistributeMousePressed(true) { - setForegroundColor(Theme::getThemeColor(Theme::TEXT)); + setForegroundColor(Theme::getThemeColor(Theme::LISTBOX)); } ListBox::~ListBox() -- cgit v1.2.3-60-g2f50