From 15bf66b6656ff4d1436b53672bb012afd2716a38 Mon Sep 17 00:00:00 2001 From: David Lewis Date: Fri, 4 Aug 2017 13:04:07 -0700 Subject: [PATCH 1/2] Add Preference option to show region naming dialog --- data/base/client-options.xml | 3 +++ data/strings/FreeColMessages.properties | 2 ++ src/net/sf/freecol/client/ClientOptions.java | 3 +++ .../client/control/InGameController.java | 17 +++++++++++------ 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/data/base/client-options.xml b/data/base/client-options.xml index 7a0106b91..2c0929400 100644 --- a/data/base/client-options.xml +++ b/data/base/client-options.xml @@ -210,6 +210,9 @@ + + diff --git a/data/strings/FreeColMessages.properties b/data/strings/FreeColMessages.properties index 959f6d4bb..46f2a2724 100644 --- a/data/strings/FreeColMessages.properties +++ b/data/strings/FreeColMessages.properties @@ -1125,6 +1125,8 @@ model.option.guiShowPreCombat.name=Pre-combat analysis model.option.guiShowPreCombat.shortDescription=Determines whether to show the pre-combat analysis. model.option.guiShowNotBestTile.name=Not best tile model.option.guiShowNotBestTile.shortDescription=Determines whether to warn about units not working on the best available tile. +model.option.guiShowRegionNaming.name=Region naming +model.option.guiShowRegionNaming.shortDescription=Display the Region Naming Dialog while exploring. model.option.colonyReport.name=Colony Report model.option.colonyReport.shortDescription=A summary of activity in each colony. clientOptions.messages.colonyReport.classic.name=Classic diff --git a/src/net/sf/freecol/client/ClientOptions.java b/src/net/sf/freecol/client/ClientOptions.java index 254b5b5e5..db6f204e4 100644 --- a/src/net/sf/freecol/client/ClientOptions.java +++ b/src/net/sf/freecol/client/ClientOptions.java @@ -289,6 +289,9 @@ public class ClientOptions extends OptionGroup { public static final String SHOW_NOT_BEST_TILE = "model.option.guiShowNotBestTile"; + public static final String SHOW_REGION_NAMING + = "model.option.guiShowRegionNaming"; + /** Option for selecting the compact colony report. */ public static final String COLONY_REPORT = "model.option.colonyReport"; diff --git a/src/net/sf/freecol/client/control/InGameController.java b/src/net/sf/freecol/client/control/InGameController.java index 6a2aef5e9..6f63efc95 100644 --- a/src/net/sf/freecol/client/control/InGameController.java +++ b/src/net/sf/freecol/client/control/InGameController.java @@ -4164,12 +4164,17 @@ public final class InGameController extends FreeColClientHolder { } newRegionName(region, tile, unit, name); } else { - getGUI().showNamingDialog(StringTemplate - .template("nameRegion.text") - .addStringTemplate("%type%", region.getLabel()), - name, unit, - (String n) -> newRegionName(region, tile, unit, - (n == null || n.isEmpty()) ? name : n)); + if (getClientOptions().getBoolean(ClientOptions.SHOW_REGION_NAMING)) { + getGUI().showNamingDialog(StringTemplate + .template("nameRegion.text") + .addStringTemplate("%type%", region.getLabel()), + name, unit, + (String n) -> newRegionName(region, tile, unit, + (n == null || n.isEmpty()) ? name : n)); + } else { + newRegionName(region, tile, unit, name); + } + } }); } From 6e66bd4d90e1300d91019ef6023b6081d349957b Mon Sep 17 00:00:00 2001 From: David Lewis Date: Tue, 8 Aug 2017 11:15:30 -0700 Subject: [PATCH 2/2] Add region naming option to fixClientOptions --- src/net/sf/freecol/client/ClientOptions.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/net/sf/freecol/client/ClientOptions.java b/src/net/sf/freecol/client/ClientOptions.java index db6f204e4..eb36cedd2 100644 --- a/src/net/sf/freecol/client/ClientOptions.java +++ b/src/net/sf/freecol/client/ClientOptions.java @@ -198,11 +198,11 @@ public class ClientOptions extends OptionGroup { /** Whether to draw the fog of war on the minimap. */ public static final String MINIMAP_TOGGLE_FOG_OF_WAR = "model.option.miniMapToggleFogOfWar"; - + /** Whether to draw the borders on the minimap. */ public static final String MINIMAP_TOGGLE_BORDERS = "model.option.miniMapToggleBorders"; - + /** Style of map controls. */ public static final String MAP_CONTROLS = "model.option.mapControls"; @@ -401,7 +401,7 @@ public class ClientOptions extends OptionGroup { /** Option to autoload sentried units. */ public static final String AUTOLOAD_SENTRIES = "model.option.autoloadSentries"; - + /** Automatically end the turn when no units can be * made active. */ public static final String AUTO_END_TURN = "model.option.autoEndTurn"; @@ -690,7 +690,7 @@ public class ClientOptions extends OptionGroup { public void fixClientOptions() { // @compact 0.11.0 addBooleanOption(MINIMAP_TOGGLE_BORDERS, - "clientOptions.gui", true); + "clientOptions.gui", true); addBooleanOption(MINIMAP_TOGGLE_FOG_OF_WAR, "clientOptions.gui", true); addTextOption(AUTO_SAVE_PREFIX, @@ -727,6 +727,11 @@ public class ClientOptions extends OptionGroup { + " option", e); } // end @compat 0.11.3 + + // @compat 0.11.6 + addBooleanOption(SHOW_REGION_NAMING, + "clientOptions.messages", true); + // end @compat 0.11.6 } private void addBooleanOption(String id, String gr, boolean val) {