diff --git a/forge-gui-desktop/src/main/java/forge/gui/framework/EDocID.java b/forge-gui-desktop/src/main/java/forge/gui/framework/EDocID.java index 3fd274cd0be..e6f2d7517c5 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/framework/EDocID.java +++ b/forge-gui-desktop/src/main/java/forge/gui/framework/EDocID.java @@ -68,7 +68,7 @@ public enum EDocID { HOME_GAUNTLETBUILD (VSubmenuGauntletBuild.SINGLETON_INSTANCE), HOME_GAUNTLETLOAD (VSubmenuGauntletLoad.SINGLETON_INSTANCE), HOME_GAUNTLETQUICK (VSubmenuGauntletQuick.SINGLETON_INSTANCE), - HOME_GAUNTLETCOMMANDER (VSubmenuGauntletCommander.SINGLETON_INSTANCE), + HOME_GAUNTLETCOMMANDER (VSubmenuGauntletCommanderQuick.SINGLETON_INSTANCE), HOME_GAUNTLETCONTESTS (VSubmenuGauntletContests.SINGLETON_INSTANCE), HOME_PREFERENCES (VSubmenuPreferences.SINGLETON_INSTANCE), HOME_ACHIEVEMENTS (VSubmenuAchievements.SINGLETON_INSTANCE), diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/DeckController.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/DeckController.java index 402be59e46f..67e215fe44b 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/DeckController.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/DeckController.java @@ -24,7 +24,7 @@ import forge.item.PaperCard; import forge.screens.deckeditor.menus.DeckFileMenu; import forge.screens.deckeditor.views.VCurrentDeck; import forge.screens.home.gauntlet.VSubmenuGauntletBuild; -import forge.screens.home.gauntlet.VSubmenuGauntletCommander; +import forge.screens.home.gauntlet.VSubmenuGauntletCommanderQuick; import forge.screens.home.gauntlet.VSubmenuGauntletContests; import forge.screens.home.gauntlet.VSubmenuGauntletQuick; import forge.screens.home.sanctioned.VSubmenuConstructed; @@ -358,7 +358,7 @@ public class DeckController { VSubmenuGauntletBuild.SINGLETON_INSTANCE.updateDeckPanel(); VSubmenuGauntletQuick.SINGLETON_INSTANCE.updateDeckPanel(); VSubmenuGauntletContests.SINGLETON_INSTANCE.updateDeckPanel(); - VSubmenuGauntletCommander.SINGLETON_INSTANCE.updateDeckPanel(); + VSubmenuGauntletCommanderQuick.SINGLETON_INSTANCE.updateDeckPanel(); } /** diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/VHomeUI.java b/forge-gui-desktop/src/main/java/forge/screens/home/VHomeUI.java index 9e6546d6846..f9106de5268 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/VHomeUI.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/VHomeUI.java @@ -133,7 +133,7 @@ public enum VHomeUI implements IVTopLevelUI { allSubmenus.add(VSubmenuGauntletBuild.SINGLETON_INSTANCE); allSubmenus.add(VSubmenuGauntletLoad.SINGLETON_INSTANCE); allSubmenus.add(VSubmenuGauntletContests.SINGLETON_INSTANCE); - allSubmenus.add(VSubmenuGauntletCommander.SINGLETON_INSTANCE); + allSubmenus.add(VSubmenuGauntletCommanderQuick.SINGLETON_INSTANCE); allSubmenus.add(VSubmenuPuzzleSolve.SINGLETON_INSTANCE); allSubmenus.add(VSubmenuPuzzleCreate.SINGLETON_INSTANCE); diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletCommander.java b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletCommanderQuick.java similarity index 94% rename from forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletCommander.java rename to forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletCommanderQuick.java index aca7753832f..43a122b2c7e 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletCommander.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletCommanderQuick.java @@ -21,13 +21,13 @@ import forge.player.GamePlayerUtil; * */ -public enum CSubmenuGauntletCommander implements ICDoc { +public enum CSubmenuGauntletCommanderQuick implements ICDoc { /** */ SINGLETON_INSTANCE; private final ActionListener actStartGame = arg0 -> startGame(); - private final VSubmenuGauntletCommander view = VSubmenuGauntletCommander.SINGLETON_INSTANCE; + private final VSubmenuGauntletCommanderQuick view = VSubmenuGauntletCommanderQuick.SINGLETON_INSTANCE; /* (non-Javadoc) * @see forge.gui.home.ICSubmenu#initialize() diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/VSubmenuGauntletCommander.java b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/VSubmenuGauntletCommanderQuick.java similarity index 94% rename from forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/VSubmenuGauntletCommander.java rename to forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/VSubmenuGauntletCommanderQuick.java index d1272b9daa7..7921030fb23 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/VSubmenuGauntletCommander.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/VSubmenuGauntletCommanderQuick.java @@ -31,18 +31,18 @@ import net.miginfocom.swing.MigLayout; *

(V at beginning of class name denotes a view class.) * */ -public enum VSubmenuGauntletCommander implements IVSubmenu { +public enum VSubmenuGauntletCommanderQuick implements IVSubmenu { /** */ SINGLETON_INSTANCE; final Localizer localizer = Localizer.getInstance(); // Fields used with interface IVDoc private DragCell parentCell; - private final DragTab tab = new DragTab(localizer.getMessage("lblCommanderGauntlet")); + private final DragTab tab = new DragTab(localizer.getMessage("lblQuickCommanderGauntlet")); // Other fields private final FPanel pnlOptions = new FPanel(new MigLayout("insets 0, gap 0, wrap")); private final FLabel lblTitle = new FLabel.Builder() - .text(localizer.getMessage("lblCommanderGauntletBuilder")).fontAlign(SwingConstants.CENTER) + .text(localizer.getMessage("lblQuickCommanderGauntletBuilder")).fontAlign(SwingConstants.CENTER) .opaque(true).fontSize(16).build(); private final FLabel lblDecklist = new FLabel.Builder() @@ -71,7 +71,7 @@ public enum VSubmenuGauntletCommander implements IVSubmenu() { @Override public void run(String result) { @@ -66,7 +66,7 @@ public class NewGauntletScreen extends LaunchScreen { createQuickGauntlet(); } else if(Forge.getLocalizer().getMessage("lblCustomGauntlet").equals(result)) { createCustomGauntlet(); - } else if(Forge.getLocalizer().getMessage("lblCommanderGauntlet").equals(result)) { + } else if(Forge.getLocalizer().getMessage("lblQuickCommanderGauntlet").equals(result)) { createCommandGauntlet(); } else { createGauntletContest(); diff --git a/forge-gui/res/languages/en-US.properties b/forge-gui/res/languages/en-US.properties index f1027f49a64..acfc0209070 100644 --- a/forge-gui/res/languages/en-US.properties +++ b/forge-gui/res/languages/en-US.properties @@ -1503,8 +1503,8 @@ lblGauntletText2=Configure how many opponents you wish to face and what decks or lblGauntletText3=Then, try to beat all AI opponents without losing a match. lblSelectGauntletType=Select a Gauntlet Type lblCustomGauntlet=Custom Gauntlet -lblCommanderGauntlet=Commander Gauntlet -lblCommanderGauntletBuilder=Commander Gauntlet Builder +lblQuickCommanderGauntlet=Quick EDH Gauntlet +lblQuickCommanderGauntletBuilder=Quick EDH Gauntlet Builder lblGauntletContest=Gauntlet Contest lblSelectYourDeck=Select Your Deck lblSelectDeckForOpponent=Select Deck for Opponent