summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-12-09 20:56:51 +0300
committerAndrei Karas <akaras@inbox.ru>2013-12-09 20:56:51 +0300
commit2856985d7441cbd8edd0b83b308f65ad9c72ad02 (patch)
tree3f48ca4c78cf0c2bdd9fb7997b6d60815219ac23
parentb5c294696cb58d00e8c4c9a005f9bf580a43dc6a (diff)
downloadmv-2856985d7441cbd8edd0b83b308f65ad9c72ad02.tar.gz
mv-2856985d7441cbd8edd0b83b308f65ad9c72ad02.tar.bz2
mv-2856985d7441cbd8edd0b83b308f65ad9c72ad02.tar.xz
mv-2856985d7441cbd8edd0b83b308f65ad9c72ad02.zip
Add new theme color for old chat messages.
New chat colors: OLDCHAT, OLDCHAT_OUTLINE
-rw-r--r--data/graphics/gui/colors.xml1
-rw-r--r--data/themes/blacknblack/colors.xml1
-rw-r--r--data/themes/blackwood/colors.xml1
-rw-r--r--data/themes/enchilado/colors.xml1
-rw-r--r--data/themes/jewelry/colors.xml4
-rw-r--r--data/themes/mana/colors.xml1
-rw-r--r--data/themes/pink/colors.xml1
-rw-r--r--data/themes/unity/colors.xml1
-rw-r--r--data/themes/wood/colors.xml1
-rw-r--r--src/gui/theme.cpp7
-rw-r--r--src/gui/theme.h2
-rw-r--r--src/gui/widgets/tabs/chattab.cpp2
12 files changed, 21 insertions, 2 deletions
diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml
index ce4858ae7..046a19cf3 100644
--- a/data/graphics/gui/colors.xml
+++ b/data/graphics/gui/colors.xml
@@ -96,6 +96,7 @@
<color id="PURPLE" color="#8415e2" />
<color id="GRAY" color="#919191" />
<color id="BROWN" color="#8e4c17" />
+ <color id="OLDCHAT" 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 e9e8280d2..e8cc20fed 100644
--- a/data/themes/blacknblack/colors.xml
+++ b/data/themes/blacknblack/colors.xml
@@ -120,6 +120,7 @@
<color id="PURPLE" color="#ffffff" />
<color id="GRAY" color="#ffffff" />
<color id="BROWN" color="#ffffff" />
+ <color id="OLDCHAT" 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 915132f69..c60def591 100644
--- a/data/themes/blackwood/colors.xml
+++ b/data/themes/blackwood/colors.xml
@@ -119,6 +119,7 @@
<color id="PURPLE" color="#8415e2" />
<color id="GRAY" color="#919191" />
<color id="BROWN" color="#8e4c17" />
+ <color id="OLDCHAT" 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 ec49de580..bdc954807 100644
--- a/data/themes/enchilado/colors.xml
+++ b/data/themes/enchilado/colors.xml
@@ -120,6 +120,7 @@
<color id="PURPLE" color="#8415e2" />
<color id="GRAY" color="#919191" />
<color id="BROWN" color="#8e4c17" />
+ <color id="OLDCHAT" 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 de61a3ee4..c4c30c102 100644
--- a/data/themes/jewelry/colors.xml
+++ b/data/themes/jewelry/colors.xml
@@ -83,6 +83,7 @@
<color id="PURPLE" color="#8415e2" />
<color id="GRAY" color="#919191" />
<color id="BROWN" color="#774217" />
+ <color id="OLDCHAT" color="#774217" />
<color id="STATUSBAR_ON" color="#646464" />
<color id="STATUSBAR_OFF" color="#ffff00" />
<color id="TABLE_BACKGROUND" color="#bfbfbf" />
@@ -266,6 +267,8 @@
<color id="GRAY_OUTLINE" color="#333333" />
<color id="BROWN" color="#cb884c" />
<color id="BROWN_OUTLINE" color="#271802" />
+ <color id="OLDCHAT" color="#cb884c" />
+ <color id="OLDCHAT_OUTLINE" color="#271802" />
<color id="STATUSBAR_ON" color="#646464" />
<color id="STATUSBAR_OFF" color="#ffff00" />
<color id="TABLE_BACKGROUND" color="#bfbfbf" />
@@ -373,6 +376,7 @@
<color id="PURPLE" color="#5e1298" />
<color id="GRAY" color="#dbdbdb" />
<color id="BROWN" color="#8e4c17" />
+ <color id="OLDCHAT" 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 4b8ca8ad2..6b3084519 100644
--- a/data/themes/mana/colors.xml
+++ b/data/themes/mana/colors.xml
@@ -120,6 +120,7 @@
<color id="PURPLE" color="#8415e2" />
<color id="GRAY" color="#919191" />
<color id="BROWN" color="#8e4c17" />
+ <color id="OLDCHAT" 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 b92c8d03b..04fc7071f 100644
--- a/data/themes/pink/colors.xml
+++ b/data/themes/pink/colors.xml
@@ -120,6 +120,7 @@
<color id="PURPLE" color="#8415e2" />
<color id="GRAY" color="#919191" />
<color id="BROWN" color="#8e4c17" />
+ <color id="OLDCHAT" 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 38f1eafbe..127f7bae2 100644
--- a/data/themes/unity/colors.xml
+++ b/data/themes/unity/colors.xml
@@ -119,6 +119,7 @@
<color id="PURPLE" color="#8480E2" />
<color id="GRAY" color="#C1C1C1" />
<color id="BROWN" color="#05FF2E" />
+ <color id="OLDCHAT" 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 224eb6f65..2589cdbfc 100644
--- a/data/themes/wood/colors.xml
+++ b/data/themes/wood/colors.xml
@@ -120,6 +120,7 @@
<color id="PURPLE" color="#8415e2" />
<color id="GRAY" color="#919191" />
<color id="BROWN" color="#8e4c17" />
+ <color id="OLDCHAT" color="#8e4c17" />
</palette>
<progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" />
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index b7510dc9f..fbde968f4 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -198,6 +198,7 @@ Theme::Theme() :
mColors[LOGGER].ch = 'L';
mColors[HYPERLINK].ch = '<';
mColors[SELFNICK].ch = 's';
+ mColors[OLDCHAT].ch = 'o';
mCharColors['H'] = HIGHLIGHT;
mCharColors['C'] = CHAT;
mCharColors['G'] = GM;
@@ -212,6 +213,7 @@ Theme::Theme() :
mCharColors['L'] = LOGGER;
mCharColors['<'] = HYPERLINK;
mCharColors['s'] = SELFNICK;
+ mCharColors['o'] = OLDCHAT;
// here need use outlined colors
mCharColors['H' | 0x80] = HIGHLIGHT_OUTLINE;
@@ -228,6 +230,7 @@ Theme::Theme() :
mCharColors['L' | 0x80] = LOGGER_OUTLINE;
mCharColors['<' | 0x80] = HYPERLINK_OUTLINE;
mCharColors['s' | 0x80] = SELFNICK_OUTLINE;
+ mCharColors['o' | 0x80] = OLDCHAT_OUTLINE;
}
Theme::~Theme()
@@ -970,7 +973,9 @@ static int readColorType(const std::string &type)
"STATUS_BAR",
"STATUS_BAR_OUTLINE",
"JOB_BAR",
- "JOB_BAR_OUTLINE"
+ "JOB_BAR_OUTLINE",
+ "OLDCHAT",
+ "OLDCHAT_OUTLINE"
};
if (type.empty())
diff --git a/src/gui/theme.h b/src/gui/theme.h
index 049e7e04b..8ece0488d 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -414,6 +414,8 @@ class Theme final : public Palette, public ConfigListener
STATUS_BAR_OUTLINE,
JOB_BAR,
JOB_BAR_OUTLINE,
+ OLDCHAT,
+ OLDCHAT_OUTLINE,
THEME_COLORS_END
};
diff --git a/src/gui/widgets/tabs/chattab.cpp b/src/gui/widgets/tabs/chattab.cpp
index a9e1556d6..5235f8667 100644
--- a/src/gui/widgets/tabs/chattab.cpp
+++ b/src/gui/widgets/tabs/chattab.cpp
@@ -504,7 +504,7 @@ void ChatTab::loadFromLogFile(const std::string &name)
std::list<std::string>::const_iterator i = list.begin();
while (i != list.end())
{
- std::string line("##9" + *i);
+ std::string line("##o" + *i);
addRow(line);
++i;
}