Mercurial > hg > openttd

comparison src/dock_gui.cpp @ 5682:7a3b79babecb draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r8143) Remove the landscaping button from the build toolbars. 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.
author tron <tron@openttd.org>
date Mon, 15 Jan 2007 07:38:36 +0000
parents c44c070c5032
children dc5ff33e8dda
comparison
equal deleted inserted replaced
5681:0f0d1e5358a2 5682:7a3b79babecb
103 static void BuildDocksClick_Buoy(Window *w) 103 static void BuildDocksClick_Buoy(Window *w)
104 { 104 {
105 HandlePlacePushButton(w, DTW_BUOY, SPR_CURSOR_BOUY, 1, PlaceDocks_Buoy); 105 HandlePlacePushButton(w, DTW_BUOY, SPR_CURSOR_BOUY, 1, PlaceDocks_Buoy);
106 } 106 }
107 107
108 static void BuildDocksClick_Landscaping(Window *w)
109 {
110 ShowTerraformToolbar();
111 }
112 108
113 typedef void OnButtonClick(Window *w); 109 typedef void OnButtonClick(Window *w);
114 static OnButtonClick * const _build_docks_button_proc[] = { 110 static OnButtonClick * const _build_docks_button_proc[] = {
115 BuildDocksClick_Canal, 111 BuildDocksClick_Canal,
116 BuildDocksClick_Lock, 112 BuildDocksClick_Lock,
117 NULL, 113 NULL,
118 BuildDocksClick_Demolish, 114 BuildDocksClick_Demolish,
119 BuildDocksClick_Depot, 115 BuildDocksClick_Depot,
120 BuildDocksClick_Dock, 116 BuildDocksClick_Dock,
121 BuildDocksClick_Buoy, 117 BuildDocksClick_Buoy
122 BuildDocksClick_Landscaping,
123 }; 118 };
124 119
125 static void BuildDocksToolbWndProc(Window *w, WindowEvent *e) 120 static void BuildDocksToolbWndProc(Window *w, WindowEvent *e)
126 { 121 {
127 switch (e->event) { 122 switch (e->event) {
139 case '2': BuildDocksClick_Lock(w); break; 134 case '2': BuildDocksClick_Lock(w); break;
140 case '3': BuildDocksClick_Demolish(w); break; 135 case '3': BuildDocksClick_Demolish(w); break;
141 case '4': BuildDocksClick_Depot(w); break; 136 case '4': BuildDocksClick_Depot(w); break;
142 case '5': BuildDocksClick_Dock(w); break; 137 case '5': BuildDocksClick_Dock(w); break;
143 case '6': BuildDocksClick_Buoy(w); break; 138 case '6': BuildDocksClick_Buoy(w); break;
144 case 'l': BuildDocksClick_Landscaping(w); break;
145 default: return; 139 default: return;
146 } 140 }
147 break; 141 break;
148 142
149 case WE_PLACE_OBJ: 143 case WE_PLACE_OBJ:
196 } 190 }
197 } 191 }
198 192
199 static const Widget _build_docks_toolb_widgets[] = { 193 static const Widget _build_docks_toolb_widgets[] = {
200 { WWT_CLOSEBOX, RESIZE_NONE, 7, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, 194 { WWT_CLOSEBOX, RESIZE_NONE, 7, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
201 { WWT_CAPTION, RESIZE_NONE, 7, 11, 145, 0, 13, STR_9801_DOCK_CONSTRUCTION, STR_018C_WINDOW_TITLE_DRAG_THIS}, 195 { WWT_CAPTION, RESIZE_NONE, 7, 11, 123, 0, 13, STR_9801_DOCK_CONSTRUCTION, STR_018C_WINDOW_TITLE_DRAG_THIS},
202 { WWT_STICKYBOX, RESIZE_NONE, 7, 146, 157, 0, 13, 0x0, STR_STICKY_BUTTON}, 196 { WWT_STICKYBOX, RESIZE_NONE, 7, 124, 135, 0, 13, 0x0, STR_STICKY_BUTTON},
203 { WWT_IMGBTN, RESIZE_NONE, 7, 0, 21, 14, 35, SPR_IMG_BUILD_CANAL, STR_BUILD_CANALS_TIP}, 197 { WWT_IMGBTN, RESIZE_NONE, 7, 0, 21, 14, 35, SPR_IMG_BUILD_CANAL, STR_BUILD_CANALS_TIP},
204 { WWT_IMGBTN, RESIZE_NONE, 7, 22, 43, 14, 35, SPR_IMG_BUILD_LOCK, STR_BUILD_LOCKS_TIP}, 198 { WWT_IMGBTN, RESIZE_NONE, 7, 22, 43, 14, 35, SPR_IMG_BUILD_LOCK, STR_BUILD_LOCKS_TIP},
205 199
206 { WWT_PANEL, RESIZE_NONE, 7, 44, 47, 14, 35, 0x0, STR_NULL}, 200 { WWT_PANEL, RESIZE_NONE, 7, 44, 47, 14, 35, 0x0, STR_NULL},
207 201
208 { WWT_IMGBTN, RESIZE_NONE, 7, 48, 69, 14, 35, SPR_IMG_DYNAMITE, STR_018D_DEMOLISH_BUILDINGS_ETC}, 202 { WWT_IMGBTN, RESIZE_NONE, 7, 48, 69, 14, 35, SPR_IMG_DYNAMITE, STR_018D_DEMOLISH_BUILDINGS_ETC},
209 { WWT_IMGBTN, RESIZE_NONE, 7, 70, 91, 14, 35, SPR_IMG_SHIP_DEPOT, STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING}, 203 { WWT_IMGBTN, RESIZE_NONE, 7, 70, 91, 14, 35, SPR_IMG_SHIP_DEPOT, STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING},
210 { WWT_IMGBTN, RESIZE_NONE, 7, 92, 113, 14, 35, SPR_IMG_SHIP_DOCK, STR_981D_BUILD_SHIP_DOCK}, 204 { WWT_IMGBTN, RESIZE_NONE, 7, 92, 113, 14, 35, SPR_IMG_SHIP_DOCK, STR_981D_BUILD_SHIP_DOCK},
211 { WWT_IMGBTN, RESIZE_NONE, 7, 114, 135, 14, 35, SPR_IMG_BOUY, STR_9834_POSITION_BUOY_WHICH_CAN}, 205 { WWT_IMGBTN, RESIZE_NONE, 7, 114, 135, 14, 35, SPR_IMG_BOUY, STR_9834_POSITION_BUOY_WHICH_CAN},
212 { WWT_IMGBTN, RESIZE_NONE, 7, 136, 157, 14, 35, SPR_IMG_LANDSCAPING, STR_LANDSCAPING_TOOLBAR_TIP},
213 { WIDGETS_END}, 206 { WIDGETS_END},
214 }; 207 };
215 208
216 static const WindowDesc _build_docks_toolbar_desc = { 209 static const WindowDesc _build_docks_toolbar_desc = {
217 WDP_ALIGN_TBR, 22, 158, 36, 210 WDP_ALIGN_TBR, 22, 136, 36,
218 WC_BUILD_TOOLBAR, 0, 211 WC_BUILD_TOOLBAR, 0,
219 WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON, 212 WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON,
220 _build_docks_toolb_widgets, 213 _build_docks_toolb_widgets,
221 BuildDocksToolbWndProc 214 BuildDocksToolbWndProc
222 }; 215 };