summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-08-29 01:02:00 +0300
committerAndrei Karas <akaras@inbox.ru>2012-08-29 01:02:00 +0300
commit8173f60c83d176e10412b1dc1191d7987cebdb10 (patch)
treea58654240215f64676ab73850ecb29ee83a04631
parent46696c84bad31e35e003b5c09998503119b128eb (diff)
downloadManaVerse-8173f60c83d176e10412b1dc1191d7987cebdb10.tar.gz
ManaVerse-8173f60c83d176e10412b1dc1191d7987cebdb10.tar.bz2
ManaVerse-8173f60c83d176e10412b1dc1191d7987cebdb10.tar.xz
ManaVerse-8173f60c83d176e10412b1dc1191d7987cebdb10.zip
Add checkbox own color.
Parameter "CHECKBOX" 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/theme.cpp1
-rw-r--r--src/gui/theme.h1
-rw-r--r--src/gui/widgets/checkbox.cpp2
11 files changed, 11 insertions, 1 deletions
diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml
index a4798c760..a2a6ad514 100644
--- a/data/graphics/gui/colors.xml
+++ b/data/graphics/gui/colors.xml
@@ -6,6 +6,7 @@
<color id="PROGRESS_BAR" color="#ffffff" />
<color id="BUTTON" color="#000000" />
<color id="BUTTON_DISABLED" color="#333333" />
+ <color id="CHECKBOX" 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 cda7bdfe4..a730f20a3 100644
--- a/data/themes/blacknblack/colors.xml
+++ b/data/themes/blacknblack/colors.xml
@@ -6,6 +6,7 @@
<color id="PROGRESS_BAR" color="#ffffff" />
<color id="BUTTON" color="#ffffff" />
<color id="BUTTON_DISABLED" color="#777777" />
+ <color id="CHECKBOX" 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 f21ae45b9..165bbc7d5 100644
--- a/data/themes/blackwood/colors.xml
+++ b/data/themes/blackwood/colors.xml
@@ -6,6 +6,7 @@
<color id="PROGRESS_BAR" color="#ffffff" />
<color id="BUTTON" color="#000000" />
<color id="BUTTON_DISABLED" color="#333333" />
+ <color id="CHECKBOX" 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 bf3fd8f3e..35d63d9d4 100644
--- a/data/themes/enchilado/colors.xml
+++ b/data/themes/enchilado/colors.xml
@@ -6,6 +6,7 @@
<color id="PROGRESS_BAR" color="#ffffff" />
<color id="BUTTON" color="#000000" />
<color id="BUTTON_DISABLED" color="#333333" />
+ <color id="CHECKBOX" 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 79821eff2..7b9d75b38 100644
--- a/data/themes/mana/colors.xml
+++ b/data/themes/mana/colors.xml
@@ -6,6 +6,7 @@
<color id="PROGRESS_BAR" color="#ffffff" />
<color id="BUTTON" color="#000000" />
<color id="BUTTON_DISABLED" color="#333333" />
+ <color id="CHECKBOX" 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 478779f6e..f00c6a9fd 100644
--- a/data/themes/pink/colors.xml
+++ b/data/themes/pink/colors.xml
@@ -6,6 +6,7 @@
<color id="PROGRESS_BAR" color="#ffffff" />
<color id="BUTTON" color="#FF00FF" />
<color id="BUTTON_DISABLED" color="#FF00FF" />
+ <color id="CHECKBOX" 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 059d8cce7..b7c983d93 100644
--- a/data/themes/unity/colors.xml
+++ b/data/themes/unity/colors.xml
@@ -5,6 +5,7 @@
<color id="PROGRESS_BAR" color="#ffffff" />
<color id="BUTTON" color="#FE9750" />
<color id="BUTTON_DISABLED" color="#FC6400" />
+ <color id="CHECKBOX" 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 4b3d14111..e7670aba8 100644
--- a/data/themes/wood/colors.xml
+++ b/data/themes/wood/colors.xml
@@ -6,6 +6,7 @@
<color id="PROGRESS_BAR" color="#ffffff" />
<color id="BUTTON" color="#000000" />
<color id="BUTTON_DISABLED" color="#cccccc" />
+ <color id="CHECKBOX" 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/theme.cpp b/src/gui/theme.cpp
index 990f0d41a..723730e2d 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -662,6 +662,7 @@ static int readColorType(const std::string &type)
"PROGRESS_BAR",
"BUTTON",
"BUTTON_DISABLED",
+ "CHECKBOX",
"TAB",
"PARTY_CHAT_TAB",
"PARTY_SOCIAL_TAB",
diff --git a/src/gui/theme.h b/src/gui/theme.h
index a3b4f6800..15628d9d3 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -170,6 +170,7 @@ class Theme : public Palette, public ConfigListener
PROGRESS_BAR,
BUTTON,
BUTTON_DISABLED,
+ CHECKBOX,
TAB,
PARTY_CHAT_TAB,
PARTY_SOCIAL_TAB,
diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp
index 04ac998bf..72ca9eb8d 100644
--- a/src/gui/widgets/checkbox.cpp
+++ b/src/gui/widgets/checkbox.cpp
@@ -96,7 +96,7 @@ CheckBox::CheckBox(const std::string &caption, bool selected,
if (listener)
addActionListener(listener);
- setForegroundColor(Theme::getThemeColor(Theme::TEXT));
+ setForegroundColor(Theme::getThemeColor(Theme::CHECKBOX));
}
CheckBox::~CheckBox()