.ui minor update before merge

include/gui/recruitmentscene.ui

@@ -137,7 +137,7 @@
      <height>64</height>
     </rect>
    </property>
-   <layout class="QGridLayout" name="gridLayout">
+   <layout class="QGridLayout" name="available_units_layout_">
     <property name="leftMargin">
      <number>0</number>
     </property>
@@ -153,9 +153,6 @@
     <property name="spacing">
      <number>0</number>
     </property>
-    <item row="0" column="3">
-     <layout class="QHBoxLayout" name="available_units_layout_"/>
-    </item>
    </layout>
   </widget>
   <widget class="QWidget" name="chosen_units_grid_" native="true">
@@ -167,7 +164,7 @@
      <height>128</height>
     </rect>
    </property>
-   <layout class="QGridLayout" name="gridLayout_2">
+   <layout class="QGridLayout" name="chosen_units_layout_">
     <property name="leftMargin">
      <number>0</number>
     </property>
@@ -183,13 +180,6 @@
     <property name="spacing">
      <number>0</number>
     </property>
-    <item row="0" column="0">
-     <layout class="QGridLayout" name="chosen_units_layout_">
-      <property name="spacing">
-       <number>0</number>
-      </property>
-     </layout>
-    </item>
    </layout>
   </widget>
   <widget class="QPushButton" name="apply_">

source/gui/recruitmentscene.cpp

@@ -12,7 +12,7 @@ RecruitmentScene::RecruitmentScene(QWidget *parent)
 
     for (int i = 0; i < 5; i++) {
         available_units_icons_[i] = new UnitIcon(ui->available_units_list_);
-        ui->available_units_layout_->addWidget(available_units_icons_[i]);
+        ui->available_units_layout_->addWidget(available_units_icons_[i], 0, i);
         available_units_icons_[i]->setUnitIcon("norace", "nounit");
     }
 
@@ -39,11 +39,11 @@ RecruitmentScene::RecruitmentScene(QWidget *parent)
     ui->next_spec_unit_4_->setUnitIcon("warcraft", "chaosorc");
 
 
-    //available_units_icons_[0]->setUnitIcon("warcraft", "blademaster");
-    //available_units_icons_[1]->setUnitIcon("warcraft", "chaosorc");
-    //available_units_icons_[2]->setUnitIcon("warcraft", "nagasummoner");
-    //available_units_icons_[3]->setUnitIcon("warcraft", "rogue");
-    //available_units_icons_[4]->setUnitIcon("warcraft", "ogremagi");
+    available_units_icons_[0]->setUnitIcon("warcraft", "blademaster");
+    available_units_icons_[1]->setUnitIcon("warcraft", "chaosorc");
+    available_units_icons_[2]->setUnitIcon("warcraft", "nagasummoner");
+    available_units_icons_[3]->setUnitIcon("warcraft", "rogue");
+    available_units_icons_[4]->setUnitIcon("norace", "nounit");
 }
 
 RecruitmentScene::~RecruitmentScene()