Fix the viewport map default display mode setting

Routes value was missing
Adjust strings

See: #475
This commit is contained in:
Jonathan G Rennison
2023-01-22 12:39:18 +00:00
parent 7ec00f4242
commit 1f364c6b21
7 changed files with 13 additions and 24 deletions

View File

@@ -1755,9 +1755,6 @@ STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_SCROLLING_VP_BLEND :Smíchat s bíl
STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_SCROLLING_VP_ALL :Smíchat + obrys
STR_CONFIG_SETTING_VIEWPORT_MAP_USE_OWNER_COLOUR_BRIDGE_TUNNEL :Použít barvu vlastníka pro mosty a tunely: {STRING}
STR_CONFIG_SETTING_VIEWPORT_MAP_DEFAULT_MODE :Výchozí zobrazení: {STRING}
STR_CONFIG_SETTING_VIEWPORT_MAP_DEFAULT_MODE_VEGETATION :Vegetace
STR_CONFIG_SETTING_VIEWPORT_MAP_DEFAULT_MODE_OWNER :Vlastník
STR_CONFIG_SETTING_VIEWPORT_MAP_DEFAULT_MODE_INDUSTRY :Průmysl
STR_CONFIG_SETTING_VIEWPORT_MAP_ACTION_DBLCLICK :Funkce dvojkliku: {STRING}
STR_CONFIG_SETTING_VIEWPORT_MAP_ACTION_DBLCLICK_DO_NOTHING :Nic
STR_CONFIG_SETTING_VIEWPORT_MAP_ACTION_DBLCLICK_ZOOM_MAIN :Nastvit 1X zoom

View File

@@ -1824,9 +1824,7 @@ STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_SCROLLING_VP_BLEND :Blend with some
STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_SCROLLING_VP_ALL :Blend + contour
STR_CONFIG_SETTING_VIEWPORT_MAP_USE_OWNER_COLOUR_BRIDGE_TUNNEL :Use owner's colour for bridges and tunnels: {STRING2}
STR_CONFIG_SETTING_VIEWPORT_MAP_DEFAULT_MODE :Default mode: {STRING2}
STR_CONFIG_SETTING_VIEWPORT_MAP_DEFAULT_MODE_VEGETATION :Vegetation
STR_CONFIG_SETTING_VIEWPORT_MAP_DEFAULT_MODE_OWNER :Owner
STR_CONFIG_SETTING_VIEWPORT_MAP_DEFAULT_MODE_INDUSTRY :Industry
STR_CONFIG_SETTING_VIEWPORT_MAP_DEFAULT_MODE_HELPTEXT :Default display mode for the main viewport and any extra viewport windows, when zoomed out into map mode.
STR_CONFIG_SETTING_VIEWPORT_MAP_ACTION_DBLCLICK :Function of double-click: {STRING2}
STR_CONFIG_SETTING_VIEWPORT_MAP_ACTION_DBLCLICK_DO_NOTHING :Do nothing
STR_CONFIG_SETTING_VIEWPORT_MAP_ACTION_DBLCLICK_ZOOM_MAIN :Zoom in directly to 1X

View File

@@ -5811,9 +5811,6 @@ STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_SCROLLING_VP_BLEND :Mesturar con al
STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_SCROLLING_VP_ALL :Mesturar + Contorno
STR_CONFIG_SETTING_VIEWPORT_MAP_USE_OWNER_COLOUR_BRIDGE_TUNNEL :Usar a cor do dono para pontes e túneis: {STRING}
STR_CONFIG_SETTING_VIEWPORT_MAP_DEFAULT_MODE :Modo por defecto: {STRING}
STR_CONFIG_SETTING_VIEWPORT_MAP_DEFAULT_MODE_VEGETATION :Vexetación
STR_CONFIG_SETTING_VIEWPORT_MAP_DEFAULT_MODE_OWNER :Propietario
STR_CONFIG_SETTING_VIEWPORT_MAP_DEFAULT_MODE_INDUSTRY :Industria
STR_CONFIG_SETTING_VIEWPORT_MAP_ACTION_DBLCLICK :Función do doble-click: {STRING}
STR_CONFIG_SETTING_VIEWPORT_MAP_ACTION_DBLCLICK_DO_NOTHING :Non facer nada
STR_CONFIG_SETTING_VIEWPORT_MAP_ACTION_DBLCLICK_ZOOM_MAIN :Facer zoom directamente a 1X

View File

