[ADD] SpeciesItemUI.{h, cpp}

[ADD] SpeciesMoveUI.{h, cpp}
[FIX] CoinListObjectUI fixes

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

1 files changed, 8 insertions, 10 deletions

diff --git a/pokemodr/CoinListObjectUI.cpp b/pokemodr/CoinListObjectUI.cpp
index a64d4ec1..ec471c2e 100644
--- a/pokemodr/CoinListObjectUI.cpp
+++ b/pokemodr/CoinListObjectUI.cpp
@@ -37,6 +37,10 @@ CoinListObjectUI::CoinListObjectUI(CoinListObject* c, QWidget* parent) :
 {
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
+    for (int i = 0; i < coinListObject->getPokemod().getItemCount(); ++i)
+        itemList << coinListObject->getPokemod().getItem(i).getName();
+    for (int i = 0; i < coinListObject->getPokemod().getSpeciesCount(); ++i)
+        speciesList << coinListObject->getPokemod().getSpecies(i).getName();
     setObjects(coinListObject, coinListObject_mod);
     varObject->setModel(new QStringListModel(varObject));
     varType->addItems(CoinListObject::TypeStr);
@@ -53,17 +57,11 @@ void CoinListObjectUI::setGui()
     varType->setCurrentIndex(coinListObject_mod->getType());
     if (coinListObject_mod->getType() == CoinListObject::Item)
     {
-        QStringList itemList;
-        for (int i = 0; i < coinListObject->getPokemod().getItemCount(); ++i)
-            itemList << coinListObject->getPokemod().getItem(i).getName();
         static_cast<QStringListModel*>(varObject->model())->setStringList(itemList);
         varObject->setCurrentIndex(coinListObject->getPokemod().getItemIndex(coinListObject_mod->getObject()));
     }
     else
     {
-        QStringList speciesList;
-        for (int i = 0; i < coinListObject->getPokemod().getSpeciesCount(); ++i)
-            speciesList << coinListObject->getPokemod().getSpecies(i).getName();
         static_cast<QStringListModel*>(varObject->model())->setStringList(speciesList);
         varObject->setCurrentIndex(coinListObject->getPokemod().getSpeciesIndex(coinListObject_mod->getObject()));
     }
@@ -84,11 +82,11 @@ void CoinListObjectUI::on_buttonDiscard_clicked()
     setGui();
 }
 
-void CoinListObjectUI::on_varType_currentIndexChanged(const int i)
+void CoinListObjectUI::on_varType_currentIndexChanged(const int t)
 {
     try
     {
-        coinListObject_mod->setType(i);
+        coinListObject_mod->setType(t);
         emit(setChanged(true));
     }
     catch (BoundsException& e)
@@ -115,7 +113,7 @@ void CoinListObjectUI::on_varObject_currentIndexChanged(const int o)
     }
 }
 
-void CoinListObjectUI::on_varAmount_currentIndexChanged(const int a)
+void CoinListObjectUI::on_varAmount_valueChanged(const int a)
 {
     try
     {
@@ -129,7 +127,7 @@ void CoinListObjectUI::on_varAmount_currentIndexChanged(const int a)
     }
 }
 
-void CoinListObjectUI::on_varCost_currentIndexChanged(const int c)
+void CoinListObjectUI::on_varCost_valueChanged(const int c)
 {
     try
     {