summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-11-08 16:46:23 +0000
committerrubidium <rubidium@openttd.org>2009-11-08 16:46:23 +0000
commit5d3fa809317a84528af338cac7d7903250eb959b (patch)
treefdf5b22cf9ac045e307c76ec90160ba2a43bc434 /src
parent71c207048f92379b86fbb8c126e7917c761ff0ed (diff)
downloadopenttd-5d3fa809317a84528af338cac7d7903250eb959b.tar.xz
(svn r18015) -Codechange: redesign the world generation windows to make 'proper' use of nested widgets.
Diffstat (limited to 'src')
-rw-r--r--src/genworld_gui.cpp415
-rw-r--r--src/lang/afrikaans.txt3
-rw-r--r--src/lang/arabic_egypt.txt3
-rw-r--r--src/lang/brazilian_portuguese.txt3
-rw-r--r--src/lang/bulgarian.txt3
-rw-r--r--src/lang/catalan.txt3
-rw-r--r--src/lang/croatian.txt3
-rw-r--r--src/lang/czech.txt3
-rw-r--r--src/lang/danish.txt3
-rw-r--r--src/lang/dutch.txt3
-rw-r--r--src/lang/english.txt3
-rw-r--r--src/lang/english_US.txt3
-rw-r--r--src/lang/esperanto.txt3
-rw-r--r--src/lang/estonian.txt3
-rw-r--r--src/lang/finnish.txt3
-rw-r--r--src/lang/french.txt3
-rw-r--r--src/lang/galician.txt3
-rw-r--r--src/lang/german.txt3
-rw-r--r--src/lang/greek.txt3
-rw-r--r--src/lang/hebrew.txt3
-rw-r--r--src/lang/hungarian.txt3
-rw-r--r--src/lang/icelandic.txt3
-rw-r--r--src/lang/indonesian.txt3
-rw-r--r--src/lang/italian.txt3
-rw-r--r--src/lang/japanese.txt3
-rw-r--r--src/lang/korean.txt3
-rw-r--r--src/lang/latvian.txt3
-rw-r--r--src/lang/lithuanian.txt3
-rw-r--r--src/lang/luxembourgish.txt3
-rw-r--r--src/lang/norwegian_bokmal.txt3
-rw-r--r--src/lang/norwegian_nynorsk.txt3
-rw-r--r--src/lang/polish.txt3
-rw-r--r--src/lang/portuguese.txt3
-rw-r--r--src/lang/romanian.txt3
-rw-r--r--src/lang/russian.txt3
-rw-r--r--src/lang/serbian.txt3
-rw-r--r--src/lang/simplified_chinese.txt3
-rw-r--r--src/lang/slovak.txt3
-rw-r--r--src/lang/slovenian.txt3
-rw-r--r--src/lang/spanish.txt3
-rw-r--r--src/lang/swedish.txt3
-rw-r--r--src/lang/traditional_chinese.txt5
-rw-r--r--src/lang/turkish.txt3
-rw-r--r--src/lang/ukrainian.txt3
-rw-r--r--src/lang/welsh.txt3
45 files changed, 291 insertions, 258 deletions
diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp
index d4dd5f311..941e7bfec 100644
--- a/src/genworld_gui.cpp
+++ b/src/genworld_gui.cpp
@@ -95,6 +95,11 @@ enum GenerateLandscapeWindowWidgets {
GLAND_TREE_PULLDOWN,
GLAND_LANDSCAPE_TEXT,
GLAND_LANDSCAPE_PULLDOWN,
+ GLAND_HEIGHTMAP_NAME_LABEL,
+ GLAND_HEIGHTMAP_NAME_TEXT,
+ GLAND_HEIGHTMAP_NAME_SPACER,
+ GLAND_HEIGHTMAP_SIZE_LABEL,
+ GLAND_HEIGHTMAP_SIZE_TEXT,
GLAND_HEIGHTMAP_ROTATION_TEXT,
GLAND_HEIGHTMAP_ROTATION_PULLDOWN,
@@ -125,135 +130,105 @@ static const NWidgetPart _nested_generate_landscape_widgets[] = {
NWidget(WWT_PANEL, COLOUR_BROWN, GLAND_BACKGROUND),
NWidget(NWID_SPACER), SetMinimalSize(0, 10),
/* Landscape selection. */
- NWidget(NWID_HORIZONTAL), SetPIP(10, 3, 11),
- NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, GLAND_TEMPERATE), SetMinimalSize(77, 55), SetDataTip(SPR_SELECT_TEMPERATE, STR_INTRO_TOOLTIP_TEMPERATE),
- NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, GLAND_ARCTIC), SetMinimalSize(77, 55), SetDataTip(SPR_SELECT_SUB_ARCTIC, STR_INTRO_TOOLTIP_SUB_ARCTIC_LANDSCAPE),
- NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, GLAND_TROPICAL), SetMinimalSize(77, 55), SetDataTip(SPR_SELECT_SUB_TROPICAL, STR_INTRO_TOOLTIP_SUB_TROPICAL_LANDSCAPE),
- NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, GLAND_TOYLAND), SetMinimalSize(77, 55), SetDataTip(SPR_SELECT_TOYLAND, STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE),
+ NWidget(NWID_HORIZONTAL), SetPIP(10, 0, 10),
+ NWidget(NWID_SPACER), SetFill(true, false),
+ NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, GLAND_TEMPERATE), SetDataTip(SPR_SELECT_TEMPERATE, STR_INTRO_TOOLTIP_TEMPERATE),
+ NWidget(NWID_SPACER), SetFill(true, false),
+ NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, GLAND_ARCTIC), SetDataTip(SPR_SELECT_SUB_ARCTIC, STR_INTRO_TOOLTIP_SUB_ARCTIC_LANDSCAPE),
+ NWidget(NWID_SPACER), SetFill(true, false),
+ NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, GLAND_TROPICAL), SetDataTip(SPR_SELECT_SUB_TROPICAL, STR_INTRO_TOOLTIP_SUB_TROPICAL_LANDSCAPE),
+ NWidget(NWID_SPACER), SetFill(true, false),
+ NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, GLAND_TOYLAND), SetDataTip(SPR_SELECT_TOYLAND, STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE),
+ NWidget(NWID_SPACER), SetFill(true, false),
EndContainer(),
NWidget(NWID_SPACER), SetMinimalSize(0, 11),
- NWidget(NWID_HORIZONTAL),
- NWidget(NWID_SPACER), SetMinimalSize(12, 0),
- /* Left column with labels. */
- NWidget(NWID_VERTICAL),
- NWidget(NWID_SPACER), SetMinimalSize(0, 1),
- NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_MAPSIZE_X_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_MAPGEN_MAPSIZE, STR_NULL),
- NWidget(NWID_SPACER), SetMinimalSize(0, 11),
- NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_TOWN_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_MAPGEN_NUMBER_OF_TOWNS, STR_NULL),
- NWidget(NWID_SPACER), SetMinimalSize(0, 7),
- NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_INDUSTRY_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_MAPGEN_NUMBER_OF_INDUSTRIES, STR_NULL),
- NWidget(NWID_SPACER), SetMinimalSize(0, 11),
- NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_RANDOM_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_MAPGEN_RANDOM_SEED, STR_NULL),
- NWidget(NWID_SPACER), SetMinimalSize(0, 11),
- NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_LANDSCAPE_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_MAPGEN_LAND_GENERATOR, STR_NULL),
- NWidget(NWID_SPACER), SetMinimalSize(0, 7),
- NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_TREE_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_MAPGEN_TREE_PLACER, STR_NULL),
- NWidget(NWID_SPACER), SetMinimalSize(0, 7),
- NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_TERRAIN_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_MAPGEN_TERRAIN_TYPE, STR_NULL),
- NWidget(NWID_SPACER), SetMinimalSize(0, 7),
- NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_WATER_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_MAPGEN_QUANTITY_OF_SEA_LAKES, STR_NULL),
- NWidget(NWID_SPACER), SetMinimalSize(0, 7),
- NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_SMOOTHNESS_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_MAPGEN_SMOOTHNESS, STR_NULL),
- NWidget(NWID_SPACER), SetMinimalSize(0, 7),
- NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_BORDER_TYPES), SetMinimalSize(99, 11), SetDataTip(STR_MAPGEN_BORDER_TYPE, STR_NULL),
- EndContainer(),
- NWidget(NWID_SPACER), SetMinimalSize(3, 0),
- /* Widgets at the right of the labels. */
- NWidget(NWID_VERTICAL),
- /* Mapsize X * Y. */
- NWidget(NWID_HORIZONTAL),
- NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_MAPSIZE_X_PULLDOWN), SetMinimalSize(48, 12), SetDataTip(STR_JUST_INT, STR_NULL),
- NWidget(NWID_SPACER), SetMinimalSize(6, 0),
- NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_MAPSIZE_Y_TEXT), SetMinimalSize(9, 11), SetDataTip(STR_MAPGEN_BY, STR_NULL), SetPadding(1, 0, 0, 0),
- NWidget(NWID_SPACER), SetMinimalSize(3, 0),
- NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_MAPSIZE_Y_PULLDOWN), SetMinimalSize(48, 12), SetDataTip(STR_JUST_INT, STR_NULL),
- NWidget(NWID_SPACER), SetFill(true, false),
- EndContainer(),
- NWidget(NWID_SPACER), SetMinimalSize(0, 10), SetFill(true, false),
- NWidget(NWID_HORIZONTAL),
- /* Number of towns. */
- NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_TOWN_PULLDOWN), SetMinimalSize(62, 12), SetDataTip(STR_JUST_STRING, STR_NULL),
- NWidget(NWID_SPACER), SetMinimalSize(6, 0),
- /* Starting date. */
- NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_START_DATE_TEXT1), SetMinimalSize(31, 11), SetDataTip(STR_MAPGEN_DATE, STR_NULL), SetPadding(1, 0, 0, 0),
- NWidget(NWID_SPACER), SetMinimalSize(3, 0),
- NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_START_DATE_DOWN), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_DOWN, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD),
- NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_START_DATE_TEXT), SetMinimalSize(87, 12), SetDataTip(STR_BLACK_DATE_LONG, STR_NULL),
- NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_START_DATE_UP), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_UP, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD),
- NWidget(NWID_SPACER), SetFill(true, false),
+ NWidget(NWID_HORIZONTAL), SetPIP(10, 5, 10),
+ NWidget(NWID_HORIZONTAL), SetPIP(0, 3, 0),
+ /* Left column with labels. */
+ NWidget(NWID_VERTICAL, NC_EQUALSIZE), SetPIP(0, 4, 0),
+ NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_MAPSIZE_X_TEXT), SetDataTip(STR_MAPGEN_MAPSIZE, STR_NULL), SetFill(true, true),
+ NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_LANDSCAPE_TEXT), SetDataTip(STR_MAPGEN_LAND_GENERATOR, STR_NULL), SetFill(true, true),
+ NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_TOWN_TEXT), SetDataTip(STR_MAPGEN_NUMBER_OF_TOWNS, STR_NULL), SetFill(true, true),
+ NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_TERRAIN_TEXT), SetDataTip(STR_MAPGEN_TERRAIN_TYPE, STR_NULL), SetFill(true, true),
+ NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_RANDOM_TEXT), SetDataTip(STR_MAPGEN_RANDOM_SEED, STR_NULL), SetFill(true, true),
+ NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_WATER_TEXT), SetDataTip(STR_MAPGEN_QUANTITY_OF_SEA_LAKES, STR_NULL), SetFill(true, true),
+ NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_TREE_TEXT), SetDataTip(STR_MAPGEN_TREE_PLACER, STR_NULL), SetFill(true, true),
+ NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_BORDER_TYPES), SetDataTip(STR_MAPGEN_BORDER_TYPE, STR_NULL), SetFill(true, true),
EndContainer(),
- NWidget(NWID_SPACER), SetMinimalSize(0, 6), SetFill(true, false),
- NWidget(NWID_HORIZONTAL),
- /* Number of industries. */
- NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_INDUSTRY_PULLDOWN), SetMinimalSize(62, 12), SetDataTip(STR_JUST_STRING, STR_JUST_STRING),
- NWidget(NWID_SPACER), SetMinimalSize(6, 0),
- /* Snow line. */
- NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_SNOW_LEVEL_TEXT1), SetMinimalSize(97, 11),
- SetDataTip(STR_MAPGEN_SNOW_LINE_HEIGHT, STR_NULL), SetPadding(1, 0, 0, 0),
- NWidget(NWID_SPACER), SetMinimalSize(3, 0),
- NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_DOWN), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_DOWN, STR_MAPGEN_SNOW_LINE_DOWN),
- NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_TEXT), SetMinimalSize(21, 12), SetDataTip(STR_BLACK_INT, STR_NULL),
- NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_UP), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_UP, STR_MAPGEN_SNOW_LINE_UP),
- NWidget(NWID_SPACER), SetFill(true, false),
- EndContainer(),
- NWidget(NWID_SPACER), SetMinimalSize(0, 10), SetFill(true, false),
- NWidget(NWID_HORIZONTAL),
- /* Edit box for seed. */
- NWidget(WWT_EDITBOX, COLOUR_WHITE, GLAND_RANDOM_EDITBOX), SetMinimalSize(94, 12), SetDataTip(STR_MAPGEN_RANDOM_SEED_OSKTITLE, STR_MAPGEN_RANDOM_SEED_HELP),
- NWidget(NWID_SPACER), SetMinimalSize(8, 0),
- NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_RANDOM_BUTTON), SetMinimalSize(111, 12), SetDataTip(STR_MAPGEN_RANDOM, STR_MAPGEN_RANDOM_HELP),
- NWidget(NWID_SPACER), SetFill(true, false),
+ /* Widgets at the right of the labels. */
+ NWidget(NWID_VERTICAL, NC_EQUALSIZE), SetPIP(0, 4, 0),
+ /* Mapsize X * Y. */
+ NWidget(NWID_HORIZONTAL), SetPIP(0, 4, 0),
+ NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_MAPSIZE_X_PULLDOWN), SetDataTip(STR_JUST_INT, STR_NULL), SetFill(true, false),
+ NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_MAPSIZE_Y_TEXT), SetDataTip(STR_MAPGEN_BY, STR_NULL), SetPadding(1, 0, 0, 0), SetFill(true, true),
+ NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_MAPSIZE_Y_PULLDOWN), SetDataTip(STR_JUST_INT, STR_NULL), SetFill(true, false),
+ EndContainer(),
+ NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_LANDSCAPE_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(true, false),
+ NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_TOWN_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(true, false),
+ NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_TERRAIN_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(true, false),
+ NWidget(WWT_EDITBOX, COLOUR_WHITE, GLAND_RANDOM_EDITBOX), SetDataTip(STR_MAPGEN_RANDOM_SEED_OSKTITLE, STR_MAPGEN_RANDOM_SEED_HELP), SetFill(true, true),
+ NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_WATER_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(true, false),
+ NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_TREE_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(true, false),
+ NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, GLAND_BORDERS_RANDOM), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(true, false),
EndContainer(),
- NWidget(NWID_HORIZONTAL),
- NWidget(NWID_VERTICAL),
- NWidget(NWID_SPACER), SetMinimalSize(0, 10),
- /* Dropdown buttons. */
- NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_LANDSCAPE_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetMinimalSize(118, 12),
- NWidget(NWID_SPACER), SetMinimalSize(0, 6),
- NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_TREE_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetMinimalSize(118, 12),
- NWidget(NWID_SPACER), SetMinimalSize(0, 6),
- NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_TERRAIN_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetMinimalSize(118, 12),
- NWidget(NWID_SPACER), SetMinimalSize(0, 6),
- NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_WATER_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetMinimalSize(118, 12),
- NWidget(NWID_SPACER), SetMinimalSize(0, 6),
- NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_SMOOTHNESS_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetMinimalSize(118, 12),
- NWidget(NWID_SPACER), SetMinimalSize(0, 6),
- NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, GLAND_BORDERS_RANDOM), SetDataTip(STR_JUST_STRING, STR_NULL), SetMinimalSize(118, 12), SetDataTip(STR_MAPGEN_BORDER_RANDOMIZE, STR_NULL),
+ EndContainer(),
+ NWidget(NWID_VERTICAL), SetPIP(0, 4, 0),
+ NWidget(NWID_HORIZONTAL), SetPIP(0, 3, 0),
+ NWidget(NWID_VERTICAL, NC_EQUALSIZE), SetPIP(0, 4, 0),
+ NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_START_DATE_TEXT1), SetDataTip(STR_MAPGEN_DATE, STR_NULL), SetFill(true, true),
+ NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_SNOW_LEVEL_TEXT1), SetDataTip(STR_MAPGEN_SNOW_LINE_HEIGHT, STR_NULL), SetFill(true, true),
+ NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_INDUSTRY_TEXT), SetDataTip(STR_MAPGEN_NUMBER_OF_INDUSTRIES, STR_NULL), SetFill(true, true),
+ NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_SMOOTHNESS_TEXT), SetDataTip(STR_MAPGEN_SMOOTHNESS, STR_NULL), SetFill(true, true),
EndContainer(),
- NWidget(NWID_VERTICAL),
- NWidget(WWT_TEXTBTN, COLOUR_GREEN, GLAND_GENERATE_BUTTON), SetMinimalSize(84,30),
- SetDataTip(STR_MAPGEN_GENERATE, STR_NULL), SetPadding(64, 0, 0, 11),
- NWidget(NWID_SPACER), SetFill(false, true),
+ NWidget(NWID_VERTICAL, NC_EQUALSIZE), SetPIP(0, 4, 0),
+ /* Starting date. */
+ NWidget(NWID_HORIZONTAL),
+ NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_START_DATE_DOWN), SetDataTip(SPR_ARROW_DOWN, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD), SetFill(false, true),
+ NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_START_DATE_TEXT), SetDataTip(STR_BLACK_DATE_LONG, STR_NULL), SetFill(true, false),
+ NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_START_DATE_UP), SetDataTip(SPR_ARROW_UP, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD), SetFill(false, true),
+ EndContainer(),
+ /* Snow line. */
+ NWidget(NWID_HORIZONTAL),
+ NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_DOWN), SetDataTip(SPR_ARROW_DOWN, STR_MAPGEN_SNOW_LINE_DOWN), SetFill(false, true),
+ NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_TEXT), SetDataTip(STR_BLACK_INT, STR_NULL), SetFill(true, false),
+ NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_UP), SetDataTip(SPR_ARROW_UP, STR_MAPGEN_SNOW_LINE_UP), SetFill(false, true),
+ EndContainer(),
+ NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_INDUSTRY_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_JUST_STRING), SetFill(true, false),
+ NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_SMOOTHNESS_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(true, false),
EndContainer(),
- NWidget(NWID_SPACER), SetFill(true, false),
EndContainer(),
+ NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_RANDOM_BUTTON), SetDataTip(STR_MAPGEN_RANDOM, STR_MAPGEN_RANDOM_HELP), SetFill(true, false),
NWidget(NWID_SPACER), SetFill(true, true),
+ NWidget(WWT_TEXTBTN, COLOUR_GREEN, GLAND_GENERATE_BUTTON), SetMinimalSize(84, 30), SetDataTip(STR_MAPGEN_GENERATE, STR_NULL), SetFill(true, false),
EndContainer(),
EndContainer(),
NWidget(NWID_SPACER), SetMinimalSize(0, 4),
/* Map borders buttons for each edge. */
- NWidget(NWID_HORIZONTAL),
- NWidget(NWID_VERTICAL),
- NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_WATER_NW_TEXT), SetMinimalSize(84, 11), SetDataTip(STR_MAPGEN_NORTHWEST, STR_NULL), SetPadding(2, 0, 0, 12),
- NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_WATER_SW_TEXT), SetMinimalSize(84, 11), SetDataTip(STR_MAPGEN_SOUTHWEST, STR_NULL), SetPadding(1, 0, 0, 12),
+ NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(10, 0, 10),
+ NWidget(NWID_HORIZONTAL), SetPIP(0, 0, 3),
+ NWidget(NWID_SPACER), SetFill(true, true),
+ NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_WATER_NW_TEXT), SetDataTip(STR_MAPGEN_NORTHWEST, STR_NULL), SetPadding(1, 0, 0, 0), SetFill(false, true),
EndContainer(),
- NWidget(NWID_VERTICAL),
- NWidget(NWID_HORIZONTAL),
- NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, GLAND_WATER_NW), SetMinimalSize(73, 12), SetDataTip(STR_JUST_STRING, STR_MAPGEN_NORTHWEST), SetPadding(0, 0, 0, 4),
- NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, GLAND_WATER_NE), SetMinimalSize(73, 12), SetDataTip(STR_JUST_STRING, STR_MAPGEN_NORTHEAST),
- EndContainer(),
- NWidget(NWID_HORIZONTAL),
- NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, GLAND_WATER_SW), SetMinimalSize(73, 12), SetDataTip(STR_JUST_STRING, STR_MAPGEN_SOUTHWEST), SetPadding(0, 0, 0, 4),
- NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, GLAND_WATER_SE), SetMinimalSize(73, 12), SetDataTip(STR_JUST_STRING, STR_MAPGEN_SOUTHEAST),
- EndContainer(),
+ NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, GLAND_WATER_NW), SetDataTip(STR_JUST_STRING, STR_MAPGEN_NORTHWEST), SetFill(true, true),
+ NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, GLAND_WATER_SW), SetDataTip(STR_JUST_STRING, STR_MAPGEN_SOUTHWEST), SetFill(true, true),
+ NWidget(NWID_HORIZONTAL), SetPIP(3, 0, 0),
+ NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_WATER_NE_TEXT), SetDataTip(STR_MAPGEN_NORTHEAST, STR_NULL), SetPadding(1, 0, 0, 0), SetFill(false, true),
+ NWidget(NWID_SPACER), SetFill(true, true),
EndContainer(),
- NWidget(NWID_VERTICAL),
- NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_WATER_NE_TEXT), SetMinimalSize(77, 11), SetDataTip(STR_MAPGEN_NORTHEAST, STR_NULL), SetPadding(2, 0, 0, 4),
- NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_WATER_SE_TEXT), SetMinimalSize(77, 11), SetDataTip(STR_MAPGEN_SOUTHEAST, STR_NULL), SetPadding(1, 0, 0, 4),
+ EndContainer(),
+ NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(10, 0, 10),
+ NWidget(NWID_HORIZONTAL), SetPIP(0, 0, 3),
+ NWidget(NWID_SPACER), SetFill(true, true),
+ NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_WATER_SW_TEXT), SetDataTip(STR_MAPGEN_SOUTHWEST, STR_NULL), SetPadding(1, 0, 0, 0), SetFill(false, true),
+ EndContainer(),
+ NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, GLAND_WATER_NE), SetDataTip(STR_JUST_STRING, STR_MAPGEN_NORTHEAST), SetFill(true, true),
+ NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, GLAND_WATER_SE), SetDataTip(STR_JUST_STRING, STR_MAPGEN_SOUTHEAST), SetFill(true, true),
+ NWidget(NWID_HORIZONTAL), SetPIP(3, 0, 0),
+ NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_WATER_SE_TEXT), SetDataTip(STR_MAPGEN_SOUTHEAST, STR_NULL), SetPadding(1, 0, 0, 0), SetFill(false, true),
+ NWidget(NWID_SPACER), SetFill(true, true),
EndContainer(),
- NWidget(NWID_SPACER), SetFill(true, false),
EndContainer(),
- NWidget(NWID_SPACER), SetMinimalSize(0, 9),
+ NWidget(NWID_SPACER), SetMinimalSize(0, 9), SetFill(true, true),
EndContainer(),
};
@@ -266,97 +241,72 @@ static const NWidgetPart _nested_heightmap_load_widgets[] = {
NWidget(WWT_PANEL, COLOUR_BROWN, GLAND_BACKGROUND),
NWidget(NWID_SPACER), SetMinimalSize(0, 10),
/* Landscape selection. */
- NWidget(NWID_HORIZONTAL), SetPIP(10, 3, 11),
- NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, GLAND_TEMPERATE), SetMinimalSize(77, 55), SetDataTip(SPR_SELECT_TEMPERATE, STR_INTRO_TOOLTIP_TEMPERATE),
- NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, GLAND_ARCTIC), SetMinimalSize(77, 55), SetDataTip(SPR_SELECT_SUB_ARCTIC, STR_INTRO_TOOLTIP_SUB_ARCTIC_LANDSCAPE),
- NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, GLAND_TROPICAL), SetMinimalSize(77, 55), SetDataTip(SPR_SELECT_SUB_TROPICAL, STR_INTRO_TOOLTIP_SUB_TROPICAL_LANDSCAPE),
- NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, GLAND_TOYLAND), SetMinimalSize(77, 55), SetDataTip(SPR_SELECT_TOYLAND, STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE),
+ NWidget(NWID_HORIZONTAL), SetPIP(10, 0, 10),
+ NWidget(NWID_SPACER), SetFill(true, false),
+ NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, GLAND_TEMPERATE), SetDataTip(SPR_SELECT_TEMPERATE, STR_INTRO_TOOLTIP_TEMPERATE),
+ NWidget(NWID_SPACER), SetFill(true, false),
+ NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, GLAND_ARCTIC), SetDataTip(SPR_SELECT_SUB_ARCTIC, STR_INTRO_TOOLTIP_SUB_ARCTIC_LANDSCAPE),
+ NWidget(NWID_SPACER), SetFill(true, false),
+ NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, GLAND_TROPICAL), SetDataTip(SPR_SELECT_SUB_TROPICAL, STR_INTRO_TOOLTIP_SUB_TROPICAL_LANDSCAPE),
+ NWidget(NWID_SPACER), SetFill(true, false),
+ NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, GLAND_TOYLAND), SetDataTip(SPR_SELECT_TOYLAND, STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE),
+ NWidget(NWID_SPACER), SetFill(true, false),
EndContainer(),
- NWidget(NWID_SPACER), SetMinimalSize(0, 33), SetFill(false, true),
- NWidget(NWID_HORIZONTAL),
- NWidget(NWID_SPACER), SetMinimalSize(12, 0),
+ NWidget(NWID_SPACER), SetMinimalSize(0, 11), SetFill(false, true),
+ NWidget(NWID_HORIZONTAL), SetPIP(10, 3, 10),
/* Labels at the left side. */
- NWidget(NWID_VERTICAL),
- NWidget(NWID_SPACER), SetMinimalSize(0, 1),
- NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_MAPSIZE_X_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_MAPGEN_MAPSIZE, STR_NULL),
- NWidget(NWID_SPACER), SetMinimalSize(0, 11),
- NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_TOWN_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_MAPGEN_NUMBER_OF_TOWNS, STR_NULL),
- NWidget(NWID_SPACER), SetMinimalSize(0, 7),
- NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_INDUSTRY_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_MAPGEN_NUMBER_OF_INDUSTRIES, STR_NULL),
- NWidget(NWID_SPACER), SetMinimalSize(0, 11),
- NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_RANDOM_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_MAPGEN_RANDOM_SEED, STR_NULL),
- NWidget(NWID_SPACER), SetMinimalSize(0, 11),
- NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_TREE_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_MAPGEN_TREE_PLACER, STR_NULL),
- NWidget(NWID_SPACER), SetMinimalSize(0, 7),
- NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_HEIGHTMAP_ROTATION_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_MAPGEN_HEIGHTMAP_ROTATION, STR_NULL),
- NWidget(NWID_SPACER), SetMinimalSize(0, 10),
- NWidget(NWID_SPACER), SetFill(false, true),
+ NWidget(NWID_VERTICAL, NC_EQUALSIZE), SetPIP(0, 4, 0),
+ NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_HEIGHTMAP_NAME_LABEL), SetDataTip(STR_MAPGEN_HEIGHTMAP_NAME, STR_NULL), SetFill(true, true),
+ NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_MAPSIZE_X_TEXT), SetDataTip(STR_MAPGEN_MAPSIZE, STR_NULL), SetFill(true, true),
+ NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_TOWN_TEXT), SetDataTip(STR_MAPGEN_NUMBER_OF_TOWNS, STR_NULL), SetFill(true, true),
+ NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_INDUSTRY_TEXT), SetDataTip(STR_MAPGEN_NUMBER_OF_INDUSTRIES, STR_NULL), SetFill(true, true),
+ NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_RANDOM_TEXT), SetDataTip(STR_MAPGEN_RANDOM_SEED, STR_NULL), SetFill(true, true),
+ NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_TREE_TEXT), SetDataTip(STR_MAPGEN_TREE_PLACER, STR_NULL), SetFill(true, true),
+ NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_HEIGHTMAP_ROTATION_TEXT), SetDataTip(STR_MAPGEN_HEIGHTMAP_ROTATION, STR_NULL), SetFill(true, true),
EndContainer(),
- NWidget(NWID_SPACER), SetMinimalSize(3, 0),
/* Widgets at the right of the labels. */
- NWidget(NWID_VERTICAL),
+ NWidget(NWID_VERTICAL, NC_EQUALSIZE), SetPIP(0, 4, 0),
+ NWidget(WWT_EMPTY, COLOUR_ORANGE, GLAND_HEIGHTMAP_NAME_TEXT), SetFill(true, false),
/* Mapsize X * Y. */
- NWidget(NWID_HORIZONTAL),
- NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_MAPSIZE_X_PULLDOWN), SetMinimalSize(48, 12), SetDataTip(STR_JUST_INT, STR_NULL),
- NWidget(NWID_SPACER), SetMinimalSize(6, 0),
- NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_MAPSIZE_Y_TEXT), SetMinimalSize(9, 11), SetDataTip(STR_MAPGEN_BY, STR_NULL), SetPadding(1, 0, 0, 0),
- NWidget(NWID_SPACER), SetMinimalSize(3, 0),
- NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_MAPSIZE_Y_PULLDOWN), SetMinimalSize(48, 12), SetDataTip(STR_JUST_INT, STR_NULL),
- NWidget(NWID_SPACER), SetFill(true, false),
- EndContainer(),
- NWidget(NWID_SPACER), SetMinimalSize(0, 10),
- NWidget(NWID_HORIZONTAL),
- /* Number of towns. */
- NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_TOWN_PULLDOWN), SetMinimalSize(62, 12), SetDataTip(STR_JUST_STRING, STR_NULL),
- NWidget(NWID_SPACER), SetMinimalSize(6, 0),
- /* Starting date. */
- NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_START_DATE_TEXT1), SetMinimalSize(31, 11), SetDataTip(STR_MAPGEN_DATE, STR_NULL), SetPadding(1, 0, 0, 0),
- NWidget(NWID_SPACER), SetMinimalSize(3, 0),
- NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_START_DATE_DOWN), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_DOWN, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD),
- NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_START_DATE_TEXT), SetMinimalSize(87, 12), SetDataTip(STR_BLACK_DATE_LONG, STR_NULL),
- NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_START_DATE_UP), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_UP, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD),
- NWidget(NWID_SPACER), SetFill(true, false),
+ NWidget(NWID_HORIZONTAL), SetPIP(0, 4, 0),
+ NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_MAPSIZE_X_PULLDOWN), SetDataTip(STR_JUST_INT, STR_NULL), SetFill(true, false),
+ NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_MAPSIZE_Y_TEXT), SetDataTip(STR_MAPGEN_BY, STR_NULL), SetPadding(1, 0, 0, 0), SetFill(true, true),
+ NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_MAPSIZE_Y_PULLDOWN), SetDataTip(STR_JUST_INT, STR_NULL), SetFill(true, false),
EndContainer(),
- NWidget(NWID_SPACER), SetMinimalSize(0, 6),
- NWidget(NWID_HORIZONTAL),
- /* Number of industries. */
- NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_INDUSTRY_PULLDOWN), SetMinimalSize(62, 12), SetDataTip(STR_JUST_STRING, STR_NULL),
- NWidget(NWID_SPACER), SetMinimalSize(6, 0),
- /* Snow line. */
- NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_SNOW_LEVEL_TEXT1), SetMinimalSize(97, 11),
- SetDataTip(STR_MAPGEN_SNOW_LINE_HEIGHT, STR_NULL), SetPadding(1, 0, 0, 0),
- NWidget(NWID_SPACER), SetMinimalSize(3, 0),
- NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_DOWN), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_DOWN, STR_MAPGEN_SNOW_LINE_DOWN),
- NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_TEXT), SetMinimalSize(21, 12), SetDataTip(STR_BLACK_INT, STR_NULL),
- NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_UP), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_UP, STR_MAPGEN_SNOW_LINE_UP),
- NWidget(NWID_SPACER), SetFill(true, false),
- EndContainer(),
- NWidget(NWID_SPACER), SetMinimalSize(0, 10),
- NWidget(NWID_HORIZONTAL),
- /* Edit box for seed. */
- NWidget(WWT_EDITBOX, COLOUR_WHITE, GLAND_RANDOM_EDITBOX), SetMinimalSize(94, 12), SetDataTip(STR_MAPGEN_RANDOM_SEED_OSKTITLE, STR_MAPGEN_RANDOM_SEED_HELP),
- NWidget(NWID_SPACER), SetMinimalSize(8, 0),
- NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_RANDOM_BUTTON), SetMinimalSize(111, 12), SetDataTip(STR_MAPGEN_RANDOM, STR_MAPGEN_RANDOM_HELP),
- NWidget(NWID_SPACER), SetFill(true, false),
- EndContainer(),
- NWidget(NWID_SPACER), SetMinimalSize(0, 10),
- NWidget(NWID_HORIZONTAL),
- NWidget(NWID_VERTICAL),
- /* Tree placer. */
- NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_TREE_PULLDOWN), SetMinimalSize(118, 12), SetDataTip(STR_JUST_STRING, STR_NULL),
- NWidget(NWID_SPACER), SetMinimalSize(0, 6),
- /* Heightmap rotation. */
- NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_HEIGHTMAP_ROTATION_PULLDOWN), SetMinimalSize(118, 12), SetDataTip(STR_JUST_STRING, STR_NULL),
+ NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_TOWN_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(true, false),
+ NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_INDUSTRY_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(true, false),
+ NWidget(WWT_EDITBOX, COLOUR_WHITE, GLAND_RANDOM_EDITBOX), SetDataTip(STR_MAPGEN_RANDOM_SEED_OSKTITLE, STR_MAPGEN_RANDOM_SEED_HELP), SetFill(true, true),
+ NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_TREE_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(true, false),
+ NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_HEIGHTMAP_ROTATION_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(true, false),
+ EndContainer(),
+ NWidget(NWID_VERTICAL), SetPIP(0, 4, 0),
+ NWidget(NWID_HORIZONTAL), SetPIP(0, 3, 0),
+ NWidget(NWID_VERTICAL, NC_EQUALSIZE), SetPIP(0, 4, 0),
+ NWidget(WWT_EMPTY, INVALID_COLOUR, GLAND_HEIGHTMAP_NAME_SPACER), SetFill(true, false),
+ NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_HEIGHTMAP_SIZE_LABEL), SetDataTip(STR_MAPGEN_HEIGHTMAP_SIZE_LABEL, STR_NULL), SetFill(true, true),
+ NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_START_DATE_TEXT1), SetDataTip(STR_MAPGEN_DATE, STR_NULL), SetFill(true, true),
+ NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_SNOW_LEVEL_TEXT1), SetDataTip(STR_MAPGEN_SNOW_LINE_HEIGHT, STR_NULL), SetFill(true, true),
+ EndContainer(),
+ NWidget(NWID_VERTICAL, NC_EQUALSIZE), SetPIP(0, 4, 0),
+ NWidget(WWT_EMPTY, INVALID_COLOUR, GLAND_HEIGHTMAP_NAME_SPACER), SetFill(true, false),
+ NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_HEIGHTMAP_SIZE_TEXT), SetDataTip(STR_MAPGEN_HEIGHTMAP_SIZE, STR_NULL), SetFill(true, false),
+ NWidget(NWID_HORIZONTAL),
+ NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_START_DATE_DOWN), SetDataTip(SPR_ARROW_DOWN, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD), SetFill(false, true),
+ NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_START_DATE_TEXT), SetDataTip(STR_BLACK_DATE_LONG, STR_NULL), SetFill(true, false),
+ NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_START_DATE_UP), SetDataTip(SPR_ARROW_UP, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD), SetFill(false, true),
+ EndContainer(),
+ NWidget(NWID_HORIZONTAL),
+ NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_DOWN), SetDataTip(SPR_ARROW_DOWN, STR_MAPGEN_SNOW_LINE_DOWN), SetFill(false, true),
+ NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_TEXT), SetDataTip(STR_BLACK_INT, STR_NULL), SetFill(true, false),
+ NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_UP), SetDataTip(SPR_ARROW_UP, STR_MAPGEN_SNOW_LINE_UP), SetFill(false, true),
+ EndContainer(),
EndContainer(),
- NWidget(NWID_SPACER), SetMinimalSize(11, 0),
- /* Generate button. */
- NWidget(WWT_TEXTBTN, COLOUR_GREEN, GLAND_GENERATE_BUTTON), SetMinimalSize(84, 30), SetDataTip(STR_MAPGEN_GENERATE, STR_NULL),
- NWidget(NWID_SPACER), SetFill(true, false),
EndContainer(),
- NWidget(NWID_SPACER), SetFill(false, true),
+ NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_RANDOM_BUTTON), SetDataTip(STR_MAPGEN_RANDOM, STR_MAPGEN_RANDOM_HELP), SetFill(true, false),
+ NWidget(WWT_TEXTBTN, COLOUR_GREEN, GLAND_GENERATE_BUTTON), SetDataTip(STR_MAPGEN_GENERATE, STR_NULL), SetFill(true, true),
EndContainer(),
- NWidget(NWID_SPACER), SetFill(true, false),
EndContainer(),
+ NWidget(NWID_SPACER), SetMinimalSize(0, 9), SetFill(true, true),
EndContainer(),
};
@@ -448,33 +398,88 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
case GLAND_WATER_SE: SetDParam(0, (_settings_newgame.game_creation.water_borders == BORDERS_RANDOM) ? STR_MAPGEN_BORDER_RANDOM : HasBit(_settings_newgame.game_creation.water_borders, BORDER_SE) ? STR_MAPGEN_BORDER_WATER : STR_MAPGEN_BORDER_FREEFORM); break;
case GLAND_WATER_SW: SetDParam(0, (_settings_newgame.game_creation.water_borders == BORDERS_RANDOM) ? STR_MAPGEN_BORDER_RANDOM : HasBit(_settings_newgame.game_creation.water_borders, BORDER_SW) ? STR_MAPGEN_BORDER_WATER : STR_MAPGEN_BORDER_FREEFORM); break;
case GLAND_HEIGHTMAP_ROTATION_PULLDOWN: SetDParam(0, _rotation[_settings_newgame.game_creation.heightmap_rotation]); break;
+
+ case GLAND_HEIGHTMAP_SIZE_TEXT:
+ if (_settings_newgame.game_creation.heightmap_rotation == HM_CLOCKWISE) {
+ SetDParam(0, this->y);
+ SetDParam(1, this->x);
+ } else {
+ SetDParam(0, this->x);
+ SetDParam(1, this->y);
+ }
+ break;
}
}
virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *resize)
{
- StringID str = STR_JUST_INT;
+ const StringID *strs = NULL;
switch (widget) {
case GLAND_START_DATE_TEXT:
SetDParam(0, ConvertYMDToDate(MAX_YEAR, 0, 1));
- str = STR_BLACK_DATE_LONG;
+ *size = GetStringBoundingBox(STR_BLACK_DATE_LONG);
break;
case GLAND_MAPSIZE_X_PULLDOWN:
case GLAND_MAPSIZE_Y_PULLDOWN:
SetDParam(0, MAX_MAP_SIZE);
+ *size = GetStringBoundingBox(STR_JUST_INT);
break;
case GLAND_SNOW_LEVEL_TEXT:
SetDParam(0, MAX_TILE_HEIGHT);
+ *size = GetStringBoundingBox(STR_JUST_INT);
+ break;
+
+ case GLAND_HEIGHTMAP_SIZE_TEXT:
+ SetDParam(0, this->x);
+ SetDParam(1, this->y);
+ *size = GetStringBoundingBox(STR_MAPGEN_HEIGHTMAP_SIZE);
+ break;
+
+ case GLAND_TOWN_PULLDOWN: strs = _num_towns; break;
+ case GLAND_INDUSTRY_PULLDOWN: strs = _num_inds; break;
+ case GLAND_LANDSCAPE_PULLDOWN: strs = _landscape; break;
+ case GLAND_TREE_PULLDOWN: strs = _tree_placer; break;
+ case GLAND_TERRAIN_PULLDOWN: strs = _elevations; break;
+ case GLAND_WATER_PULLDOWN: strs = _sea_lakes; break;
+ case GLAND_SMOOTHNESS_PULLDOWN: strs = _smoothness; break;
+ case GLAND_HEIGHTMAP_ROTATION_PULLDOWN: strs = _rotation; break;
+ case GLAND_BORDERS_RANDOM:
+ *size = maxdim(GetStringBoundingBox(STR_MAPGEN_BORDER_RANDOMIZE), GetStringBoundingBox(STR_MAPGEN_BORDER_MANUAL));
+ break;
+
+ case GLAND_WATER_NE:
+ case GLAND_WATER_NW:
+ case GLAND_WATER_SE:
+ case GLAND_WATER_SW:
+ *size = maxdim(GetStringBoundingBox(STR_MAPGEN_BORDER_RANDOM), maxdim(GetStringBoundingBox(STR_MAPGEN_BORDER_WATER), GetStringBoundingBox(STR_MAPGEN_BORDER_FREEFORM)));
+ break;
+
+ case GLAND_HEIGHTMAP_NAME_SPACER:
+ case GLAND_HEIGHTMAP_NAME_TEXT:
+ size->width = 0;
break;
default:
return;
}
- *size = GetStringBoundingBox(str);
+ if (strs != NULL) {
+ while (*strs != INVALID_STRING_ID) {
+ *size = maxdim(*size, GetStringBoundingBox(*strs++));
+ }
+ }
size->width += padding.width;
- size->height += padding.height;
+ size->height = FONT_HEIGHT_NORMAL + WD_DROPDOWNTEXT_TOP + WD_DROPDOWNTEXT_BOTTOM;
+ }
+
+ virtual void DrawWidget(const Rect &r, int widget) const
+ {
+ switch (widget) {
+ case GLAND_HEIGHTMAP_NAME_TEXT:
+ DrawString(r.left, this->width - WD_FRAMERECT_RIGHT, r.top, this->name, TC_ORANGE);
+ break;
+ }
}
virtual void OnPaint()
@@ -513,20 +518,6 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
this->DrawWidgets();
this->DrawEditBox(GLAND_RANDOM_EDITBOX);
-
- if (mode != GLWP_GENERATE) {
- if (_settings_newgame.game_creation.heightmap_rotation == HM_CLOCKWISE) {
- SetDParam(0, this->y);
- SetDParam(1, this->x);
- } else {
- SetDParam(0, this->x);
- SetDParam(1, this->y);
- }
- int right = DrawString(0, 326, 91, STR_MAPGEN_HEIGHTMAP_SIZE, TC_FROMSTRING, SA_RIGHT);
-
- DrawString( 12, 114, 91, STR_MAPGEN_HEIGHTMAP_NAME);
- DrawString(114, right - 5, 91, this->name, TC_ORANGE);
- }
}
virtual void OnClick(Point pt, int widget)
diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt
index 3cbbe4c1d..5cf129ba1 100644
--- a/src/lang/afrikaans.txt
+++ b/src/lang/afrikaans.txt
@@ -2160,7 +2160,8 @@ STR_MAPGEN_BORDER_RANDOMIZE :{BLACK}Lukraak
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Hoogtekaart rotasie:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Hoogtekaart name:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Groote: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Groote:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Sleutel 'n lukraak saad in
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Verander sneeu lyn hoogte
diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt
index 7a3308cc9..d196ab766 100644
--- a/src/lang/arabic_egypt.txt
+++ b/src/lang/arabic_egypt.txt
@@ -2224,7 +2224,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK} يدو
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}اتجاة خريطة المرتفعات:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}اسم خريطة المرتفعات:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}الحجم: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}الحجم:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}ادخل مرجع عشوائي
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE} غير مستوى خط الثلج
diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt
index 8e86cf590..d36486eeb 100644
--- a/src/lang/brazilian_portuguese.txt
+++ b/src/lang/brazilian_portuguese.txt
@@ -2235,7 +2235,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Manual
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Rotação do mapa em relevo:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Nome do mapa em relevo:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Tamanho: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Tamanho:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Coloque uma semente randomica
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Mudar linha da neve
diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt
index 67d17cce8..28836fc34 100644
--- a/src/lang/bulgarian.txt
+++ b/src/lang/bulgarian.txt
@@ -2207,7 +2207,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Ръчн
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Завъртане на височинна карта:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Име на височинна карта:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Размер: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Размер:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Въведи случаено семе
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Височина на снежната линия
diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt
index b89e0c893..f903bedcc 100644
--- a/src/lang/catalan.txt
+++ b/src/lang/catalan.txt
@@ -2236,7 +2236,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Manual
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Rotació del mapa d'alçades:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Nom del mapa d'alçades:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Mida: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Mida:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Posa un valor aleatori
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Canviar alçada de la línia de neu
diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt
index 4da21c172..9979404d0 100644
--- a/src/lang/croatian.txt
+++ b/src/lang/croatian.txt
@@ -2282,7 +2282,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Ručno
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Rotacija visinske mape:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Ime visinske karte:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Veličina: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Veličina:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Upiši nasumično sjeme
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Promijeni visinu linije snijega
diff --git a/src/lang/czech.txt b/src/lang/czech.txt
index 5e558600f..b898c6c7a 100644
--- a/src/lang/czech.txt
+++ b/src/lang/czech.txt
@@ -2289,7 +2289,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}vlastní
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Otočení výškové mapy:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Jméno výškové mapy:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Velikost: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Velikost:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Zadej náhodné číslo
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Změnit výšku sněžne čáry
diff --git a/src/lang/danish.txt b/src/lang/danish.txt
index 8a0a60c18..cb96edf8d 100644
--- a/src/lang/danish.txt
+++ b/src/lang/danish.txt
@@ -2234,7 +2234,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Manuelle
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Højdekortets rotation:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Højdekortets navn:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Størrelse: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Størrelse:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Skriv startværdi til tilfældige tal
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Ændre snegrænsen
diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt
index efc654918..31674bc20 100644
--- a/src/lang/dutch.txt
+++ b/src/lang/dutch.txt
@@ -2236,7 +2236,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Handmati
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Aantal graden hoogtekaart:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Hoogtekaartnaam:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Grootte: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Grootte:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Geef een willekeurige seed op
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Verander hoogte van sneeuwlijn
diff --git a/src/lang/english.txt b/src/lang/english.txt
index 3940b4cd3..65c044f77 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -2236,7 +2236,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Manual
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Heightmap rotation:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Heightmap name:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Size: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Size:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Enter a random seed
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Change snow line height
diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt
index 26c5de9c3..6f37c0287 100644
--- a/src/lang/english_US.txt
+++ b/src/lang/english_US.txt
@@ -2233,7 +2233,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Manual
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Heightmap rotation:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Heightmap name:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Size: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Size:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Enter a random seed
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Change snow line height
diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt
index ececb5946..58468b26c 100644
--- a/src/lang/esperanto.txt
+++ b/src/lang/esperanto.txt
@@ -2049,7 +2049,8 @@ STR_MAPGEN_GENERATE :{WHITE}Generu
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Mapa turniĝo:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Mapa nomo:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Grandeco: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Grandeco:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Ŝanĝu altecon de la neĝlinio
STR_MAPGEN_START_DATE_QUERY_CAPT :{WHITE}Ŝanĝu komencjaron
diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt
index a5e4afa2d..4e56cad61 100644
--- a/src/lang/estonian.txt
+++ b/src/lang/estonian.txt
@@ -2292,7 +2292,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Ise vali
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Kõrgustekaardi pööre:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Kõrgusekaardi nimi:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Suurus: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Suurus:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Sisesta suvaline arv
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Muuda lumepiiri kõrgust
diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt
index d1dba4fb2..34273042d 100644
--- a/src/lang/finnish.txt
+++ b/src/lang/finnish.txt
@@ -2236,7 +2236,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Manuaali
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Korkeuskartan kierto:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Korkeuskartan nimi:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Koko: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Koko:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Syötä satunnaissiemen
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Vaihda lumilinjan korkeutta
diff --git a/src/lang/french.txt b/src/lang/french.txt
index e09efdcee..a0d6a3139 100644
--- a/src/lang/french.txt
+++ b/src/lang/french.txt
@@ -2237,7 +2237,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Manuel
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Rotation de la carte d'altitude{NBSP}:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Nom de la carte d'altitude{NBSP}:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Taille{NBSP}: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Taille{NBSP}:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Entrer une amorce
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Modifier l'altitude d'enneigement
diff --git a/src/lang/galician.txt b/src/lang/galician.txt
index 83a31dd4d..832327005 100644
--- a/src/lang/galician.txt
+++ b/src/lang/galician.txt
@@ -2193,7 +2193,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Manual
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Rotación do mapa de altura:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Nome do mapa de altura:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Tamaño: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Tamaño:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Introduce a semente aleatoria
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Cambiar a altura da liña de neve
diff --git a/src/lang/german.txt b/src/lang/german.txt
index 3a8579b7a..f78594cb1 100644
--- a/src/lang/german.txt
+++ b/src/lang/german.txt
@@ -2237,7 +2237,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Manuell
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Reliefkarte drehen:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Reliefkartenname:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Größe: {ORANGE}{NUM} × {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Größe:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Zufallsstartwert eingeben
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Höhe der Schneegrenze ändern
diff --git a/src/lang/greek.txt b/src/lang/greek.txt
index 40d69fed6..d79fed8a9 100644
--- a/src/lang/greek.txt
+++ b/src/lang/greek.txt
@@ -2299,7 +2299,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Χειρ
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Περιστροφή χάρτη υψομετρίας:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Όνομα χάρτη υψομετρίας:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Μέγεθος: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Μέγεθος:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Δώστε ένα σπόρο τυχαίας παραγωγής
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Άλλαγη του ύψους της γράμμης χιονιού
diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt
index fdc11183a..4ba2993ad 100644
--- a/src/lang/hebrew.txt
+++ b/src/lang/hebrew.txt
@@ -2234,7 +2234,6 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}ידני
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK} :סיבוב מפת הגבהים
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK} :שם מפת הגבהים
-STR_MAPGEN_HEIGHTMAP_SIZE ::{ORANGE}{NUM} x {NUM} {BLACK} :גודל
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}מספר אקראי
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}שנה את גובה קו השלג
@@ -2895,7 +2894,7 @@ STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL :{LTBLUE}בשי
STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE :{LTBLUE}{TOWN} טיפול במבדוק
STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL :{LTBLUE}{1:VELOCITY} מהירות , {NBSP}{0:TOWN} טיפול במבדוק
STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE :{LTBLUE}{STATION} טיפול בסככת המטוסים
-STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL :{LTBLUE}{1:VELOCITY} מהירות , {NBSP}{0:STATION} טיפול בסככת המטוסים
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL :{LTBLUE}{1:VELOCITY} מהירות , {NBSP}{0:STATION} טיפול בסככת ה�טוסים
# Vehicle details
STR_VEHICLE_DETAILS_CAPTION :{WHITE}(פרטים){VEHICLE}
diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt
index 298a6e2f6..b69f011c7 100644
--- a/src/lang/hungarian.txt
+++ b/src/lang/hungarian.txt
@@ -2269,7 +2269,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Kézi
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Magasságtérkép elforgatása:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Magasságtérkép neve:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Méret: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Méret:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Irj be egy tetszőleges számot
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Hóhatár megváltoztatása
diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt
index bfa1c3c25..1d458061f 100644
--- a/src/lang/icelandic.txt
+++ b/src/lang/icelandic.txt
@@ -2215,7 +2215,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Forvalda
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Snúningur hæðarkorts:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Nafn hæðarlínukorts:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Stærð: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Stærð:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Sláðu inn slembistofn
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Breyta hæð snjólínu
diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt
index 1d4a16e8b..288b4b1df 100644
--- a/src/lang/indonesian.txt
+++ b/src/lang/indonesian.txt
@@ -2235,7 +2235,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Manual
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Rotasi Heightmap:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Nama Peta Heightmap:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Luas: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Luas:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Masukkan angka umpan pengacakan
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Ubah ketinggian garis salju
diff --git a/src/lang/italian.txt b/src/lang/italian.txt
index 82f953f6b..0ab88a110 100644
--- a/src/lang/italian.txt
+++ b/src/lang/italian.txt
@@ -2238,7 +2238,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Manuale
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Rotazione heightmap:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Nome heightmap:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Dim.: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Dim.:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Inserire un seme casuale
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Cambia l'altezza delle nevi perenni
diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt
index 61a6131b7..40ad78d4d 100644
--- a/src/lang/japanese.txt
+++ b/src/lang/japanese.txt
@@ -2174,7 +2174,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}手動
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}ハイトマップの回転:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}ハイトマップ名:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}サイズ:{ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}サイズ:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}ランダムシードを入力
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}雪線の位置を変更
diff --git a/src/lang/korean.txt b/src/lang/korean.txt
index b2297d8f4..24b5135c5 100644
--- a/src/lang/korean.txt
+++ b/src/lang/korean.txt
@@ -2234,7 +2234,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}사용
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Heightmap 방향:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Heightmap 이름:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}크기: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}크기:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}임의 설정값 입력
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}만년설의 높이를 변경
diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt
index ea4ae652d..ee26473ae 100644
--- a/src/lang/latvian.txt
+++ b/src/lang/latvian.txt
@@ -2227,7 +2227,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Rokas va
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Reliefa kartes rotācija:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Reliefkartes nosaukums:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Lielums: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Lielums:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Ievadiet nejaušu sākumu
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Mainīt sniega līnijas augstumu
diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt
index 2b2e8c29e..d50e1e781 100644
--- a/src/lang/lithuanian.txt
+++ b/src/lang/lithuanian.txt
@@ -2238,7 +2238,8 @@ STR_MAPGEN_BORDER_RANDOMIZE :{BLACK}Atsitikt
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Zemelapio rotacija:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Zemelapio vardas:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Dydis: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Dydis:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Pakeisti snieko linijos aukštį
STR_MAPGEN_START_DATE_QUERY_CAPT :{WHITE}Keisti pradzios metus
diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt
index 16e59b42c..ba71f6675 100644
--- a/src/lang/luxembourgish.txt
+++ b/src/lang/luxembourgish.txt
@@ -2211,7 +2211,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Handbuch
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Héichtekaart rotatioun:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Héichtekaart Numm:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Gréisst: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Gréisst:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Gidd eng zoufälleg Zuel an
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Ännert d'Schnéilinnhéicht
diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt
index a11f6fc65..20e505d41 100644
--- a/src/lang/norwegian_bokmal.txt
+++ b/src/lang/norwegian_bokmal.txt
@@ -2231,7 +2231,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Manuell
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Høydekartrotering:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Høydekartnavn:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Størrelse: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Størrelse:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Skriv inn en tilfeldig sender
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Skift høyden på snøgrensen
diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt
index 266d3db77..75499cc7f 100644
--- a/src/lang/norwegian_nynorsk.txt
+++ b/src/lang/norwegian_nynorsk.txt
@@ -2197,7 +2197,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Manuell
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Rotering av høgdekart:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Høgdekartnamn:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Storleik: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Storleik:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Skriv inn tilfeldig seed
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Skift høgda på snøgrensa
diff --git a/src/lang/polish.txt b/src/lang/polish.txt
index 1b7eefa0d..bdafe41d0 100644
--- a/src/lang/polish.txt
+++ b/src/lang/polish.txt
@@ -2613,7 +2613,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Własne
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Obrót mapy wysokości:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Nazwa mapy wysokosci:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Rozmiar: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Rozmiar:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Wprowadź losowe ziarno
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Zmień wysokość śniegu
diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt
index 3bf182f46..7bb411f30 100644
--- a/src/lang/portuguese.txt
+++ b/src/lang/portuguese.txt
@@ -2233,7 +2233,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Manual
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Rotação mapa alt.:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Nome mapa de alt.:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Tamanho: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Tamanho:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Insira um número aleatório de base
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Mudar a altura da linha de neve
diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt
index 5c8a2da56..9a91e05f2 100644
--- a/src/lang/romanian.txt
+++ b/src/lang/romanian.txt
@@ -2235,7 +2235,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Manual
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Rotatie harta inaltimi:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Nume harta inaltimi:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Dimensiune: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Dimensiune:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Introduceţi o valoare de pornire pentru numerele aleatoare
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Nu pot modifica inaltimea zapezii
diff --git a/src/lang/russian.txt b/src/lang/russian.txt
index c018ff1df..e04645b84 100644
--- a/src/lang/russian.txt
+++ b/src/lang/russian.txt
@@ -2395,7 +2395,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Вруч
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Поворот карты:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Имя карты:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Размер: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Размер:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Введите случайное число
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Изменить высоту снеговой линии
diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt
index e0dbe9fde..319c49318 100644
--- a/src/lang/serbian.txt
+++ b/src/lang/serbian.txt
@@ -2421,7 +2421,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Podešen
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Orjentacija elevacione karte:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Naziv elevacione karte:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Veličina: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Veličina:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Unos nove vrednosti klice
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Promena donjeg nivoa snežnog pojasa
diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt
index cef83a6c1..a58193225 100644
--- a/src/lang/simplified_chinese.txt
+++ b/src/lang/simplified_chinese.txt
@@ -2235,7 +2235,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}手动
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}高度图旋转:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}高度图名称:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}地图尺寸: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}地图尺寸:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}请输入随机种子
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}改变雪线高度
diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt
index 26a493a15..49c43a14f 100644
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -2302,7 +2302,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Manuál
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Orientacia vyskovej mapy:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Nazov vyskovej mapy:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Velkost: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Velkost:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Zadajte náhodný kód
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Zmenit vysku snehovej ciary
diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt
index bc17eec14..9b5110130 100644
--- a/src/lang/slovenian.txt
+++ b/src/lang/slovenian.txt
@@ -2256,7 +2256,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Ročno
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Zasuk višinskega zemljevida:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Ime višinskega zemljevida:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Velikost: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Velikost:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Vpiši naključno seme
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Spremeni višino snežne meje
diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt
index e45dd619a..3bacfe623 100644
--- a/src/lang/spanish.txt
+++ b/src/lang/spanish.txt
@@ -2237,7 +2237,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Manual
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Rotación mapa de alturas:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Nombre del mapa de alturas:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Tamaño: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Tamaño:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Introducir una semilla aleatoria
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Cambiar altura de la línea de nieve
diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt
index d37b2e1e4..6fe0bc949 100644
--- a/src/lang/swedish.txt
+++ b/src/lang/swedish.txt
@@ -2234,7 +2234,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Manuell
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Rotation på höjdkarta:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Namn på höjdkarta:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Storlek: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Storlek:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Mata in ett slumpmässigt frö
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Ändra snölinjens höjd
diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt
index 3d7119272..738748f76 100644
--- a/src/lang/traditional_chinese.txt
+++ b/src/lang/traditional_chinese.txt
@@ -2236,7 +2236,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}手動
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}高度圖旋轉:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}高度圖名稱:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}大小:{ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}大小:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}輸入亂數種子
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}變更雪線高度
@@ -3281,7 +3282,7 @@ STR_ERROR_CAN_T_REPAY_LOAN :{WHITE}無法
STR_ERROR_INSUFFICIENT_FUNDS :{WHITE}無法把貸款的錢流通出去...
STR_ERROR_CAN_T_BUY_COMPANY :{WHITE}無法購買公司...
STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS :{WHITE}無法建造公司總部...
-STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}無法購買這間公司的股份...
+STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}無法購買這間�司的股份...
STR_ERROR_CAN_T_SELL_25_SHARE_IN :{WHITE}無法出售這間公司的股份...
STR_ERROR_PROTECTED :{WHITE}這間公司才剛成立,還不能交易股票...
diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt
index b2180846d..7e59ddc83 100644
--- a/src/lang/turkish.txt
+++ b/src/lang/turkish.txt
@@ -2235,7 +2235,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}El ile
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Yükseklik haritası döndür:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Yükseklik haritası adı:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Boyut: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Boyut:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Rastgele bir tohum girin
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Kar yüksekliğini değiştir
diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt
index 8541a942f..860affaba 100644
--- a/src/lang/ukrainian.txt
+++ b/src/lang/ukrainian.txt
@@ -2360,7 +2360,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Вруч
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Поворот рельєфу
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Назва рельєфу:
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Розмір: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Розмір:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Введіть випадкове число
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Змінити висоту лінії снігу
diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt
index b17efebec..ce9c649a9 100644
--- a/src/lang/welsh.txt
+++ b/src/lang/welsh.txt
@@ -2214,7 +2214,8 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Â Llaw
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Cylchdro Map Uchder:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Enw'r Map Uchder
-STR_MAPGEN_HEIGHTMAP_SIZE :{BLACK}Maint: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Maint:
+STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} * {NUM}
STR_MAPGEN_RANDOM_SEED_OSKTITLE :{BLACK}Rhowch hedyn hap
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Newid uchder Llinell Eira