widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

Hans Joachim Desserud has proposed merging lp:~hjd/widelands/button-order into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #902765 in widelands: "Show buttons in the bottom toolbar in the same order, also for spectators"
  https://bugs.launchpad.net/widelands/+bug/902765

For more details, see:
https://code.launchpad.net/~hjd/widelands/button-order/+merge/85249

For details, see the bug report.
-- 
https://code.launchpad.net/~hjd/widelands/button-order/+merge/85249
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/button-order into lp:widelands.

=== modified file 'src/wui/interactive_spectator.cc'
--- src/wui/interactive_spectator.cc	2011-11-30 21:38:37 +0000
+++ src/wui/interactive_spectator.cc	2011-12-11 11:43:26 +0000
@@ -71,7 +71,6 @@
 	m_toggle_minimap.sigclicked.connect(boost::bind(&Interactive_Spectator::toggle_minimap, this));
 
 	m_toolbar.set_layout_toplevel(true);
-	m_toolbar.add(&m_toggle_chat,            UI::Box::AlignLeft);
 	if (!multiplayer) {
 		m_toolbar.add(&m_exit,                UI::Box::AlignLeft);
 		m_toolbar.add(&m_save,                UI::Box::AlignLeft);
@@ -79,6 +78,7 @@
 		m_toolbar.add(&m_toggle_options_menu, UI::Box::AlignLeft);
 	m_toolbar.add(&m_toggle_statistics,      UI::Box::AlignLeft);
 	m_toolbar.add(&m_toggle_minimap,         UI::Box::AlignLeft);
+	m_toolbar.add(&m_toggle_chat,            UI::Box::AlignLeft);
 
 	// TODO : instead of making unneeded buttons invisible after generation,
 	// they should not at all be generated. -> implement more dynamic toolbar UI

=== modified file 'src/wui/transport_ui.cc'
--- src/wui/transport_ui.cc	2011-12-06 20:54:23 +0000
+++ src/wui/transport_ui.cc	2011-12-11 11:43:26 +0000
@@ -143,9 +143,9 @@
 		  text, tooltip, m_can_act);                                \
 	b->sigclicked.connect(boost::bind(&Economy_Options_Ware_Panel::callback, this)); \
 	buttons->add(b, UI::Box::AlignCenter);
-			ADD_WARE_BUTTON(decrease_target, "-", _("Decrease target"))			
+			ADD_WARE_BUTTON(decrease_target, "-", _("Decrease target"))
 			b->set_repeating(true);
-			ADD_WARE_BUTTON(increase_target, "+", _("Increase target"))			
+			ADD_WARE_BUTTON(increase_target, "+", _("Increase target"))
 			b->set_repeating(true);
 			ADD_WARE_BUTTON(reset_target, "R", _("Reset to default"))
 		}