diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-08-04 03:27:13 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-08-04 03:27:13 +0000 |
| commit | 373e686bf4ecaaabcf80544e74f017eebe05213f (patch) | |
| tree | cddf7a223f16944b0380386e568f2606f634c366 /pokemodr/MapEffectUI.cpp | |
| parent | 63417b1c5057d22bd853e92cd3a25aa812b8d917 (diff) | |
| download | sigen-373e686bf4ecaaabcf80544e74f017eebe05213f.tar.gz sigen-373e686bf4ecaaabcf80544e74f017eebe05213f.tar.xz sigen-373e686bf4ecaaabcf80544e74f017eebe05213f.zip | |
[FIX] Cleaned up the RC file
[FIX] Script editing is getting there (still a little weird...)
[FIX] Cleaned up the main file a bit
[FIX] Added the Skin class
[FIX] All sprites and skins are internally linked now
[FIX] No more image restraints (tiles are still enforced so that map editing works)
[FIX] Cleaned up checking for valid values when setting in pokemod
[FIX] Removed FileDialog files
git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@233 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'pokemodr/MapEffectUI.cpp')
| -rw-r--r-- | pokemodr/MapEffectUI.cpp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/pokemodr/MapEffectUI.cpp b/pokemodr/MapEffectUI.cpp index 61e6f9bd..72b1d7f0 100644 --- a/pokemodr/MapEffectUI.cpp +++ b/pokemodr/MapEffectUI.cpp @@ -18,14 +18,12 @@ // Header include #include "MapEffectUI.h" -// Pokemodr includes -#include "FileDialog.h" - // Pokemod includes #include "../pokemod/Item.h" #include "../pokemod/Map.h" #include "../pokemod/MapEffect.h" #include "../pokemod/Pokemod.h" +#include "../pokemod/Skin.h" Pokemodr::MapEffectUI::MapEffectUI(Pokemod::MapEffect* effect, QWidget* parent) : ObjectUI(parent) @@ -41,13 +39,18 @@ Pokemodr::MapEffectUI::~MapEffectUI() void Pokemodr::MapEffectUI::refreshGui() { varCoordinate->setMaximum(qobject_cast<const Pokemod::Map*>(original()->parent())->size()); + for (int i = 0; i < pokemod()->skinCount(); ++i) + { + const Pokemod::Skin* skin = pokemod()->skin(i); + varSkin->addItem(skin->name(), skin->id()); + } } void Pokemodr::MapEffectUI::setGui() { varName->setText(qobject_cast<Pokemod::MapEffect*>(modified())->name()); varCoordinate->setValue(qobject_cast<Pokemod::MapEffect*>(modified())->coordinate()); - varSkin->setIcon(qobject_cast<Pokemod::MapEffect*>(modified())->skin()); + varSkin->setCurrentIndex(varSkin->findData(qobject_cast<Pokemod::MapEffect*>(modified())->skin())); varScript->setValue(qobject_cast<Pokemod::MapEffect*>(modified())->script()); varIsGhost->setChecked(qobject_cast<Pokemod::MapEffect*>(modified())->isGhost() ? Qt::Checked : Qt::Unchecked); } @@ -77,15 +80,9 @@ void Pokemodr::MapEffectUI::on_varCoordinate_valueChanged(const QPoint& coordina qobject_cast<Pokemod::MapEffect*>(modified())->setCoordinate(coordinate); } -void Pokemodr::MapEffectUI::on_varSkin_pressed() +void Pokemodr::MapEffectUI::on_varSkin_currentIndexChanged(const int skin) { - FileDialog* dialog = new FileDialog(QSize(192, 128)); - if (dialog->exec() == QDialog::Accepted) - { - qobject_cast<Pokemod::MapEffect*>(modified())->setSkin(QPixmap(dialog->selectedFile())); - setGui(); - } - delete dialog; + qobject_cast<Pokemod::MapEffect*>(modified())->setSkin(varSkin->itemData(skin).toInt()); } void Pokemodr::MapEffectUI::on_varScript_valueChanged(const Pokemod::Script& script) |