cleaned up ItemType widget

1 files changed, 98 insertions, 70 deletions

diff --git a/sigmodr/gui/itemtype.ui b/sigmodr/gui/itemtype.ui
index 5ebee3c8..226b10c2 100644
--- a/sigmodr/gui/itemtype.ui
+++ b/sigmodr/gui/itemtype.ui
@@ -1,12 +1,22 @@
 <ui version="4.0" >
  <class>formItemType</class>
  <widget class="QWidget" name="formItemType" >
-  <layout class="QVBoxLayout" >
-   <item>
-    <widget class="QGroupBox" name="boxName" >
-     <property name="title" >
-      <string comment="Label for the name of the item type" >Name</string>
+  <layout class="QGridLayout" >
+   <item row="0" column="0" >
+    <widget class="QLabel" name="labelName" >
+     <property name="text" >
+      <string comment="Label for the name of the item type" >Name:</string>
      </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
+     </property>
+     <property name="buddy" >
+      <cstring>varName</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" >
+    <widget class="KLineEdit" name="varName" >
      <property name="toolTip" >
       <string>Name of the item type</string>
      </property>
@@ -16,22 +26,26 @@
      <property name="whatsThis" >
       <string>Name of the item type</string>
      </property>
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KLineEdit" name="varName" >
-        <property name="showClearButton" stdset="0" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
+     <property name="showClearButton" stdset="0" >
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
-   <item>
-    <widget class="QGroupBox" name="boxComputer" >
-     <property name="title" >
-      <string>Computer</string>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="labelComputer" >
+     <property name="text" >
+      <string>Computer storage:</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
      </property>
+     <property name="buddy" >
+      <cstring>varComputer</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" >
+    <widget class="KIntNumInput" name="varComputer" >
      <property name="toolTip" >
       <string>How many of the items can be stored on the computer system</string>
      </property>
@@ -41,22 +55,26 @@
      <property name="whatsThis" >
       <string>How many of the items can be stored on the computer system</string>
      </property>
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KIntNumInput" name="varComputer" >
-        <property name="minimum" >
-         <number>-1</number>
-        </property>
-       </widget>
-      </item>
-     </layout>
+     <property name="minimum" >
+      <number>-1</number>
+     </property>
     </widget>
    </item>
-   <item>
-    <widget class="QGroupBox" name="boxPlayer" >
-     <property name="title" >
-      <string comment="Label for the number of players allowed in an arena at once" >Player</string>
+   <item row="2" column="0" >
+    <widget class="QLabel" name="labelPlayer" >
+     <property name="text" >
+      <string>Player storage:</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
+     </property>
+     <property name="buddy" >
+      <cstring>varPlayer</cstring>
      </property>
+    </widget>
+   </item>
+   <item row="2" column="1" >
+    <widget class="KIntNumInput" name="varPlayer" >
      <property name="toolTip" >
       <string>How many of the type of item the player can carry</string>
      </property>
@@ -66,64 +84,67 @@
      <property name="whatsThis" >
       <string>How many of the type of item the player can carry</string>
      </property>
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KIntNumInput" name="varPlayer" >
-        <property name="minimum" >
-         <number>0</number>
-        </property>
-       </widget>
-      </item>
-     </layout>
+     <property name="minimum" >
+      <number>0</number>
+     </property>
     </widget>
    </item>
-   <item>
-    <widget class="QGroupBox" name="boxMaxWeight" >
-     <property name="title" >
-      <string>Maximum Weight</string>
+   <item row="3" column="0" >
+    <widget class="QLabel" name="labelCount" >
+     <property name="text" >
+      <string>Count:</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
      </property>
+     <property name="buddy" >
+      <cstring>varCount</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1" >
+    <widget class="KComboBox" name="varCount" >
      <property name="toolTip" >
-      <string>How much weight can be carried of these items</string>
+      <string>The way the items count towards the storage limit</string>
      </property>
      <property name="statusTip" >
-      <string>How much weight can be carried of these items</string>
+      <string>The way the items count towards the storage limit</string>
      </property>
      <property name="whatsThis" >
-      <string>How much weight can be carried of these items</string>
-     </property>
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KIntNumInput" name="varMaxWeight" >
-        <property name="minimum" >
-         <number>-1</number>
-        </property>
-       </widget>
-      </item>
-     </layout>
+      <string>The way the items count towards the storage limit</string>
+     </property>
     </widget>
    </item>
-   <item>
-    <widget class="QGroupBox" name="boxCount" >
-     <property name="title" >
-      <string>Count</string>
+   <item row="4" column="0" >
+    <widget class="QLabel" name="labelMaxWeight" >
+     <property name="text" >
+      <string>Maximum weight:</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
      </property>
+     <property name="buddy" >
+      <cstring>varMaxWeight</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="1" >
+    <widget class="KIntNumInput" name="varMaxWeight" >
      <property name="toolTip" >
-      <string>The way the items count towards the storage limit</string>
+      <string>How much weight can be carried of these items by the player</string>
      </property>
      <property name="statusTip" >
-      <string>The way the items count towards the storage limit</string>
+      <string>How much weight can be carried of these items by the player</string>
      </property>
      <property name="whatsThis" >
-      <string>The way the items count towards the storage limit</string>
+      <string>How much weight can be carried of these items by the player</string>
+     </property>
+     <property name="minimum" >
+      <number>-1</number>
      </property>
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KComboBox" name="varCount" />
-      </item>
-     </layout>
     </widget>
    </item>
-   <item>
+   <item row="5" column="0" colspan="2" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
@@ -155,6 +176,13 @@
    <header location="global" >KLineEdit</header>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>varName</tabstop>
+  <tabstop>varComputer</tabstop>
+  <tabstop>varPlayer</tabstop>
+  <tabstop>varMaxWeight</tabstop>
+  <tabstop>varCount</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>