Fixed more of Rules widget

3 files changed, 236 insertions, 129 deletions

diff --git a/sigmodr/RulesUI.cpp b/sigmodr/RulesUI.cpp
index 601baa94..50c5c469 100644
--- a/sigmodr/RulesUI.cpp
+++ b/sigmodr/RulesUI.cpp
@@ -37,12 +37,12 @@ void Sigmodr::RulesUI::setGui()
     varGenders->setCheckState(qobject_cast<Sigmod::Rules*>(modified())->genderAllowed() ? Qt::Checked : Qt::Unchecked);
     varBreeding->setCheckState(qobject_cast<Sigmod::Rules*>(modified())->breedingAllowed() ? Qt::Checked : Qt::Unchecked);
     varBreeding->setEnabled(qobject_cast<Sigmod::Rules*>(modified())->genderAllowed());
-    varCriticalDomains->setChecked(qobject_cast<Sigmod::Rules*>(modified())->criticalDomains() ? Qt::Checked : Qt::Unchecked);
-    varSwitchStyle->setChecked(qobject_cast<Sigmod::Rules*>(modified())->allowSwitchStyle() ? Qt::Checked : Qt::Unchecked);
-    varUseATB->setChecked(qobject_cast<Sigmod::Rules*>(modified())->useATB() ? Qt::Checked : Qt::Unchecked);
-    boxSplitSpecial->setChecked(qobject_cast<Sigmod::Rules*>(modified())->specialSplit() ? Qt::Checked : Qt::Unchecked);
+    varCriticalDomains->setCheckState(qobject_cast<Sigmod::Rules*>(modified())->criticalDomains() ? Qt::Checked : Qt::Unchecked);
+    varSwitchStyle->setCheckState(qobject_cast<Sigmod::Rules*>(modified())->allowSwitchStyle() ? Qt::Checked : Qt::Unchecked);
+    varUseATB->setCheckState(qobject_cast<Sigmod::Rules*>(modified())->useATB() ? Qt::Checked : Qt::Unchecked);
+    varSplitSpecial->setCheckState(qobject_cast<Sigmod::Rules*>(modified())->specialSplit() ? Qt::Checked : Qt::Unchecked);
     varSplitSpecialDV->setCheckState(qobject_cast<Sigmod::Rules*>(modified())->specialDVSplit() ? Qt::Checked : Qt::Unchecked);
-    boxEffortValues->setChecked(qobject_cast<Sigmod::Rules*>(modified())->effortValuesAllowed() ? Qt::Checked : Qt::Unchecked);
+    varEffortValues->setCheckState(qobject_cast<Sigmod::Rules*>(modified())->effortValuesAllowed() ? Qt::Checked : Qt::Unchecked);
     varMaxEV->setValue(qobject_cast<Sigmod::Rules*>(modified())->maxTotalEV());
     varMaxEVPerStat->setEnabled(0 < qobject_cast<Sigmod::Rules*>(modified())->maxTotalEV());
     varMaxEVPerStat->setMaximum(qobject_cast<Sigmod::Rules*>(modified())->maxTotalEV());
@@ -102,7 +102,7 @@ void Sigmodr::RulesUI::on_varUseATB_toggled(const bool useATB)
     qobject_cast<Sigmod::Rules*>(modified())->setUseATB(useATB);
 }
 
-void Sigmodr::RulesUI::on_boxSplitSpecial_toggled(const bool splitSpecial)
+void Sigmodr::RulesUI::on_varSplitSpecial_toggled(const bool splitSpecial)
 {
     qobject_cast<Sigmod::Rules*>(modified())->setSpecialSplit(splitSpecial);
     if (!splitSpecial)
@@ -114,7 +114,7 @@ void Sigmodr::RulesUI::on_varSplitSpecialDV_toggled(const bool splitSpecialDV)
     qobject_cast<Sigmod::Rules*>(modified())->setSpecialDVSplit(splitSpecialDV);
 }
 
