summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-09-08 01:11:07 +0300
committerAndrei Karas <akaras@inbox.ru>2012-09-08 01:11:07 +0300
commit577b75a14fa04b0d78281257ee7f5e3c42be3b7e (patch)
tree2028a97a20d11b6cef13cee0ab29d0b1f5f471dd
parent4f3e6ddeae45b7b04b191533e8f6c456fbc207d8 (diff)
downloadmanaplus-577b75a14fa04b0d78281257ee7f5e3c42be3b7e.tar.gz
manaplus-577b75a14fa04b0d78281257ee7f5e3c42be3b7e.tar.bz2
manaplus-577b75a14fa04b0d78281257ee7f5e3c42be3b7e.tar.xz
manaplus-577b75a14fa04b0d78281257ee7f5e3c42be3b7e.zip
Rename colors WHISPER and WHISPER_OFFLINE to WHISPER_TAB and WHISPER_TAB_OFFLINE.
Diffstat
-rw-r--r--data/graphics/gui/colors.xml4
-rw-r--r--data/themes/blacknblack/colors.xml4
-rw-r--r--data/themes/blackwood/colors.xml4
-rw-r--r--data/themes/enchilado/colors.xml4
-rw-r--r--data/themes/mana/colors.xml4
-rw-r--r--data/themes/pink/colors.xml4
-rw-r--r--data/themes/unity/colors.xml4
-rw-r--r--data/themes/wood/colors.xml4
-rw-r--r--src/gui/chatwindow.cpp14
-rw-r--r--src/gui/theme.cpp12
-rw-r--r--src/gui/theme.h4
-rw-r--r--src/gui/widgets/whispertab.cpp2
-rw-r--r--src/localplayer.cpp2
13 files changed, 35 insertions, 31 deletions
diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml
index b0fa0444e..59f089b46 100644
--- a/data/graphics/gui/colors.xml
+++ b/data/graphics/gui/colors.xml
@@ -35,8 +35,8 @@
<color id="CHAT" color="#000000" />
<color id="GM" color="#ff0000" />
<color id="PLAYER" color="#003000" />
- <color id="WHISPER" color="#0000ff" />
- <color id="WHISPER_OFFLINE" color="#000050" />
+ <color id="WHISPER_TAB" color="#0000ff" />
+ <color id="WHISPER_TAB_OFFLINE" color="#000050" />
<color id="IS" color="#705000" />
<color id="SERVER" color="#8415e2" />
<color id="LOGGER" color="#919191" />
diff --git a/data/themes/blacknblack/colors.xml b/data/themes/blacknblack/colors.xml
index abdac6e79..018304ba0 100644
--- a/data/themes/blacknblack/colors.xml
+++ b/data/themes/blacknblack/colors.xml
@@ -35,8 +35,8 @@
<color id="CHAT" color="#ffffff" />
<color id="GM" color="#ffff00" />
<color id="PLAYER" color="#ffffff" />
- <color id="WHISPER" color="#55ffff" />
- <color id="WHISPER_OFFLINE" color="#ff5044" />
+ <color id="WHISPER_TAB" color="#55ffff" />
+ <color id="WHISPER_TAB_OFFLINE" color="#ff5044" />
<color id="IS" color="#ffff99" />
<color id="SERVER" color="#8415e2" />
<color id="LOGGER" color="#919191" />
diff --git a/data/themes/blackwood/colors.xml b/data/themes/blackwood/colors.xml
index 4d739182f..d7043ac13 100644
--- a/data/themes/blackwood/colors.xml
+++ b/data/themes/blackwood/colors.xml
@@ -35,8 +35,8 @@
<color id="CHAT" color="#744c04" />
<color id="GM" color="#ff0000" />
<color id="PLAYER" color="#00ff00" />
- <color id="WHISPER" color="#0000ff" />
- <color id="WHISPER_OFFLINE" color="#0000e0" />
+ <color id="WHISPER_TAB" color="#0000ff" />
+ <color id="WHISPER_TAB_OFFLINE" color="#0000e0" />
<color id="IS" color="#a08527" />
<color id="SERVER" color="#8415e2" />
<color id="LOGGER" color="#919191" />
diff --git a/data/themes/enchilado/colors.xml b/data/themes/enchilado/colors.xml
index 1ea877c6d..34024633b 100644
--- a/data/themes/enchilado/colors.xml
+++ b/data/themes/enchilado/colors.xml
@@ -35,8 +35,8 @@
<color id="CHAT" color="#000000" />
<color id="GM" color="#ff0000" />
<color id="PLAYER" color="#009000" />
- <color id="WHISPER" color="#0000ff" />
- <color id="WHISPER_OFFLINE" color="#000050" />
+ <color id="WHISPER_TAB" color="#0000ff" />
+ <color id="WHISPER_TAB_OFFLINE" color="#000050" />
<color id="IS" color="#705000" />
<color id="SERVER" color="#8415e2" />
<color id="LOGGER" color="#919191" />
diff --git a/data/themes/mana/colors.xml b/data/themes/mana/colors.xml
index 3081a7493..d8086d2d3 100644
--- a/data/themes/mana/colors.xml
+++ b/data/themes/mana/colors.xml
@@ -35,8 +35,8 @@
<color id="CHAT" color="#000000" />
<color id="GM" color="#ff0000" />
<color id="PLAYER" color="#003000" />
- <color id="WHISPER" color="#0000ff" />
- <color id="WHISPER_OFFLINE" color="#000050" />
+ <color id="WHISPER_TAB" color="#0000ff" />
+ <color id="WHISPER_TAB_OFFLINE" color="#000050" />
<color id="IS" color="#a08527" />
<color id="SERVER" color="#8415e2" />
<color id="LOGGER" color="#919191" />
diff --git a/data/themes/pink/colors.xml b/data/themes/pink/colors.xml
index 0b69b1149..ee20dfb8f 100644
--- a/data/themes/pink/colors.xml
+++ b/data/themes/pink/colors.xml
@@ -35,8 +35,8 @@
<color id="CHAT" color="#FF00FF" />
<color id="GM" color="#ff0000" />
<color id="PLAYER" color="#009000" />
- <color id="WHISPER" color="#0000ff" />
- <color id="WHISPER_OFFLINE" color="#000050" />
+ <color id="WHISPER_TAB" color="#0000ff" />
+ <color id="WHISPER_TAB_OFFLINE" color="#000050" />
<color id="IS" color="#705000" />
<color id="SERVER" color="#8415e2" />
<color id="LOGGER" color="#919191" />
diff --git a/data/themes/unity/colors.xml b/data/themes/unity/colors.xml
index 564c024de..c57feb282 100644
--- a/data/themes/unity/colors.xml
+++ b/data/themes/unity/colors.xml
@@ -33,8 +33,8 @@
<color id="CHAT" color="#E0E0E0" />
<color id="GM" color="#FFFFFF" />
<color id="PLAYER" color="#66CCCC" />
- <color id="WHISPER" color="#E0E0E0" />
- <color id="WHISPER_OFFLINE" color="#A8A8A8" />
+ <color id="WHISPER_TAB" color="#E0E0E0" />
+ <color id="WHISPER_TAB_OFFLINE" color="#A8A8A8" />
<color id="IS" color="#70C600" />
<color id="SERVER" color="#9966FF" />
<color id="LOGGER" color="#9966FF" />
diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml
index ef4e698f4..e0ec90c68 100644
--- a/data/themes/wood/colors.xml
+++ b/data/themes/wood/colors.xml
@@ -35,8 +35,8 @@
<color id="CHAT" color="#000000" />
<color id="GM" color="#ff0000" />
<color id="PLAYER" color="#003000" />
- <color id="WHISPER" color="#00feaf" />
- <color id="WHISPER_OFFLINE" color="#000a40" />
+ <color id="WHISPER_TAB" color="#00feaf" />
+ <color id="WHISPER_TAB_OFFLINE" color="#000a40" />
<color id="IS" color="#006000" />
<color id="SERVER" color="#8415e2" />
<color id="LOGGER" color="#919191" />
diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp
index 9417f5214..2aaa0da2d 100644
--- a/src/gui/chatwindow.cpp
+++ b/src/gui/chatwindow.cpp
@@ -1479,7 +1479,7 @@ void ChatWindow::updateOnline(std::set<std::string> &onlinePlayers)
if (onlinePlayers.find(tab->getNick()) != onlinePlayers.end())
{
- tab->setTabColor(&Theme::getThemeColor(Theme::WHISPER));
+ tab->setTabColor(&Theme::getThemeColor(Theme::WHISPER_TAB));
}
else
{
@@ -1490,7 +1490,8 @@ void ChatWindow::updateOnline(std::set<std::string> &onlinePlayers)
nick, ActorSprite::PLAYER);
if (being)
{
- tab->setTabColor(&Theme::getThemeColor(Theme::WHISPER));
+ tab->setTabColor(&Theme::getThemeColor(
+ Theme::WHISPER_TAB));
continue;
}
}
@@ -1499,7 +1500,8 @@ void ChatWindow::updateOnline(std::set<std::string> &onlinePlayers)
const PartyMember *const pm = party->getMember(nick);
if (pm && pm->getOnline())
{
- tab->setTabColor(&Theme::getThemeColor(Theme::WHISPER));
+ tab->setTabColor(&Theme::getThemeColor(
+ Theme::WHISPER_TAB));
continue;
}
}
@@ -1508,11 +1510,13 @@ void ChatWindow::updateOnline(std::set<std::string> &onlinePlayers)
const GuildMember *const gm = guild->getMember(nick);
if (gm && gm->getOnline())
{
- tab->setTabColor(&Theme::getThemeColor(Theme::WHISPER));
+ tab->setTabColor(&Theme::getThemeColor(
+ Theme::WHISPER_TAB));
continue;
}
}
- tab->setTabColor(&Theme::getThemeColor(Theme::WHISPER_OFFLINE));
+ tab->setTabColor(&Theme::getThemeColor(
+ Theme::WHISPER_TAB_OFFLINE));
}
}
}
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index fd6ccc23d..ccb033e78 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -168,8 +168,8 @@ Theme::Theme():
mColors[CHAT].ch = 'C';
mColors[GM].ch = 'G';
mColors[PLAYER].ch = 'Y';
- mColors[WHISPER].ch = 'W';
- mColors[WHISPER_OFFLINE].ch = 'w';
+ mColors[WHISPER_TAB].ch = 'W';
+ mColors[WHISPER_TAB_OFFLINE].ch = 'w';
mColors[IS].ch = 'I';
mColors[PARTY_CHAT_TAB].ch = 'P';
mColors[GUILD_CHAT_TAB].ch = 'U';
@@ -180,8 +180,8 @@ Theme::Theme():
mCharColors['C'] = CHAT;
mCharColors['G'] = GM;
mCharColors['Y'] = PLAYER;
- mCharColors['W'] = WHISPER;
- mCharColors['w'] = WHISPER_OFFLINE;
+ mCharColors['W'] = WHISPER_TAB;
+ mCharColors['w'] = WHISPER_TAB_OFFLINE;
mCharColors['I'] = IS;
mCharColors['P'] = PARTY_CHAT_TAB;
mCharColors['U'] = GUILD_CHAT_TAB;
@@ -707,8 +707,8 @@ static int readColorType(const std::string &type)
"CHAT",
"GM",
"PLAYER",
- "WHISPER",
- "WHISPER_OFFLINE",
+ "WHISPER_TAB",
+ "WHISPER_TAB_OFFLINE",
"IS",
"SERVER",
"LOGGER",
diff --git a/src/gui/theme.h b/src/gui/theme.h
index f73988c48..546bab99a 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -199,8 +199,8 @@ class Theme : public Palette, public ConfigListener
CHAT,
GM,
PLAYER,
- WHISPER,
- WHISPER_OFFLINE,
+ WHISPER_TAB,
+ WHISPER_TAB_OFFLINE,
IS,
SERVER,
LOGGER,
diff --git a/src/gui/widgets/whispertab.cpp b/src/gui/widgets/whispertab.cpp
index bb918e3b3..ae034d8d2 100644
--- a/src/gui/widgets/whispertab.cpp
+++ b/src/gui/widgets/whispertab.cpp
@@ -39,7 +39,7 @@ WhisperTab::WhisperTab(const std::string &nick) :
ChatTab(nick),
mNick(nick)
{
- setTabColor(&Theme::getThemeColor(Theme::WHISPER));
+ setTabColor(&Theme::getThemeColor(Theme::WHISPER_TAB));
}
WhisperTab::~WhisperTab()
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index cba78a449..0521a170d 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -4164,7 +4164,7 @@ void LocalPlayer::checkNewName(Being *const being)
{
ChatTab *const tab = chatWindow->getWhisperTab(nick);
if (tab)
- tab->setTabColor(&Theme::getThemeColor(Theme::WHISPER));
+ tab->setTabColor(&Theme::getThemeColor(Theme::WHISPER_TAB));
}
}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-21 19:49:50 +0000