# HG changeset patch # User HackaLittleBit # Date 1491382808 -3600 # Wed Apr 05 10:00:08 2017 +0100 # Branch trunk # Node ID bebfe63ea8337e3e459b495d3ba337c1910c95e3 # Parent 15d401c3ff452ed3e244788eace5f9ecd542ad2c Codechange:Make viewport text clearer. diff -r 15d401c3ff45 -r bebfe63ea833 src/lang/english.txt --- a/src/lang/english.txt Sun Apr 02 17:36:53 2017 +0000 +++ b/src/lang/english.txt Wed Apr 05 10:00:08 2017 +0100 @@ -880,10 +880,11 @@ # Extra view window STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Viewport {COMMA} -STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Copy to viewport -STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Copy the location of the main view to this viewport -STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Paste from viewport -STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT :{BLACK}Paste the location of this viewport to the main view +STR_EXTRA_VIEW_MOVE :{WHITE}Scroll: +STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN :{BLACK}Viewport +STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT :{BLACK}Scroll this viewport to the center of main window +STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW :{BLACK}Main window +STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT :{BLACK}Scroll the main window to the center of this viewport # Game options window STR_GAME_OPTIONS_CAPTION :{WHITE}Game Options diff -r 15d401c3ff45 -r bebfe63ea833 src/viewport_gui.cpp --- a/src/viewport_gui.cpp Sun Apr 02 17:36:53 2017 +0000 +++ b/src/viewport_gui.cpp Wed Apr 05 10:00:08 2017 +0100 @@ -36,14 +36,17 @@ NWidget(WWT_PANEL, COLOUR_GREY), NWidget(NWID_VIEWPORT, INVALID_COLOUR, WID_EV_VIEWPORT), SetPadding(2, 2, 2, 2), SetResize(1, 1), SetFill(1, 1), EndContainer(), - NWidget(NWID_HORIZONTAL), - NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_EV_ZOOM_IN), SetDataTip(SPR_IMG_ZOOMIN, STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_IN), - NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_EV_ZOOM_OUT), SetDataTip(SPR_IMG_ZOOMOUT, STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_OUT), - NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), - NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_EV_MAIN_TO_VIEW), SetFill(1, 1), SetResize(1, 0), - SetDataTip(STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW, STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT), - NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_EV_VIEW_TO_MAIN), SetFill(1, 1), SetResize(1, 0), - SetDataTip(STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN, STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT), + NWidget(WWT_PANEL, COLOUR_GREY), + NWidget(NWID_HORIZONTAL), + NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_EV_ZOOM_IN), SetDataTip(SPR_IMG_ZOOMIN, STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_IN), + NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_EV_ZOOM_OUT), SetDataTip(SPR_IMG_ZOOMOUT, STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_OUT), + NWidget(WWT_LABEL, COLOUR_GREY), SetDataTip(STR_EXTRA_VIEW_MOVE, STR_NULL), + NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), + NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_EV_VIEW_TO_MAIN), SetFill(1, 1), SetResize(1, 0), + SetDataTip(STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN, STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT), + NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_EV_MAIN_TO_VIEW), SetFill(1, 1), SetResize(1, 0), + SetDataTip(STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW, STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT), + EndContainer(), EndContainer(), EndContainer(), NWidget(NWID_HORIZONTAL),