Changeset - r9953:8c469baed535
[Not reviewed]
master
1 3 1
belugas - 16 years ago 2008-08-20 15:27:22
belugas@openttd.org
(svn r14108) -Fix(r14104): Give a more consistent naming of the new gui file
5 files changed with 114 insertions and 114 deletions:
0 comments (0 inline, 0 general)
projects/openttd_vs80.vcproj
Show inline comments
 
@@ -1775,193 +1775,193 @@
 
				RelativePath=".\..\src\network\network_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\newgrf_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\news_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\order_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\osk_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\player_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\rail_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\road_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\roadveh_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\settings_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\ship_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\signs_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\smallmap_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\station_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\statusbar_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\subsidy_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\terraform_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\timetable_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\toolbar_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\town_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\train_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\transparency_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\tree_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\vehicle_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\waypoints_gui.cpp"
 
				RelativePath=".\..\src\waypoint_gui.cpp"
 
				>
 
			</File>
 
		</Filter>
 
		<Filter
 
			Name="Command handlers"
 
			>
 
			<File
 
				RelativePath=".\..\src\aircraft_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\autoreplace_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\clear_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\disaster_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\dummy_land.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\group_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\industry_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\misc_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\order_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\rail_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\road_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\roadveh_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\ship_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\station_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\terraform_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\timetable_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\town_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\train_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\tree_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\tunnelbridge_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\unmovable_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\water_cmd.cpp"
 
				>
 
			</File>
 
		</Filter>
 
		<Filter
projects/openttd_vs90.vcproj
Show inline comments
 
@@ -1772,193 +1772,193 @@
 
				RelativePath=".\..\src\network\network_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\newgrf_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\news_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\order_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\osk_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\player_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\rail_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\road_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\roadveh_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\settings_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\ship_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\signs_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\smallmap_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\station_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\statusbar_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\subsidy_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\terraform_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\timetable_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\toolbar_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\town_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\train_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\transparency_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\tree_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\vehicle_gui.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\waypoints_gui.cpp"
 
				RelativePath=".\..\src\waypoint_gui.cpp"
 
				>
 
			</File>
 
		</Filter>
 
		<Filter
 
			Name="Command handlers"
 
			>
 
			<File
 
				RelativePath=".\..\src\aircraft_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\autoreplace_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\clear_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\disaster_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\dummy_land.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\group_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\industry_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\misc_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\order_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\rail_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\road_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\roadveh_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\ship_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\station_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\terraform_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\timetable_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\town_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\train_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\tree_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\tunnelbridge_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\unmovable_cmd.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\water_cmd.cpp"
 
				>
 
			</File>
 
		</Filter>
 
		<Filter
source.list
Show inline comments
 
@@ -317,193 +317,193 @@ unmovable.h
 
variables.h
 
vehicle_base.h
 
vehicle_func.h
 
vehicle_gui.h
 
vehicle_type.h
 
vehiclelist.h
 
viewport_func.h
 
viewport_type.h
 
water.h
 
waypoint.h
 
waypoint_type.h
 
win32.h
 
music/win32_m.h
 
sound/win32_s.h
 
video/win32_v.h
 
window_func.h
 
window_gui.h
 
window_type.h
 
zoom_func.h
 
zoom_type.h
 
#if WIN32
 
#else
 
music/bemidi.h
 
music/extmidi.h
 
music/libtimidity.h
 
music/os2_m.h
 
music/qtmidi.h
 
os/macosx/macos.h
 
os/macosx/osx_stdafx.h
 
os/macosx/splash.h
 
sound/cocoa_s.h
 
video/cocoa/cocoa_keys.h
 
video/cocoa/cocoa_v.h
 
#end
 

	
 
# Core Source Code
 
core/alloc_func.cpp
 
core/alloc_func.hpp
 
core/alloc_type.hpp
 
core/bitmath_func.cpp
 
core/bitmath_func.hpp
 
core/endian_func.hpp
 
core/endian_type.hpp
 
core/enum_type.hpp
 
core/geometry_type.hpp
 
core/math_func.hpp
 
core/mem_func.hpp
 
core/overflowsafe_type.hpp
 
core/random_func.cpp
 
core/random_func.hpp
 
core/smallvec_type.hpp
 
core/sort_func.hpp
 

	
 
# GUI Source Code
 
aircraft_gui.cpp
 
airport_gui.cpp
 
autoreplace_gui.cpp
 
bridge_gui.cpp
 
build_vehicle_gui.cpp
 
cheat_gui.cpp
 
depot_gui.cpp
 
dock_gui.cpp
 
engine_gui.cpp
 
genworld_gui.cpp
 
graph_gui.cpp
 
group_gui.cpp
 
industry_gui.cpp
 
intro_gui.cpp
 
main_gui.cpp
 
misc_gui.cpp
 
