jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-12 13:00:01 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Added fade to games you cant join

Browse source
This commit is contained in:
Matt Lowe 2015-02-10 00:48:05 +01:00
parent b7cb16da07
commit 79f0ed065f
4 changed files with 955 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cockatrice/src/gamesmodel.cpp
View file

@ -79,12 +79,15 @@ QVariant GamesModel::data(const QModelIndex &index, int role) const
return QVariant();
if (role == Qt::UserRole)
return index.row();
if (role != Qt::DisplayRole && role != SORT_ROLE && role != Qt::DecorationRole && role != Qt::TextAlignmentRole)
if (role != Qt::DisplayRole && role != SORT_ROLE && role != Qt::DecorationRole && role != Qt::TextAlignmentRole && role != Qt::ForegroundRole)
return QVariant();
if ((index.row() >= gameList.size()) || (index.column() >= columnCount()))
return QVariant();
const ServerInfo_Game &g = gameList[index.row()];
if (role == Qt::ForegroundRole && !isGameAvailable(g))
return QColor(130, 130, 130);
switch (index.column()) {
case ROOM:
return rooms.value(g.room_id());
@ -151,7 +154,7 @@ QVariant GamesModel::data(const QModelIndex &index, int role) const
return result.join(", ");
}
case Qt::DecorationRole:{
return g.with_password() ? QIcon(":/resources/lock.svg") : QVariant();
return g.with_password() ? QIcon(isGameAvailable(g) ? ":/resources/lock.svg" : ":/resources/faded_lock.svg") : QVariant();
case Qt::TextAlignmentRole:
return Qt::AlignLeft;
default:
@ -168,7 +171,6 @@ QVariant GamesModel::data(const QModelIndex &index, int role) const
default:
return QVariant();
}
case SPECTATORS:
switch(role) {
case SORT_ROLE:
@ -193,6 +195,10 @@ QVariant GamesModel::data(const QModelIndex &index, int role) const
}
}
bool GamesModel::isGameAvailable(const ServerInfo_Game &g) const {
return g.player_count() != g.max_players() && !g.started();
}
QVariant GamesModel::headerData(int section, Qt::Orientation orientation, int role) const
{
if ((role != Qt::DisplayRole) || (orientation != Qt::Horizontal))

1
cockatrice/src/gamesmodel.h
View file

@ -38,6 +38,7 @@ public:
int startTimeColIndex() { return 1; }
const QMap<int, GameTypeMap> &getGameTypes() { return gameTypes; }
bool isGameAvailable(const ServerInfo_Game &g) const;
};
class GamesProxyModel : public QSortFilterProxyModel {