remove old quick switcher

CMakeLists.txt

@@ -315,7 +315,6 @@ set(SRC_FILES
 	src/MatrixClient.cpp
 	src/MxcImageProvider.cpp
 	src/Olm.cpp
-	src/QuickSwitcher.cpp
 	src/RegisterPage.cpp
 	src/RoomInfoListItem.cpp
 	src/RoomList.cpp
@@ -527,7 +526,6 @@ qt5_wrap_cpp(MOC_HEADERS
 	src/LoginPage.h
 	src/MainWindow.h
 	src/MxcImageProvider.h
-	src/QuickSwitcher.h
 	src/RegisterPage.h
 	src/RoomInfoListItem.h
 	src/RoomList.h

resources/qml/TimelineView.qml

@@ -76,7 +76,7 @@ Page {
     }
 
     Shortcut {
-        sequence: "Ctrl+L"
+        sequence: "Ctrl+K"
         onActivated: {
             var quickSwitch = quickSwitcherComponent.createObject(timelineRoot);
             TimelineManager.focusTimeline()

src/ChatPage.cpp

@@ -35,7 +35,6 @@
 #include "MainWindow.h"
 #include "MatrixClient.h"
 #include "Olm.h"
-#include "QuickSwitcher.h"
 #include "RoomList.h"
 #include "SideBarActions.h"
 #include "Splitter.h"
@@ -598,18 +597,6 @@ ChatPage::loadStateFromCache()
         emit trySyncCb();
 }
 
-void
-ChatPage::showQuickSwitcher()
-{
-        auto dialog = new QuickSwitcher(this);
-
-        connect(dialog, &QuickSwitcher::roomSelected, room_list_, &RoomList::highlightSelectedRoom);
-        connect(
-          dialog, &QuickSwitcher::closing, this, []() { MainWindow::instance()->hideOverlay(); });
-
-        MainWindow::instance()->showTransparentOverlayModal(dialog);
-}
-
 void
 ChatPage::removeRoom(const QString &room_id)
 {

src/ChatPage.h

@@ -43,7 +43,6 @@
 #include "notifications/Manager.h"
 
 class OverlayModal;
-class QuickSwitcher;
 class RoomList;
 class SideBarActions;
 class Splitter;
@@ -84,7 +83,6 @@ public:
 
         // Initialize all the components of the UI.
         void bootstrap(QString userid, QString homeserver, QString token);
-        void showQuickSwitcher();
         QString currentRoom() const { return current_room_; }
 
         static ChatPage *instance() { return instance_; }

src/MainWindow.cpp

@@ -147,12 +147,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()) {

src/QuickSwitcher.cpp

@@ -1,141 +0,0 @@
-/*
- * nheko Copyright (C) 2017  Konstantinos Sideris <siderisk@auth.gr>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <QCompleter>
-#include <QPainter>
-#include <QStringListModel>
-#include <QStyleOption>
-#include <QTimer>
-#include <QtConcurrent>
-
-#include "Cache.h"
-#include "QuickSwitcher.h"
-#include "popups/SuggestionsPopup.h"
-
-Q_DECLARE_METATYPE(std::vector<RoomSearchResult>)
-
-RoomSearchInput::RoomSearchInput(QWidget *parent)
-  : TextField(parent)
-{}
-
-void
-RoomSearchInput::keyPressEvent(QKeyEvent *event)
-{
-        switch (event->key()) {
-        case Qt::Key_Tab:
-        case Qt::Key_Down: {
-                emit selectNextCompletion();
-                event->accept();
-                break;
-        }
-        case Qt::Key_Backtab:
-        case Qt::Key_Up: {
-                emit selectPreviousCompletion();
-                event->accept();
-                break;
-        }
-        default:
-                TextField::keyPressEvent(event);
-        }
-}
-
-void
-RoomSearchInput::hideEvent(QHideEvent *event)
-{
-        emit hiding();
-        TextField::hideEvent(event);
-}
-
-QuickSwitcher::QuickSwitcher(QWidget *parent)
-  : QWidget(parent)
-{
-        qRegisterMetaType<std::vector<RoomSearchResult>>();
-        setMaximumWidth(450);
-
-        QFont font;
-        font.setPointSizeF(font.pointSizeF() * 1.5);
-
-        roomSearch_ = new RoomSearchInput(this);
-        roomSearch_->setFont(font);
-        roomSearch_->setPlaceholderText(tr("Search for a room..."));
-
-        topLayout_ = new QVBoxLayout(this);
-        topLayout_->addWidget(roomSearch_);
-
-        connect(this,
-                &QuickSwitcher::queryResults,
-                this,
-                [this](const std::vector<RoomSearchResult> &rooms) {
-                        auto pos = mapToGlobal(roomSearch_->geometry().bottomLeft());
-
-                        popup_.setFixedWidth(width());
-                        popup_.addRooms(rooms);
-                        popup_.move(pos.x() - topLayout_->margin(), pos.y() + topLayout_->margin());
-                        popup_.show();
-                });
-
-        connect(roomSearch_, &QLineEdit::textEdited, this, [this](const QString &query) {
-                if (query.isEmpty()) {
-                        popup_.hide();
-                        return;
-                }
-
-                QtConcurrent::run([this, query = query.toLower()]() {
-                        try {
-                                emit queryResults(cache::searchRooms(query.toStdString()));
-                        } catch (const lmdb::error &e) {
-                                qWarning() << "room search failed:" << e.what();
-                        }
-                });
-        });
-
-        connect(roomSearch_,
-                &RoomSearchInput::selectNextCompletion,
-                &popup_,
-                &SuggestionsPopup::selectNextSuggestion);
-        connect(roomSearch_,
-                &RoomSearchInput::selectPreviousCompletion,
-                &popup_,
-                &SuggestionsPopup::selectPreviousSuggestion);
-        connect(&popup_, &SuggestionsPopup::itemSelected, this, [this](const QString &room_id) {
-                reset();
-                emit roomSelected(room_id);
-        });
-        connect(roomSearch_, &RoomSearchInput::hiding, this, [this]() { popup_.hide(); });
-        connect(roomSearch_, &QLineEdit::returnPressed, this, [this]() {
-                reset();
-                popup_.selectHoveredSuggestion();
-        });
-}
-
-void
-QuickSwitcher::paintEvent(QPaintEvent *)
-{
-        QStyleOption opt;
-        opt.init(this);
-        QPainter p(this);
-        style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
-}
-
-void
-QuickSwitcher::keyPressEvent(QKeyEvent *event)
-{
-        if (event->key() == Qt::Key_Escape) {
-                event->accept();
-                reset();
-        }
-}

src/QuickSwitcher.h

@@ -1,77 +0,0 @@
-/*
- * nheko Copyright (C) 2017  Konstantinos Sideris <siderisk@auth.gr>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <QAbstractItemView>
-#include <QKeyEvent>
-#include <QVBoxLayout>
-#include <QWidget>
-
-#include "popups/SuggestionsPopup.h"
-#include "ui/TextField.h"
-
-class RoomSearchInput : public TextField
-{
-        Q_OBJECT
-public:
-        explicit RoomSearchInput(QWidget *parent = nullptr);
-
-signals:
-        void selectNextCompletion();
-        void selectPreviousCompletion();
-        void hiding();
-
-protected:
-        void keyPressEvent(QKeyEvent *event) override;
-        void hideEvent(QHideEvent *event) override;
-        bool focusNextPrevChild(bool) override { return false; };
-};
-
-class QuickSwitcher : public QWidget
-{
-        Q_OBJECT
-
-public:
-        QuickSwitcher(QWidget *parent = nullptr);
-
-signals:
-        void closing();
-        void roomSelected(const QString &roomid);
-        void queryResults(const std::vector<RoomSearchResult> &rooms);
-
-protected:
-        void keyPressEvent(QKeyEvent *event) override;
-        void showEvent(QShowEvent *) override { roomSearch_->setFocus(); }
-        void paintEvent(QPaintEvent *event) override;
-
-private:
-        void reset()
-        {
-                emit closing();
-                roomSearch_->clear();
-        }
-
-        // Current highlighted selection from the completer.
-        int selection_ = -1;
-
-        QVBoxLayout *topLayout_;
-        RoomSearchInput *roomSearch_;
-
-        //! Autocomplete popup box with the room suggestions.
-        SuggestionsPopup popup_;
-};