[FIX] Main .pro file now excludes non-working subdirectories

[FIX] Minor fixes in the RulesUI logic

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@86 6ecfd1a5-f3ed-3746-8530-beee90d26b22

1 files changed, 13 insertions, 14 deletions

diff --git a/pokemodr/RulesUI.cpp b/pokemodr/RulesUI.cpp
index 28250028..8dc5114d 100644
--- a/pokemodr/RulesUI.cpp
+++ b/pokemodr/RulesUI.cpp
@@ -36,6 +36,7 @@ RulesUI::RulesUI(Rules* r, QWidget* parent) :
     QMetaObject::connectSlotsByName(this);
     setObjects(rules, rules_mod);
     connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
+    varMaxDV->addItems(Rules::DVStr);
     emit(changed(false));
     setGui();
 }
@@ -54,6 +55,10 @@ void RulesUI::setGui()
     boxAllowAbilities->setChecked(rules_mod->getAbilityAllowed() ? Qt::Checked : Qt::Unchecked);
     boxAllowNatures->setChecked(rules_mod->getNatureAllowed() ? Qt::Checked : Qt::Unchecked);
     varBoxes->setValue(rules_mod->getNumBoxes());
+    if (rules_mod->getNumBoxes())
+        varBoxSize->setEnabled(true);
+    else
+        varBoxSize->setEnabled(false);
     varBoxSize->setValue(rules_mod->getBoxSize());
     varMaxParty->setValue(rules_mod->getMaxParty());
     varMaxFight->setMaximum(rules_mod->getMaxParty());
@@ -64,20 +69,18 @@ void RulesUI::setGui()
     boxHardCash->setChecked(rules_mod->getHardCash() ? Qt::Checked : Qt::Unchecked);
     boxSplitSpecial->setChecked(rules_mod->getSpecialSplit() ? Qt::Checked : Qt::Unchecked);
     varSplitSpecialDV->setCheckState(rules_mod->getSpecialDVSplit() ? Qt::Checked : Qt::Unchecked);
-    varMaxDV->clear();
-    varMaxDV->addItems(Rules::DVStr);
-    varMaxDV->setCurrentItem(Rules::DVStr[rules_mod->getMaxDVValue()]);
+    varMaxDV->setCurrentIndex(rules_mod->getMaxDVValue());
     boxHappiness->setChecked(rules_mod->getHappiness() ? Qt::Checked : Qt::Unchecked);
     varFaintLoss->setValue(rules_mod->getHappyFaintLoss());
     varLevelGain->setValue(rules_mod->getHappyLevelGain());
     varNumSteps->setValue(rules_mod->getHappySteps());
     boxEffortValues->setChecked(rules_mod->getEffortValuesAllowed() ? Qt::Checked : Qt::Unchecked);
     varMaxEV->setValue(rules_mod->getMaxTotalEV());
-    varMaxEVPerStat->setValue(rules_mod->getMaxEVPerStat());
     varMaxEVPerStat->setMaximum(rules_mod->getMaxTotalEV());
+    varMaxEVPerStat->setValue(rules_mod->getMaxEVPerStat());
     varPokerusNum->setValue(rules_mod->getPokerusChance().getNum());
     varPokerusDenom->setValue(rules_mod->getPokerusChance().getDenom());
-    varPokerusNum->setMaximum(rules_mod->getPokerusChance().getDenom());
+    varPokerusNum->setMaximum(rules_mod->getPokerusChance().getDenom() - 1);
     varPokerus->setText(QString::number(rules_mod->getPokerusChance(), 'g', DBL_PREC));
 }
 
@@ -134,6 +137,7 @@ void RulesUI::on_varBoxes_valueChanged(const int b)
 {
     rules_mod->setNumBoxes(b);
     emit(changed(true));
+    setGui();
 }
 
 void RulesUI::on_varBoxSize_valueChanged(const int b)
@@ -145,9 +149,8 @@ void RulesUI::on_varBoxSize_valueChanged(const int b)
 void RulesUI::on_varMaxParty_valueChanged(const int m)
 {
     rules_mod->setMaxParty(m);
-    varMaxFight->setMaximum(m);
-    setGui();
     emit(changed(true));
+    setGui();
 }
 
 void RulesUI::on_varMaxFight_valueChanged(const int m)
@@ -216,14 +219,11 @@ void RulesUI::on_varSplitSpecialDV_toggled(const bool s)
     emit(changed(true));
 }
 
-void RulesUI::on_varMaxDV_currentIndexChanged(const QString& m)
+void RulesUI::on_varMaxDV_currentIndexChanged(const int m)
 {
     try
     {
-        if (Rules::DVStr.contains(m))
-            rules_mod->setMaxDVValue(Rules::DVStr.indexOf(m));
-        else
-            throw(BoundsException("RulesUI", "maxDVValue"));
+        rules_mod->setMaxDVValue(m);
         emit(changed(true));
     }
     catch (BoundsException& e)
@@ -268,14 +268,13 @@ void RulesUI::on_varMaxEV_valueChanged(const int m)
     try
     {
         rules_mod->setMaxTotalEV(m);
-        varMaxEVPerStat->setMaximum(m);
         emit(changed(true));
     }
     catch (BoundsException& e)
     {
         BugCatcher::report(e);
-        setGui();
     }
+    setGui();
 }
 
 void RulesUI::on_varMaxEVPerStat_valueChanged(const int m)