Cleaned up Move widget

1 files changed, 199 insertions, 146 deletions

diff --git a/sigmodr/gui/move.ui b/sigmodr/gui/move.ui
index 5c65ad30..d35b4443 100644
--- a/sigmodr/gui/move.ui
+++ b/sigmodr/gui/move.ui
@@ -1,12 +1,22 @@
 <ui version="4.0" >
  <class>formMove</class>
  <widget class="QWidget" name="formMove" >
-  <layout class="QVBoxLayout" >
-   <item>
-    <widget class="QGroupBox" name="boxName" >
-     <property name="title" >
-      <string comment="Label for the name of the move" >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 move" >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 move</string>
      </property>
@@ -16,43 +26,81 @@
      <property name="whatsThis" >
       <string>Name of the move</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="boxPriority" >
-     <property name="title" >
-      <string>Priority</string>
+   <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>
+    </widget>
+   </item>
+   <item row="1" column="1" >
+    <widget class="KComboBox" name="varType" >
      <property name="toolTip" >
-      <string>The priority of the move (lower goes first)</string>
+      <string>The type of the move</string>
      </property>
      <property name="statusTip" >
-      <string>The priority of the move (lower goes first)</string>
+      <string>The type of the move</string>
      </property>
      <property name="whatsThis" >
-      <string>The priority of the move (lower goes first)</string>
+      <string>The type of the move</string>
      </property>
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KIntNumInput" name="varPriority" />
-      </item>
-     </layout>
     </widget>
    </item>
-   <item>
-    <widget class="QGroupBox" name="boxAccuracy" >
-     <property name="title" >
-      <string>Accuracy</string>
+   <item row="2" column="0" >
+    <widget class="QLabel" name="labelSpecial" >
+     <property name="text" >
+      <string comment="Label for whether the move uses special stats or not" >Special:</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
+     </property>
+     <property name="buddy" >
+      <cstring>varSpecial</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1" >
+    <widget class="QCheckBox" name="varSpecial" >
+     <property name="toolTip" >
+      <string>Whether the move uses special stats</string>
+     </property>
+     <property name="statusTip" >
+      <string>Whether the move uses special stats</string>
+     </property>
+     <property name="whatsThis" >
+      <string>Whether the move uses special stats</string>
+     </property>
+     <property name="text" >
+      <string>Use special stats</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" >
+    <widget class="QLabel" name="labelAccuracy" >
+     <property name="text" >
+      <string>Accuracy:</string>
      </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
+     </property>
+     <property name="buddy" >
+      <cstring>varAccuracy</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1" >
+    <widget class="Sigmodr::FractionWidget" name="varAccuracy" >
      <property name="toolTip" >
       <string>The chance that the move hits</string>
      </property>
@@ -62,22 +110,26 @@
      <property name="whatsThis" >
       <string>The chance that the move hits</string>
      </property>
-     <layout class="QVBoxLayout" >
-      <item>
-       <widget class="Sigmodr::FractionWidget" name="varAccuracy" >
-        <property name="behavior" >
-         <enum>Sigmodr::FractionWidget::NonZero</enum>
-        </property>
-       </widget>
-      </item>
-     </layout>
+     <property name="behavior" >
+      <enum>Sigmodr::FractionWidget::NonZero</enum>
+     </property>
     </widget>
    </item>
-   <item>
-    <widget class="QGroupBox" name="boxPower" >
-     <property name="title" >
-      <string>Power</string>
+   <item row="4" column="0" >
+    <widget class="QLabel" name="labelPower" >
+     <property name="text" >
+      <string>Power:</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
+     </property>
+     <property name="buddy" >
+      <cstring>varPower</cstring>
      </property>
+    </widget>
+   </item>
+   <item row="4" column="1" >
+    <widget class="KIntNumInput" name="varPower" >
      <property name="toolTip" >
       <string>The power of the move</string>
      </property>
@@ -87,43 +139,26 @@
      <property name="whatsThis" >
       <string>The power of the move</string>
      </property>
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KIntNumInput" name="varPower" >
-        <property name="minimum" >
-         <number>0</number>
-        </property>
-       </widget>
-      </item>
-     </layout>
+     <property name="minimum" >
+      <number>0</number>
+     </property>
     </widget>
    </item>
-   <item>
-    <widget class="QGroupBox" name="boxType" >
-     <property name="title" >
-      <string>Type</string>
+   <item row="5" column="0" >
+    <widget class="QLabel" name="labelPowerPoints" >
+     <property name="text" >
+      <string>Power points:</string>
      </property>
-     <property name="toolTip" >
-      <string>The type of the move</string>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
      </property>
-     <property name="statusTip" >
-      <string>The type of the move</string>
+     <property name="buddy" >
+      <cstring>varPowerPoints</cstring>
      </property>
-     <property name="whatsThis" >
-      <string>The type of the move</string>
-     </property>
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KComboBox" name="varType" />
-      </item>
-     </layout>
     </widget>
    </item>
-   <item>
-    <widget class="QGroupBox" name="boxPowerPoints" >
-     <property name="title" >
-      <string>Power Points</string>
-     </property>
+   <item row="5" column="1" >
+    <widget class="KIntNumInput" name="varPowerPoints" >
      <property name="toolTip" >
       <string>How many power points the move has</string>
      </property>
