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

- Renamed the "Display Color Identity" option to "Display Current Color Info" (to avoid confusion because color identity is actually not the same as the sum of current colors of the card, e.g. a Forest should has a green identity because it produces green mane but it's a colorless card nonetheless). Internal functions and variables related to this code is also renamed accordingly to avoid confusion.

Browse Source
This commit is contained in:
Agetian
2015-06-08 11:30:41 +00:00
parent 72158229f0
commit 1c55a00304
6 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java
View File

@@ -300,10 +300,10 @@ public enum CSubmenuPreferences implements ICDoc {
}
private void initializeColorIdentityCombobox() {
final String[] elems = {ForgeConstants.DISP_COLOR_IDENT_NEVER, ForgeConstants.DISP_COLOR_IDENT_CHANGED,
ForgeConstants.DISP_COLOR_IDENT_MULTICOLOR, ForgeConstants.DISP_COLOR_IDENT_MULTI_OR_CHANGED,
ForgeConstants.DISP_COLOR_IDENT_ALWAYS};
final FPref userSetting = FPref.UI_DISPLAY_COLOR_IDENTITY;
final String[] elems = {ForgeConstants.DISP_CURRENT_COLORS_NEVER, ForgeConstants.DISP_CURRENT_COLORS_CHANGED,
ForgeConstants.DISP_CURRENT_COLORS_MULTICOLOR, ForgeConstants.DISP_CURRENT_COLORS_MULTI_OR_CHANGED,
ForgeConstants.DISP_CURRENT_COLORS_ALWAYS};
final FPref userSetting = FPref.UI_DISPLAY_CURRENT_COLORS;
final FComboBoxPanel<String> panel = this.view.getDisplayColorIdentity();
final FComboBox<String> comboBox = createComboBox(elems, userSetting);
final String selectedItem = this.prefs.getPref(userSetting);

8
forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java
View File

@@ -89,7 +89,7 @@ public enum VSubmenuPreferences implements IVSubmenu<CSubmenuPreferences> {
private final FComboBoxPanel<GameLogEntryType> cbpGameLogEntryType = new FComboBoxPanel<>("Game Log Verbosity:");
private final FComboBoxPanel<CloseAction> cbpCloseAction = new FComboBoxPanel<>("Close Action:");
private final FComboBoxPanel<String> cbpAiProfiles = new FComboBoxPanel<>("AI Personality:");
private final FComboBoxPanel<String> cbpDisplayColorIdentity = new FComboBoxPanel<>("Display Color Identity:");
private final FComboBoxPanel<String> cbpDisplayCurrentCardColors = new FComboBoxPanel<>("Display Card Color Info:");
/**
* Constructor.
@@ -225,8 +225,8 @@ public enum VSubmenuPreferences implements IVSubmenu<CSubmenuPreferences> {
pnlPrefs.add(cbStackCreatures, regularConstraints);
pnlPrefs.add(new NoteLabel("Stacks identical creatures on the battlefield like lands, artifacts, and enchantments."), regularConstraints);
pnlPrefs.add(cbpDisplayColorIdentity, "w 80%!, gap 10% 0 0 10px, span 2 1");
pnlPrefs.add(new NoteLabel("Displays the color identity of cards in the card detail information panel."), regularConstraints);
pnlPrefs.add(cbpDisplayCurrentCardColors, "w 80%!, gap 10% 0 0 10px, span 2 1");
pnlPrefs.add(new NoteLabel("Displays the current color of cards in the card detail information panel."), regularConstraints);
// Sound options
pnlPrefs.add(new SectionLabel("Sound Options"), sectionConstraints + ", gaptop 2%");
@@ -499,7 +499,7 @@ public enum VSubmenuPreferences implements IVSubmenu<CSubmenuPreferences> {
}
public FComboBoxPanel<String> getDisplayColorIdentity() {
return cbpDisplayColorIdentity;
return cbpDisplayCurrentCardColors;
}
public FComboBoxPanel<CloseAction> getCloseActionComboBoxPanel() {