From be9e5ef95dce4459b8cf02a7039ecf1571f41b0d Mon Sep 17 00:00:00 2001 From: Agetian Date: Mon, 1 Jun 2015 20:25:21 +0000 Subject: [PATCH] - String constants for the Display Color Identity setting. --- .../forge/screens/home/settings/CSubmenuPreferences.java | 2 +- .../src/forge/screens/settings/SettingsPage.java | 3 ++- .../src/main/java/forge/properties/ForgeConstants.java | 6 ++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java index d0165c03a77..0b3573a58e2 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java @@ -300,7 +300,7 @@ public enum CSubmenuPreferences implements ICDoc { } private void initializeColorIdentityCombobox() { - final String[] elems = {"Never", "Only Multicolor", "Always"}; + final String[] elems = {ForgeConstants.DISP_COLOR_IDENT_NEVER, ForgeConstants.DISP_COLOR_IDENT_MULTICOLOR, ForgeConstants.DISP_COLOR_IDENT_ALWAYS}; final FPref userSetting = FPref.UI_DISPLAY_COLOR_IDENTITY; final FComboBoxPanel panel = this.view.getDisplayColorIdentity(); final FComboBox comboBox = createComboBox(elems, userSetting); diff --git a/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java b/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java index 0efe4315dcd..cbb4372fc45 100644 --- a/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java +++ b/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java @@ -10,6 +10,7 @@ import forge.assets.FSkinFont; import forge.assets.FSkinImage; import forge.game.GameLogEntryType; import forge.model.FModel; +import forge.properties.ForgeConstants; import forge.properties.ForgePreferences; import forge.properties.ForgePreferences.FPref; import forge.screens.FScreen; @@ -165,7 +166,7 @@ public class SettingsPage extends TabPage { lstSettings.addItem(new CustomSelectSetting(FPref.UI_DISPLAY_COLOR_IDENTITY, "Display Color Identity", "Displays the color identity of cards in the card detail information panel.", - new String[]{"Never", "Only Multicolor", "Always"}), + new String[]{ForgeConstants.DISP_COLOR_IDENT_NEVER, ForgeConstants.DISP_COLOR_IDENT_MULTICOLOR, ForgeConstants.DISP_COLOR_IDENT_ALWAYS}), 4); //Card Overlays diff --git a/forge-gui/src/main/java/forge/properties/ForgeConstants.java b/forge-gui/src/main/java/forge/properties/ForgeConstants.java index 2ab1b1e072c..02a6788a229 100644 --- a/forge-gui/src/main/java/forge/properties/ForgeConstants.java +++ b/forge-gui/src/main/java/forge/properties/ForgeConstants.java @@ -177,4 +177,10 @@ public final class ForgeConstants { private static final String URL_CARDFORGE = "http://downloads.cardforge.link"; public static final String URL_PIC_DOWNLOAD = URL_CARDFORGE + "/images/cards/"; public static final String URL_PRICE_DOWNLOAD = "http://www.cardforge.org/MagicInfo/pricegen.php"; + + // Constants for Display Card Identity game setting + public static final String DISP_COLOR_IDENT_ALWAYS = "Always"; + public static final String DISP_COLOR_IDENT_MULTICOLOR = "Only Multicolor"; + public static final String DISP_COLOR_IDENT_NEVER = "Never"; + }