Cleaned up Status widget

1 files changed, 51 insertions, 40 deletions

diff --git a/sigmodr/gui/status.ui b/sigmodr/gui/status.ui
index ca37bc01..03e45487 100644
--- a/sigmodr/gui/status.ui
+++ b/sigmodr/gui/status.ui
@@ -1,12 +1,22 @@
 <ui version="4.0" >
  <class>formStatus</class>
  <widget class="QWidget" name="formStatus" >
-  <layout class="QVBoxLayout" >
-   <item>
-    <widget class="QGroupBox" name="boxName" >
-     <property name="title" >
-      <string comment="Label for the name of the status" >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 status" >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 status (internal use only)</string>
      </property>
@@ -16,55 +26,51 @@
      <property name="whatsThis" >
       <string>Name of the status (internal use only)</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>
+   <item row="1" column="0" colspan="2" >
     <widget class="QGroupBox" name="boxBattleScript" >
      <property name="title" >
       <string>Battle Script</string>
      </property>
-     <property name="toolTip" >
-      <string>The script that controls how the status works in battle</string>
-     </property>
-     <property name="statusTip" >
-      <string>The script that controls how the status works in battle</string>
-     </property>
-     <property name="whatsThis" >
-      <string>The script that controls how the status works in battle</string>
-     </property>
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="Sigmodr::ScriptWidget" name="varBattleScript" />
+     <layout class="QGridLayout" >
+      <item row="0" column="0" >
+       <widget class="Sigmodr::ScriptWidget" name="varBattleScript" >
+        <property name="toolTip" >
+         <string>The script that controls how the status works in battle</string>
+        </property>
+        <property name="statusTip" >
+         <string>The script that controls how the status works in battle</string>
+        </property>
+        <property name="whatsThis" >
+         <string>The script that controls how the status works in battle</string>
+        </property>
+       </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="2" column="0" colspan="2" >
     <widget class="QGroupBox" name="boxWorldScript" >
      <property name="title" >
       <string>WorldScript</string>
      </property>
-     <property name="toolTip" >
-      <string>The script that controls how the status works in the overworld</string>
-     </property>
-     <property name="statusTip" >
-      <string>The script that controls how the status works in the overworld</string>
-     </property>
-     <property name="whatsThis" >
-      <string>The script that controls how the status works in the overworld</string>
-     </property>
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="Sigmodr::ScriptWidget" name="varWorldScript" />
+     <layout class="QGridLayout" >
+      <item row="0" column="0" >
+       <widget class="Sigmodr::ScriptWidget" name="varWorldScript" >
+        <property name="toolTip" >
+         <string>The script that controls how the status works in the overworld</string>
+        </property>
+        <property name="statusTip" >
+         <string>The script that controls how the status works in the overworld</string>
+        </property>
+        <property name="whatsThis" >
+         <string>The script that controls how the status works in the overworld</string>
+        </property>
+       </widget>
       </item>
      </layout>
     </widget>
@@ -83,6 +89,11 @@
    <header>ScriptWidget.h</header>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>varName</tabstop>
+  <tabstop>varBattleScript</tabstop>
+  <tabstop>varWorldScript</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>