summaryrefslogtreecommitdiffstats
path: root/pokemodr
diff options
context:
space:
mode:
Diffstat (limited to 'pokemodr')
-rw-r--r--pokemodr/AbilityUI.cpp8
-rw-r--r--pokemodr/AuthorUI.cpp12
-rw-r--r--pokemodr/BadgeUI.cpp18
-rw-r--r--pokemodr/CoinListObjectUI.cpp14
-rw-r--r--pokemodr/CoinListUI.cpp10
-rw-r--r--pokemodr/EggGroupUI.cpp8
-rw-r--r--pokemodr/ItemTypeUI.cpp12
-rw-r--r--pokemodr/ItemUI.cpp16
-rw-r--r--pokemodr/MapUI.cpp54
-rw-r--r--pokemodr/MapUI.h2
-rw-r--r--pokemodr/MoveUI.cpp36
-rw-r--r--pokemodr/NatureUI.cpp16
-rw-r--r--pokemodr/ObjectUI.h8
-rw-r--r--pokemodr/PokemodUI.cpp30
-rw-r--r--pokemodr/RulesUI.cpp58
-rw-r--r--pokemodr/SpeciesAbilityUI.cpp10
-rw-r--r--pokemodr/SpeciesEvolutionUI.cpp18
-rw-r--r--pokemodr/SpeciesItemUI.cpp10
-rw-r--r--pokemodr/SpeciesMoveUI.cpp12
-rw-r--r--pokemodr/SpeciesUI.cpp58
-rw-r--r--pokemodr/StoreUI.cpp10
-rw-r--r--pokemodr/TileUI.cpp18
-rw-r--r--pokemodr/TimeUI.cpp10
-rw-r--r--pokemodr/TypeUI.cpp10
-rw-r--r--pokemodr/pokemodr.pro194
25 files changed, 332 insertions, 320 deletions
diff --git a/pokemodr/AbilityUI.cpp b/pokemodr/AbilityUI.cpp
index 079490c2..593e765e 100644
--- a/pokemodr/AbilityUI.cpp
+++ b/pokemodr/AbilityUI.cpp
@@ -32,7 +32,7 @@ AbilityUI::AbilityUI(Ability* a, QWidget* parent) :
setupUi(this);
QMetaObject::connectSlotsByName(this);
setObjects(ability, ability_mod);
- connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
+ connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setDisabled(bool)));
setGui();
}
@@ -49,18 +49,18 @@ void AbilityUI::setGui()
void AbilityUI::on_buttonApply_clicked()
{
*ability = *ability_mod;
- emit(setChanged(false));
+ emit(changed(false));
}
void AbilityUI::on_buttonDiscard_clicked()
{
*ability_mod = *ability;
- emit(setChanged(false));
+ emit(changed(false));
setGui();
}
void AbilityUI::on_varName_textChanged(const QString& n)
{
ability_mod->setName(n);
- emit(setChanged(true));
+ emit(changed(true));
}
diff --git a/pokemodr/AuthorUI.cpp b/pokemodr/AuthorUI.cpp
index efc5510e..3c53536e 100644
--- a/pokemodr/AuthorUI.cpp
+++ b/pokemodr/AuthorUI.cpp
@@ -34,7 +34,7 @@ AuthorUI::AuthorUI(Author* a, QWidget* parent) :
setupUi(this);
QMetaObject::connectSlotsByName(this);
setObjects(author, author_mod);
- connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
+ connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setDisabled(bool)));
setGui();
}
@@ -53,30 +53,30 @@ void AuthorUI::setGui()
void AuthorUI::on_buttonApply_clicked()
{
*author = *author_mod;
- emit(setChanged(false));
+ emit(changed(false));
}
void AuthorUI::on_buttonDiscard_clicked()
{
*author_mod = *author;
- emit(setChanged(false));
+ emit(changed(false));
setGui();
}
void AuthorUI::on_varName_textChanged(const QString& n)
{
author_mod->setName(n);
- emit(setChanged(true));
+ emit(changed(true));
}
void AuthorUI::on_varEmail_textChanged(const QString& e)
{
author_mod->setEmail(e);
- emit(setChanged(true));
+ emit(changed(true));
}
void AuthorUI::on_varRole_textChanged(const QString& r)
{
author_mod->setRole(r);
- emit(setChanged(true));
+ emit(changed(true));
}
diff --git a/pokemodr/BadgeUI.cpp b/pokemodr/BadgeUI.cpp
index 1f27595b..c407b737 100644
--- a/pokemodr/BadgeUI.cpp
+++ b/pokemodr/BadgeUI.cpp
@@ -41,7 +41,7 @@ BadgeUI::BadgeUI(Badge* b, QWidget* parent) :
setupUi(this);
QMetaObject::connectSlotsByName(this);
setObjects(badge, badge_mod);
- connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
+ connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setDisabled(bool)));
varHMs->addItems(HMStr);
const bool isSplit = badge->getPokemod()->getRules()->getSpecialSplit();
varStat->addItems((isSplit ? StatGSCStr : StatRBYStr).mid(0, isSplit ? ST_End_GSC : ST_End_RBY));
@@ -85,20 +85,20 @@ void BadgeUI::setGui()
void BadgeUI::on_buttonApply_clicked()
{
*badge = *badge_mod;
- emit(setChanged(false));
+ emit(changed(false));
}
void BadgeUI::on_buttonDiscard_clicked()
{
*badge_mod = *badge;
- emit(setChanged(false));
+ emit(changed(false));
setGui();
}
void BadgeUI::on_varName_textChanged(const QString& n)
{
badge_mod->setName(n);
- emit(setChanged(true));
+ emit(changed(true));
}
void BadgeUI::on_varObey_valueChanged(const int o)
@@ -106,7 +106,7 @@ void BadgeUI::on_varObey_valueChanged(const int o)
try
{
badge_mod->setObey(o);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
@@ -149,7 +149,7 @@ void BadgeUI::on_varBadge_pressed()
void BadgeUI::on_varStat_currentIndexChanged()
{
- emit(setChanged(true));
+ emit(changed(true));
setGui();
}
@@ -158,7 +158,7 @@ void BadgeUI::on_varMultiplierNum_valueChanged(const int m)
try
{
badge_mod->setStatNum(varStat->currentIndex(), m);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (Exception& e)
{
@@ -172,7 +172,7 @@ void BadgeUI::on_varMultiplierDenom_valueChanged(const int m)
try
{
badge_mod->setStatDenom(varStat->currentIndex(), m);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (Exception& e)
{
@@ -187,7 +187,7 @@ void BadgeUI::on_varHMs_itemSelectionChanged()
{
for (int i = 0; i < varHMs->count(); ++i)
badge_mod->setHm(i, varHMs->item(i)->isSelected());
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
diff --git a/pokemodr/CoinListObjectUI.cpp b/pokemodr/CoinListObjectUI.cpp
index 71b9f075..da333fe0 100644
--- a/pokemodr/CoinListObjectUI.cpp
+++ b/pokemodr/CoinListObjectUI.cpp
@@ -41,7 +41,7 @@ CoinListObjectUI::CoinListObjectUI(CoinListObject* c, QWidget* parent) :
setupUi(this);
QMetaObject::connectSlotsByName(this);
setObjects(coinListObject, coinListObject_mod);
- connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
+ connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setDisabled(bool)));
varType->addItems(CoinListObject::TypeStr);
setGui();
}
@@ -86,13 +86,13 @@ void CoinListObjectUI::setGui()
void CoinListObjectUI::on_buttonApply_clicked()
{
*coinListObject = *coinListObject_mod;
- emit(setChanged(false));
+ emit(changed(false));
}
void CoinListObjectUI::on_buttonDiscard_clicked()
{
*coinListObject_mod = *coinListObject;
- emit(setChanged(false));
+ emit(changed(false));
setGui();
}
@@ -101,7 +101,7 @@ void CoinListObjectUI::on_varType_currentIndexChanged(const int t)
try
{
coinListObject_mod->setType(t);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
@@ -115,7 +115,7 @@ void CoinListObjectUI::on_varObject_currentIndexChanged(const int o)
try
{
coinListObject_mod->setObject(varObject->itemData(o).toInt());
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
@@ -129,7 +129,7 @@ void CoinListObjectUI::on_varAmount_valueChanged(const int a)
try
{
coinListObject_mod->setAmount(a);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
@@ -143,7 +143,7 @@ void CoinListObjectUI::on_varCost_valueChanged(const int c)
try
{
coinListObject_mod->setCost(c);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
diff --git a/pokemodr/CoinListUI.cpp b/pokemodr/CoinListUI.cpp
index 9095dffd..7de83bdc 100644
--- a/pokemodr/CoinListUI.cpp
+++ b/pokemodr/CoinListUI.cpp
@@ -40,7 +40,7 @@ CoinListUI::CoinListUI(CoinList* c, QWidget* parent) :
setupUi(this);
QMetaObject::connectSlotsByName(this);
setObjects(coinList, coinList_mod);
- connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
+ connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setDisabled(bool)));
for (int i = 0; i < coinList->getPokemod()->getItemCount(); ++i)
{
const Item* it = coinList->getPokemod()->getItem(i);
@@ -71,20 +71,20 @@ void CoinListUI::setGui()
void CoinListUI::on_buttonApply_clicked()
{
*coinList = *coinList_mod;
- emit(setChanged(false));
+ emit(changed(false));
}
void CoinListUI::on_buttonDiscard_clicked()
{
*coinList_mod = *coinList;
- emit(setChanged(false));
+ emit(changed(false));
setGui();
}
void CoinListUI::on_varName_textChanged(const QString& n)
{
coinList_mod->setName(n);
- emit(setChanged(true));
+ emit(changed(true));
}
void CoinListUI::on_varValue_currentIndexChanged(const int v)
@@ -92,7 +92,7 @@ void CoinListUI::on_varValue_currentIndexChanged(const int v)
try
{
coinList_mod->setValue(varValue->itemData(v).toInt());
- emit(setChanged(true));
+ emit(changed(true));
}
catch (Exception& e)
{
diff --git a/pokemodr/EggGroupUI.cpp b/pokemodr/EggGroupUI.cpp
index 56459d83..382f78f9 100644
--- a/pokemodr/EggGroupUI.cpp
+++ b/pokemodr/EggGroupUI.cpp
@@ -32,7 +32,7 @@ EggGroupUI::EggGroupUI(EggGroup* e, QWidget* parent) :
setupUi(this);
QMetaObject::connectSlotsByName(this);
setObjects(eggGroup, eggGroup_mod);
- connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
+ connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setDisabled(bool)));
setGui();
}
@@ -49,18 +49,18 @@ void EggGroupUI::setGui()
void EggGroupUI::on_buttonApply_clicked()
{
*eggGroup = *eggGroup_mod;
- emit(setChanged(false));
+ emit(changed(false));
}
void EggGroupUI::on_buttonDiscard_clicked()
{
*eggGroup_mod = *eggGroup;
- emit(setChanged(false));
+ emit(changed(false));
setGui();
}
void EggGroupUI::on_varName_textChanged(const QString& n)
{
eggGroup_mod->setName(n);
- emit(setChanged(true));
+ emit(changed(true));
}
diff --git a/pokemodr/ItemTypeUI.cpp b/pokemodr/ItemTypeUI.cpp
index db2e8f34..df697e36 100644
--- a/pokemodr/ItemTypeUI.cpp
+++ b/pokemodr/ItemTypeUI.cpp
@@ -35,7 +35,7 @@ ItemTypeUI::ItemTypeUI(ItemType* i, QWidget* parent) :
setupUi(this);
QMetaObject::connectSlotsByName(this);
setObjects(itemType, itemType_mod);
- connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
+ connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setDisabled(bool)));
setGui();
}
@@ -54,26 +54,26 @@ void ItemTypeUI::setGui()
void ItemTypeUI::on_buttonApply_clicked()
{
*itemType = *itemType_mod;
- emit(setChanged(false));
+ emit(changed(false));
}
void ItemTypeUI::on_buttonDiscard_clicked()
{
*itemType_mod = *itemType;
- emit(setChanged(false));
+ emit(changed(false));
setGui();
}
void ItemTypeUI::on_varName_textChanged(const QString& n)
{
itemType_mod->setName(n);
- emit(setChanged(true));
+ emit(changed(true));
}
void ItemTypeUI::on_varComputer_valueChanged(const int c)
{
itemType_mod->setComputer(c);
- emit(setChanged(true));
+ emit(changed(true));
}
void ItemTypeUI::on_varPlayer_valueChanged(const int p)
@@ -81,7 +81,7 @@ void ItemTypeUI::on_varPlayer_valueChanged(const int p)
try
{
itemType_mod->setPlayer(p);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
diff --git a/pokemodr/ItemUI.cpp b/pokemodr/ItemUI.cpp
index fdd7c008..3d2546d7 100644
--- a/pokemodr/ItemUI.cpp
+++ b/pokemodr/ItemUI.cpp
@@ -37,7 +37,7 @@ ItemUI::ItemUI(Item* i, QWidget* parent) :
setupUi(this);
QMetaObject::connectSlotsByName(this);
setObjects(item, item_mod);
- connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
+ connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setDisabled(bool)));
for (int i = 0; i < item->getPokemod()->getItemTypeCount(); ++i)
{
const ItemType* it = item->getPokemod()->getItemType(i);
@@ -65,26 +65,26 @@ void ItemUI::setGui()
void ItemUI::on_buttonApply_clicked()
{
*item = *item_mod;
- emit(setChanged(false));
+ emit(changed(false));
}
void ItemUI::on_buttonDiscard_clicked()
{
*item_mod = *item;
- emit(setChanged(false));
+ emit(changed(false));
setGui();
}
void ItemUI::on_varName_textChanged(const QString& n)
{
item_mod->setName(n);
- emit(setChanged(true));
+ emit(changed(true));
}
void ItemUI::on_boxSellable_toggled(const bool s)
{
item_mod->setSellable(s);
- emit(setChanged(true));
+ emit(changed(true));
}
void ItemUI::on_varType_currentIndexChanged(const int t)
@@ -92,7 +92,7 @@ void ItemUI::on_varType_currentIndexChanged(const int t)
try
{
item_mod->setType(varType->itemData(t).toInt());
- emit(setChanged(true));
+ emit(changed(true));
}
catch (Exception& e)
{
@@ -106,7 +106,7 @@ void ItemUI::on_varPrice_valueChanged(const int p)
try
{
item_mod->setPrice(p);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
@@ -118,5 +118,5 @@ void ItemUI::on_varPrice_valueChanged(const int p)
void ItemUI::on_varDescription_textChanged()
{
item_mod->setDescription(varDescription->toPlainText());
- emit(setChanged(true));
+ emit(changed(true));
}
diff --git a/pokemodr/MapUI.cpp b/pokemodr/MapUI.cpp
index e1c50556..db8ec4d3 100644
--- a/pokemodr/MapUI.cpp
+++ b/pokemodr/MapUI.cpp
@@ -26,10 +26,9 @@
#include <BugCatcher.h>
#include <Exception.h>
+#include <MapWarp.h>
#include <Pokemod.h>
-#include "TileDelegate.h"
-#include "TilemapModel.h"
#include "MapUI.h"
MapUI::MapUI(Map* m, QWidget* parent) :
@@ -42,9 +41,13 @@ MapUI::MapUI(Map* m, QWidget* parent) :
setupUi(this);
QMetaObject::connectSlotsByName(this);
setObjects(map, map_mod);
- connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
+ connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setDisabled(bool)));
for (int i = 0; i < map->getWarpCount(); ++i)
- varFlyWarp->addItem(map->getWarp(i)->getName());
+ {
+ const MapWarp* w = map->getWarp(i);
+ varFlyWarp->addItem(w->getName());
+ varFlyWarp->setItemData(i, w->getId());
+ }
varType->addItems(Map::TypeStr);
varTilemap->setModel(model);
varTilemap->setItemDelegate(delegate);
@@ -60,60 +63,79 @@ void MapUI::setGui()
{
varName->setText(map_mod->getName());
boxFlyWarp->setChecked((map_mod->getFlyWarp() == -1) ? Qt::Unchecked : Qt::Checked);
- varFlyWarp->setCurrentIndex(map_mod->getFlyWarp());
+ varFlyWarp->setCurrentIndex(varFlyWarp->findData(map_mod->getFlyWarp()));
varType->setCurrentIndex(map_mod->getType());
}
void MapUI::on_buttonApply_clicked()
{
*map = *map_mod;
- emit(setChanged(false));
+ emit(changed(false));
}
void MapUI::on_buttonDiscard_clicked()
{
*map_mod = *map;
- emit(setChanged(false));
+ emit(changed(false));
setGui();
}
void MapUI::on_varName_textChanged(const QString& n)
{
map_mod->setName(n);
- emit(setChanged(true));
+ emit(changed(true));
}
-void MapUI::on_boxFlyWarp_toggled(const bool f)
+void MapUI::on_boxFlyWarp_toggled()
{
-
+ map_mod->setFlyWarp(-1);
+ emit(changed(true));
}
void MapUI::on_varFlyWarp_currentIndexChanged(const int f)
{
-
+ try
+ {
+ map_mod->setFlyWarp(varFlyWarp->itemData(f).toInt());
+ emit(changed(true));
+ }
+ catch (BoundsException& e)
+ {
+ BugCatcher::report(e);
+ setGui();
+ }
}
void MapUI::on_varType_currentIndexChanged(const int t)
{
-
+ try
+ {
+ map_mod->setType(t);
+ emit(changed(true));
+ }
+ catch (BoundsException& e)
+ {
+ BugCatcher::report(e);
+ setGui();
+ }
}
void MapUI::on_buttonAddColumn_pressed()
{
-
+ model->insertColumns(varTilemap->currentIndex().column(), 1);
}
void MapUI::on_buttonAddRow_pressed()
{
-
+ model->insertRows(varTilemap->currentIndex().row(), 1);
}
void MapUI::on_buttonDeleteColumn_pressed()
{
-
+ model->removeColumns(varTilemap->currentIndex().column(), 1);
}
void MapUI::on_buttonDeleteRow_pressed()
{
-
+ model->removeRows(varTilemap->currentIndex().row(), 1);
}
diff --git a/pokemodr/MapUI.h b/pokemodr/MapUI.h
index de24ce98..92fa7054 100644
--- a/pokemodr/MapUI.h
+++ b/pokemodr/MapUI.h
@@ -53,7 +53,7 @@ class MapUI : public ObjectUI, private Ui::formMap
void on_buttonApply_clicked();
void on_buttonDiscard_clicked();
void on_varName_textChanged(const QString& n);
- void on_boxFlyWarp_toggled(const bool f);
+ void on_boxFlyWarp_toggled();
void on_varFlyWarp_currentIndexChanged(const int f);
void on_varType_currentIndexChanged(const int t);
void on_buttonAddColumn_pressed();
diff --git a/pokemodr/MoveUI.cpp b/pokemodr/MoveUI.cpp
index c513cd7a..47014a04 100644
--- a/pokemodr/MoveUI.cpp
+++ b/pokemodr/MoveUI.cpp
@@ -37,7 +37,7 @@ MoveUI::MoveUI(Move* m, QWidget* parent) :
setupUi(this);
QMetaObject::connectSlotsByName(this);
setObjects(move, move_mod);
- connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
+ connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setDisabled(bool)));
for (int i = 0; i < move->getPokemod()->getTypeCount(); ++i)
{
const Type* t = move->getPokemod()->getType(i);
@@ -78,20 +78,20 @@ void MoveUI::setGui()
void MoveUI::on_buttonApply_clicked()
{
*move = *move_mod;
- emit(setChanged(false));
+ emit(changed(false));
}
void MoveUI::on_buttonDiscard_clicked()
{
*move_mod = *move;
- emit(setChanged(false));
+ emit(changed(false));
setGui();
}
void MoveUI::on_varName_textChanged(const QString& n)
{
move_mod->setName(n);
- emit(setChanged(true));
+ emit(changed(true));
}
void MoveUI::on_varAccuracyNum_valueChanged(const int a)
@@ -99,7 +99,7 @@ void MoveUI::on_varAccuracyNum_valueChanged(const int a)
try
{
move_mod->setAccuracyNum(a);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (Exception& e)
{
@@ -113,7 +113,7 @@ void MoveUI::on_varAccuracyDenom_valueChanged(const int a)
try
{
move_mod->setAccuracyDenom(a);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (Exception& e)
{
@@ -127,7 +127,7 @@ void MoveUI::on_varType_currentIndexChanged(const int t)
try
{
move_mod->setType(varType->itemData(t).toInt());
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
@@ -141,7 +141,7 @@ void MoveUI::on_varPowerPoints_valueChanged(const int p)
try
{
move_mod->setPowerPoints(p);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
@@ -155,7 +155,7 @@ void MoveUI::on_varTarget_currentIndexChanged(const int t)
try
{
move_mod->setTarget(t);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
@@ -169,7 +169,7 @@ void MoveUI::on_varNumTargets_valueChanged(const int n)
try
{
move_mod->setNumTargets(n);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
@@ -183,7 +183,7 @@ void MoveUI::on_varTargetChoice_currentIndexChanged(const int t)
try
{
move_mod->setTargetChoice(t);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
@@ -195,41 +195,41 @@ void MoveUI::on_varTargetChoice_currentIndexChanged(const int t)
void MoveUI::on_varSpecial_toggled(const bool s)
{
move_mod->setSpecial(s);
- emit(setChanged(true));
+ emit(changed(true));
}
void MoveUI::on_varIgnoreAccuracy_toggled(const bool i)
{
move_mod->setIgnoreAccuracy(i);
- emit(setChanged(true));
+ emit(changed(true));
}
void MoveUI::on_varCanFlinch_toggled(const bool c)
{
move_mod->setCanFlinch(c);
- emit(setChanged(true));
+ emit(changed(true));
}
void MoveUI::on_varCanRandom_toggled(const bool c)
{
move_mod->setCanRandom(c);
- emit(setChanged(true));
+ emit(changed(true));
}
void MoveUI::on_varCanSnatch_toggled(const bool c)
{
move_mod->setCanSnatch(c);
- emit(setChanged(true));
+ emit(changed(true));
}
void MoveUI::on_varSound_toggled(const bool s)
{
move_mod->setSound(s);
- emit(setChanged(true));
+ emit(changed(true));
}
void MoveUI::on_varDescription_textChanged()
{
move_mod->setDescription(varDescription->toPlainText());
- emit(setChanged(true));
+ emit(changed(true));
}
diff --git a/pokemodr/NatureUI.cpp b/pokemodr/NatureUI.cpp
index bd008f34..b194d108 100644
--- a/pokemodr/NatureUI.cpp
+++ b/pokemodr/NatureUI.cpp
@@ -39,7 +39,7 @@ NatureUI::NatureUI(Nature* n, QWidget* parent) :
setupUi(this);
QMetaObject::connectSlotsByName(this);
setObjects(nature, nature_mod);
- connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
+ connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setDisabled(bool)));
const bool isSplit = nature->getPokemod()->getRules()->getSpecialSplit();
varStat->addItems((isSplit ? StatRBYStr : StatGSCStr).mid(0, isSplit ? ST_End_RBY : ST_End_GSC));
setGui();
@@ -62,25 +62,25 @@ void NatureUI::setGui()
void NatureUI::on_buttonApply_clicked()
{
*nature = *nature_mod;
- emit(setChanged(false));
+ emit(changed(false));
}
void NatureUI::on_buttonDiscard_clicked()
{
*nature_mod = *nature;
- emit(setChanged(false));
+ emit(changed(false));
setGui();
}
void NatureUI::on_varName_textChanged(const QString& n)
{
nature_mod->setName(n);
- emit(setChanged(true));
+ emit(changed(true));
}
void NatureUI::on_varStatMultiplier_currentIndexChanged()
{
- emit(setChanged(true));
+ emit(changed(true));
setGui();
}
@@ -89,7 +89,7 @@ void NatureUI::on_varStatMultiplierNum_valueChanged(const int s)
try
{
nature_mod->setStatNum(varStat->currentIndex(), s);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (Exception& e)
{
@@ -103,7 +103,7 @@ void NatureUI::on_varStatMultiplierDenom_valueChanged(const int s)
try
{
nature_mod->setStatDenom(varStat->currentIndex(), s);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (Exception& e)
{
@@ -117,7 +117,7 @@ void NatureUI::on_varWeight_valueChanged(const int w)
try
{
nature_mod->setWeight(w);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
diff --git a/pokemodr/ObjectUI.h b/pokemodr/ObjectUI.h
index b75b46a1..691fcb1a 100644
--- a/pokemodr/ObjectUI.h
+++ b/pokemodr/ObjectUI.h
@@ -43,7 +43,6 @@ class ObjectUI : public QWidget
obj_mod(NULL)
{
connect(this, SIGNAL(changed(bool)), parent->parent()->parent()->parent(), SLOT(setChangedTitle(bool)));
- connect(this, SIGNAL(changed(bool)), SLOT(setChanged(bool)));
}
virtual ~ObjectUI()
{
@@ -69,11 +68,6 @@ class ObjectUI : public QWidget
}
signals:
void changed(bool);
- public slots:
- void setChanged(const bool c)
- {
- isChanged = c;
- }
protected:
void setObjects(Object* orig, Object* mod)
{
@@ -83,8 +77,6 @@ class ObjectUI : public QWidget
virtual void setGui() = 0;
- bool isChanged;
-
Object* obj;
Object* obj_mod;
};
diff --git a/pokemodr/PokemodUI.cpp b/pokemodr/PokemodUI.cpp
index dddbf447..0366d663 100644
--- a/pokemodr/PokemodUI.cpp
+++ b/pokemodr/PokemodUI.cpp
@@ -25,8 +25,6 @@
#include <BugCatcher.h>
#include <Exception.h>
-#include <Pokemod.h>
-
#include "PokemodUI.h"
PokemodUI::PokemodUI(Pokemod* p, QWidget* parent) :
@@ -38,7 +36,7 @@ PokemodUI::PokemodUI(Pokemod* p, QWidget* parent) :
setupUi(this);
QMetaObject::connectSlotsByName(this);
setObjects(pokemod, pokemod_mod);
- connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
+ connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setDisabled(bool)));
for (int i = 0; i < pokemod->getPokemod()->getMapCount(); ++i)
{
const Map* m = pokemod->getPokemod()->getMap(i);
@@ -85,32 +83,32 @@ void PokemodUI::setGui()
void PokemodUI::on_buttonApply_clicked()
{
*pokemod = *pokemod_mod;
- emit(setChanged(false));
+ emit(changed(false));
}
void PokemodUI::on_buttonDiscard_clicked()
{
*pokemod_mod = *pokemod;
- emit(setChanged(false));
+ emit(changed(false));
setGui();
}
-void PokemodUI::on_varTitle_textChanged(const QString & t)
+void PokemodUI::on_varTitle_textChanged(const QString& t)
{
pokemod_mod->setTitle(t);
- emit(setChanged(true));
+ emit(changed(true));
}
-void PokemodUI::on_varVersion_textChanged(const QString & v)
+void PokemodUI::on_varVersion_textChanged(const QString& v)
{
pokemod_mod->setVersion(v);
- emit(setChanged(true));
+ emit(changed(true));
}
void PokemodUI::on_varDescription_textChanged()
{
pokemod_mod->setDescription(varDescription->toPlainText());
- emit(setChanged(true));
+ emit(changed(true));
}
void PokemodUI::on_varMap_currentIndexChanged(const int s)
@@ -118,7 +116,7 @@ void PokemodUI::on_varMap_currentIndexChanged(const int s)
try
{
pokemod_mod->setStartMap(s);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
@@ -132,7 +130,7 @@ void PokemodUI::on_varWarp_currentIndexChanged(const int s)
try
{
pokemod_mod->setStartWarp(s);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
@@ -141,14 +139,14 @@ void PokemodUI::on_varWarp_currentIndexChanged(const int s)
}
}
-void PokemodUI::on_varSuperPCUsername_textChanged(const QString & u)
+void PokemodUI::on_varSuperPCUsername_textChanged(const QString& u)
{
pokemod_mod->setSuperPCUname(u);
- emit(setChanged(true));
+ emit(changed(true));
}
-void PokemodUI::on_varSuperPCPassword_textChanged(const QString & p)
+void PokemodUI::on_varSuperPCPassword_textChanged(const QString& p)
{
pokemod_mod->setSuperPCPasswd(p);
- emit(setChanged(true));
+ emit(changed(true));
}
diff --git a/pokemodr/RulesUI.cpp b/pokemodr/RulesUI.cpp
index cec7fc3a..621cdd1f 100644
--- a/pokemodr/RulesUI.cpp
+++ b/pokemodr/RulesUI.cpp
@@ -35,7 +35,7 @@ RulesUI::RulesUI(Rules* r, QWidget* parent) :
setupUi(this);
QMetaObject::connectSlotsByName(this);
setObjects(rules, rules_mod);
- connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
+ connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setDisabled(bool)));
setGui();
}
@@ -83,62 +83,62 @@ void RulesUI::setGui()
void RulesUI::on_buttonApply_clicked()
{
*rules = *rules_mod;
- emit(setChanged(false));
+ emit(changed(false));
}
void RulesUI::on_buttonDiscard_clicked()
{
*rules_mod = *rules;
- emit(setChanged(false));
+ emit(changed(false));
setGui();
}
void RulesUI::on_boxGenders_toggled(const bool g)
{
rules_mod->setGenderAllowed(g);
- emit(setChanged(true));
+ emit(changed(true));
}
void RulesUI::on_varBreeding_toggled(const bool b)
{
rules_mod->setBreedingAllowed(b);
- emit(setChanged(true));
+ emit(changed(true));
}
void RulesUI::on_varHeldItems_valueChanged(const int h)
{
rules_mod->setHoldItems(h);
- emit(setChanged(true));
+ emit(changed(true));
}
void RulesUI::on_boxCriticalDomains_toggled(const bool c)
{
rules_mod->setCriticalDomains(c);
- emit(setChanged(true));
+ emit(changed(true));
}
void RulesUI::on_boxAllowAbilities_toggled(const bool a)
{
rules_mod->setAbilityAllowed(a);
- emit(setChanged(true));
+ emit(changed(true));
}
void RulesUI::on_boxAllowNatures_toggled(const bool a)
{
rules_mod->setNatureAllowed(a);
- emit(setChanged(true));
+ emit(changed(true));
}
void RulesUI::on_varBoxes_valueChanged(const int b)
{
rules_mod->setNumBoxes(b);
- emit(setChanged(true));
+ emit(changed(true));
}
void RulesUI::on_varBoxSize_valueChanged(const int b)
{
rules_mod->setBoxSize(b);
- emit(setChanged(true));
+ emit(changed(true));
}
void RulesUI::on_varMaxParty_valueChanged(const int m)
@@ -146,7 +146,7 @@ void RulesUI::on_varMaxParty_valueChanged(const int m)
rules_mod->setMaxParty(m);
varMaxFight->setMaximum(m);
setGui();
- emit(setChanged(true));
+ emit(changed(true));
}
void RulesUI::on_varMaxFight_valueChanged(const int m)
@@ -154,7 +154,7 @@ void RulesUI::on_varMaxFight_valueChanged(const int m)
try
{
rules_mod->setMaxFight(m);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
@@ -168,7 +168,7 @@ void RulesUI::on_varMaxMoves_valueChanged(const int m)
try
{
rules_mod->setMaxMoves(m);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
@@ -182,7 +182,7 @@ void RulesUI::on_varMaxLevel_valueChanged(const int m)
try
{
rules_mod->setMaxLevel(m);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
@@ -194,25 +194,25 @@ void RulesUI::on_varMaxLevel_valueChanged(const int m)
void RulesUI::on_varMaxMoney_valueChanged(const int m)
{
rules_mod->setMaxMoney(m);
- emit(setChanged(true));
+ emit(changed(true));
}
void RulesUI::on_boxHardCash_toggled(const bool h)
{
rules_mod->setHardCash(h);
- emit(setChanged(true));
+ emit(changed(true));
}
void RulesUI::on_boxSplitSpecial_toggled(const bool s)
{
rules_mod->setSpecialSplit(s);
- emit(setChanged(true));
+ emit(changed(true));
}
void RulesUI::on_varSplitSpecialDV_toggled(const bool s)
{
rules_mod->setSpecialDVSplit(s);
- emit(setChanged(true));
+ emit(changed(true));
}
void RulesUI::on_varMaxDV_currentIndexChanged(const QString& m)
@@ -223,7 +223,7 @@ void RulesUI::on_varMaxDV_currentIndexChanged(const QString& m)
rules_mod->setMaxDVValue(Rules::DVStr.indexOf(m));
else
throw(BoundsException("RulesUI", "maxDVValue"));
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
@@ -235,31 +235,31 @@ void RulesUI::on_varMaxDV_currentIndexChanged(const QString& m)
void RulesUI::on_boxHappiness_toggled(const bool h)
{
rules_mod->setHappiness(h);
- emit(setChanged(true));
+ emit(changed(true));
}
void RulesUI::on_varFaintLoss_valueChanged(const int f)
{
rules_mod->setHappyFaintLoss(f);
- emit(setChanged(true));
+ emit(changed(true));
}
void RulesUI::on_varLevelGain_valueChanged(const int l)
{
rules_mod->setHappyLevelGain(l);
- emit(setChanged(true));
+ emit(changed(true));
}
void RulesUI::on_varNumSteps_valueChanged(const int n)
{
rules_mod->setHappySteps(n);
- emit(setChanged(true));
+ emit(changed(true));
}
void RulesUI::on_boxEffortValues_toggled(const bool e)
{
rules_mod->setEffortValuesAllowed(e);
- emit(setChanged(true));
+ emit(changed(true));
}
void RulesUI::on_varMaxEV_valueChanged(const int m)
@@ -268,7 +268,7 @@ void RulesUI::on_varMaxEV_valueChanged(const int m)
{
rules_mod->setMaxTotalEV(m);
varMaxEVPerStat->setMaximum(m);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
@@ -282,7 +282,7 @@ void RulesUI::on_varMaxEVPerStat_valueChanged(const int m)
try
{
rules_mod->setMaxEVPerStat(m);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
@@ -296,7 +296,7 @@ void RulesUI::on_varPokerusNum_valueChanged(const int p)
try
{
rules_mod->setPokerusChanceNum(p);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (Exception& e)
{
@@ -310,7 +310,7 @@ void RulesUI::on_varPokerusDenom_valueChanged(const int p)
try
{
rules_mod->setPokerusChanceDenom(p);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (Exception& e)
{
diff --git a/pokemodr/SpeciesAbilityUI.cpp b/pokemodr/SpeciesAbilityUI.cpp
index f055a776..930185eb 100644
--- a/pokemodr/SpeciesAbilityUI.cpp
+++ b/pokemodr/SpeciesAbilityUI.cpp
@@ -40,7 +40,7 @@ SpeciesAbilityUI::SpeciesAbilityUI(SpeciesAbility* s, QWidget* parent) :
setupUi(this);
QMetaObject::connectSlotsByName(this);
setObjects(speciesAbility, speciesAbility_mod);
- connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
+ connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setDisabled(bool)));
for (int i = 0; i < speciesAbility->getPokemod()->getAbilityCount(); ++i)
{
const Ability* a = speciesAbility->getPokemod()->getAbility(i);
@@ -64,13 +64,13 @@ void SpeciesAbilityUI::setGui()
void SpeciesAbilityUI::on_buttonApply_clicked()
{
*speciesAbility = *speciesAbility_mod;
- emit(setChanged(false));
+ emit(changed(false));
}
void SpeciesAbilityUI::on_buttonDiscard_clicked()
{
*speciesAbility_mod = *speciesAbility;
- emit(setChanged(false));
+ emit(changed(false));
setGui();
}
@@ -79,7 +79,7 @@ void SpeciesAbilityUI::on_varAbility_currentIndexChanged(const int m)
try
{
speciesAbility_mod->setAbility(varAbility->itemData(m).toInt());
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
@@ -93,7 +93,7 @@ void SpeciesAbilityUI::on_varWeight_valueChanged(const int w)
try
{
speciesAbility_mod->setWeight(w);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
diff --git a/pokemodr/SpeciesEvolutionUI.cpp b/pokemodr/SpeciesEvolutionUI.cpp
index be8857e2..e82c98ff 100644
--- a/pokemodr/SpeciesEvolutionUI.cpp
+++ b/pokemodr/SpeciesEvolutionUI.cpp
@@ -42,7 +42,7 @@ SpeciesEvolutionUI::SpeciesEvolutionUI(SpeciesEvolution* s, QWidget* parent) :
setupUi(this);
QMetaObject::connectSlotsByName(this);
setObjects(speciesEvolution, speciesEvolution_mod);
- connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
+ connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setDisabled(bool)));
for (int i = 0; i < speciesEvolution->getPokemod()->getSpeciesCount(); ++i)
{
const Species* s = speciesEvolution->getPokemod()->getSpecies(i);
@@ -131,13 +131,13 @@ void SpeciesEvolutionUI::setGui()
void SpeciesEvolutionUI::on_buttonApply_clicked()
{
*speciesEvolution = *speciesEvolution_mod;
- emit(setChanged(false));
+ emit(changed(false));
}
void SpeciesEvolutionUI::on_buttonDiscard_clicked()
{
*speciesEvolution_mod = *speciesEvolution;
- emit(setChanged(false));
+ emit(changed(false));
setGui();
}
@@ -146,7 +146,7 @@ void SpeciesEvolutionUI::on_varSpecies_currentIndexChanged(const int s)
try
{
speciesEvolution_mod->setSpecies(varSpecies->itemData(s).toInt());
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
@@ -160,7 +160,7 @@ void SpeciesEvolutionUI::on_varStyle_currentIndexChanged(const int s)
try
{
speciesEvolution_mod->setStyle(s);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
@@ -177,7 +177,7 @@ void SpeciesEvolutionUI::on_varVal1_currentIndexChanged(const int v)
speciesEvolution_mod->setVal1(varVal1->itemData(v).toInt());
else
speciesEvolution_mod->setVal1(v);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (Exception& e)
{
@@ -191,7 +191,7 @@ void SpeciesEvolutionUI::on_varVal2_currentIndexChanged(const int v)
try
{
speciesEvolution_mod->setVal3(v);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (Exception& e)
{
@@ -205,7 +205,7 @@ void SpeciesEvolutionUI::on_varVal3_valueChanged(const int v)
try
{
speciesEvolution_mod->setVal3(v);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (UnusedException& e)
{
@@ -219,7 +219,7 @@ void SpeciesEvolutionUI::on_varLevel_valueChanged(const int l)
try
{
speciesEvolution_mod->setLevel(l);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
diff --git a/pokemodr/SpeciesItemUI.cpp b/pokemodr/SpeciesItemUI.cpp
index c6c5aa46..160eabb9 100644
--- a/pokemodr/SpeciesItemUI.cpp
+++ b/pokemodr/SpeciesItemUI.cpp
@@ -40,7 +40,7 @@ SpeciesItemUI::SpeciesItemUI(SpeciesItem* s, QWidget* parent) :
setupUi(this);
QMetaObject::connectSlotsByName(this);
setObjects(speciesItem, speciesItem_mod);
- connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
+ connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setDisabled(bool)));
for (int i = 0; i < speciesItem->getPokemod()->getItemCount(); ++i)
{
const Item* it = speciesItem->getPokemod()->getItem(i);
@@ -64,13 +64,13 @@ void SpeciesItemUI::setGui()
void SpeciesItemUI::on_buttonApply_clicked()
{
*speciesItem = *speciesItem_mod;
- emit(setChanged(false));
+ emit(changed(false));
}
void SpeciesItemUI::on_buttonDiscard_clicked()
{
*speciesItem_mod = *speciesItem;
- emit(setChanged(false));
+ emit(changed(false));
setGui();
}
@@ -79,7 +79,7 @@ void SpeciesItemUI::on_varItem_currentIndexChanged(const int i)
try
{
speciesItem_mod->setItem(varItem->itemData(i).toInt());
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
@@ -93,7 +93,7 @@ void SpeciesItemUI::on_varWeight_valueChanged(const int w)
try
{
speciesItem_mod->setWeight(w);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
diff --git a/pokemodr/SpeciesMoveUI.cpp b/pokemodr/SpeciesMoveUI.cpp
index 5bbbe4d9..3645efc7 100644
--- a/pokemodr/SpeciesMoveUI.cpp
+++ b/pokemodr/SpeciesMoveUI.cpp
@@ -40,7 +40,7 @@ SpeciesMoveUI::SpeciesMoveUI(SpeciesMove* s, QWidget* parent) :
setupUi(this);
QMetaObject::connectSlotsByName(this);
setObjects(speciesMove, speciesMove_mod);
- connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
+ connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setDisabled(bool)));
for (int i = 0; i < speciesMove->getPokemod()->getMoveCount(); ++i)
{
const Move* m = speciesMove->getPokemod()->getMove(i);
@@ -67,13 +67,13 @@ void SpeciesMoveUI::setGui()
void SpeciesMoveUI::on_buttonApply_clicked()
{
*speciesMove = *speciesMove_mod;
- emit(setChanged(false));
+ emit(changed(false));
}
void SpeciesMoveUI::on_buttonDiscard_clicked()
{
*speciesMove_mod = *speciesMove;
- emit(setChanged(false));
+ emit(changed(false));
setGui();
}
@@ -82,7 +82,7 @@ void SpeciesMoveUI::on_varMove_currentIndexChanged(const int m)
try
{
speciesMove_mod->setMove(varMove->itemData(m).toInt());
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
@@ -96,7 +96,7 @@ void SpeciesMoveUI::on_varLevel_valueChanged(const int l)
try
{
speciesMove_mod->setLevel(l);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
@@ -110,7 +110,7 @@ void SpeciesMoveUI::on_varWildLevel_valueChanged(const int w)
try
{
speciesMove_mod->setWild(w);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
diff --git a/pokemodr/SpeciesUI.cpp b/pokemodr/SpeciesUI.cpp
index bd378241..e3a0444a 100644
--- a/pokemodr/SpeciesUI.cpp
+++ b/pokemodr/SpeciesUI.cpp
@@ -44,7 +44,7 @@ SpeciesUI::SpeciesUI(Species* s, QWidget* parent) :
setupUi(this);
QMetaObject::connectSlotsByName(this);
setObjects(species, species_mod);
- connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
+ connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setDisabled(bool)));
const bool isSplit = species->getPokemod()->getRules()->getSpecialSplit();
varBaseStat->addItems((isSplit ? StatGSCStr : StatRBYStr).mid(0, isSplit ? ST_End_GSC : ST_End_RBY));
varEVStat->addItems((isSplit ? StatGSCStr : StatRBYStr).mid(0, isSplit ? ST_End_GSC : ST_End_RBY));
@@ -179,25 +179,25 @@ void SpeciesUI::setGui()
void SpeciesUI::on_buttonApply_clicked()
{
*species = *species_mod;
- emit(setChanged(false));
+ emit(changed(false));
}
void SpeciesUI::on_buttonDiscard_clicked()
{
*species_mod = *species;
- emit(setChanged(false));
+ emit(changed(false));
setGui();
}
-void SpeciesUI::on_varName_textChanged(const QString & n)
+void SpeciesUI::on_varName_textChanged(const QString& n)
{
species_mod->setName(n);
- emit(setChanged(true));
+ emit(changed(true));
}
void SpeciesUI::on_varBaseStat_currentIndexChanged()
{
- emit(setChanged(true));
+ emit(changed(true));
setGui();
}
@@ -206,7 +206,7 @@ void SpeciesUI::on_varBaseStatValue_valueChanged(const int b)
try
{
species_mod->setBaseStat(varBaseStat->currentIndex(), b);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
@@ -217,7 +217,7 @@ void SpeciesUI::on_varBaseStatValue_valueChanged(const int b)
void SpeciesUI::on_varEVStat_currentIndexChanged()
{
- emit(setChanged(true));
+ emit(changed(true));
setGui();
}
@@ -226,7 +226,7 @@ void SpeciesUI::on_varEffortValue_valueChanged(const int e)
try
{
species_mod->setEffortValue(varEVStat->currentIndex(), e);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
@@ -240,7 +240,7 @@ void SpeciesUI::on_varGrowth_currentIndexChanged(const int g)
try
{
species_mod->setGrowth(g);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
@@ -252,13 +252,13 @@ void SpeciesUI::on_varGrowth_currentIndexChanged(const int g)
void SpeciesUI::on_varExperienceValue_valueChanged(const int e)
{
species_mod->setExperienceValue(e);
- emit(setChanged(true));
+ emit(changed(true));
}
void SpeciesUI::on_varCatchValue_valueChanged(const int c)
{
species_mod->setCatchValue(c);
- emit(setChanged(true));
+ emit(changed(true));
}
void SpeciesUI::on_varRunChanceNum_valueChanged(const int r)
@@ -266,7 +266,7 @@ void SpeciesUI::on_varRunChanceNum_valueChanged(const int r)
try
{
species_mod->setRunChanceNum(r);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (Exception& e)
{
@@ -280,7 +280,7 @@ void SpeciesUI::on_varRunChanceDenom_valueChanged(const int r)
try
{
species_mod->setRunChanceDenom(r);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (Exception& e)
{
@@ -294,7 +294,7 @@ void SpeciesUI::on_varItemChanceNum_valueChanged(const int i)
try
{
species_mod->setItemChanceNum(i);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (Exception& e)
{
@@ -308,7 +308,7 @@ void SpeciesUI::on_varItemChanceDenom_valueChanged(const int i)
try
{
species_mod->setItemChanceDenom(i);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (Exception& e)
{
@@ -321,19 +321,19 @@ void SpeciesUI::on_varItemChanceDenom_valueChanged(const int i)
void SpeciesUI::on_varPokedexNumber_valueChanged(const int p)
{
species_mod->setPokedexNumber(p);
- emit(setChanged(true));
+ emit(changed(true));
}
void SpeciesUI::on_varWeight_valueChanged(const int w)
{
species_mod->setWeight(w);
- emit(setChanged(true));
+ emit(changed(true));
}
void SpeciesUI::on_varHeightFeet_valueChanged(const int h)
{
species_mod->setHeightFeet(h);
- emit(setChanged(true));
+ emit(changed(true));
}
void SpeciesUI::on_varHeightInches_valueChanged(const int h)
@@ -341,7 +341,7 @@ void SpeciesUI::on_varHeightInches_valueChanged(const int h)
try
{
species_mod->setHeightInches(h);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
@@ -353,7 +353,7 @@ void SpeciesUI::on_varHeightInches_valueChanged(const int h)
void SpeciesUI::on_varPokedexEntry_textChanged()
{
species_mod->setPokedexEntry(varPokedexEntry->toPlainText());
- emit(setChanged(true));
+ emit(changed(true));
}
void SpeciesUI::on_varFrontMaleSprite_pressed()
@@ -439,7 +439,7 @@ void SpeciesUI::on_varListSprite_pressed()
void SpeciesUI::on_boxGenderChance_toggled(const bool g)
{
species_mod->setGenderFactor(g ? 1 : -1, 1);
- emit(setChanged(true));
+ emit(changed(true));
setGui();
}
@@ -448,7 +448,7 @@ void SpeciesUI::on_varGenderChanceNum_valueChanged(const int g)
try
{
species_mod->setGenderFactorNum(g);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (Exception& e)
{
@@ -462,7 +462,7 @@ void SpeciesUI::on_varGenderChanceDenom_valueChanged(const int g)
try
{
species_mod->setGenderFactorDenom(g);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (Exception& e)
{
@@ -476,7 +476,7 @@ void SpeciesUI::on_varEggSpecies_currentIndexChanged(const int e)
try
{
species_mod->setEggSpecies(varEggSpecies->itemData(e).toInt());
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
@@ -488,13 +488,13 @@ void SpeciesUI::on_varEggSpecies_currentIndexChanged(const int e)
void SpeciesUI::on_varEggSteps_valueChanged(const int e)
{
species_mod->setEggSteps(e);
- emit(setChanged(true));
+ emit(changed(true));
}
void SpeciesUI::on_varNidoranGroup_valueChanged(const int n)
{
species_mod->setNidoranGroup(n);
- emit(setChanged(true));
+ emit(changed(true));
}
void SpeciesUI::on_varTypes_itemSelectionChanged()
@@ -506,7 +506,7 @@ void SpeciesUI::on_varTypes_itemSelectionChanged()
const QListWidgetItem* lwi = varTypes->item(i);
species_mod->setType(lwi->data(Qt::UserRole).toInt(), lwi->isSelected());
}
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
@@ -524,7 +524,7 @@ void SpeciesUI::on_varEggGroups_itemSelectionChanged()
const QListWidgetItem* lwi = varEggGroups->item(i);
species_mod->setEggGroup(lwi->data(Qt::UserRole).toInt(), lwi->isSelected());
}
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
diff --git a/pokemodr/StoreUI.cpp b/pokemodr/StoreUI.cpp
index eae6c201..7259058c 100644
--- a/pokemodr/StoreUI.cpp
+++ b/pokemodr/StoreUI.cpp
@@ -41,7 +41,7 @@ StoreUI::StoreUI(Store* s, QWidget* parent) :
setupUi(this);
QMetaObject::connectSlotsByName(this);
setObjects(store, store_mod);
- connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
+ connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setDisabled(bool)));
for (int i = 0; i < store->getPokemod()->getItemCount(); ++i)
{
const Item* it = store->getPokemod()->getItem(i);
@@ -69,20 +69,20 @@ void StoreUI::setGui()
void StoreUI::on_buttonApply_clicked()
{
*store = *store_mod;
- emit(setChanged(false));
+ emit(changed(false));
}
void StoreUI::on_buttonDiscard_clicked()
{
*store_mod = *store;
- emit(setChanged(false));
+ emit(changed(false));
setGui();
}
void StoreUI::on_varName_textChanged(const QString& n)
{
store_mod->setName(n);
- emit(setChanged(true));
+ emit(changed(true));
}
void StoreUI::on_varItems_itemSelectionChanged()
@@ -94,7 +94,7 @@ void StoreUI::on_varItems_itemSelectionChanged()
const QListWidgetItem* lwi = varItems->item(i);
store_mod->setItem(lwi->data(Qt::UserRole).toInt(), lwi->isSelected());
}
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
diff --git a/pokemodr/TileUI.cpp b/pokemodr/TileUI.cpp
index 6a22bd32..f4d033d1 100644
--- a/pokemodr/TileUI.cpp
+++ b/pokemodr/TileUI.cpp
@@ -43,7 +43,7 @@ TileUI::TileUI(Tile* t, QWidget* parent) :
setupUi(this);
QMetaObject::connectSlotsByName(this);
setObjects(tile, tile_mod);
- connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
+ connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setDisabled(bool)));
varAccessibility->addItems(DirectionStr.mid(0, 4));
varHMType->addItems(HMStr);
for (int i = 0; i < tile->getPokemod()->getTileCount(); ++i)
@@ -95,20 +95,20 @@ void TileUI::setGui()
void TileUI::on_buttonApply_clicked()
{
*tile = *tile_mod;
- emit(setChanged(false));
+ emit(changed(false));
}
void TileUI::on_buttonDiscard_clicked()
{
*tile_mod = *tile;
- emit(setChanged(false));
+ emit(changed(false));
setGui();
}
void TileUI::on_varName_textChanged(const QString& n)
{
tile_mod->setName(n);
- emit(setChanged(true));
+ emit(changed(true));
}
void TileUI::on_varImage_pressed()
@@ -132,7 +132,7 @@ void TileUI::on_varWildNum_valueChanged(const int m)
try
{
tile_mod->setWildChanceNum(m);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
@@ -146,7 +146,7 @@ void TileUI::on_varWildDenom_valueChanged(const int m)
try
{
tile_mod->setWildChanceDenom(m);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
@@ -164,7 +164,7 @@ void TileUI::on_varAccessibility_itemSelectionChanged()
const QListWidgetItem* lwi = varAccessibility->item(i);
tile_mod->setFrom(lwi->data(Qt::UserRole).toInt(), lwi->isSelected());
}
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
@@ -180,7 +180,7 @@ void TileUI::on_boxHMs_toggled(const bool h)
varHMType->setCurrentIndex(-1);
varHMUnder->setCurrentIndex(-1);
setGui();
- emit(setChanged(true));
+ emit(changed(true));
}
}
@@ -217,7 +217,7 @@ void TileUI::on_boxForces_toggled(const bool f)
varForce->setCurrentIndex(-1);
varDirection->setCurrentIndex(-1);
setGui();
- emit(setChanged(true));
+ emit(changed(true));
}
}
diff --git a/pokemodr/TimeUI.cpp b/pokemodr/TimeUI.cpp
index 692a6c03..38cf7803 100644
--- a/pokemodr/TimeUI.cpp
+++ b/pokemodr/TimeUI.cpp
@@ -35,7 +35,7 @@ TimeUI::TimeUI(Time* t, QWidget* parent) :
setupUi(this);
QMetaObject::connectSlotsByName(this);
setObjects(time, time_mod);
- connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
+ connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setDisabled(bool)));
setGui();
}
@@ -52,20 +52,20 @@ void TimeUI::setGui()
void TimeUI::on_buttonApply_clicked()
{
*time = *time_mod;
- emit(setChanged(false));
+ emit(changed(false));
}
void TimeUI::on_buttonDiscard_clicked()
{
*time_mod = *time;
- emit(setChanged(false));
+ emit(changed(false));
setGui();
}
void TimeUI::on_varName_textChanged(const QString& n)
{
time_mod->setName(n);
- emit(setChanged(true));
+ emit(changed(true));
}
void TimeUI::on_varTime_timeChanged(const QTime& t)
@@ -74,7 +74,7 @@ void TimeUI::on_varTime_timeChanged(const QTime& t)
{
time_mod->setStartHour(t.hour());
time_mod->setStartMinute(t.minute());
- emit(setChanged(true));
+ emit(changed(true));
}
catch (BoundsException& e)
{
diff --git a/pokemodr/TypeUI.cpp b/pokemodr/TypeUI.cpp
index 5982a3ef..fee8860b 100644
--- a/pokemodr/TypeUI.cpp
+++ b/pokemodr/TypeUI.cpp
@@ -36,7 +36,7 @@ TypeUI::TypeUI(Type* t, QWidget* parent) :
setupUi(this);
QMetaObject::connectSlotsByName(this);
setObjects(type, type_mod);
- connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
+ connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setDisabled(bool)));
setGui();
}
@@ -56,13 +56,13 @@ void TypeUI::setGui()
void TypeUI::on_buttonApply_clicked()
{
*type = *type_mod;
- emit(setChanged(false));
+ emit(changed(false));
}
void TypeUI::on_buttonDiscard_clicked()
{
*type_mod = *type;
- emit(setChanged(false));
+ emit(changed(false));
setGui();
}
@@ -76,7 +76,7 @@ void TypeUI::on_varSTABNum_valueChanged(const int s)
try
{
type_mod->setStabNum(s);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (Exception& e)
{
@@ -90,7 +90,7 @@ void TypeUI::on_varSTABDenom_valueChanged(const int s)
try
{
type_mod->setStabDenom(s);
- emit(setChanged(true));
+ emit(changed(true));
}
catch (Exception& e)
{
diff --git a/pokemodr/pokemodr.pro b/pokemodr/pokemodr.pro
index 3b41589c..77545915 100644
--- a/pokemodr/pokemodr.pro
+++ b/pokemodr/pokemodr.pro
@@ -46,104 +46,104 @@ win32 {
}
}
-CONFIG += qt \
-gui \
-warn_on \
-exceptions
+CONFIG += qt gui warn_on exceptions
+
+TARGETDEPS += ../../lib/libpokemod.so ../../lib/libgeneral.so
+
+INCLUDEPATH += ../pokemod ../general
-TARGETDEPS += ../../lib/libpokemod.so \
-../../lib/libgeneral.so
-INCLUDEPATH += ../pokemod \
-../general
SOURCES += AbilityUI.cpp \
-AuthorUI.cpp \
-BadgeUI.cpp \
-CoinListObjectUI.cpp \
-CoinListUI.cpp \
-EggGroupUI.cpp \
-ImageDialog.cpp \
-ItemTypeUI.cpp \
-ItemUI.cpp \
-MapUI.cpp \
-MoveUI.cpp \
-NatureUI.cpp \
-PokeModr.cpp \
-PokeModrUI.cpp \
-RulesUI.cpp \
-SpeciesAbilityUI.cpp \
-SpeciesEvolutionUI.cpp \
-SpeciesItemUI.cpp \
-SpeciesMoveUI.cpp \
-SpeciesUI.cpp \
-StoreUI.cpp \
-TileDelegate.cpp \
-TilemapModel.cpp \
-TileUI.cpp \
-TimeUI.cpp \
-TypeUI.cpp \
+ AuthorUI.cpp \
+ BadgeUI.cpp \
+ CoinListUI.cpp \
+ CoinListObjectUI.cpp \
+ EggGroupUI.cpp \
+ ImageDialog.cpp \
+ ItemUI.cpp \
+ ItemTypeUI.cpp \
+ MapUI.cpp \
+ MoveUI.cpp \
+ NatureUI.cpp \
PokemodUI.cpp \
- SkinsUI.cpp
+ PokeModr.cpp \
+ PokeModrUI.cpp \
+ RulesUI.cpp \
+ SkinsUI.cpp \
+ SpeciesUI.cpp \
+ SpeciesAbilityUI.cpp \
+ SpeciesEvolutionUI.cpp \
+ SpeciesItemUI.cpp \
+ SpeciesMoveUI.cpp \
+ StoreUI.cpp \
+ TileDelegate.cpp \
+ TilemapModel.cpp \
+ TileUI.cpp \
+ TimeUI.cpp \
+ TypeUI.cpp
+
HEADERS += AbilityUI.h \
-AuthorUI.h \
-BadgeUI.h \
-CoinListObjectUI.h \
-CoinListUI.h \
-EggGroupUI.h \
-ImageDialog.h \
-ItemTypeUI.h \
-ItemUI.h \
-MapUI.h \
-MoveUI.h \
-NatureUI.h \
-ObjectUI.h \
-PokeModr.h \
-PokeModrUI.h \
-PokeModTreeItem.h \
-RulesUI.h \
-SpeciesAbilityUI.h \
-SpeciesEvolutionUI.h \
-SpeciesItemUI.h \
-SpeciesMoveUI.h \
-SpeciesUI.h \
-StoreUI.h \
-TileDelegate.h \
-TilemapModel.h \
-TileUI.h \
-TimeUI.h \
-TypeUI.h \
- SkinsUI.h
-FORMS += gui/abilityeffect.ui \
-gui/ability.ui \
-gui/author.ui \
-gui/badge.ui \
-gui/coinlistobject.ui \
-gui/coinlist.ui \
-gui/dialog.ui \
-gui/egggroup.ui \
-gui/itemeffect.ui \
-gui/itemtype.ui \
-gui/item.ui \
-gui/mapeffect.ui \
-gui/maptrainerteammember.ui \
-gui/maptrainer.ui \
-gui/map.ui \
-gui/mapwarp.ui \
-gui/mapwildlistencounter.ui \
-gui/mapwildlist.ui \
-gui/moveeffect.ui \
-gui/move.ui \
-gui/nature.ui \
-gui/pokemodr.ui \
-gui/pokemod.ui \
-gui/rules.ui \
-gui/skins.ui \
-gui/speciesability.ui \
-gui/speciesevolution.ui \
-gui/speciesitem.ui \
-gui/speciesmove.ui \
-gui/species.ui \
-gui/store.ui \
-gui/tile.ui \
-gui/time.ui \
-gui/typechart.ui \
-gui/type.ui \
+ AuthorUI.h \
+ BadgeUI.h \
+ CoinListUI.h \
+ CoinListObjectUI.h \
+ EggGroupUI.h \
+ ImageDialog.h \
+ ItemUI.h \
+ ItemTypeUI.h \
+ MapUI.h \
+ MoveUI.h \
+ NatureUI.h \
+ ObjectUI.h \
+ PokemodUI.h \
+ PokeModr.h \
+ PokeModrUI.h \
+ PokeModTreeItem.h \
+ RulesUI.h \
+ SkinsUI.h \
+ SpeciesUI.h \
+ SpeciesAbilityUI.h \
+ SpeciesEvolutionUI.h \
+ SpeciesItemUI.h \
+ SpeciesMoveUI.h \
+ StoreUI.h \
+ TileDelegate.h \
+ TilemapModel.h \
+ TileUI.h \
+ TimeUI.h \
+ TypeUI.h
+
+FORMS += gui/ability.ui \
+ gui/abilityeffect.ui \
+ gui/author.ui \
+ gui/badge.ui \
+ gui/coinlist.ui \
+ gui/coinlistobject.ui \
+ gui/dialog.ui \
+ gui/egggroup.ui \
+ gui/item.ui \
+ gui/itemeffect.ui \
+ gui/itemtype.ui \
+ gui/map.ui \
+ gui/mapeffect.ui \
+ gui/maptrainer.ui \
+ gui/maptrainerteammember.ui \
+ gui/mapwarp.ui \
+ gui/mapwildlist.ui \
+ gui/mapwildlistencounter.ui \
+ gui/move.ui \
+ gui/moveeffect.ui \
+ gui/nature.ui \
+ gui/pokemod.ui \
+ gui/pokemodr.ui \
+ gui/rules.ui \
+ gui/skins.ui \
+ gui/species.ui \
+ gui/speciesability.ui \
+ gui/speciesevolution.ui \
+ gui/speciesitem.ui \
+ gui/speciesmove.ui \
+ gui/store.ui \
+ gui/tile.ui \
+ gui/time.ui \
+ gui/type.ui \
+ gui/typechart.ui
generated by cgit (git 2.34.1) at 2024-10-07 20:23:42 +0000