Merge lp:~alocritani/widelands/bug902823 into lp:widelands

[Angelo Locritani]

Move the "change capacity" buttons inside the "soldiers" tab

=== modified file 'src/wui/militarysitewindow.cc'
--- src/wui/militarysitewindow.cc	2011-11-30 21:38:37 +0000
+++ src/wui/militarysitewindow.cc	2011-12-13 13:01:09 +0000
@@ -61,11 +61,6 @@
 void MilitarySite_Window::create_capsbuttons(UI::Box * buttons)
 {
 	Building_Window::create_capsbuttons(buttons);
-
-	buttons->add_space(8);
-	buttons->add
-		(create_soldier_capacity_control(*buttons, igbase(), militarysite()),
-		 UI::Box::AlignCenter);
 }
 
 /**

=== modified file 'src/wui/soldierlist.cc'
--- src/wui/soldierlist.cc	2011-11-30 21:38:37 +0000
+++ src/wui/soldierlist.cc	2011-12-13 13:01:09 +0000
@@ -29,6 +29,7 @@
 #include "logic/player.h"
 #include "logic/soldier.h"
 #include "logic/soldiercontrol.h"
+#include "soldiercapacitycontrol.h"
 #include "ui_basic/box.h"
 #include "ui_basic/button.h"
 #include "ui_basic/table.h"
@@ -395,6 +396,15 @@
 		(style.calc_bare_width(_("Click soldier to send away")),
 		 style.calc_bare_width("HP: 8/8  AT: 8/8  DE: 8/8  EV: 8/8_"));
 	set_min_desired_breadth(maxtextwidth + 4);
+
+	UI::Box * capacity_buttons = new UI::Box(this, 0, 0, UI::Box::Horizontal);
+	capacity_buttons->add
+		(create_soldier_capacity_control(*capacity_buttons, igb, building),
+		 UI::Box::AlignCenter);
+
+	add(capacity_buttons, UI::Box::AlignRight);
+
+
 }
 
 SoldierControl & SoldierList::soldiers() const

=== modified file 'src/wui/trainingsitewindow.cc'
--- src/wui/trainingsitewindow.cc	2011-11-30 21:38:37 +0000
+++ src/wui/trainingsitewindow.cc	2011-12-13 13:01:09 +0000
@@ -60,11 +60,6 @@
 void TrainingSite_Window::create_capsbuttons(UI::Box * buttons)
 {
 	ProductionSite_Window::create_capsbuttons(buttons);
-
-	buttons->add_space(8);
-	buttons->add
-		(create_soldier_capacity_control(*buttons, igbase(), trainingsite()),
-		 UI::Box::AlignCenter);
 }
 
 /*