From e9c1ff50c632349b0b8294907bdc166c7923e3a9 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sun, 20 Oct 2024 13:57:21 +0100 Subject: [PATCH] Re-add house placer town selector See: #765 Partial revert of fe84080c --- src/lang/extra/afrikaans.txt | 2 + src/lang/extra/arabic_egypt.txt | 2 + src/lang/extra/basque.txt | 2 + src/lang/extra/belarusian.txt | 2 + src/lang/extra/brazilian_portuguese.txt | 2 + src/lang/extra/bulgarian.txt | 2 + src/lang/extra/catalan.txt | 2 + src/lang/extra/chuvash.txt | 2 + src/lang/extra/croatian.txt | 2 + src/lang/extra/czech.txt | 4 + src/lang/extra/danish.txt | 2 + src/lang/extra/dutch.txt | 2 + src/lang/extra/english.txt | 4 + src/lang/extra/english_AU.txt | 2 + src/lang/extra/english_US.txt | 2 + src/lang/extra/esperanto.txt | 2 + src/lang/extra/estonian.txt | 2 + src/lang/extra/faroese.txt | 2 + src/lang/extra/finnish.txt | 2 + src/lang/extra/french.txt | 2 + src/lang/extra/frisian.txt | 2 + src/lang/extra/gaelic.txt | 2 + src/lang/extra/galician.txt | 4 + src/lang/extra/german.txt | 4 + src/lang/extra/greek.txt | 2 + src/lang/extra/hebrew.txt | 2 + src/lang/extra/hindi.txt | 2 + src/lang/extra/hungarian.txt | 2 + src/lang/extra/icelandic.txt | 2 + src/lang/extra/ido.txt | 2 + src/lang/extra/indonesian.txt | 2 + src/lang/extra/irish.txt | 2 + src/lang/extra/italian.txt | 2 + src/lang/extra/japanese.txt | 2 + src/lang/extra/korean.txt | 4 + src/lang/extra/latin.txt | 2 + src/lang/extra/latvian.txt | 2 + src/lang/extra/lithuanian.txt | 2 + src/lang/extra/luxembourgish.txt | 2 + src/lang/extra/macedonian.txt | 2 + src/lang/extra/malay.txt | 2 + src/lang/extra/maltese.txt | 2 + src/lang/extra/marathi.txt | 2 + src/lang/extra/norwegian_bokmal.txt | 2 + src/lang/extra/norwegian_nynorsk.txt | 2 + src/lang/extra/persian.txt | 2 + src/lang/extra/polish.txt | 2 + src/lang/extra/portuguese.txt | 2 + src/lang/extra/romanian.txt | 2 + src/lang/extra/russian.txt | 4 + src/lang/extra/serbian.txt | 2 + src/lang/extra/simplified_chinese.txt | 4 + src/lang/extra/slovak.txt | 2 + src/lang/extra/slovenian.txt | 2 + src/lang/extra/spanish.txt | 2 + src/lang/extra/spanish_MX.txt | 2 + src/lang/extra/swedish.txt | 2 + src/lang/extra/tamil.txt | 2 + src/lang/extra/thai.txt | 2 + src/lang/extra/traditional_chinese.txt | 2 + src/lang/extra/turkish.txt | 2 + src/lang/extra/ukrainian.txt | 2 + src/lang/extra/urdu.txt | 2 + src/lang/extra/vietnamese.txt | 2 + src/lang/extra/welsh.txt | 2 + src/town_cmd.cpp | 14 ++- src/town_gui.cpp | 134 +++++++++++++++++++++++- src/widgets/town_widget.h | 7 ++ 68 files changed, 294 insertions(+), 5 deletions(-) diff --git a/src/lang/extra/afrikaans.txt b/src/lang/extra/afrikaans.txt index b8588be1efa..e165278c88f 100644 --- a/src/lang/extra/afrikaans.txt +++ b/src/lang/extra/afrikaans.txt @@ -21,6 +21,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Wissel d # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Sneeu lyn hoogte: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Beweeg die sneeu lyn een op STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Beweeg die sneeu lyn een af diff --git a/src/lang/extra/arabic_egypt.txt b/src/lang/extra/arabic_egypt.txt index 7b770a004e4..8031f6ae7e8 100644 --- a/src/lang/extra/arabic_egypt.txt +++ b/src/lang/extra/arabic_egypt.txt @@ -21,6 +21,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}غير # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK} ارتفاع خط الثلج STR_MAPGEN_SNOW_LINE_UP :{BLACK}ارفع خط الثلج مستوى واحد STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}خفض خط الثلج مستوى واحد diff --git a/src/lang/extra/basque.txt b/src/lang/extra/basque.txt index 6f35cd1f704..940590ef74e 100644 --- a/src/lang/extra/basque.txt +++ b/src/lang/extra/basque.txt @@ -21,6 +21,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Zama adi # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Elur garaiera: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Igo puntu batean elur garaiera STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Jeitsi puntu batean elur garaiera diff --git a/src/lang/extra/belarusian.txt b/src/lang/extra/belarusian.txt index ee8e0e7c625..0547edb412c 100644 --- a/src/lang/extra/belarusian.txt +++ b/src/lang/extra/belarusian.txt @@ -23,6 +23,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Пера # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Вышыня сьнегавой лініі: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Падняць сьнегавую лінію STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Апусьціць сьнегавую лінію diff --git a/src/lang/extra/brazilian_portuguese.txt b/src/lang/extra/brazilian_portuguese.txt index efb76ce7636..226f07317db 100644 --- a/src/lang/extra/brazilian_portuguese.txt +++ b/src/lang/extra/brazilian_portuguese.txt @@ -23,6 +23,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Altera t # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Linha da neve STR_MAPGEN_SNOW_LINE_UP :{BLACK}Aumentar a linha da neve em um ponto STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Diminuir a linha da neve em um ponto diff --git a/src/lang/extra/bulgarian.txt b/src/lang/extra/bulgarian.txt index 0a90dcbec60..91179eb5ea4 100644 --- a/src/lang/extra/bulgarian.txt +++ b/src/lang/extra/bulgarian.txt @@ -17,6 +17,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Вклу # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Снежна линия: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Преместване снежната линия нагоре STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Преместване снежната линия надолу diff --git a/src/lang/extra/catalan.txt b/src/lang/extra/catalan.txt index 1bd58992f27..8b63bda8d89 100644 --- a/src/lang/extra/catalan.txt +++ b/src/lang/extra/catalan.txt @@ -26,6 +26,8 @@ STR_LINKGRAPH_STATS_TOOLTIP_CAPACITY :{}Capacitat: {C # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Alçada dels estatges amb neu: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Mou els estatges amb neu un pas amunt STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Mou els estatges amb neu un pas avall diff --git a/src/lang/extra/chuvash.txt b/src/lang/extra/chuvash.txt index 9b6e271eb43..76d64412841 100644 --- a/src/lang/extra/chuvash.txt +++ b/src/lang/extra/chuvash.txt @@ -13,6 +13,8 @@ STR_VEHICLE_TYPE_AIRCRAFT :Сывлӑш ҫ # Programmable Pre-Signals +#Town select window (for SE only) + # Town tooltip # Cargo type orders Window diff --git a/src/lang/extra/croatian.txt b/src/lang/extra/croatian.txt index 849d3c159fe..f47c059ec11 100644 --- a/src/lang/extra/croatian.txt +++ b/src/lang/extra/croatian.txt @@ -21,6 +21,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Namjesti # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Visina linije snijega STR_MAPGEN_SNOW_LINE_UP :{BLACK}Pomakni visinu linije snijega za jedan gore STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Pomakni visinu linije snijega za jedan dolje diff --git a/src/lang/extra/czech.txt b/src/lang/extra/czech.txt index 3a4921e9b20..c85f43787a6 100644 --- a/src/lang/extra/czech.txt +++ b/src/lang/extra/czech.txt @@ -1068,6 +1068,10 @@ STR_WATERWAYS_TOOLBAR_CREATE_RIVER_IN_GAME_TOOLTIP :{BLACK}Vytvář STR_LANDSCAPING_TOOLTIP_RULER_TOOL :{BLACK}Použít virtuální pravítko pro měření vzdálenosti a výšky +#Town select window (for SE only) +STR_SELECT_TOWN_CAPTION :{WHITE}Vybrat město +STR_SELECT_TOWN_LIST_ITEM :{BLACK}{TOWN} + STR_TREES_REMOVE_TREES_BUTTON :{BLACK}Odstranit všechny stromy STR_TREES_REMOVE_TREES_TOOLTIP :{BLACK}Odstraní všechny stromy z terénů diff --git a/src/lang/extra/danish.txt b/src/lang/extra/danish.txt index 81ca286f334..375a0ec33df 100644 --- a/src/lang/extra/danish.txt +++ b/src/lang/extra/danish.txt @@ -25,6 +25,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Slå gen # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Snegrænse STR_MAPGEN_SNOW_LINE_UP :{BLACK}Flyt snegrænsen een op STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Flyt snegrænsen een ned diff --git a/src/lang/extra/dutch.txt b/src/lang/extra/dutch.txt index 98c0a79e33a..1674c4cab6b 100644 --- a/src/lang/extra/dutch.txt +++ b/src/lang/extra/dutch.txt @@ -26,6 +26,8 @@ STR_LINKGRAPH_STATS_TOOLTIP_CAPACITY :{}Capaciteit: { # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Hoogte van sneeuwgrens: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Verhoog de sneeuwgrens met één STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Verlaag de sneeuwgrens met één diff --git a/src/lang/extra/english.txt b/src/lang/extra/english.txt index be2068ab79f..7f0a5167e2a 100644 --- a/src/lang/extra/english.txt +++ b/src/lang/extra/english.txt @@ -1236,6 +1236,10 @@ STR_WATERWAYS_TOOLBAR_CREATE_RIVER_IN_GAME_TOOLTIP :{BLACK}Place ri STR_LANDSCAPING_TOOLTIP_RULER_TOOL :{BLACK}Use a virtual ruler to measure distance and height +#Town select window (for SE only) +STR_SELECT_TOWN_CAPTION :{WHITE}Select town +STR_SELECT_TOWN_LIST_ITEM :{BLACK}{TOWN} + STR_TREES_REMOVE_TREES_BUTTON :{BLACK}Remove all Trees STR_TREES_REMOVE_TREES_TOOLTIP :{BLACK}Remove all Trees over landscape diff --git a/src/lang/extra/english_AU.txt b/src/lang/extra/english_AU.txt index 8eb8c290ed6..917471bfba7 100644 --- a/src/lang/extra/english_AU.txt +++ b/src/lang/extra/english_AU.txt @@ -51,6 +51,8 @@ STR_LINKGRAPH_STATS_TOOLTIP_CAPACITY :{}Capacity: {CA # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Snow line height: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Move the snow line height one up STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Move the snow line height one down diff --git a/src/lang/extra/english_US.txt b/src/lang/extra/english_US.txt index a693e67caab..68952fbcb07 100644 --- a/src/lang/extra/english_US.txt +++ b/src/lang/extra/english_US.txt @@ -52,6 +52,8 @@ STR_LINKGRAPH_STATS_TOOLTIP_CAPACITY :{}Capacity: {CA # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Snow line height: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Move the snow line height up one STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Move the snow line height down one diff --git a/src/lang/extra/esperanto.txt b/src/lang/extra/esperanto.txt index 4b1bea7f798..3df89f57857 100644 --- a/src/lang/extra/esperanto.txt +++ b/src/lang/extra/esperanto.txt @@ -22,6 +22,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Baskulig # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Neĝlinia alteco: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Altigu la neĝlinion per unu STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Malaltigu la neĝlinion per unu diff --git a/src/lang/extra/estonian.txt b/src/lang/extra/estonian.txt index 05d34d8065e..1ab510afc90 100644 --- a/src/lang/extra/estonian.txt +++ b/src/lang/extra/estonian.txt @@ -23,6 +23,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Vaheta l # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Lumepiiri kõrgus: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Lumepiiri liigutamine ühe võrra üles STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Lumepiiri liigutamine ühe võrra alla diff --git a/src/lang/extra/faroese.txt b/src/lang/extra/faroese.txt index 45b0b6bb7fe..f518e6e7b8f 100644 --- a/src/lang/extra/faroese.txt +++ b/src/lang/extra/faroese.txt @@ -18,6 +18,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Tendra/s # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Hædd á kava linju: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Flyt kava linjuna eitt upp STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Flyt kava linjuna eitt niður diff --git a/src/lang/extra/finnish.txt b/src/lang/extra/finnish.txt index 557ab4b2043..2858eea00ff 100644 --- a/src/lang/extra/finnish.txt +++ b/src/lang/extra/finnish.txt @@ -23,6 +23,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Muuta la # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Lumirajan korkeus: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Siirrä lumirajaa yksi taso ylöspäin STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Siirrä lumirajaa yksi taso alaspäin diff --git a/src/lang/extra/french.txt b/src/lang/extra/french.txt index 73d9c75cf18..0367841595a 100644 --- a/src/lang/extra/french.txt +++ b/src/lang/extra/french.txt @@ -26,6 +26,8 @@ STR_LINKGRAPH_STATS_TOOLTIP_CAPACITY :{}Capacité{NBS # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Alt. d'enneigement{NBSP}: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Augmenter l'altitude d'enneigement STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Baisser l'altitude d'enneigement diff --git a/src/lang/extra/frisian.txt b/src/lang/extra/frisian.txt index 14759b330fe..04c11dd8741 100644 --- a/src/lang/extra/frisian.txt +++ b/src/lang/extra/frisian.txt @@ -19,6 +19,8 @@ STR_CONFIG_SETTING_TIMETABLE_IN_TICKS_HELPTEXT :Lit reistiden s # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Hichte sniegrins: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Sniegrins ien omheech ferpleatsje: STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Sniegrins ien nei beneden ferpleatsje: diff --git a/src/lang/extra/gaelic.txt b/src/lang/extra/gaelic.txt index f507fe360d9..b941db4ed13 100644 --- a/src/lang/extra/gaelic.txt +++ b/src/lang/extra/gaelic.txt @@ -21,6 +21,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Toglaich # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Àirde na loidhne-shneachda: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Gluais an loidhne-shneachda suas aon cheum STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Gluais an loidhne-shneachda sìos aon cheum diff --git a/src/lang/extra/galician.txt b/src/lang/extra/galician.txt index 8d34e004c0a..1bfba9498de 100644 --- a/src/lang/extra/galician.txt +++ b/src/lang/extra/galician.txt @@ -1185,6 +1185,10 @@ STR_WATERWAYS_TOOLBAR_CREATE_RIVER_IN_GAME_TOOLTIP :{BLACK}Colocar STR_LANDSCAPING_TOOLTIP_RULER_TOOL :{BLACK}Usa unha regra virtual para medir a distancia e altura +#Town select window (for SE only) +STR_SELECT_TOWN_CAPTION :{WHITE}Selecciona localidade +STR_SELECT_TOWN_LIST_ITEM :{BLACK}{TOWN} + STR_TREES_REMOVE_TREES_BUTTON :{BLACK}Eliminar todas as árbores STR_TREES_REMOVE_TREES_TOOLTIP :{BLACK}Eliminar todas as árbores da paisaxe diff --git a/src/lang/extra/german.txt b/src/lang/extra/german.txt index ad3cc919bab..807c8ce8a0a 100644 --- a/src/lang/extra/german.txt +++ b/src/lang/extra/german.txt @@ -972,6 +972,10 @@ STR_WATERWAYS_TOOLBAR_CREATE_RIVER_IN_GAME_TOOLTIP :{BLACK}Flüsse STR_LANDSCAPING_TOOLTIP_RULER_TOOL :{BLACK}Benutze einen virtuellen Zollstock, um Entfernung und Höhe zu messen +#Town select window (for SE only) +STR_SELECT_TOWN_CAPTION :{WHITE}Wähle Stadt +STR_SELECT_TOWN_LIST_ITEM :{BLACK}{TOWN} + STR_TREES_REMOVE_TREES_BUTTON :{BLACK}Entferne alle Bäume STR_TREES_REMOVE_TREES_TOOLTIP :{BLACK}Entferne alle Bäume in der Landschaft diff --git a/src/lang/extra/greek.txt b/src/lang/extra/greek.txt index 37d94a8bbfb..6f53dd94410 100644 --- a/src/lang/extra/greek.txt +++ b/src/lang/extra/greek.txt @@ -23,6 +23,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Εναλ # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Ύψος γραμμής χιονιού: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Μετακίνηση του ύψους της γραμμής χιονιού ένα πάνω STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Μετακίνηση του ύψους της γραμμής χιονιού ένα κάτω diff --git a/src/lang/extra/hebrew.txt b/src/lang/extra/hebrew.txt index 3d4e52ace1e..e0f11027a9e 100644 --- a/src/lang/extra/hebrew.txt +++ b/src/lang/extra/hebrew.txt @@ -21,6 +21,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}שנה # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}גובה קו השלג STR_MAPGEN_SNOW_LINE_UP :{BLACK}הגבה את קו השלג STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}הנמך את קו השלג diff --git a/src/lang/extra/hindi.txt b/src/lang/extra/hindi.txt index b773ed86b08..982386c929f 100644 --- a/src/lang/extra/hindi.txt +++ b/src/lang/extra/hindi.txt @@ -2,6 +2,8 @@ # Programmable Pre-Signals +#Town select window (for SE only) + # Town tooltip # Cargo type orders Window diff --git a/src/lang/extra/hungarian.txt b/src/lang/extra/hungarian.txt index 1a153a24670..c4b30d32830 100644 --- a/src/lang/extra/hungarian.txt +++ b/src/lang/extra/hungarian.txt @@ -26,6 +26,8 @@ STR_LINKGRAPH_STATS_TOOLTIP_CAPACITY :{}Kapacitás: { # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Hóhatár: STR_MAPGEN_SNOW_LINE_UP :{BLACK}A hóhatár megnövelése eggyel STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}A hóhatár csökkentése eggyel diff --git a/src/lang/extra/icelandic.txt b/src/lang/extra/icelandic.txt index 5bd480cf9cb..231b2853272 100644 --- a/src/lang/extra/icelandic.txt +++ b/src/lang/extra/icelandic.txt @@ -18,6 +18,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Virkja/a # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Hæð snjólínu: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Hækka snjólínu upp um eitt þrep STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Lækka snjólínu niður um eitt þrep diff --git a/src/lang/extra/ido.txt b/src/lang/extra/ido.txt index 57dce6f22a6..9f348691b98 100644 --- a/src/lang/extra/ido.txt +++ b/src/lang/extra/ido.txt @@ -13,6 +13,8 @@ STR_VEHICLE_TYPE_AIRCRAFT :Aeroplani # Programmable Pre-Signals +#Town select window (for SE only) + # Town tooltip STR_VEHICLE_STATUS_HEADING_FOR_DEPOT_SERVICE_VEL_END :{LTBLUE}Servado ad {DEPOT}, {VELOCITY} diff --git a/src/lang/extra/indonesian.txt b/src/lang/extra/indonesian.txt index 62e8b8c9f3b..8e68f48b11d 100644 --- a/src/lang/extra/indonesian.txt +++ b/src/lang/extra/indonesian.txt @@ -22,6 +22,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Hidup/ma # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Tinggi garis salju: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Naikkan ketinggian garis salju satu angka STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Turunkan ketinggian garis salju satu angka diff --git a/src/lang/extra/irish.txt b/src/lang/extra/irish.txt index 8d660a343cb..414981e946d 100644 --- a/src/lang/extra/irish.txt +++ b/src/lang/extra/irish.txt @@ -21,6 +21,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Scorána # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Airde na líne sneachta: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Bog airde na líne sneachta suas ceann amháin STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Bog airde na líne sneachta síos ceann amháin diff --git a/src/lang/extra/italian.txt b/src/lang/extra/italian.txt index 3035b833642..d20e8c95a07 100644 --- a/src/lang/extra/italian.txt +++ b/src/lang/extra/italian.txt @@ -26,6 +26,8 @@ STR_LINKGRAPH_STATS_TOOLTIP_CAPACITY :{}Capacità: {C # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Altezza delle nevi: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Sposta in su di uno l'altezza delle nevi perenni STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Sposta in giù di uno l'altezza delle nevi perenni diff --git a/src/lang/extra/japanese.txt b/src/lang/extra/japanese.txt index 03d6039088e..78e8629ce3c 100644 --- a/src/lang/extra/japanese.txt +++ b/src/lang/extra/japanese.txt @@ -27,6 +27,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}積み # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}雪線の位置: STR_MAPGEN_SNOW_LINE_UP :{BLACK}雪線を上げる STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}雪線を下げる diff --git a/src/lang/extra/korean.txt b/src/lang/extra/korean.txt index 9eee1480dde..73e52b52322 100644 --- a/src/lang/extra/korean.txt +++ b/src/lang/extra/korean.txt @@ -1185,6 +1185,10 @@ STR_WATERWAYS_TOOLBAR_CREATE_RIVER_IN_GAME_TOOLTIP :{BLACK}강 만 STR_LANDSCAPING_TOOLTIP_RULER_TOOL :{BLACK}거리와 고도를 측정하기 위한 가상의 자를 사용합니다. +#Town select window (for SE only) +STR_SELECT_TOWN_CAPTION :{WHITE}도시 선택 +STR_SELECT_TOWN_LIST_ITEM :{BLACK}{TOWN} + STR_TREES_REMOVE_TREES_BUTTON :{BLACK}모든 나무 제거하기 STR_TREES_REMOVE_TREES_TOOLTIP :{BLACK}전 지역에 걸쳐 나무를 모두 제거합니다. diff --git a/src/lang/extra/latin.txt b/src/lang/extra/latin.txt index 987fd43387d..f0cb505a52c 100644 --- a/src/lang/extra/latin.txt +++ b/src/lang/extra/latin.txt @@ -21,6 +21,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Mutare p # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Altitudo nivis lineae: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Tollere altitudinem lineae nivis STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Inclinere altitudinem lineae nivis diff --git a/src/lang/extra/latvian.txt b/src/lang/extra/latvian.txt index b32ef7a0b6e..66b6d574bd4 100644 --- a/src/lang/extra/latvian.txt +++ b/src/lang/extra/latvian.txt @@ -23,6 +23,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Pārslē # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Sniega līnijas augstums STR_MAPGEN_SNOW_LINE_UP :{BLACK}Paaugstināt sniega līnijas augstumu STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Pazemināt sniega līnijas augstumu diff --git a/src/lang/extra/lithuanian.txt b/src/lang/extra/lithuanian.txt index 2ee767bf2f7..c45e492d0cd 100644 --- a/src/lang/extra/lithuanian.txt +++ b/src/lang/extra/lithuanian.txt @@ -22,6 +22,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Perjungt # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Sniego linijos aukštis: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Paaukštinti sniego liniją STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Pažeminti sniego liniją diff --git a/src/lang/extra/luxembourgish.txt b/src/lang/extra/luxembourgish.txt index 7583f55f9f5..79bf02c038d 100644 --- a/src/lang/extra/luxembourgish.txt +++ b/src/lang/extra/luxembourgish.txt @@ -23,6 +23,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Wiesselt # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Weis d'Schnéilinnhéicht STR_MAPGEN_SNOW_LINE_UP :{BLACK}Beweg Schnéilinnhéicht erop STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Beweg Schnéilinnhéicht erof diff --git a/src/lang/extra/macedonian.txt b/src/lang/extra/macedonian.txt index 77b95cada95..4d7bcd23283 100644 --- a/src/lang/extra/macedonian.txt +++ b/src/lang/extra/macedonian.txt @@ -13,6 +13,8 @@ STR_VEHICLE_TYPE_AIRCRAFT :Летала # Programmable Pre-Signals +#Town select window (for SE only) + # Town tooltip # Cargo type orders Window diff --git a/src/lang/extra/malay.txt b/src/lang/extra/malay.txt index 641cb8a4398..fd3664f3aec 100644 --- a/src/lang/extra/malay.txt +++ b/src/lang/extra/malay.txt @@ -20,6 +20,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Teluskan # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Paras ketinggian garis salji: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Tinggikan paras garis salji satu petak STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Rendahkan paras garis salji satu petak diff --git a/src/lang/extra/maltese.txt b/src/lang/extra/maltese.txt index e56b7b13a57..5b7d243b5a6 100644 --- a/src/lang/extra/maltese.txt +++ b/src/lang/extra/maltese.txt @@ -8,6 +8,8 @@ STR_BUTTON_RENAME :{BLACK}Semmi mi # Programmable Pre-Signals +#Town select window (for SE only) + # Town tooltip # Cargo type orders Window diff --git a/src/lang/extra/marathi.txt b/src/lang/extra/marathi.txt index 85dbfd69191..cbda3f42b0e 100644 --- a/src/lang/extra/marathi.txt +++ b/src/lang/extra/marathi.txt @@ -8,6 +8,8 @@ STR_BUTTON_RENAME :{BLACK}ना # Programmable Pre-Signals +#Town select window (for SE only) + # Town tooltip # Cargo type orders Window diff --git a/src/lang/extra/norwegian_bokmal.txt b/src/lang/extra/norwegian_bokmal.txt index 465b07b7d63..eb67656aa41 100644 --- a/src/lang/extra/norwegian_bokmal.txt +++ b/src/lang/extra/norwegian_bokmal.txt @@ -23,6 +23,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Gjennoms # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Høyde på snøgrensen: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Flytt høyden på snøgrensen ett hakk opp STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Flytt høyden på snøgrensen ett hakk ned diff --git a/src/lang/extra/norwegian_nynorsk.txt b/src/lang/extra/norwegian_nynorsk.txt index 4f008f456a2..899373de4a4 100644 --- a/src/lang/extra/norwegian_nynorsk.txt +++ b/src/lang/extra/norwegian_nynorsk.txt @@ -20,6 +20,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Byt gjen # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Høgd på snøgrensa: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Flytt høgda på snøgrensa eitt hakk opp STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Flytt høgda på snøgrensa eitt hakk ned diff --git a/src/lang/extra/persian.txt b/src/lang/extra/persian.txt index 792452975bd..8838f360d8c 100644 --- a/src/lang/extra/persian.txt +++ b/src/lang/extra/persian.txt @@ -20,6 +20,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}فعال # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}ارتفاع خط برف: STR_MAPGEN_SNOW_LINE_UP :{BLACK}اضافه کردن یک واحد به ارتفاع خط برف STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}کم کردن یک واحد از ارتفاع خط برف diff --git a/src/lang/extra/polish.txt b/src/lang/extra/polish.txt index d15ac74dc85..083c4aec2e9 100644 --- a/src/lang/extra/polish.txt +++ b/src/lang/extra/polish.txt @@ -26,6 +26,8 @@ STR_LINKGRAPH_STATS_TOOLTIP_CAPACITY :{}Ładowność: # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Śnieg od wysokości: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Podnieś wysokość śniegu o jeden w górę STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Obniż wysokość śniegu o jeden w dół diff --git a/src/lang/extra/portuguese.txt b/src/lang/extra/portuguese.txt index 509f6723ece..f615976bfd7 100644 --- a/src/lang/extra/portuguese.txt +++ b/src/lang/extra/portuguese.txt @@ -26,6 +26,8 @@ STR_LINKGRAPH_STATS_TOOLTIP_CAPACITY :{}Capacidade: { # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Altura linha neve: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Mover a linha de neve um nível acima STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Mover a linha de neve um nível abaixo diff --git a/src/lang/extra/romanian.txt b/src/lang/extra/romanian.txt index 83652524426..fe565db61e4 100644 --- a/src/lang/extra/romanian.txt +++ b/src/lang/extra/romanian.txt @@ -23,6 +23,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Comută # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Înălţimea zăpezii: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Mută linia zăpezii cu un punct în sus STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Mută linia zăpezii cu un punct în jos diff --git a/src/lang/extra/russian.txt b/src/lang/extra/russian.txt index 52db3306db9..f070436971a 100644 --- a/src/lang/extra/russian.txt +++ b/src/lang/extra/russian.txt @@ -1186,6 +1186,10 @@ STR_WATERWAYS_TOOLBAR_CREATE_RIVER_IN_GAME_TOOLTIP :{BLACK}Разм STR_LANDSCAPING_TOOLTIP_RULER_TOOL :{BLACK}Использовать виртуальную линейку для измерения расстояния и высоты +#Town select window (for SE only) +STR_SELECT_TOWN_CAPTION :{WHITE}Выбрать город +STR_SELECT_TOWN_LIST_ITEM :{BLACK}{TOWN} + STR_TREES_REMOVE_TREES_BUTTON :{BLACK}Удалить все деревья STR_TREES_REMOVE_TREES_TOOLTIP :{BLACK}Удалить все деревья над ландшафтом diff --git a/src/lang/extra/serbian.txt b/src/lang/extra/serbian.txt index fc7ac6f1a0f..0bbd9a1e3c2 100644 --- a/src/lang/extra/serbian.txt +++ b/src/lang/extra/serbian.txt @@ -23,6 +23,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Promena # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Nivo snežnog pokrivača: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Sužava snežni pokrivač naviše za jedan STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Proširuje snežni pojas naniže za jedan diff --git a/src/lang/extra/simplified_chinese.txt b/src/lang/extra/simplified_chinese.txt index 234e45fd99d..644231e5a8e 100644 --- a/src/lang/extra/simplified_chinese.txt +++ b/src/lang/extra/simplified_chinese.txt @@ -1182,6 +1182,10 @@ STR_WATERWAYS_TOOLBAR_CREATE_RIVER_IN_GAME_TOOLTIP :{BLACK}放置 STR_LANDSCAPING_TOOLTIP_RULER_TOOL :{BLACK}使用虚拟直尺来测量距离和高度差 +#Town select window (for SE only) +STR_SELECT_TOWN_CAPTION :{WHITE}选择城镇 +STR_SELECT_TOWN_LIST_ITEM :{BLACK}{TOWN} + STR_TREES_REMOVE_TREES_BUTTON :{BLACK}移除所有树木 STR_TREES_REMOVE_TREES_TOOLTIP :{BLACK}移除地面上的所有树木 diff --git a/src/lang/extra/slovak.txt b/src/lang/extra/slovak.txt index 47b0531a1ce..9fd703f4d65 100644 --- a/src/lang/extra/slovak.txt +++ b/src/lang/extra/slovak.txt @@ -26,6 +26,8 @@ STR_LINKGRAPH_STATS_TOOLTIP_CAPACITY :{}Kapacita: {CA # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Výška hranice snehu: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Zvýšiť výšku hranice snehu o jedno STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Znížiť výšku hranice snehu o jedno diff --git a/src/lang/extra/slovenian.txt b/src/lang/extra/slovenian.txt index 07cc303c43b..dfda0332ccd 100644 --- a/src/lang/extra/slovenian.txt +++ b/src/lang/extra/slovenian.txt @@ -21,6 +21,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Preklop # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Višina snežne meje: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Premik snežne meje eno enoto višje STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Premik snežne meje eno enoto nižje diff --git a/src/lang/extra/spanish.txt b/src/lang/extra/spanish.txt index bf97f0b855d..8e8c09a10d6 100644 --- a/src/lang/extra/spanish.txt +++ b/src/lang/extra/spanish.txt @@ -26,6 +26,8 @@ STR_LINKGRAPH_STATS_TOOLTIP_CAPACITY :{}Capacidad: {C # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Altura cota nieve: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Sube la cota de nieve una unidad STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Baja la cota de nieve una unidad diff --git a/src/lang/extra/spanish_MX.txt b/src/lang/extra/spanish_MX.txt index a38655aa08f..6fd54149ca2 100644 --- a/src/lang/extra/spanish_MX.txt +++ b/src/lang/extra/spanish_MX.txt @@ -26,6 +26,8 @@ STR_LINKGRAPH_STATS_TOOLTIP_CAPACITY :{}Capacidad: {C # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Nivel de nieve: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Mover el nivel de inicio de nieve hacia arriba STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Mover el nivel de inicio de nieve hacia abajo diff --git a/src/lang/extra/swedish.txt b/src/lang/extra/swedish.txt index bfa7917ce64..043091dbacd 100644 --- a/src/lang/extra/swedish.txt +++ b/src/lang/extra/swedish.txt @@ -23,6 +23,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Växla g # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Snögränsens höjd: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Höj snögränsens höjd ett steg STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Sänk snögränsens höjd ett steg diff --git a/src/lang/extra/tamil.txt b/src/lang/extra/tamil.txt index 3b2a9338342..c23c4a476a4 100644 --- a/src/lang/extra/tamil.txt +++ b/src/lang/extra/tamil.txt @@ -19,6 +19,8 @@ STR_CONFIG_SETTING_TIMETABLE_IN_TICKS_HELPTEXT :கால அ # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}பனிக் கோடின் உயரம்: STR_MAPGEN_SNOW_LINE_UP :{BLACK}பனி கோடின் உயரத்தை ஒரு அடி உயர்த்து STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}பனி கோடின் உயரத்தை ஒரு அடி இறக்கு diff --git a/src/lang/extra/thai.txt b/src/lang/extra/thai.txt index 010482d5562..670e358a811 100644 --- a/src/lang/extra/thai.txt +++ b/src/lang/extra/thai.txt @@ -18,6 +18,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}เป # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}เส้นความสูงเขตหิมะ: STR_MAPGEN_SNOW_LINE_UP :{BLACK}ปรับเปลี่ยนความสูงของหิมะขึ้นไป 1 ระดับ STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}ปรับเปลี่ยนความสูงของหิมะลงมา 1 ระดับ diff --git a/src/lang/extra/traditional_chinese.txt b/src/lang/extra/traditional_chinese.txt index 81561d7fd93..39d4f115c20 100644 --- a/src/lang/extra/traditional_chinese.txt +++ b/src/lang/extra/traditional_chinese.txt @@ -21,6 +21,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}切換 # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}雪線高度： STR_MAPGEN_SNOW_LINE_UP :{BLACK}將雪線高度上移一層 STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}將雪線高度下移一層 diff --git a/src/lang/extra/turkish.txt b/src/lang/extra/turkish.txt index e8670ba4e70..2b9fec77169 100644 --- a/src/lang/extra/turkish.txt +++ b/src/lang/extra/turkish.txt @@ -26,6 +26,8 @@ STR_LINKGRAPH_STATS_TOOLTIP_CAPACITY :{}Kapasite: {CA # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Kar yüksekliği: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Kar yüksekliğini bir arttır STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Kar yüksekliğini bir azalt diff --git a/src/lang/extra/ukrainian.txt b/src/lang/extra/ukrainian.txt index 7fd1dc3bad0..b8196118326 100644 --- a/src/lang/extra/ukrainian.txt +++ b/src/lang/extra/ukrainian.txt @@ -23,6 +23,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Змін # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Висота лінії снігу: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Підвищити лінію снігу STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Понизити лінію снігу diff --git a/src/lang/extra/urdu.txt b/src/lang/extra/urdu.txt index 09f880080a4..9645e8d3054 100644 --- a/src/lang/extra/urdu.txt +++ b/src/lang/extra/urdu.txt @@ -20,6 +20,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}لوڈ # Programmable Pre-Signals +#Town select window (for SE only) + # Town tooltip STR_VEHICLE_STATUS_HEADING_FOR_DEPOT_VEL_END :{ORANGE} روانگی {DEPOT} کی طرف، {VELOCITY} diff --git a/src/lang/extra/vietnamese.txt b/src/lang/extra/vietnamese.txt index d2e1d141c4c..dc1a9f9191d 100644 --- a/src/lang/extra/vietnamese.txt +++ b/src/lang/extra/vietnamese.txt @@ -26,6 +26,8 @@ STR_LINKGRAPH_STATS_TOOLTIP_CAPACITY :{}Sức chứa: # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Độ cao tuyết phủ: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Di chuyển độ cao tuyết phủ lên cao STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Di chuyển độ cao tuyết phủ xuống thấp diff --git a/src/lang/extra/welsh.txt b/src/lang/extra/welsh.txt index 39302651c7f..91cdb17f4da 100644 --- a/src/lang/extra/welsh.txt +++ b/src/lang/extra/welsh.txt @@ -23,6 +23,8 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Toglu tr # Programmable Pre-Signals +#Town select window (for SE only) + STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Uchder Llinell Eira: STR_MAPGEN_SNOW_LINE_UP :{BLACK}Symud y llinell eira un yn uwch STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Symud y llinell eira un yn is diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp index 0761ac25a04..bc28a432516 100644 --- a/src/town_cmd.cpp +++ b/src/town_cmd.cpp @@ -3090,7 +3090,7 @@ static bool TryBuildTownHouse(Town *t, TileIndex tile) return false; } -CommandCost CmdPlaceHouse(DoCommandFlag flags, TileIndex tile, HouseID house) +CommandCost CmdPlaceHouse(DoCommandFlag flags, TileIndex tile, HouseID house, TownID town_id) { if (_game_mode != GM_EDITOR) return CMD_ERROR; if (Town::GetNumItems() == 0) return_cmd_error(STR_ERROR_MUST_FOUND_TOWN_FIRST); @@ -3099,7 +3099,13 @@ CommandCost CmdPlaceHouse(DoCommandFlag flags, TileIndex tile, HouseID house) const HouseSpec *hs = HouseSpec::Get(house); if (!hs->enabled) return CMD_ERROR; - Town *t = ClosestTownFromTile(tile, UINT_MAX); + Town *t; + if (town_id == INVALID_TOWN) { + t = ClosestTownFromTile(tile, UINT_MAX); + } else { + t = Town::GetIfValid(town_id); + if (t == nullptr) return CMD_ERROR; + } int max_z = GetTileMaxZ(tile); @@ -3127,13 +3133,13 @@ CommandCost CmdPlaceHouse(DoCommandFlag flags, TileIndex tile, HouseID house) * @param tile Tile to place house on. * @param flags Type of operation. * @param p1 House ID. - * @param p2 Unused. + * @param p2 Town ID, or INVALID_TOWN to use nearest. * @param text Unused. * @return Empty cost or an error. */ CommandCost CmdPlaceHouse(TileIndex tile, DoCommandFlag flags, uint32_t p1, uint32_t p2, const char *text) { - return CmdPlaceHouse(flags, tile, static_cast(p1)); + return CmdPlaceHouse(flags, tile, static_cast(p1), static_cast(p2)); } /** diff --git a/src/town_gui.cpp b/src/town_gui.cpp index 1aff3b3a310..32dcff9052b 100644 --- a/src/town_gui.cpp +++ b/src/town_gui.cpp @@ -1535,6 +1535,127 @@ void ShowFoundTownWindow() AllocateWindowDescFront(_found_town_desc, 0); } +/** + * Window for selecting towns to build a house in. + */ +struct SelectTownWindow : Window { + TownList towns; ///< list of towns + CommandContainer cmd; ///< command to build the house (CMD_PLACE_HOUSE) + Scrollbar *vscroll; ///< scrollbar for the town list + + SelectTownWindow(WindowDesc &desc, const CommandContainer &cmd) : Window(desc), cmd(cmd) + { + std::vector> town_set; + constexpr uint MAX_TOWN_COUNT = 16; + for (const Town *t : Town::Iterate()) { + uint dist_sq = DistanceSquare(cmd.tile, t->xy); + if (town_set.size() >= MAX_TOWN_COUNT && dist_sq >= town_set.front().first) { + /* We already have enough entries and this town is further away than the furthest existing one, don't bother adding it */ + continue; + } + + /* Add to heap */ + town_set.emplace_back(dist_sq, t->index); + std::push_heap(town_set.begin(), town_set.end()); + + if (town_set.size() > MAX_TOWN_COUNT) { + /* Remove largest from heap */ + std::pop_heap(town_set.begin(), town_set.end()); + town_set.pop_back(); + } + } + std::sort_heap(town_set.begin(), town_set.end()); + for (auto &it : town_set) { + this->towns.push_back(it.second); + } + + this->CreateNestedTree(); + this->vscroll = this->GetScrollbar(WID_ST_SCROLLBAR); + this->vscroll->SetCount((uint)this->towns.size()); + this->FinishInitNested(); + } + + void UpdateWidgetSize(WidgetID widget, Dimension &size, const Dimension &padding, Dimension &fill, Dimension &resize) override + { + if (widget != WID_ST_PANEL) return; + + /* Determine the widest string */ + Dimension d = { 0, 0 }; + for (uint i = 0; i < this->towns.size(); i++) { + SetDParam(0, this->towns[i]); + d = maxdim(d, GetStringBoundingBox(STR_SELECT_TOWN_LIST_ITEM)); + } + + resize.height = d.height; + d.height *= 5; + d.width += WidgetDimensions::scaled.framerect.Horizontal(); + d.height += WidgetDimensions::scaled.framerect.Vertical(); + size = d; + } + + void DrawWidget(const Rect &r, WidgetID widget) const override + { + if (widget != WID_ST_PANEL) return; + + Rect ir = r.Shrink(WidgetDimensions::scaled.framerect); + uint y = ir.top; + uint end = std::min(this->vscroll->GetCount(), this->vscroll->GetPosition() + this->vscroll->GetCapacity()); + for (uint i = this->vscroll->GetPosition(); i < end; i++) { + SetDParam(0, this->towns[i]); + DrawString(ir.left, ir.right, y, STR_SELECT_TOWN_LIST_ITEM); + y += this->resize.step_height; + } + } + + void OnClick(Point pt, WidgetID widget, int click_count) override + { + if (widget != WID_ST_PANEL) return; + + uint pos = this->vscroll->GetScrolledRowFromWidget(pt.y, this, WID_ST_PANEL, WidgetDimensions::scaled.framerect.top); + if (pos >= this->towns.size()) return; + + /* Place a house */ + this->cmd.p2 = this->towns[pos]; + DoCommandP(this->cmd); + + /* Close the window */ + this->Close(); + } + + void OnResize() override + { + this->vscroll->SetCapacityFromWidget(this, WID_ST_PANEL, WidgetDimensions::scaled.framerect.Vertical()); + } +}; + +static const NWidgetPart _nested_select_town_widgets[] = { + NWidget(NWID_HORIZONTAL), + NWidget(WWT_CLOSEBOX, COLOUR_DARK_GREEN), + NWidget(WWT_CAPTION, COLOUR_DARK_GREEN, WID_ST_CAPTION), SetDataTip(STR_SELECT_TOWN_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), + NWidget(WWT_DEFSIZEBOX, COLOUR_DARK_GREEN), + EndContainer(), + NWidget(NWID_HORIZONTAL), + NWidget(WWT_PANEL, COLOUR_DARK_GREEN, WID_ST_PANEL), SetResize(1, 0), SetScrollbar(WID_ST_SCROLLBAR), EndContainer(), + NWidget(NWID_VERTICAL), + NWidget(NWID_VSCROLLBAR, COLOUR_DARK_GREEN, WID_ST_SCROLLBAR), + NWidget(WWT_RESIZEBOX, COLOUR_DARK_GREEN), + EndContainer(), + EndContainer(), +}; + +static WindowDesc _select_town_desc(__FILE__, __LINE__, + WDP_AUTO, "select_town", 100, 0, + WC_SELECT_TOWN, WC_NONE, + WDF_CONSTRUCTION, + _nested_select_town_widgets +); + +static void ShowSelectTownWindow(const CommandContainer &cmd) +{ + CloseWindowByClass(WC_SELECT_TOWN); + new SelectTownWindow(_select_town_desc, cmd); +} + void InitializeTownGui() { _town_local_authority_kdtree.Clear(); @@ -1830,7 +1951,18 @@ struct BuildHouseWindow : public PickerWindow { void OnPlaceObject([[maybe_unused]] Point pt, TileIndex tile) override { const HouseSpec *spec = HouseSpec::Get(HousePickerCallbacks::sel_type); - DoCommandP(tile, spec->Index(), 0, CMD_PLACE_HOUSE | CMD_MSG(STR_ERROR_CAN_T_BUILD_HOUSE), CcPlaySound_CONSTRUCTION_OTHER); + CommandContainer cmd = NewCommandContainerBasic( + tile, + spec->Index(), + INVALID_TOWN, + CMD_PLACE_HOUSE | CMD_MSG(STR_ERROR_CAN_T_BUILD_HOUSE), + CcPlaySound_CONSTRUCTION_OTHER + ); + if (_ctrl_pressed) { + ShowSelectTownWindow(cmd); + } else { + DoCommandP(cmd); + } } IntervalTimer view_refresh_interval = {std::chrono::milliseconds(2500), [this](auto) { diff --git a/src/widgets/town_widget.h b/src/widgets/town_widget.h index 3dc493d4ba8..936d4cb770f 100644 --- a/src/widgets/town_widget.h +++ b/src/widgets/town_widget.h @@ -68,4 +68,11 @@ enum TownFoundingWidgets : WidgetID { WID_TF_LAYOUT_RANDOM, ///< Selection for a randomly chosen town layout. }; +/** Widgets of the #SelectTownWindow class. */ +enum SelectTownWidgets : WidgetID { + WID_ST_CAPTION, ///< Caption of the window. + WID_ST_PANEL, ///< Main panel. + WID_ST_SCROLLBAR, ///< Scrollbar of the panel. +}; + #endif /* WIDGETS_TOWN_WIDGET_H */