-void Sigmodr::RulesUI::on_boxEffortValues_toggled(const bool effortValues)
+void Sigmodr::RulesUI::on_varEffortValues_toggled(const bool effortValues)
 {
     qobject_cast<Sigmod::Rules*>(modified())->setEffortValuesAllowed(effortValues);
 }
diff --git a/sigmodr/RulesUI.h b/sigmodr/RulesUI.h
index 94206f9a..cec4c4eb 100644
--- a/sigmodr/RulesUI.h
+++ b/sigmodr/RulesUI.h
@@ -48,9 +48,9 @@ class RulesUI : public ObjectUI, private Ui::formRules
         void on_varCriticalDomains_toggled(const bool criticalDomains);
         void on_varSwitchStyle_toggled(const bool switchStyle);
         void on_varUseATB_toggled(const bool useATB);
-        void on_boxSplitSpecial_toggled(const bool specialSplit);
+        void on_varSplitSpecial_toggled(const bool specialSplit);
         void on_varSplitSpecialDV_toggled(const bool specialSplitDV);
-        void on_boxEffortValues_toggled(const bool effortValues);
+        void on_varEffortValues_toggled(const bool effortValues);
         void on_varMaxEV_valueChanged(const int maxEV);
         void on_varMaxEVPerStat_valueChanged(const int maxEVPerStat);
         void on_varBoxes_valueChanged(const int boxes);
diff --git a/sigmodr/gui/rules.ui b/sigmodr/gui/rules.ui
index 830b118d..0bdb7de0 100644
--- a/sigmodr/gui/rules.ui
+++ b/sigmodr/gui/rules.ui
@@ -48,6 +48,12 @@
      </item>
      <item row="0" column="1" >
       <widget class="QCheckBox" name="varBreeding" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="toolTip" >
         <string>If checked, breeding will be allowed</string>
        </property>
@@ -151,14 +157,21 @@
      </property>
     </widget>
    </item>
-   <item>
-    <widget class="QGroupBox" name="boxSplitSpecial" >
-     <property name="title" >
-      <string>Split Special</string>
+   <item row="5" column="0" >
+    <widget class="QLabel" name="labelSplitSpecial" >
+     <property name="text" >
+      <string>Split special:</string>
      </property>
-     <property name="checkable" >
-      <bool>true</bool>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
      </property>
+     <property name="buddy" >
+      <cstring>varSplitSpecial</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1" >
+    <widget class="QCheckBox" name="varSplitSpecial" >
      <property name="toolTip" >
       <string>If checked, the special stat will be split into separate attack and defense stats</string>
      </property>
@@ -168,141 +181,221 @@
      <property name="whatsThis" >
       <string>If checked, the special stat will be split into separate attack and defense stats</string>
      </property>
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="QCheckBox" name="varSplitSpecialDV" >
-        <property name="toolTip" >
-         <string>If checked, the each special stat will have their own DV</string>
-        </property>
-        <property name="statusTip" >
-         <string>If checked, the each special stat will have their own DV</string>
-        </property>
-        <property name="whatsThis" >
-         <string>If checked, the each special stat will have their own DV</string>
-        </property>
-        <property name="text" >
-         <string>Split Special DV</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
+     <property name="text" >
+      <string>Enabled</string>
+     </property>
     </widget>
    </item>
-   <item>
-    <widget class="QGroupBox" name="boxEffortValues" >
-     <property name="title" >
-      <string>Effort Values</string>
+   <item row="6" column="1" >
+    <layout class="QGridLayout" >
+     <item row="0" column="0" >
+      <widget class="QLabel" name="labelSplitSpecialDV" >
+       <property name="text" >
+        <string>Split special DV:</string>
+       </property>
+       <property name="alignment" >
+        <set>Qt::AlignRight|Qt::AlignVCenter</set>
+       </property>
+       <property name="buddy" >
+        <cstring>varSplitSpecialDV</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1" >
+      <widget class="QCheckBox" name="varSplitSpecialDV" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="toolTip" >
+        <string>If checked, the each special stat will have their own DV</string>
+       </property>
+       <property name="statusTip" >
+        <string>If checked, the each special stat will have their own DV</string>
+       </property>
+       <property name="whatsThis" >
+        <string>If checked, the each special stat will have their own DV</string>
+       </property>
+       <property name="text" >
+        <string>Enabled</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="7" column="0" >
+    <widget class="QLabel" name="labelEffortValues" >
+     <property name="text" >
+      <string>Effort values:</string>
      </property>
