Cleaned up MapTrainerTeamMember widget

1 files changed, 98 insertions, 58 deletions

diff --git a/sigmodr/gui/maptrainerteammember.ui b/sigmodr/gui/maptrainerteammember.ui
index 2e59d9e1..0f174acc 100644
--- a/sigmodr/gui/maptrainerteammember.ui
+++ b/sigmodr/gui/maptrainerteammember.ui
@@ -1,12 +1,22 @@
 <ui version="4.0" >
  <class>formMapTrainerTeamMember</class>
  <widget class="QWidget" name="formMapTrainerTeamMember" >
-  <layout class="QVBoxLayout" >
-   <item>
-    <widget class="QGroupBox" name="boxSpecies" >
-     <property name="title" >
-      <string>Species</string>
+  <layout class="QGridLayout" >
+   <item row="0" column="0" >
+    <widget class="QLabel" name="labelSpecies" >
+     <property name="text" >
+      <string>Species:</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
      </property>
+     <property name="buddy" >
+      <cstring>varSpecies</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" >
+    <widget class="KComboBox" name="varSpecies" >
      <property name="toolTip" >
       <string>Species of the team member</string>
      </property>
@@ -16,18 +26,23 @@
      <property name="whatsThis" >
       <string>Species of the team member</string>
      </property>
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KComboBox" name="varSpecies" />
-      </item>
-     </layout>
     </widget>
    </item>
-   <item>
-    <widget class="QGroupBox" name="boxLevel" >
-     <property name="title" >
-      <string comment="Label for level of the team member" >Level</string>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="labelLevel" >
+     <property name="text" >
+      <string comment="Label for the level of the team member" >Level:</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
+     </property>
+     <property name="buddy" >
+      <cstring>varLevel</cstring>
      </property>
+    </widget>
+   </item>
+   <item row="1" column="1" >
+    <widget class="KIntNumInput" name="varLevel" >
      <property name="toolTip" >
       <string>Level of the team member</string>
      </property>
@@ -37,34 +52,28 @@
      <property name="whatsThis" >
       <string>Level of the team member</string>
      </property>
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KIntNumInput" name="varLevel" >
-        <property name="minimum" >
-         <number>1</number>
-        </property>
-       </widget>
-      </item>
-     </layout>
+     <property name="minimum" >
+      <number>1</number>
+     </property>
     </widget>
    </item>
-   <item>
+   <item row="2" column="0" colspan="2" >
     <widget class="QGroupBox" name="boxAbilities" >
      <property name="title" >
       <string>Abilities</string>
      </property>
-     <property name="toolTip" >
-      <string>Abilities the team member has</string>
-     </property>
-     <property name="statusTip" >
-      <string>Abilities the team member has</string>
-     </property>
-     <property name="whatsThis" >
-      <string>Abilities the team member has</string>
-     </property>
      <layout class="QHBoxLayout" >
       <item>
        <widget class="KActionSelector" name="varAbilities" >
+        <property name="toolTip" >
+         <string>Abilities the team member has</string>
+        </property>
+        <property name="statusTip" >
+         <string>Abilities the team member has</string>
+        </property>
+        <property name="whatsThis" >
+         <string>Abilities the team member has</string>
+        </property>
         <property name="showUpDownButtons" >
          <bool>false</bool>
         </property>
@@ -73,30 +82,52 @@
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="3" column="0" colspan="2" >
     <widget class="QGroupBox" name="boxItems" >
      <property name="title" >
       <string>Items</string>
      </property>
-     <property name="toolTip" >
-      <string>Items the team member is holding</string>
-     </property>
-     <property name="statusTip" >
-      <string>Items the team member is holding</string>
-     </property>
-     <property name="whatsThis" >
-      <string>Items the team member is holding</string>
-     </property>
-     <layout class="QHBoxLayout" >
-      <item>
+     <layout class="QGridLayout" >
+      <item row="0" column="0" colspan="2" >
        <widget class="KActionSelector" name="varItems" >
+        <property name="toolTip" >
+         <string>Items the team member is holding</string>
+        </property>
+        <property name="statusTip" >
+         <string>Items the team member is holding</string>
+        </property>
+        <property name="whatsThis" >
+         <string>Items the team member is holding</string>
+        </property>
         <property name="showUpDownButtons" >
          <bool>false</bool>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="labelItemCount" >
+        <property name="text" >
+         <string>Item count:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignVCenter</set>
+        </property>
+        <property name="buddy" >
+         <cstring>varItemCount</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
        <widget class="KIntNumInput" name="varItemCount" >
+        <property name="toolTip" >
+         <string>How many of the item the creature is holding</string>
+        </property>
+        <property name="statusTip" >
+         <string>How many of the item the creature is holding</string>
+        </property>
+        <property name="whatsThis" >
+         <string>How many of the item the creature is holding</string>
+        </property>
         <property name="minimum" >
          <number>1</number>
         </property>
@@ -105,23 +136,23 @@
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="4" column="0" colspan="2" >
     <widget class="QGroupBox" name="boxMoves" >
      <property name="title" >
       <string>Moves</string>
      </property>
-     <property name="toolTip" >
-      <string>Moves the team member has</string>
-     </property>
-     <property name="statusTip" >
-      <string>Moves the team member has</string>
-     </property>
-     <property name="whatsThis" >
-      <string>Moves the team member has</string>
-     </property>
      <layout class="QHBoxLayout" >
       <item>
        <widget class="KActionSelector" name="varMoves" >
+        <property name="toolTip" >
+         <string>Moves the team member has</string>
+        </property>
+        <property name="statusTip" >
+         <string>Moves the team member has</string>
+        </property>
+        <property name="whatsThis" >
+         <string>Moves the team member has</string>
+        </property>
         <property name="showUpDownButtons" >
          <bool>false</bool>
         </property>
@@ -130,7 +161,7 @@
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="5" column="0" colspan="2" >
     <widget class="QGroupBox" name="boxNatures" >
      <property name="title" >
       <string>Natures</string>
@@ -155,7 +186,7 @@
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="6" column="0" colspan="2" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
@@ -187,6 +218,15 @@
    <header location="global" >KIntNumInput</header>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>varSpecies</tabstop>
+  <tabstop>varLevel</tabstop>
+  <tabstop>varAbilities</tabstop>
+  <tabstop>varItems</tabstop>
+  <tabstop>varItemCount</tabstop>
+  <tabstop>varMoves</tabstop>
+  <tabstop>varNatures</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>