summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-01-11 23:59:36 +0300
committerAndrei Karas <akaras@inbox.ru>2015-01-11 23:59:36 +0300
commit1939f5fa61fe071ff8e1e4ab0301c6f821c0de8a (patch)
treeedc73443a83b5e3b59147c4fbe27ccaa8eb311b5
parent5b4e74ab44a2ae4eab9db71c860885802e2ba28d (diff)
downloadplus-1939f5fa61fe071ff8e1e4ab0301c6f821c0de8a.tar.gz
plus-1939f5fa61fe071ff8e1e4ab0301c6f821c0de8a.tar.bz2
plus-1939f5fa61fe071ff8e1e4ab0301c6f821c0de8a.tar.xz
plus-1939f5fa61fe071ff8e1e4ab0301c6f821c0de8a.zip
Remove popup handler "clear drops".
-rw-r--r--src/actions/actions.cpp6
-rw-r--r--src/actions/actions.h1
-rw-r--r--src/gui/popups/popupmenu.cpp7
-rw-r--r--src/input/inputaction.h1
-rw-r--r--src/input/inputactionmap.h5
-rw-r--r--src/input/pages/windows.cpp6
6 files changed, 20 insertions, 6 deletions
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp
index 7596758c8..3c9605fc7 100644
--- a/src/actions/actions.cpp
+++ b/src/actions/actions.cpp
@@ -1518,4 +1518,10 @@ impHandler(kick)
return true;
}
+impHandler0(clearDrop)
+{
+ if (dropShortcut)
+ dropShortcut->clear();
+}
+
} // namespace Actions
diff --git a/src/actions/actions.h b/src/actions/actions.h
index 545e92f02..17b4900a0 100644
--- a/src/actions/actions.h
+++ b/src/actions/actions.h
@@ -102,6 +102,7 @@ namespace Actions
decHandler(protectItem);
decHandler(unprotectItem);
decHandler(kick);
+ decHandler(clearDrop);
} // namespace Actions
#undef decHandler
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 1ee8e5035..349598f26 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -1018,11 +1018,6 @@ void PopupMenu::handleLink(const std::string &link,
mDialog->setActionEventId("ok");
mDialog->addActionListener(&mRenameListener);
}
- else if (link == "clear drops")
- {
- if (dropShortcut)
- dropShortcut->clear();
- }
else if (link == "edit spell" && mSpell)
{
(new TextCommandEditor(mSpell))->postInit();
@@ -1862,7 +1857,7 @@ void PopupMenu::showDropPopup(const int x, const int y, Item *const item)
}
mBrowserBox->addRow("##3---");
// TRANSLATORS: popup menu item
- mBrowserBox->addRow("clear drops", _("Clear drop window"));
+ mBrowserBox->addRow("/cleardrops", _("Clear drop window"));
mBrowserBox->addRow("##3---");
// TRANSLATORS: popup menu item
// TRANSLATORS: close menu
diff --git a/src/input/inputaction.h b/src/input/inputaction.h
index 694647a93..63f351706 100644
--- a/src/input/inputaction.h
+++ b/src/input/inputaction.h
@@ -534,6 +534,7 @@ namespace InputAction
CHAT_GM_TAB,
CHAT_PARTY_TAB,
CHAT_GUILD_TAB,
+ DROP_CLEAR,
TOTAL
};
} // namespace InputAction
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index 2235daba4..030600a38 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -3964,6 +3964,11 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
InputCondition::INGAME,
"guildtab|guildchattab",
false},
+ {"keyDropClear",
+ defaultAction(&Actions::clearDrop),
+ InputCondition::INGAME,
+ "cleardrops|cleardrop|cleardropwindow|dropclear|dropsclear",
+ false},
};
#undef defaultAction
diff --git a/src/input/pages/windows.cpp b/src/input/pages/windows.cpp
index ff646ded0..41a538326 100644
--- a/src/input/pages/windows.cpp
+++ b/src/input/pages/windows.cpp
@@ -236,6 +236,12 @@ SetupActionData setupActionDataWindows[] =
"",
},
{
+ // TRANSLATORS: input action name
+ N_("Clear drops window"),
+ InputAction::DROP_CLEAR,
+ "",
+ },
+ {
"",
InputAction::NO_VALUE,
""