-     <property name="checkable" >
-      <bool>true</bool>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
+     </property>
+     <property name="buddy" >
+      <cstring>varEffortValues</cstring>
      </property>
+    </widget>
+   </item>
+   <item row="7" column="1" >
+    <widget class="QCheckBox" name="varEffortValues" >
      <property name="toolTip" >
-      <string>If checked, stats will have effort values</string>
+      <string>If checked, stats will use effort values rather than stat experience</string>
      </property>
      <property name="statusTip" >
-      <string>If checked, stats will have effort values</string>
+      <string>If checked, stats will use effort values rather than stat experience</string>
      </property>
      <property name="whatsThis" >
-      <string>If checked, stats will have effort values</string>
+      <string>If checked, stats will use effort values rather than stat experience</string>
+     </property>
+     <property name="text" >
+      <string>Enabled</string>
      </property>
-     <layout class="QVBoxLayout" >
-      <item>
-       <widget class="KIntNumInput" name="varMaxEV" >
-        <property name="label" >
-         <string>Max EV</string>
-        </property>
-        <property name="toolTip" >
-         <string>The maximum amount of effort values allowed</string>
-        </property>
-        <property name="statusTip" >
-         <string>The maximum amount of effort values allowed</string>
-        </property>
-        <property name="whatsThis" >
-         <string>The maximum amount of effort values allowed</string>
-        </property>
-        <property name="minimum" >
-         <number>0</number>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KIntNumInput" name="varMaxEVPerStat" >
-        <property name="label" >
-         <string>Max EV Per Stat</string>
-        </property>
-        <property name="toolTip" >
-         <string>The maximum amount of effort values allowed for a single stat</string>
-        </property>
-        <property name="statusTip" >
-         <string>The maximum amount of effort values allowed for a single stat</string>
-        </property>
-        <property name="whatsThis" >
-         <string>The maximum amount of effort values allowed for a single stat</string>
-        </property>
-        <property name="minimum" >
-         <number>0</number>
-        </property>
-       </widget>
-      </item>
-     </layout>
     </widget>
    </item>
-   <item>
-    <widget class="QGroupBox" name="boxBoxes" >
-     <property name="title" >
-      <string>Storage</string>
+   <item row="8" column="1" >
+    <layout class="QGridLayout" >
+     <item row="0" column="0" >
+      <widget class="QLabel" name="labelMaxEV" >
+       <property name="text" >
+        <string>Max total:</string>
+       </property>
+       <property name="alignment" >
+        <set>Qt::AlignRight|Qt::AlignVCenter</set>
+       </property>
+       <property name="buddy" >
+        <cstring>varMaxEV</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1" >
+      <widget class="KIntNumInput" name="varMaxEV" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="toolTip" >
+        <string>The maximum amount of effort values allowed</string>
+       </property>
+       <property name="statusTip" >
+        <string>The maximum amount of effort values allowed</string>
+       </property>
+       <property name="whatsThis" >
+        <string>The maximum amount of effort values allowed</string>
+       </property>
+       <property name="minimum" >
+        <number>0</number>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0" >
+      <widget class="QLabel" name="labelMaxEVPerStat" >
+       <property name="text" >
+        <string>Max per stat:</string>
+       </property>
+       <property name="alignment" >
+        <set>Qt::AlignRight|Qt::AlignVCenter</set>
+       </property>
+       <property name="buddy" >
+        <cstring>varMaxEVPerStat</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1" >
+      <widget class="KIntNumInput" name="varMaxEVPerStat" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="toolTip" >
+        <string>The maximum amount of effort values allowed for a single stat</string>
+       </property>
+       <property name="statusTip" >
+        <string>The maximum amount of effort values allowed for a single stat</string>
+       </property>
+       <property name="whatsThis" >
+        <string>The maximum amount of effort values allowed for a single stat</string>
+       </property>
+       <property name="minimum" >
+        <number>0</number>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="9" column="0" >
+    <widget class="QLabel" name="labelBoxes" >
+     <property name="text" >
+      <string>Boxes:</string>
      </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
