diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index 6feab38061..0b2f9f9c64 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -915,6 +915,10 @@
RelativePath=".\..\src\date_func.h"
>
+
+
@@ -1791,6 +1795,10 @@
RelativePath=".\..\src\console_gui.cpp"
>
+
+
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index 569b8a04b4..94b35d120f 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -912,6 +912,10 @@
RelativePath=".\..\src\date_func.h"
>
+
+
@@ -1788,6 +1792,10 @@
RelativePath=".\..\src\console_gui.cpp"
>
+
+
diff --git a/source.list b/source.list
index 82abc4da9f..b44e967dae 100644
--- a/source.list
+++ b/source.list
@@ -138,6 +138,7 @@ console_internal.h
console_type.h
currency.h
date_func.h
+date_gui.h
date_type.h
debug.h
video/dedicated_v.h
@@ -374,6 +375,7 @@ build_vehicle_gui.cpp
cheat_gui.cpp
company_gui.cpp
console_gui.cpp
+date_gui.cpp
depot_gui.cpp
dock_gui.cpp
engine_gui.cpp
diff --git a/src/date_gui.cpp b/src/date_gui.cpp
new file mode 100644
index 0000000000..dc6d9b8cbf
--- /dev/null
+++ b/src/date_gui.cpp
@@ -0,0 +1,232 @@
+/* $Id$ */
+
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * 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 .
+ */
+
+/** @file date_gui.cpp Graphical selection of a date. */
+
+#include "stdafx.h"
+#include "core/math_func.hpp"
+#include "strings_func.h"
+#include "date_func.h"
+#include "gfx_func.h"
+#include "window_func.h"
+#include "window_gui.h"
+#include "date_gui.h"
+
+#include "widgets/dropdown_type.h"
+#include "widgets/dropdown_func.h"
+
+#include "table/strings.h"
+
+/** Widgets used by the date window */
+enum SetDateWidgets {
+ SDW_DAY, ///< Dropdown for the day
+ SDW_MONTH, ///< Dropdown for the month
+ SDW_YEAR, ///< Dropdown for the year
+ SDW_SET_DATE, ///< Actually set the date
+};
+
+/** Window to select a date graphically by using dropdowns */
+struct SetDateWindow : Window {
+ SetDateCallback *callback; ///< Callback to call when a date has been selected
+ YearMonthDay date; ///< The currently selected date
+ Year min_year; ///< The minimum year in the year dropdown
+ Year max_year; ///< The maximum year (inclusive) in the year dropdown
+
+ /**
+ * Create the new 'set date' window
+ * @param desc the window description
+ * @param window_number number of the window
+ * @param parent the parent window, i.e. if this closes we should close too
+ * @param initial_date the initial date to show
+ * @param min_year the minimum year to show in the year dropdown
+ * @param max_year the maximum year (inclusive) to show in the year dropdown
+ * @param callback the callback to call once a date has been selected
+ */
+ SetDateWindow(const WindowDesc *desc, WindowNumber window_number, Window *parent, Date initial_date, Year min_year, Year max_year, SetDateCallback *callback) :
+ Window(),
+ callback(callback),
+ min_year(max(MIN_YEAR, min_year)),
+ max_year(min(MAX_YEAR, max_year))
+ {
+ assert(this->min_year <= this->max_year);
+ this->parent = parent;
+ this->InitNested(desc, window_number);
+
+ if (initial_date == 0) initial_date = _date;
+ ConvertDateToYMD(initial_date, &this->date);
+ this->date.year = Clamp(this->date.year, min_year, max_year);
+ }
+
+ virtual Point OnInitialPosition(const WindowDesc *desc, int16 sm_width, int16 sm_height, int window_number)
+ {
+ Point pt = { this->parent->left + this->parent->width / 2 - sm_width / 2, this->parent->top + this->parent->height / 2 - sm_height / 2 };
+ return pt;
+ }
+
+ /**
+ * Helper function to construct the dropdown.
+ * @param widget the dropdown widget to create the dropdown for
+ */
+ void ShowDateDropDown(int widget)
+ {
+ int selected;
+ DropDownList *list = new DropDownList();
+
+ switch (widget) {
+ default: NOT_REACHED();
+
+ case SDW_DAY:
+ for (uint i = 0; i < 31; i++) {
+ list->push_back(new DropDownListStringItem(STR_ORDINAL_NUMBER_1ST + i, i + 1, false));
+ }
+ selected = this->date.day;
+ break;
+
+ case SDW_MONTH:
+ for (uint i = 0; i < 12; i++) {
+ list->push_back(new DropDownListStringItem(STR_MONTH_JAN + i, i, false));
+ }
+ selected = this->date.month;
+ break;
+
+ case SDW_YEAR:
+ for (Year i = this->min_year; i <= this->max_year; i++) {
+ DropDownListParamStringItem *item = new DropDownListParamStringItem(STR_JUST_INT, i, false);
+ item->SetParam(0, i);
+ list->push_back(item);
+ }
+ selected = this->date.year;
+ break;
+ }
+
+ ShowDropDownList(this, list, selected, widget);
+ }
+
+ virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize)
+ {
+ Dimension d = {0, 0};
+ switch (widget) {
+ default: return;
+
+ case SDW_DAY:
+ for (uint i = 0; i < 31; i++) {
+ d = maxdim(d, GetStringBoundingBox(STR_ORDINAL_NUMBER_1ST + i));
+ }
+ break;
+
+ case SDW_MONTH:
+ for (uint i = 0; i < 12; i++) {
+ d = maxdim(d, GetStringBoundingBox(STR_MONTH_JAN + i));
+ }
+ break;
+
+ case SDW_YEAR:
+ for (Year i = this->min_year; i <= this->max_year; i++) {
+ SetDParam(0, i);
+ d = maxdim(d, GetStringBoundingBox(STR_JUST_INT));
+ }
+ break;
+ }
+
+ d.width += padding.width;
+ d.height += padding.height;
+ *size = d;
+ }
+
+ virtual void SetStringParameters(int widget) const
+ {
+ switch (widget) {
+ case SDW_DAY: SetDParam(0, this->date.day - 1 + STR_ORDINAL_NUMBER_1ST); break;
+ case SDW_MONTH: SetDParam(0, this->date.month + STR_MONTH_JAN); break;
+ case SDW_YEAR: SetDParam(0, this->date.year); break;
+ }
+ }
+
+ virtual void OnPaint()
+ {
+ this->DrawWidgets();
+ }
+
+ virtual void OnClick(Point pt, int widget)
+ {
+ switch (widget) {
+ case SDW_DAY:
+ case SDW_MONTH:
+ case SDW_YEAR:
+ ShowDateDropDown(widget);
+ break;
+
+ case SDW_SET_DATE:
+ if (this->callback != NULL) this->callback(this->parent, ConvertYMDToDate(this->date.year, this->date.month, this->date.day));
+ delete this;
+ break;
+ }
+ }
+
+ virtual void OnDropdownSelect(int widget, int index)
+ {
+ switch (widget) {
+ case SDW_DAY:
+ this->date.day = index;
+ break;
+
+ case SDW_MONTH:
+ this->date.month = index;
+ break;
+
+ case SDW_YEAR:
+ this->date.year = index;
+ break;
+ }
+ this->SetDirty();
+ }
+};
+
+static const NWidgetPart _nested_set_date_widgets[] = {
+ NWidget(NWID_HORIZONTAL),
+ NWidget(WWT_CLOSEBOX, COLOUR_BROWN),
+ NWidget(WWT_CAPTION, COLOUR_BROWN), SetDataTip(STR_DATE_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
+ EndContainer(),
+ NWidget(WWT_PANEL, COLOUR_BROWN),
+ NWidget(NWID_VERTICAL), SetPIP(6, 6, 6),
+ NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(6, 6, 6),
+ NWidget(WWT_DROPDOWN, COLOUR_ORANGE, SDW_DAY), SetFill(1, 0), SetDataTip(STR_JUST_STRING, STR_DATE_DAY_TOOLTIP),
+ NWidget(WWT_DROPDOWN, COLOUR_ORANGE, SDW_MONTH), SetFill(1, 0), SetDataTip(STR_JUST_STRING, STR_DATE_MONTH_TOOLTIP),
+ NWidget(WWT_DROPDOWN, COLOUR_ORANGE, SDW_YEAR), SetFill(1, 0), SetDataTip(STR_JUST_INT, STR_DATE_YEAR_TOOLTIP),
+ EndContainer(),
+ NWidget(NWID_HORIZONTAL),
+ NWidget(NWID_SPACER), SetFill(1, 0),
+ NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, SDW_SET_DATE), SetMinimalSize(100, 12), SetDataTip(STR_DATE_SET_DATE, STR_DATE_SET_DATE_TOOLTIP),
+ NWidget(NWID_SPACER), SetFill(1, 0),
+ EndContainer(),
+ EndContainer(),
+ EndContainer()
+};
+
+static const WindowDesc _set_date_desc(
+ WDP_CENTER, WDP_CENTER, 0, 0,
+ WC_SET_DATE, WC_NONE,
+ WDF_UNCLICK_BUTTONS,
+ _nested_set_date_widgets, lengthof(_nested_set_date_widgets)
+);
+
+/**
+ * Create the new 'set date' window
+ * @param window_number number for the window
+ * @param parent the parent window, i.e. if this closes we should close too
+ * @param initial_date the initial date to show
+ * @param min_year the minimum year to show in the year dropdown
+ * @param max_year the maximum year (inclusive) to show in the year dropdown
+ * @param callback the callback to call once a date has been selected
+ */
+void ShowSetDateWindow(Window *parent, int window_number, Date initial_date, Year min_year, Year max_year, SetDateCallback *callback)
+{
+ DeleteWindowByClass(WC_SET_DATE);
+ new SetDateWindow(&_set_date_desc, window_number, parent, initial_date, min_year, max_year, callback);
+}
diff --git a/src/date_gui.h b/src/date_gui.h
new file mode 100644
index 0000000000..f15f6b34a2
--- /dev/null
+++ b/src/date_gui.h
@@ -0,0 +1,24 @@
+/* $Id$ */
+
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * 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 .
+ */
+
+/** @file date_gui.h Functions related to the graphical selection of a date. */
+
+#ifndef DATE_GUI_H
+#define DATE_GUI_H
+
+/**
+ * Callback for when a date has been chosen
+ * @param w the window that sends the callback
+ * @param date the date that has been chosen
+ */
+typedef void SetDateCallback(const Window *w, Date date);
+
+void ShowSetDateWindow(Window *parent, int window_number, Date initial_date, Year min_year, Year max_year, SetDateCallback *callback);
+
+#endif /* DATE_GUI_H */
diff --git a/src/lang/english.txt b/src/lang/english.txt
index 4ed70cedd1..ba41cb18ab 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -3168,6 +3168,16 @@ STR_TIMETABLE_DEPARTURE_EARLY :D:{SETX 30}{GRE
STR_TIMETABLE_DEPARTURE_LATE :D:{SETX 30}{RED}{STRING1}
#####
+
+# Date window (for timetable)
+STR_DATE_CAPTION :{WHITE}Set date
+STR_DATE_SET_DATE :{BLACK}Set date
+STR_DATE_SET_DATE_TOOLTIP :{BLACK}Use the selected date as starting date for the timetable
+STR_DATE_DAY_TOOLTIP :{BLACK}Select day
+STR_DATE_MONTH_TOOLTIP :{BLACK}Select month
+STR_DATE_YEAR_TOOLTIP :{BLACK}Select year
+
+
# AI debug window
STR_AI_DEBUG :{WHITE}AI Debug
STR_AI_DEBUG_NAME_TOOLTIP :{BLACK}Name of the AI
diff --git a/src/window_type.h b/src/window_type.h
index 909b945afd..466ed69dd6 100644
--- a/src/window_type.h
+++ b/src/window_type.h
@@ -103,6 +103,7 @@ enum WindowClass {
WC_OSK,
WC_WAYPOINT_VIEW,
WC_SELECT_STATION,
+ WC_SET_DATE,
WC_AI_DEBUG,
WC_AI_LIST,
WC_AI_SETTINGS,