@@ -133,44 +168,52 @@
      <property name="whatsThis" >
       <string>How many power points the move has</string>
      </property>
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KIntNumInput" name="varPowerPoints" >
-        <property name="minimum" >
-         <number>1</number>
-        </property>
-       </widget>
-      </item>
-     </layout>
+     <property name="minimum" >
+      <number>1</number>
+     </property>
     </widget>
    </item>
-   <item>
-    <widget class="QGroupBox" name="varSpecial" >
-     <property name="title" >
-      <string comment="Label for whether the move uses special stats or not" >Special</string>
+   <item row="6" column="0" >
+    <widget class="QLabel" name="labelPriority" >
+     <property name="text" >
+      <string>Priority:</string>
      </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
+     </property>
+     <property name="buddy" >
+      <cstring>varPriority</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="1" >
+    <widget class="KIntNumInput" name="varPriority" >
      <property name="toolTip" >
-      <string>Whether the move uses special stats</string>
+      <string>The priority of the move (lower goes first)</string>
      </property>
      <property name="statusTip" >
-      <string>Whether the move uses special stats</string>
+      <string>The priority of the move (lower goes first)</string>
      </property>
      <property name="whatsThis" >
-      <string>Whether the move uses special stats</string>
+      <string>The priority of the move (lower goes first)</string>
      </property>
-     <property name="checkable" >
-      <bool>true</bool>
+    </widget>
+   </item>
+   <item row="7" column="0" >
+    <widget class="QLabel" name="labelDescription" >
+     <property name="text" >
+      <string>Description:</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
      </property>
-     <property name="checked" >
-      <bool>false</bool>
+     <property name="buddy" >
+      <cstring>varDescription</cstring>
      </property>
     </widget>
    </item>
-   <item>
-    <widget class="QGroupBox" name="boxDescription" >
-     <property name="title" >
-      <string>Description</string>
-     </property>
+   <item row="7" column="1" >
+    <widget class="KLineEdit" name="varDescription" >
      <property name="toolTip" >
       <string>Description of the move</string>
      </property>
@@ -180,76 +223,73 @@
      <property name="whatsThis" >
       <string>Description of the move</string>
      </property>
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KLineEdit" name="varDescription" >
-        <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="8" column="0" colspan="2" >
     <widget class="QGroupBox" name="boxBattleScript" >
      <property name="title" >
       <string>Battle Script</string>
      </property>
-     <property name="toolTip" >
-      <string>Script that controls the move when used in battle</string>
-     </property>
-     <property name="statusTip" >
-      <string>Script that controls the move when used in battle</string>
-     </property>
-     <property name="whatsThis" >
-      <string>Script that controls the move when used 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>Script that controls the move when used in battle</string>
+        </property>
+        <property name="statusTip" >
+         <string>Script that controls the move when used in battle</string>
+        </property>
+        <property name="whatsThis" >
+         <string>Script that controls the move when used in battle</string>
+        </property>
+       </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="9" column="0" colspan="2" >
     <widget class="QGroupBox" name="boxWorldScript" >
      <property name="title" >
       <string>World Script</string>
      </property>
-     <property name="toolTip" >
-      <string>The script that controls the move when used in the overworld</string>
-     </property>
-     <property name="toolTip" >
-      <string>The script that controls the move when used in the overworld</string>
-     </property>
-     <property name="toolTip" >
-      <string>The script that controls the move when used 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 the move when used in the overworld</string>
+        </property>
+        <property name="toolTip" >
+         <string>The script that controls the move when used in the overworld</string>
+        </property>
+        <property name="toolTip" >
+         <string>The script that controls the move when used in the overworld</string>
+        </property>
+       </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="10" column="0" colspan="2" >
     <widget class="QGroupBox" name="boxPriorityScript" >
      <property name="title" >
       <string>Priority Script</string>
      </property>
-     <property name="toolTip" >
-      <string>The script used to determine if the move should modify its priority depending on the environment</string>
-     </property>
-     <property name="statusTip" >
-      <string>The script used to determine if the move should modify its priority depending on the environment</string>
-     </property>
-     <property name="whatsThis" >
-      <string>The script used to determine if the move should modify its priority depending on the environment</string>
-     </property>
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="Sigmodr::ScriptWidget" name="varPriorityScript" />
+     <layout class="QGridLayout" >
+      <item row="0" column="0" >
+       <widget class="Sigmodr::ScriptWidget" name="varPriorityScript" >
+        <property name="toolTip" >
+         <string>The script used to determine if the move should modify its priority depending on the environment</string>
+        </property>
+        <property name="statusTip" >
+         <string>The script used to determine if the move should modify its priority depending on the environment</string>
+        </property>
+        <property name="whatsThis" >
+         <string>The script used to determine if the move should modify its priority depending on the environment</string>
+        </property>
+       </widget>
       </item>
      </layout>
     </widget>
@@ -283,6 +323,19 @@
    <header>ScriptWidget.h</header>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>varName</tabstop>
+  <tabstop>varType</tabstop>
+  <tabstop>varSpecial</tabstop>
+  <tabstop>varAccuracy</tabstop>
+  <tabstop>varPower</tabstop>
+  <tabstop>varPowerPoints</tabstop>
+  <tabstop>varPriority</tabstop>
+  <tabstop>varDescription</tabstop>
+  <tabstop>varBattleScript</tabstop>
+  <tabstop>varWorldScript</tabstop>
+  <tabstop>varPriorityScript</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>