From 2db9a59d8eec88b3c51bc09729764c2de4fce259 Mon Sep 17 00:00:00 2001 From: rubidium Date: Wed, 9 Apr 2008 19:52:33 +0000 Subject: [PATCH] (svn r12641) -Codechange: do not use the same button for two completely distinct tasks, just make an extra button for it and hide them when not needed. --- src/lang/afrikaans.txt | 1 - src/lang/brazilian_portuguese.txt | 1 - src/lang/bulgarian.txt | 1 - src/lang/catalan.txt | 1 - src/lang/croatian.txt | 1 - src/lang/czech.txt | 1 - src/lang/danish.txt | 1 - src/lang/dutch.txt | 1 - src/lang/english.txt | 1 - src/lang/english_US.txt | 1 - src/lang/esperanto.txt | 1 - src/lang/estonian.txt | 1 - src/lang/finnish.txt | 1 - src/lang/french.txt | 1 - src/lang/galician.txt | 1 - src/lang/german.txt | 1 - src/lang/hungarian.txt | 1 - src/lang/icelandic.txt | 1 - src/lang/italian.txt | 1 - src/lang/japanese.txt | 1 - src/lang/korean.txt | 1 - src/lang/lithuanian.txt | 1 - src/lang/norwegian_bokmal.txt | 1 - src/lang/norwegian_nynorsk.txt | 1 - src/lang/piglatin.txt | 1 - src/lang/polish.txt | 1 - src/lang/portuguese.txt | 1 - src/lang/romanian.txt | 1 - src/lang/russian.txt | 1 - src/lang/simplified_chinese.txt | 1 - src/lang/slovak.txt | 1 - src/lang/slovenian.txt | 1 - src/lang/spanish.txt | 1 - src/lang/swedish.txt | 1 - src/lang/traditional_chinese.txt | 1 - src/lang/turkish.txt | 1 - src/lang/ukrainian.txt | 1 - src/lang/unfinished/latvian.txt | 1 - src/order_cmd.cpp | 2 +- src/order_gui.cpp | 73 +++++++++++++++++++------------ 40 files changed, 46 insertions(+), 67 deletions(-) diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index adaa813d31..e1632899a6 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -2679,7 +2679,6 @@ STR_TIMETABLE_VIEW :{BLACK}Rooster STR_TIMETABLE_VIEW_TOOLTIP :{BLACK}Skakel na die rooster uitsig STR_8829_ORDERS :{WHITE}{VEHICLE} (Opdrae) STR_882A_END_OF_ORDERS :{SETX 10}- - Einde van Opdrae - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}Diens STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Kan nie spoorweg voertuig bou nie... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Gebou: {LTBLUE}{NUM}{BLACK} Waarde: {LTBLUE}{CURRENCY} diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 6ac7383358..016a5e65f8 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -2726,7 +2726,6 @@ STR_ORDER_VIEW :{BLACK}Ordens STR_ORDER_VIEW_TOOLTIP :{BLACK}Alternar para ver as ordens STR_8829_ORDERS :{WHITE}{VEHICLE} (Ordens) STR_882A_END_OF_ORDERS :{SETX 10}- - Fim de Ordens - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}Manutenção STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Impossível construir veículo ferroviário... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY} diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index cf094a2209..af1056eef0 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -2726,7 +2726,6 @@ STR_ORDER_VIEW :{BLACK}Сорт STR_ORDER_VIEW_TOOLTIP :{BLACK}Промени сортацията STR_8829_ORDERS :{WHITE}{VEHICLE} (Заповеди) STR_882A_END_OF_ORDERS :{SETX 10}- - Край на Заповедите - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}Ремонт STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Не може да купиш ЖП машина... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Купи: {LTBLUE}{NUM}{BLACK} Цена: {LTBLUE}{CURRENCY} diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index e791d23da9..6e1cf81c10 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -2725,7 +2725,6 @@ STR_ORDER_VIEW :{BLACK}Ordres STR_ORDER_VIEW_TOOLTIP :{BLACK}Commuta l'ordre de la vista STR_8829_ORDERS :{WHITE}{VEHICLE} (Ordres) STR_882A_END_OF_ORDERS :{SETX 10}- - Fí d'Ordres - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}Servei STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}No es pot construir el vehicle... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Construit: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY} diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 95ce25fd30..b0970ab868 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -2693,7 +2693,6 @@ STR_TIMETABLE_VIEW :{BLACK} Raspore STR_TIMETABLE_VIEW_TOOLTIP :{BLACK}Prebacivanje na pogled rasporeda STR_8829_ORDERS :{WHITE}{VEHICLE} (Naredbe) STR_882A_END_OF_ORDERS :{SETX 10}- - Kraj naredbi - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}Servis STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Nije moguće izgraditi željezničko vozilo... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Izgrađen: {LTBLUE}{NUM}{BLACK} Vrijednost: {LTBLUE}{CURRENCY} diff --git a/src/lang/czech.txt b/src/lang/czech.txt index b66c814422..64ec9d3383 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -2775,7 +2775,6 @@ STR_TIMETABLE_VIEW :{BLACK}Jízdní STR_TIMETABLE_VIEW_TOOLTIP :{BLACK}Přepnout na jízdní řád STR_8829_ORDERS :{WHITE}{VEHICLE} (Příkazy) STR_882A_END_OF_ORDERS :{SETX 10}- - Konec příkazů - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}Údržba STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Nemohu koupit vagon nebo lokomotivu... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Koupeno: {LTBLUE}{NUM}{BLACK} Hodnota: {LTBLUE}{CURRENCY} diff --git a/src/lang/danish.txt b/src/lang/danish.txt index 031d5203b1..75b3c8e3bc 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -2710,7 +2710,6 @@ STR_TIMETABLE_VIEW :{BLACK}Kørepla STR_TIMETABLE_VIEW_TOOLTIP :{BLACK}Skift til køreplan-visning STR_8829_ORDERS :{WHITE}{VEHICLE} (Ordrer) STR_882A_END_OF_ORDERS :{SETX 10}- - Slut på ordrer - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}Service STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Kan ikke bygge jernbanekøretøj... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Bygget: {LTBLUE}{NUM}{BLACK} Værdi: {LTBLUE}{CURRENCY} diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index 5b60909fc1..6ed3518935 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -2725,7 +2725,6 @@ STR_ORDER_VIEW :{BLACK}Orders STR_ORDER_VIEW_TOOLTIP :{BLACK}Ga naar het order scherm STR_8829_ORDERS :{WHITE}{VEHICLE} (Orders) STR_882A_END_OF_ORDERS :{SETX 10}- - Einde van orders - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}Reparatie STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Kan spoorvoertuig niet bouwen... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Gebouwd: {LTBLUE}{NUM}{BLACK} Waarde: {LTBLUE}{CURRENCY} diff --git a/src/lang/english.txt b/src/lang/english.txt index 66d541ba8d..ed5ea5f75b 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -2726,7 +2726,6 @@ STR_ORDER_VIEW :{BLACK}Orders STR_ORDER_VIEW_TOOLTIP :{BLACK}Switch to the order view STR_8829_ORDERS :{WHITE}{VEHICLE} (Orders) STR_882A_END_OF_ORDERS :{SETX 10}- - End of Orders - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}Service STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Can't build railway vehicle... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Built: {LTBLUE}{NUM}{BLACK} Value: {LTBLUE}{CURRENCY} diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 6d937b9617..7deaa29e39 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -2690,7 +2690,6 @@ STR_TIMETABLE_VIEW :{BLACK}Timetabl STR_TIMETABLE_VIEW_TOOLTIP :{BLACK}Switch to the timetable view STR_8829_ORDERS :{WHITE}{VEHICLE} (Orders) STR_882A_END_OF_ORDERS :{SETX 10}- - End of Orders - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}Service STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Can't build railroad vehicle... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Built: {LTBLUE}{NUM}{BLACK} Value: {LTBLUE}{CURRENCY} diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index ebca56caad..76b53aa8c8 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -2553,7 +2553,6 @@ STR_REFIT_TIP :{BLACK}Elektu STR_REFIT_ORDER :(Transformu al {STRING}) STR_8829_ORDERS :{WHITE}{VEHICLE} (Ordenoj) STR_882A_END_OF_ORDERS :{SETX 10}- - Fino de Ordenoj - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}Prizorgo STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Ne povas krei relan veturilon... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Kreite: {LTBLUE}{NUM}{BLACK} Valoro: {LTBLUE}{CURRENCY} diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index b0a8b790a4..5fe6ada17d 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -2810,7 +2810,6 @@ STR_TIMETABLE_VIEW :{BLACK}Sõidupl STR_TIMETABLE_VIEW_TOOLTIP :{BLACK}Näita sõiduplaani STR_8829_ORDERS :{WHITE}{VEHICLE} (käsud) STR_882A_END_OF_ORDERS :{SETX 10}- - Sihtpunktide lõpp - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}Hooldus STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Rööbassõidukit ei saa ehitada... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Ehitatud: {LTBLUE}{NUM}{BLACK} Väärtus: {LTBLUE}{CURRENCY} diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 423df7bbdd..241d6e3176 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -2670,7 +2670,6 @@ STR_TIMETABLE_VIEW :{BLACK}Aikataul STR_TIMETABLE_VIEW_TOOLTIP :{BLACK}Näytä aikataulu STR_8829_ORDERS :{WHITE}{VEHICLE} (aikataulu) STR_882A_END_OF_ORDERS :{SETX 10}- - aikataulun loppu - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}Huolto STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Yksikköä ei voi rakentaa... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Rakennettu: {LTBLUE}{NUM}{BLACK} Arvo: {LTBLUE}{CURRENCY} diff --git a/src/lang/french.txt b/src/lang/french.txt index 09b519e3e4..5d541379e5 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -2726,7 +2726,6 @@ STR_ORDER_VIEW :{BLACK}Ordres STR_ORDER_VIEW_TOOLTIP :{BLACK}Basculer vers la vue ordres STR_8829_ORDERS :{WHITE}{VEHICLE} (Ordres) STR_882A_END_OF_ORDERS :{SETX 10}- - Fin des ordres - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}Entretien STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Impossible de construire le véhicule ferroviaire... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Construit en: {LTBLUE}{NUM}{BLACK} Valeur: {LTBLUE}{CURRENCY} diff --git a/src/lang/galician.txt b/src/lang/galician.txt index c2de310570..1c750aaed4 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -2486,7 +2486,6 @@ STR_8828_UNLOAD :{BLACK}Descarga STR_TIMETABLE_VIEW :{BLACK}Táboa de tempo STR_8829_ORDERS :{WHITE}{VEHICLE} (Ordes) STR_882A_END_OF_ORDERS :{SETX 10}- - Fin das Ordes - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}Servicio STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}No se pode construí-lo vehículo de ferrocarril... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY} diff --git a/src/lang/german.txt b/src/lang/german.txt index bfa7745633..d68564743a 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -2711,7 +2711,6 @@ STR_TIMETABLE_VIEW :{BLACK}Fahrplan STR_TIMETABLE_VIEW_TOOLTIP :{BLACK}Zur Fahrplanansicht wechseln STR_8829_ORDERS :{WHITE}{VEHICLE} (Aufträge) STR_882A_END_OF_ORDERS :{SETX 10}- - Ende der Aufträge - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}Wartung STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Schienenfahrzeug kann nicht gebaut werden... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Gebaut: {LTBLUE}{NUM}{BLACK} Wert: {LTBLUE}{CURRENCY} diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 59ae953fa4..d8ddf31411 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -2825,7 +2825,6 @@ STR_TIMETABLE_VIEW :{BLACK}Menetren STR_TIMETABLE_VIEW_TOOLTIP :{BLACK}Átkapcsolás menetrendi nézetre STR_8829_ORDERS :{WHITE}{VEHICLE} menetrendje STR_882A_END_OF_ORDERS :{SETX 10}- - Menetrend vége - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}Javítás STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Nem veheted meg a vasúti járművet... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Vásárlás éve: {LTBLUE}{NUM}{BLACK} Érték: {LTBLUE}{CURRENCY} diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index 1c2d3a474f..1df544d28f 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -2725,7 +2725,6 @@ STR_ORDER_VIEW :{BLACK}Skipanir STR_ORDER_VIEW_TOOLTIP :{BLACK}Skipta yfir í skipanasýn STR_8829_ORDERS :{WHITE}{VEHICLE} (Skipanir) STR_882A_END_OF_ORDERS :{SETX 10}- - Endi skipana - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}Skoðun STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Get ekki byggt lest... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Framleitt: {LTBLUE}{NUM}{BLACK} Virði: {LTBLUE}{CURRENCY} diff --git a/src/lang/italian.txt b/src/lang/italian.txt index e3464c94dc..97fd4598b0 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -2727,7 +2727,6 @@ STR_ORDER_VIEW :{BLACK}Ordini STR_ORDER_VIEW_TOOLTIP :{BLACK}Passa alla visualizzazione degli ordini STR_8829_ORDERS :{WHITE}{VEHICLE} (Ordini) STR_882A_END_OF_ORDERS :{SETX 10}- - Fine degli ordini - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}Manutieni STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Impossibile costruire il veicolo ferroviario... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Costruito nel: {LTBLUE}{NUM}{BLACK} Valore: {LTBLUE}{CURRENCY} diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index 58d043dca2..82512c1f44 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -2708,7 +2708,6 @@ STR_TIMETABLE_VIEW :{BLACK}時刻 STR_TIMETABLE_VIEW_TOOLTIP :{BLACK}時刻表を表示します STR_8829_ORDERS :{WHITE}{VEHICLE}（指令） STR_882A_END_OF_ORDERS :{SETX 10}- - 指令終了 - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}修理 STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}鉄道車両が購入できません... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK}　購入日付：{LTBLUE}{NUM}{BLACK}　価値：{LTBLUE}{CURRENCY} diff --git a/src/lang/korean.txt b/src/lang/korean.txt index ed634a7fc4..212e4b2f04 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -2725,7 +2725,6 @@ STR_ORDER_VIEW :{BLACK}순서 STR_ORDER_VIEW_TOOLTIP :{BLACK}순서 보기로 변경 STR_8829_ORDERS :{WHITE}{VEHICLE} (경로) STR_882A_END_OF_ORDERS :{SETX 10}- - 경로의 끝 - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}점검 STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}기차를 생성할 수 없습니다... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} 생산: {LTBLUE}{NUM}{BLACK} 가격: {LTBLUE}{CURRENCY} diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index 293e9d085d..1a68ccabc1 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -2562,7 +2562,6 @@ STR_REFIT_TIP :{BLACK}Pasirink STR_REFIT_ORDER :(Keisti į {STRING}) STR_8829_ORDERS :{WHITE}{VEHICLE} (Uzduotys) STR_882A_END_OF_ORDERS :{SETX 10}- - Uzduociu pabaiga- - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}Remontas STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Gelezinkelio transporto priemones nupirkti negalima... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Pastatyta: {LTBLUE}{NUM}{BLACK} Verte: {LTBLUE}{CURRENCY} diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 126967fccb..7b9f48c1b8 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -2692,7 +2692,6 @@ STR_TIMETABLE_VIEW :{BLACK}Tidstabe STR_TIMETABLE_VIEW_TOOLTIP :{BLACK}Bytt til tidstabellvisning STR_8829_ORDERS :{WHITE}{VEHICLE} (Ordre) STR_882A_END_OF_ORDERS :{SETX 10}- - Slutt på ordre - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}Vedlikehold STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Kan ikke bygge jernbanekjøretøy... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Bygget: {LTBLUE}{NUM}{BLACK} Verdi: {LTBLUE}{CURRENCY} diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index dcb83dba77..efbca3a3b0 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -2691,7 +2691,6 @@ STR_TIMETABLE_VIEW :{BLACK}Rutetabe STR_TIMETABLE_VIEW_TOOLTIP :{BLACK}Bytt til rutetabellvinauge STR_8829_ORDERS :{WHITE}{VEHICLE} (Ordre) STR_882A_END_OF_ORDERS :{SETX 10}- - Slutt på ordre - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}Vedlikehald STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Kan ikkje byggje jernbanekøyretøy... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Bygd: {LTBLUE}{NUM}{BLACK} Verdi: {LTBLUE}{CURRENCY} diff --git a/src/lang/piglatin.txt b/src/lang/piglatin.txt index 0f3fd63525..35ab46e92c 100644 --- a/src/lang/piglatin.txt +++ b/src/lang/piglatin.txt @@ -2681,7 +2681,6 @@ STR_TIMETABLE_VIEW :{BLACK}Imetable STR_TIMETABLE_VIEW_TOOLTIP :{BLACK}Itchsway otay ethay imetabletay iewvay STR_8829_ORDERS :{WHITE}{VEHICLE} (Ordersway) STR_882A_END_OF_ORDERS :{SETX 10}- - Endway ofway Ordersway - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}Ervicesay STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}An'tcay uildbay ailwayray ehiclevay... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Uiltbay: {LTBLUE}{NUM}{BLACK} Aluevay: {LTBLUE}{CURRENCY} diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 7d630a1ce3..d7715ce653 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -2819,7 +2819,6 @@ STR_TIMETABLE_VIEW :{BLACK}Rozkład STR_TIMETABLE_VIEW_TOOLTIP :{BLACK}Otwórz widok rozkładu jazdy STR_8829_ORDERS :{WHITE}{VEHICLE} (Polecenia) STR_882A_END_OF_ORDERS :{SETX 10}- - Koniec poleceń - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}Serwis STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Nie można wybudować lokomotywy... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Budowa: {LTBLUE}{NUM}{BLACK} Wartość: {LTBLUE}{CURRENCY} diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 8ad2fcaab2..26a2e8dc4a 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -2710,7 +2710,6 @@ STR_TIMETABLE_VIEW :{BLACK}Horário STR_TIMETABLE_VIEW_TOOLTIP :{BLACK}Mudar para a vista de horário STR_8829_ORDERS :{WHITE}{VEHICLE} (Ordens) STR_882A_END_OF_ORDERS :{SETX 10}- - Fim de Ordens - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}Manutenção STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Não é possível construir veículo ferroviário... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY} diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index dd968afda7..290e0d7227 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -2691,7 +2691,6 @@ STR_TIMETABLE_VIEW :{BLACK}Orar STR_TIMETABLE_VIEW_TOOLTIP :{BLACK}Comuta in modul de vizualizare orar STR_8829_ORDERS :{WHITE}{VEHICLE} (Comenzi) STR_882A_END_OF_ORDERS :{SETX 10}- - Sfârşitul comenzilor - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}Service STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Nu pot construi vehiculul... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Cumpărat: {LTBLUE}{NUM}{BLACK} Valoare: {LTBLUE}{CURRENCY} diff --git a/src/lang/russian.txt b/src/lang/russian.txt index b6fde01cd9..69b1229918 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -2731,7 +2731,6 @@ STR_TIMETABLE_VIEW :{BLACK}Расп STR_TIMETABLE_VIEW_TOOLTIP :{BLACK}Просмотр расписания STR_8829_ORDERS :{WHITE}{VEHICLE} (Задания) STR_882A_END_OF_ORDERS :{SETX 10}- - Конец заданий - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}Обслуж. STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Невозможно построить ж/д транспорт... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Построен: {LTBLUE}{NUM}{BLACK} Стоимость: {LTBLUE}{CURRENCY} diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index 02b6844d32..7cfb8f3a2d 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -2550,7 +2550,6 @@ STR_TIMETABLE_VIEW :{BLACK}时间 STR_TIMETABLE_VIEW_TOOLTIP :{BLACK}切换到时间表视图 STR_8829_ORDERS :{WHITE}{VEHICLE} (调度计划) STR_882A_END_OF_ORDERS :{SETX 10}-- 调度计划结束 -- -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}保养 STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}不能购买列车…… STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} 建造时间：{LTBLUE}{NUM}{BLACK} 价值：{LTBLUE}{CURRENCY} diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index d87f60ff90..7abc935722 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -2788,7 +2788,6 @@ STR_ORDER_VIEW :{BLACK}Príkazy STR_ORDER_VIEW_TOOLTIP :{BLACK}Prepnút na zobrazenie príkazov STR_8829_ORDERS :{WHITE}{VEHICLE} (Prikazy) STR_882A_END_OF_ORDERS :{SETX 10}- - Koniec prikazov - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}Oprava STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Nemozno kupit vlak... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Vyrobene: {LTBLUE}{NUM}{BLACK} Hodnota: {LTBLUE}{CURRENCY} diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index ed494cc983..c2ccd5fc73 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -2805,7 +2805,6 @@ STR_ORDER_VIEW :{BLACK}Ukazi STR_ORDER_VIEW_TOOLTIP :{BLACK}Preklop na pogled ukazov STR_8829_ORDERS :{WHITE}{VEHICLE} (Ukazi) STR_882A_END_OF_ORDERS :{SETX 10}- - Konec ukazov - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}Servis STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Ni mogoče kupiti vozila ... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Zgrajeno: {LTBLUE}{NUM}{BLACK} Vrednost: {LTBLUE}{CURRENCY} diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index b9a969db9d..2ff35e003f 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -2711,7 +2711,6 @@ STR_TIMETABLE_VIEW :{BLACK}Horarios STR_TIMETABLE_VIEW_TOOLTIP :{BLACK}Cambiar a la vista de horarios STR_8829_ORDERS :{WHITE}{VEHICLE} (Órdenes) STR_882A_END_OF_ORDERS :{SETX 10}- - Fin de pedidos - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}Servicio STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}No se puede construir vehículo... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Construido: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY} diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 05a41fc409..ad17321d4f 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -2724,7 +2724,6 @@ STR_ORDER_VIEW :{BLACK}Order STR_ORDER_VIEW_TOOLTIP :{BLACK}Byt till ordervyn STR_8829_ORDERS :{WHITE}{VEHICLE} (Order) STR_882A_END_OF_ORDERS :{SETX 10}- - Slut på order - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}Servning STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Kan inte bygga järnvägfordon... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Byggt: {LTBLUE}{NUM}{BLACK} Värde: {LTBLUE}{CURRENCY} diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index dd6e536678..b550f1dde6 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -2687,7 +2687,6 @@ STR_TIMETABLE_VIEW :{BLACK}時刻 STR_TIMETABLE_VIEW_TOOLTIP :{BLACK}切換至時刻表檢視模式 STR_8829_ORDERS :{WHITE}{VEHICLE} (指令) STR_882A_END_OF_ORDERS :{SETX 10}- - 指令結束 - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}維護 STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}無法購買鐵道車輛... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} 購於：{LTBLUE}{NUM}{BLACK} 價值：{LTBLUE}{CURRENCY} diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index 6928d87895..6aa7022730 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -2721,7 +2721,6 @@ STR_TIMETABLE_VIEW :{BLACK}Zaman ç STR_TIMETABLE_VIEW_TOOLTIP :{BLACK}Zaman tablosu görünümüne geç STR_8829_ORDERS :{WHITE}{VEHICLE} (Talimatlar) STR_882A_END_OF_ORDERS :{SETX 10}- - Talimatların Sonu - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}Bakım STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Tren satın alınamaz... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Tarih: {LTBLUE}{NUM}{BLACK} Değeri: {LTBLUE}{CURRENCY} diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index c800845551..b02e34874d 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -2886,7 +2886,6 @@ STR_ORDER_VIEW :{BLACK}Завд STR_ORDER_VIEW_TOOLTIP :{BLACK}Переключитись до вікна завдань STR_8829_ORDERS :{WHITE}{VEHICLE} (Накази) STR_882A_END_OF_ORDERS :{SETX 10}- - Кінець наказів - - -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}Техогляд STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE :{WHITE}Неможливо збудувати поїзд... STR_882C_BUILT_VALUE :{LTBLUE}{ENGINE}{BLACK} Рік випуску: {LTBLUE}{NUM}{BLACK} Ціна: {LTBLUE}{CURRENCY} diff --git a/src/lang/unfinished/latvian.txt b/src/lang/unfinished/latvian.txt index 5d416d684f..e38b15aef5 100644 --- a/src/lang/unfinished/latvian.txt +++ b/src/lang/unfinished/latvian.txt @@ -1795,7 +1795,6 @@ STR_8812_EMPTY :{LTBLUE}Tukšs STR_8816 :{BLACK}- -STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING} STR_SERVICE :{BLACK}Serviss STR_882E :{WHITE}{VEHICLE} STR_TRAIN_MUST_BE_STOPPED :{WHITE}Vilciens ja'apsta'dina kad tas ierodas depo diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp index 9fc94e854f..cea569137c 100644 --- a/src/order_cmd.cpp +++ b/src/order_cmd.cpp @@ -797,7 +797,7 @@ CommandCost CmdModifyOrder(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) order->SetUnloadType((OrderUnloadFlags)data); /* Full loading gets disabled when un loading! */ if ((data & OUFB_UNLOAD) != 0) { - order->SetLoadType((OrderLoadFlags)(order->GetLoadType() & ~OLFB_FULL_LOAD)); + order->SetLoadType((OrderLoadFlags)(order->GetLoadType() & ~(OLFB_FULL_LOAD | OLF_FULL_LOAD_ANY))); } break; diff --git a/src/order_gui.cpp b/src/order_gui.cpp index 76fa29b334..3a59f818cd 100644 --- a/src/order_gui.cpp +++ b/src/order_gui.cpp @@ -44,8 +44,9 @@ enum OrderWindowWidgets { ORDER_WIDGET_UNLOAD, ORDER_WIDGET_REFIT, ORDER_WIDGET_TRANSFER, - ORDER_WIDGET_SHARED_ORDER_LIST, + ORDER_WIDGET_SERVICE, ORDER_WIDGET_RESIZE_BAR, + ORDER_WIDGET_SHARED_ORDER_LIST, ORDER_WIDGET_RESIZE, }; @@ -117,8 +118,6 @@ static void DrawOrdersWindow(Window *w) SetVScrollCount(w, v->num_orders + 1); int sel = OrderGetSel(w); - SetDParam(2, STR_8827_FULL_LOAD); - const Order *order = GetVehicleOrder(v, sel); if (v->owner == _local_player) { @@ -137,12 +136,16 @@ static void DrawOrdersWindow(Window *w) /* Disable list of vehicles with the same shared orders if there is no list */ w->SetWidgetDisabledState(ORDER_WIDGET_SHARED_ORDER_LIST, !shared_orders || v->orders == NULL); w->SetWidgetDisabledState(ORDER_WIDGET_REFIT, order == NULL); // Refit + w->SetWidgetDisabledState(ORDER_WIDGET_SERVICE, order == NULL); // Refit w->HideWidget(ORDER_WIDGET_REFIT); // Refit + w->HideWidget(ORDER_WIDGET_SERVICE); // Service } else { w->DisableWidget(ORDER_WIDGET_TRANSFER); + w->DisableWidget(ORDER_WIDGET_FULL_LOAD); } - w->ShowWidget(ORDER_WIDGET_UNLOAD); // Unload + w->ShowWidget(ORDER_WIDGET_UNLOAD); + w->ShowWidget(ORDER_WIDGET_TRANSFER); if (order != NULL) { switch (order->GetType()) { @@ -157,12 +160,13 @@ static void DrawOrdersWindow(Window *w) break; case OT_GOTO_DEPOT: - w->DisableWidget(ORDER_WIDGET_TRANSFER); + w->DisableWidget(ORDER_WIDGET_FULL_LOAD); /* Remove unload and replace it with refit */ w->HideWidget(ORDER_WIDGET_UNLOAD); w->ShowWidget(ORDER_WIDGET_REFIT); - SetDParam(2,STR_SERVICE); + w->HideWidget(ORDER_WIDGET_TRANSFER); + w->ShowWidget(ORDER_WIDGET_SERVICE); break; default: // every other orders @@ -397,11 +401,18 @@ static void OrderClick_FullLoad(Window *w, const Vehicle *v) VehicleOrderID sel_ord = OrderGetSel(w); const Order *order = GetVehicleOrder(v, sel_ord); - if (order->IsType(OT_GOTO_STATION)) { - DoCommandP(v->tile, v->index + (sel_ord << 16), MOF_LOAD | (order->GetLoadType() ^ OLFB_FULL_LOAD) << 2, NULL, CMD_MODIFY_ORDER | CMD_MSG(STR_8835_CAN_T_MODIFY_THIS_ORDER)); - } else { - DoCommandP(v->tile, v->index + (sel_ord << 16), MOF_DEPOT_ACTION, NULL, CMD_MODIFY_ORDER | CMD_MSG(STR_8835_CAN_T_MODIFY_THIS_ORDER)); - } + DoCommandP(v->tile, v->index + (sel_ord << 16), MOF_LOAD | ((order->GetLoadType() & OLFB_FULL_LOAD) ^ OLFB_FULL_LOAD) << 2, NULL, CMD_MODIFY_ORDER | CMD_MSG(STR_8835_CAN_T_MODIFY_THIS_ORDER)); +} + +/** + * Handle the click on the service. + * + * @param w current window + * @param v current vehicle + */ +static void OrderClick_Service(Window *w, const Vehicle *v) +{ + DoCommandP(v->tile, v->index + (OrderGetSel(w) << 16), MOF_DEPOT_ACTION, NULL, CMD_MODIFY_ORDER | CMD_MSG(STR_8835_CAN_T_MODIFY_THIS_ORDER)); } /** @@ -507,7 +518,8 @@ static OnButtonVehClick* const _order_button_proc[] = { OrderClick_Goto, OrderClick_FullLoad, OrderClick_Unload, - OrderClick_Transfer + OrderClick_Transfer, + OrderClick_Service, }; static const uint16 _order_keycodes[] = { @@ -618,6 +630,7 @@ static void OrdersWndProc(Window *w, WindowEvent *e) case ORDER_WIDGET_UNLOAD: OrderClick_Unload(w, v); break; + case ORDER_WIDGET_REFIT: OrderClick_Refit(w, v); break; @@ -626,6 +639,10 @@ static void OrdersWndProc(Window *w, WindowEvent *e) OrderClick_Transfer(w, v); break; + case ORDER_WIDGET_SERVICE: + OrderClick_Service(w, v); + break; + case ORDER_WIDGET_TIMETABLE_VIEW: ShowTimetableWindow(v); break; @@ -740,14 +757,14 @@ static const Widget _orders_train_widgets[] = { { WWT_PUSHTXTBTN, RESIZE_TB, 14, 53, 105, 76, 87, STR_8824_DELETE, STR_8854_DELETE_THE_HIGHLIGHTED}, // ORDER_WIDGET_DELETE { WWT_PUSHTXTBTN, RESIZE_TB, 14, 106, 158, 76, 87, STR_8825_NON_STOP, STR_8855_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_NON_STOP { WWT_TEXTBTN, RESIZE_TB, 14, 159, 211, 76, 87, STR_8826_GO_TO, STR_8856_INSERT_A_NEW_ORDER_BEFORE}, // ORDER_WIDGET_GOTO - { WWT_PUSHTXTBTN, RESIZE_TB, 14, 212, 264, 76, 87, STR_FULLLOAD_OR_SERVICE, STR_NULL}, // ORDER_WIDGET_FULL_LOAD + { WWT_PUSHTXTBTN, RESIZE_TB, 14, 212, 264, 76, 87, STR_8827_FULL_LOAD, STR_8857_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_FULL_LOAD { WWT_PUSHTXTBTN, RESIZE_TB, 14, 265, 319, 76, 87, STR_8828_UNLOAD, STR_8858_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_UNLOAD { WWT_PUSHTXTBTN, RESIZE_TB, 14, 265, 319, 76, 87, STR_REFIT, STR_REFIT_TIP}, // ORDER_WIDGET_REFIT { WWT_PUSHTXTBTN, RESIZE_TB, 14, 320, 372, 76, 87, STR_TRANSFER, STR_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_TRANSFER - - { WWT_PUSHIMGBTN, RESIZE_TB, 14, 373, 386, 76, 87, SPR_SHARED_ORDERS_ICON, STR_VEH_WITH_SHARED_ORDERS_LIST_TIP}, // ORDER_WIDGET_SHARED_ORDER_LIST + { WWT_PUSHTXTBTN, RESIZE_TB, 14, 320, 372, 76, 87, STR_SERVICE, STR_NULL}, // ORDER_WIDGET_SERVICE { WWT_PANEL, RESIZE_RTB, 14, 387, 386, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_RESIZE_BAR + { WWT_PUSHIMGBTN, RESIZE_TB, 14, 373, 386, 76, 87, SPR_SHARED_ORDERS_ICON, STR_VEH_WITH_SHARED_ORDERS_LIST_TIP}, // ORDER_WIDGET_SHARED_ORDER_LIST { WWT_RESIZEBOX, RESIZE_LRTB, 14, 387, 398, 76, 87, 0x0, STR_RESIZE_BUTTON}, // ORDER_WIDGET_RESIZE { WIDGETS_END}, @@ -777,14 +794,14 @@ static const Widget _orders_widgets[] = { { WWT_PUSHTXTBTN, RESIZE_TB, 14, 64, 128, 76, 87, STR_8824_DELETE, STR_8854_DELETE_THE_HIGHLIGHTED}, // ORDER_WIDGET_DELETE { WWT_EMPTY, RESIZE_TB, 14, 0, 0, 76, 87, 0x0, 0x0}, // ORDER_WIDGET_NON_STOP { WWT_TEXTBTN, RESIZE_TB, 14, 129, 192, 76, 87, STR_8826_GO_TO, STR_8856_INSERT_A_NEW_ORDER_BEFORE}, // ORDER_WIDGET_GOTO - { WWT_PUSHTXTBTN, RESIZE_TB, 14, 193, 256, 76, 87, STR_FULLLOAD_OR_SERVICE, STR_NULL}, // ORDER_WIDGET_FULL_LOAD + { WWT_PUSHTXTBTN, RESIZE_TB, 14, 193, 256, 76, 87, STR_8827_FULL_LOAD, STR_8857_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_FULL_LOAD { WWT_PUSHTXTBTN, RESIZE_TB, 14, 257, 319, 76, 87, STR_8828_UNLOAD, STR_8858_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_UNLOAD { WWT_PUSHTXTBTN, RESIZE_TB, 14, 257, 319, 76, 87, STR_REFIT, STR_REFIT_TIP}, // ORDER_WIDGET_REFIT { WWT_PUSHTXTBTN, RESIZE_TB, 14, 320, 383, 76, 87, STR_TRANSFER, STR_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_TRANSFER - - { WWT_PUSHIMGBTN, RESIZE_TB, 14, 384, 397, 76, 87, SPR_SHARED_ORDERS_ICON, STR_VEH_WITH_SHARED_ORDERS_LIST_TIP}, // ORDER_WIDGET_SHARED_ORDER_LIST + { WWT_PUSHTXTBTN, RESIZE_TB, 14, 320, 383, 76, 87, STR_SERVICE, STR_NULL}, // ORDER_WIDGET_SERVICE { WWT_PANEL, RESIZE_RTB, 14, 397, 396, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_RESIZE_BAR + { WWT_PUSHIMGBTN, RESIZE_TB, 14, 384, 397, 76, 87, SPR_SHARED_ORDERS_ICON, STR_VEH_WITH_SHARED_ORDERS_LIST_TIP}, // ORDER_WIDGET_SHARED_ORDER_LIST { WWT_RESIZEBOX, RESIZE_LRTB, 14, 398, 409, 76, 87, 0x0, STR_RESIZE_BUTTON}, // ORDER_WIDGET_RESIZE { WIDGETS_END}, @@ -810,18 +827,18 @@ static const Widget _other_orders_widgets[] = { { WWT_SCROLLBAR, RESIZE_LRB, 14, 320, 331, 14, 75, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST}, // ORDER_WIDGET_SCROLLBAR - { WWT_EMPTY, RESIZE_NONE, 14, 0, 319, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_SKIP - { WWT_EMPTY, RESIZE_NONE, 14, 0, 319, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_DELETE - { WWT_EMPTY, RESIZE_NONE, 14, 0, 319, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_NON_STOP - { WWT_EMPTY, RESIZE_NONE, 14, 0, 319, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_GOTO - { WWT_EMPTY, RESIZE_NONE, 14, 0, 319, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_FULL_LOAD - { WWT_EMPTY, RESIZE_NONE, 14, 0, 319, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_UNLOAD - { WWT_EMPTY, RESIZE_NONE, 14, 0, 319, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_REFIT - { WWT_EMPTY, RESIZE_NONE, 14, 0, 319, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_TRANSFER - - { WWT_EMPTY, RESIZE_NONE, 14, 0, 319, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_SHARED_ORDER_LIST + { WWT_EMPTY, RESIZE_NONE, 14, 0, 0, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_SKIP + { WWT_EMPTY, RESIZE_NONE, 14, 0, 0, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_DELETE + { WWT_EMPTY, RESIZE_NONE, 14, 0, 0, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_NON_STOP + { WWT_EMPTY, RESIZE_NONE, 14, 0, 0, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_GOTO + { WWT_EMPTY, RESIZE_NONE, 14, 0, 0, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_FULL_LOAD + { WWT_EMPTY, RESIZE_NONE, 14, 0, 0, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_UNLOAD + { WWT_EMPTY, RESIZE_NONE, 14, 0, 0, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_REFIT + { WWT_EMPTY, RESIZE_NONE, 14, 0, 0, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_TRANSFER + { WWT_EMPTY, RESIZE_NONE, 14, 0, 0, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_SERVICE { WWT_PANEL, RESIZE_RTB, 14, 0, 319, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_RESIZE_BAR + { WWT_EMPTY, RESIZE_TB, 14, 0, 0, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_SHARED_ORDER_LIST { WWT_RESIZEBOX, RESIZE_LRTB, 14, 320, 331, 76, 87, 0x0, STR_RESIZE_BUTTON}, // ORDER_WIDGET_RESIZE { WIDGETS_END},