diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-08-29 01:38:29 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-08-29 01:38:59 +0300 |
commit | 36293c710cf8a6da0f8ed6340731812c90885dc7 (patch) | |
tree | 8a95ea540ff1c30bf609559abee5dd13952f4f06 | |
parent | 12b59d229f700b6e1b2364407d83bebfc83df907 (diff) | |
download | manaplus-36293c710cf8a6da0f8ed6340731812c90885dc7.tar.gz manaplus-36293c710cf8a6da0f8ed6340731812c90885dc7.tar.bz2 manaplus-36293c710cf8a6da0f8ed6340731812c90885dc7.tar.xz manaplus-36293c710cf8a6da0f8ed6340731812c90885dc7.zip |
Add radiobutton own color.
Parameter "RADIOBUTTON" 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/radiobutton.cpp | 2 |
11 files changed, 11 insertions, 1 deletions
diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml index 498179faa..5314e891c 100644 --- a/data/graphics/gui/colors.xml +++ b/data/graphics/gui/colors.xml @@ -10,6 +10,7 @@ <color id="DROPDOWN" color="#000000" /> <color id="LABEL" color="#000000" /> <color id="LISTBOX" color="#000000" /> + <color id="RADIOBUTTON" 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 c8cce9ae7..783c6b92a 100644 --- a/data/themes/blacknblack/colors.xml +++ b/data/themes/blacknblack/colors.xml @@ -10,6 +10,7 @@ <color id="DROPDOWN" color="#ffffff" /> <color id="LABEL" color="#ffffff" /> <color id="LISTBOX" color="#ffffff" /> + <color id="RADIOBUTTON" 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 02b5cb57c..a44187f9d 100644 --- a/data/themes/blackwood/colors.xml +++ b/data/themes/blackwood/colors.xml @@ -10,6 +10,7 @@ <color id="DROPDOWN" color="#000000" /> <color id="LABEL" color="#000000" /> <color id="LISTBOX" color="#000000" /> + <color id="RADIOBUTTON" 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 dc00dc97b..c1e4fac69 100644 --- a/data/themes/enchilado/colors.xml +++ b/data/themes/enchilado/colors.xml @@ -10,6 +10,7 @@ <color id="DROPDOWN" color="#000000" /> <color id="LABEL" color="#000000" /> <color id="LISTBOX" color="#000000" /> + <color id="RADIOBUTTON" 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 aa46f45a6..67dd73975 100644 --- a/data/themes/mana/colors.xml +++ b/data/themes/mana/colors.xml @@ -10,6 +10,7 @@ <color id="DROPDOWN" color="#000000" /> <color id="LABEL" color="#000000" /> <color id="LISTBOX" color="#000000" /> + <color id="RADIOBUTTON" 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 1e30679cb..e3ec74a47 100644 --- a/data/themes/pink/colors.xml +++ b/data/themes/pink/colors.xml @@ -10,6 +10,7 @@ <color id="DROPDOWN" color="#FF00FF" /> <color id="LABEL" color="#FF00FF" /> <color id="LISTBOX" color="#FF00FF" /> + <color id="RADIOBUTTON" 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 9dd361324..d9d66eb5d 100644 --- a/data/themes/unity/colors.xml +++ b/data/themes/unity/colors.xml @@ -9,6 +9,7 @@ <color id="DROPDOWN" color="#FE9750" /> <color id="LABEL" color="#FE9750" /> <color id="LISTBOX" color="#FE9750" /> + <color id="RADIOBUTTON" 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 dca2fc3b9..63aa43a0a 100644 --- a/data/themes/wood/colors.xml +++ b/data/themes/wood/colors.xml @@ -10,6 +10,7 @@ <color id="DROPDOWN" color="#000000" /> <color id="LABEL" color="#000000" /> <color id="LISTBOX" color="#000000" /> + <color id="RADIOBUTTON" 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 bf811d3fb..ce439903b 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -666,6 +666,7 @@ static int readColorType(const std::string &type) "DROPDOWN", "LABEL", "LISTBOX", + "RADIOBUTTON", "TAB", "PARTY_CHAT_TAB", "PARTY_SOCIAL_TAB", diff --git a/src/gui/theme.h b/src/gui/theme.h index 7705388fb..dcafd75e6 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -174,6 +174,7 @@ class Theme : public Palette, public ConfigListener DROPDOWN, LABEL, LISTBOX, + RADIOBUTTON, TAB, PARTY_CHAT_TAB, PARTY_SOCIAL_TAB, diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp index 6a89b3080..7d3c67671 100644 --- a/src/gui/widgets/radiobutton.cpp +++ b/src/gui/widgets/radiobutton.cpp @@ -48,7 +48,7 @@ RadioButton::RadioButton(const std::string &caption, const std::string &group, gcn::RadioButton(caption, group, marked), mHasMouse(false) { - setForegroundColor(Theme::getThemeColor(Theme::TEXT)); + setForegroundColor(Theme::getThemeColor(Theme::RADIOBUTTON)); if (instances == 0) { if (Theme::instance()) |