[FIX] SoundUI uses correct icon names now

[FIX] Setting up combo boxes in UI widgets cleaner
[ADD] AbilityEffect widget done
[FIX] Fixed up MapEffect setting code

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

1 files changed, 4 insertions, 7 deletions

diff --git a/pokemodr/MapTrainerUI.cpp b/pokemodr/MapTrainerUI.cpp
index 30632013..69ac68fe 100644
--- a/pokemodr/MapTrainerUI.cpp
+++ b/pokemodr/MapTrainerUI.cpp
@@ -51,8 +51,7 @@ void MapTrainerUI::refreshGui()
     for (int i = 0; i < static_cast<const Pokemod*>(original()->pokemod())->trainerCount(); ++i)
     {
         const Trainer* trainer = static_cast<const Pokemod*>(original()->pokemod())->trainer(i);
-        varTrainerClass->addItem(trainer->name());
-        varTrainerClass->setItemData(i, trainer->id());
+        varTrainerClass->addItem(trainer->name(), trainer->id());
     }
     varCoordinate->setMaximum(static_cast<const Map*>(original()->parent())->size());
     varNumberFight->setMaximum(static_cast<const Pokemod*>(original()->pokemod())->rules()->maxFight());
@@ -60,8 +59,7 @@ void MapTrainerUI::refreshGui()
     for (int i = 0; i < static_cast<const Pokemod*>(original()->pokemod())->dialogCount(); ++i)
     {
         const Dialog* dialog = static_cast<const Pokemod*>(original()->pokemod())->dialog(i);
-        varDialog->addItem(dialog->dialog().mid(0, 25));
-        varDialog->setItemData(i, dialog->id());
+        varDialog->addItem(dialog->dialog().mid(0, 25), dialog->id());
     }
     varLeadTeamMember->clear();
     for (int i = 0; i < static_cast<MapTrainer*>(original())->teamMemberCount(); ++i)
@@ -69,10 +67,9 @@ void MapTrainerUI::refreshGui()
         const MapTrainerTeamMember* teamMember = static_cast<MapTrainer*>(original())->teamMember(i);
         const Species* species = static_cast<const Pokemod*>(original()->pokemod())->species(teamMember->species());
         if (species)
-            varLeadTeamMember->addItem(species->name());
+            varLeadTeamMember->addItem(species->name(), teamMember->id());
         else
-            varLeadTeamMember->addItem("Invalid Species");
-        varLeadTeamMember->setItemData(i, teamMember->id());
+            varLeadTeamMember->addItem("Invalid Species", teamMember->id());
     }
 }