From b60e6d82d6e843f9e65c81555ec281d237c3ce41 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 4 Mar 2010 22:03:14 +0200
Subject: Show gender near player names.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Configuring in Setup / Players / Show gender.

Reviewed-by: Jared Adams <jaxad0127@gmail.com>
Signed-off-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
---
 src/gui/setup_players.cpp | 23 ++++++++++++++++++++++-
 src/gui/setup_players.h   |  3 +++
 2 files changed, 25 insertions(+), 1 deletion(-)

(limited to 'src/gui')

diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index fba4228e..159eab78 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -21,6 +21,7 @@
 
 #include "gui/setup_players.h"
 
+#include "beingmanager.h"
 #include "configuration.h"
 #include "log.h"
 
@@ -214,6 +215,7 @@ public:
 #define ACTION_TABLE "table"
 #define ACTION_STRATEGY "strategy"
 #define ACTION_WHISPER_TAB "whisper tab"
+#define ACTION_SHOW_GENDER "show gender"
 
 Setup_Players::Setup_Players():
     mPlayerTableTitleModel(new StaticTableModel(1, COLUMNS_NR)),
@@ -227,7 +229,9 @@ Setup_Players::Setup_Players():
                 player_relations.getDefault() & PlayerRelation::WHISPER)),
     mDeleteButton(new Button(_("Delete"), ACTION_DELETE, this)),
     mWhisperTab(config.getValue("whispertab", false)),
-    mWhisperTabCheckBox(new CheckBox(_("Put all whispers in tabs"), mWhisperTab))
+    mWhisperTabCheckBox(new CheckBox(_("Put all whispers in tabs"), mWhisperTab)),
+    mShowGender(config.getValue("showgender", false)),
+    mShowGenderCheckBox(new CheckBox(_("Show gender"), mShowGender))
 {
     setName(_("Players"));
 
@@ -274,6 +278,9 @@ Setup_Players::Setup_Players():
     mWhisperTabCheckBox->setActionEventId(ACTION_WHISPER_TAB);
     mWhisperTabCheckBox->addActionListener(this);
 
+    mShowGenderCheckBox->setActionEventId(ACTION_SHOW_GENDER);
+    mShowGenderCheckBox->addActionListener(this);
+
     reset();
 
     // Do the layout
@@ -283,6 +290,7 @@ Setup_Players::Setup_Players():
     place(0, 0, mPlayerTitleTable, 4);
     place(0, 1, mPlayerScrollArea, 4, 4).setPadding(2);
     place(0, 5, mDeleteButton);
+    place(0, 6, mShowGenderCheckBox, 2).setPadding(2);
     place(2, 5, ignore_action_label);
     place(2, 6, mIgnoreActionChoicesBox, 2).setPadding(2);
     place(2, 7, mDefaultTrading);
@@ -334,12 +342,21 @@ void Setup_Players::apply()
                                 | (mDefaultWhisper->isSelected() ?
                                        PlayerRelation::WHISPER : 0));
     config.setValue("whispertab", mWhisperTab);
+
+    bool showGender = config.getValue("showgender", false);
+
+    config.setValue("showgender", mShowGender);
+
+    if (beingManager && mShowGender != showGender)
+        beingManager->updatePlayerNames();
 }
 
 void Setup_Players::cancel()
 {
     mWhisperTab = config.getValue("whispertab", false);
     mWhisperTabCheckBox->setSelected(mWhisperTab);
+    mShowGender = config.getValue("showgender", false);
+    mShowGenderCheckBox->setSelected(mShowGender);
 }
 
 void Setup_Players::action(const gcn::ActionEvent &event)
@@ -383,6 +400,10 @@ void Setup_Players::action(const gcn::ActionEvent &event)
     {
         mWhisperTab = mWhisperTabCheckBox->isSelected();
     }
+    else if (event.getId() == ACTION_SHOW_GENDER)
+    {
+        mShowGender = mShowGenderCheckBox->isSelected();
+    }
 }
 
 void Setup_Players::updatedPlayer(const std::string &name)
diff --git a/src/gui/setup_players.h b/src/gui/setup_players.h
index 0dc8ab73..5337b213 100644
--- a/src/gui/setup_players.h
+++ b/src/gui/setup_players.h
@@ -67,6 +67,9 @@ private:
 
     bool mWhisperTab;
     gcn::CheckBox *mWhisperTabCheckBox;
+
+    bool mShowGender;
+    gcn::CheckBox *mShowGenderCheckBox;
 };
 
 #endif
-- 
cgit v1.2.3-70-g09d2