[FIX] Script to make a tarball now defaults to HEAD for the revision

[FIX] Enumeration types used to help remove some checks
[FIX] Macro code moved to static members of Object (not all though)
[FIX] Scripting wrappers now share information by keeping track of already-created instances of the wrapper
[FIX] Scripting methods are now Q_SCRIPTABLE and not slots

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

1 files changed, 25 insertions, 10 deletions

diff --git a/pokemodr/TrainerUI.cpp b/pokemodr/TrainerUI.cpp
index fc090b98..b579a6dd 100644
--- a/pokemodr/TrainerUI.cpp
+++ b/pokemodr/TrainerUI.cpp
@@ -37,11 +37,26 @@ Pokemodr::TrainerUI::~TrainerUI()
 
 void Pokemodr::TrainerUI::initGui()
 {
-    varTeamIntel->addItems(Pokemod::Trainer::IntelligenceStr);
-    varMoveIntel->addItems(Pokemod::Trainer::IntelligenceStr);
-    varItemIntel->addItems(Pokemod::Trainer::IntelligenceStr);
-    varAbilityIntel->addItems(Pokemod::Trainer::IntelligenceStr);
-    varStatIntel->addItems(Pokemod::Trainer::IntelligenceStr);
+    varTeamIntel->addItem(Pokemod::Trainer::IntelligenceStr[Pokemod::Trainer::Ignorant], QVariant::fromValue(Pokemod::Trainer::Ignorant));
+    varTeamIntel->addItem(Pokemod::Trainer::IntelligenceStr[Pokemod::Trainer::Determine], QVariant::fromValue(Pokemod::Trainer::Determine));
+    varTeamIntel->addItem(Pokemod::Trainer::IntelligenceStr[Pokemod::Trainer::Remember], QVariant::fromValue(Pokemod::Trainer::Remember));
+    varTeamIntel->addItem(Pokemod::Trainer::IntelligenceStr[Pokemod::Trainer::Cheating], QVariant::fromValue(Pokemod::Trainer::Cheating));
+    varMoveIntel->addItem(Pokemod::Trainer::IntelligenceStr[Pokemod::Trainer::Ignorant], QVariant::fromValue(Pokemod::Trainer::Ignorant));
+    varMoveIntel->addItem(Pokemod::Trainer::IntelligenceStr[Pokemod::Trainer::Determine], QVariant::fromValue(Pokemod::Trainer::Determine));
+    varMoveIntel->addItem(Pokemod::Trainer::IntelligenceStr[Pokemod::Trainer::Remember], QVariant::fromValue(Pokemod::Trainer::Remember));
+    varMoveIntel->addItem(Pokemod::Trainer::IntelligenceStr[Pokemod::Trainer::Cheating], QVariant::fromValue(Pokemod::Trainer::Cheating));
+    varItemIntel->addItem(Pokemod::Trainer::IntelligenceStr[Pokemod::Trainer::Ignorant], QVariant::fromValue(Pokemod::Trainer::Ignorant));
+    varItemIntel->addItem(Pokemod::Trainer::IntelligenceStr[Pokemod::Trainer::Determine], QVariant::fromValue(Pokemod::Trainer::Determine));
+    varItemIntel->addItem(Pokemod::Trainer::IntelligenceStr[Pokemod::Trainer::Remember], QVariant::fromValue(Pokemod::Trainer::Remember));
+    varItemIntel->addItem(Pokemod::Trainer::IntelligenceStr[Pokemod::Trainer::Cheating], QVariant::fromValue(Pokemod::Trainer::Cheating));
+    varAbilityIntel->addItem(Pokemod::Trainer::IntelligenceStr[Pokemod::Trainer::Ignorant], QVariant::fromValue(Pokemod::Trainer::Ignorant));
+    varAbilityIntel->addItem(Pokemod::Trainer::IntelligenceStr[Pokemod::Trainer::Determine], QVariant::fromValue(Pokemod::Trainer::Determine));
+    varAbilityIntel->addItem(Pokemod::Trainer::IntelligenceStr[Pokemod::Trainer::Remember], QVariant::fromValue(Pokemod::Trainer::Remember));
+    varAbilityIntel->addItem(Pokemod::Trainer::IntelligenceStr[Pokemod::Trainer::Cheating], QVariant::fromValue(Pokemod::Trainer::Cheating));
+    varStatIntel->addItem(Pokemod::Trainer::IntelligenceStr[Pokemod::Trainer::Ignorant], QVariant::fromValue(Pokemod::Trainer::Ignorant));
+    varStatIntel->addItem(Pokemod::Trainer::IntelligenceStr[Pokemod::Trainer::Determine], QVariant::fromValue(Pokemod::Trainer::Determine));
+    varStatIntel->addItem(Pokemod::Trainer::IntelligenceStr[Pokemod::Trainer::Remember], QVariant::fromValue(Pokemod::Trainer::Remember));
+    varStatIntel->addItem(Pokemod::Trainer::IntelligenceStr[Pokemod::Trainer::Cheating], QVariant::fromValue(Pokemod::Trainer::Cheating));
 }
 
 void Pokemodr::TrainerUI::refreshGui()
@@ -102,25 +117,25 @@ void Pokemodr::TrainerUI::on_varDepth_valueChanged(const int depth)
 
 void Pokemodr::TrainerUI::on_varTeamIntel_activated(const int teamIntel)
 {
-    qobject_cast<Pokemod::Trainer*>(modified())->setTeamIntel(teamIntel);
+    qobject_cast<Pokemod::Trainer*>(modified())->setTeamIntel(varTeamIntel->itemData(teamIntel).value<Pokemod::Trainer::Intelligence>());
 }
 
 void Pokemodr::TrainerUI::on_varMoveIntel_activated(const int moveIntel)
 {
-    qobject_cast<Pokemod::Trainer*>(modified())->setMoveIntel(moveIntel);
+    qobject_cast<Pokemod::Trainer*>(modified())->setMoveIntel(varMoveIntel->itemData(moveIntel).value<Pokemod::Trainer::Intelligence>());
 }
 
 void Pokemodr::TrainerUI::on_varItemIntel_activated(const int itemIntel)
 {
-    qobject_cast<Pokemod::Trainer*>(modified())->setItemIntel(itemIntel);
+    qobject_cast<Pokemod::Trainer*>(modified())->setItemIntel(varItemIntel->itemData(itemIntel).value<Pokemod::Trainer::Intelligence>());
 }
 
 void Pokemodr::TrainerUI::on_varAbilityIntel_activated(const int abilityIntel)
 {
-    qobject_cast<Pokemod::Trainer*>(modified())->setAbilityIntel(abilityIntel);
+    qobject_cast<Pokemod::Trainer*>(modified())->setAbilityIntel(varAbilityIntel->itemData(abilityIntel).value<Pokemod::Trainer::Intelligence>());
 }
 
 void Pokemodr::TrainerUI::on_varStatIntel_activated(const int statIntel)
 {
-    qobject_cast<Pokemod::Trainer*>(modified())->setStatIntel(statIntel);
+    qobject_cast<Pokemod::Trainer*>(modified())->setStatIntel(varStatIntel->itemData(statIntel).value<Pokemod::Trainer::Intelligence>());
 }