music_gui.cpp
 
network/network_chat_gui.cpp
 
network/network_gui.cpp
 
newgrf_gui.cpp
 
news_gui.cpp
 
order_gui.cpp
 
osk_gui.cpp
 
player_gui.cpp
 
rail_gui.cpp
 
road_gui.cpp
 
roadveh_gui.cpp
 
settings_gui.cpp
 
ship_gui.cpp
 
signs_gui.cpp
 
smallmap_gui.cpp
 
station_gui.cpp
 
statusbar_gui.cpp
 
subsidy_gui.cpp
 
terraform_gui.cpp
 
timetable_gui.cpp
 
toolbar_gui.cpp
 
town_gui.cpp
 
train_gui.cpp
 
transparency_gui.cpp
 
tree_gui.cpp
 
vehicle_gui.cpp
 
waypoints_gui.cpp
 
waypoint_gui.cpp
 

	
 
# Command handlers
 
aircraft_cmd.cpp
 
autoreplace_cmd.cpp
 
clear_cmd.cpp
 
disaster_cmd.cpp
 
dummy_land.cpp
 
group_cmd.cpp
 
industry_cmd.cpp
 
misc_cmd.cpp
 
order_cmd.cpp
 
rail_cmd.cpp
 
road_cmd.cpp
 
roadveh_cmd.cpp
 
ship_cmd.cpp
 
station_cmd.cpp
 
terraform_cmd.cpp
 
timetable_cmd.cpp
 
town_cmd.cpp
 
train_cmd.cpp
 
tree_cmd.cpp
 
tunnelbridge_cmd.cpp
 
unmovable_cmd.cpp
 
water_cmd.cpp
 

	
 
# Tables
 
table/ai_rail.h
 
table/animcursors.h
 
table/autorail.h
 
table/bridge_land.h
 
table/build_industry.h
 
table/cargo_const.h
 
table/clear_land.h
 
table/control_codes.h
 
table/elrail_data.h
 
table/engines.h
 
table/files.h
 
table/genland.h
 
table/industry_land.h
 
table/landscape_sprite.h
 
table/namegen.h
 
table/palettes.h
 
table/railtypes.h
 
table/road_land.h
 
table/roadveh_movement.h
 
table/sprites.h
 
table/station_land.h
 
../objs/langs/table/strings.h
 
table/town_land.h
 
table/track_land.h
 
table/train_cmd.h
 
table/tree_land.h
 
table/unicode.h
 
table/unmovable_land.h
 
table/water_land.h
 

	
 
# AI Files
 
ai/ai.cpp
 
ai/trolly/build.cpp
 
ai/default/default.cpp
 
ai/trolly/pathfinder.cpp
 
ai/trolly/shared.cpp
 
ai/trolly/trolly.cpp
 

	
 
# Blitters
 
blitter/32bpp_anim.cpp
 
blitter/32bpp_anim.hpp
 
blitter/32bpp_base.cpp
 
blitter/32bpp_base.hpp
 
blitter/32bpp_optimized.cpp
 
blitter/32bpp_optimized.hpp
 
blitter/32bpp_simple.cpp
 
blitter/32bpp_simple.hpp
 
blitter/8bpp_base.cpp
 
blitter/8bpp_base.hpp
 
blitter/8bpp_debug.cpp
 
blitter/8bpp_debug.hpp
 
blitter/8bpp_optimized.cpp
 
blitter/8bpp_optimized.hpp
 
blitter/8bpp_simple.cpp
 
blitter/8bpp_simple.hpp
 
blitter/base.hpp
 
blitter/factory.hpp
 
blitter/null.cpp
 
blitter/null.hpp
 

	
 
# Drivers
 
music/music_driver.hpp
 
sound/sound_driver.hpp
 
video/video_driver.hpp
 

	
 
# Sprite loaders
 
spriteloader/grf.cpp
 
spriteloader/grf.hpp
 
#if PNG
 
spriteloader/png.cpp
src/waypoint_gui.cpp
Show inline comments
 
new file 100644
 
/* $Id$ */
 

	
 
/** @file waypoint_gui.cpp Handling of waypoints gui. */
 

	
 
#include "stdafx.h"
 
#include "openttd.h"
 
#include "window_gui.h"
 
#include "gui.h"
 
#include "textbuf_gui.h"
 
#include "vehicle_gui.h"
 
#include "waypoint.h"
 
#include "viewport_func.h"
 
#include "string_func.h"
 
#include "strings_func.h"
 
#include "gfx_func.h"
 
#include "command_func.h"
 
#include "functions.h"
 

	
 
#include "table/strings.h"
 

	
 
struct WaypointWindow : Window {
 
private:
 
	Waypoint *wp;
 

	
 
	enum WaypointViewWidget {
 
		WAYPVW_CLOSEBOX = 0,
 
