Index: bin/baseset/openttd.grf =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: bin/baseset/orig_dos.obg =================================================================== --- bin/baseset/orig_dos.obg (revision 26457) +++ bin/baseset/orig_dos.obg (working copy) @@ -70,7 +70,7 @@ TRGC.GRF = ed446637e034104c5559b32c18afe78d TRGH.GRF = ee6616fb0e6ef6b24892c58c93d86fc9 TRGT.GRF = e30e8a398ae86c03dc534a8ac7dfb3b6 -OPENTTD.GRF = 75a93cea2ed455c2fd5dcbda39e53538 +OPENTTD.GRF = d9ef51e1f467a26dd794981baa0af668 [origin] default = You can find it on your Transport Tycoon Deluxe CD-ROM. Index: bin/baseset/orig_dos_de.obg =================================================================== --- bin/baseset/orig_dos_de.obg (revision 26457) +++ bin/baseset/orig_dos_de.obg (working copy) @@ -70,7 +70,7 @@ TRGC.GRF = ed446637e034104c5559b32c18afe78d TRGH.GRF = ee6616fb0e6ef6b24892c58c93d86fc9 TRGT.GRF = fcde1d7e8a74197d72a62695884b909e -OPENTTD.GRF = 75a93cea2ed455c2fd5dcbda39e53538 +OPENTTD.GRF = d9ef51e1f467a26dd794981baa0af668 [origin] default = You can find it on your Transport Tycoon Deluxe CD-ROM. Index: bin/baseset/orig_win.obg =================================================================== --- bin/baseset/orig_win.obg (revision 26457) +++ bin/baseset/orig_win.obg (working copy) @@ -70,7 +70,7 @@ TRGCR.GRF = 3668f410c761a050b5e7095a2b14879b TRGHR.GRF = 06bf2b7a31766f048baac2ebe43457b1 TRGTR.GRF = de53650517fe661ceaa3138c6edb0eb8 -OPENTTD.GRF = 75a93cea2ed455c2fd5dcbda39e53538 +OPENTTD.GRF = d9ef51e1f467a26dd794981baa0af668 [origin] default = You can find it on your Transport Tycoon Deluxe CD-ROM. Index: media/extra_grf/openttdgui.nfo =================================================================== --- media/extra_grf/openttdgui.nfo (revision 26457) +++ media/extra_grf/openttdgui.nfo (working copy) @@ -7,7 +7,7 @@ // See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . // -1 * 0 0C "OpenTTD GUI graphics" - -1 * 3 05 15 \b 175 // OPENTTD_SPRITE_COUNT + -1 * 3 05 15 \b 176 // OPENTTD_SPRITE_COUNT -1 sprites/openttdgui.png 8bpp 66 8 64 31 -31 7 normal -1 sprites/openttdgui.png 8bpp 146 8 64 31 -31 7 normal -1 sprites/openttdgui.png 8bpp 226 8 64 31 -31 7 normal @@ -183,3 +183,4 @@ -1 sprites/openttdgui.png 8bpp 440 440 20 20 0 0 normal -1 sprites/openttdgui.png 8bpp 466 440 20 20 0 0 normal -1 sprites/openttdgui.png 8bpp 490 440 20 20 0 0 normal + -1 sprites/openttdgui.png 8bpp 517 440 8 8 0 0 normal Index: media/extra_grf/openttdgui.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: src/depot_gui.cpp =================================================================== --- src/depot_gui.cpp (revision 26457) +++ src/depot_gui.cpp (working copy) @@ -47,6 +47,7 @@ NWidget(WWT_SHADEBOX, COLOUR_GREY), NWidget(WWT_DEFSIZEBOX, COLOUR_GREY), NWidget(WWT_STICKYBOX, COLOUR_GREY), + NWidget(WWT_LOCATIONBOX, COLOUR_GREY, WID_D_LOCATION), EndContainer(), NWidget(NWID_HORIZONTAL), NWidget(NWID_VERTICAL), @@ -68,7 +69,6 @@ NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_D_BUILD), SetDataTip(0x0, STR_NULL), SetFill(1, 1), SetResize(1, 0), NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_D_CLONE), SetDataTip(0x0, STR_NULL), SetFill(1, 1), SetResize(1, 0), - NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_D_LOCATION), SetDataTip(STR_BUTTON_LOCATION, STR_NULL), SetFill(1, 1), SetResize(1, 0), NWidget(NWID_SELECTION, INVALID_COLOUR, WID_D_SHOW_RENAME), // rename button NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_D_RENAME), SetDataTip(STR_BUTTON_RENAME, STR_DEPOT_RENAME_TOOLTIP), SetFill(1, 1), SetResize(1, 0), EndContainer(), Index: src/error_gui.cpp =================================================================== --- src/error_gui.cpp (revision 26457) +++ src/error_gui.cpp (working copy) @@ -23,6 +23,7 @@ #include "window_func.h" #include "console_func.h" #include "window_gui.h" +#include "gui.h" ///< TODO: Check with community if there's a set order for imports #include "widgets/error_widget.h" @@ -33,6 +34,7 @@ NWidget(NWID_HORIZONTAL), NWidget(WWT_CLOSEBOX, COLOUR_RED), NWidget(WWT_CAPTION, COLOUR_RED, WID_EM_CAPTION), SetDataTip(STR_ERROR_MESSAGE_CAPTION, STR_NULL), + NWidget(WWT_LOCATIONBOX, COLOUR_RED, WID_EM_LOCATION), SetDataTip(STR_NULL, STR_ERROR_LOCATION_TOOLTIP), EndContainer(), NWidget(WWT_PANEL, COLOUR_RED), NWidget(WWT_EMPTY, COLOUR_RED, WID_EM_MESSAGE), SetPadding(0, 2, 0, 2), SetMinimalSize(236, 32), @@ -50,6 +52,7 @@ NWidget(NWID_HORIZONTAL), NWidget(WWT_CLOSEBOX, COLOUR_RED), NWidget(WWT_CAPTION, COLOUR_RED, WID_EM_CAPTION), SetDataTip(STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY, STR_NULL), + NWidget(WWT_LOCATIONBOX, COLOUR_RED, WID_EM_LOCATION), SetDataTip(STR_NULL, STR_ERROR_LOCATION_TOOLTIP), EndContainer(), NWidget(WWT_PANEL, COLOUR_RED), NWidget(NWID_HORIZONTAL), SetPIP(2, 1, 2), @@ -180,21 +183,30 @@ virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) { - if (widget != WID_EM_MESSAGE) return; + switch (widget) { + case WID_EM_LOCATION: + if (this->position.x == 0 && this->position.y == 0) { + size->height = 0; + size->width = 0; + } + break; + case WID_EM_MESSAGE: { + CopyInDParam(0, this->decode_params, lengthof(this->decode_params)); + if (this->textref_stack_size > 0) StartTextRefStackUsage(this->textref_stack_grffile, this->textref_stack_size, this->textref_stack); - CopyInDParam(0, this->decode_params, lengthof(this->decode_params)); - if (this->textref_stack_size > 0) StartTextRefStackUsage(this->textref_stack_grffile, this->textref_stack_size, this->textref_stack); + int text_width = max(0, (int)size->width - WD_FRAMETEXT_LEFT - WD_FRAMETEXT_RIGHT); + this->height_summary = GetStringHeight(this->summary_msg, text_width); + this->height_detailed = (this->detailed_msg == INVALID_STRING_ID) ? 0 : GetStringHeight(this->detailed_msg, text_width); - int text_width = max(0, (int)size->width - WD_FRAMETEXT_LEFT - WD_FRAMETEXT_RIGHT); - this->height_summary = GetStringHeight(this->summary_msg, text_width); - this->height_detailed = (this->detailed_msg == INVALID_STRING_ID) ? 0 : GetStringHeight(this->detailed_msg, text_width); + if (this->textref_stack_size > 0) StopTextRefStackUsage(); - if (this->textref_stack_size > 0) StopTextRefStackUsage(); + uint panel_height = WD_FRAMERECT_TOP + this->height_summary + WD_FRAMERECT_BOTTOM; + if (this->detailed_msg != INVALID_STRING_ID) panel_height += this->height_detailed + WD_PAR_VSEP_WIDE; - uint panel_height = WD_FRAMERECT_TOP + this->height_summary + WD_FRAMERECT_BOTTOM; - if (this->detailed_msg != INVALID_STRING_ID) panel_height += this->height_detailed + WD_PAR_VSEP_WIDE; - - size->height = max(size->height, panel_height); + size->height = max(size->height, panel_height); + break; + } + } } virtual Point OnInitialPosition(int16 sm_width, int16 sm_height, int window_number) @@ -317,6 +329,20 @@ { return this->duration == 0; } + + virtual void OnClick(Point pt, int widget, int click_count) + { + switch (widget) { + case WID_EM_LOCATION: + TileIndex ti = TileVirtXY(this->position.x, this->position.y); + if (_ctrl_pressed) { + ShowExtraViewPortWindow(ti); + } else { + ScrollMainWindowToTile(ti); + } + break; + } + } }; /** Index: src/industry_gui.cpp =================================================================== --- src/industry_gui.cpp (revision 26457) +++ src/industry_gui.cpp (working copy) @@ -1015,6 +1015,7 @@ NWidget(WWT_SHADEBOX, COLOUR_CREAM), NWidget(WWT_DEFSIZEBOX, COLOUR_CREAM), NWidget(WWT_STICKYBOX, COLOUR_CREAM), + NWidget(WWT_LOCATIONBOX, COLOUR_CREAM, WID_IV_GOTO), SetDataTip(STR_NULL, STR_INDUSTRY_VIEW_LOCATION_TOOLTIP), EndContainer(), NWidget(WWT_PANEL, COLOUR_CREAM), NWidget(WWT_INSET, COLOUR_CREAM), SetPadding(2, 2, 2, 2), @@ -1024,7 +1025,6 @@ NWidget(WWT_PANEL, COLOUR_CREAM, WID_IV_INFO), SetMinimalSize(260, 2), SetResize(1, 0), EndContainer(), NWidget(NWID_HORIZONTAL), - NWidget(WWT_PUSHTXTBTN, COLOUR_CREAM, WID_IV_GOTO), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_BUTTON_LOCATION, STR_INDUSTRY_VIEW_LOCATION_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_CREAM, WID_IV_DISPLAY), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_INDUSTRY_DISPLAY_CHAIN, STR_INDUSTRY_DISPLAY_CHAIN_TOOLTIP), NWidget(WWT_RESIZEBOX, COLOUR_CREAM), EndContainer(), Index: src/lang/afrikaans.txt =================================================================== --- src/lang/afrikaans.txt (revision 26457) +++ src/lang/afrikaans.txt (working copy) @@ -234,7 +234,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Kies kriterea om volgens te rangskik STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Kies kriteria om volgens te filter STR_BUTTON_SORT_BY :{BLACK}Sorteer volgens -STR_BUTTON_LOCATION :{BLACK}Ligging STR_BUTTON_RENAME :{BLACK}Hernoem STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Maak venster toe Index: src/lang/arabic_egypt.txt =================================================================== --- src/lang/arabic_egypt.txt (revision 26457) +++ src/lang/arabic_egypt.txt (working copy) @@ -224,7 +224,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK} اختر نوع الترتيب STR_TOOLTIP_FILTER_CRITERIA :{BLACK}حدد معايير المُرَشِح STR_BUTTON_SORT_BY :{BLACK} رتب بـ -STR_BUTTON_LOCATION :{BLACK}الموقع STR_BUTTON_RENAME :{BLACK}اعادة تسمية STR_TOOLTIP_CLOSE_WINDOW :{BLACK}اغلاق الاطار Index: src/lang/basque.txt =================================================================== --- src/lang/basque.txt (revision 26457) +++ src/lang/basque.txt (working copy) @@ -231,7 +231,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Aukeratu ordenatze irizpideak STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Aukeratu iragazki irizpideak STR_BUTTON_SORT_BY :{BLACK}Ordenatu -STR_BUTTON_LOCATION :{BLACK}Kokapena STR_BUTTON_RENAME :{BLACK}Berrizendatu STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Lehioa itxi Index: src/lang/belarusian.txt =================================================================== --- src/lang/belarusian.txt (revision 26457) +++ src/lang/belarusian.txt (working copy) @@ -546,7 +546,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Зьмена крытэрыю сартаваньня STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Выберыце фiльтр STR_BUTTON_SORT_BY :{BLACK}Сартаваньне -STR_BUTTON_LOCATION :{BLACK}Агляд STR_BUTTON_RENAME :{BLACK}Перайменаваць STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Закрыць вакно Index: src/lang/brazilian_portuguese.txt =================================================================== --- src/lang/brazilian_portuguese.txt (revision 26457) +++ src/lang/brazilian_portuguese.txt (working copy) @@ -234,7 +234,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Selecione critério de classificação STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Selecione critério para filtração STR_BUTTON_SORT_BY :{BLACK}Classificar por -STR_BUTTON_LOCATION :{BLACK}Local STR_BUTTON_RENAME :{BLACK}Renomear STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Fechar janela Index: src/lang/bulgarian.txt =================================================================== --- src/lang/bulgarian.txt (revision 26457) +++ src/lang/bulgarian.txt (working copy) @@ -234,7 +234,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Избери критерий за сортиране STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Избери критерии за филтриране STR_BUTTON_SORT_BY :{BLACK}Сортирай по -STR_BUTTON_LOCATION :{BLACK}Позиция STR_BUTTON_RENAME :{BLACK}Преименувай STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Затвори прозореца Index: src/lang/catalan.txt =================================================================== --- src/lang/catalan.txt (revision 26457) +++ src/lang/catalan.txt (working copy) @@ -234,7 +234,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Selecciona el criteri de classificació STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Selecciona el criteri de filtratge STR_BUTTON_SORT_BY :{BLACK}Ordena per -STR_BUTTON_LOCATION :{G=Masculin}{BLACK}Lloc STR_BUTTON_RENAME :{BLACK}Canvia el nom STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Tanca la finestra Index: src/lang/croatian.txt =================================================================== --- src/lang/croatian.txt (revision 26457) +++ src/lang/croatian.txt (working copy) @@ -329,7 +329,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Izaberi kriterij za sortiranje STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Odaberi kriterij filtriranja STR_BUTTON_SORT_BY :{BLACK}Sortiraj prema -STR_BUTTON_LOCATION :{BLACK}Lokacija STR_BUTTON_RENAME :{BLACK}Preimenuj STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Zatvori prozor Index: src/lang/czech.txt =================================================================== --- src/lang/czech.txt (revision 26457) +++ src/lang/czech.txt (working copy) @@ -308,7 +308,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Vyber, podle čeho se má třídit STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Vyber třídící podmínku STR_BUTTON_SORT_BY :{BLACK}Řadit podle -STR_BUTTON_LOCATION :{BLACK}Umístění STR_BUTTON_RENAME :{BLACK}Přejmenovat STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Zavřít okno Index: src/lang/danish.txt =================================================================== --- src/lang/danish.txt (revision 26457) +++ src/lang/danish.txt (working copy) @@ -233,7 +233,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Vælg sorteringskriterie STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Vælg filtreringskriterier STR_BUTTON_SORT_BY :{BLACK}Sortér på -STR_BUTTON_LOCATION :{BLACK}Lokalitet STR_BUTTON_RENAME :{BLACK}Omdøb STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Luk vindue Index: src/lang/dutch.txt =================================================================== --- src/lang/dutch.txt (revision 26457) +++ src/lang/dutch.txt (working copy) @@ -233,7 +233,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Selecteer sorteercriteria STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Kies filtercriteria STR_BUTTON_SORT_BY :{BLACK}Sorteer op -STR_BUTTON_LOCATION :{BLACK}Locatie STR_BUTTON_RENAME :{BLACK}Hernoem STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Sluit venster Index: src/lang/english.txt =================================================================== --- src/lang/english.txt (revision 26457) +++ src/lang/english.txt (working copy) @@ -233,7 +233,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Select sorting criteria STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Select filtering criteria STR_BUTTON_SORT_BY :{BLACK}Sort by -STR_BUTTON_LOCATION :{BLACK}Location STR_BUTTON_RENAME :{BLACK}Rename STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Close window @@ -2553,6 +2552,7 @@ STR_LAND_AREA_INFORMATION_CARGO_EIGHTS :({COMMA}/8 {STRING}) STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT :{BLACK}Rail speed limit: {LTBLUE}{VELOCITY} STR_LANG_AREA_INFORMATION_ROAD_SPEED_LIMIT :{BLACK}Road speed limit: {LTBLUE}{VELOCITY} +STR_LAND_AREA_INFORMATION_LOCATION_TOOLTIP :{BLACK}Click to go to this location. Ctrl+Click to open a viewport on this location. # Description of land area of different tiles STR_LAI_CLEAR_DESCRIPTION_ROCKS :Rocks @@ -4032,6 +4032,7 @@ # Error message titles STR_ERROR_MESSAGE_CAPTION :{YELLOW}Message STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY :{YELLOW}Message from {STRING1} +STR_ERROR_LOCATION_TOOLTIP :{BLACK}Click to go to this location. Ctrl+Click to open a viewport on this location. # Generic construction errors STR_ERROR_OFF_EDGE_OF_MAP :{WHITE}Off edge of map Index: src/lang/english_AU.txt =================================================================== --- src/lang/english_AU.txt (revision 26457) +++ src/lang/english_AU.txt (working copy) @@ -233,7 +233,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Select sorting criteria STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Select filtering criteria STR_BUTTON_SORT_BY :{BLACK}Sort by -STR_BUTTON_LOCATION :{BLACK}Location STR_BUTTON_RENAME :{BLACK}Rename STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Close window Index: src/lang/english_US.txt =================================================================== --- src/lang/english_US.txt (revision 26457) +++ src/lang/english_US.txt (working copy) @@ -233,7 +233,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Select sorting criteria STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Select filtering criteria STR_BUTTON_SORT_BY :{BLACK}Sort by -STR_BUTTON_LOCATION :{BLACK}Location STR_BUTTON_RENAME :{BLACK}Rename STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Close window Index: src/lang/esperanto.txt =================================================================== --- src/lang/esperanto.txt (revision 26457) +++ src/lang/esperanto.txt (working copy) @@ -225,7 +225,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Elektu ordigaj kondiĉoj STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Selektu kriteriojn por filtrado STR_BUTTON_SORT_BY :{BLACK}Ordigu laŭ -STR_BUTTON_LOCATION :{BLACK}Loko STR_BUTTON_RENAME :{BLACK}Alinomi STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Fermu fenestron Index: src/lang/estonian.txt =================================================================== --- src/lang/estonian.txt (revision 26457) +++ src/lang/estonian.txt (working copy) @@ -290,7 +290,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Vali järjekord STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Vali sõelumisalused STR_BUTTON_SORT_BY :{BLACK}Järjekord: -STR_BUTTON_LOCATION :{BLACK}Asukoht STR_BUTTON_RENAME :{BLACK}Nimevahetus STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Sulge aken Index: src/lang/faroese.txt =================================================================== --- src/lang/faroese.txt (revision 26457) +++ src/lang/faroese.txt (working copy) @@ -226,7 +226,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Set raðfestingar treytir STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Set filtrerings treytir STR_BUTTON_SORT_BY :{BLACK}Sortera eftur -STR_BUTTON_LOCATION :{BLACK}Stað STR_BUTTON_RENAME :{BLACK}Endurdoyp STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Lat glugga aftur Index: src/lang/finnish.txt =================================================================== --- src/lang/finnish.txt (revision 26457) +++ src/lang/finnish.txt (working copy) @@ -233,7 +233,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Valitse järjestyskriteeri STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Valitse suodatuskriteerit STR_BUTTON_SORT_BY :{BLACK}Lajittele -STR_BUTTON_LOCATION :{BLACK}Sijainti STR_BUTTON_RENAME :{BLACK}Nimeä uudelleen STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Sulje ikkuna Index: src/lang/french.txt =================================================================== --- src/lang/french.txt (revision 26457) +++ src/lang/french.txt (working copy) @@ -234,7 +234,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Choisir le critère de tri STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Choisir le critère de filtrage STR_BUTTON_SORT_BY :{BLACK}Trier par -STR_BUTTON_LOCATION :{BLACK}Emplacement STR_BUTTON_RENAME :{BLACK}Renommer STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Fermer la fenêtre Index: src/lang/gaelic.txt =================================================================== --- src/lang/gaelic.txt (revision 26457) +++ src/lang/gaelic.txt (working copy) @@ -421,7 +421,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Tagh cuspairean-deuchainn an t-seòrsachaidh STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Tagh cuspairean-deuchainn a' chriathraidh STR_BUTTON_SORT_BY :{BLACK}Seòrsaich a-rèir -STR_BUTTON_LOCATION :{BLACK}Ionad STR_BUTTON_RENAME :{BLACK}Thoir ainm ùr air STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Dùin an uinneag Index: src/lang/galician.txt =================================================================== --- src/lang/galician.txt (revision 26457) +++ src/lang/galician.txt (working copy) @@ -234,7 +234,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Selecciona o criterio de ordenación STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Selecciona o criterio de filtrado STR_BUTTON_SORT_BY :{BLACK}Ordenar por -STR_BUTTON_LOCATION :{BLACK}Situación STR_BUTTON_RENAME :{BLACK}Renomear STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Pechar xanela Index: src/lang/german.txt =================================================================== --- src/lang/german.txt (revision 26457) +++ src/lang/german.txt (working copy) @@ -234,7 +234,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Sortierkriterien auswählen STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Filterkriterien auswählen STR_BUTTON_SORT_BY :{BLACK}Sortieren nach -STR_BUTTON_LOCATION :{BLACK}Standort STR_BUTTON_RENAME :{BLACK}Umbenennen STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Fenster schließen Index: src/lang/greek.txt =================================================================== --- src/lang/greek.txt (revision 26457) +++ src/lang/greek.txt (working copy) @@ -296,7 +296,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Επιλογή κριτηρίου ταξινόμησης STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Επιλέξτε κριτήρια φιλτραρίσματος STR_BUTTON_SORT_BY :{BLACK}Ταξινόμηση κατά -STR_BUTTON_LOCATION :{BLACK}Τοποθεσία STR_BUTTON_RENAME :{BLACK}Μετονομασία STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Κλείσιμο παραθύρου Index: src/lang/hebrew.txt =================================================================== --- src/lang/hebrew.txt (revision 26457) +++ src/lang/hebrew.txt (working copy) @@ -247,7 +247,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}בחר\י קרטריון מיון STR_TOOLTIP_FILTER_CRITERIA :{BLACK}בחר קריטריון סינון STR_BUTTON_SORT_BY :{BLACK}מיון לפי -STR_BUTTON_LOCATION :{BLACK}מיקום STR_BUTTON_RENAME :{BLACK}שנה שם STR_TOOLTIP_CLOSE_WINDOW :{BLACK}סגור חלון Index: src/lang/hungarian.txt =================================================================== --- src/lang/hungarian.txt (revision 26457) +++ src/lang/hungarian.txt (working copy) @@ -296,7 +296,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Sorbarendezési feltétel STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Szűrési feltétel kiválasztása STR_BUTTON_SORT_BY :{BLACK}Rendezés -STR_BUTTON_LOCATION :{BLACK}Megnéz STR_BUTTON_RENAME :{BLACK}Átnevez STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Ablak bezárása Index: src/lang/icelandic.txt =================================================================== --- src/lang/icelandic.txt (revision 26457) +++ src/lang/icelandic.txt (working copy) @@ -226,7 +226,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Velja uppröðun STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Veldu hvers kyns farartæki þú vilt kaupa STR_BUTTON_SORT_BY :{BLACK}Flokka eftir -STR_BUTTON_LOCATION :{BLACK}Staðsetning STR_BUTTON_RENAME :{BLACK}Endurnefna STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Loka glugga Index: src/lang/indonesian.txt =================================================================== --- src/lang/indonesian.txt (revision 26457) +++ src/lang/indonesian.txt (working copy) @@ -233,7 +233,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Pilih kriteria pengurutan STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Pilih kriteria STR_BUTTON_SORT_BY :{BLACK}Urutkan -STR_BUTTON_LOCATION :{BLACK}Lokasi STR_BUTTON_RENAME :{BLACK}Ubah nama STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Tutup window Index: src/lang/irish.txt =================================================================== --- src/lang/irish.txt (revision 26457) +++ src/lang/irish.txt (working copy) @@ -224,7 +224,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Roghnaigh critéir sórtála STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Roghnaigh critéir scagtha STR_BUTTON_SORT_BY :{BLACK}Sórtáil de réir -STR_BUTTON_LOCATION :{BLACK}Suíomh STR_BUTTON_RENAME :{BLACK}Athainmnigh STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Dún an fhuinneog Index: src/lang/italian.txt =================================================================== --- src/lang/italian.txt (revision 26457) +++ src/lang/italian.txt (working copy) @@ -235,7 +235,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Seleziona il criterio di ordinamento STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Seleziona il criterio di filtraggio STR_BUTTON_SORT_BY :{BLACK}Ordina per -STR_BUTTON_LOCATION :{BLACK}Posizione STR_BUTTON_RENAME :{BLACK}Rinomina STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Chiude la finestra Index: src/lang/japanese.txt =================================================================== --- src/lang/japanese.txt (revision 26457) +++ src/lang/japanese.txt (working copy) @@ -233,7 +233,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}並べ替えの基準を選択します STR_TOOLTIP_FILTER_CRITERIA :{BLACK}フィルタリングの基準を選択します STR_BUTTON_SORT_BY :{BLACK}並べ替え -STR_BUTTON_LOCATION :{BLACK}所在地に移動 STR_BUTTON_RENAME :{BLACK}名前を変更 STR_TOOLTIP_CLOSE_WINDOW :{BLACK}ウィンドウを閉じます Index: src/lang/korean.txt =================================================================== --- src/lang/korean.txt (revision 26457) +++ src/lang/korean.txt (working copy) @@ -234,7 +234,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}정렬 기준을 선택하십시오. STR_TOOLTIP_FILTER_CRITERIA :{BLACK}검색 기준 선택 STR_BUTTON_SORT_BY :{BLACK}정렬 -STR_BUTTON_LOCATION :{BLACK}위치 STR_BUTTON_RENAME :{BLACK}이름 바꾸기 STR_TOOLTIP_CLOSE_WINDOW :{BLACK}창을 닫습니다. Index: src/lang/latvian.txt =================================================================== --- src/lang/latvian.txt (revision 26457) +++ src/lang/latvian.txt (working copy) @@ -235,7 +235,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Izvēlēties kārtošanas pazīmes STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Izvēlēties filtrēšanas pazīmes STR_BUTTON_SORT_BY :{BLACK}Kārtot pēc -STR_BUTTON_LOCATION :{BLACK}Atrašanās vieta STR_BUTTON_RENAME :{BLACK}Pārdēvēt STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Aizvērt logu Index: src/lang/lithuanian.txt =================================================================== --- src/lang/lithuanian.txt (revision 26457) +++ src/lang/lithuanian.txt (working copy) @@ -428,7 +428,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Rikiavimo raktas STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Filtravimo raktas STR_BUTTON_SORT_BY :{BLACK}Rikiuoti -STR_BUTTON_LOCATION :{BLACK}Vieta STR_BUTTON_RENAME :{BLACK}Pervadinti STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Užverti langą Index: src/lang/luxembourgish.txt =================================================================== --- src/lang/luxembourgish.txt (revision 26457) +++ src/lang/luxembourgish.txt (working copy) @@ -233,7 +233,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Argument fir ze sortéieren STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Filterkritère wielen STR_BUTTON_SORT_BY :{BLACK}Sortéier no -STR_BUTTON_LOCATION :{BLACK}Plaz STR_BUTTON_RENAME :{BLACK}Ëmbenennen STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Fënster zoumaachen Index: src/lang/malay.txt =================================================================== --- src/lang/malay.txt (revision 26457) +++ src/lang/malay.txt (working copy) @@ -225,7 +225,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Pilih cara susunan STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Pilih cara penapisan STR_BUTTON_SORT_BY :{BLACK}Menyusun mengikuti -STR_BUTTON_LOCATION :{BLACK}Lokasi STR_BUTTON_RENAME :{BLACK}Tukar Nama STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Tutup tetingkap Index: src/lang/norwegian_bokmal.txt =================================================================== --- src/lang/norwegian_bokmal.txt (revision 26457) +++ src/lang/norwegian_bokmal.txt (working copy) @@ -235,7 +235,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Velg sorteringskriterier STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Velg filtreringskriterier STR_BUTTON_SORT_BY :{BLACK}Sorter etter -STR_BUTTON_LOCATION :{BLACK}Gå til STR_BUTTON_RENAME :{BLACK}Gi nytt navn STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Lukk vindu Index: src/lang/norwegian_nynorsk.txt =================================================================== --- src/lang/norwegian_nynorsk.txt (revision 26457) +++ src/lang/norwegian_nynorsk.txt (working copy) @@ -235,7 +235,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Vel sorteringskriterium STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Vel filtreringskriterium STR_BUTTON_SORT_BY :{BLACK}Sorter etter -STR_BUTTON_LOCATION :{BLACK}Stad STR_BUTTON_RENAME :{BLACK}Gje nytt namn STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Lukk vindauge Index: src/lang/polish.txt =================================================================== --- src/lang/polish.txt (revision 26457) +++ src/lang/polish.txt (working copy) @@ -612,7 +612,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Wybierz kryterium sortowania STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Wybierz kryteria filtrowania STR_BUTTON_SORT_BY :{BLACK}Sortuj wg -STR_BUTTON_LOCATION :{BLACK}Położenie STR_BUTTON_RENAME :{BLACK}Zmień nazwę STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Zamknij okno Index: src/lang/portuguese.txt =================================================================== --- src/lang/portuguese.txt (revision 26457) +++ src/lang/portuguese.txt (working copy) @@ -234,7 +234,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Seleccione critério de ordenação STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Seleccione o critério de filtragem/procura STR_BUTTON_SORT_BY :{BLACK}Ordenar por -STR_BUTTON_LOCATION :{BLACK}Localização STR_BUTTON_RENAME :{BLACK}Renomear STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Fechar janela Index: src/lang/romanian.txt =================================================================== --- src/lang/romanian.txt (revision 26457) +++ src/lang/romanian.txt (working copy) @@ -233,7 +233,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Alegeți criteriul de sortare STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Alegeți criteriul de filtrare STR_BUTTON_SORT_BY :{BLACK}Ordonează -STR_BUTTON_LOCATION :{BLACK}Locație STR_BUTTON_RENAME :{BLACK}Nume nou STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Închide fereastra Index: src/lang/russian.txt =================================================================== --- src/lang/russian.txt (revision 26457) +++ src/lang/russian.txt (working copy) @@ -359,7 +359,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Смена критерия сортировки STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Выберите фильтр STR_BUTTON_SORT_BY :{BLACK}Сортировка -STR_BUTTON_LOCATION :{BLACK}Обзор STR_BUTTON_RENAME :{BLACK}Переименовать STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Закрыть окно Index: src/lang/serbian.txt =================================================================== --- src/lang/serbian.txt (revision 26457) +++ src/lang/serbian.txt (working copy) @@ -421,7 +421,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Odaberite kriterijum za sortiranje STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Izaberite način filtriranja STR_BUTTON_SORT_BY :{BLACK}Sortiraj po -STR_BUTTON_LOCATION :{BLACK}Mesto STR_BUTTON_RENAME :{BLACK}Preimenuj STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Zatvori prozor Index: src/lang/simplified_chinese.txt =================================================================== --- src/lang/simplified_chinese.txt (revision 26457) +++ src/lang/simplified_chinese.txt (working copy) @@ -233,7 +233,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}选择排序标准 STR_TOOLTIP_FILTER_CRITERIA :{BLACK}选择过滤标准 STR_BUTTON_SORT_BY :{BLACK}排序 -STR_BUTTON_LOCATION :{BLACK}定位 STR_BUTTON_RENAME :{BLACK}重命名 STR_TOOLTIP_CLOSE_WINDOW :{BLACK}关闭窗口 Index: src/lang/slovak.txt =================================================================== --- src/lang/slovak.txt (revision 26457) +++ src/lang/slovak.txt (working copy) @@ -297,7 +297,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Zvoľ kritérium triedenia STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Vybrať kritériá filtrovania STR_BUTTON_SORT_BY :{BLACK}Usporiadať -STR_BUTTON_LOCATION :{BLACK}Poloha STR_BUTTON_RENAME :{BLACK}Premenovať STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Zavrieť okno Index: src/lang/slovenian.txt =================================================================== --- src/lang/slovenian.txt (revision 26457) +++ src/lang/slovenian.txt (working copy) @@ -386,7 +386,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Izberite kriterij razvrščanja STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Izberite kriterij filtriranja STR_BUTTON_SORT_BY :{BLACK}Razvrsti po -STR_BUTTON_LOCATION :{BLACK}Mesto STR_BUTTON_RENAME :{BLACK}Preimenuj STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Zapri okno Index: src/lang/spanish.txt =================================================================== --- src/lang/spanish.txt (revision 26457) +++ src/lang/spanish.txt (working copy) @@ -234,7 +234,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Seleccione criterio de orden STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Seleccione criterio de filtrado STR_BUTTON_SORT_BY :{BLACK}Ordenar por -STR_BUTTON_LOCATION :{BLACK}Sitio STR_BUTTON_RENAME :{BLACK}Renombrar STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Cerrar ventana Index: src/lang/swedish.txt =================================================================== --- src/lang/swedish.txt (revision 26457) +++ src/lang/swedish.txt (working copy) @@ -233,7 +233,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Välj sortering STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Angre kriterier för filtrering STR_BUTTON_SORT_BY :{BLACK}Sortera efter -STR_BUTTON_LOCATION :{BLACK}Plats STR_BUTTON_RENAME :{BLACK}Byt namn STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Stäng fönster Index: src/lang/tamil.txt =================================================================== --- src/lang/tamil.txt (revision 26457) +++ src/lang/tamil.txt (working copy) @@ -233,7 +233,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Select sorting criteria STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Select filtering criteria STR_BUTTON_SORT_BY :{BLACK}Sort by -STR_BUTTON_LOCATION :{BLACK}Location STR_BUTTON_RENAME :{BLACK}Rename STR_TOOLTIP_CLOSE_WINDOW :{BLACK}சாளரத்தை மூடு Index: src/lang/thai.txt =================================================================== --- src/lang/thai.txt (revision 26457) +++ src/lang/thai.txt (working copy) @@ -233,7 +233,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}เลือกเกณฑ์การเรียงลำดับ STR_TOOLTIP_FILTER_CRITERIA :{BLACK}เลือกเกณฑ์การกรอง STR_BUTTON_SORT_BY :{BLACK}เรียงตาม -STR_BUTTON_LOCATION :{BLACK}ที่ตั้ง STR_BUTTON_RENAME :{BLACK}เปลี่ยนชื่อ STR_TOOLTIP_CLOSE_WINDOW :{BLACK}ปิดหน้าต่าง Index: src/lang/traditional_chinese.txt =================================================================== --- src/lang/traditional_chinese.txt (revision 26457) +++ src/lang/traditional_chinese.txt (working copy) @@ -233,7 +233,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}選擇排序項目 STR_TOOLTIP_FILTER_CRITERIA :{BLACK}選擇過濾條件 STR_BUTTON_SORT_BY :{BLACK}排序依照 -STR_BUTTON_LOCATION :{BLACK}位置 STR_BUTTON_RENAME :{BLACK}重新命名 STR_TOOLTIP_CLOSE_WINDOW :{BLACK}關閉視窗 Index: src/lang/turkish.txt =================================================================== --- src/lang/turkish.txt (revision 26457) +++ src/lang/turkish.txt (working copy) @@ -234,7 +234,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Sıralama kriterini seçin STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Süzme kriterini seçin STR_BUTTON_SORT_BY :{BLACK}Sırala -STR_BUTTON_LOCATION :{BLACK}Göster STR_BUTTON_RENAME :{BLACK}Yeni ad STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Pencereyi kapat Index: src/lang/ukrainian.txt =================================================================== --- src/lang/ukrainian.txt (revision 26457) +++ src/lang/ukrainian.txt (working copy) @@ -358,7 +358,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Оберіть критерій сортування STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Оберіть критерій фільтру STR_BUTTON_SORT_BY :{BLACK}Сортувати -STR_BUTTON_LOCATION :{BLACK}Показати STR_BUTTON_RENAME :{BLACK}Назва STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Закрити вікно Index: src/lang/unfinished/frisian.txt =================================================================== --- src/lang/unfinished/frisian.txt (revision 26457) +++ src/lang/unfinished/frisian.txt (working copy) @@ -233,7 +233,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Selektear skiftnoarm STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Selekear filternoarm STR_BUTTON_SORT_BY :{BLACK}Skifte op -STR_BUTTON_LOCATION :{BLACK}Lokaasje STR_BUTTON_RENAME :{BLACK}op 'e nij neamme STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Slút finster Index: src/lang/unfinished/ido.txt =================================================================== --- src/lang/unfinished/ido.txt (revision 26457) +++ src/lang/unfinished/ido.txt (working copy) @@ -218,7 +218,6 @@ # Common window strings STR_BUTTON_SORT_BY :{BLACK}Ordinas per -STR_BUTTON_LOCATION :{BLACK}Loko STR_BUTTON_RENAME :{BLACK}Rinomizar STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Klozas fenestro Index: src/lang/unfinished/macedonian.txt =================================================================== --- src/lang/unfinished/macedonian.txt (revision 26457) +++ src/lang/unfinished/macedonian.txt (working copy) @@ -224,7 +224,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Изберете критериум за сортирање STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Изберете филтрирање критериуми STR_BUTTON_SORT_BY :{BLACK}Сортирање според -STR_BUTTON_LOCATION :{BLACK}Локација STR_BUTTON_RENAME :{BLACK}Преименувај STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Затвори го прозорецот Index: src/lang/unfinished/maltese.txt =================================================================== --- src/lang/unfinished/maltese.txt (revision 26457) +++ src/lang/unfinished/maltese.txt (working copy) @@ -177,7 +177,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Għazel il-kriterju biex tissortja STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Għazel il-kriterju biex tiffilterja STR_BUTTON_SORT_BY :{BLACK}Issortja b'dan -STR_BUTTON_LOCATION :{BLACK}Lokal STR_BUTTON_RENAME :{BLACK}Semmi mil-ġdid STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Għalaq it-tieqa Index: src/lang/unfinished/marathi.txt =================================================================== --- src/lang/unfinished/marathi.txt (revision 26457) +++ src/lang/unfinished/marathi.txt (working copy) @@ -224,7 +224,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}वर्गीकरण निकष निवडा STR_TOOLTIP_FILTER_CRITERIA :{BLACK}फिल्टरिंग निकष निवडा STR_BUTTON_SORT_BY :{BLACK}यानुसार क्रमवारी लावा -STR_BUTTON_LOCATION :{BLACK}जागा STR_BUTTON_RENAME :{BLACK}नाव बदला STR_TOOLTIP_CLOSE_WINDOW :{BLACK}खिडकी बंद करा Index: src/lang/unfinished/persian.txt =================================================================== --- src/lang/unfinished/persian.txt (revision 26457) +++ src/lang/unfinished/persian.txt (working copy) @@ -225,7 +225,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}انتخاب معیار مرتب کردن STR_TOOLTIP_FILTER_CRITERIA :{BLACK}انتخاب معیار پایش STR_BUTTON_SORT_BY :{BLACK}مرتب کردن بر اساس -STR_BUTTON_LOCATION :{BLACK}مختصات STR_BUTTON_RENAME :{BLACK}نام گزاری STR_TOOLTIP_CLOSE_WINDOW :{BLACK}بستن پنجره Index: src/lang/unfinished/urdu.txt =================================================================== --- src/lang/unfinished/urdu.txt (revision 26457) +++ src/lang/unfinished/urdu.txt (working copy) @@ -225,7 +225,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}ترتیب کا طریقہ منتخب کریں STR_TOOLTIP_FILTER_CRITERIA :{BLACK} چھاننے کے اصول چنیئے STR_BUTTON_SORT_BY :{BLACK}سے ترتیب دو -STR_BUTTON_LOCATION :{BLACK}جگہ STR_BUTTON_RENAME :{BLACK} تبادلھء نام STR_TOOLTIP_CLOSE_WINDOW :{BLACK}کھڑکی بند کرو Index: src/lang/vietnamese.txt =================================================================== --- src/lang/vietnamese.txt (revision 26457) +++ src/lang/vietnamese.txt (working copy) @@ -233,7 +233,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Chọn tiêu chí sắp xếp STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Chọn tiêu chí lọc bỏ STR_BUTTON_SORT_BY :{BLACK}Sắp xếp bởi -STR_BUTTON_LOCATION :{BLACK}Vị trí STR_BUTTON_RENAME :{BLACK}Đổi tên STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Đóng cửa sổ Index: src/lang/welsh.txt =================================================================== --- src/lang/welsh.txt (revision 26457) +++ src/lang/welsh.txt (working copy) @@ -233,7 +233,6 @@ STR_TOOLTIP_SORT_CRITERIA :{BLACK}Dewiswch drefn trefnu STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Dewis criteria hidlydd STR_BUTTON_SORT_BY :{BLACK}Trefnu yn ôl -STR_BUTTON_LOCATION :{BLACK}Lleoliad STR_BUTTON_RENAME :{BLACK}Ailenwi STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Cau ffenestr Index: src/misc_gui.cpp =================================================================== --- src/misc_gui.cpp (revision 26457) +++ src/misc_gui.cpp (working copy) @@ -25,6 +25,7 @@ #include "querystring_gui.h" #include "core/geometry_func.hpp" #include "newgrf_debug.h" +#include "viewport_func.h" #include "widgets/misc_widget.h" @@ -44,6 +45,7 @@ NWidget(WWT_CLOSEBOX, COLOUR_GREY), NWidget(WWT_CAPTION, COLOUR_GREY), SetDataTip(STR_LAND_AREA_INFORMATION_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), NWidget(WWT_DEBUGBOX, COLOUR_GREY), + NWidget(WWT_LOCATIONBOX, COLOUR_GREY, WID_LI_LOCATION), SetDataTip(STR_NULL, STR_LAND_AREA_INFORMATION_LOCATION_TOOLTIP), EndContainer(), NWidget(WWT_PANEL, COLOUR_GREY, WID_LI_BACKGROUND), EndContainer(), }; @@ -345,6 +347,19 @@ break; } } + + virtual void OnClick(Point pt, int widget, int click_count) + { + switch (widget) { + case WID_LI_LOCATION: + if (_ctrl_pressed) { + ShowExtraViewPortWindow(tile); + } else { + ScrollMainWindowToTile(tile); + } + break; + } + } }; /** Index: src/station_gui.cpp =================================================================== --- src/station_gui.cpp (revision 26457) +++ src/station_gui.cpp (working copy) @@ -755,6 +755,7 @@ NWidget(WWT_SHADEBOX, COLOUR_GREY), NWidget(WWT_DEFSIZEBOX, COLOUR_GREY), NWidget(WWT_STICKYBOX, COLOUR_GREY), + NWidget(WWT_LOCATIONBOX, COLOUR_GREY, WID_SV_LOCATION), SetDataTip(STR_NULL, STR_STATION_VIEW_CENTER_TOOLTIP), EndContainer(), NWidget(NWID_HORIZONTAL), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SV_SORT_ORDER), SetMinimalSize(81, 12), SetFill(1, 1), SetDataTip(STR_BUTTON_SORT_BY, STR_TOOLTIP_SORT_ORDER), @@ -771,8 +772,6 @@ NWidget(WWT_PANEL, COLOUR_GREY, WID_SV_ACCEPT_RATING_LIST), SetMinimalSize(249, 23), SetResize(1, 0), EndContainer(), NWidget(NWID_HORIZONTAL), NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), - NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SV_LOCATION), SetMinimalSize(45, 12), SetResize(1, 0), SetFill(1, 1), - SetDataTip(STR_BUTTON_LOCATION, STR_STATION_VIEW_CENTER_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SV_ACCEPTS_RATINGS), SetMinimalSize(46, 12), SetResize(1, 0), SetFill(1, 1), SetDataTip(STR_STATION_VIEW_RATINGS_BUTTON, STR_STATION_VIEW_RATINGS_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SV_RENAME), SetMinimalSize(45, 12), SetResize(1, 0), SetFill(1, 1), Index: src/table/sprites.h =================================================================== --- src/table/sprites.h (revision 26457) +++ src/table/sprites.h (working copy) @@ -56,7 +56,7 @@ /** Extra graphic spritenumbers */ static const SpriteID SPR_OPENTTD_BASE = 4896; -static const uint16 OPENTTD_SPRITE_COUNT = 175; +static const uint16 OPENTTD_SPRITE_COUNT = 176; /* Halftile-selection sprites */ static const SpriteID SPR_HALFTILE_SELECTION_FLAT = SPR_OPENTTD_BASE; @@ -161,6 +161,8 @@ static const SpriteID SPR_IMG_CARGOFLOW = SPR_OPENTTD_BASE + 174; +static const SpriteID SPR_WINDOW_LOCATION = SPR_OPENTTD_BASE + 175; + static const SpriteID SPR_SIGNALS_BASE = SPR_OPENTTD_BASE + OPENTTD_SPRITE_COUNT; static const uint16 PRESIGNAL_SPRITE_COUNT = 48; static const uint16 PRESIGNAL_AND_SEMAPHORE_SPRITE_COUNT = 112; Index: src/town_gui.cpp =================================================================== --- src/town_gui.cpp (revision 26457) +++ src/town_gui.cpp (working copy) @@ -46,6 +46,7 @@ NWidget(WWT_SHADEBOX, COLOUR_BROWN), NWidget(WWT_DEFSIZEBOX, COLOUR_BROWN), NWidget(WWT_STICKYBOX, COLOUR_BROWN), + NWidget(WWT_LOCATIONBOX, COLOUR_BROWN, WID_TA_LOCATION), SetDataTip(STR_NULL, STR_TOWN_VIEW_CENTER_TOOLTIP), EndContainer(), NWidget(WWT_PANEL, COLOUR_BROWN, WID_TA_RATING_INFO), SetMinimalSize(317, 92), SetResize(1, 1), EndContainer(), NWidget(NWID_HORIZONTAL), @@ -272,6 +273,14 @@ case WID_TA_EXECUTE: DoCommandP(this->town->xy, this->window_number, this->sel_index, CMD_DO_TOWN_ACTION | CMD_MSG(STR_ERROR_CAN_T_DO_THIS)); break; + + case WID_TA_LOCATION: + if (_ctrl_pressed) { + ShowExtraViewPortWindow(this->town->xy); + } else { + ScrollMainWindowToTile(this->town->xy); + } + break; } } @@ -535,6 +544,7 @@ NWidget(WWT_SHADEBOX, COLOUR_BROWN), NWidget(WWT_DEFSIZEBOX, COLOUR_BROWN), NWidget(WWT_STICKYBOX, COLOUR_BROWN), + NWidget(WWT_LOCATIONBOX, COLOUR_BROWN, WID_TV_CENTER_VIEW), SetDataTip(STR_NULL, STR_TOWN_VIEW_CENTER_TOOLTIP), EndContainer(), NWidget(WWT_PANEL, COLOUR_BROWN), NWidget(WWT_INSET, COLOUR_BROWN), SetPadding(2, 2, 2, 2), @@ -544,7 +554,6 @@ NWidget(WWT_PANEL, COLOUR_BROWN, WID_TV_INFO), SetMinimalSize(260, 32), SetResize(1, 0), SetFill(1, 0), EndContainer(), NWidget(NWID_HORIZONTAL), NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), - NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_CENTER_VIEW), SetMinimalSize(80, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_BUTTON_LOCATION, STR_TOWN_VIEW_CENTER_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_SHOW_AUTHORITY), SetMinimalSize(80, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON, STR_TOWN_VIEW_LOCAL_AUTHORITY_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_CHANGE_NAME), SetMinimalSize(80, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_BUTTON_RENAME, STR_TOWN_VIEW_RENAME_TOOLTIP), EndContainer(), @@ -567,6 +576,7 @@ NWidget(WWT_SHADEBOX, COLOUR_BROWN), NWidget(WWT_DEFSIZEBOX, COLOUR_BROWN), NWidget(WWT_STICKYBOX, COLOUR_BROWN), + NWidget(WWT_LOCATIONBOX, COLOUR_BROWN, WID_TV_CENTER_VIEW), SetDataTip(STR_NULL, STR_TOWN_VIEW_CENTER_TOOLTIP), EndContainer(), NWidget(WWT_PANEL, COLOUR_BROWN), NWidget(WWT_INSET, COLOUR_BROWN), SetPadding(2, 2, 2, 2), @@ -576,7 +586,6 @@ NWidget(WWT_PANEL, COLOUR_BROWN, WID_TV_INFO), SetMinimalSize(260, 32), SetResize(1, 0), SetFill(1, 0), EndContainer(), NWidget(NWID_HORIZONTAL), NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), - NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_CENTER_VIEW), SetMinimalSize(80, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_BUTTON_LOCATION, STR_TOWN_VIEW_CENTER_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_EXPAND), SetMinimalSize(80, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_TOWN_VIEW_EXPAND_BUTTON, STR_TOWN_VIEW_EXPAND_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_DELETE), SetMinimalSize(80, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_TOWN_VIEW_DELETE_BUTTON, STR_TOWN_VIEW_DELETE_TOOLTIP), EndContainer(), Index: src/vehicle_gui.cpp =================================================================== --- src/vehicle_gui.cpp (revision 26457) +++ src/vehicle_gui.cpp (working copy) @@ -2246,6 +2246,7 @@ NWidget(WWT_SHADEBOX, COLOUR_GREY), NWidget(WWT_DEFSIZEBOX, COLOUR_GREY), NWidget(WWT_STICKYBOX, COLOUR_GREY), + NWidget(WWT_LOCATIONBOX, COLOUR_GREY, WID_VV_CENTER_MAIN_VIEW), SetDataTip(STR_NULL, 0x0 /* filled later */), EndContainer(), NWidget(NWID_HORIZONTAL), NWidget(WWT_PANEL, COLOUR_GREY), @@ -2254,7 +2255,6 @@ EndContainer(), EndContainer(), NWidget(NWID_VERTICAL), - NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_VV_CENTER_MAIN_VIEW), SetMinimalSize(18, 18), SetFill(1, 1), SetDataTip(SPR_CENTRE_VIEW_VEHICLE, 0x0 /* filled later */), NWidget(NWID_SELECTION, INVALID_COLOUR, WID_VV_SELECT_DEPOT_CLONE), NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_VV_GOTO_DEPOT), SetMinimalSize(18, 18), SetFill(1, 1), SetDataTip(0x0 /* filled later */, 0x0 /* filled later */), NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_VV_CLONE), SetMinimalSize(18, 18), SetFill(1, 1), SetDataTip(0x0 /* filled later */, 0x0 /* filled later */), @@ -2269,7 +2269,7 @@ EndContainer(), NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_VV_SHOW_ORDERS), SetFill(1, 1), SetMinimalSize(18, 18), SetDataTip(SPR_SHOW_ORDERS, 0x0 /* filled later */), NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_VV_SHOW_DETAILS), SetFill(1, 1), SetMinimalSize(18, 18), SetDataTip(SPR_SHOW_VEHICLE_DETAILS, 0x0 /* filled later */), - NWidget(WWT_PANEL, COLOUR_GREY), SetFill(1, 1), SetMinimalSize(18, 0), SetResize(0, 1), EndContainer(), + NWidget(WWT_PANEL, COLOUR_GREY), SetFill(1, 1), SetMinimalSize(18, 18), SetResize(0, 1), EndContainer(), EndContainer(), EndContainer(), NWidget(NWID_HORIZONTAL), Index: src/waypoint_gui.cpp =================================================================== --- src/waypoint_gui.cpp (revision 26457) +++ src/waypoint_gui.cpp (working copy) @@ -156,6 +156,7 @@ NWidget(WWT_SHADEBOX, COLOUR_GREY), NWidget(WWT_DEFSIZEBOX, COLOUR_GREY), NWidget(WWT_STICKYBOX, COLOUR_GREY), + NWidget(WWT_LOCATIONBOX, COLOUR_GREY, WID_W_CENTER_VIEW), SetDataTip(STR_NULL, STR_BUOY_VIEW_CENTER_TOOLTIP), EndContainer(), NWidget(WWT_PANEL, COLOUR_GREY), NWidget(WWT_INSET, COLOUR_GREY), SetPadding(2, 2, 2, 2), @@ -163,7 +164,6 @@ EndContainer(), EndContainer(), NWidget(NWID_HORIZONTAL), - NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_W_CENTER_VIEW), SetMinimalSize(100, 12), SetResize(1, 0), SetFill(1, 0), SetDataTip(STR_BUTTON_LOCATION, STR_BUOY_VIEW_CENTER_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_W_RENAME), SetMinimalSize(100, 12), SetResize(1, 0), SetFill(1, 0), SetDataTip(STR_BUTTON_RENAME, STR_BUOY_VIEW_CHANGE_BUOY_NAME), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_W_SHOW_VEHICLES), SetMinimalSize(15, 12), SetDataTip(STR_SHIP, STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP), NWidget(WWT_RESIZEBOX, COLOUR_GREY), Index: src/widget.cpp =================================================================== --- src/widget.cpp (revision 26457) +++ src/widget.cpp (working copy) @@ -501,6 +501,18 @@ } /** + * Draw a location box + * @param r Rectangle of the box + * @param colour Colour of the location box + * @param clicked Box is lowered + */ +static inline void DrawLocationBox(const Rect &r, Colours colour, bool clicked) +{ + DrawFrameRect(r.left, r.top, r.right, r.bottom, colour, (clicked) ? FR_LOWERED : FR_NONE); + DrawSprite(SPR_WINDOW_LOCATION, PAL_NONE, r.left + WD_LOCATIONBOX_LEFT + clicked, r.top + WD_LOCATIONBOX_TOP + clicked); +} + +/** * Draw a resize box. * @param r Rectangle of the box. * @param colour Colour of the resize box. @@ -2076,6 +2088,7 @@ resizebox_dimension.width = resizebox_dimension.height = 0; closebox_dimension.width = closebox_dimension.height = 0; dropdown_dimension.width = dropdown_dimension.height = 0; + locationbox_dimension.width= locationbox_dimension.height= 0; } Dimension NWidgetLeaf::shadebox_dimension = {0, 0}; @@ -2085,6 +2098,7 @@ Dimension NWidgetLeaf::resizebox_dimension = {0, 0}; Dimension NWidgetLeaf::closebox_dimension = {0, 0}; Dimension NWidgetLeaf::dropdown_dimension = {0, 0}; +Dimension NWidgetLeaf::locationbox_dimension= {0, 0}; /** * Nested leaf widget. @@ -2096,7 +2110,7 @@ */ NWidgetLeaf::NWidgetLeaf(WidgetType tp, Colours colour, int index, uint16 data, StringID tip) : NWidgetCore(tp, colour, 1, 1, data, tip) { - assert(index >= 0 || tp == WWT_LABEL || tp == WWT_TEXT || tp == WWT_CAPTION || tp == WWT_RESIZEBOX || tp == WWT_SHADEBOX || tp == WWT_DEFSIZEBOX || tp == WWT_DEBUGBOX || tp == WWT_STICKYBOX || tp == WWT_CLOSEBOX); + assert(index >= 0 || tp == WWT_LABEL || tp == WWT_TEXT || tp == WWT_CAPTION || tp == WWT_RESIZEBOX || tp == WWT_SHADEBOX || tp == WWT_DEFSIZEBOX || tp == WWT_DEBUGBOX || tp == WWT_STICKYBOX || tp == WWT_CLOSEBOX || tp == WWT_LOCATIONBOX); if (index >= 0) this->SetIndex(index); this->SetMinimalSize(0, 0); this->SetResize(0, 0); @@ -2159,6 +2173,11 @@ this->SetMinimalSize(WD_DEFSIZEBOX_TOP, WD_CAPTION_HEIGHT); this->SetDataTip(STR_NULL, STR_TOOLTIP_DEFSIZE); break; + + case WWT_LOCATIONBOX: + this->SetFill(0, 0); + this->SetMinimalSize(WD_LOCATIONBOX_TOP, WD_CAPTION_HEIGHT); + break; case WWT_RESIZEBOX: this->SetFill(0, 0); @@ -2257,6 +2276,18 @@ size = maxdim(size, NWidgetLeaf::defsizebox_dimension); break; } + + case WWT_LOCATIONBOX: { + static const Dimension extra = {WD_LOCATIONBOX_LEFT + WD_LOCATIONBOX_RIGHT, WD_LOCATIONBOX_TOP + WD_LOCATIONBOX_BOTTOM}; + padding = &extra; + if (NWidgetLeaf::locationbox_dimension.width == 0) { + NWidgetLeaf::locationbox_dimension = GetSpriteSize(SPR_WINDOW_LOCATION); + NWidgetLeaf::locationbox_dimension.width += extra.width; + NWidgetLeaf::locationbox_dimension.height += extra.height; + } + size = maxdim(size, NWidgetLeaf::locationbox_dimension); + break; + } case WWT_RESIZEBOX: { static const Dimension extra = {WD_RESIZEBOX_LEFT + WD_RESIZEBOX_RIGHT, WD_RESIZEBOX_TOP + WD_RESIZEBOX_BOTTOM}; @@ -2467,6 +2498,11 @@ assert(this->widget_data == 0); DrawDefSizeBox(r, this->colour, clicked); break; + + case WWT_LOCATIONBOX: + assert(this->widget_data == 0); + DrawLocationBox(r, this->colour, clicked); + break; case WWT_RESIZEBOX: assert(this->widget_data == 0); Index: src/widget_type.h =================================================================== --- src/widget_type.h (revision 26457) +++ src/widget_type.h (working copy) @@ -63,7 +63,8 @@ WWT_DEBUGBOX, ///< NewGRF debug box (at top-right of a window, between WWT_CAPTION and WWT_SHADEBOX) WWT_SHADEBOX, ///< Shade box (at top-right of a window, between WWT_DEBUGBOX and WWT_DEFSIZEBOX) WWT_DEFSIZEBOX, ///< Default window size box (at top-right of a window, between WWT_SHADEBOX and WWT_STICKYBOX) - WWT_STICKYBOX, ///< Sticky box (at top-right of a window, after WWT_DEFSIZEBOX) + WWT_STICKYBOX, ///< Sticky box (at top-right of a window, between WWT_DEFSIZEBOX and WWT_LOCATIONBOX) + WWT_LOCATIONBOX, ///< Go to location box (at top-right of a window, after WWT_STICKYBOX) WWT_RESIZEBOX, ///< Resize box (normally at bottom-right of a window) WWT_CLOSEBOX, ///< Close box (at top-left of a window) @@ -786,6 +787,7 @@ static Dimension stickybox_dimension; ///< Cached size of a stickybox widget. static Dimension resizebox_dimension; ///< Cached size of a resizebox widget. static Dimension closebox_dimension; ///< Cached size of a closebox widget. + static Dimension locationbox_dimension; ///< Cached size of a locationbox widget. }; /** Index: src/widgets/error_widget.h =================================================================== --- src/widgets/error_widget.h (revision 26457) +++ src/widgets/error_widget.h (working copy) @@ -15,6 +15,7 @@ /** Widgets of the #ErrmsgWindow class. */ enum ErrorMessageWidgets { WID_EM_CAPTION, ///< Caption of the window. + WID_EM_LOCATION,///< Locationbox of the window. WID_EM_FACE, ///< Error title. WID_EM_MESSAGE, ///< Error message. }; Index: src/widgets/misc_widget.h =================================================================== --- src/widgets/misc_widget.h (revision 26457) +++ src/widgets/misc_widget.h (working copy) @@ -14,6 +14,7 @@ /** Widgets of the #LandInfoWindow class. */ enum LandInfoWidgets { + WID_LI_LOCATION, ///< Locationbox for the LandInfo WID_LI_BACKGROUND, ///< Background of the window. }; Index: src/widgets/town_widget.h =================================================================== --- src/widgets/town_widget.h (revision 26457) +++ src/widgets/town_widget.h (working copy) @@ -24,6 +24,7 @@ /** Widgets of the #TownAuthorityWindow class. */ enum TownAuthorityWidgets { WID_TA_CAPTION, ///< Caption of window. + WID_TA_LOCATION, ///< Locationbox for the town. WID_TA_RATING_INFO, ///< Overview with ratings for each company. WID_TA_COMMAND_LIST, ///< List of commands for the player. WID_TA_SCROLLBAR, ///< Scrollbar of the list of commands. @@ -34,6 +35,7 @@ /** Widgets of the #TownViewWindow class. */ enum TownViewWidgets { WID_TV_CAPTION, ///< Caption of window. + WID_TV_LOCATION, ///< Locatonbox for the town WID_TV_VIEWPORT, ///< View of the center of the town. WID_TV_INFO, ///< General information about the town. WID_TV_CENTER_VIEW, ///< Center the main view on this town. Index: src/window.cpp =================================================================== --- src/window.cpp (revision 26457) +++ src/window.cpp (working copy) @@ -534,7 +534,7 @@ if (this->nested_array[i] == NULL) continue; WidgetType type = this->nested_array[i]->type; if (((type & ~WWB_PUSHBUTTON) < WWT_LAST || type == NWID_PUSHBUTTON_DROPDOWN) && - (!autoraise || (type & WWB_PUSHBUTTON) || type == WWT_EDITBOX) && this->IsWidgetLowered(i)) { + (!autoraise || (type & WWB_PUSHBUTTON) || type == WWT_EDITBOX || type == WWT_LOCATIONBOX) && this->IsWidgetLowered(i)) { this->RaiseWidget(i); this->SetWidgetDirty(i); } @@ -701,6 +701,12 @@ w->SetTimeout(); break; } + + case WWT_LOCATIONBOX: + nw->SetLowered(true); + nw->SetDirty(w); + w->SetTimeout(); + break; case WWT_DEBUGBOX: w->ShowNewGRFInspectWindow(); Index: src/window_gui.h =================================================================== --- src/window_gui.h (revision 26457) +++ src/window_gui.h (working copy) @@ -107,6 +107,13 @@ WD_DEFSIZEBOX_RIGHT = 2, ///< Right offset of defsize sprite. WD_DEFSIZEBOX_TOP = 3, ///< Top offset of defsize sprite. WD_DEFSIZEBOX_BOTTOM = 3, ///< Bottom offset of defsize sprite. + + /* WWT_LOCATIONBOX */ + WD_LOCATIONBOX_WIDTH = 12, ///< Width of a standard location box widget. + WD_LOCATIONBOX_LEFT = 2, ///< Left offset of location sprite. + WD_LOCATIONBOX_RIGHT = 2, ///< Right offset of location sprite. + WD_LOCATIONBOX_TOP = 3, ///< Top offset of location sprite. + WD_LOCATIONBOX_BOTTOM = 3, ///< Bottom offset of location sprite. /* WWT_RESIZEBOX */ WD_RESIZEBOX_WIDTH = 12, ///< Width of a resize box widget.