summaryrefslogtreecommitdiff
path: root/src/gui/popups
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-12-11 23:18:12 +0300
committerAndrei Karas <akaras@inbox.ru>2014-12-11 23:18:12 +0300
commit2602ebc1da53d04f3b6e01d59bad63147b21b8c9 (patch)
treeaae29e58fd983e6df288211141560bfaa656412a /src/gui/popups
parent5b9713d50b4b504e74e857b48a2c5d6e7153d9e2 (diff)
downloadplus-2602ebc1da53d04f3b6e01d59bad63147b21b8c9.tar.gz
plus-2602ebc1da53d04f3b6e01d59bad63147b21b8c9.tar.bz2
plus-2602ebc1da53d04f3b6e01d59bad63147b21b8c9.tar.xz
plus-2602ebc1da53d04f3b6e01d59bad63147b21b8c9.zip
Remove "disregard" popup menu handler.
Diffstat (limited to 'src/gui/popups')
-rw-r--r--src/gui/popups/popupmenu.cpp20
1 files changed, 5 insertions, 15 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 605698acd..ec79231f1 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -979,19 +979,9 @@ void PopupMenu::handleLink(const std::string &link,
if (actorManager)
being = actorManager->findBeing(mBeingId);
- if (link == "disregard" && being &&
+ if (link == "friend" && being &&
being->getType() == ActorType::Player)
{
- player_relations.setRelation(being->getName(),
- PlayerRelation::DISREGARDED);
- }
- else if (link == "disregard" && !mNick.empty())
- {
- player_relations.setRelation(mNick, PlayerRelation::DISREGARDED);
- }
- else if (link == "friend" && being &&
- being->getType() == ActorType::Player)
- {
player_relations.setRelation(being->getName(), PlayerRelation::FRIEND);
}
else if (link == "friend" && !mNick.empty())
@@ -2584,7 +2574,7 @@ void PopupMenu::addNormalRelations()
{
// TRANSLATORS: popup menu item
// TRANSLATORS: add player to disregarded list
- mBrowserBox->addRow("disregard", _("Disregard"));
+ mBrowserBox->addRow("/disregard 'NAME'", _("Disregard"));
// TRANSLATORS: popup menu item
// TRANSLATORS: add player to ignore list
mBrowserBox->addRow("/ignore 'NAME'", _("Ignore"));
@@ -2620,7 +2610,7 @@ void PopupMenu::addPlayerRelation(const std::string &name)
mBrowserBox->addRow("/unignore 'NAME'", _("Unignore"));
// TRANSLATORS: popup menu item
// TRANSLATORS: add player to disregarded list
- mBrowserBox->addRow("disregard", _("Disregard"));
+ mBrowserBox->addRow("/disregard 'NAME'", _("Disregard"));
// TRANSLATORS: popup menu item
// TRANSLATORS: add player to ignore list
mBrowserBox->addRow("/ignore 'NAME'", _("Ignore"));
@@ -2659,7 +2649,7 @@ void PopupMenu::addPlayerRelation(const std::string &name)
mBrowserBox->addRow("/unignore 'NAME'", _("Unignore"));
// TRANSLATORS: popup menu item
// TRANSLATORS: add player to disregarded list
- mBrowserBox->addRow("disregard", _("Disregard"));
+ mBrowserBox->addRow("/disregard 'NAME'", _("Disregard"));
// TRANSLATORS: popup menu item
// TRANSLATORS: add player to ignore list
mBrowserBox->addRow("/ignore 'NAME'", _("Ignore"));
@@ -2677,7 +2667,7 @@ void PopupMenu::addPlayerRelation(const std::string &name)
mBrowserBox->addRow("/unignore 'NAME'", _("Unignore"));
// TRANSLATORS: popup menu item
// TRANSLATORS: add player to disregarded list
- mBrowserBox->addRow("disregard", _("Disregard"));
+ mBrowserBox->addRow("/disregard 'NAME'", _("Disregard"));
// TRANSLATORS: popup menu item
// TRANSLATORS: add player to ignore list
mBrowserBox->addRow("/ignore 'NAME'", _("Completely ignore"));