Merge branch 'quickswitcher_qml' of git://github.com/Jedi18/nheko into Jedi18-quickswitcher_qml

This commit is contained in:
Nicolas Werner 2021-03-13 23:45:05 +01:00
commit 7a356f3832
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
18 changed files with 323 additions and 272 deletions

View file

@ -135,12 +135,6 @@ MainWindow::MainWindow(QWidget *parent)
QShortcut *quitShortcut = new QShortcut(QKeySequence::Quit, this);
connect(quitShortcut, &QShortcut::activated, this, QApplication::quit);
QShortcut *quickSwitchShortcut = new QShortcut(QKeySequence("Ctrl+K"), this);
connect(quickSwitchShortcut, &QShortcut::activated, this, [this]() {
if (chat_page_->isVisible() && !hasActiveDialogs())
chat_page_->showQuickSwitcher();
});
trayIcon_->setVisible(userSettings_->tray());
if (hasActiveUser()) {