Finsihed up Rules widget cleanup

1 files changed, 307 insertions, 228 deletions

diff --git a/sigmodr/gui/rules.ui b/sigmodr/gui/rules.ui
index 0bdb7de0..fe98208c 100644
--- a/sigmodr/gui/rules.ui
+++ b/sigmodr/gui/rules.ui
@@ -396,237 +396,311 @@
      </item>
     </layout>
    </item>
-   <item>
-    <widget class="QGroupBox" name="boxArena" >
-     <property name="title" >
-      <string>Arena</string>
+   <item row="11" column="0" >
+    <widget class="QLabel" name="labelMaxParty" >
+     <property name="text" >
+      <string>Max party size:</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
      </property>
+     <property name="buddy" >
+      <cstring>varMaxParty</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="11" column="1" >
+    <widget class="KIntNumInput" name="varMaxParty" >
      <property name="toolTip" >
-      <string>Limits in the battle arena</string>
+      <string>The size of the largest party possible</string>
      </property>
      <property name="statusTip" >
-      <string>Limits in the battle arena</string>
+      <string>The size of the largest party possible</string>
      </property>
      <property name="whatsThis" >
-      <string>Limits in the battle arena</string>
-     </property>
-     <layout class="QVBoxLayout" >
-      <item>
-       <widget class="KIntNumInput" name="varMaxParty" >
-        <property name="label" >
-         <string>Team</string>
-        </property>
-        <property name="toolTip" >
-         <string>The size of the largest party possible</string>
-        </property>
-        <property name="statusTip" >
-         <string>The size of the largest party possible</string>
-        </property>
-        <property name="whatsThis" >
-         <string>The size of the largest party possible</string>
-        </property>
-        <property name="minimum" >
-         <number>1</number>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KIntNumInput" name="varMaxFight" >
-        <property name="label" >
-         <string>Fighters</string>
-        </property>
-        <property name="toolTip" >
-         <string>Maximum amount of team members active at one time per side</string>
-        </property>
-        <property name="statusTip" >
-         <string>Maximum amount of team members active at one time per side</string>
-        </property>
-        <property name="whatsThis" >
-         <string>Maximum amount of team members active at one time per side</string>
-        </property>
-        <property name="minimum" >
-         <number>1</number>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KIntNumInput" name="varMaxPlayers" >
-        <property name="label" >
-         <string>Teams</string>
-        </property>
-        <property name="toolTip" >
-         <string>Maximum amount of trainers allowed in a battle</string>
-        </property>
-        <property name="statusTip" >
-         <string>Maximum amount of trainers allowed in a battle</string>
-        </property>
-        <property name="whatsThis" >
-         <string>Maximum amount of trainers allowed in a battle</string>
-        </property>
-        <property name="minimum" >
-         <number>2</number>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KIntNumInput" name="varMaxTotalWeight" >
-        <property name="label" >
-         <string>Max Total Weight</string>
-        </property>
-        <property name="toolTip" >
-         <string>Maximum amount of weight that can be carried by the player</string>
-        </property>
-        <property name="statusTip" >
-         <string>Maximum amount of weight that can be carried by the player</string>
-        </property>
-        <property name="whatsThis" >
-         <string>Maximum amount of weight that can be carried by the player</string>
-        </property>
-        <property name="minimum" >
-         <number>-1</number>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="boxGeneral" >
-     <property name="title" >
-      <string comment="Label for general rules of the sigmod" >General</string>
+      <string>The size of the largest party possible</string>
+     </property>
+     <property name="minimum" >
+      <number>1</number>
      </property>
+    </widget>
+   </item>
+   <item row="12" column="0" >
+    <widget class="QLabel" name="labelMaxFight" >
+     <property name="text" >
+      <string>Max fight:</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
+     </property>
+     <property name="buddy" >
+      <cstring>varMaxFight</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="12" column="1" >
+    <widget class="KIntNumInput" name="varMaxFight" >
      <property name="toolTip" >
-      <string>Limits for various aspects of the game</string>
+      <string>Maximum amount of team members active at one time per side</string>
      </property>
      <property name="statusTip" >
-      <string>Limits for various aspects of the game</string>
+      <string>Maximum amount of team members active at one time per side</string>
      </property>
      <property name="whatsThis" >
