From 8170458137757fa8981498572ae3e88ebf5992a5 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 23 Jan 2013 00:05:03 +0300
Subject: Show self nick in online list with special color.

New theme colors:
    SELFNICK - color for own player nick in online list.
    SELFNICK_OUTLINE - outline color for self nick.
---
 data/graphics/gui/colors.xml       | 1 +
 data/themes/blacknblack/colors.xml | 1 +
 data/themes/blackwood/colors.xml   | 1 +
 data/themes/enchilado/colors.xml   | 1 +
 data/themes/jewelry/colors.xml     | 3 +++
 data/themes/mana/colors.xml        | 1 +
 data/themes/pink/colors.xml        | 1 +
 data/themes/unity/colors.xml       | 1 +
 data/themes/wood/colors.xml        | 1 +
 src/gui/theme.cpp                  | 5 +++++
 src/gui/theme.h                    | 2 ++
 src/gui/whoisonline.cpp            | 5 +++++
 12 files changed, 23 insertions(+)

diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml
index 0f0358897..aeaf33884 100644
--- a/data/graphics/gui/colors.xml
+++ b/data/graphics/gui/colors.xml
@@ -1,6 +1,7 @@
 <colors>
     <palette id="0">
         <color id="BROWSERBOX" color="#000000" />
+        <color id="SELFNICK" color="#000000" />
         <color id="TEXT" color="#000000" />
         <color id="CARET" color="#000000" />
         <color id="SHADOW" color="#000000" />
diff --git a/data/themes/blacknblack/colors.xml b/data/themes/blacknblack/colors.xml
index ab428f763..fb091b137 100644
--- a/data/themes/blacknblack/colors.xml
+++ b/data/themes/blacknblack/colors.xml
@@ -1,6 +1,7 @@
 <colors>
     <palette id="0">
         <color id="BROWSERBOX" color="#ffffff" />
+        <color id="SELFNICK" color="#ffffff" />
         <color id="TEXT" color="#ffffff" />
         <color id="CARET" color="#ffffff" />
         <color id="SHADOW" color="#000000" />
diff --git a/data/themes/blackwood/colors.xml b/data/themes/blackwood/colors.xml
index 16ab31193..078da2b30 100644
--- a/data/themes/blackwood/colors.xml
+++ b/data/themes/blackwood/colors.xml
@@ -1,6 +1,7 @@
 <colors>
     <palette id="0">
         <color id="BROWSERBOX" color="#7a7972" />
+        <color id="SELFNICK" color="#7a7972" />
         <color id="TEXT" color="#7a7972" />
         <color id="CARET" color="#7a7972" />
         <color id="SHADOW" color="#000000" />
diff --git a/data/themes/enchilado/colors.xml b/data/themes/enchilado/colors.xml
index a070e0fce..d0396a3ec 100644
--- a/data/themes/enchilado/colors.xml
+++ b/data/themes/enchilado/colors.xml
@@ -1,6 +1,7 @@
 <colors>
     <palette id="0">
         <color id="BROWSERBOX" color="#000000" />
+        <color id="SELFNICK" color="#000000" />
         <color id="TEXT" color="#000000" />
         <color id="CARET" color="#000000" />
         <color id="SHADOW" color="#000000" />
diff --git a/data/themes/jewelry/colors.xml b/data/themes/jewelry/colors.xml
index 4a3e24953..fdde78002 100644
--- a/data/themes/jewelry/colors.xml
+++ b/data/themes/jewelry/colors.xml
@@ -1,6 +1,7 @@
 <colors>
     <palette id="0">
         <color id="BROWSERBOX" color="#402600" />
+        <color id="SELFNICK" color="#402600" />
         <color id="TEXT" color="#402600" />
         <color id="CARET" color="#80561f" />
         <color id="SHADOW" color="#000000" />
@@ -93,6 +94,7 @@
 
     <palette id="1">
         <color id="BROWSERBOX" color="#402600" />
+        <color id="SELFNICK" color="#402600" />
         <color id="TEXT" color="#402600" />
         <color id="CARET" color="#80561f" />
         <color id="SHADOW" color="#000000" />
@@ -185,6 +187,7 @@
 
     <palette id="2">
         <color id="BROWSERBOX" color="#402600" />
+        <color id="SELFNICK" color="#402600" />
         <color id="TEXT" color="#402600" />
         <color id="CARET" color="#80561f" />
         <color id="SHADOW" color="#000000" />
