From b1554782fb494495810bbcac18f72854c1669f96 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 1 Jul 2020 22:19:33 +0400 Subject: [PATCH] Add one more moderate hotkey. --- Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp | 10 ++++++---- .../chat_helpers/field_autocomplete.cpp | 14 +++++++++----- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp b/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp index 3072fd125..39ce30e89 100644 --- a/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp +++ b/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp @@ -161,12 +161,14 @@ bool BotKeyboard::moderateKeyActivate(int key) { App::activateBotCommand(item, 0, index); return true; } - } else if (key == Qt::Key_Q) { - if (const auto user = item->history()->peer->asUser()) { - if (user->isBot() && item->from() == user) { + } else if (const auto user = item->history()->peer->asUser()) { + if (user->isBot() && item->from() == user) { + if (key == Qt::Key_Q) { App::sendBotCommand(user, user, qsl("/translate")); - return true; + } else if (key == Qt::Key_W) { + App::sendBotCommand(user, user, qsl("/eng")); } + return true; } } } diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp index f76d8b5a4..f08b62177 100644 --- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp +++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp @@ -571,16 +571,20 @@ bool FieldAutocomplete::eventFilter(QObject *obj, QEvent *e) { if (e->type() == QEvent::KeyPress) { QKeyEvent *ev = static_cast(e); if (!(ev->modifiers() & (Qt::AltModifier | Qt::ControlModifier | Qt::ShiftModifier | Qt::MetaModifier))) { + const auto key = ev->key(); if (!hidden) { - if (ev->key() == Qt::Key_Up || ev->key() == Qt::Key_Down || (!_srows.empty() && (ev->key() == Qt::Key_Left || ev->key() == Qt::Key_Right))) { - return _inner->moveSel(ev->key()); - } else if (ev->key() == Qt::Key_Enter || ev->key() == Qt::Key_Return) { + if (key == Qt::Key_Up || key == Qt::Key_Down || (!_srows.empty() && (key == Qt::Key_Left || key == Qt::Key_Right))) { + return _inner->moveSel(key); + } else if (key == Qt::Key_Enter || key == Qt::Key_Return) { return _inner->chooseSelected(ChooseMethod::ByEnter); } } - if (moderate && ((ev->key() >= Qt::Key_1 && ev->key() <= Qt::Key_9) || ev->key() == Qt::Key_Q)) { + if (moderate + && ((key >= Qt::Key_1 && key <= Qt::Key_9) + || key == Qt::Key_Q + || key == Qt::Key_W)) { bool handled = false; - emit moderateKeyActivate(ev->key(), &handled); + emit moderateKeyActivate(key, &handled); return handled; } }