external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'DefaultFiltersOption' into 'master'

Browse Source 
Default filters option

See merge request core-developers/forge!175
This commit is contained in:
Sol
2018-02-16 01:00:20 +00:00
parent 2dcf4b23b7 59612c45ea
commit cc664d1280
3 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-gui-desktop/src/main/java/forge/itemmanager/CardManager.java
View File

@@ -6,6 +6,7 @@ import forge.item.PaperCard;
import forge.itemmanager.filters.*; import forge.itemmanager.filters.*;
import forge.model.FModel; import forge.model.FModel;
import forge.quest.QuestWorld; import forge.quest.QuestWorld;
import forge.quest.data.QuestPreferences;
import forge.screens.home.quest.DialogChooseSets; import forge.screens.home.quest.DialogChooseSets;
import forge.screens.match.controllers.CDetailPicture; import forge.screens.match.controllers.CDetailPicture;
@@ -63,6 +64,14 @@ public class CardManager extends ItemManager<PaperCard> {
itemManager.addFilter(new CardColorFilter(itemManager)); itemManager.addFilter(new CardColorFilter(itemManager));
itemManager.addFilter(new CardTypeFilter(itemManager)); itemManager.addFilter(new CardTypeFilter(itemManager));
itemManager.addFilter(new CardCMCFilter(itemManager)); itemManager.addFilter(new CardCMCFilter(itemManager));
if (FModel.getQuestPreferences()
.getPrefInt(QuestPreferences.QPref.FOIL_FILTER_DEFAULT) == 1) {
itemManager.addFilter(new CardFoilFilter(itemManager));
}
if (FModel.getQuestPreferences()
.getPrefInt(QuestPreferences.QPref.RATING_FILTER_DEFAULT) == 1) {
itemManager.addFilter(new CardRatingFilter(itemManager));
}
} }
public static ItemFilter<PaperCard> createSearchFilter(final ItemManager<? super PaperCard> itemManager) { public static ItemFilter<PaperCard> createSearchFilter(final ItemManager<? super PaperCard> itemManager) {

6
forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestPrefs.java
View File

@@ -448,6 +448,12 @@ public enum VSubmenuQuestPrefs implements IVSubmenu<CSubmenuQuestPrefs> {
pnlShop.add(new FLabel.Builder().text("Item Level Restriction").fontAlign(SwingConstants.RIGHT).build(), labelConstraints); pnlShop.add(new FLabel.Builder().text("Item Level Restriction").fontAlign(SwingConstants.RIGHT).build(), labelConstraints);
pnlShop.add(new PrefInput(QPref.ITEM_LEVEL_RESTRICTION, QuestPreferencesErrType.SHOP), fieldConstraints); pnlShop.add(new PrefInput(QPref.ITEM_LEVEL_RESTRICTION, QuestPreferencesErrType.SHOP), fieldConstraints);
pnlShop.add(new FLabel.Builder().text("Foil filter Always On").fontAlign(SwingConstants.RIGHT).build(), labelConstraints);
pnlShop.add(new PrefInput(QPref.FOIL_FILTER_DEFAULT, QuestPreferencesErrType.SHOP), fieldConstraints);
pnlShop.add(new FLabel.Builder().text("Ratings filter Always On").fontAlign(SwingConstants.RIGHT).build(), labelConstraints);
pnlShop.add(new PrefInput(QPref.RATING_FILTER_DEFAULT, QuestPreferencesErrType.SHOP), fieldConstraints);
} }
private void populateDraftTournaments() { private void populateDraftTournaments() {

6
forge-gui/src/main/java/forge/quest/data/QuestPreferences.java
View File

@@ -182,7 +182,9 @@ public class QuestPreferences extends PreferencesStore<QuestPreferences.QPref> i
ITEM_LEVEL_RESTRICTION("1"), ITEM_LEVEL_RESTRICTION("1"),
SIMULATE_AI_VS_AI_RESULTS("0"), SIMULATE_AI_VS_AI_RESULTS("0"),
DRAFT_ROTATION("0"); DRAFT_ROTATION("0"),
FOIL_FILTER_DEFAULT("0"),
RATING_FILTER_DEFAULT("1");
private final String strDefaultVal; private final String strDefaultVal;
@@ -287,6 +289,8 @@ public class QuestPreferences extends PreferencesStore<QuestPreferences.QPref> i
break; break;
case DRAFT_ROTATION: case DRAFT_ROTATION:
case SPECIAL_BOOSTERS: case SPECIAL_BOOSTERS:
case FOIL_FILTER_DEFAULT:
case RATING_FILTER_DEFAULT:
case ITEM_LEVEL_RESTRICTION: case ITEM_LEVEL_RESTRICTION:
if (val != 0 && val != 1) { if (val != 0 && val != 1) {
return "Only values 0 or 1 are acceptable; 1 for enabled, 0 for disabled."; return "Only values 0 or 1 are acceptable; 1 for enabled, 0 for disabled.";