Cleaned up MapWarp widget

1 files changed, 102 insertions, 70 deletions

diff --git a/sigmodr/gui/mapwarp.ui b/sigmodr/gui/mapwarp.ui
index 22eb9c5b..7116748e 100644
--- a/sigmodr/gui/mapwarp.ui
+++ b/sigmodr/gui/mapwarp.ui
@@ -1,9 +1,22 @@
 <ui version="4.0" >
  <class>formMapWarp</class>
  <widget class="QWidget" name="formMapWarp" >
-  <layout class="QVBoxLayout" >
-   <item>
-    <widget class="QGroupBox" name="boxName" >
+  <layout class="QGridLayout" >
+   <item row="0" column="0" >
+    <widget class="QLabel" name="labelName" >
+     <property name="text" >
+      <string comment="Label for the name of the warp" >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 warp (internal use only)</string>
      </property>
@@ -13,22 +26,26 @@
      <property name="whatsThis" >
       <string>Name of the warp (internal use only)</string>
      </property>
-     <property name="title" >
-      <string comment="Label for the name of the warp" >Name</string>
+     <property name="showClearButton" stdset="0" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="labelType" >
+     <property name="text" >
+      <string>Type:</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
+     </property>
+     <property name="buddy" >
+      <cstring>varType</cstring>
      </property>
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KLineEdit" name="varName" >
-        <property name="showClearButton" stdset="0" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
     </widget>
    </item>
-   <item>
-    <widget class="QGroupBox" name="boxType" >
+   <item row="1" column="1" >
+    <widget class="KComboBox" name="varType" >
      <property name="toolTip" >
       <string>The type of warp</string>
      </property>
@@ -38,32 +55,35 @@
      <property name="whatsThis" >
       <string>The type of warp</string>
      </property>
-     <property name="title" >
-      <string>Type</string>
-     </property>
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KComboBox" name="varType" />
-      </item>
-     </layout>
     </widget>
    </item>
-   <item>
-    <widget class="QGroupBox" name="boxDestination" >
-     <property name="toolTip" >
-      <string>The destination for the warp</string>
-     </property>
-     <property name="statusTip" >
-      <string>The destination for the warp</string>
-     </property>
-     <property name="whatsThis" >
-      <string>The destination for the warp</string>
+   <item row="2" column="0" >
+    <widget class="QLabel" name="labelDestination" >
+     <property name="text" >
+      <string>Destination:</string>
      </property>
-     <property name="title" >
-      <string>Destination Map</string>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
      </property>
-     <layout class="QVBoxLayout" >
-      <item>
+    </widget>
+   </item>
+   <item row="2" column="1" >
+    <widget class="QWidget" >
+     <layout class="QGridLayout" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="labelDestinationMap" >
+        <property name="text" >
+         <string>Map:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignVCenter</set>
+        </property>
+        <property name="buddy" >
+         <cstring>varToMap</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
        <widget class="KComboBox" name="varToMap" >
         <property name="toolTip" >
          <string>Map the warp goes to</string>
@@ -76,48 +96,53 @@
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QGroupBox" name="boxWarp" >
-        <property name="title" >
-         <string>Warp</string>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="labelDestinationWarp" >
+        <property name="text" >
+         <string>Warp:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignVCenter</set>
+        </property>
+        <property name="buddy" >
+         <cstring>varToWarp</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="KComboBox" name="varToWarp" >
+        <property name="toolTip" >
+         <string>Warp on the map the warp goes to</string>
+        </property>
+        <property name="statusTip" >
+         <string>Warp on the map the warp goes to</string>
+        </property>
+        <property name="whatsThis" >
+         <string>Warp on the map the warp goes to</string>
         </property>
-        <layout class="QHBoxLayout" >
-         <item>
-          <widget class="KComboBox" name="varToWarp" >
-           <property name="toolTip" >
-            <string>Warp on the map the warp goes to</string>
-           </property>
-           <property name="statusTip" >
-            <string>Warp on the map the warp goes to</string>
-           </property>
-           <property name="whatsThis" >
-            <string>Warp on the map the warp goes to</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="3" column="0" colspan="2" >
     <widget class="QGroupBox" name="boxScript" >
-     <property name="toolTip" >
-      <string>The script that is executed when the warp is activated</string>
-     </property>
-     <property name="statusTip" >
-      <string>The script that is executed when the warp is activated</string>
-     </property>
-     <property name="whatsThis" >
-      <string>The script that is executed when the warp is activated</string>
-     </property>
      <property name="title" >
       <string>Script</string>
      </property>
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="Sigmodr::ScriptWidget" native="1" name="varScript" />
+     <layout class="QGridLayout" >
+      <item row="0" column="0" >
+       <widget class="Sigmodr::ScriptWidget" name="varScript" >
+        <property name="toolTip" >
+         <string>The script that is executed when the warp is activated</string>
+        </property>
+        <property name="statusTip" >
+         <string>The script that is executed when the warp is activated</string>
+        </property>
+        <property name="whatsThis" >
+         <string>The script that is executed when the warp is activated</string>
+        </property>
+       </widget>
       </item>
      </layout>
     </widget>
@@ -141,6 +166,13 @@
    <header>ScriptWidget.h</header>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>varName</tabstop>
+  <tabstop>varType</tabstop>
+  <tabstop>varToMap</tabstop>
+  <tabstop>varToWarp</tabstop>
+  <tabstop>varScript</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>