From a8b79fd020831f8cd25dc945db67f440aa99b2c1 Mon Sep 17 00:00:00 2001 From: Kaitlin <63179146+knitknit@users.noreply.github.com> Date: Sat, 26 Sep 2020 21:55:13 -0400 Subject: [PATCH] Fix show-buddies-only filter loading, and add handling for creator name filter storage/loading. (#4105) --- cockatrice/src/gamesmodel.cpp | 3 +++ cockatrice/src/settings/gamefilterssettings.cpp | 10 ++++++++++ cockatrice/src/settings/gamefilterssettings.h | 2 ++ 3 files changed, 15 insertions(+) diff --git a/cockatrice/src/gamesmodel.cpp b/cockatrice/src/gamesmodel.cpp index 9a87db86..3a0441bb 100644 --- a/cockatrice/src/gamesmodel.cpp +++ b/cockatrice/src/gamesmodel.cpp @@ -360,7 +360,9 @@ void GamesProxyModel::loadFilterParameters(const QMap &allGameType unavailableGamesVisible = gameFilters.isUnavailableGamesVisible(); showPasswordProtectedGames = gameFilters.isShowPasswordProtectedGames(); hideIgnoredUserGames = gameFilters.isHideIgnoredUserGames(); + showBuddiesOnlyGames = gameFilters.isShowBuddiesOnlyGames(); gameNameFilter = gameFilters.getGameNameFilter(); + creatorNameFilter = gameFilters.getCreatorNameFilter(); maxPlayersFilterMin = gameFilters.getMinPlayers(); maxPlayersFilterMax = gameFilters.getMaxPlayers(); @@ -383,6 +385,7 @@ void GamesProxyModel::saveFilterParameters(const QMap &allGameType gameFilters.setShowPasswordProtectedGames(showPasswordProtectedGames); gameFilters.setHideIgnoredUserGames(hideIgnoredUserGames); gameFilters.setGameNameFilter(gameNameFilter); + gameFilters.setCreatorNameFilter(creatorNameFilter); QMapIterator gameTypeIterator(allGameTypes); while (gameTypeIterator.hasNext()) { diff --git a/cockatrice/src/settings/gamefilterssettings.cpp b/cockatrice/src/settings/gamefilterssettings.cpp index 28515a88..58d9fab2 100644 --- a/cockatrice/src/settings/gamefilterssettings.cpp +++ b/cockatrice/src/settings/gamefilterssettings.cpp @@ -70,6 +70,16 @@ QString GameFiltersSettings::getGameNameFilter() 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) { setValue(min, "min_players", "filter_games"); diff --git a/cockatrice/src/settings/gamefilterssettings.h b/cockatrice/src/settings/gamefilterssettings.h index d4d52a0a..a24d423f 100644 --- a/cockatrice/src/settings/gamefilterssettings.h +++ b/cockatrice/src/settings/gamefilterssettings.h @@ -14,6 +14,7 @@ public: bool isShowPasswordProtectedGames(); bool isHideIgnoredUserGames(); QString getGameNameFilter(); + QString getCreatorNameFilter(); int getMinPlayers(); int getMaxPlayers(); bool isGameTypeEnabled(QString gametype); @@ -23,6 +24,7 @@ public: void setUnavailableGamesVisible(bool enabled); void setShowPasswordProtectedGames(bool show); void setGameNameFilter(QString gameName); + void setCreatorNameFilter(QString creatorName); void setMinPlayers(int min); void setMaxPlayers(int max); void setGameTypeEnabled(QString gametype, bool enabled);