summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-08-26 23:35:31 +0300
committerAndrei Karas <akaras@inbox.ru>2014-08-26 23:35:31 +0300
commit9f39b5c84d0b244e093380e5ad7d53c2a21d2f34 (patch)
tree486e3c373fb7a1e572be9b5a71ed95fc6d4b7707
parentc7266cda03bcab72b147b5597a126f01f915fe2c (diff)
downloadplus-9f39b5c84d0b244e093380e5ad7d53c2a21d2f34.tar.gz
plus-9f39b5c84d0b244e093380e5ad7d53c2a21d2f34.tar.bz2
plus-9f39b5c84d0b244e093380e5ad7d53c2a21d2f34.tar.xz
plus-9f39b5c84d0b244e093380e5ad7d53c2a21d2f34.zip
Move chat command /serverunignoreall into actions.
-rw-r--r--src/actions/actions.cpp6
-rw-r--r--src/actions/actions.h1
-rw-r--r--src/commands.cpp6
-rw-r--r--src/commands.h5
-rw-r--r--src/input/inputaction.h1
-rw-r--r--src/input/inputactionmap.h9
-rw-r--r--src/input/pages/chat.cpp6
7 files changed, 24 insertions, 10 deletions
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp
index 46a3d74d8..2514ac180 100644
--- a/src/actions/actions.cpp
+++ b/src/actions/actions.cpp
@@ -878,4 +878,10 @@ impHandler0(serverIgnoreAll)
return true;
}
+impHandler0(serverUnIgnoreAll)
+{
+ Net::getChatHandler()->unIgnoreAll();
+ return true;
+}
+
} // namespace Actions
diff --git a/src/actions/actions.h b/src/actions/actions.h
index a731574bb..e3e6a2c02 100644
--- a/src/actions/actions.h
+++ b/src/actions/actions.h
@@ -70,6 +70,7 @@ namespace Actions
decHandler(uptime);
decHandler(dump);
decHandler(serverIgnoreAll);
+ decHandler(serverUnIgnoreAll);
} // namespace Actions
#undef decHandler
diff --git a/src/commands.cpp b/src/commands.cpp
index b5491a805..608be620f 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -157,12 +157,6 @@ impHandler(hack)
return true;
}
-impHandler0(serverUnIgnoreAll)
-{
- Net::getChatHandler()->unIgnoreAll();
- return true;
-}
-
impHandler(dumpGraphics)
{
std::string str = strprintf("%s,%s,%dX%dX%d,", PACKAGE_OS, SMALL_VERSION,
diff --git a/src/commands.h b/src/commands.h
index d90974eaf..6b7ec8401 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -52,7 +52,6 @@ struct CommandInfo final
namespace Commands
{
decHandler(hack);
- decHandler(serverUnIgnoreAll);
decHandler(setDrop);
decHandler(error) __attribute__ ((noreturn));
decHandler(url);
@@ -86,8 +85,7 @@ namespace Commands
enum
{
- COMMAND_SERVERUNIGNOREALL = 0,
- COMMAND_SETDROP,
+ COMMAND_SETDROP = 0,
COMMAND_ERROR,
COMMAND_DUMPG,
COMMAND_DUMPE,
@@ -120,7 +118,6 @@ enum
static const CommandInfo commands[] =
{
- {"serverunignoreall", &Commands::serverUnIgnoreAll, -1, false},
{"setdrop", &Commands::setDrop, -1, true},
{"error", &Commands::error, -1, false},
{"dumpg", &Commands::dumpGraphics, -1, false},
diff --git a/src/input/inputaction.h b/src/input/inputaction.h
index 572333a3d..cb79d84a2 100644
--- a/src/input/inputaction.h
+++ b/src/input/inputaction.h
@@ -395,6 +395,7 @@ namespace InputAction
ADD_IGNORE_ATTACK,
DUMP,
SERVER_IGNORE_ALL,
+ SERVER_UNIGNORE_ALL,
TOTAL
};
} // namespace InputAction
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index 82973a0cc..b0976916c 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -3324,6 +3324,15 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
InputAction::NO_VALUE, 50,
InputCondition::INGAME,
"serverignoreall",
+ false},
+ {"keyServerUnIgnoreAll",
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ InputType::UNKNOWN, InputAction::NO_VALUE,
+ Input::GRP_DEFAULT,
+ &Actions::serverUnIgnoreAll,
+ InputAction::NO_VALUE, 50,
+ InputCondition::INGAME,
+ "serverunignoreall",
false}
};
diff --git a/src/input/pages/chat.cpp b/src/input/pages/chat.cpp
index 27e239cce..749752ab6 100644
--- a/src/input/pages/chat.cpp
+++ b/src/input/pages/chat.cpp
@@ -92,6 +92,12 @@ SetupActionData setupActionDataChat[] =
},
{
// TRANSLATORS: input action name
+ N_("Unignore all whispers on server side"),
+ InputAction::SERVER_UNIGNORE_ALL,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
N_("Previous chat line"),
InputAction::CHAT_PREV_HISTORY,
"",