summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/group_gui.cpp39
-rw-r--r--src/lang/english.txt8
-rw-r--r--src/vehicle_gui.cpp67
3 files changed, 62 insertions, 52 deletions
diff --git a/src/group_gui.cpp b/src/group_gui.cpp
index 97e7bce59..e7f76b896 100644
--- a/src/group_gui.cpp
+++ b/src/group_gui.cpp
@@ -98,7 +98,7 @@ static const NWidgetPart _nested_group_widgets[] = {
EndContainer(),
NWidget(NWID_HORIZONTAL),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, GRP_WIDGET_AVAILABLE_VEHICLES), SetMinimalSize(106, 12), SetFill(0, 1),
- SetDataTip(0x0, STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP),
+ SetDataTip(STR_BLACK_STRING, STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP),
NWidget(WWT_DROPDOWN, COLOUR_GREY, GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN), SetMinimalSize(118, 12), SetFill(0, 1),
SetDataTip(STR_VEHICLE_LIST_MANAGE_LIST, STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP),
NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, GRP_WIDGET_STOP_ALL), SetMinimalSize(12, 12), SetFill(0, 1),
@@ -197,7 +197,6 @@ public:
this->GetWidget<NWidgetCore>(GRP_WIDGET_CAPTION)->widget_data = STR_VEHICLE_LIST_TRAIN_CAPTION + this->vehicle_type;
this->GetWidget<NWidgetCore>(GRP_WIDGET_LIST_VEHICLE)->tool_tip = STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP + this->vehicle_type;
- this->GetWidget<NWidgetCore>(GRP_WIDGET_AVAILABLE_VEHICLES)->widget_data = STR_VEHICLE_LIST_AVAILABLE_TRAINS + this->vehicle_type;
this->GetWidget<NWidgetCore>(GRP_WIDGET_CREATE_GROUP)->widget_data += this->vehicle_type;
this->GetWidget<NWidgetCore>(GRP_WIDGET_RENAME_GROUP)->widget_data += this->vehicle_type;
@@ -268,22 +267,28 @@ public:
virtual void SetStringParameters(int widget) const
{
- if (widget != GRP_WIDGET_CAPTION) return;
-
- /* If selected_group == DEFAULT_GROUP || ALL_GROUP, draw the standard caption
- * We list all vehicles or ungrouped vehicles */
- if (IsDefaultGroupID(this->group_sel) || IsAllGroupID(this->group_sel)) {
- SetDParam(0, STR_COMPANY_NAME);
- SetDParam(1, GB(this->window_number, 0, 8));
- SetDParam(2, this->vehicles.Length());
- SetDParam(3, this->vehicles.Length());
- } else {
- const Group *g = Group::Get(this->group_sel);
+ switch (widget) {
+ case GRP_WIDGET_AVAILABLE_VEHICLES:
+ SetDParam(0, STR_VEHICLE_LIST_AVAILABLE_TRAINS + this->vehicle_type);
+ break;
- SetDParam(0, STR_GROUP_NAME);
- SetDParam(1, g->index);
- SetDParam(2, g->num_vehicle);
- SetDParam(3, g->num_vehicle);
+ case GRP_WIDGET_CAPTION:
+ /* If selected_group == DEFAULT_GROUP || ALL_GROUP, draw the standard caption
+ * We list all vehicles or ungrouped vehicles */
+ if (IsDefaultGroupID(this->group_sel) || IsAllGroupID(this->group_sel)) {
+ SetDParam(0, STR_COMPANY_NAME);
+ SetDParam(1, GB(this->window_number, 0, 8));
+ SetDParam(2, this->vehicles.Length());
+ SetDParam(3, this->vehicles.Length());
+ } else {
+ const Group *g = Group::Get(this->group_sel);
+
+ SetDParam(0, STR_GROUP_NAME);
+ SetDParam(1, g->index);
+ SetDParam(2, g->num_vehicle);
+ SetDParam(3, g->num_vehicle);
+ }
+ break;
}
}
diff --git a/src/lang/english.txt b/src/lang/english.txt
index dbba06cc5..09d6f7434 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -2710,10 +2710,10 @@ STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Aircraft
STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR :{TINYFONT}{BLACK}Profit this year: {CURRENCY} (last year: {CURRENCY})
-STR_VEHICLE_LIST_AVAILABLE_TRAINS :{BLACK}Available Trains
-STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES :{BLACK}Available Vehicles
-STR_VEHICLE_LIST_AVAILABLE_SHIPS :{BLACK}Available Ships
-STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT :{BLACK}Available Aircraft
+STR_VEHICLE_LIST_AVAILABLE_TRAINS :Available Trains
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES :Available Vehicles
+STR_VEHICLE_LIST_AVAILABLE_SHIPS :Available Ships
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT :Available Aircraft
STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP :{BLACK}See a list of available engine designs for this vehicle type.
STR_VEHICLE_LIST_MANAGE_LIST :{BLACK}Manage list
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index 3e71c7b7c..3a99ae1a1 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -868,7 +868,7 @@ static const NWidgetPart _nested_vehicle_list[] = {
NWidget(NWID_SELECTION, INVALID_COLOUR, VLW_WIDGET_HIDE_BUTTONS),
NWidget(NWID_HORIZONTAL),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, VLW_WIDGET_AVAILABLE_VEHICLES), SetMinimalSize(106, 12), SetFill(0, 1),
- SetDataTip(0x0, STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP),
+ SetDataTip(STR_BLACK_STRING, STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP),
NWidget(WWT_DROPDOWN, COLOUR_GREY, VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN), SetMinimalSize(118, 12), SetFill(0, 1),
SetDataTip(STR_VEHICLE_LIST_MANAGE_LIST, STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP),
NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, VLW_WIDGET_STOP_ALL), SetMinimalSize(12, 12), SetFill(0, 1),
@@ -1062,8 +1062,7 @@ public:
this->CreateNestedTree(desc);
/* Set up the window widgets */
- this->GetWidget<NWidgetCore>(VLW_WIDGET_LIST)->tool_tip = STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP + this->vehicle_type;
- this->GetWidget<NWidgetCore>(VLW_WIDGET_AVAILABLE_VEHICLES)->widget_data = STR_VEHICLE_LIST_AVAILABLE_TRAINS + this->vehicle_type;
+ this->GetWidget<NWidgetCore>(VLW_WIDGET_LIST)->tool_tip = STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP + this->vehicle_type;
if (window_type == VLW_SHARED_ORDERS) {
this->GetWidget<NWidgetCore>(VLW_WIDGET_CAPTION)->widget_data = STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION;
@@ -1113,38 +1112,44 @@ public:
virtual void SetStringParameters(int widget) const
{
- if (widget != VLW_WIDGET_CAPTION) return;
-
- const uint16 index = GB(this->window_number, 16, 16);
- switch (this->window_number & VLW_MASK) {
- case VLW_SHARED_ORDERS: // Shared Orders
- if (this->vehicles.Length() == 0) {
- /* We can't open this window without vehicles using this order
- * and we should close the window when deleting the order */
- NOT_REACHED();
- }
- SetDParam(0, this->vscroll.GetCount());
+ switch (widget) {
+ case VLW_WIDGET_AVAILABLE_VEHICLES:
+ SetDParam(0, STR_VEHICLE_LIST_AVAILABLE_TRAINS + this->vehicle_type);
break;
- case VLW_STANDARD: // Company Name
- SetDParam(0, STR_COMPANY_NAME);
- SetDParam(1, index);
- SetDParam(3, this->vscroll.GetCount());
- break;
+ case VLW_WIDGET_CAPTION: {
+ const uint16 index = GB(this->window_number, 16, 16);
+ switch (this->window_number & VLW_MASK) {
+ case VLW_SHARED_ORDERS: // Shared Orders
+ if (this->vehicles.Length() == 0) {
+ /* We can't open this window without vehicles using this order
+ * and we should close the window when deleting the order */
+ NOT_REACHED();
+ }
+ SetDParam(0, this->vscroll.GetCount());
+ break;
- case VLW_STATION_LIST: // Station/Waypoint Name
- SetDParam(0, Station::IsExpected(BaseStation::Get(index)) ? STR_STATION_NAME : STR_WAYPOINT_NAME);
- SetDParam(1, index);
- SetDParam(3, this->vscroll.GetCount());
- break;
+ case VLW_STANDARD: // Company Name
+ SetDParam(0, STR_COMPANY_NAME);
+ SetDParam(1, index);
+ SetDParam(3, this->vscroll.GetCount());
+ break;
- case VLW_DEPOT_LIST:
- SetDParam(0, STR_DEPOT_CAPTION);
- SetDParam(1, this->vehicle_type);
- SetDParam(2, index);
- SetDParam(3, this->vscroll.GetCount());
- break;
- default: NOT_REACHED();
+ case VLW_STATION_LIST: // Station/Waypoint Name
+ SetDParam(0, Station::IsExpected(BaseStation::Get(index)) ? STR_STATION_NAME : STR_WAYPOINT_NAME);
+ SetDParam(1, index);
+ SetDParam(3, this->vscroll.GetCount());
+ break;
+
+ case VLW_DEPOT_LIST:
+ SetDParam(0, STR_DEPOT_CAPTION);
+ SetDParam(1, this->vehicle_type);
+ SetDParam(2, index);
+ SetDParam(3, this->vscroll.GetCount());
+ break;
+ default: NOT_REACHED();
+ }
+ } break;
}
}
generated by cgit v1.2.3-54-g00ecf (git 2.44.0) at 2024-07-22 03:20:46 +0000