@@ -1799,9 +1799,6 @@ STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_SCROLLING_VP_BLEND :transparente we
STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_SCROLLING_VP_ALL :Fläche und Umrisse
STR_CONFIG_SETTING_VIEWPORT_MAP_USE_OWNER_COLOUR_BRIDGE_TUNNEL :Firmenfarben für Brücken und Tunnel: {STRING}
STR_CONFIG_SETTING_VIEWPORT_MAP_DEFAULT_MODE :Standardmodus: {STRING}
STR_CONFIG_SETTING_VIEWPORT_MAP_DEFAULT_MODE_VEGETATION :Vegetation
STR_CONFIG_SETTING_VIEWPORT_MAP_DEFAULT_MODE_OWNER :Landeigentümer
STR_CONFIG_SETTING_VIEWPORT_MAP_DEFAULT_MODE_INDUSTRY :Industrien
STR_CONFIG_SETTING_VIEWPORT_MAP_ACTION_DBLCLICK :Funktion des Doppelklicks: {STRING}
STR_CONFIG_SETTING_VIEWPORT_MAP_ACTION_DBLCLICK_DO_NOTHING :Keine
STR_CONFIG_SETTING_VIEWPORT_MAP_ACTION_DBLCLICK_ZOOM_MAIN :Zoome direkt auf Faktor 1x

View File

@@ -1825,9 +1825,6 @@ STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_SCROLLING_VP_BLEND :반투명 흰
STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_SCROLLING_VP_ALL :반투명 + 윤곽
STR_CONFIG_SETTING_VIEWPORT_MAP_USE_OWNER_COLOUR_BRIDGE_TUNNEL :다리와 터널의 소유주 색 적용: {STRING}
STR_CONFIG_SETTING_VIEWPORT_MAP_DEFAULT_MODE :기본 모드: {STRING}
STR_CONFIG_SETTING_VIEWPORT_MAP_DEFAULT_MODE_VEGETATION :초목
STR_CONFIG_SETTING_VIEWPORT_MAP_DEFAULT_MODE_OWNER :소유주
STR_CONFIG_SETTING_VIEWPORT_MAP_DEFAULT_MODE_INDUSTRY :산업시설
STR_CONFIG_SETTING_VIEWPORT_MAP_ACTION_DBLCLICK :더블 클릭을 하면 실행할 동작: {STRING}
STR_CONFIG_SETTING_VIEWPORT_MAP_ACTION_DBLCLICK_DO_NOTHING :아무것도 하지 않기
STR_CONFIG_SETTING_VIEWPORT_MAP_ACTION_DBLCLICK_ZOOM_MAIN :확대/축소 배율 원래대로

View File

@@ -1824,9 +1824,6 @@ STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_SCROLLING_VP_BLEND :与白色混合
STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_SCROLLING_VP_ALL :混合+轮廓
STR_CONFIG_SETTING_VIEWPORT_MAP_USE_OWNER_COLOUR_BRIDGE_TUNNEL :在桥梁和隧道使用所有者公司的颜色:{STRING}
STR_CONFIG_SETTING_VIEWPORT_MAP_DEFAULT_MODE :缺省模式:{STRING}
STR_CONFIG_SETTING_VIEWPORT_MAP_DEFAULT_MODE_VEGETATION :植被
STR_CONFIG_SETTING_VIEWPORT_MAP_DEFAULT_MODE_OWNER :所有者
STR_CONFIG_SETTING_VIEWPORT_MAP_DEFAULT_MODE_INDUSTRY :工业
STR_CONFIG_SETTING_VIEWPORT_MAP_ACTION_DBLCLICK :双击值执行功能:{STRING}
STR_CONFIG_SETTING_VIEWPORT_MAP_ACTION_DBLCLICK_DO_NOTHING :什么都不做
STR_CONFIG_SETTING_VIEWPORT_MAP_ACTION_DBLCLICK_ZOOM_MAIN :直接缩放到1X

View File

@@ -156,6 +156,14 @@ static const SettingDescEnumEntry _no_depot_order_warn[] = {
{ 0, STR_NULL }
};
static const SettingDescEnumEntry _viewport_map_modes[] = {
{ VPMT_VEGETATION, STR_SMALLMAP_TYPE_VEGETATION },
{ VPMT_OWNER, STR_SMALLMAP_TYPE_OWNERS },
{ VPMT_ROUTES, STR_SMALLMAP_TYPE_ROUTES },
{ VPMT_INDUSTRY, STR_SMALLMAP_TYPE_INDUSTRIES },
{ 0, STR_NULL }
};
/* Some settings do not need to be synchronised when playing in multiplayer.
* These include for example the GUI settings and will not be saved with the
* savegame.
@@ -4733,16 +4741,14 @@ interval = 1
str = STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_SCROLLING_VP
strval = STR_CONFIG_SETTING_VIEWPORT_MAP_SHOW_SCROLLING_VP_NOTHING
[SDTC_VAR]
[SDTC_ENUM]
var = gui.default_viewport_map_mode
type = SLE_UINT32
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
def = 0
min = 0
max = 2
interval = 1
enumlist = _viewport_map_modes
str = STR_CONFIG_SETTING_VIEWPORT_MAP_DEFAULT_MODE
strval = STR_CONFIG_SETTING_VIEWPORT_MAP_DEFAULT_MODE_VEGETATION
strhelp = STR_CONFIG_SETTING_VIEWPORT_MAP_DEFAULT_MODE_HELPTEXT
[SDTC_VAR]
var = gui.action_when_viewport_map_is_dblclicked