ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5500 from ligfx/qtfixsorting 

Qt: fixes to GameList sorting
This commit is contained in:
Leo Lam 2017-06-03 12:46:17 +02:00 committed by GitHub
parent 3443454ba2 1a7210aa74
commit 1a983bd357
2 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinQt2/GameList/GameList.cpp
View File

@ -30,6 +30,8 @@ GameList::GameList(QWidget* parent) : QStackedWidget(parent)
{
m_model = new GameListModel(this);
m_table_proxy = new QSortFilterProxyModel(this);
m_table_proxy->setSortCaseSensitivity(Qt::CaseInsensitive);
m_table_proxy->setSortRole(Qt::InitialSortOrderRole);
m_table_proxy->setSourceModel(m_model);
m_list_proxy = new ListProxyModel(this);
m_list_proxy->setSourceModel(m_model);

57
Source/Core/DolphinQt2/GameList/GameListModel.cpp
View File

@ -21,17 +21,30 @@ QVariant GameListModel::data(const QModelIndex& index, int role) const
return QVariant();
QSharedPointer<GameFile> game = m_games[index.row()];
if (role == Qt::DecorationRole)
switch (index.column())
{
switch (index.column())
{
case COL_PLATFORM:
case COL_PLATFORM:
if (role == Qt::DecorationRole)
return Resources::GetPlatform(static_cast<int>(game->GetPlatformID()));
case COL_COUNTRY:
if (role == Qt::InitialSortOrderRole)
return static_cast<int>(game->GetPlatformID());
break;
case COL_COUNTRY:
if (role == Qt::DecorationRole)
return Resources::GetCountry(static_cast<int>(game->GetCountryID()));
case COL_RATING:
if (role == Qt::InitialSortOrderRole)
return static_cast<int>(game->GetCountryID());
break;
case COL_RATING:
if (role == Qt::DecorationRole)
return Resources::GetRating(game->GetRating());
case COL_BANNER:
if (role == Qt::InitialSortOrderRole)
return game->GetRating();
break;
case COL_BANNER:
if (role == Qt::DecorationRole)
{
// GameCube banners are 96x32, but Wii banners are 192x64.
// TODO: use custom banners from rom directory like DolphinWX?
QPixmap banner = game->GetBanner();
@ -39,23 +52,31 @@ QVariant GameListModel::data(const QModelIndex& index, int role) const
banner.height() / GAMECUBE_BANNER_SIZE.height()));
return banner;
}
}
if (role == Qt::DisplayRole)
{
switch (index.column())
{
case COL_TITLE:
break;
case COL_TITLE:
if (role == Qt::DisplayRole || role == Qt::InitialSortOrderRole)
return game->GetLongName();
case COL_ID:
break;
case COL_ID:
if (role == Qt::DisplayRole || role == Qt::InitialSortOrderRole)
return game->GetGameID();
case COL_DESCRIPTION:
break;
case COL_DESCRIPTION:
if (role == Qt::DisplayRole || role == Qt::InitialSortOrderRole)
return game->GetDescription();
case COL_MAKER:
break;
case COL_MAKER:
if (role == Qt::DisplayRole || role == Qt::InitialSortOrderRole)
return game->GetMaker();
case COL_SIZE:
break;
case COL_SIZE:
if (role == Qt::DisplayRole)
return FormatSize(game->GetFileSize());
}
if (role == Qt::InitialSortOrderRole)
return game->GetFileSize();
break;
}
return QVariant();
}