From 62d8af5b803c053198afaf4a3bc6018460f1b9f8 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 9 May 2017 22:01:10 +0300
Subject: Remove some useless popup commands implementation.
---
src/gui/popups/popupmenu.cpp | 51 +++++++-------------------------------------
1 file changed, 8 insertions(+), 43 deletions(-)
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 755dbf8da..ff2b7cfa6 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -848,7 +848,7 @@ void PopupMenu::showChatPopup(const int x, const int y, ChatTab *const tab)
{
// TRANSLATORS: popup menu item
// TRANSLATORS: close chat tab
- mBrowserBox->addRow("chat close", _("Close"));
+ mBrowserBox->addRow("/close", _("Close"));
}
// TRANSLATORS: popup menu item
@@ -860,37 +860,37 @@ void PopupMenu::showChatPopup(const int x, const int y, ChatTab *const tab)
{
// TRANSLATORS: popup menu item
// TRANSLATORS: disable chat tab highlight
- mBrowserBox->addRow("disable highlight", _("Disable highlight"));
+ mBrowserBox->addRow("/disablehighlight", _("Disable highlight"));
}
else
{
// TRANSLATORS: popup menu item
// TRANSLATORS: enable chat tab highlight
- mBrowserBox->addRow("enable highlight", _("Enable highlight"));
+ mBrowserBox->addRow("/enablehighlight", _("Enable highlight"));
}
if (tab->getRemoveNames())
{
// TRANSLATORS: popup menu item
// TRANSLATORS: do not remove player names from chat tab
- mBrowserBox->addRow("dont remove name", _("Don't remove name"));
+ mBrowserBox->addRow("/dontremovename", _("Don't remove name"));
}
else
{
// TRANSLATORS: popup menu item
// TRANSLATORS: remove player names from chat tab
- mBrowserBox->addRow("remove name", _("Remove name"));
+ mBrowserBox->addRow("/removename", _("Remove name"));
}
if (tab->getNoAway())
{
// TRANSLATORS: popup menu item
// TRANSLATORS: enable away messages in chat tab
- mBrowserBox->addRow("enable away", _("Enable away"));
+ mBrowserBox->addRow("/enableaway", _("Enable away"));
}
else
{
// TRANSLATORS: popup menu item
// TRANSLATORS: disable away messages in chat tab
- mBrowserBox->addRow("disable away", _("Disable away"));
+ mBrowserBox->addRow("/disableaway", _("Disable away"));
}
mBrowserBox->addRow("##3---");
if (type == ChatTabType::PARTY)
@@ -1166,12 +1166,7 @@ void PopupMenu::handleLink(const std::string &link,
mAllowCleanMenu = true;
- if (link == "chat close" && mTab)
- {
- inputManager.executeChatCommand(InputAction::CLOSE_CHAT_TAB,
- std::string(), mTab);
- }
- else if (link == "remove map" && mMapItem)
+ if (link == "remove map" && mMapItem)
{
if (viewport)
{
@@ -1244,36 +1239,6 @@ void PopupMenu::handleLink(const std::string &link,
dialog->setActionEventId("ok");
dialog->addActionListener(&mPlayerListener);
}
- else if (link == "enable highlight" && mTab)
- {
- inputManager.executeChatCommand(InputAction::ENABLE_HIGHLIGHT,
- std::string(), mTab);
- }
- else if (link == "disable highlight" && mTab)
- {
- inputManager.executeChatCommand(InputAction::DISABLE_HIGHLIGHT,
- std::string(), mTab);
- }
- else if (link == "dont remove name" && mTab)
- {
- inputManager.executeChatCommand(InputAction::DONT_REMOVE_NAME,
- std::string(), mTab);
- }
- else if (link == "remove name" && mTab)
- {
- inputManager.executeChatCommand(InputAction::REMOVE_NAME,
- std::string(), mTab);
- }
- else if (link == "disable away" && mTab)
- {
- inputManager.executeChatCommand(InputAction::DISABLE_AWAY,
- std::string(), mTab);
- }
- else if (link == "enable away" && mTab)
- {
- inputManager.executeChatCommand(InputAction::ENABLE_AWAY,
- std::string(), mTab);
- }
else if (link == "attack moveup")
{
if (actorManager)
--
cgit v1.2.3-70-g09d2