jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-10 00:04:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/master' into show-password-games-by-default

Browse source
This commit is contained in:
Gavin Bises 2015-02-05 21:46:29 -05:00
commit 86b92a25de
21 changed files with 216 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/gamesmodel.cpp
View file

@ -298,7 +298,6 @@ void GamesProxyModel::loadFilterParameters(const QMap<int, QString> &allGameType
unavailableGamesVisible = settings.value("unavailable_games_visible", false).toBool();
passwordProtectedGamesHidden = settings.value("password_protected_games_hidden", false).toBool();
gameNameFilter = settings.value("game_name_filter", "").toString();
creatorNameFilter = settings.value("creator_name_filter", "").toString();
maxPlayersFilterMin = settings.value("min_players", 1).toInt();
maxPlayersFilterMax = settings.value("max_players", DEFAULT_MAX_PLAYERS_MAX).toInt();
@ -324,8 +323,7 @@ void GamesProxyModel::saveFilterParameters(const QMap<int, QString> &allGameType
passwordProtectedGamesHidden
);
settings.setValue("game_name_filter", gameNameFilter);
settings.setValue("creator_name_filter", creatorNameFilter);
QMapIterator<int, QString> gameTypeIterator(allGameTypes);
while (gameTypeIterator.hasNext()) {
gameTypeIterator.next();