summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2008-02-22 05:37:08 +0000
committerBen Boeckel <MathStuf@gmail.com>2008-02-22 05:37:08 +0000
commit0ee1ea1cef9eec7e0187aa9f8f2dc291775e8864 (patch)
tree6e2d6bfa29646dcedd32ffe9a487fc6ee6271196
parent8082fda92a86b34a37fe386266efbde5e30bca16 (diff)
downloadsigen-0ee1ea1cef9eec7e0187aa9f8f2dc291775e8864.tar.gz
sigen-0ee1ea1cef9eec7e0187aa9f8f2dc291775e8864.tar.xz
sigen-0ee1ea1cef9eec7e0187aa9f8f2dc291775e8864.zip
[FIX] SpeciesUI now compiles without vtable errors
git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@69 6ecfd1a5-f3ed-3746-8530-beee90d26b22
-rw-r--r--Changelog7
-rw-r--r--pokemodr/PokeModrUI.cpp4
-rw-r--r--pokemodr/SpeciesUI.cpp87
-rw-r--r--pokemodr/SpeciesUI.h1
4 files changed, 99 insertions, 0 deletions
diff --git a/Changelog b/Changelog
index f88d3c99..66b3d861 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,11 @@
-----------------
+Rev: 70
+Date: 22 February 2008
+User: MathStuf
+-----------------
+[FIX] SpeciesUI now compiles without vtable errors
+
+-----------------
Rev: 69
Date: 21 February 2008
User: MathStuf
diff --git a/pokemodr/PokeModrUI.cpp b/pokemodr/PokeModrUI.cpp
index 0fb19a70..cdc976ec 100644
--- a/pokemodr/PokeModrUI.cpp
+++ b/pokemodr/PokeModrUI.cpp
@@ -44,7 +44,9 @@
#include "MoveUI.h"
#include "NatureUI.h"
#include "RulesUI.h"
+#include "SpeciesUI.h"
#include "SpeciesAbilityUI.h"
+#include "SpeciesEvolutionUI.h"
#include "SpeciesItemUI.h"
#include "SpeciesMoveUI.h"
#include "StoreUI.h"
@@ -84,7 +86,9 @@ PokeModrUI::PokeModrUI(KConfigGroup cfg, KConfigGroup history, QWidget* parent)
pokemod->newItem()->setName("baz");
// formPanel->setWidget(new MoveUI(pokemod->newMove(), formPanel));
// formPanel->setWidget(new NatureUI(pokemod->newNature(), formPanel));
+// formPanel->setWidget(new SpeciesUI(pokemod->newSpecies(), formPanel));
// formPanel->setWidget(new SpeciesAbilityUI(pokemod->newSpecies()->newAbility(), formPanel));
+// formPanel->setWidget(new SpeciesEvolutionUI(pokemod->newSpecies()->newEvolution(), formPanel));
// formPanel->setWidget(new SpeciesItemUI(pokemod->newSpecies()->newItem(), formPanel));
// formPanel->setWidget(new SpeciesMoveUI(pokemod->newSpecies()->newMove(), formPanel));
formPanel->setWidget(new StoreUI(pokemod->newStore(), formPanel));
diff --git a/pokemodr/SpeciesUI.cpp b/pokemodr/SpeciesUI.cpp
index 3a5a914d..0d230f12 100644
--- a/pokemodr/SpeciesUI.cpp
+++ b/pokemodr/SpeciesUI.cpp
@@ -33,6 +33,7 @@
#include <Species.h>
#include <Type.h>
+#include "ImageDialog.h"
#include "SpeciesUI.h"
SpeciesUI::SpeciesUI(Species* s, QWidget* parent) :
@@ -77,6 +78,12 @@ SpeciesUI::SpeciesUI(Species* s, QWidget* parent) :
tabGenetics->setEnabled(false);
boxFemaleSprites->setEnabled(false);
}
+ for (int i = 0; i < species->getPokemod()->getTypeCount(); ++i)
+ {
+ const Type* t = species->getPokemod()->getType(i);
+ QListWidgetItem* lwi = new QListWidgetItem(t->getName(), varTypes);
+ lwi->setData(Qt::UserRole, t->getId());
+ }
}
// KToolbar SpeciesUI::getToolbar(QWidget* parent)
@@ -348,6 +355,86 @@ void SpeciesUI::on_varPokedexEntry_textChanged()
emit(setChanged(true));
}
+void SpeciesUI::on_varFrontMaleSprite_pressed()
+{
+ if (ImageDialog::exec())
+ {
+ try
+ {
+ species_mod->setBackMaleSprite(ImageDialog::selectedUrl());
+ }
+ catch (SaveException& e)
+ {
+ BugCatcher::report(e);
+ }
+ setGui();
+ }
+}
+
+void SpeciesUI::on_varBackMaleSprite_pressed()
+{
+ if (ImageDialog::exec())
+ {
+ try
+ {
+ species_mod->setBackMaleSprite(ImageDialog::selectedUrl());
+ }
+ catch (SaveException& e)
+ {
+ BugCatcher::report(e);
+ }
+ setGui();
+ }
+}
+
+void SpeciesUI::on_varFrontFemaleSprite_pressed()
+{
+ if (ImageDialog::exec())
+ {
+ try
+ {
+ species_mod->setFrontFemaleSprite(ImageDialog::selectedUrl());
+ }
+ catch (SaveException& e)
+ {
+ BugCatcher::report(e);
+ }
+ setGui();
+ }
+}
+
+void SpeciesUI::on_varBackFemaleSprite_pressed()
+{
+ if (ImageDialog::exec())
+ {
+ try
+ {
+ species_mod->setBackFemaleSprite(ImageDialog::selectedUrl());
+ }
+ catch (SaveException& e)
+ {
+ BugCatcher::report(e);
+ }
+ setGui();
+ }
+}
+
+void SpeciesUI::on_varListSprite_pressed()
+{
+ if (ImageDialog::exec())
+ {
+ try
+ {
+ species_mod->setListSprite(ImageDialog::selectedUrl());
+ }
+ catch (SaveException& e)
+ {
+ BugCatcher::report(e);
+ }
+ setGui();
+ }
+}
+
void SpeciesUI::on_boxGenderChance_toggled(const bool g)
{
species_mod->setGenderFactor(g ? 1 : -1, 1);
diff --git a/pokemodr/SpeciesUI.h b/pokemodr/SpeciesUI.h
index b00c48da..82536c48 100644
--- a/pokemodr/SpeciesUI.h
+++ b/pokemodr/SpeciesUI.h
@@ -30,6 +30,7 @@
#include <Species.h>
#include "ObjectUI.h"
+
#include "ui_species.h"
class SpeciesUI : public ObjectUI, private Ui::formSpecies