-      <string>Limits for various aspects of the game</string>
-     </property>
-     <layout class="QVBoxLayout" >
-      <item>
-       <widget class="KIntNumInput" name="varMaxMoves" >
-        <property name="label" >
-         <string>Moves</string>
-        </property>
-        <property name="toolTip" >
-         <string>Maximum amount of knowable moves</string>
-        </property>
-        <property name="statusTip" >
-         <string>Maximum amount of knowable moves</string>
-        </property>
-        <property name="whatsThis" >
-         <string>Maximum amount of knowable moves</string>
-        </property>
-        <property name="minimum" >
-         <number>1</number>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KIntNumInput" name="varMaxLevel" >
-        <property name="label" >
-         <string comment="Label for the maximum allowed level" >Level</string>
-        </property>
-        <property name="toolTip" >
-         <string>Maximum level allowed</string>
-        </property>
-        <property name="statusTip" >
-         <string>Maximum level allowed</string>
-        </property>
-        <property name="whatsThis" >
-         <string>Maximum level allowed</string>
-        </property>
-        <property name="minimum" >
-         <number>1</number>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KIntNumInput" name="varMaxHeldItems" >
-        <property name="label" >
-         <string>Held Items</string>
-        </property>
-        <property name="toolTip" >
-         <string>How many items can be held at once</string>
-        </property>
-        <property name="statusTip" >
-         <string>How many items can be held at once</string>
-        </property>
-        <property name="whatsThis" >
-         <string>How many items can be held at once</string>
-        </property>
-        <property name="minimum" >
-         <number>0</number>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KIntNumInput" name="varMaxNatures" >
-        <property name="label" >
-         <string>Natures</string>
-        </property>
-        <property name="toolTip" >
-         <string>The maximum amount of natures allowed at once</string>
-        </property>
-        <property name="statusTip" >
-         <string>The maximum amount of natures allowed at once</string>
-        </property>
-        <property name="whatsThis" >
-         <string>The maximum amount of natures allowed at once</string>
-        </property>
-        <property name="minimum" >
-         <number>0</number>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KIntNumInput" name="varMaxAbilities" >
-        <property name="label" >
-         <string>Abilities</string>
-        </property>
-        <property name="toolTip" >
-         <string>The maximum amount of abilities allowed at once</string>
-        </property>
-        <property name="statusTip" >
-         <string>The maximum amount of abilities allowed at once</string>
-        </property>
-        <property name="whatsThis" >
-         <string>The maximum amount of abilities allowed at once</string>
-        </property>
-        <property name="minimum" >
-         <number>0</number>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KIntNumInput" name="varMaxStages" >
-        <property name="label" >
-         <string>Modifier Stages</string>
-        </property>
-        <property name="toolTip" >
-         <string>The maximum stage that stats can be modified to</string>
-        </property>
-        <property name="statusTip" >
-         <string>The maximum stage that stats can be modified to</string>
-        </property>
-        <property name="whatsThis" >
-         <string>The maximum stage that stats can be modified to</string>
-        </property>
-        <property name="minimum" >
-         <number>0</number>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="boxMaxMoney" >
-     <property name="title" >
-      <string>Money</string>
+      <string>Maximum amount of team members active at one time per side</string>
+     </property>
+     <property name="minimum" >
+      <number>1</number>
      </property>
