aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix show-buddies-only filter loading, and add handling for creator name filter storage/loading. (#4105)

Browse source
This commit is contained in:
Kaitlin 2020-09-26 21:55:13 -04:00 committed by GitHub
parent 14fcb2e5d7
commit a8b79fd020
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cockatrice/src/gamesmodel.cpp
View file

@ -360,7 +360,9 @@ void GamesProxyModel::loadFilterParameters(const QMap<int, QString> &allGameType
unavailableGamesVisible = gameFilters.isUnavailableGamesVisible(); unavailableGamesVisible = gameFilters.isUnavailableGamesVisible();
showPasswordProtectedGames = gameFilters.isShowPasswordProtectedGames(); showPasswordProtectedGames = gameFilters.isShowPasswordProtectedGames();
hideIgnoredUserGames = gameFilters.isHideIgnoredUserGames(); hideIgnoredUserGames = gameFilters.isHideIgnoredUserGames();
showBuddiesOnlyGames = gameFilters.isShowBuddiesOnlyGames();
gameNameFilter = gameFilters.getGameNameFilter(); gameNameFilter = gameFilters.getGameNameFilter();
creatorNameFilter = gameFilters.getCreatorNameFilter();
maxPlayersFilterMin = gameFilters.getMinPlayers(); maxPlayersFilterMin = gameFilters.getMinPlayers();
maxPlayersFilterMax = gameFilters.getMaxPlayers(); maxPlayersFilterMax = gameFilters.getMaxPlayers();
@ -383,6 +385,7 @@ void GamesProxyModel::saveFilterParameters(const QMap<int, QString> &allGameType
gameFilters.setShowPasswordProtectedGames(showPasswordProtectedGames); gameFilters.setShowPasswordProtectedGames(showPasswordProtectedGames);
gameFilters.setHideIgnoredUserGames(hideIgnoredUserGames); gameFilters.setHideIgnoredUserGames(hideIgnoredUserGames);
gameFilters.setGameNameFilter(gameNameFilter); gameFilters.setGameNameFilter(gameNameFilter);
gameFilters.setCreatorNameFilter(creatorNameFilter);
QMapIterator<int, QString> gameTypeIterator(allGameTypes); QMapIterator<int, QString> gameTypeIterator(allGameTypes);
while (gameTypeIterator.hasNext()) { while (gameTypeIterator.hasNext()) {

10
cockatrice/src/settings/gamefilterssettings.cpp
View file

@ -70,6 +70,16 @@ QString GameFiltersSettings::getGameNameFilter()
return getValue("game_name_filter", "filter_games").toString(); return getValue("game_name_filter", "filter_games").toString();
} }
void GameFiltersSettings::setCreatorNameFilter(QString creatorName)
{
setValue(creatorName, "creator_name_filter", "filter_games");
}
QString GameFiltersSettings::getCreatorNameFilter()
{
return getValue("creator_name_filter", "filter_games").toString();
}
void GameFiltersSettings::setMinPlayers(int min) void GameFiltersSettings::setMinPlayers(int min)
{ {
setValue(min, "min_players", "filter_games"); setValue(min, "min_players", "filter_games");

2
cockatrice/src/settings/gamefilterssettings.h
View file

@ -14,6 +14,7 @@ public:
bool isShowPasswordProtectedGames(); bool isShowPasswordProtectedGames();
bool isHideIgnoredUserGames(); bool isHideIgnoredUserGames();
QString getGameNameFilter(); QString getGameNameFilter();
QString getCreatorNameFilter();
int getMinPlayers(); int getMinPlayers();
int getMaxPlayers(); int getMaxPlayers();
bool isGameTypeEnabled(QString gametype); bool isGameTypeEnabled(QString gametype);
@ -23,6 +24,7 @@ public:
void setUnavailableGamesVisible(bool enabled); void setUnavailableGamesVisible(bool enabled);
void setShowPasswordProtectedGames(bool show); void setShowPasswordProtectedGames(bool show);
void setGameNameFilter(QString gameName); void setGameNameFilter(QString gameName);
void setCreatorNameFilter(QString creatorName);
void setMinPlayers(int min); void setMinPlayers(int min);
void setMaxPlayers(int max); void setMaxPlayers(int max);
void setGameTypeEnabled(QString gametype, bool enabled); void setGameTypeEnabled(QString gametype, bool enabled);