summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-08-29 01:49:15 +0300
committerAndrei Karas <akaras@inbox.ru>2012-08-29 01:49:15 +0300
commit82abefd7567f361311b62cd96a0e9e738e233beb (patch)
tree37dbd6406074a89d01a8c2380d88bc7033e9d497
parent6b6d627f2c95d29d576c90def4764869ea1fa2fb (diff)
downloadmv-82abefd7567f361311b62cd96a0e9e738e233beb.tar.gz
mv-82abefd7567f361311b62cd96a0e9e738e233beb.tar.bz2
mv-82abefd7567f361311b62cd96a0e9e738e233beb.tar.xz
mv-82abefd7567f361311b62cd96a0e9e738e233beb.zip
Add textfield own color.
Parameter "TEXTFIELD" 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/textfield.cpp2
11 files changed, 11 insertions, 1 deletions
diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml
index 6d11adf56..9ee0d3c58 100644
--- a/data/graphics/gui/colors.xml
+++ b/data/graphics/gui/colors.xml
@@ -13,6 +13,7 @@
<color id="RADIOBUTTON" color="#000000" />
<color id="TAB" color="#000000" />
<color id="TEXTBOX" color="#000000" />
+ <color id="TEXTFIELD" color="#000000" />
<color id="PARTY_CHAT_TAB" color="#f48055" />
<color id="PARTY_SOCIAL_TAB" color="#f48055" />
<color id="GUILD_CHAT_TAB" color="#f48055" />
diff --git a/data/themes/blacknblack/colors.xml b/data/themes/blacknblack/colors.xml
index 5bfe0f103..69b6a5aa8 100644
--- a/data/themes/blacknblack/colors.xml
+++ b/data/themes/blacknblack/colors.xml
@@ -13,6 +13,7 @@
<color id="RADIOBUTTON" color="#ffffff" />
<color id="TAB" color="#13f00d" />
<color id="TEXTBOX" color="#ffffff" />
+ <color id="TEXTFIELD" color="#ffffff" />
<color id="PARTY_CHAT_TAB" color="#ff00d8" />
<color id="PARTY_SOCIAL_TAB" color="#ff00d8" />
<color id="GUILD_CHAT_TAB" color="#ff00d8" />
diff --git a/data/themes/blackwood/colors.xml b/data/themes/blackwood/colors.xml
index f57883f8c..9848c170e 100644
--- a/data/themes/blackwood/colors.xml
+++ b/data/themes/blackwood/colors.xml
@@ -13,6 +13,7 @@
<color id="RADIOBUTTON" color="#000000" />
<color id="TAB" color="#000000" />
<color id="TEXTBOX" color="#000000" />
+ <color id="TEXTFIELD" color="#000000" />
<color id="PARTY_CHAT_TAB" color="#ff00d8" />
<color id="PARTY_SOCIAL_TAB" color="#ff00d8" />
<color id="GUILD_CHAT_TAB" color="#ff00d8" />
diff --git a/data/themes/enchilado/colors.xml b/data/themes/enchilado/colors.xml
index a98ad1068..49f33e1ce 100644
--- a/data/themes/enchilado/colors.xml
+++ b/data/themes/enchilado/colors.xml
@@ -13,6 +13,7 @@
<color id="RADIOBUTTON" color="#000000" />
<color id="TAB" color="#000000" />
<color id="TEXTBOX" color="#000000" />
+ <color id="TEXTFIELD" color="#000000" />
<color id="PARTY_CHAT_TAB" color="#f48055" />
<color id="PARTY_SOCIAL_TAB" color="#f48055" />
<color id="GUILD_CHAT_TAB" color="#f48055" />
diff --git a/data/themes/mana/colors.xml b/data/themes/mana/colors.xml
index b0668f1ff..29b08fe8f 100644
--- a/data/themes/mana/colors.xml
+++ b/data/themes/mana/colors.xml
@@ -13,6 +13,7 @@
<color id="RADIOBUTTON" color="#000000" />
<color id="TAB" color="#000000" />
<color id="TEXTBOX" color="#000000" />
+ <color id="TEXTFIELD" color="#000000" />
<color id="PARTY_CHAT_TAB" color="#f48055" />
<color id="PARTY_SOCIAL_TAB" color="#ff00d8" />
<color id="GUILD_CHAT_TAB" color="#ff00d8" />
diff --git a/data/themes/pink/colors.xml b/data/themes/pink/colors.xml
index 301eacf2b..7ce80b0b1 100644
--- a/data/themes/pink/colors.xml
+++ b/data/themes/pink/colors.xml
@@ -13,6 +13,7 @@
<color id="RADIOBUTTON" color="#FF00FF" />
<color id="TAB" color="#FF32FF" />
<color id="TEXTBOX" color="#FF00FF" />
+ <color id="TEXTFIELD" color="#FF00FF" />
<color id="PARTY_CHAT_TAB" color="#f48055" />
<color id="PARTY_SOCIAL_TAB" color="#f48055" />
<color id="GUILD_CHAT_TAB" color="#f48055" />
diff --git a/data/themes/unity/colors.xml b/data/themes/unity/colors.xml
index 717dffc13..52300da0d 100644
--- a/data/themes/unity/colors.xml
+++ b/data/themes/unity/colors.xml
@@ -12,6 +12,7 @@
<color id="RADIOBUTTON" color="#FE9750" />
<color id="TAB" color="#F0F0F0" />
<color id="TEXTBOX" color="#FE9750" />
+ <color id="TEXTFIELD" color="#FE9750" />
<color id="PARTY_CHAT_TAB" color="#E0E0E0" />
<color id="PARTY_SOCIAL_TAB" color="#E0E0E0" />
<color id="GUILD_CHAT_TAB" color="#E0E0E0" />
diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml
index 80d619c29..7dce79f4a 100644
--- a/data/themes/wood/colors.xml
+++ b/data/themes/wood/colors.xml
@@ -13,6 +13,7 @@
<color id="RADIOBUTTON" color="#000000" />
<color id="TAB" color="#000000" />
<color id="TEXTBOX" color="#000000" />
+ <color id="TEXTFIELD" color="#000000" />
<color id="PARTY_CHAT_TAB" color="#c04000" />
<color id="PARTY_SOCIAL_TAB" color="#c04000" />
<color id="GUILD_CHAT_TAB" color="#c04000" />
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index cc9116cdd..9aa920bc7 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -669,6 +669,7 @@ static int readColorType(const std::string &type)
"RADIOBUTTON",
"TAB",
"TEXTBOX",
+ "TEXTFIELD",
"PARTY_CHAT_TAB",
"PARTY_SOCIAL_TAB",
"GUILD_CHAT_TAB",
diff --git a/src/gui/theme.h b/src/gui/theme.h
index 9c89afc84..2c9588b6c 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -177,6 +177,7 @@ class Theme : public Palette, public ConfigListener
RADIOBUTTON,
TAB,
TEXTBOX,
+ TEXTFIELD,
PARTY_CHAT_TAB,
PARTY_SOCIAL_TAB,
GUILD_CHAT_TAB,
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index 261cdf901..1c22a0a7b 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -60,7 +60,7 @@ TextField::TextField(const std::string &text, bool loseFocusOnTab,
{
setFrameSize(2);
- setForegroundColor(Theme::getThemeColor(Theme::TEXT));
+ setForegroundColor(Theme::getThemeColor(Theme::TEXTFIELD));
if (instances == 0)
{