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

Improve labels of non-text scheduled dispatch date/time entry window

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-11-23 23:40:13 +00:00
parent 766fbacd57
commit 2308345803
4 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/date_gui.cpp
View File

@@ -39,7 +39,8 @@ struct SetDateWindow : Window {
* @param max_year the maximum year (inclusive) 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 * @param callback the callback to call once a date has been selected
*/ */
SetDateWindow(WindowDesc *desc, WindowNumber window_number, Window *parent, Date initial_date, Year min_year, Year max_year, SetDateCallback *callback) : SetDateWindow(WindowDesc *desc, WindowNumber window_number, Window *parent, Date initial_date, Year min_year, Year max_year,
SetDateCallback *callback, StringID button_text, StringID button_tooltip) :
Window(desc), Window(desc),
callback(callback), callback(callback),
min_year(std::max(MIN_YEAR, min_year)), min_year(std::max(MIN_YEAR, min_year)),
@@ -47,7 +48,13 @@ struct SetDateWindow : Window {
{ {
assert(this->min_year <= this->max_year); assert(this->min_year <= this->max_year);
this->parent = parent; this->parent = parent;
this->InitNested(window_number); this->CreateNestedTree();
if (button_text != STR_NULL || button_tooltip != STR_NULL) {
NWidgetCore *btn = this->GetWidget<NWidgetCore>(WID_SD_SET_DATE);
if (button_text != STR_NULL) btn->widget_data = button_text;
if (button_tooltip != STR_NULL) btn->tool_tip = button_tooltip;
}
this->FinishInitNested(window_number);
if (initial_date == 0) initial_date = _date; if (initial_date == 0) initial_date = _date;
ConvertDateToYMD(initial_date, &this->date); ConvertDateToYMD(initial_date, &this->date);
@@ -179,9 +186,10 @@ struct SetMinutesWindow : SetDateWindow
Minutes minutes; Minutes minutes;
/** Constructor. */ /** Constructor. */
SetMinutesWindow(WindowDesc *desc, WindowNumber window_number, Window *parent, DateTicksScaled initial_date, Year min_year, Year max_year, SetDateCallback *callback) : SetMinutesWindow(WindowDesc *desc, WindowNumber window_number, Window *parent, DateTicksScaled initial_date, Year min_year, Year max_year,
SetDateWindow(desc, window_number, parent, initial_date, min_year, max_year, callback), SetDateCallback *callback, StringID button_text, StringID button_tooltip) :
minutes(initial_date / _settings_time.ticks_per_minute) SetDateWindow(desc, window_number, parent, initial_date, min_year, max_year, callback, button_text, button_tooltip),
minutes(initial_date / _settings_time.ticks_per_minute)
{ {
} }
@@ -317,7 +325,7 @@ static const NWidgetPart _nested_set_date_widgets[] = {
static const NWidgetPart _nested_set_minutes_widgets[] = { static const NWidgetPart _nested_set_minutes_widgets[] = {
NWidget(NWID_HORIZONTAL), NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_BROWN), NWidget(WWT_CLOSEBOX, COLOUR_BROWN),
NWidget(WWT_CAPTION, COLOUR_BROWN), SetDataTip(STR_DATE_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), NWidget(WWT_CAPTION, COLOUR_BROWN), SetDataTip(STR_TIME_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
EndContainer(), EndContainer(),
NWidget(WWT_PANEL, COLOUR_BROWN), NWidget(WWT_PANEL, COLOUR_BROWN),
NWidget(NWID_VERTICAL), SetPIP(6, 6, 6), NWidget(NWID_VERTICAL), SetPIP(6, 6, 6),
@@ -358,15 +366,17 @@ static WindowDesc _set_minutes_desc(
* @param max_year the maximum year (inclusive) 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 * @param callback the callback to call once a date has been selected
*/ */
void ShowSetDateWindow(Window *parent, int window_number, DateTicksScaled initial_date, Year min_year, Year max_year, SetDateCallback *callback) void ShowSetDateWindow(Window *parent, int window_number, DateTicksScaled initial_date, Year min_year, Year max_year,
SetDateCallback *callback, StringID button_text, StringID button_tooltip)
{ {
DeleteWindowByClass(WC_SET_DATE); DeleteWindowByClass(WC_SET_DATE);
if (!_settings_time.time_in_minutes) { if (!_settings_time.time_in_minutes) {
new SetDateWindow(&_set_date_desc, window_number, parent, initial_date / (DAY_TICKS * _settings_game.economy.day_length_factor), min_year, max_year, callback); new SetDateWindow(&_set_date_desc, window_number, parent, initial_date / (DAY_TICKS * _settings_game.economy.day_length_factor),
min_year, max_year, callback, button_text, button_tooltip);
} else { } else {
new SetMinutesWindow(&_set_minutes_desc, window_number, parent, new SetMinutesWindow(&_set_minutes_desc, window_number, parent,
initial_date + (_settings_game.economy.day_length_factor * (_settings_time.clock_offset * _settings_time.ticks_per_minute)), initial_date + (_settings_game.economy.day_length_factor * (_settings_time.clock_offset * _settings_time.ticks_per_minute)),
min_year, max_year, callback); min_year, max_year, callback, button_text, button_tooltip);
} }
} }

3
src/date_gui.h
View File

@@ -20,6 +20,7 @@
*/ */
typedef void SetDateCallback(const Window *w, DateTicksScaled date); typedef void SetDateCallback(const Window *w, DateTicksScaled date);
void ShowSetDateWindow(Window *parent, int window_number, DateTicksScaled initial_date, Year min_year, Year max_year, SetDateCallback *callback); void ShowSetDateWindow(Window *parent, int window_number, DateTicksScaled initial_date, Year min_year, Year max_year, SetDateCallback *callback,
StringID button_text = STR_NULL, StringID button_tooltip = STR_NULL);
#endif /* DATE_GUI_H */ #endif /* DATE_GUI_H */

2
src/lang/english.txt
View File

@@ -5695,6 +5695,7 @@ STR_DATE_MONTH_TOOLTIP :{BLACK}Select m
STR_DATE_YEAR_TOOLTIP :{BLACK}Select year STR_DATE_YEAR_TOOLTIP :{BLACK}Select year
STR_DATE_MINUTES_DAY_TOOLTIP :{BLACK}Select minute STR_DATE_MINUTES_DAY_TOOLTIP :{BLACK}Select minute
STR_DATE_MINUTES_MONTH_TOOLTIP :{BLACK}Select hour STR_DATE_MINUTES_MONTH_TOOLTIP :{BLACK}Select hour
STR_TIME_CAPTION :{WHITE}Set time
# Cargo type orders Window # Cargo type orders Window
STR_CARGO_TYPE_ORDERS_LOAD_CAPTION :{WHITE}{VEHICLE} ({NUM}: Load at {STATION}) STR_CARGO_TYPE_ORDERS_LOAD_CAPTION :{WHITE}{VEHICLE} ({NUM}: Load at {STATION})
@@ -7050,6 +7051,7 @@ STR_SCHDISPATCH_DURATION_TOOLTIP :{BLACK}Set dura
STR_SCHDISPATCH_DURATION_CAPTION_MINUTE :{BLACK}Duration (minute) STR_SCHDISPATCH_DURATION_CAPTION_MINUTE :{BLACK}Duration (minute)
STR_SCHDISPATCH_DURATION_CAPTION_DAY :{BLACK}Duration (day) STR_SCHDISPATCH_DURATION_CAPTION_DAY :{BLACK}Duration (day)
STR_SCHDISPATCH_START :{BLACK}Start Date STR_SCHDISPATCH_START :{BLACK}Start Date
STR_SCHDISPATCH_SET_START :{BLACK}Set Start Date
STR_SCHDISPATCH_START_TOOLTIP :{BLACK}Select a date to start this schedule. STR_SCHDISPATCH_START_TOOLTIP :{BLACK}Select a date to start this schedule.
STR_SCHDISPATCH_START_CAPTION_MINUTE :{BLACK}Start time (hhmm) STR_SCHDISPATCH_START_CAPTION_MINUTE :{BLACK}Start time (hhmm)
STR_SCHDISPATCH_DELAY :{BLACK}Delay STR_SCHDISPATCH_DELAY :{BLACK}Delay

4
src/schdispatch_gui.cpp
View File

@@ -473,7 +473,7 @@ struct SchdispatchWindow : Window {
if (_settings_time.time_in_minutes && _settings_client.gui.timetable_start_text_entry) { if (_settings_time.time_in_minutes && _settings_client.gui.timetable_start_text_entry) {
ShowQueryString(STR_EMPTY, STR_SCHDISPATCH_ADD_CAPTION, 31, this, CS_NUMERAL, QSF_NONE); ShowQueryString(STR_EMPTY, STR_SCHDISPATCH_ADD_CAPTION, 31, this, CS_NUMERAL, QSF_NONE);
} else { } else {
ShowSetDateWindow(this, v->index, _scaled_date_ticks, _cur_year, _cur_year + 15, ScheduleAddCallback); ShowSetDateWindow(this, v->index, _scaled_date_ticks, _cur_year, _cur_year + 15, ScheduleAddCallback, STR_SCHDISPATCH_ADD, STR_SCHDISPATCH_ADD_TOOLTIP);
} }
break; break;
} }
@@ -494,7 +494,7 @@ struct SchdispatchWindow : Window {
SetDParam(0, time); SetDParam(0, time);
ShowQueryString(STR_JUST_INT, STR_SCHDISPATCH_START_CAPTION_MINUTE, 31, this, CS_NUMERAL, QSF_ACCEPT_UNCHANGED); ShowQueryString(STR_JUST_INT, STR_SCHDISPATCH_START_CAPTION_MINUTE, 31, this, CS_NUMERAL, QSF_ACCEPT_UNCHANGED);
} else { } else {
ShowSetDateWindow(this, v->index, _scaled_date_ticks, _cur_year, _cur_year + 15, SetScheduleStartDateCallback); ShowSetDateWindow(this, v->index, _scaled_date_ticks, _cur_year, _cur_year + 15, SetScheduleStartDateCallback, STR_SCHDISPATCH_SET_START, STR_SCHDISPATCH_START_TOOLTIP);
} }
break; break;
} }