+    </widget>
+   </item>
+   <item row="13" column="0" >
+    <widget class="QLabel" name="labelMaxPlayers" >
+     <property name="text" >
+      <string>Max players:</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
+     </property>
+     <property name="buddy" >
+      <cstring>varMaxPlayers</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="13" column="1" >
+    <widget class="KIntNumInput" name="varMaxPlayers" >
+     <property name="toolTip" >
+      <string>Maximum amount of trainers allowed in a battle</string>
+     </property>
+     <property name="statusTip" >
+      <string>Maximum amount of trainers allowed in a battle</string>
+     </property>
+     <property name="whatsThis" >
+      <string>Maximum amount of trainers allowed in a battle</string>
+     </property>
+     <property name="minimum" >
+      <number>2</number>
+     </property>
+    </widget>
+   </item>
+   <item row="14" column="0" >
+    <widget class="QLabel" name="labelMaxTotalWeight" >
+     <property name="text" >
+      <string>Max total weight:</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
+     </property>
+     <property name="buddy" >
+      <cstring>varMaxTotalWeight</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="14" column="1" >
+    <widget class="KIntNumInput" name="varMaxTotalWeight" >
+     <property name="toolTip" >
+      <string>Maximum amount of weight that can be carried by the player</string>
+     </property>
+     <property name="statusTip" >
+      <string>Maximum amount of weight that can be carried by the player</string>
+     </property>
+     <property name="whatsThis" >
+      <string>Maximum amount of weight that can be carried by the player</string>
+     </property>
+     <property name="minimum" >
+      <number>-1</number>
+     </property>
+    </widget>
+   </item>
+   <item row="15" column="0" >
+    <widget class="QLabel" name="labelMaxMoves" >
+     <property name="text" >
+      <string>Max moves:</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
+     </property>
+     <property name="buddy" >
+      <cstring>varMaxMoves</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="15" column="1" >
+    <widget class="KIntNumInput" name="varMaxMoves" >
+     <property name="toolTip" >
+      <string>Maximum amount of knowable moves</string>
+     </property>
+     <property name="statusTip" >
+      <string>Maximum amount of knowable moves</string>
+     </property>
+     <property name="whatsThis" >
+      <string>Maximum amount of knowable moves</string>
+     </property>
+     <property name="minimum" >
+      <number>1</number>
+     </property>
+    </widget>
+   </item>
+   <item row="16" column="0" >
+    <widget class="QLabel" name="labelMaxLevel" >
+     <property name="text" >
+      <string>Max level:</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
+     </property>
+     <property name="buddy" >
+      <cstring>varMaxLevel</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="16" column="1" >
+    <widget class="KIntNumInput" name="varMaxLevel" >
+     <property name="toolTip" >
+      <string>Maximum level allowed</string>
+     </property>
+     <property name="statusTip" >
+      <string>Maximum level allowed</string>
+     </property>
+     <property name="whatsThis" >
+      <string>Maximum level allowed</string>
+     </property>
+     <property name="minimum" >
+      <number>1</number>
+     </property>
+    </widget>
+   </item>
+   <item row="17" column="0" >
+    <widget class="QLabel" name="labelMaxHeldItems" >
+     <property name="text" >
+      <string>Max held items:</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
+     </property>
+     <property name="buddy" >
+      <cstring>varMaxHeldItems</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="17" column="1" >
+    <widget class="KIntNumInput" name="varMaxHeldItems" >
+     <property name="toolTip" >
+      <string>How many items can be held at once</string>
+     </property>
+     <property name="statusTip" >
+      <string>How many items can be held at once</string>
+     </property>
+     <property name="whatsThis" >
+      <string>How many items can be held at once</string>
+     </property>
+     <property name="minimum" >
+      <number>0</number>
+     </property>
+    </widget>
+   </item>
+   <item row="18" column="0" >
+    <widget class="QLabel" name="labelMaxNatures" >
+     <property name="text" >
+      <string>Max natures:</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
+     </property>
+     <property name="buddy" >
+      <cstring>varMaxNatures</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="18" column="1" >
+    <widget class="KIntNumInput" name="varMaxNatures" >
+     <property name="toolTip" >
+      <string>The maximum amount of natures allowed at once</string>
+     </property>
+     <property name="statusTip" >
+      <string>The maximum amount of natures allowed at once</string>
+     </property>
+     <property name="whatsThis" >
+      <string>The maximum amount of natures allowed at once</string>
+     </property>
+     <property name="minimum" >
+      <number>0</number>
+     </property>
+    </widget>
+   </item>
+   <item row="19" column="0" >
+    <widget class="QLabel" name="labelMaxAbilities" >
+     <property name="text" >
+      <string>Max abilities:</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
+     </property>
+     <property name="buddy" >
+      <cstring>varMaxAbilities</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="19" column="1" >
+    <widget class="KIntNumInput" name="varMaxAbilities" >
+     <property name="toolTip" >
+      <string>The maximum amount of abilities allowed at once</string>
+     </property>
+     <property name="statusTip" >
+      <string>The maximum amount of abilities allowed at once</string>
+     </property>
+     <property name="whatsThis" >
+      <string>The maximum amount of abilities allowed at once</string>
+     </property>
+     <property name="minimum" >
+      <number>0</number>
+     </property>
+    </widget>
+   </item>
+   <item row="20" column="0" >
+    <widget class="QLabel" name="labelMaxStages" >
+     <property name="text" >
+      <string>Max stat stages:</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
+     </property>
+     <property name="buddy" >
+      <cstring>varMaxStages</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="20" column="1" >
+    <widget class="KIntNumInput" name="varMaxStages" >
+     <property name="toolTip" >
+      <string>The maximum stage that stats can be modified to</string>
+     </property>
+     <property name="statusTip" >
+      <string>The maximum stage that stats can be modified to</string>
+     </property>
+     <property name="whatsThis" >
+      <string>The maximum stage that stats can be modified to</string>
+     </property>
+     <property name="minimum" >
+      <number>0</number>
+     </property>
+    </widget>
+   </item>
+   <item row="21" column="0" >
+    <widget class="QLabel" name="labelMaxMoney" >
+     <property name="text" >
+      <string>Max money:</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
+     </property>
+     <property name="buddy" >
+      <cstring>varMaxMoney</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="21" column="1" >
+    <widget class="KIntNumInput" name="varMaxMoney" >
      <property name="toolTip" >
       <string>Maximum amount of money allowed</string>
      </property>
@@ -636,18 +710,12 @@
      <property name="whatsThis" >
       <string>Maximum amount of money allowed</string>
      </property>
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KIntNumInput" name="varMaxMoney" >
-        <property name="minimum" >
-         <number>0</number>
-        </property>
-       </widget>
-      </item>
-     </layout>
+     <property name="minimum" >
+      <number>0</number>
+     </property>
     </widget>
    </item>
-   <item>
+   <item row="22" column="0" colspan="2" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
@@ -687,6 +755,17 @@
   <tabstop>varMaxEVPerStat</tabstop>
   <tabstop>varBoxes</tabstop>
   <tabstop>varBoxSize</tabstop>
+  <tabstop>varMaxParty</tabstop>
+  <tabstop>varMaxFight</tabstop>
+  <tabstop>varMaxPlayer</tabstop>
+  <tabstop>varMaxTotalWeight</tabstop>
+  <tabstop>varMaxMoves</tabstop>
+  <tabstop>varMaxLevel</tabstop>
+  <tabstop>varMaxHeldItems</tabstop>
+  <tabstop>varMaxNatures</tabstop>
+  <tabstop>varMaxAbilities</tabstop>
+  <tabstop>varMaxStages</tabstop>
+  <tabstop>varMaxMoney</tabstop>
  </tabstops>
  <resources/>
  <connections/>