Mercurial > hg > openttd

changeset 14971:34548761af22 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r19579) -Codechange: auto-raise 'Enable/Disable all' buttons in the Cargo payment rates window
author smatz <smatz@openttd.org>
date Wed, 07 Apr 2010 21:22:08 +0000
parents 04e81a0048e4
children 5b01b5e3b63c
files src/graph_gui.cpp
diffstat 1 files changed, 3 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/graph_gui.cpp
+++ b/src/graph_gui.cpp
@@ -919,9 +919,6 @@
 				_legend_excluded_cargo = 0;
 				this->excluded_data = 0;
 				this->UpdateLoweredWidgets();
-				/* Toggle appeareance indicating the choice. */
-				this->LowerWidget(CPW_ENABLE_CARGOS);
-				this->RaiseWidget(CPW_DISABLE_CARGOS);
 				this->SetDirty();
 				break;
 
@@ -935,9 +932,6 @@
 					i++;
 				}
 				this->UpdateLoweredWidgets();
-				/* Toggle appeareance indicating the choice. */
-				this->LowerWidget(CPW_DISABLE_CARGOS);
-				this->RaiseWidget(CPW_ENABLE_CARGOS);
 				this->SetDirty();
 			} break;
 
@@ -947,9 +941,6 @@
 					ToggleBit(_legend_excluded_cargo, _sorted_cargo_specs[i]->Index());
 					this->ToggleWidgetLoweredState(widget);
 					this->UpdateExcludedData();
-					/* Raise the two "all" buttons, as we have done a specific choice. */
-					this->RaiseWidget(CPW_ENABLE_CARGOS);
-					this->RaiseWidget(CPW_DISABLE_CARGOS);
 					this->SetDirty();
 				}
 				break;
@@ -1018,8 +1009,8 @@
 				NWidget(WWT_EMPTY, COLOUR_GREY, CPW_GRAPH), SetMinimalSize(495, 0), SetFill(1, 1),
 				NWidget(NWID_VERTICAL),
 					NWidget(NWID_SPACER), SetMinimalSize(0, 24), SetFill(0, 0),
-						NWidget(WWT_TEXTBTN, COLOUR_ORANGE, CPW_ENABLE_CARGOS), SetDataTip(STR_GRAPH_CARGO_ENABLE_ALL, STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL),SetFill(1, 0),
-						NWidget(WWT_TEXTBTN, COLOUR_ORANGE, CPW_DISABLE_CARGOS), SetDataTip(STR_GRAPH_CARGO_DISABLE_ALL, STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL),SetFill(1, 0),
+						NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, CPW_ENABLE_CARGOS), SetDataTip(STR_GRAPH_CARGO_ENABLE_ALL, STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL), SetFill(1, 0),
+						NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, CPW_DISABLE_CARGOS), SetDataTip(STR_GRAPH_CARGO_DISABLE_ALL, STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL), SetFill(1, 0),
 						NWidget(NWID_SPACER), SetMinimalSize(0, 4), SetFill(0, 0),
 						NWidgetFunction(MakeCargoButtons),
 					NWidget(NWID_SPACER), SetMinimalSize(0, 24), SetFill(0, 1),
@@ -1038,7 +1029,7 @@
 static const WindowDesc _cargo_payment_rates_desc(
 	WDP_AUTO, 0, 0,
 	WC_PAYMENT_RATES, WC_NONE,
-	0,
+	WDF_UNCLICK_BUTTONS,
 	_nested_cargo_payment_rates_widgets, lengthof(_nested_cargo_payment_rates_widgets)
 );