[FIX] Classes in pokemod will no longer emit a changed signal if not actually changed

[FIX] Logic error with checking to see if certain GUI elements need resetting
[FIX] Using activated rather than currentIndexChanged signals for combo boxes
[FIX] Qt bugs now irrelevant

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

1 files changed, 5 insertions, 5 deletions

diff --git a/pokemodr/MapEffectUI.cpp b/pokemodr/MapEffectUI.cpp
index 1aeec57a..17dea814 100644
--- a/pokemodr/MapEffectUI.cpp
+++ b/pokemodr/MapEffectUI.cpp
@@ -59,7 +59,7 @@ void MapEffectUI::refreshGui()
 
 void MapEffectUI::setGui()
 {
-    const bool resetEffect = (static_cast<MapEffect*>(modified())->effect() == m_lastEffect);
+    const bool resetEffect = (static_cast<MapEffect*>(modified())->effect() != m_lastEffect);
     varName->setText(static_cast<MapEffect*>(modified())->name());
     varCoordinate->setValue(static_cast<MapEffect*>(modified())->coordinate());
     varExistFlag->setValue(static_cast<MapEffect*>(modified())->existFlag());
@@ -143,7 +143,7 @@ void MapEffectUI::on_varSkin_pressed()
     delete dialog;
 }
 
-void MapEffectUI::on_varEffect_currentIndexChanged(const int effect)
+void MapEffectUI::on_varEffect_activated(const int effect)
 {
     static_cast<MapEffect*>(modified())->setEffect(effect);
 }
@@ -153,12 +153,12 @@ void MapEffectUI::on_varValue1_valueChanged(const int value1)
     static_cast<MapEffect*>(modified())->setValue1(value1);
 }
 
-void MapEffectUI::on_varValue2_currentIndexChanged(const int value2)
+void MapEffectUI::on_varValue2_activated(const int value2)
 {
     static_cast<MapEffect*>(modified())->setValue1(varValue2->itemData(value2).toInt());
 }
 
-void MapEffectUI::on_varDirection_currentIndexChanged(const int direction)
+void MapEffectUI::on_varDirection_activated(const int direction)
 {
     static_cast<MapEffect*>(modified())->setDirection(direction);
 }
@@ -173,7 +173,7 @@ void MapEffectUI::on_varCanMove_clicked(const bool canMove)
     static_cast<MapEffect*>(modified())->setCanMove(canMove);
 }
 
-void MapEffectUI::on_varDialog_currentIndexChanged(const int dialog)
+void MapEffectUI::on_varDialog_activated(const int dialog)
 {
     static_cast<MapEffect*>(modified())->setDialog(varDialog->itemData(dialog).toInt());
 }