From 13cb0521fa4fd692f66a89c83ef17b7e3ea339bb Mon Sep 17 00:00:00 2001 From: Jani Mustonen Date: Fri, 3 Nov 2017 08:54:17 +0200 Subject: [PATCH] Improvements to the quick switcher (#109) - Ghetto disambiguation for the quick switcher - Fix the Ctrl+K shortcut - Fix keyboard focus when the quick switcher is closed fixes #114 --- include/MainWindow.h | 1 - include/TextInputWidget.h | 3 +++ src/ChatPage.cc | 9 +++++++-- src/MainWindow.cc | 14 +++++--------- src/QuickSwitcher.cc | 11 ++++++++++- src/TextInputWidget.cc | 6 ++++++ 6 files changed, 31 insertions(+), 13 deletions(-) diff --git a/include/MainWindow.h b/include/MainWindow.h index 21530d07..2d047b51 100644 --- a/include/MainWindow.h +++ b/include/MainWindow.h @@ -47,7 +47,6 @@ public: protected: void closeEvent(QCloseEvent *event); - void keyPressEvent(QKeyEvent *event); private slots: // Handle interaction with the tray icon. diff --git a/include/TextInputWidget.h b/include/TextInputWidget.h index e32ce2ff..32da6ba3 100644 --- a/include/TextInputWidget.h +++ b/include/TextInputWidget.h @@ -79,6 +79,9 @@ signals: void startedTyping(); void stoppedTyping(); +protected: + void focusInEvent(QFocusEvent *event); + private: void showUploadSpinner(); QString parseEmoteCommand(const QString &cmd); diff --git a/src/ChatPage.cc b/src/ChatPage.cc index e32b288a..884e219a 100644 --- a/src/ChatPage.cc +++ b/src/ChatPage.cc @@ -562,6 +562,7 @@ ChatPage::showQuickSwitcher() connect(quickSwitcher_.data(), &QuickSwitcher::closing, this, [=]() { if (!this->quickSwitcherModal_.isNull()) this->quickSwitcherModal_->fadeOut(); + this->text_input_->setFocus(Qt::FocusReason::PopupFocusReason); }); } @@ -575,8 +576,12 @@ ChatPage::showQuickSwitcher() QMap rooms; - for (auto it = state_manager_.constBegin(); it != state_manager_.constEnd(); ++it) - rooms.insert(it.value().getName(), it.key()); + for (auto it = state_manager_.constBegin(); it != state_manager_.constEnd(); ++it) { + QString deambiguator = it.value().canonical_alias.content().alias(); + if (deambiguator == "") + deambiguator = it.key(); + rooms.insert(it.value().getName() + " (" + deambiguator + ")", it.key()); + } quickSwitcher_->setRoomList(rooms); quickSwitcherModal_->fadeIn(); diff --git a/src/MainWindow.cc b/src/MainWindow.cc index 04576d44..9c81ef85 100644 --- a/src/MainWindow.cc +++ b/src/MainWindow.cc @@ -114,6 +114,11 @@ 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, [=]() { + chat_page_->showQuickSwitcher(); + }); + QSettings settings; trayIcon_->setVisible(userSettings_->isTrayEnabled()); @@ -127,15 +132,6 @@ MainWindow::MainWindow(QWidget *parent) } } -void -MainWindow::keyPressEvent(QKeyEvent *e) -{ - if ((e->key() == Qt::Key_K) && (e->modifiers().testFlag(Qt::ControlModifier))) - chat_page_->showQuickSwitcher(); - else - QMainWindow::keyPressEvent(e); -} - void MainWindow::restoreWindowSize() { diff --git a/src/QuickSwitcher.cc b/src/QuickSwitcher.cc index 542eebd9..2be636a4 100644 --- a/src/QuickSwitcher.cc +++ b/src/QuickSwitcher.cc @@ -122,7 +122,16 @@ QuickSwitcher::QuickSwitcher(QWidget *parent) roomSearch_, &RoomSearchInput::hiding, this, [=]() { completer_->popup()->hide(); }); connect(roomSearch_, &QLineEdit::returnPressed, this, [=]() { emit closing(); - emit roomSelected(rooms_[this->roomSearch_->text().trimmed()]); + + QString text(""); + + if (selection_ == -1) { + completer_->setCurrentRow(0); + text = completer_->currentCompletion(); + } else { + text = this->roomSearch_->text().trimmed(); + } + emit roomSelected(rooms_[text]); roomSearch_->clear(); }); diff --git a/src/TextInputWidget.cc b/src/TextInputWidget.cc index 7ebef6b1..e68b1c28 100644 --- a/src/TextInputWidget.cc +++ b/src/TextInputWidget.cc @@ -259,3 +259,9 @@ TextInputWidget::stopTyping() { input_->stopTyping(); } + +void +TextInputWidget::focusInEvent(QFocusEvent *event) +{ + input_->setFocus(event->reason()); +}