procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'dev' of https://bitbucket.org/johnprestonmail/telegram-desktop into dev

This commit is contained in:
John Preston 2016-03-14 12:26:05 +03:00
parent f25e63bad7 6706b3882d
commit 91a2d6b02e
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Telegram/SourceFiles/shortcuts.cpp
View File

@ -263,6 +263,13 @@ namespace Shortcuts {
QMap<QKeySequence, QShortcut*> sequences; QMap<QKeySequence, QShortcut*> sequences;
QMap<int, ShortcutCommands::Handler> handlers; QMap<int, ShortcutCommands::Handler> handlers;
QSet<QString> autoRepeatCommands = {
qsl("media_previous"),
qsl("media_next"),
qsl("next_chat"),
qsl("previous_chat"),
};
}; };
void _createCommand(const QString &command, ShortcutCommands::Handler handler) { void _createCommand(const QString &command, ShortcutCommands::Handler handler) {
@ -287,7 +294,9 @@ namespace Shortcuts {
LOG(("Warning: could not find shortcut command handler '%1'").arg(command)); LOG(("Warning: could not find shortcut command handler '%1'").arg(command));
} else { } else {
QShortcut *shortcut(new QShortcut(seq, App::wnd(), nullptr, nullptr, Qt::ApplicationShortcut)); QShortcut *shortcut(new QShortcut(seq, App::wnd(), nullptr, nullptr, Qt::ApplicationShortcut));
shortcut->setAutoRepeat(false); if (!DataPtr->autoRepeatCommands.contains(command)) {
shortcut->setAutoRepeat(false);
}
int shortcutId = shortcut->id(); int shortcutId = shortcut->id();
if (!shortcutId) { if (!shortcutId) {
DataPtr->errors.push_back(qsl("Could not create shortcut '%1'!").arg(keys)); DataPtr->errors.push_back(qsl("Could not create shortcut '%1'!").arg(keys));