Merge branch 'quickswitcher_qml' of git://github.com/Jedi18/nheko into Jedi18-quickswitcher_qml
This commit is contained in:
commit
7a356f3832
18 changed files with 323 additions and 272 deletions
|
|
@ -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()) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue