N-archive/citra
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #4956 from vitor-k/game-sorting

Browse source 
Fixes to game list sorting
This commit is contained in:
James Rowe 2019-11-20 09:48:08 -07:00 committed by GitHub
parent e6c7f84dc6 cc9bcf3e48
commit 15ed600c91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/citra_qt/game_list.cpp
View file

@ -301,7 +301,7 @@ GameList::GameList(GMainWindow* parent) : QWidget{parent} {
item_model->setHeaderData(COLUMN_REGION, Qt::Horizontal, tr("Region")); item_model->setHeaderData(COLUMN_REGION, Qt::Horizontal, tr("Region"));
item_model->setHeaderData(COLUMN_FILE_TYPE, Qt::Horizontal, tr("File type")); item_model->setHeaderData(COLUMN_FILE_TYPE, Qt::Horizontal, tr("File type"));
item_model->setHeaderData(COLUMN_SIZE, Qt::Horizontal, tr("Size")); item_model->setHeaderData(COLUMN_SIZE, Qt::Horizontal, tr("Size"));
item_model->setSortRole(GameListItemPath::TitleRole); item_model->setSortRole(GameListItemPath::SortRole);
connect(main_window, &GMainWindow::UpdateThemedIcons, this, &GameList::onUpdateThemedIcons); connect(main_window, &GMainWindow::UpdateThemedIcons, this, &GameList::onUpdateThemedIcons);
connect(tree_view, &QTreeView::activated, this, &GameList::ValidateEntry); connect(tree_view, &QTreeView::activated, this, &GameList::ValidateEntry);
@ -426,6 +426,8 @@ void GameList::DonePopulating(QStringList watch_list) {
if (children_total > 0) { if (children_total > 0) {
search_field->setFocus(); search_field->setFocus();
} }
item_model->sort(tree_view->header()->sortIndicatorSection(),
tree_view->header()->sortIndicatorOrder());
emit PopulatingCompleted(); emit PopulatingCompleted();
} }
@ -675,8 +677,6 @@ void GameList::LoadInterfaceLayout() {
// so make it as large as possible as default. // so make it as large as possible as default.
header->resizeSection(COLUMN_NAME, header->width()); header->resizeSection(COLUMN_NAME, header->width());
} }
item_model->sort(header->sortIndicatorSection(), header->sortIndicatorOrder());
} }
const QStringList GameList::supported_file_extensions = { const QStringList GameList::supported_file_extensions = {

26
src/citra_qt/game_list_p.h
View file

@ -146,11 +146,11 @@ static const std::unordered_map<UISettings::GameListIconSize, int> IconSizes{
*/ */
class GameListItemPath : public GameListItem { class GameListItemPath : public GameListItem {
public: public:
static const int TitleRole = SortRole; static const int TitleRole = SortRole + 1;
static const int FullPathRole = SortRole + 1; static const int FullPathRole = SortRole + 2;
static const int ProgramIdRole = SortRole + 2; static const int ProgramIdRole = SortRole + 3;
static const int ExtdataIdRole = SortRole + 3; static const int ExtdataIdRole = SortRole + 4;
static const int LongTitleRole = SortRole + 4; static const int LongTitleRole = SortRole + 5;
GameListItemPath() = default; GameListItemPath() = default;
GameListItemPath(const QString& game_path, const std::vector<u8>& smdh_data, u64 program_id, GameListItemPath(const QString& game_path, const std::vector<u8>& smdh_data, u64 program_id,
@ -196,7 +196,7 @@ public:
} }
QVariant data(int role) const override { QVariant data(int role) const override {
if (role == Qt::DisplayRole) { if (role == Qt::DisplayRole || role == SortRole) {
std::string path, filename, extension; std::string path, filename, extension;
Common::SplitPath(data(FullPathRole).toString().toStdString(), &path, &filename, Common::SplitPath(data(FullPathRole).toString().toStdString(), &path, &filename,
&extension); &extension);
@ -212,6 +212,9 @@ public:
const QString& row1 = display_texts.at(UISettings::values.game_list_row_1).simplified(); const QString& row1 = display_texts.at(UISettings::values.game_list_row_1).simplified();
if (role == SortRole)
return row1.toLower();
QString row2; QString row2;
auto row_2_id = UISettings::values.game_list_row_2; auto row_2_id = UISettings::values.game_list_row_2;
if (row_2_id != UISettings::GameListText::NoText) { if (row_2_id != UISettings::GameListText::NoText) {
@ -377,6 +380,13 @@ public:
return static_cast<int>(dir_type); return static_cast<int>(dir_type);
} }
/**
* Override to prevent automatic sorting.
*/
bool operator<(const QStandardItem& other) const override {
return false;
}
private: private:
GameListItemType dir_type; GameListItemType dir_type;
}; };
@ -394,6 +404,10 @@ public:
int type() const override { int type() const override {
return static_cast<int>(GameListItemType::AddDir); return static_cast<int>(GameListItemType::AddDir);
} }
bool operator<(const QStandardItem& other) const override {
return false;
}
}; };
class GameList; class GameList;