(svn r24206) -Codechange: Move colouring of advanced setting options to the drawing code.

2 files changed, 36 insertions, 0 deletions

diff --git a/src/table/company_settings.ini b/src/table/company_settings.ini
index f01a0b18e..e19004dd4 100644
--- a/src/table/company_settings.ini
+++ b/src/table/company_settings.ini
@@ -45,6 +45,7 @@ def      = 6
 min      = -12
 max      = 12
 str      = STR_CONFIG_SETTING_AUTORENEW_MONTHS
+strval   = STR_JUST_COMMA
 
 [SDT_VAR]
 base     = CompanySettings
@@ -55,6 +56,7 @@ def      = 100000
 min      = 0
 max      = 2000000
 str      = STR_CONFIG_SETTING_AUTORENEW_MONEY
+strval   = STR_JUST_CURRENCY_LONG
 
 [SDT_BOOL]
 base     = CompanySettings
@@ -77,6 +79,7 @@ def      = 150
 min      = 5
 max      = 800
 str      = STR_CONFIG_SETTING_SERVINT_TRAINS
+strval   = STR_CONFIG_SETTING_SERVINT_VALUE
 proc     = InvalidateDetailsWindow
 
 [SDT_VAR]
@@ -88,6 +91,7 @@ def      = 150
 min      = 5
 max      = 800
 str      = STR_CONFIG_SETTING_SERVINT_ROAD_VEHICLES
+strval   = STR_CONFIG_SETTING_SERVINT_VALUE
 proc     = InvalidateDetailsWindow
 
 [SDT_VAR]
@@ -99,6 +103,7 @@ def      = 360
 min      = 5
 max      = 800
 str      = STR_CONFIG_SETTING_SERVINT_SHIPS
+strval   = STR_CONFIG_SETTING_SERVINT_VALUE
 proc     = InvalidateDetailsWindow
 
 [SDT_VAR]
@@ -110,6 +115,7 @@ def      = 100
 min      = 5
 max      = 800
 str      = STR_CONFIG_SETTING_SERVINT_AIRCRAFT
+strval   = STR_CONFIG_SETTING_SERVINT_VALUE
 proc     = InvalidateDetailsWindow
 
 [SDT_END]
diff --git a/src/table/settings.ini b/src/table/settings.ini
index 5e2c51495..d67528f2d 100644
--- a/src/table/settings.ini
+++ b/src/table/settings.ini
@@ -455,6 +455,7 @@ min      = 1
 max      = 2048
 interval = 1
 str      = STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH
+strval   = STR_CONFIG_SETTING_TILE_LENGTH
 
 [SDT_VAR]
 base     = GameSettings
@@ -467,6 +468,7 @@ min      = 1
 max      = 2048
 interval = 1
 str      = STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH
+strval   = STR_CONFIG_SETTING_TILE_LENGTH
 
 # construction.longbridges
 [SDT_NULL]
@@ -575,6 +577,7 @@ min      = 0
 max      = 10
 interval = 1
 str      = STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS
+strval   = STR_CONFIG_SETTING_PERCENTAGE
 proc     = TrainSlopeSteepnessChanged
 
 [SDT_VAR]
@@ -587,6 +590,7 @@ min      = 0
 max      = 10
 interval = 1
 str      = STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS
+strval   = STR_CONFIG_SETTING_PERCENTAGE
 proc     = RoadVehSlopeSteepnessChanged
 
 [SDT_BOOL]
@@ -605,6 +609,7 @@ min      = 1
 max      = 64
 interval = 1
 str      = STR_CONFIG_SETTING_TRAIN_LENGTH
+strval   = STR_CONFIG_SETTING_TILE_LENGTH
 
 ; vehicle.mammoth_trains
 [SDT_NULL]
@@ -718,6 +723,7 @@ def      = 500
 min      = 0
 max      = 5000
 str      = STR_CONFIG_SETTING_MAX_TRAINS
+strval   = STR_JUST_COMMA
 proc     = RedrawScreen
 
 [SDT_VAR]
@@ -728,6 +734,7 @@ def      = 500
 min      = 0
 max      = 5000
 str      = STR_CONFIG_SETTING_MAX_ROAD_VEHICLES
+strval   = STR_JUST_COMMA
 proc     = RedrawScreen
 
 [SDT_VAR]
@@ -738,6 +745,7 @@ def      = 200
 min      = 0
 max      = 5000
 str      = STR_CONFIG_SETTING_MAX_AIRCRAFT
+strval   = STR_JUST_COMMA
 proc     = RedrawScreen
 
 [SDT_VAR]
@@ -748,6 +756,7 @@ def      = 300
 min      = 0
 max      = 5000
 str      = STR_CONFIG_SETTING_MAX_SHIPS
+strval   = STR_JUST_COMMA
 proc     = RedrawScreen
 
 [SDTG_BOOL]
@@ -831,6 +840,7 @@ min      = 1
 max      = 255
 interval = 1
 str      = STR_CONFIG_SETTING_FREIGHT_TRAINS
+strval   = STR_JUST_COMMA
 proc     = UpdateConsists
 
 ; order.timetabling
@@ -849,6 +859,7 @@ def      = 4
 min      = 1
 max      = 4
 str      = STR_CONFIG_SETTING_PLANE_SPEED
+strval   = STR_CONFIG_SETTING_PLANE_SPEED_VALUE
 
 [SDT_BOOL]
 base     = GameSettings
@@ -915,6 +926,7 @@ def      = 12
 min      = 4
 max      = 64
 str      = STR_CONFIG_SETTING_STATION_SPREAD