diff --git a/data/themes/mana/colors.xml b/data/themes/mana/colors.xml
index 020ac3ef1..bd394f901 100644
--- a/data/themes/mana/colors.xml
+++ b/data/themes/mana/colors.xml
@@ -1,6 +1,7 @@
 <colors>
     <palette id="0">
         <color id="BROWSERBOX" color="#000000" />
+        <color id="SELFNICK" color="#000000" />
         <color id="TEXT" color="#000000" />
         <color id="CARET" color="#000000" />
         <color id="SHADOW" color="#000000" />
diff --git a/data/themes/pink/colors.xml b/data/themes/pink/colors.xml
index 938d9d7ca..a30652fdb 100644
--- a/data/themes/pink/colors.xml
+++ b/data/themes/pink/colors.xml
@@ -1,6 +1,7 @@
 <colors>
     <palette id="0">
         <color id="BROWSERBOX" color="#FF00FF" />
+        <color id="SELFNICK" color="#FF00FF" />
         <color id="TEXT" color="#FF00FF" />
         <color id="CARET" color="#FF00FF" />
         <color id="SHADOW" color="#000000" />
diff --git a/data/themes/unity/colors.xml b/data/themes/unity/colors.xml
index 08b9ce1e4..2f53b3cbe 100644
--- a/data/themes/unity/colors.xml
+++ b/data/themes/unity/colors.xml
@@ -1,6 +1,7 @@
 <colors>
     <palette id="0">
         <color id="BROWSERBOX" color="#E0E0E0" />
+        <color id="SELFNICK" color="#E0E0E0" />
         <color id="TEXT" color="#E0E0E0" />
         <color id="CARET" color="#E0E0E0" />
         <color id="SHADOW" color="#000000" />
diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml
index fa3cc89be..7b6125439 100644
--- a/data/themes/wood/colors.xml
+++ b/data/themes/wood/colors.xml
@@ -1,6 +1,7 @@
 <colors>
     <palette id="0">
         <color id="BROWSERBOX" color="#000000" />
+        <color id="SELFNICK" color="#000000" />
         <color id="TEXT" color="#000000" />
         <color id="CARET" color="#000000" />
         <color id="SHADOW" color="#000000" />
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 4ff1f8ea4..3e7775b63 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -195,6 +195,7 @@ Theme::Theme():
     mColors[SERVER].ch = 'S';
     mColors[LOGGER].ch = 'L';
     mColors[HYPERLINK].ch = '<';
+    mColors[SELFNICK].ch = 's';
     mCharColors['H'] = HIGHLIGHT;
     mCharColors['C'] = CHAT;
     mCharColors['G'] = GM;
@@ -207,6 +208,7 @@ Theme::Theme():
     mCharColors['S'] = SERVER;
     mCharColors['L'] = LOGGER;
     mCharColors['<'] = HYPERLINK;
+    mCharColors['s'] = SELFNICK;
 
     // here need use outlined colors
     mCharColors['H' | 0x80] = HIGHLIGHT_OUTLINE;
@@ -221,6 +223,7 @@ Theme::Theme():
     mCharColors['S' | 0x80] = SERVER_OUTLINE;
     mCharColors['L' | 0x80] = LOGGER_OUTLINE;
     mCharColors['<' | 0x80] = HYPERLINK_OUTLINE;
+    mCharColors['s' | 0x80] = SELFNICK_OUTLINE;
 }
 
 Theme::~Theme()
@@ -724,6 +727,8 @@ static int readColorType(const std::string &type)
     {
         "BROWSERBOX",
         "BROWSERBOX_OUTLINE",
+        "SELFNICK",
+        "SELFNICK_OUTLINE",
         "TEXT",
         "CARET",
         "SHADOW",
diff --git a/src/gui/theme.h b/src/gui/theme.h
index 572946e0b..f46bd23ab 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -190,6 +190,8 @@ class Theme final : public Palette, public ConfigListener
         {
             BROWSERBOX = 0,
             BROWSERBOX_OUTLINE,
+            SELFNICK_OUTLINE,
+            SELFNICK,
             TEXT,
             CARET,
             SHADOW,
diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp
index 893b27a46..170f5ba9e 100644
--- a/src/gui/whoisonline.cpp
+++ b/src/gui/whoisonline.cpp
@@ -733,6 +733,11 @@ void WhoIsOnline::setNeutralColor(OnlinePlayer *const player)
     if (actorSpriteManager && player_node)
     {
         const std::string &nick = player->getNick();
+        if (nick == player_node->getName())
+        {
+            player->setText("s");
+            return;
+        }
         if (player_node->isInParty())
         {
             const Party *const party = player_node->getParty();
-- 
cgit v1.2.3-60-g2f50