summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichi_cc <michi_cc@openttd.org>2012-04-17 19:43:38 +0000
committermichi_cc <michi_cc@openttd.org>2012-04-17 19:43:38 +0000
commit32ab630bda765ba6eb7283d06df88d783ce17865 (patch)
tree562a14f9bb82c9da292b7e2be15ba98e3e2998fc
parentf1c59a315961ac8cc4d2e65a33f9322dc32b0941 (diff)
downloadopenttd-32ab630bda765ba6eb7283d06df88d783ce17865.tar.xz
(svn r24131) -Add [FS#1952]: Ctrl-Clicking to change colour of all colour schemes at once. (Roest)
-rw-r--r--src/company_gui.cpp3
-rw-r--r--src/lang/english.txt4
2 files changed, 4 insertions, 3 deletions
diff --git a/src/company_gui.cpp b/src/company_gui.cpp
index 6804e98d1..654eb94e6 100644
--- a/src/company_gui.cpp
+++ b/src/company_gui.cpp
@@ -781,7 +781,8 @@ public:
virtual void OnDropdownSelect(int widget, int index)
{
for (LiveryScheme scheme = LS_DEFAULT; scheme < LS_END; scheme++) {
- if (HasBit(this->sel, scheme)) {
+ /* Changed colour for the selected scheme, or all visible schemes if CTRL is pressed. */
+ if (HasBit(this->sel, scheme) || (_ctrl_pressed && _livery_class[scheme] == this->livery_class && HasBit(_loaded_newgrf_features.used_liveries, scheme))) {
DoCommandP(0, scheme | (widget == WID_SCL_PRI_COL_DROPDOWN ? 0 : 256), index, CMD_SET_COMPANY_COLOUR);
}
}
diff --git a/src/lang/english.txt b/src/lang/english.txt
index fba9c9790..4575df7c9 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -1484,8 +1484,8 @@ STR_LIVERY_TRAIN_TOOLTIP :{BLACK}Show tra
STR_LIVERY_ROAD_VEHICLE_TOOLTIP :{BLACK}Show road vehicle colour schemes
STR_LIVERY_SHIP_TOOLTIP :{BLACK}Show ship colour schemes
STR_LIVERY_AIRCRAFT_TOOLTIP :{BLACK}Show aircraft colour schemes
-STR_LIVERY_PRIMARY_TOOLTIP :{BLACK}Choose the primary colour for the selected scheme
-STR_LIVERY_SECONDARY_TOOLTIP :{BLACK}Choose the secondary colour for the selected scheme
+STR_LIVERY_PRIMARY_TOOLTIP :{BLACK}Choose the primary colour for the selected scheme. Ctrl+Click will set this colour for every scheme
+STR_LIVERY_SECONDARY_TOOLTIP :{BLACK}Choose the secondary colour for the selected scheme. Ctrl+Click will set this colour for every scheme
STR_LIVERY_PANEL_TOOLTIP :{BLACK}Select a colour scheme to change, or multiple schemes with Ctrl+Click. Click on the box to toggle use of the scheme
STR_LIVERY_DEFAULT :Standard Livery