From 11da018ea64ab31ef485890654dc352bdbc7c02b Mon Sep 17 00:00:00 2001 From: zhupengfei Date: Mon, 23 Jul 2018 18:43:34 +0800 Subject: [PATCH] game_list: move SearchField to game_list_p.h and fix untranslated text I have tested and made sure the text is translatable, but this would require a translation update to take effect. --- src/citra_qt/game_list.cpp | 14 ++++++------- src/citra_qt/game_list.h | 36 ++++--------------------------- src/citra_qt/game_list_p.h | 43 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 39 deletions(-) diff --git a/src/citra_qt/game_list.cpp b/src/citra_qt/game_list.cpp index b1fa73c88..1891371fb 100644 --- a/src/citra_qt/game_list.cpp +++ b/src/citra_qt/game_list.cpp @@ -31,10 +31,10 @@ #include "core/hle/service/fs/archive.h" #include "core/loader/loader.h" -GameList::SearchField::KeyReleaseEater::KeyReleaseEater(GameList* gamelist) : gamelist{gamelist} {} +GameListSearchField::KeyReleaseEater::KeyReleaseEater(GameList* gamelist) : gamelist{gamelist} {} // EventFilter in order to process systemkeys while editing the searchfield -bool GameList::SearchField::KeyReleaseEater::eventFilter(QObject* obj, QEvent* event) { +bool GameListSearchField::KeyReleaseEater::eventFilter(QObject* obj, QEvent* event) { // If it isn't a KeyRelease event then continue with standard event processing if (event->type() != QEvent::KeyRelease) return QObject::eventFilter(obj, event); @@ -82,7 +82,7 @@ bool GameList::SearchField::KeyReleaseEater::eventFilter(QObject* obj, QEvent* e return QObject::eventFilter(obj, event); } -void GameList::SearchField::setFilterResult(int visible, int total) { +void GameListSearchField::setFilterResult(int visible, int total) { this->visible = visible; this->total = total; @@ -116,17 +116,17 @@ QString GameList::getLastFilterResultItem() { return file_path; } -void GameList::SearchField::clear() { +void GameListSearchField::clear() { edit_filter->setText(""); } -void GameList::SearchField::setFocus() { +void GameListSearchField::setFocus() { if (edit_filter->isVisible()) { edit_filter->setFocus(); } } -GameList::SearchField::SearchField(GameList* parent) : QWidget{parent} { +GameListSearchField::GameListSearchField(GameList* parent) : QWidget{parent} { KeyReleaseEater* keyReleaseEater = new KeyReleaseEater(parent); layout_filter = new QHBoxLayout; layout_filter->setMargin(8); @@ -271,7 +271,7 @@ GameList::GameList(GMainWindow* parent) : QWidget{parent} { this->main_window = parent; layout = new QVBoxLayout; tree_view = new QTreeView; - search_field = new SearchField(this); + search_field = new GameListSearchField(this); item_model = new QStandardItemModel(tree_view); tree_view->setModel(item_model); diff --git a/src/citra_qt/game_list.h b/src/citra_qt/game_list.h index db4897189..a0d383c3e 100644 --- a/src/citra_qt/game_list.h +++ b/src/citra_qt/game_list.h @@ -12,6 +12,7 @@ class GameListWorker; class GameListDir; +class GameListSearchField; class GMainWindow; class QFileSystemWatcher; class QHBoxLayout; @@ -41,37 +42,6 @@ public: COLUMN_COUNT, // Number of columns }; - class SearchField : public QWidget { - public: - explicit SearchField(GameList* parent = nullptr); - - void setFilterResult(int visible, int total); - void clear(); - void setFocus(); - - int visible; - int total; - - private: - class KeyReleaseEater : public QObject { - public: - explicit KeyReleaseEater(GameList* gamelist); - - private: - GameList* gamelist = nullptr; - QString edit_filter_text_old; - - protected: - bool eventFilter(QObject* obj, QEvent* event) override; - }; - QHBoxLayout* layout_filter = nullptr; - QTreeView* tree_view = nullptr; - QLabel* label_filter = nullptr; - QLineEdit* edit_filter = nullptr; - QLabel* label_filter_result = nullptr; - QToolButton* button_filter_close = nullptr; - }; - explicit GameList(GMainWindow* parent = nullptr); ~GameList() override; @@ -121,7 +91,7 @@ private: void AddCustomDirPopup(QMenu& context_menu, QModelIndex selected); void AddPermDirPopup(QMenu& context_menu, QModelIndex selected); - SearchField* search_field; + GameListSearchField* search_field; GMainWindow* main_window = nullptr; QVBoxLayout* layout = nullptr; QTreeView* tree_view = nullptr; @@ -129,6 +99,8 @@ private: GameListWorker* current_worker = nullptr; QFileSystemWatcher* watcher = nullptr; std::unordered_map> compatibility_list; + + friend class GameListSearchField; }; Q_DECLARE_METATYPE(GameListOpenTarget); diff --git a/src/citra_qt/game_list_p.h b/src/citra_qt/game_list_p.h index b842c96a7..93a98fd47 100644 --- a/src/citra_qt/game_list_p.h +++ b/src/citra_qt/game_list_p.h @@ -15,6 +15,7 @@ #include #include #include +#include #include "citra_qt/ui_settings.h" #include "citra_qt/util/util.h" #include "common/file_util.h" @@ -408,3 +409,45 @@ private: void AddFstEntriesToGameList(const std::string& dir_path, unsigned int recursion, GameListDir* parent_dir); }; + +class GameList; +class QHBoxLayout; +class QTreeView; +class QLabel; +class QLineEdit; +class QToolButton; + +class GameListSearchField : public QWidget { + Q_OBJECT + +public: + explicit GameListSearchField(GameList* parent = nullptr); + + void setFilterResult(int visible, int total); + + void clear(); + void setFocus(); + + int visible; + int total; + +private: + class KeyReleaseEater : public QObject { + public: + explicit KeyReleaseEater(GameList* gamelist); + + private: + GameList* gamelist = nullptr; + QString edit_filter_text_old; + + protected: + // EventFilter in order to process systemkeys while editing the searchfield + bool eventFilter(QObject* obj, QEvent* event) override; + }; + QHBoxLayout* layout_filter = nullptr; + QTreeView* tree_view = nullptr; + QLabel* label_filter = nullptr; + QLineEdit* edit_filter = nullptr; + QLabel* label_filter_result = nullptr; + QToolButton* button_filter_close = nullptr; +};