diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-05-30 21:42:26 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-05-30 21:42:26 +0300 |
commit | d4f7f4f688c3660440e0ac0d752ec9db036cdf59 (patch) | |
tree | f15996edc69ed3a505e523d548902dcdf2bb0ce3 | |
parent | 256b20612d17e0cbe44332538cdedd2ef5f1a498 (diff) | |
download | manaplus-d4f7f4f688c3660440e0ac0d752ec9db036cdf59.tar.gz manaplus-d4f7f4f688c3660440e0ac0d752ec9db036cdf59.tar.bz2 manaplus-d4f7f4f688c3660440e0ac0d752ec9db036cdf59.tar.xz manaplus-d4f7f4f688c3660440e0ac0d752ec9db036cdf59.zip |
Add color for globals with player/npc name.
New colors: GLOBAL, GLOBAL_OUTLINE.
-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/jewelry/colors.xml | 4 | ||||
-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 | 5 | ||||
-rw-r--r-- | src/gui/theme.h | 2 | ||||
-rw-r--r-- | src/gui/widgets/chattab.cpp | 2 |
12 files changed, 20 insertions, 1 deletions
diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml index 2d0fd5a6e..e3ed8ba0d 100644 --- a/data/graphics/gui/colors.xml +++ b/data/graphics/gui/colors.xml @@ -53,6 +53,7 @@ <color id="ITEM_NOT_EQUIPPED" color="#000000" /> <color id="CHAT" color="#000000" /> <color id="GM" color="#ff0000" /> + <color id="GLOBAL" color="#ff0000" /> <color id="PLAYER" color="#003000" /> <color id="WHISPER_TAB" color="#0000ff" /> <color id="WHISPER_TAB_OFFLINE" color="#000050" /> diff --git a/data/themes/blacknblack/colors.xml b/data/themes/blacknblack/colors.xml index c53f06686..c050a7426 100644 --- a/data/themes/blacknblack/colors.xml +++ b/data/themes/blacknblack/colors.xml @@ -53,6 +53,7 @@ <color id="ITEM_NOT_EQUIPPED" color="#ffffff" /> <color id="CHAT" color="#ffffff" /> <color id="GM" color="#ffff00" /> + <color id="GLOBAL" color="#ffff00" /> <color id="PLAYER" color="#ffffff" /> <color id="WHISPER_TAB" color="#55ffff" /> <color id="WHISPER_TAB_OFFLINE" color="#ff5044" /> diff --git a/data/themes/blackwood/colors.xml b/data/themes/blackwood/colors.xml index f6e3d237c..c9203cf71 100644 --- a/data/themes/blackwood/colors.xml +++ b/data/themes/blackwood/colors.xml @@ -53,6 +53,7 @@ <color id="ITEM_NOT_EQUIPPED" color="#000000" /> <color id="CHAT" color="#744c04" /> <color id="GM" color="#ff0000" /> + <color id="GLOBAL" color="#ff0000" /> <color id="PLAYER" color="#00ff00" /> <color id="WHISPER_TAB" color="#0000ff" /> <color id="WHISPER_TAB_OFFLINE" color="#0000e0" /> diff --git a/data/themes/enchilado/colors.xml b/data/themes/enchilado/colors.xml index f448e2bfe..4691e2aa3 100644 --- a/data/themes/enchilado/colors.xml +++ b/data/themes/enchilado/colors.xml @@ -53,6 +53,7 @@ <color id="ITEM_NOT_EQUIPPED" color="#000000" /> <color id="CHAT" color="#000000" /> <color id="GM" color="#ff0000" /> + <color id="GLOBAL" color="#ff0000" /> <color id="PLAYER" color="#009000" /> <color id="WHISPER_TAB" color="#0000ff" /> <color id="WHISPER_TAB_OFFLINE" color="#000050" /> diff --git a/data/themes/jewelry/colors.xml b/data/themes/jewelry/colors.xml index 01289bf13..94295bee1 100644 --- a/data/themes/jewelry/colors.xml +++ b/data/themes/jewelry/colors.xml @@ -46,6 +46,7 @@ <color id="ITEM_NOT_EQUIPPED" color="#000000" /> <color id="CHAT" color="#f1d9a9" /> <color id="GM" color="#fec4ff" /> + <color id="GLOBAL" color="#fec4ff" /> <color id="PLAYER" color="#eeeeee" /> <color id="IS" color="#edbedb" /> <color id="SERVER" color="#edbedb" /> @@ -210,6 +211,8 @@ <color id="CHAT_OUTLINE" color="#3f3f3f" /> <color id="GM" color="#ff45fd" /> <color id="GM_OUTLINE" color="#44033a" /> + <color id="GLOBAL" color="#ff45fd" /> + <color id="GLOBAL_OUTLINE" color="#44033a" /> <color id="PLAYER" color="#bcdff4" /> <color id="PLAYER_OUTLINE" color="#052f47" /> <color id="PLAYER_ADVANCED" color="#f9eabc" /> @@ -288,6 +291,7 @@ <color id="ITEM_NOT_EQUIPPED" color="#000000" /> <color id="CHAT" color="#f1d9a9" /> <color id="GM" color="#fec4ff" /> + <color id="GLOBAL" color="#fec4ff" /> <color id="PLAYER" color="#eeeeee" /> <color id="IS" color="#edbedb" /> <color id="SERVER" color="#edbedb" /> diff --git a/data/themes/mana/colors.xml b/data/themes/mana/colors.xml index 2636728db..2326c07b2 100644 --- a/data/themes/mana/colors.xml +++ b/data/themes/mana/colors.xml @@ -53,6 +53,7 @@ <color id="ITEM_NOT_EQUIPPED" color="#000000" /> <color id="CHAT" color="#000000" /> <color id="GM" color="#ff0000" /> + <color id="GLOBAL" color="#ff0000" /> <color id="PLAYER" color="#003000" /> <color id="WHISPER_TAB" color="#0000ff" /> <color id="WHISPER_TAB_OFFLINE" color="#000050" /> diff --git a/data/themes/pink/colors.xml b/data/themes/pink/colors.xml index a59dde18a..9d4e06a86 100644 --- a/data/themes/pink/colors.xml +++ b/data/themes/pink/colors.xml @@ -53,6 +53,7 @@ <color id="ITEM_NOT_EQUIPPED" color="#000000" /> <color id="CHAT" color="#FF00FF" /> <color id="GM" color="#ff0000" /> + <color id="GLOBAL" color="#ff0000" /> <color id="PLAYER" color="#009000" /> <color id="WHISPER_TAB" color="#0000ff" /> <color id="WHISPER_TAB_OFFLINE" color="#000050" /> diff --git a/data/themes/unity/colors.xml b/data/themes/unity/colors.xml index 3b5a81e1c..22db3e328 100644 --- a/data/themes/unity/colors.xml +++ b/data/themes/unity/colors.xml @@ -51,6 +51,7 @@ <color id="ITEM_EQUIPPED" color="#FFFFFF" /> <color id="CHAT" color="#E0E0E0" /> <color id="GM" color="#FFFFFF" /> + <color id="GLOBAL" color="#FFFFFF" /> <color id="PLAYER" color="#66CCCC" /> <color id="WHISPER_TAB" color="#E0E0E0" /> <color id="WHISPER_TAB_OFFLINE" color="#A8A8A8" /> diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml index cc36392e9..983c68e96 100644 --- a/data/themes/wood/colors.xml +++ b/data/themes/wood/colors.xml @@ -53,6 +53,7 @@ <color id="ITEM_NOT_EQUIPPED" color="#000000" /> <color id="CHAT" color="#000000" /> <color id="GM" color="#ff0000" /> + <color id="GLOBAL" color="#ff0000" /> <color id="PLAYER" color="#003000" /> <color id="WHISPER_TAB" color="#00feaf" /> <color id="WHISPER_TAB_OFFLINE" color="#000a40" /> diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index 13fb07382..f117563b5 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -185,6 +185,7 @@ Theme::Theme() : mColors[HIGHLIGHT].ch = 'H'; mColors[CHAT].ch = 'C'; mColors[GM].ch = 'G'; + mColors[GLOBAL].ch = 'g'; mColors[PLAYER].ch = 'Y'; mColors[WHISPER_TAB].ch = 'W'; mColors[WHISPER_TAB_OFFLINE].ch = 'w'; @@ -198,6 +199,7 @@ Theme::Theme() : mCharColors['H'] = HIGHLIGHT; mCharColors['C'] = CHAT; mCharColors['G'] = GM; + mCharColors['g'] = GLOBAL; mCharColors['Y'] = PLAYER; mCharColors['W'] = WHISPER_TAB; mCharColors['w'] = WHISPER_TAB_OFFLINE; @@ -213,6 +215,7 @@ Theme::Theme() : mCharColors['H' | 0x80] = HIGHLIGHT_OUTLINE; mCharColors['C' | 0x80] = CHAT_OUTLINE; mCharColors['G' | 0x80] = GM_OUTLINE; + mCharColors['g' | 0x80] = GLOBAL_OUTLINE; mCharColors['Y' | 0x80] = PLAYER_OUTLINE; mCharColors['W' | 0x80] = WHISPER_TAB_OUTLINE; mCharColors['w' | 0x80] = WHISPER_TAB_OFFLINE_OUTLINE; @@ -857,6 +860,8 @@ static int readColorType(const std::string &type) "CHAT_OUTLINE", "GM", "GM_OUTLINE", + "GLOBAL", + "GLOBAL_OUTLINE", "PLAYER", "PLAYER_OUTLINE", "WHISPER_TAB", diff --git a/src/gui/theme.h b/src/gui/theme.h index 443150a0f..21f541701 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -304,6 +304,8 @@ class Theme final : public Palette, public ConfigListener CHAT_OUTLINE, GM, GM_OUTLINE, + GLOBAL, + GLOBAL_OUTLINE, PLAYER, PLAYER_OUTLINE, WHISPER_TAB, diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp index 09b3bea6b..339d124f7 100644 --- a/src/gui/widgets/chattab.cpp +++ b/src/gui/widgets/chattab.cpp @@ -157,7 +157,7 @@ void ChatTab::chatLog(std::string line, Own own, // TRANSLATORS: chat message tmp.nick = strprintf(_("Global announcement from %s:"), tmp.nick.c_str()).append(" "); - lineColor = "##1"; // Equiv. to BrowserBox::RED + lineColor = "##g"; // Equiv. to BrowserBox::RED } break; case BY_PLAYER: |