DolphinQt: Make Ctrl+F show the game list search and select the search text if already open. Escape closes.

This commit is contained in:
Jordan Woyak 2019-03-17 16:08:59 -05:00
parent 8713a752f3
commit 94c4975b5d
5 changed files with 40 additions and 12 deletions

View File

@ -452,7 +452,7 @@ void MainWindow::ConnectMenuBar()
connect(m_menu_bar, &MenuBar::ShowList, m_game_list, &GameList::SetListView); connect(m_menu_bar, &MenuBar::ShowList, m_game_list, &GameList::SetListView);
connect(m_menu_bar, &MenuBar::ShowGrid, m_game_list, &GameList::SetGridView); connect(m_menu_bar, &MenuBar::ShowGrid, m_game_list, &GameList::SetGridView);
connect(m_menu_bar, &MenuBar::PurgeGameListCache, m_game_list, &GameList::PurgeCache); connect(m_menu_bar, &MenuBar::PurgeGameListCache, m_game_list, &GameList::PurgeCache);
connect(m_menu_bar, &MenuBar::ToggleSearch, m_search_bar, &SearchBar::Toggle); connect(m_menu_bar, &MenuBar::ShowSearch, m_search_bar, &SearchBar::Show);
connect(m_menu_bar, &MenuBar::ColumnVisibilityToggled, m_game_list, connect(m_menu_bar, &MenuBar::ColumnVisibilityToggled, m_game_list,
&GameList::OnColumnVisibilityToggled); &GameList::OnColumnVisibilityToggled);

View File

@ -473,7 +473,7 @@ void MenuBar::AddViewMenu()
view_menu->addSeparator(); view_menu->addSeparator();
view_menu->addAction(tr("Purge Game List Cache"), this, &MenuBar::PurgeGameListCache); view_menu->addAction(tr("Purge Game List Cache"), this, &MenuBar::PurgeGameListCache);
view_menu->addSeparator(); view_menu->addSeparator();
view_menu->addAction(tr("Search"), this, &MenuBar::ToggleSearch, view_menu->addAction(tr("Search"), this, &MenuBar::ShowSearch,
QKeySequence(QStringLiteral("Ctrl+F"))); QKeySequence(QStringLiteral("Ctrl+F")));
} }

View File

@ -96,7 +96,7 @@ signals:
void ShowList(); void ShowList();
void ShowGrid(); void ShowGrid();
void PurgeGameListCache(); void PurgeGameListCache();
void ToggleSearch(); void ShowSearch();
void ColumnVisibilityToggled(const QString& row, bool visible); void ColumnVisibilityToggled(const QString& row, bool visible);
void GameListPlatformVisibilityToggled(const QString& row, bool visible); void GameListPlatformVisibilityToggled(const QString& row, bool visible);
void GameListRegionVisibilityToggled(const QString& row, bool visible); void GameListRegionVisibilityToggled(const QString& row, bool visible);

View File

@ -4,7 +4,9 @@
#include "DolphinQt/SearchBar.h" #include "DolphinQt/SearchBar.h"
#include <QEvent>
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QKeyEvent>
#include <QLineEdit> #include <QLineEdit>
#include <QPushButton> #include <QPushButton>
@ -16,6 +18,8 @@ SearchBar::SearchBar(QWidget* parent) : QWidget(parent)
setFixedHeight(32); setFixedHeight(32);
setHidden(true); setHidden(true);
installEventFilter(this);
} }
void SearchBar::CreateWidgets() void SearchBar::CreateWidgets()
@ -34,20 +38,40 @@ void SearchBar::CreateWidgets()
setLayout(layout); setLayout(layout);
} }
void SearchBar::Toggle() void SearchBar::Show()
{ {
m_search_edit->clear(); m_search_edit->setFocus();
m_search_edit->selectAll();
setHidden(isVisible()); // Re-apply the filter string.
emit Search(m_search_edit->text());
if (isVisible()) show();
m_search_edit->setFocus(); }
else
m_search_edit->clearFocus(); void SearchBar::Hide()
{
// Clear the filter string.
emit Search(QString());
m_search_edit->clearFocus();
hide();
} }
void SearchBar::ConnectWidgets() void SearchBar::ConnectWidgets()
{ {
connect(m_search_edit, &QLineEdit::textChanged, this, &SearchBar::Search); connect(m_search_edit, &QLineEdit::textChanged, this, &SearchBar::Search);
connect(m_close_button, &QPushButton::pressed, this, &SearchBar::Toggle); connect(m_close_button, &QPushButton::pressed, this, &SearchBar::Hide);
}
bool SearchBar::eventFilter(QObject* object, QEvent* event)
{
if (event->type() == QEvent::KeyPress)
{
if (static_cast<QKeyEvent*>(event)->key() == Qt::Key_Escape)
Hide();
}
return false;
} }

View File

@ -15,7 +15,9 @@ class SearchBar : public QWidget
public: public:
explicit SearchBar(QWidget* parent = nullptr); explicit SearchBar(QWidget* parent = nullptr);
void Toggle(); void Show();
void Hide();
signals: signals:
void Search(const QString& serach); void Search(const QString& serach);
@ -23,6 +25,8 @@ private:
void CreateWidgets(); void CreateWidgets();
void ConnectWidgets(); void ConnectWidgets();
bool eventFilter(QObject* object, QEvent* event) final override;
QLineEdit* m_search_edit; QLineEdit* m_search_edit;
QPushButton* m_close_button; QPushButton* m_close_button;
}; };