Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3979 from zhaowenlan1779/filter-untranslated

Browse source 
game_list: move SearchField to game_list_p.h and fix untranslated text
This commit is contained in:
Weiyi Wang 2018-07-26 12:26:39 +03:00 • committed by GitHub
commit 7568020ea0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 54 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/citra_qt/game_list.cpp
View file

@ -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);