+     </property>
+     <property name="buddy" >
+      <cstring>varBoxes</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="9" column="1" >
+    <widget class="KIntNumInput" name="varBoxes" >
      <property name="toolTip" >
-      <string>Computer storage values</string>
+      <string>How many boxes on the computer will be available</string>
      </property>
      <property name="statusTip" >
-      <string>Computer storage values</string>
+      <string>How many boxes on the computer will be available</string>
      </property>
      <property name="whatsThis" >
-      <string>Computer storage values</string>
+      <string>How many boxes on the computer will be available</string>
+     </property>
+     <property name="minimum" >
+      <number>0</number>
      </property>
-     <layout class="QVBoxLayout" >
-      <item>
-       <widget class="KIntNumInput" name="varBoxes" >
-        <property name="label" >
-         <string>Boxes</string>
-        </property>
-        <property name="toolTip" >
-         <string>How many boxes on the computer will be available</string>
-        </property>
-        <property name="statusTip" >
-         <string>How many boxes on the computer will be available</string>
-        </property>
-        <property name="whatsThis" >
-         <string>How many boxes on the computer will be available</string>
-        </property>
-        <property name="minimum" >
-         <number>0</number>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KIntNumInput" name="varBoxSize" >
-        <property name="label" >
-         <string>Box Size</string>
-        </property>
-        <property name="toolTip" >
-         <string>How large each box is</string>
-        </property>
-        <property name="statusTip" >
-         <string>How large each box is</string>
-        </property>
-        <property name="whatsThis" >
-         <string>How large each box is</string>
-        </property>
-        <property name="minimum" >
-         <number>1</number>
-        </property>
-       </widget>
-      </item>
-     </layout>
     </widget>
    </item>
+   <item row="10" column="1" >
+    <layout class="QGridLayout" >
+     <item row="0" column="0" >
+      <widget class="QLabel" name="labelBoxSize" >
+       <property name="text" >
+        <string>Box size:</string>
+       </property>
+       <property name="alignment" >
+        <set>Qt::AlignRight|Qt::AlignVCenter</set>
+       </property>
+       <property name="buddy" >
+        <cstring>varBoxSize</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1" >
+      <widget class="KIntNumInput" name="varBoxSize" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="toolTip" >
+        <string>How large each box is</string>
+       </property>
+       <property name="statusTip" >
+        <string>How large each box is</string>
+       </property>
+       <property name="whatsThis" >
+        <string>How large each box is</string>
+       </property>
+       <property name="minimum" >
+        <number>1</number>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
    <item>
     <widget class="QGroupBox" name="boxArena" >
      <property name="title" >
@@ -581,6 +674,20 @@
    <header location="global" >KIntNumInput</header>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>varGenders</tabstop>
+  <tabstop>varBreeding</tabstop>
+  <tabstop>varCriticalDomains</tabstop>
+  <tabstop>varSwitchStyle</tabstop>
+  <tabstop>varUseATB</tabstop>
+  <tabstop>varSplitSpecial</tabstop>
+  <tabstop>varSplitSpecialDV</tabstop>
+  <tabstop>varEffortValues</tabstop>
+  <tabstop>varMaxEV</tabstop>
+  <tabstop>varMaxEVPerStat</tabstop>
+  <tabstop>varBoxes</tabstop>
+  <tabstop>varBoxSize</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>