dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r8143) Remove the landscaping button from the build toolbars.

Browse Source 
The landscaping toolbar can be reached at least as easy directly from the main toolbar.
Further two of the four toolbars uses 'l' as keyboard shortcut for this button, which plain does not work (The letter has to be uppercase).
This was covered by the fact there is a global shortcut 'L' to open the landscaping toolbar, so the individual checks in the four build toolbars were redundant anyway.
This commit is contained in:
tron
2007-01-15 07:38:36 +00:00
parent 5461ec7889
commit f8c650fa3a
4 changed files with 15 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/road_gui.cpp
View File

@@ -176,10 +176,6 @@ static void BuildRoadClick_Remove(Window *w)
SetSelectionRed(IsWindowWidgetLowered(w, RTW_REMOVE));
}
static void BuildRoadClick_Landscaping(Window *w)
{
ShowTerraformToolbar();
}
static OnButtonClick* const _build_road_button_proc[] = {
BuildRoadClick_NE,
@@ -190,8 +186,7 @@ static OnButtonClick* const _build_road_button_proc[] = {
BuildRoadClick_TruckStation,
BuildRoadClick_Bridge,
BuildRoadClick_Tunnel,
BuildRoadClick_Remove,
BuildRoadClick_Landscaping,
BuildRoadClick_Remove
};
static void BuildRoadToolbWndProc(Window *w, WindowEvent *e)
@@ -221,7 +216,6 @@ static void BuildRoadToolbWndProc(Window *w, WindowEvent *e)
case 'B': BuildRoadClick_Bridge(w); break;
case 'T': BuildRoadClick_Tunnel(w); break;
case 'R': BuildRoadClick_Remove(w); break;
case 'L': BuildRoadClick_Landscaping(w); break;
default: return;
}
MarkTileDirty(_thd.pos.x, _thd.pos.y); // redraw tile selection
@@ -307,8 +301,8 @@ static void BuildRoadToolbWndProc(Window *w, WindowEvent *e)
static const Widget _build_road_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 7, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
{ WWT_CAPTION, RESIZE_NONE, 7, 11, 227, 0, 13, STR_1802_ROAD_CONSTRUCTION, STR_018C_WINDOW_TITLE_DRAG_THIS},
{ WWT_STICKYBOX, RESIZE_NONE, 7, 228, 239, 0, 13, 0x0, STR_STICKY_BUTTON},
{ WWT_CAPTION, RESIZE_NONE, 7, 11, 205, 0, 13, STR_1802_ROAD_CONSTRUCTION, STR_018C_WINDOW_TITLE_DRAG_THIS},
{ WWT_STICKYBOX, RESIZE_NONE, 7, 206, 217, 0, 13, 0x0, STR_STICKY_BUTTON},
{ WWT_IMGBTN, RESIZE_NONE, 7, 0, 21, 14, 35, SPR_IMG_ROAD_NW, STR_180B_BUILD_ROAD_SECTION},
{ WWT_IMGBTN, RESIZE_NONE, 7, 22, 43, 14, 35, SPR_IMG_ROAD_NE, STR_180B_BUILD_ROAD_SECTION},
@@ -319,12 +313,11 @@ static const Widget _build_road_widgets[] = {
{ WWT_IMGBTN, RESIZE_NONE, 7, 132, 173, 14, 35, SPR_IMG_BRIDGE, STR_180F_BUILD_ROAD_BRIDGE},
{ WWT_IMGBTN, RESIZE_NONE, 7, 174, 195, 14, 35, SPR_IMG_ROAD_TUNNEL, STR_1810_BUILD_ROAD_TUNNEL},
{ WWT_IMGBTN, RESIZE_NONE, 7, 196, 217, 14, 35, SPR_IMG_REMOVE, STR_1811_TOGGLE_BUILD_REMOVE_FOR},
{ WWT_IMGBTN, RESIZE_NONE, 7, 218, 239, 14, 35, SPR_IMG_LANDSCAPING, STR_LANDSCAPING_TOOLBAR_TIP},
{ WIDGETS_END},
};
static const WindowDesc _build_road_desc = {
WDP_ALIGN_TBR, 22, 240, 36,
WDP_ALIGN_TBR, 22, 218, 36,
WC_BUILD_TOOLBAR, 0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON,
_build_road_widgets,