Filter password games consistancy

This commit is contained in:
Matt Lowe 2015-04-15 22:00:52 +02:00
parent feeaa9c9d1
commit 8938d291f8
5 changed files with 22 additions and 22 deletions

View file

@ -223,7 +223,7 @@ GamesProxyModel::GamesProxyModel(QObject *parent, ServerInfo_User *_ownUser)
: QSortFilterProxyModel(parent),
ownUser(_ownUser),
unavailableGamesVisible(false),
passwordProtectedGamesHidden(false),
showPasswordProtectedGames(true),
maxPlayersFilterMin(-1),
maxPlayersFilterMax(-1)
{
@ -237,9 +237,9 @@ void GamesProxyModel::setUnavailableGamesVisible(bool _unavailableGamesVisible)
invalidateFilter();
}
void GamesProxyModel::setPasswordProtectedGamesHidden(bool _passwordProtectedGamesHidden)
void GamesProxyModel::setShowPasswordProtectedGames(bool _showPasswordProtectedGames)
{
passwordProtectedGamesHidden = _passwordProtectedGamesHidden;
showPasswordProtectedGames = _showPasswordProtectedGames;
invalidateFilter();
}
@ -271,7 +271,7 @@ void GamesProxyModel::setMaxPlayersFilter(int _maxPlayersFilterMin, int _maxPlay
void GamesProxyModel::resetFilterParameters()
{
unavailableGamesVisible = false;
passwordProtectedGamesHidden = false;
showPasswordProtectedGames = true;
gameNameFilter = QString();
creatorNameFilter = QString();
gameTypeFilter.clear();
@ -287,7 +287,7 @@ void GamesProxyModel::loadFilterParameters(const QMap<int, QString> &allGameType
settings.beginGroup("filter_games");
unavailableGamesVisible = settings.value("unavailable_games_visible", false).toBool();
passwordProtectedGamesHidden = settings.value("password_protected_games_hidden", false).toBool();
showPasswordProtectedGames = settings.value("show_password_protected_games", true).toBool();
gameNameFilter = settings.value("game_name_filter", "").toString();
maxPlayersFilterMin = settings.value("min_players", 1).toInt();
maxPlayersFilterMax = settings.value("max_players", DEFAULT_MAX_PLAYERS_MAX).toInt();
@ -310,8 +310,8 @@ void GamesProxyModel::saveFilterParameters(const QMap<int, QString> &allGameType
settings.setValue("unavailable_games_visible", unavailableGamesVisible);
settings.setValue(
"password_protected_games_hidden",
passwordProtectedGamesHidden
"show_password_protected_games",
showPasswordProtectedGames
);
settings.setValue("game_name_filter", gameNameFilter);
@ -345,7 +345,7 @@ bool GamesProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &/*sourc
if (game.only_registered())
return false;
}
if (passwordProtectedGamesHidden && game.with_password())
if (!showPasswordProtectedGames && game.with_password())
return false;
if (!gameNameFilter.isEmpty())
if (!QString::fromStdString(game.description()).contains(gameNameFilter, Qt::CaseInsensitive))