[FIX] API of FractionWidget and PointWidget

[ADD] FlagWidget
[FIX] Changed MapEffect, MapTrainer, and MapWarp to use FlagWidget

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

1 files changed, 3 insertions, 18 deletions

diff --git a/pokemodr/MapWarpUI.cpp b/pokemodr/MapWarpUI.cpp
index a0f498c7..d24cb17f 100644
--- a/pokemodr/MapWarpUI.cpp
+++ b/pokemodr/MapWarpUI.cpp
@@ -101,12 +101,7 @@ void MapWarpUI::setGui()
         }
     }
     varToWarp->setCurrentIndex(varToMap->findData(static_cast<MapWarp*>(modified())->toWarp()));
-    boxFlag->setChecked((static_cast<MapWarp*>(modified())->workingFlag().status() == Flag::Ignore) ? Qt::Unchecked : Qt::Checked);
-    if (boxFlag->isChecked())
-    {
-        varFlag->setValue(static_cast<MapWarp*>(modified())->workingFlag().flag());
-        varState->setCheckState((static_cast<MapWarp*>(modified())->workingFlag().status() == Flag::On) ? Qt::Checked : Qt::Unchecked);
-    }
+    varWorkingFlag->setValue(static_cast<MapWarp*>(modified())->workingFlag());
     varDialog->setCurrentIndex(varDialog->findData(static_cast<MapWarp*>(modified())->dialog()));
 }
 
@@ -174,21 +169,11 @@ void MapWarpUI::on_varToWarp_currentIndexChanged(const int toWarp)
     static_cast<MapWarp*>(modified())->setToWarp(toWarp);
 }
 
-void MapWarpUI::on_boxFlag_toggled(const bool flagUsed)
+void MapWarpUI::on_varWorkingFlag_valueChanged(const Flag& workingFlag)
 {
-    if (!flagUsed)
-        static_cast<MapWarp*>(modified())->setWorkingFlag(Flag(varFlag->value(), Flag::Ignore));
+    static_cast<MapWarp*>(modified())->setWorkingFlag(workingFlag);
 }
 
-void MapWarpUI::on_varFlag_valueChanged(const int flag)
-{
-    static_cast<MapWarp*>(modified())->setWorkingFlag(Flag(flag, boxFlag->isChecked() ? Flag::Ignore : (varState->isChecked() ? Flag::On : Flag::Off)));
-}
-
-void MapWarpUI::on_varState_toggled(const bool status)
-{
-    static_cast<MapWarp*>(modified())->setWorkingFlag(Flag(varFlag->value(), status ? Flag::On : Flag::Off));
-}
 
 void MapWarpUI::on_varDialog_currentIndexChanged(const int dialog)
 {