[ADD] win32 support (KDE) into .pro files

[FIX] Ref.h extern variables
[FIX] Nature include
[FIX[ GUI fixes

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

1 files changed, 3 insertions, 7 deletions

diff --git a/pokemodr/RulesUI.cpp b/pokemodr/RulesUI.cpp
index 33168e67..25ffe63c 100644
--- a/pokemodr/RulesUI.cpp
+++ b/pokemodr/RulesUI.cpp
@@ -33,7 +33,6 @@ RulesUI::RulesUI(Rules* r, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(rules, rules_mod);
-    varMaxDV->addItems(Rules::DVStr);
     setGui();
 }
 
@@ -61,6 +60,8 @@ 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()]);
     boxHappiness->setChecked(rules_mod->getHappiness() ? Qt::Checked : Qt::Unchecked);
     varFaintLoss->setValue(rules_mod->getHappyFaintLoss());
@@ -79,7 +80,6 @@ void RulesUI::on_buttonApply_clicked()
 {
     *rules = *rules_mod;
     emit(setChanged(false));
-    setGui();
 }
 
 void RulesUI::on_buttonDiscard_clicked()
@@ -216,12 +216,10 @@ void RulesUI::on_varMaxDV_currentIndexChanged(const QString& m)
     try
     {
         if (Rules::DVStr.contains(m))
-        {
             rules_mod->setMaxDVValue(Rules::DVStr.indexOf(m));
-            emit(setChanged(true));
-        }
         else
             throw(BoundsException("RulesUI", "maxDVValue"));
+        emit(setChanged(true));
     }
     catch (BoundsException& e)
     {
@@ -264,8 +262,6 @@ void RulesUI::on_varMaxEV_valueChanged(const int m)
 {
     try
     {
-        if (unsigned(m) < rules_mod->getMaxEVPerStat())
-            varMaxEVPerStat->setValue(m);
         rules_mod->setMaxTotalEV(m);
         varMaxEVPerStat->setMaximum(m);
         emit(setChanged(true));