+strval   = STR_CONFIG_SETTING_TILE_LENGTH
 proc     = InvalidateStationBuildWindow
 
 [SDT_BOOL]
@@ -1004,6 +1016,7 @@ def      = 1
 min      = 0
 max      = 4
 str      = STR_CONFIG_SETTING_INDUSTRY_PLATFORM
+strval   = STR_CONFIG_SETTING_TILE_LENGTH
 
 [SDT_BOOL]
 base     = GameSettings
@@ -1061,6 +1074,7 @@ def      = DEF_SNOWLINE_HEIGHT
 min      = MIN_SNOWLINE_HEIGHT
 max      = MAX_SNOWLINE_HEIGHT
 str      = STR_CONFIG_SETTING_SNOWLINE_HEIGHT
+strval   = STR_JUST_COMMA
 
 [SDT_NULL]
 length   = 4
@@ -1076,6 +1090,7 @@ min      = MIN_YEAR
 max      = MAX_YEAR
 interval = 1
 str      = STR_CONFIG_SETTING_STARTING_YEAR
+strval   = STR_JUST_INT
 
 [SDT_NULL]
 length   = 4
@@ -1103,6 +1118,7 @@ def      = 75
 min      = 0
 max      = 100
 str      = STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE
+strval   = STR_CONFIG_SETTING_PERCENTAGE
 
 [SDT_VAR]
 base     = GameSettings
@@ -1127,6 +1143,7 @@ min      = 0
 max      = 255
 interval = 1
 str      = STR_CONFIG_SETTING_LARGER_TOWNS
+strval   = STR_CONFIG_SETTING_LARGER_TOWNS_VALUE
 
 [SDT_VAR]
 base     = GameSettings
@@ -1138,6 +1155,7 @@ min      = 1
 max      = 10
 interval = 1
 str      = STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER
+strval   = STR_JUST_COMMA
 
 [SDT_BOOL]
 base     = GameSettings
@@ -1192,6 +1210,7 @@ min      = 5000
 max      = 250000
 interval = 2500
 str      = STR_CONFIG_SETTING_SCRIPT_MAX_OPCODES
+strval   = STR_JUST_COMMA
 
 ##
 [SDT_VAR]
@@ -1766,6 +1785,7 @@ def      = 32
 min      = 12
 max      = 48
 str      = STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE
+strval   = STR_CONFIG_SETTING_TILE_LENGTH
 
 [SDT_VAR]
 base     = GameSettings
@@ -1830,6 +1850,7 @@ def      = 1
 min      = 0
 max      = 15
 str      = STR_CONFIG_SETTING_SE_FLAT_WORLD_HEIGHT
+strval   = STR_JUST_COMMA
 
 ##
 [SDT_VAR]
@@ -2047,6 +2068,7 @@ def      = 5
 min      = 0
 max      = 20
 str      = STR_CONFIG_SETTING_ERRMSG_DURATION
+strval   = STR_CONFIG_SETTING_ERRMSG_DURATION_VALUE
 
 [SDTC_VAR]
 var      = gui.hover_delay
@@ -2057,6 +2079,7 @@ def      = 2
 min      = 1
 max      = 5
 str      = STR_CONFIG_SETTING_HOVER_DELAY
+strval   = STR_CONFIG_SETTING_HOVER_DELAY_VALUE
 
 [SDTC_VAR]
 var      = gui.toolbar_pos
@@ -2091,6 +2114,7 @@ def      = 10
 min      = 1
 max      = 32
 str      = STR_CONFIG_SETTING_SNAP_RADIUS
+strval   = STR_CONFIG_SETTING_SNAP_RADIUS_VALUE
 
 [SDTC_VAR]
 var      = gui.window_soft_limit
@@ -2102,6 +2126,7 @@ min      = 5
 max      = 255
 interval = 1
 str      = STR_CONFIG_SETTING_SOFT_LIMIT
+strval   = STR_CONFIG_SETTING_SOFT_LIMIT_VALUE
 
 [SDTC_VAR]
 var      = gui.zoom_min
@@ -2190,6 +2215,7 @@ min      = 1
 max      = 15
 interval = 1
 str      = STR_CONFIG_SETTING_SCROLLWHEEL_MULTIPLIER
+strval   = STR_JUST_COMMA
 
 [SDTC_BOOL]
 var      = gui.pause_on_newgame
@@ -2268,6 +2294,7 @@ min      = MIN_YEAR
 max      = MAX_YEAR
 interval = 1
 str      = STR_CONFIG_SETTING_COLOURED_NEWS_YEAR
+strval   = STR_JUST_INT
 
 [SDTC_VAR]
 var      = gui.drag_signals_density
@@ -2277,6 +2304,7 @@ def      = 4
 min      = 1
 max      = 20
 str      = STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY
+strval   = STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY_VALUE
 proc     = DragSignalsDensityChanged
 
 [SDTC_BOOL]
@@ -2295,6 +2323,7 @@ min      = MIN_YEAR
 max      = MAX_YEAR
 interval = 1
 str      = STR_CONFIG_SETTING_SEMAPHORE_BUILD_BEFORE_DATE
+strval   = STR_JUST_INT
 proc     = ResetSignalVariant
 
 [SDTC_BOOL]
@@ -2462,6 +2491,7 @@ def      = 3
 min      = 1
 max      = 5
 str      = STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS
+strval   = STR_JUST_COMMA
 proc     = RedrawScreen
 
 ; For the dedicated build we'll enable dates in logs by default.