summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-12-11 21:43:25 +0300
committerAndrei Karas <akaras@inbox.ru>2014-12-11 21:43:25 +0300
commit59d14a65cf36efcae7aecbd0af02efc30257ec97 (patch)
tree75c1e7007d2c766563a542c405433ff133ba6d50
parentcf8bf4d6b452bf8649080948f6cdceec49bbb9c5 (diff)
downloadplus-59d14a65cf36efcae7aecbd0af02efc30257ec97.tar.gz
plus-59d14a65cf36efcae7aecbd0af02efc30257ec97.tar.bz2
plus-59d14a65cf36efcae7aecbd0af02efc30257ec97.tar.xz
plus-59d14a65cf36efcae7aecbd0af02efc30257ec97.zip
Remove "ignore" popup menu handler.
-rw-r--r--src/gui/popups/popupmenu.cpp23
1 files changed, 6 insertions, 17 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 30eb24ff4..95f639831 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -979,21 +979,10 @@ void PopupMenu::handleLink(const std::string &link,
if (actorManager)
being = actorManager->findBeing(mBeingId);
- if (link == "ignore" && being &&
+ if (link == "blacklist" && being &&
being->getType() == ActorType::Player)
{
player_relations.setRelation(being->getName(),
- PlayerRelation::IGNORED);
- }
- else if (link == "ignore" && !mNick.empty())
- {
- player_relations.setRelation(mNick, PlayerRelation::IGNORED);
- }
-
- else if (link == "blacklist" && being &&
- being->getType() == ActorType::Player)
- {
- player_relations.setRelation(being->getName(),
PlayerRelation::BLACKLISTED);
}
else if (link == "blacklist" && !mNick.empty())
@@ -2628,7 +2617,7 @@ void PopupMenu::addNormalRelations()
mBrowserBox->addRow("disregard", _("Disregard"));
// TRANSLATORS: popup menu item
// TRANSLATORS: add player to ignore list
- mBrowserBox->addRow("ignore", _("Ignore"));
+ mBrowserBox->addRow("/ignore 'NAME'", _("Ignore"));
// TRANSLATORS: popup menu item
// TRANSLATORS: add player to black list
mBrowserBox->addRow("blacklist", _("Black list"));
@@ -2664,7 +2653,7 @@ void PopupMenu::addPlayerRelation(const std::string &name)
mBrowserBox->addRow("disregard", _("Disregard"));
// TRANSLATORS: popup menu item
// TRANSLATORS: add player to ignore list
- mBrowserBox->addRow("ignore", _("Ignore"));
+ mBrowserBox->addRow("/ignore 'NAME'", _("Ignore"));
// TRANSLATORS: popup menu item
// TRANSLATORS: add player to enemy list
mBrowserBox->addRow("enemy", _("Set as enemy"));
@@ -2679,7 +2668,7 @@ void PopupMenu::addPlayerRelation(const std::string &name)
mBrowserBox->addRow("/unignore 'NAME'", _("Unignore"));
// TRANSLATORS: popup menu item
// TRANSLATORS: add player to completle ignore list
- mBrowserBox->addRow("ignore", _("Completely ignore"));
+ mBrowserBox->addRow("/ignore 'NAME'", _("Completely ignore"));
// TRANSLATORS: popup menu item
// TRANSLATORS: add player to erased list
mBrowserBox->addRow("erase", _("Erase"));
@@ -2703,7 +2692,7 @@ void PopupMenu::addPlayerRelation(const std::string &name)
mBrowserBox->addRow("disregard", _("Disregard"));
// TRANSLATORS: popup menu item
// TRANSLATORS: add player to ignore list
- mBrowserBox->addRow("ignore", _("Ignore"));
+ mBrowserBox->addRow("/ignore 'NAME'", _("Ignore"));
// TRANSLATORS: popup menu item
// TRANSLATORS: add player to black list
mBrowserBox->addRow("blacklist", _("Black list"));
@@ -2721,7 +2710,7 @@ void PopupMenu::addPlayerRelation(const std::string &name)
mBrowserBox->addRow("disregard", _("Disregard"));
// TRANSLATORS: popup menu item
// TRANSLATORS: add player to ignore list
- mBrowserBox->addRow("ignore", _("Completely ignore"));
+ mBrowserBox->addRow("/ignore 'NAME'", _("Completely ignore"));
break;
default: