summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-08-29 01:33:26 +0300
committerAndrei Karas <akaras@inbox.ru>2012-08-29 01:33:26 +0300
commit12b59d229f700b6e1b2364407d83bebfc83df907 (patch)
tree4409330b0c0052f2f6ce3ac41a9982f666dccbdf
parent82e111b764205e9f070c2af0562433800b9eabea (diff)
downloadmv-12b59d229f700b6e1b2364407d83bebfc83df907.tar.gz
mv-12b59d229f700b6e1b2364407d83bebfc83df907.tar.bz2
mv-12b59d229f700b6e1b2364407d83bebfc83df907.tar.xz
mv-12b59d229f700b6e1b2364407d83bebfc83df907.zip
Add listbox own color.
Parameter "LISTBOX" in colors.xml
-rw-r--r--data/graphics/gui/colors.xml1
-rw-r--r--data/themes/blacknblack/colors.xml1
-rw-r--r--data/themes/blackwood/colors.xml1
-rw-r--r--data/themes/enchilado/colors.xml1
-rw-r--r--data/themes/mana/colors.xml1
-rw-r--r--data/themes/pink/colors.xml1
-rw-r--r--data/themes/unity/colors.xml1
-rw-r--r--data/themes/wood/colors.xml1
-rw-r--r--src/gui/serverdialog.cpp2
-rw-r--r--src/gui/theme.cpp1
-rw-r--r--src/gui/theme.h1
-rw-r--r--src/gui/widgets/listbox.cpp2
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 @@
<color id="CHECKBOX" color="#000000" />
<color id="DROPDOWN" color="#000000" />
<color id="LABEL" color="#000000" />
+ <color id="LISTBOX" color="#000000" />
<color id="TAB" color="#000000" />
<color id="PARTY_CHAT_TAB" color="#f48055" />
<color id="PARTY_SOCIAL_TAB" color="#f48055" />
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 @@
<color id="CHECKBOX" color="#ffffff" />
<color id="DROPDOWN" color="#ffffff" />
<color id="LABEL" color="#ffffff" />
+ <color id="LISTBOX" color="#ffffff" />
<color id="TAB" color="#13f00d" />
<color id="PARTY_CHAT_TAB" color="#ff00d8" />
<color id="PARTY_SOCIAL_TAB" color="#ff00d8" />
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 @@
<color id="CHECKBOX" color="#000000" />
<color id="DROPDOWN" color="#000000" />
<color id="LABEL" color="#000000" />
+ <color id="LISTBOX" color="#000000" />
<color id="TAB" color="#000000" />
<color id="PARTY_CHAT_TAB" color="#ff00d8" />
<color id="PARTY_SOCIAL_TAB" color="#ff00d8" />
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 @@
<color id="CHECKBOX" color="#000000" />
<color id="DROPDOWN" color="#000000" />
<color id="LABEL" color="#000000" />
+ <color id="LISTBOX" color="#000000" />
<color id="TAB" color="#000000" />
<color id="PARTY_CHAT_TAB" color="#f48055" />
<color id="PARTY_SOCIAL_TAB" color="#f48055" />
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 @@
<color id="CHECKBOX" color="#000000" />
<color id="DROPDOWN" color="#000000" />
<color id="LABEL" color="#000000" />
+ <color id="LISTBOX" color="#000000" />
<color id="TAB" color="#000000" />
<color id="PARTY_CHAT_TAB" color="#f48055" />
<color id="PARTY_SOCIAL_TAB" color="#ff00d8" />
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 @@
<color id="CHECKBOX" color="#FF00FF" />
<color id="DROPDOWN" color="#FF00FF" />
<color id="LABEL" color="#FF00FF" />
+ <color id="LISTBOX" color="#FF00FF" />
<color id="TAB" color="#FF32FF" />
<color id="PARTY_CHAT_TAB" color="#f48055" />
<color id="PARTY_SOCIAL_TAB" color="#f48055" />
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 @@
<color id="CHECKBOX" color="#FE9750" />
<color id="DROPDOWN" color="#FE9750" />
<color id="LABEL" color="#FE9750" />
+ <color id="LISTBOX" color="#FE9750" />
<color id="TAB" color="#F0F0F0" />
<color id="PARTY_CHAT_TAB" color="#E0E0E0" />
<color id="PARTY_SOCIAL_TAB" color="#E0E0E0" />
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 @@
<color id="CHECKBOX" color="#000000" />
<color id="DROPDOWN" color="#000000" />
<color id="LABEL" color="#000000" />
+ <color id="LISTBOX" color="#000000" />
<color id="TAB" color="#000000" />
<color id="PARTY_CHAT_TAB" color="#c04000" />
<color id="PARTY_SOCIAL_TAB" color="#c04000" />
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()