diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-09-18 18:44:23 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-09-18 18:50:00 +0300 |
commit | cbd1e245325bc83c35a84508f75a9ed3f0e74c2d (patch) | |
tree | 0dffec7e1c72cff00bb5f00daa424d74196469d6 | |
parent | cc16bd52b4bfd5b542deddfcb131f0a1ca15b2e0 (diff) | |
download | plus-cbd1e245325bc83c35a84508f75a9ed3f0e74c2d.tar.gz plus-cbd1e245325bc83c35a84508f75a9ed3f0e74c2d.tar.bz2 plus-cbd1e245325bc83c35a84508f75a9ed3f0e74c2d.tar.xz plus-cbd1e245325bc83c35a84508f75a9ed3f0e74c2d.zip |
Add new theme colors for disabled text.
New colors: TEXT_DISABLED, TEXT_DISABLED_OUTLINE
For now unused.
-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/golden-delicious/colors.xml | 3 | ||||
-rw-r--r-- | data/themes/jewelry/colors.xml | 3 | ||||
-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 | 4 | ||||
-rw-r--r-- | src/gui/theme.h | 2 |
12 files changed, 19 insertions, 1 deletions
diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml index 0b697eff6..978dbbe8c 100644 --- a/data/graphics/gui/colors.xml +++ b/data/graphics/gui/colors.xml @@ -4,6 +4,7 @@ <color id="BROWSERBOX" color="#000000" /> <color id="SELFNICK" color="#000000" /> <color id="TEXT" color="#000000" /> + <color id="TEXT_DISABLED" color="#000000" /> <color id="CARET" color="#000000" /> <color id="SHADOW" color="#000000" /> <color id="OUTLINE" color="#000000" /> diff --git a/data/themes/blacknblack/colors.xml b/data/themes/blacknblack/colors.xml index c42bdda57..15da730ac 100644 --- a/data/themes/blacknblack/colors.xml +++ b/data/themes/blacknblack/colors.xml @@ -4,6 +4,7 @@ <color id="BROWSERBOX" color="#ffffff" /> <color id="SELFNICK" color="#ffffff" /> <color id="TEXT" color="#ffffff" /> + <color id="TEXT_DISABLED" color="#ffffff" /> <color id="CARET" color="#ffffff" /> <color id="SHADOW" color="#000000" /> <color id="OUTLINE" color="#555555" /> diff --git a/data/themes/blackwood/colors.xml b/data/themes/blackwood/colors.xml index 951b0035d..964429a0d 100644 --- a/data/themes/blackwood/colors.xml +++ b/data/themes/blackwood/colors.xml @@ -4,6 +4,7 @@ <color id="BROWSERBOX" color="#7a7972" /> <color id="SELFNICK" color="#7a7972" /> <color id="TEXT" color="#7a7972" /> + <color id="TEXT_DISABLED" color="#7a7972" /> <color id="CARET" color="#7a7972" /> <color id="SHADOW" color="#000000" /> <color id="OUTLINE" color="#000000" /> diff --git a/data/themes/enchilado/colors.xml b/data/themes/enchilado/colors.xml index fbf9321cb..500c0b023 100644 --- a/data/themes/enchilado/colors.xml +++ b/data/themes/enchilado/colors.xml @@ -4,6 +4,7 @@ <color id="BROWSERBOX" color="#000000" /> <color id="SELFNICK" color="#000000" /> <color id="TEXT" color="#000000" /> + <color id="TEXT_DISABLED" color="#000000" /> <color id="CARET" color="#000000" /> <color id="SHADOW" color="#000000" /> <color id="OUTLINE" color="#000000" /> diff --git a/data/themes/golden-delicious/colors.xml b/data/themes/golden-delicious/colors.xml index 6af08729b..e141ceef1 100644 --- a/data/themes/golden-delicious/colors.xml +++ b/data/themes/golden-delicious/colors.xml @@ -4,6 +4,7 @@ <color id="BROWSERBOX" color="#f9eabc" /> <color id="SELFNICK" color="#808600" /> <color id="TEXT" color="#e8d8aa" /> + <color id="TEXT_DISABLED" color="#e8d8aa" /> <color id="CARET" color="#F8E8DC" /> <color id="SHADOW" color="#000000" /> <color id="OUTLINE" color="#000000" /> @@ -114,6 +115,7 @@ <palette id="1"> <color id="SELFNICK" color="#402600" /> <color id="TEXT" color="#C0C670" /> + <color id="TEXT_DISABLED" color="#C0C670" /> <color id="CARET" color="#e8d8aa" /> <color id="SHADOW" color="#000000" /> <color id="OUTLINE" color="#000000" /> @@ -277,6 +279,7 @@ <color id="PARTY_CHAT_TAB" color="#a0a0a0" /> <color id="SELFNICK" color="#402600" /> <color id="TEXT" color="#7fFF10" /> + <color id="TEXT_DISABLED" color="#7fFF10" /> <color id="CARET" color="#80561f" /> <color id="SHADOW" color="#000000" /> <color id="OUTLINE" color="#000000" /> diff --git a/data/themes/jewelry/colors.xml b/data/themes/jewelry/colors.xml index 0e2961e79..eb268a4be 100644 --- a/data/themes/jewelry/colors.xml +++ b/data/themes/jewelry/colors.xml @@ -4,6 +4,7 @@ <color id="BROWSERBOX" color="#402600" /> <color id="SELFNICK" color="#402600" /> <color id="TEXT" color="#402600" /> + <color id="TEXT_DISABLED" color="#402600" /> <color id="CARET" color="#80561f" /> <color id="SHADOW" color="#000000" /> <color id="OUTLINE" color="#000000" /> @@ -113,6 +114,7 @@ <palette id="1"> <color id="SELFNICK" color="#402600" /> <color id="TEXT" color="#402600" /> + <color id="TEXT_DISABLED" color="#402600" /> <color id="CARET" color="#80561f" /> <color id="SHADOW" color="#000000" /> <color id="OUTLINE" color="#000000" /> @@ -300,6 +302,7 @@ <palette id="2"> <color id="SELFNICK" color="#402600" /> <color id="TEXT" color="#402600" /> + <color id="TEXT_DISABLED" color="#402600" /> <color id="CARET" color="#80561f" /> <color id="SHADOW" color="#000000" /> <color id="OUTLINE" color="#000000" /> diff --git a/data/themes/mana/colors.xml b/data/themes/mana/colors.xml index ea26b3457..fd778fd0d 100644 --- a/data/themes/mana/colors.xml +++ b/data/themes/mana/colors.xml @@ -4,6 +4,7 @@ <color id="BROWSERBOX" color="#000000" /> <color id="SELFNICK" color="#000000" /> <color id="TEXT" color="#000000" /> + <color id="TEXT_DISABLED" color="#000000" /> <color id="CARET" color="#000000" /> <color id="SHADOW" color="#000000" /> <color id="OUTLINE" color="#000000" /> diff --git a/data/themes/pink/colors.xml b/data/themes/pink/colors.xml index b3e2b1f92..7d2aa9e45 100644 --- a/data/themes/pink/colors.xml +++ b/data/themes/pink/colors.xml @@ -4,6 +4,7 @@ <color id="BROWSERBOX" color="#FF00FF" /> <color id="SELFNICK" color="#FF00FF" /> <color id="TEXT" color="#FF00FF" /> + <color id="TEXT_DISABLED" color="#FF00FF" /> <color id="CARET" color="#FF00FF" /> <color id="SHADOW" color="#000000" /> <color id="OUTLINE" color="#000000" /> diff --git a/data/themes/unity/colors.xml b/data/themes/unity/colors.xml index 872a902e2..a3b4e6cac 100644 --- a/data/themes/unity/colors.xml +++ b/data/themes/unity/colors.xml @@ -4,6 +4,7 @@ <color id="BROWSERBOX" color="#E0E0E0" /> <color id="SELFNICK" color="#E0E0E0" /> <color id="TEXT" color="#E0E0E0" /> + <color id="TEXT_DISABLED" color="#E0E0E0" /> <color id="CARET" color="#E0E0E0" /> <color id="SHADOW" color="#000000" /> <color id="OUTLINE" color="#000000" /> diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml index 2553fffd8..058766a17 100644 --- a/data/themes/wood/colors.xml +++ b/data/themes/wood/colors.xml @@ -4,6 +4,7 @@ <color id="BROWSERBOX" color="#000000" /> <color id="SELFNICK" color="#000000" /> <color id="TEXT" color="#000000" /> + <color id="TEXT_DISABLED" color="#000000" /> <color id="CARET" color="#000000" /> <color id="SHADOW" color="#000000" /> <color id="OUTLINE" color="#000000" /> diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index 03b7b7097..a584f446a 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -839,7 +839,9 @@ static int readColorType(const std::string &type) "OLDCHAT_OUTLINE", "AWAYCHAT", "AWAYCHAT_OUTLINE", - "SKILL_COOLDOWN" + "SKILL_COOLDOWN", + "TEXT_DISABLED", + "TEXT_DISABLED_OUTLINE" }; if (type.empty()) diff --git a/src/gui/theme.h b/src/gui/theme.h index 93fd263dd..708d12202 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -300,6 +300,8 @@ class Theme final : public Palette, AWAYCHAT, AWAYCHAT_OUTLINE, SKILL_COOLDOWN, + TEXT_DISABLED, + TEXT_DISABLED_OUTLINE, THEME_COLORS_END }; |