diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-12-09 21:18:35 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-12-09 21:18:35 +0300 |
commit | b24d92e3052e0b4a43b0bfe209ef910ddc41878e (patch) | |
tree | 479d0865a2323e2532e7cbbce24b80ad408e2ea5 | |
parent | 2856985d7441cbd8edd0b83b308f65ad9c72ad02 (diff) | |
download | mv-b24d92e3052e0b4a43b0bfe209ef910ddc41878e.tar.gz mv-b24d92e3052e0b4a43b0bfe209ef910ddc41878e.tar.bz2 mv-b24d92e3052e0b4a43b0bfe209ef910ddc41878e.tar.xz mv-b24d92e3052e0b4a43b0bfe209ef910ddc41878e.zip |
add color for away chat messages.
New theme color: AWAYCHAT, AWAYCHAT_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 | 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 | 7 | ||||
-rw-r--r-- | src/gui/theme.h | 2 | ||||
-rw-r--r-- | src/gui/windows/chatwindow.cpp | 2 |
12 files changed, 20 insertions, 2 deletions
diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml index 046a19cf3..92b8cc756 100644 --- a/data/graphics/gui/colors.xml +++ b/data/graphics/gui/colors.xml @@ -97,6 +97,7 @@ <color id="GRAY" color="#919191" /> <color id="BROWN" color="#8e4c17" /> <color id="OLDCHAT" color="#8e4c17" /> + <color id="AWAYCHAT" color="#8e4c17" /> <color id="STATUSBAR_ON" color="#646464" /> <color id="STATUSBAR_OFF" color="#ffff00" /> <color id="TABLE_BACKGROUND" color="#ffffff" /> diff --git a/data/themes/blacknblack/colors.xml b/data/themes/blacknblack/colors.xml index e8cc20fed..429a46a66 100644 --- a/data/themes/blacknblack/colors.xml +++ b/data/themes/blacknblack/colors.xml @@ -121,6 +121,7 @@ <color id="GRAY" color="#ffffff" /> <color id="BROWN" color="#ffffff" /> <color id="OLDCHAT" color="#ffffff" /> + <color id="AWAYCHAT" color="#ffffff" /> </palette> <progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" /> diff --git a/data/themes/blackwood/colors.xml b/data/themes/blackwood/colors.xml index c60def591..30cddd93d 100644 --- a/data/themes/blackwood/colors.xml +++ b/data/themes/blackwood/colors.xml @@ -120,6 +120,7 @@ <color id="GRAY" color="#919191" /> <color id="BROWN" color="#8e4c17" /> <color id="OLDCHAT" color="#8e4c17" /> + <color id="AWAYCHAT" color="#8e4c17" /> </palette> <progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" /> diff --git a/data/themes/enchilado/colors.xml b/data/themes/enchilado/colors.xml index bdc954807..ed0b47824 100644 --- a/data/themes/enchilado/colors.xml +++ b/data/themes/enchilado/colors.xml @@ -121,6 +121,7 @@ <color id="GRAY" color="#919191" /> <color id="BROWN" color="#8e4c17" /> <color id="OLDCHAT" color="#8e4c17" /> + <color id="AWAYCHAT" color="#8e4c17" /> </palette> <progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" /> diff --git a/data/themes/jewelry/colors.xml b/data/themes/jewelry/colors.xml index c4c30c102..2721d6d2d 100644 --- a/data/themes/jewelry/colors.xml +++ b/data/themes/jewelry/colors.xml @@ -269,6 +269,8 @@ <color id="BROWN_OUTLINE" color="#271802" /> <color id="OLDCHAT" color="#cb884c" /> <color id="OLDCHAT_OUTLINE" color="#271802" /> + <color id="AWAYCHAT" color="#cb884c" /> + <color id="AWAYCHAT_OUTLINE" color="#271802" /> <color id="STATUSBAR_ON" color="#646464" /> <color id="STATUSBAR_OFF" color="#ffff00" /> <color id="TABLE_BACKGROUND" color="#bfbfbf" /> @@ -377,6 +379,7 @@ <color id="GRAY" color="#dbdbdb" /> <color id="BROWN" color="#8e4c17" /> <color id="OLDCHAT" color="#8e4c17" /> + <color id="AWAYCHAT" color="#8e4c17" /> <color id="STATUSBAR_ON" color="#646464" /> <color id="STATUSBAR_OFF" color="#ffff00" /> <color id="TABLE_BACKGROUND" color="#bfbfbf" /> diff --git a/data/themes/mana/colors.xml b/data/themes/mana/colors.xml index 6b3084519..7bc5afcec 100644 --- a/data/themes/mana/colors.xml +++ b/data/themes/mana/colors.xml @@ -121,6 +121,7 @@ <color id="GRAY" color="#919191" /> <color id="BROWN" color="#8e4c17" /> <color id="OLDCHAT" color="#8e4c17" /> + <color id="AWAYCHAT" color="#8e4c17" /> </palette> <progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" /> diff --git a/data/themes/pink/colors.xml b/data/themes/pink/colors.xml index 04fc7071f..f9b1dc441 100644 --- a/data/themes/pink/colors.xml +++ b/data/themes/pink/colors.xml @@ -121,6 +121,7 @@ <color id="GRAY" color="#919191" /> <color id="BROWN" color="#8e4c17" /> <color id="OLDCHAT" color="#8e4c17" /> + <color id="AWAYCHAT" color="#8e4c17" /> </palette> <progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" /> diff --git a/data/themes/unity/colors.xml b/data/themes/unity/colors.xml index 127f7bae2..552bce4bf 100644 --- a/data/themes/unity/colors.xml +++ b/data/themes/unity/colors.xml @@ -120,6 +120,7 @@ <color id="GRAY" color="#C1C1C1" /> <color id="BROWN" color="#05FF2E" /> <color id="OLDCHAT" color="#05FF2E" /> + <color id="AWAYCHAT" color="#05FF2E" /> </palette> <progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" /> diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml index 2589cdbfc..9f3915ab5 100644 --- a/data/themes/wood/colors.xml +++ b/data/themes/wood/colors.xml @@ -121,6 +121,7 @@ <color id="GRAY" color="#919191" /> <color id="BROWN" color="#8e4c17" /> <color id="OLDCHAT" color="#8e4c17" /> + <color id="AWAYCHAT" color="#8e4c17" /> </palette> <progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" /> diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index fbde968f4..fb69dce3b 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -199,6 +199,7 @@ Theme::Theme() : mColors[HYPERLINK].ch = '<'; mColors[SELFNICK].ch = 's'; mColors[OLDCHAT].ch = 'o'; + mColors[AWAYCHAT].ch = 'a'; mCharColors['H'] = HIGHLIGHT; mCharColors['C'] = CHAT; mCharColors['G'] = GM; @@ -214,6 +215,7 @@ Theme::Theme() : mCharColors['<'] = HYPERLINK; mCharColors['s'] = SELFNICK; mCharColors['o'] = OLDCHAT; + mCharColors['a'] = AWAYCHAT; // here need use outlined colors mCharColors['H' | 0x80] = HIGHLIGHT_OUTLINE; @@ -231,6 +233,7 @@ Theme::Theme() : mCharColors['<' | 0x80] = HYPERLINK_OUTLINE; mCharColors['s' | 0x80] = SELFNICK_OUTLINE; mCharColors['o' | 0x80] = OLDCHAT_OUTLINE; + mCharColors['a' | 0x80] = AWAYCHAT_OUTLINE; } Theme::~Theme() @@ -975,7 +978,9 @@ static int readColorType(const std::string &type) "JOB_BAR", "JOB_BAR_OUTLINE", "OLDCHAT", - "OLDCHAT_OUTLINE" + "OLDCHAT_OUTLINE", + "AWAYCHAT", + "AWAYCHAT_OUTLINE" }; if (type.empty()) diff --git a/src/gui/theme.h b/src/gui/theme.h index 8ece0488d..0ed889794 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -416,6 +416,8 @@ class Theme final : public Palette, public ConfigListener JOB_BAR_OUTLINE, OLDCHAT, OLDCHAT_OUTLINE, + AWAYCHAT, + AWAYCHAT_OUTLINE, THEME_COLORS_END }; diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index 576ff9fd4..64eeb7669 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -1714,7 +1714,7 @@ void ChatWindow::addToAwayLog(const std::string &line) mAwayLog.pop_front(); if (findI(line, mHighlights) != std::string::npos) - mAwayLog.push_back("##9away:" + line); + mAwayLog.push_back("##aaway:" + line); } void ChatWindow::displayAwayLog() const |