summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-12-11 21:40:54 +0300
committerAndrei Karas <akaras@inbox.ru>2014-12-11 21:40:54 +0300
commitcf8bf4d6b452bf8649080948f6cdceec49bbb9c5 (patch)
tree8420756203fa0d4a51cceda188f4990b77451a2c /src
parent2216a1e5cda198bbd6d97104136054a82ff9f739 (diff)
downloadmv-cf8bf4d6b452bf8649080948f6cdceec49bbb9c5.tar.gz
mv-cf8bf4d6b452bf8649080948f6cdceec49bbb9c5.tar.bz2
mv-cf8bf4d6b452bf8649080948f6cdceec49bbb9c5.tar.xz
mv-cf8bf4d6b452bf8649080948f6cdceec49bbb9c5.zip
Remove "unignore" popup menu handler.
Diffstat (limited to 'src')
-rw-r--r--src/gui/popups/popupmenu.cpp22
1 files changed, 6 insertions, 16 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index e6b5aad57..30eb24ff4 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -979,20 +979,10 @@ void PopupMenu::handleLink(const std::string &link,
if (actorManager)
being = actorManager->findBeing(mBeingId);
- if (link == "unignore" && being &&
+ if (link == "ignore" && being &&
being->getType() == ActorType::Player)
{
player_relations.setRelation(being->getName(),
- PlayerRelation::NEUTRAL);
- }
- else if (link == "unignore" && !mNick.empty())
- {
- player_relations.setRelation(mNick, PlayerRelation::NEUTRAL);
- }
- else if (link == "ignore" && being &&
- being->getType() == ActorType::Player)
- {
- player_relations.setRelation(being->getName(),
PlayerRelation::IGNORED);
}
else if (link == "ignore" && !mNick.empty())
@@ -2668,7 +2658,7 @@ void PopupMenu::addPlayerRelation(const std::string &name)
case PlayerRelation::BLACKLISTED:
// TRANSLATORS: popup menu item
// TRANSLATORS: remove player from ignore list
- mBrowserBox->addRow("unignore", _("Unignore"));
+ mBrowserBox->addRow("/unignore 'NAME'", _("Unignore"));
// TRANSLATORS: popup menu item
// TRANSLATORS: add player to disregarded list
mBrowserBox->addRow("disregard", _("Disregard"));
@@ -2686,7 +2676,7 @@ void PopupMenu::addPlayerRelation(const std::string &name)
case PlayerRelation::DISREGARDED:
// TRANSLATORS: popup menu item
// TRANSLATORS: remove player from ignore list
- mBrowserBox->addRow("unignore", _("Unignore"));
+ mBrowserBox->addRow("/unignore 'NAME'", _("Unignore"));
// TRANSLATORS: popup menu item
// TRANSLATORS: add player to completle ignore list
mBrowserBox->addRow("ignore", _("Completely ignore"));
@@ -2698,7 +2688,7 @@ void PopupMenu::addPlayerRelation(const std::string &name)
case PlayerRelation::IGNORED:
// TRANSLATORS: popup menu item
// TRANSLATORS: remove player from ignore list
- mBrowserBox->addRow("unignore", _("Unignore"));
+ mBrowserBox->addRow("/unignore 'NAME'", _("Unignore"));
// TRANSLATORS: popup menu item
// TRANSLATORS: add player to erased list
mBrowserBox->addRow("erase", _("Erase"));
@@ -2707,7 +2697,7 @@ void PopupMenu::addPlayerRelation(const std::string &name)
case PlayerRelation::ENEMY2:
// TRANSLATORS: popup menu item
// TRANSLATORS: remove player from ignore list
- mBrowserBox->addRow("unignore", _("Unignore"));
+ mBrowserBox->addRow("/unignore 'NAME'", _("Unignore"));
// TRANSLATORS: popup menu item
// TRANSLATORS: add player to disregarded list
mBrowserBox->addRow("disregard", _("Disregard"));
@@ -2725,7 +2715,7 @@ void PopupMenu::addPlayerRelation(const std::string &name)
case PlayerRelation::ERASED:
// TRANSLATORS: popup menu item
// TRANSLATORS: remove player from ignore list
- mBrowserBox->addRow("unignore", _("Unignore"));
+ mBrowserBox->addRow("/unignore 'NAME'", _("Unignore"));
// TRANSLATORS: popup menu item
// TRANSLATORS: add player to disregarded list
mBrowserBox->addRow("disregard", _("Disregard"));