diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-03-08 12:29:10 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-03-08 12:29:10 +0300 |
| commit | d1c4cb3675600137d0239ac7bdfc91062592804a (patch) | |
| tree | e09c62c2e8a796bb745e0e3c2ed86810327ea3c5 /src/gui/popups/popupmenu.cpp | |
| parent | 905bfd0ad38d7101f99f38b00044d9f192cc664d (diff) | |
| download | manaverse-d1c4cb3675600137d0239ac7bdfc91062592804a.tar.gz manaverse-d1c4cb3675600137d0239ac7bdfc91062592804a.tar.bz2 manaverse-d1c4cb3675600137d0239ac7bdfc91062592804a.tar.xz manaverse-d1c4cb3675600137d0239ac7bdfc91062592804a.zip | |
Move guild-kick from popup manager into actions.
Diffstat (limited to 'src/gui/popups/popupmenu.cpp')
| -rw-r--r-- | src/gui/popups/popupmenu.cpp | 35 |
1 files changed, 10 insertions, 25 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index bedc93259..1420d5714 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -183,7 +183,7 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being) { if (guild1->getId() == guild2->getId()) { - mBrowserBox->addRow("guild-kick", + mBrowserBox->addRow("/kickguild 'NAME'", // TRANSLATORS: popup menu item // TRANSLATORS: kick player from guild _("Kick from guild")); @@ -199,7 +199,7 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being) } else if (guild2->getMember(mNick)) { - mBrowserBox->addRow("guild-kick", + mBrowserBox->addRow("/kickguild 'NAME'", // TRANSLATORS: popup menu item // TRANSLATORS: kick player from guild _("Kick from guild")); @@ -506,9 +506,10 @@ void PopupMenu::showPlayerPopup(const std::string &nick) && guildManager->havePower())) #endif { - // TRANSLATORS: popup menu item - // TRANSLATORS: kick player from guild - mBrowserBox->addRow("guild-kick", _("Kick from guild")); + mBrowserBox->addRow("/kickguild 'NAME'", + // TRANSLATORS: popup menu item + // TRANSLATORS: kick player from guild + _("Kick from guild")); } if (guild2->getServerGuild()) { @@ -829,10 +830,10 @@ void PopupMenu::showChatPopup(const int x, const int y, ChatTab *const tab) && guildManager->havePower())) #endif { - // TRANSLATORS: popup menu item - // TRANSLATORS: kick player from guild - mBrowserBox->addRow(strprintf( - "@@guild-kick|%s@@", _("Kick from guild"))); + mBrowserBox->addRow("/kickguild 'NAME'", + // TRANSLATORS: popup menu item + // TRANSLATORS: kick player from guild + _("Kick from guild")); } if (guild2->getServerGuild()) { @@ -1067,22 +1068,6 @@ void PopupMenu::handleLink(const std::string &link, dialog->setActionEventId("ok"); dialog->addActionListener(&mPlayerListener); } - else if (link == "guild-kick" && !mNick.empty()) - { - if (localPlayer) - { - const Guild *const guild = localPlayer->getGuild(); - if (guild) - { - if (guild->getServerGuild()) - guildHandler->kick(guild->getMember(mNick), ""); -#ifdef TMWA_SUPPORT - else if (guildManager) - guildManager->kick(mNick); -#endif - } - } - } else if (link == "enable highlight" && mTab) { inputManager.executeChatCommand(InputAction::ENABLE_HIGHLIGHT, |