		WAYPVW_CAPTION,
 
		WAYPVW_STICKY,
 
		WAYPVW_VIEWPORTPANEL,
 
		WAYPVW_SPACER,
 
		WAYPVW_CENTERVIEW,
 
		WAYPVW_RENAME,
 
		WAYPVW_SHOW_TRAINS,
 
	};
 

	
 
public:
 
	WaypointWindow(const WindowDesc *desc, WindowNumber window_number) : Window(desc, window_number)
 
	{
 
		this->wp = GetWaypoint(this->window_number);
 

	
 
		this->flags4 |= WF_DISABLE_VP_SCROLL;
 
		InitializeWindowViewport(this, 3, 17, 254, 86, this->wp->xy, ZOOM_LVL_MIN);
 

	
 
		this->FindWindowPlacementAndResize(desc);
 
	}
 

	
 
	virtual void OnPaint()
 
	{
 
		/* You can only change your own waypoints */
 
		this->SetWidgetDisabledState(WAYPVW_RENAME, !CheckTileOwnership(this->wp->xy));
 
		SetDParam(0, this->wp->index);
 
		this->DrawWidgets();
 

	
 
		this->DrawViewport();
 
	}
 

	
 
	virtual void OnClick(Point pt, int widget)
 
	{
 
		switch (widget) {
 
			case WAYPVW_CENTERVIEW: /* scroll to location */
 
				if (_ctrl_pressed) {
 
					ShowExtraViewPortWindow(this->wp->xy);
 
				} else {
 
					ScrollMainWindowToTile(this->wp->xy);
 
				}
 
				break;
 

	
 
			case WAYPVW_RENAME: /* rename */
 
				SetDParam(0, this->wp->index);
 
				ShowQueryString(STR_WAYPOINT_RAW, STR_EDIT_WAYPOINT_NAME, MAX_LENGTH_WAYPOINT_NAME_BYTES, MAX_LENGTH_WAYPOINT_NAME_PIXELS, this, CS_ALPHANUMERAL);
 
				break;
 

	
 
			case WAYPVW_SHOW_TRAINS: /* show list of trains having this waypoint in their orders*/
 
				ShowVehicleListWindow(this->wp);
 
				break;
 
		}
 
	}
 

	
 
	virtual void OnQueryTextFinished(char *str)
 
	{
 
		if (!StrEmpty(str)) {
 
			_cmd_text = str;
 
			DoCommandP(0, this->window_number, 0, NULL, CMD_RENAME_WAYPOINT | CMD_MSG(STR_CANT_CHANGE_WAYPOINT_NAME));
 
		}
 
	}
 

	
 
};
 

	
 
static const Widget _waypoint_view_widgets[] = {
 
{   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_GREY,     0,    10,     0,    13, STR_00C5,              STR_018B_CLOSE_WINDOW},                 // WAYPVW_CLOSEBOX
 
{    WWT_CAPTION,   RESIZE_NONE,  COLOUR_GREY,    11,   247,     0,    13, STR_WAYPOINT_VIEWPORT, STR_018C_WINDOW_TITLE_DRAG_THIS},       // WAYPVW_CAPTION
 
{  WWT_STICKYBOX,   RESIZE_NONE,  COLOUR_GREY,   248,   259,     0,    13, 0x0,                   STR_STICKY_BUTTON},                     // WAYPVW_STICKY
 
{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     0,   259,    14,   105, 0x0,                   STR_NULL},                              // WAYPVW_VIEWPORTPANEL
 
{      WWT_INSET,   RESIZE_NONE,  COLOUR_GREY,     2,   257,    16,   103, 0x0,                   STR_NULL},                              // WAYPVW_SPACER
 
{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,     0,   121,   106,   117, STR_00E4_LOCATION,     STR_3053_CENTER_MAIN_VIEW_ON_STATION},  // WAYPVW_CENTERVIEW
 
{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   122,   244,   106,   117, STR_0130_RENAME,       STR_CHANGE_WAYPOINT_NAME},              // WAYPVW_RENAME
 
{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   245,   259,   106,   117, STR_TRAIN,             STR_SCHEDULED_TRAINS_TIP },             // WAYPVW_SHOW_TRAINS
 
{   WIDGETS_END},
 
};
 

	
 
static const WindowDesc _waypoint_view_desc = {
 
	WDP_AUTO, WDP_AUTO, 260, 118, 260, 118,
 
	WC_WAYPOINT_VIEW, WC_NONE,
 
	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON,
 
	_waypoint_view_widgets,
 
};
 

	
 
void ShowWaypointWindow(const Waypoint *wp)
 
{
 
	AllocateWindowDescFront<WaypointWindow>(&_waypoint_view_desc, wp->index);
 
}
src/waypoints_gui.cpp
Show inline comments
 
deleted file
0 comments (0 inline, 0 general)