diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-08-29 01:20:29 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-08-29 01:22:57 +0300 |
commit | 82e111b764205e9f070c2af0562433800b9eabea (patch) | |
tree | 57c54780203ec2d3a3e79f476eda838dadacdd14 | |
parent | e09cff19fba98786e2bbc551066cbb11d189f687 (diff) | |
download | manaverse-82e111b764205e9f070c2af0562433800b9eabea.tar.gz manaverse-82e111b764205e9f070c2af0562433800b9eabea.tar.bz2 manaverse-82e111b764205e9f070c2af0562433800b9eabea.tar.xz manaverse-82e111b764205e9f070c2af0562433800b9eabea.zip |
Add label own color.
Parameter "LABEL" in colors.xml
-rw-r--r-- | data/graphics/gui/colors.xml | 1 | ||||
-rw-r--r-- | data/themes/blacknblack/colors.xml | 1 | ||||
-rw-r--r-- | data/themes/blackwood/colors.xml | 1 | ||||
-rw-r--r-- | data/themes/enchilado/colors.xml | 1 | ||||
-rw-r--r-- | data/themes/mana/colors.xml | 1 | ||||
-rw-r--r-- | data/themes/pink/colors.xml | 1 | ||||
-rw-r--r-- | data/themes/unity/colors.xml | 1 | ||||
-rw-r--r-- | data/themes/wood/colors.xml | 1 | ||||
-rw-r--r-- | src/gui/theme.cpp | 1 | ||||
-rw-r--r-- | src/gui/theme.h | 1 | ||||
-rw-r--r-- | src/gui/widgets/label.cpp | 4 |
11 files changed, 12 insertions, 2 deletions
diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml index 2bce2d159..abd91c267 100644 --- a/data/graphics/gui/colors.xml +++ b/data/graphics/gui/colors.xml @@ -8,6 +8,7 @@ <color id="BUTTON_DISABLED" color="#333333" /> <color id="CHECKBOX" color="#000000" /> <color id="DROPDOWN" color="#000000" /> + <color id="LABEL" 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 b857cff7a..9d6d564c4 100644 --- a/data/themes/blacknblack/colors.xml +++ b/data/themes/blacknblack/colors.xml @@ -8,6 +8,7 @@ <color id="BUTTON_DISABLED" color="#777777" /> <color id="CHECKBOX" color="#ffffff" /> <color id="DROPDOWN" color="#ffffff" /> + <color id="LABEL" 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 41ec10cff..b0acd4bd6 100644 --- a/data/themes/blackwood/colors.xml +++ b/data/themes/blackwood/colors.xml @@ -8,6 +8,7 @@ <color id="BUTTON_DISABLED" color="#333333" /> <color id="CHECKBOX" color="#000000" /> <color id="DROPDOWN" color="#000000" /> + <color id="LABEL" 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 452d3aac4..bd5af8103 100644 --- a/data/themes/enchilado/colors.xml +++ b/data/themes/enchilado/colors.xml @@ -8,6 +8,7 @@ <color id="BUTTON_DISABLED" color="#333333" /> <color id="CHECKBOX" color="#000000" /> <color id="DROPDOWN" color="#000000" /> + <color id="LABEL" 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 cbf28baa5..41c63a63f 100644 --- a/data/themes/mana/colors.xml +++ b/data/themes/mana/colors.xml @@ -8,6 +8,7 @@ <color id="BUTTON_DISABLED" color="#333333" /> <color id="CHECKBOX" color="#000000" /> <color id="DROPDOWN" color="#000000" /> + <color id="LABEL" 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 210b7b272..894ebe77f 100644 --- a/data/themes/pink/colors.xml +++ b/data/themes/pink/colors.xml @@ -8,6 +8,7 @@ <color id="BUTTON_DISABLED" color="#FF00FF" /> <color id="CHECKBOX" color="#FF00FF" /> <color id="DROPDOWN" color="#FF00FF" /> + <color id="LABEL" 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 7cd475a13..b84422328 100644 --- a/data/themes/unity/colors.xml +++ b/data/themes/unity/colors.xml @@ -7,6 +7,7 @@ <color id="BUTTON_DISABLED" color="#FC6400" /> <color id="CHECKBOX" color="#FE9750" /> <color id="DROPDOWN" color="#FE9750" /> + <color id="LABEL" 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 ff4608596..1b8217749 100644 --- a/data/themes/wood/colors.xml +++ b/data/themes/wood/colors.xml @@ -8,6 +8,7 @@ <color id="BUTTON_DISABLED" color="#cccccc" /> <color id="CHECKBOX" color="#000000" /> <color id="DROPDOWN" color="#000000" /> + <color id="LABEL" 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 440c4ccf9..e98534da8 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -664,6 +664,7 @@ static int readColorType(const std::string &type) "BUTTON_DISABLED", "CHECKBOX", "DROPDOWN", + "LABEL", "TAB", "PARTY_CHAT_TAB", "PARTY_SOCIAL_TAB", diff --git a/src/gui/theme.h b/src/gui/theme.h index 5e478a433..01f8d1c3f 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -172,6 +172,7 @@ class Theme : public Palette, public ConfigListener BUTTON_DISABLED, CHECKBOX, DROPDOWN, + LABEL, TAB, PARTY_CHAT_TAB, PARTY_SOCIAL_TAB, diff --git a/src/gui/widgets/label.cpp b/src/gui/widgets/label.cpp index dde7ddca3..c0d708975 100644 --- a/src/gui/widgets/label.cpp +++ b/src/gui/widgets/label.cpp @@ -27,13 +27,13 @@ Label::Label() { - setForegroundColor(Theme::getThemeColor(Theme::TEXT)); + setForegroundColor(Theme::getThemeColor(Theme::LABEL)); } Label::Label(const std::string &caption) : gcn::Label(caption) { - setForegroundColor(Theme::getThemeColor(Theme::TEXT)); + setForegroundColor(Theme::getThemeColor(Theme::LABEL)); } void Label::draw(gcn::Graphics *graphics) |