From dd73b250eb8390a87e09eeefc054202835b29a43 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 27 Jan 2016 18:19:44 +0300
Subject: Remove add/remove/ignore pickup actions from item popup menu.

---
 src/gui/popups/popupmenu.cpp | 37 ++++++-------------------------------
 1 file changed, 6 insertions(+), 31 deletions(-)

(limited to 'src')

diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index d79a2f92d..e792b2bb4 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -1134,33 +1134,6 @@ void PopupMenu::handleLink(const std::string &link,
         inputManager.executeChatCommand(InputAction::ENABLE_AWAY,
             std::string(), mTab);
     }
-    else if (link == "remove pickup" && !mNick.empty())
-    {
-        if (actorManager)
-        {
-            actorManager->removePickupItem(mNick);
-            if (socialWindow)
-                socialWindow->updatePickupFilter();
-        }
-    }
-    else if (link == "add pickup" && !mNick.empty())
-    {
-        if (actorManager)
-        {
-            actorManager->addPickupItem(mNick);
-            if (socialWindow)
-                socialWindow->updatePickupFilter();
-        }
-    }
-    else if (link == "add pickup ignore" && !mNick.empty())
-    {
-        if (actorManager)
-        {
-            actorManager->addIgnorePickupItem(mNick);
-            if (socialWindow)
-                socialWindow->updatePickupFilter();
-        }
-    }
     else if (link == "attack moveup")
     {
         if (actorManager)
@@ -2591,16 +2564,18 @@ void PopupMenu::addPickupFilter(const std::string &name)
     if (actorManager->isInPickupList(name)
         || actorManager->isInIgnorePickupList(name))
     {
-        mBrowserBox->addRow("remove pickup",
+        mBrowserBox->addRow("/removepickup 'NAME'",
             // TRANSLATORS: popup menu item
             // TRANSLATORS: remove item from pickup list
             _("Remove from pickup list"));
     }
     else
     {
-        // TRANSLATORS: popup menu item
-        mBrowserBox->addRow("add pickup", _("Add to pickup list"));
-        mBrowserBox->addRow("add pickup ignore",
+        mBrowserBox->addRow("/addpickup 'NAME'",
+            // TRANSLATORS: popup menu item
+            // TRANSLATORS: popup menu item
+            _("Add to pickup list"));
+        mBrowserBox->addRow("/ignorepickup 'NAME'",
             // TRANSLATORS: popup menu item
             // TRANSLATORS: add item to pickup list
             _("Add to ignore list"));
-- 
cgit v1.2.3-60-g2f50