[FIX] Refactored the apply/discard buttons out of the widgets

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

101 files changed, 222 insertions, 1076 deletions

diff --git a/Changelog b/Changelog
index 5519cd5e..ae50d9b6 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,11 @@
 -----------------
+Rev:  137
+Date: 15 May 2008
+User: MathStuf
+-----------------
+[FIX] Refactored the apply/discard buttons out of the widgets
+
+-----------------
 Rev:  136
 Date: 15 May 2008
 User: MathStuf
diff --git a/pokemodr/AbilityUI.cpp b/pokemodr/AbilityUI.cpp
index 79a88362..14e5f0cb 100644
--- a/pokemodr/AbilityUI.cpp
+++ b/pokemodr/AbilityUI.cpp
@@ -27,7 +27,6 @@ AbilityUI::AbilityUI(Ability* ability, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(ability, new Ability(*ability));
-    connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(setGui()));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(errorMessage(const QString&)));
     connect(modified(), SIGNAL(warning(const QString&)), this, SLOT(warningMessage(const QString&)));
@@ -44,13 +43,13 @@ void AbilityUI::setGui()
     varName->setText(static_cast<Ability*>(modified())->name());
 }
 
-void AbilityUI::on_buttonApply_clicked()
+void AbilityUI::apply()
 {
     *static_cast<Ability*>(original()) = *static_cast<Ability*>(modified());
     emit(changed(false));
 }
 
-void AbilityUI::on_buttonDiscard_clicked()
+void AbilityUI::discard()
 {
     *static_cast<Ability*>(modified()) = *static_cast<Ability*>(original());
     setGui();
diff --git a/pokemodr/AbilityUI.h b/pokemodr/AbilityUI.h
index d2b41073..bf838268 100644
--- a/pokemodr/AbilityUI.h
+++ b/pokemodr/AbilityUI.h
@@ -35,8 +35,9 @@ class AbilityUI : public ObjectUI, private Ui::formAbility
         AbilityUI(Ability* ability, QWidget* parent);
         ~AbilityUI();
     public slots:
-        void on_buttonApply_clicked();
-        void on_buttonDiscard_clicked();
+        void apply();
+        void discard();
+    protected slots:
         void on_varName_textChanged(const QString& name);
     private slots:
         void setGui();
diff --git a/pokemodr/AuthorUI.cpp b/pokemodr/AuthorUI.cpp
index d61a57b4..45020256 100644
--- a/pokemodr/AuthorUI.cpp
+++ b/pokemodr/AuthorUI.cpp
@@ -27,7 +27,6 @@ AuthorUI::AuthorUI(Author* author, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(author, new Author(*author));
-    connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(setGui()));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(errorMessage(const QString&)));
     connect(modified(), SIGNAL(warning(const QString&)), this, SLOT(warningMessage(const QString&)));
@@ -46,13 +45,13 @@ void AuthorUI::setGui()
     varRole->setText(static_cast<Author*>(modified())->role());
 }
 
-void AuthorUI::on_buttonApply_clicked()
+void AuthorUI::apply()
 {
     *static_cast<Author*>(original()) = *static_cast<Author*>(modified());
     emit(changed(false));
 }
 
-void AuthorUI::on_buttonDiscard_clicked()
+void AuthorUI::discard()
 {
     *static_cast<Author*>(modified()) = *static_cast<Author*>(original());
     setGui();
diff --git a/pokemodr/AuthorUI.h b/pokemodr/AuthorUI.h
index dbaf8404..9d8cf8aa 100644
--- a/pokemodr/AuthorUI.h
+++ b/pokemodr/AuthorUI.h
@@ -35,8 +35,9 @@ class AuthorUI : public ObjectUI, private Ui::formAuthor
         AuthorUI(Author* author, QWidget* parent);
         ~AuthorUI();
     public slots:
-        void on_buttonApply_clicked();
-        void on_buttonDiscard_clicked();
+        void apply();
+        void discard();
+    protected slots:
         void on_varName_textChanged(const QString& name);
         void on_varEmail_textChanged(const QString& email);
         void on_varRole_textChanged(const QString& role);
diff --git a/pokemodr/BadgeUI.cpp b/pokemodr/BadgeUI.cpp
index 89dbd1d9..cb4b5b9a 100644
--- a/pokemodr/BadgeUI.cpp
+++ b/pokemodr/BadgeUI.cpp
@@ -31,7 +31,6 @@ BadgeUI::BadgeUI(Badge* badge, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(badge, new Badge(*badge));
-    connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(setGui()));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(errorMessage(const QString&)));
     connect(modified(), SIGNAL(warning(const QString&)), this, SLOT(warningMessage(const QString&)));
@@ -68,13 +67,13 @@ void BadgeUI::setGui()
         varHMs->item(i)->setSelected(static_cast<Badge*>(modified())->hm(i));
 }
 
-void BadgeUI::on_buttonApply_clicked()
+void BadgeUI::apply()
 {
     *static_cast<Badge*>(original()) = *static_cast<Badge*>(modified());
     emit(changed(false));
 }
 
-void BadgeUI::on_buttonDiscard_clicked()
+void BadgeUI::discard()
 {
     *static_cast<Badge*>(modified()) = *static_cast<Badge*>(original());
     setGui();
diff --git a/pokemodr/BadgeUI.h b/pokemodr/BadgeUI.h
index e72f97c8..c67215dd 100644
--- a/pokemodr/BadgeUI.h
+++ b/pokemodr/BadgeUI.h
@@ -35,8 +35,9 @@ class BadgeUI : public ObjectUI, private Ui::formBadge
         BadgeUI(Badge* badge, QWidget* parent);
         ~BadgeUI();
     public slots:
-        void on_buttonApply_clicked();
-        void on_buttonDiscard_clicked();
+        void apply();
+        void discard();
+    protected slots:
         void on_varName_textChanged(const QString& name);
         void on_varObey_valueChanged(const int obey);
         void on_varFace_pressed();
diff --git a/pokemodr/CoinListObjectUI.cpp b/pokemodr/CoinListObjectUI.cpp
index 77bd8744..2e672415 100644
--- a/pokemodr/CoinListObjectUI.cpp
+++ b/pokemodr/CoinListObjectUI.cpp
@@ -32,7 +32,6 @@ CoinListObjectUI::CoinListObjectUI(CoinListObject* object, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(object, new CoinListObject(*object));
-    connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(setGui()));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(errorMessage(const QString&)));
     connect(modified(), SIGNAL(warning(const QString&)), this, SLOT(warningMessage(const QString&)));
@@ -82,13 +81,13 @@ void CoinListObjectUI::setGui()
     varCost->setValue(static_cast<CoinListObject*>(modified())->cost());
 }
 
-void CoinListObjectUI::on_buttonApply_clicked()
+void CoinListObjectUI::apply()
 {
     *static_cast<CoinListObject*>(original()) = *static_cast<CoinListObject*>(modified());
     emit(changed(false));
 }
 
-void CoinListObjectUI::on_buttonDiscard_clicked()
+void CoinListObjectUI::discard()
 {
     *static_cast<CoinListObject*>(modified()) = *static_cast<CoinListObject*>(original());
     setGui();
diff --git a/pokemodr/CoinListObjectUI.h b/pokemodr/CoinListObjectUI.h
index 72f9883f..c20b798b 100644
--- a/pokemodr/CoinListObjectUI.h
+++ b/pokemodr/CoinListObjectUI.h
@@ -35,8 +35,9 @@ class CoinListObjectUI : public ObjectUI, private Ui::formCoinListObject
         CoinListObjectUI(CoinListObject* object, QWidget* parent);
         ~CoinListObjectUI();
     public slots:
-        void on_buttonApply_clicked();
-        void on_buttonDiscard_clicked();
+        void apply();
+        void discard();
+    protected slots:
         void on_varType_currentIndexChanged(const int type);
         void on_varObject_currentIndexChanged(const int object);
         void on_varAmount_valueChanged(const int amount);
diff --git a/pokemodr/CoinListUI.cpp b/pokemodr/CoinListUI.cpp
index b0febfa0..da0cd85e 100644
--- a/pokemodr/CoinListUI.cpp
+++ b/pokemodr/CoinListUI.cpp
@@ -30,7 +30,6 @@ CoinListUI::CoinListUI(CoinList* coinList, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(coinList, new CoinList(*coinList));
-    connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(setGui()));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(errorMessage(const QString&)));
     connect(modified(), SIGNAL(warning(const QString&)), this, SLOT(warningMessage(const QString&)));
@@ -66,13 +65,13 @@ void CoinListUI::setGui()
     varValue->setCurrentIndex(varValue->findData(static_cast<CoinList*>(modified())->value()));
 }
 
-void CoinListUI::on_buttonApply_clicked()
+void CoinListUI::apply()
 {
     *static_cast<CoinList*>(original()) = *static_cast<CoinList*>(modified());
     emit(changed(false));
 }
 
-void CoinListUI::on_buttonDiscard_clicked()
+void CoinListUI::discard()
 {
     *static_cast<CoinList*>(modified()) = *static_cast<CoinList*>(original());
     setGui();
diff --git a/pokemodr/CoinListUI.h b/pokemodr/CoinListUI.h
index 9a59e675..102b14b2 100644
--- a/pokemodr/CoinListUI.h
+++ b/pokemodr/CoinListUI.h
@@ -35,8 +35,9 @@ class CoinListUI : public ObjectUI, private Ui::formCoinList
         CoinListUI(CoinList* coinList, QWidget* parent);
         ~CoinListUI();
     public slots:
-        void on_buttonApply_clicked();
-        void on_buttonDiscard_clicked();
+        void apply();
+        void discard();
+    protected slots:
         void on_varName_textChanged(const QString& name);
         void on_varValue_currentIndexChanged(const int value);
     private slots:
diff --git a/pokemodr/EggGroupUI.cpp b/pokemodr/EggGroupUI.cpp
index 1ae27e05..fc2b5ed8 100644
--- a/pokemodr/EggGroupUI.cpp
+++ b/pokemodr/EggGroupUI.cpp
@@ -27,7 +27,6 @@ EggGroupUI::EggGroupUI(EggGroup* eggGroup, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(eggGroup, new EggGroup(*eggGroup));
-    connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(setGui()));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(errorMessage(const QString&)));
     connect(modified(), SIGNAL(warning(const QString&)), this, SLOT(warningMessage(const QString&)));
@@ -44,13 +43,13 @@ void EggGroupUI::setGui()
     varName->setText(static_cast<EggGroup*>(modified())->name());
 }
 
-void EggGroupUI::on_buttonApply_clicked()
+void EggGroupUI::apply()
 {
     *static_cast<EggGroup*>(original()) = *static_cast<EggGroup*>(modified());
     emit(changed(false));
 }
 
-void EggGroupUI::on_buttonDiscard_clicked()
+void EggGroupUI::discard()
 {
     *static_cast<EggGroup*>(modified()) = *static_cast<EggGroup*>(original());
     setGui();
diff --git a/pokemodr/EggGroupUI.h b/pokemodr/EggGroupUI.h
index 767379c0..b46812a7 100644
--- a/pokemodr/EggGroupUI.h
+++ b/pokemodr/EggGroupUI.h
@@ -35,8 +35,9 @@ class EggGroupUI : public ObjectUI, private Ui::formEggGroup
         EggGroupUI(EggGroup* eggGroup, QWidget* parent);
         ~EggGroupUI();
     public slots:
-        void on_buttonApply_clicked();
-        void on_buttonDiscard_clicked();
+        void apply();
+        void discard();
+    protected slots:
         void on_varName_textChanged(const QString& name);
     private slots:
         void setGui();
diff --git a/pokemodr/ItemTypeUI.cpp b/pokemodr/ItemTypeUI.cpp
index 03bf7584..f95827ac 100644
--- a/pokemodr/ItemTypeUI.cpp
+++ b/pokemodr/ItemTypeUI.cpp
@@ -27,7 +27,6 @@ ItemTypeUI::ItemTypeUI(ItemType* itemType, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(itemType, new ItemType(*itemType));
-    connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(setGui()));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(errorMessage(const QString&)));
     connect(modified(), SIGNAL(warning(const QString&)), this, SLOT(warningMessage(const QString&)));
@@ -46,13 +45,13 @@ void ItemTypeUI::setGui()
     varPlayer->setValue(static_cast<ItemType*>(modified())->player());
 }
 
-void ItemTypeUI::on_buttonApply_clicked()
+void ItemTypeUI::apply()
 {
     *static_cast<ItemType*>(original()) = *static_cast<ItemType*>(modified());
     emit(changed(false));
 }
 
-void ItemTypeUI::on_buttonDiscard_clicked()
+void ItemTypeUI::discard()
 {
     *static_cast<ItemType*>(modified()) = *static_cast<ItemType*>(original());
     setGui();
diff --git a/pokemodr/ItemTypeUI.h b/pokemodr/ItemTypeUI.h
index bfe9cc31..e98b58b0 100644
--- a/pokemodr/ItemTypeUI.h
+++ b/pokemodr/ItemTypeUI.h
@@ -35,8 +35,9 @@ class ItemTypeUI : public ObjectUI, private Ui::formItemType
         ItemTypeUI(ItemType* itemType, QWidget* parent);
         ~ItemTypeUI();
     public slots:
-        void on_buttonApply_clicked();
-        void on_buttonDiscard_clicked();
+        void apply();
+        void discard();
+    protected slots:
         void on_varName_textChanged(const QString& name);
         void on_varComputer_valueChanged(const int computer);
         void on_varPlayer_valueChanged(const int player);
diff --git a/pokemodr/ItemUI.cpp b/pokemodr/ItemUI.cpp
index 276de03c..cf99132c 100644
--- a/pokemodr/ItemUI.cpp
+++ b/pokemodr/ItemUI.cpp
@@ -29,7 +29,6 @@ ItemUI::ItemUI(Item* item, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(item, new Item(*item));
-    connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(setGui()));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(errorMessage(const QString&)));
     connect(modified(), SIGNAL(warning(const QString&)), this, SLOT(warningMessage(const QString&)));
@@ -62,13 +61,13 @@ void ItemUI::setGui()
     varDescription->setText(static_cast<Item*>(modified())->description());
 }
 
-void ItemUI::on_buttonApply_clicked()
+void ItemUI::apply()
 {
     *static_cast<Item*>(original()) = *static_cast<Item*>(modified());
     emit(changed(false));
 }
 
-void ItemUI::on_buttonDiscard_clicked()
+void ItemUI::discard()
 {
     *static_cast<Item*>(modified()) = *static_cast<Item*>(original());
     setGui();
diff --git a/pokemodr/ItemUI.h b/pokemodr/ItemUI.h
index 665b83ce..d2f365e6 100644
--- a/pokemodr/ItemUI.h
+++ b/pokemodr/ItemUI.h
@@ -35,8 +35,9 @@ class ItemUI : public ObjectUI, private Ui::formItem
         ItemUI(Item* item, QWidget* parent);
         ~ItemUI();
     public slots:
-        void on_buttonApply_clicked();
-        void on_buttonDiscard_clicked();
+        void apply();
+        void discard();
+    protected slots:
         void on_varName_textChanged(const QString& name);
         void on_boxSellable_toggled(const bool sellable);
         void on_varType_currentIndexChanged(const int type);
diff --git a/pokemodr/MapEffectUI.cpp b/pokemodr/MapEffectUI.cpp
index 5aefb6fd..2e21f8f1 100644
--- a/pokemodr/MapEffectUI.cpp
+++ b/pokemodr/MapEffectUI.cpp
@@ -34,7 +34,6 @@ MapEffectUI::MapEffectUI(MapEffect* effect, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(effect, new MapEffect(*effect));
-    connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(setGui()));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(errorMessage(const QString&)));
     connect(modified(), SIGNAL(warning(const QString&)), this, SLOT(warningMessage(const QString&)));
@@ -111,13 +110,13 @@ void MapEffectUI::setGui()
     varDialog->setCurrentIndex(varDialog->findData(static_cast<MapEffect*>(modified())->dialog()));
 }
 
-void MapEffectUI::on_buttonApply_clicked()
+void MapEffectUI::apply()
 {
     *static_cast<MapEffect*>(original()) = *static_cast<MapEffect*>(modified());
     emit(changed(false));
 }
 
-void MapEffectUI::on_buttonDiscard_clicked()
+void MapEffectUI::discard()
 {
     *static_cast<MapEffect*>(modified()) = *static_cast<MapEffect*>(original());
     setGui();
diff --git a/pokemodr/MapEffectUI.h b/pokemodr/MapEffectUI.h
index 04a24639..2005e8f2 100644
--- a/pokemodr/MapEffectUI.h
+++ b/pokemodr/MapEffectUI.h
@@ -35,8 +35,9 @@ class MapEffectUI : public ObjectUI, private Ui::formMapEffect
         MapEffectUI(MapEffect* effect, QWidget* parent);
         ~MapEffectUI();
     public slots:
-        void on_buttonApply_clicked();
-        void on_buttonDiscard_clicked();
+        void apply();
+        void discard();
+    protected slots:
         void on_varName_textChanged(const QString& name);
         void on_varCoordinate_valueChanged(const Point& coordinate);
         void on_varExistFlag_valueChanged(const Flag& existFlag);
diff --git a/pokemodr/MapTrainerTeamMemberUI.cpp b/pokemodr/MapTrainerTeamMemberUI.cpp
index c997a1f0..d08f17e3 100644
--- a/pokemodr/MapTrainerTeamMemberUI.cpp
+++ b/pokemodr/MapTrainerTeamMemberUI.cpp
@@ -31,7 +31,6 @@ MapTrainerTeamMemberUI::MapTrainerTeamMemberUI(MapTrainerTeamMember* teamMember,
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(teamMember, new MapTrainerTeamMember(*teamMember));
-    connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(setGui()));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(errorMessage(const QString&)));
     connect(modified(), SIGNAL(warning(const QString&)), this, SLOT(warningMessage(const QString&)));
@@ -91,13 +90,13 @@ void MapTrainerTeamMemberUI::setGui()
         boxItems->setEnabled(false);
 }
 
-void MapTrainerTeamMemberUI::on_buttonApply_clicked()
+void MapTrainerTeamMemberUI::apply()
 {
     *static_cast<MapTrainerTeamMember*>(original()) = *static_cast<MapTrainerTeamMember*>(modified());
     emit(changed(false));
 }
 
-void MapTrainerTeamMemberUI::on_buttonDiscard_clicked()
+void MapTrainerTeamMemberUI::discard()
 {
     *static_cast<MapTrainerTeamMember*>(modified()) = *static_cast<MapTrainerTeamMember*>(original());
     setGui();
diff --git a/pokemodr/MapTrainerTeamMemberUI.h b/pokemodr/MapTrainerTeamMemberUI.h
index b24067e8..f9373b30 100644
--- a/pokemodr/MapTrainerTeamMemberUI.h
+++ b/pokemodr/MapTrainerTeamMemberUI.h
@@ -35,8 +35,9 @@ class MapTrainerTeamMemberUI : public ObjectUI, private Ui::formMapTrainerTeamMe
         MapTrainerTeamMemberUI(MapTrainerTeamMember* teamMember, QWidget* parent);
         ~MapTrainerTeamMemberUI();
     public slots:
-        void on_buttonApply_clicked();
-        void on_buttonDiscard_clicked();
+        void apply();
+        void discard();
+    protected slots:
         void on_varSpecies_currentIndexChanged(const int species);
         void on_varLevel_valueChanged(const int level);
         void on_varNature_currentIndexChanged(const int nature);
diff --git a/pokemodr/MapTrainerUI.cpp b/pokemodr/MapTrainerUI.cpp
index 47caf9a8..1ca6b1cd 100644
--- a/pokemodr/MapTrainerUI.cpp
+++ b/pokemodr/MapTrainerUI.cpp
@@ -33,7 +33,6 @@ MapTrainerUI::MapTrainerUI(MapTrainer* trainer, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(trainer, new MapTrainer(*trainer));
-    connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(setGui()));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(errorMessage(const QString&)));
     connect(modified(), SIGNAL(warning(const QString&)), this, SLOT(warningMessage(const QString&)));
@@ -94,13 +93,13 @@ void MapTrainerUI::setGui()
     varLeadTeamMember->setCurrentIndex(varLeadTeamMember->findData(static_cast<MapTrainer*>(modified())->leadTeamMember()));
 }
 
-void MapTrainerUI::on_buttonApply_clicked()
+void MapTrainerUI::apply()
 {
     *static_cast<MapTrainer*>(original()) = *static_cast<MapTrainer*>(modified());
     emit(changed(false));
 }
 
-void MapTrainerUI::on_buttonDiscard_clicked()
+void MapTrainerUI::discard()
 {
     *static_cast<MapTrainer*>(modified()) = *static_cast<MapTrainer*>(original());
     setGui();
diff --git a/pokemodr/MapTrainerUI.h b/pokemodr/MapTrainerUI.h
index 229f4930..ec200066 100644
--- a/pokemodr/MapTrainerUI.h
+++ b/pokemodr/MapTrainerUI.h
@@ -35,8 +35,9 @@ class MapTrainerUI : public ObjectUI, private Ui::formMapTrainer
         MapTrainerUI(MapTrainer* trainer, QWidget* parent);
         ~MapTrainerUI();
     public slots:
-        void on_buttonApply_clicked();
-        void on_buttonDiscard_clicked();
+        void apply();
+        void discard();
+    protected slots:
         void on_varName_textChanged(const QString& name);
         void on_varTrainerClass_currentIndexChanged(const int trainerClass);
         void on_varCoordinate_valueChanged(const Point& coordinate);
diff --git a/pokemodr/MapUI.cpp b/pokemodr/MapUI.cpp
index 75436eee..749b2bf5 100644
--- a/pokemodr/MapUI.cpp
+++ b/pokemodr/MapUI.cpp
@@ -41,7 +41,6 @@ MapUI::MapUI(Map* map, QWidget* parent) :
     QMetaObject::connectSlotsByName(this);
     setObjects(map, new Map(*map));
     m_model = new TilemapModel(this, static_cast<Map*>(modified())->map(), static_cast<const Pokemod*>(original()->pokemod()));
-    connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(setGui()));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(errorMessage(const QString&)));
     connect(modified(), SIGNAL(warning(const QString&)), this, SLOT(warningMessage(const QString&)));
@@ -87,13 +86,13 @@ void MapUI::setGui()
     buttonDeleteRow->setEnabled(0 < m_model->rowCount());
 }
 
-void MapUI::on_buttonApply_clicked()
+void MapUI::apply()
 {
     *static_cast<Map*>(original()) = *static_cast<Map*>(modified());
     emit(changed(false));
 }
 
-void MapUI::on_buttonDiscard_clicked()
+void MapUI::discard()
 {
     *static_cast<Map*>(modified()) = *static_cast<Map*>(original());
     setGui();
diff --git a/pokemodr/MapUI.h b/pokemodr/MapUI.h
index 16e21da0..23ca987a 100644
--- a/pokemodr/MapUI.h
+++ b/pokemodr/MapUI.h
@@ -37,8 +37,9 @@ class MapUI : public ObjectUI, private Ui::formMap
         MapUI(Map* map, QWidget* parent);
         ~MapUI();
     public slots:
-        void on_buttonApply_clicked();
-        void on_buttonDiscard_clicked();
+        void apply();
+        void discard();
+    protected slots:
         void on_varName_textChanged(const QString& name);
         void on_boxFlyWarp_toggled();
         void on_varFlyWarp_currentIndexChanged(const int flyWarp);
diff --git a/pokemodr/MapWarpUI.cpp b/pokemodr/MapWarpUI.cpp
index d24cb17f..b12a53a7 100644
--- a/pokemodr/MapWarpUI.cpp
+++ b/pokemodr/MapWarpUI.cpp
@@ -31,7 +31,6 @@ MapWarpUI::MapWarpUI(MapWarp* warp, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(warp, new MapWarp(*warp));
-    connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(setGui()));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(errorMessage(const QString&)));
     connect(modified(), SIGNAL(warning(const QString&)), this, SLOT(warningMessage(const QString&)));
@@ -105,13 +104,13 @@ void MapWarpUI::setGui()
     varDialog->setCurrentIndex(varDialog->findData(static_cast<MapWarp*>(modified())->dialog()));
 }
 
-void MapWarpUI::on_buttonApply_clicked()
+void MapWarpUI::apply()
 {
     *static_cast<MapWarp*>(original()) = *static_cast<MapWarp*>(modified());
     emit(changed(false));
 }
 
-void MapWarpUI::on_buttonDiscard_clicked()
+void MapWarpUI::discard()
 {
     *static_cast<MapWarp*>(modified()) = *static_cast<MapWarp*>(original());
     setGui();
diff --git a/pokemodr/MapWarpUI.h b/pokemodr/MapWarpUI.h
index f31976d2..c09f4b40 100644
--- a/pokemodr/MapWarpUI.h
+++ b/pokemodr/MapWarpUI.h
@@ -35,8 +35,9 @@ class MapWarpUI : public ObjectUI, private Ui::formMapWarp
         MapWarpUI(MapWarp* warp, QWidget* parent);
         ~MapWarpUI();
     public slots:
-        void on_buttonApply_clicked();
-        void on_buttonDiscard_clicked();
+        void apply();
+        void discard();
+    protected slots:
         void on_varName_textChanged(const QString& name);
         void on_varCoordinate_valueChanged(const Point& coordinate);
         void on_varActivation_itemSelectionChanged();
diff --git a/pokemodr/MapWildListEncounterUI.cpp b/pokemodr/MapWildListEncounterUI.cpp
index 8fb17fa6..c3bfe837 100644
--- a/pokemodr/MapWildListEncounterUI.cpp
+++ b/pokemodr/MapWildListEncounterUI.cpp
@@ -29,7 +29,6 @@ MapWildListEncounterUI::MapWildListEncounterUI(MapWildListEncounter* encounter,
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(encounter, new MapWildListEncounter(*encounter));
-    connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(setGui()));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(errorMessage(const QString&)));
     connect(modified(), SIGNAL(warning(const QString&)), this, SLOT(warningMessage(const QString&)));
@@ -60,13 +59,13 @@ void MapWildListEncounterUI::setGui()
     varWeight->setValue(static_cast<MapWildListEncounter*>(modified())->weight());
 }
 
-void MapWildListEncounterUI::on_buttonApply_clicked()
+void MapWildListEncounterUI::apply()
 {
     *static_cast<MapWildListEncounter*>(original()) = *static_cast<MapWildListEncounter*>(modified());
     emit(changed(false));
 }
 
-void MapWildListEncounterUI::on_buttonDiscard_clicked()
+void MapWildListEncounterUI::discard()
 {
     *static_cast<MapWildListEncounter*>(modified()) = *static_cast<MapWildListEncounter*>(original());
     setGui();
diff --git a/pokemodr/MapWildListEncounterUI.h b/pokemodr/MapWildListEncounterUI.h
index 94e6fa75..8ef4919f 100644
--- a/pokemodr/MapWildListEncounterUI.h
+++ b/pokemodr/MapWildListEncounterUI.h
@@ -35,8 +35,9 @@ class MapWildListEncounterUI : public ObjectUI, private Ui::formMapWildListEncou
         MapWildListEncounterUI(MapWildListEncounter* encounter, QWidget* parent);
         ~MapWildListEncounterUI();
     public slots:
-        void on_buttonApply_clicked();
-        void on_buttonDiscard_clicked();
+        void apply();
+        void discard();
+    protected slots:
         void on_varSpecies_currentIndexChanged(const int species);
         void on_varLevel_valueChanged(const int level);
         void on_varWeight_valueChanged(const int weight);
diff --git a/pokemodr/MapWildListUI.cpp b/pokemodr/MapWildListUI.cpp
index 1931277e..00f332eb 100644
--- a/pokemodr/MapWildListUI.cpp
+++ b/pokemodr/MapWildListUI.cpp
@@ -31,7 +31,6 @@ MapWildListUI::MapWildListUI(MapWildList* wildList, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(wildList, new MapWildList(*wildList));
-    connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(setGui()));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(errorMessage(const QString&)));
     connect(modified(), SIGNAL(warning(const QString&)), this, SLOT(warningMessage(const QString&)));
@@ -93,13 +92,13 @@ void MapWildListUI::setGui()
     varScope->setCurrentIndex(varScope->findData(static_cast<MapWildList*>(modified())->scope()));
 }
 
-void MapWildListUI::on_buttonApply_clicked()
+void MapWildListUI::apply()
 {
     *static_cast<MapWildList*>(original()) = *static_cast<MapWildList*>(modified());
     emit(changed(false));
 }
 
-void MapWildListUI::on_buttonDiscard_clicked()
+void MapWildListUI::discard()
 {
     *static_cast<MapWildList*>(modified()) = *static_cast<MapWildList*>(original());
     setGui();
diff --git a/pokemodr/MapWildListUI.h b/pokemodr/MapWildListUI.h
index a9336d4f..1e1ae8ad 100644
--- a/pokemodr/MapWildListUI.h
+++ b/pokemodr/MapWildListUI.h
@@ -35,8 +35,9 @@ class MapWildListUI : public ObjectUI, private Ui::formMapWildList
         MapWildListUI(MapWildList* wildList, QWidget* parent);
         ~MapWildListUI();
     public slots:
-        void on_buttonApply_clicked();
-        void on_buttonDiscard_clicked();
+        void apply();
+        void discard();
+    protected slots:
         void on_varControl_currentIndexChanged(const int control);
         void on_varValue_currentIndexChanged(const int value);
         void on_varTimes_itemSelectionChanged();
diff --git a/pokemodr/MoveUI.cpp b/pokemodr/MoveUI.cpp
index df0c4e72..ca9d085f 100644
--- a/pokemodr/MoveUI.cpp
+++ b/pokemodr/MoveUI.cpp
@@ -29,7 +29,6 @@ MoveUI::MoveUI(Move* move, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(move, new Move(*move));
-    connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(setGui()));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(errorMessage(const QString&)));
     connect(modified(), SIGNAL(warning(const QString&)), this, SLOT(warningMessage(const QString&)));
@@ -76,13 +75,13 @@ void MoveUI::setGui()
     varDescription->setText(static_cast<Move*>(modified())->description());
 }
 
-void MoveUI::on_buttonApply_clicked()
+void MoveUI::apply()
 {
     *static_cast<Move*>(original()) = *static_cast<Move*>(modified());
     emit(changed(false));
 }
 
-void MoveUI::on_buttonDiscard_clicked()
+void MoveUI::discard()
 {
     *static_cast<Move*>(modified()) = *static_cast<Move*>(original());
     setGui();
diff --git a/pokemodr/MoveUI.h b/pokemodr/MoveUI.h
index 067d5ba4..18d02fc7 100644
--- a/pokemodr/MoveUI.h
+++ b/pokemodr/MoveUI.h
@@ -35,8 +35,9 @@ class MoveUI : public ObjectUI, private Ui::formMove
         MoveUI(Move* move, QWidget* parent);
         ~MoveUI();
     public slots:
-        void on_buttonApply_clicked();
-        void on_buttonDiscard_clicked();
+        void apply();
+        void discard();
+    protected slots:
         void on_varName_textChanged(const QString& name);
         void on_varAccuracy_valueChanged(const Fraction& accuracy);
         void on_varType_currentIndexChanged(const int type);
diff --git a/pokemodr/NatureUI.cpp b/pokemodr/NatureUI.cpp
index 525fa65e..f8f49c77 100644
--- a/pokemodr/NatureUI.cpp
+++ b/pokemodr/NatureUI.cpp
@@ -28,7 +28,6 @@ NatureUI::NatureUI(Nature* nature, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(nature, new Nature(*nature));
-    connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(setGui()));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(errorMessage(const QString&)));
     connect(modified(), SIGNAL(warning(const QString&)), this, SLOT(warningMessage(const QString&)));
@@ -59,13 +58,13 @@ void NatureUI::setGui()
     varWeight->setValue(static_cast<Nature*>(modified())->weight());
 }
 
-void NatureUI::on_buttonApply_clicked()
+void NatureUI::apply()
 {
     *static_cast<Nature*>(original()) = *static_cast<Nature*>(modified());
     emit(changed(false));
 }
 
-void NatureUI::on_buttonDiscard_clicked()
+void NatureUI::discard()
 {
     *static_cast<Nature*>(modified()) = *static_cast<Nature*>(original());
     setGui();
diff --git a/pokemodr/NatureUI.h b/pokemodr/NatureUI.h
index 15f9be8c..12493071 100644
--- a/pokemodr/NatureUI.h
+++ b/pokemodr/NatureUI.h
@@ -35,8 +35,9 @@ class NatureUI : public ObjectUI, private Ui::formNature
         NatureUI(Nature* nature, QWidget* parent);
         ~NatureUI();
     public slots:
-        void on_buttonApply_clicked();
-        void on_buttonDiscard_clicked();
+        void apply();
+        void discard();
+    protected slots:
         void on_varName_textChanged(const QString& name);
         void on_varStatMultiplier_valueChanged(const Fraction& statMultiplier);
         void on_varWeight_valueChanged(const int weight);
diff --git a/pokemodr/ObjectUI.h b/pokemodr/ObjectUI.h
index 6e754cf8..3a31801b 100644
--- a/pokemodr/ObjectUI.h
+++ b/pokemodr/ObjectUI.h
@@ -49,9 +49,9 @@ class ObjectUI : public QWidget
             if (m_changed)
             {
 //                 if (KMessageBox::questionYesNo(this, "You have unsaved changes, would you like to save them?", QString("Unsaved %1").arg(m_object->className())) == KMessageBox::Yes)
-//                     on_buttonApply_clicked();
+//                     apply();
 //                 else
-//                     on_buttonDiscard_clicked();
+//                     discard();
             }
             delete m_object_mod;
         }
@@ -64,11 +64,11 @@ class ObjectUI : public QWidget
                 {
                     case KMessageBox::Yes:
                         event->accept();
-                        on_buttonApply_clicked();
+                        apply();
                         break;
                     case KMessageBox::No:
                         event->accept();
-                        on_buttonDiscard_clicked();
+                        discard();
                         break;
                     case KMessageBox::Cancel:
                         event->ignore();
@@ -106,6 +106,9 @@ class ObjectUI : public QWidget
     signals:
         void changed(bool);
     public slots:
+        virtual void apply() = 0;
+        virtual void discard() = 0;
+    protected slots:
         void setChanged(const bool changed = true)
         {
             m_changed = changed;
@@ -118,9 +121,7 @@ class ObjectUI : public QWidget
         {
             KMessageBox::warningContinueCancel(this, message, "Warning");
         }
-        virtual void on_buttonApply_clicked() = 0;
-        virtual void on_buttonDiscard_clicked() = 0;
-    protected slots:
+        
         void initGui()
         {
         }
diff --git a/pokemodr/PokeModrUI.cpp b/pokemodr/PokeModrUI.cpp
index 74e68eb3..4df5f88d 100644
--- a/pokemodr/PokeModrUI.cpp
+++ b/pokemodr/PokeModrUI.cpp
@@ -284,7 +284,7 @@ void PokeModrUI::on_splitter_splitterMoved()
 
 void PokeModrUI::on_treePokemod_clicked(const QModelIndex& index)
 {
-    QWidget* widget = treePokemod->editorWidget(index);
+    ObjectUI* widget = treePokemod->editorWidget(index);
     if (widget)
     {
         if (formPanel->widget())
@@ -293,6 +293,9 @@ void PokeModrUI::on_treePokemod_clicked(const QModelIndex& index)
                 return;
         }
         connect(widget, SIGNAL(changed(bool)), this, SLOT(setChangedTitle(bool)));
+        connect(widget, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
+        connect(buttonApply, SIGNAL(clicked()), widget, SLOT(apply()));
+        connect(buttonDiscard, SIGNAL(clicked()), widget, SLOT(discard()));
         setChangedTitle(false);
         formPanel->setWidget(widget);
         formPanel->show();
diff --git a/pokemodr/PokemodTree.cpp b/pokemodr/PokemodTree.cpp
index ad9c93e2..1812e593 100644
--- a/pokemodr/PokemodTree.cpp
+++ b/pokemodr/PokemodTree.cpp
@@ -21,6 +21,9 @@
 // Model includes
 #include "models/BaseModel.h"
 
+// PokeModr includes
+#include "ObjectUI.h"
+
 // KDE includes
 #include <KUrl>
 
@@ -38,9 +41,9 @@ QString PokemodTree::description(const QModelIndex& index)
     return QString("%1: %2").arg(model()->data(index, BaseModel::TypeRole).toString()).arg(model()->data(index, Qt::DisplayRole).toString());
 }
 
-QWidget* PokemodTree::editorWidget(const QModelIndex& index)
+ObjectUI* PokemodTree::editorWidget(const QModelIndex& index)
 {
-    return model()->data(index, BaseModel::WidgetRole).value<QWidget*>();
+    return static_cast<ObjectUI*>(model()->data(index, BaseModel::WidgetRole).value<QWidget*>());
 }
 
 KMenu* PokemodTree::contextMenu(const QModelIndex& index)
diff --git a/pokemodr/PokemodTree.h b/pokemodr/PokemodTree.h
index d8ee18a4..5591a6e6 100644
--- a/pokemodr/PokemodTree.h
+++ b/pokemodr/PokemodTree.h
@@ -25,6 +25,7 @@
 // Forward declarations
 class KMenu;
 class KUrl;
+class ObjectUI;
 class Pokemod;
 
 class PokemodTree : public QTreeView
@@ -35,7 +36,7 @@ class PokemodTree : public QTreeView
         PokemodTree(QWidget* parent = 0);
         
         QString description(const QModelIndex& index);
-        QWidget* editorWidget(const QModelIndex& index);
+        ObjectUI* editorWidget(const QModelIndex& index);
         KMenu* contextMenu(const QModelIndex& index);
         
         QDomDocument cut(const QModelIndex& index);
diff --git a/pokemodr/PokemodUI.cpp b/pokemodr/PokemodUI.cpp
index c693b57f..f04ee87e 100644
--- a/pokemodr/PokemodUI.cpp
+++ b/pokemodr/PokemodUI.cpp
@@ -35,7 +35,6 @@ PokemodUI::PokemodUI(Pokemod* pokemod, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(pokemod, new Pokemod(*pokemod));
-    connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(setGui()));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(errorMessage(const QString&)));
     connect(modified(), SIGNAL(warning(const QString&)), this, SLOT(warningMessage(const QString&)));
@@ -108,13 +107,13 @@ void PokemodUI::setGui()
     varSurfFishSkin->setIcon(static_cast<Pokemod*>(original())->surfFishSkin());
 }
 
-void PokemodUI::on_buttonApply_clicked()
+void PokemodUI::apply()
 {
     *static_cast<Pokemod*>(original()) = *static_cast<Pokemod*>(modified());
     emit(changed(false));
 }
 
-void PokemodUI::on_buttonDiscard_clicked()
+void PokemodUI::discard()
 {
     *static_cast<Pokemod*>(modified()) = *static_cast<Pokemod*>(original());
     setGui();
diff --git a/pokemodr/PokemodUI.h b/pokemodr/PokemodUI.h
index 14e2f877..440075b9 100644
--- a/pokemodr/PokemodUI.h
+++ b/pokemodr/PokemodUI.h
@@ -34,8 +34,9 @@ class PokemodUI : public ObjectUI, private Ui::formPokemod
         PokemodUI(Pokemod* pokemod, QWidget* parent);
         ~PokemodUI();
     public slots:
-        void on_buttonApply_clicked();
-        void on_buttonDiscard_clicked();
+        void apply();
+        void discard();
+    protected slots:
         void on_varTitle_textChanged(const QString& title);
         void on_varVersion_textChanged(const QString& version);
         void on_varDescription_textChanged();
diff --git a/pokemodr/RulesUI.cpp b/pokemodr/RulesUI.cpp
index be68010c..e7648f14 100644
--- a/pokemodr/RulesUI.cpp
+++ b/pokemodr/RulesUI.cpp
@@ -27,7 +27,6 @@ RulesUI::RulesUI(Rules* rules, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(rules, new Rules(*rules));
-    connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(setGui()));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(errorMessage(const QString&)));
     connect(modified(), SIGNAL(warning(const QString&)), this, SLOT(warningMessage(const QString&)));
@@ -79,13 +78,13 @@ void RulesUI::setGui()
     varPokerus->setValue(static_cast<Rules*>(modified())->pokerusChance());
 }
 
-void RulesUI::on_buttonApply_clicked()
+void RulesUI::apply()
 {
     *static_cast<Rules*>(original()) = *static_cast<Rules*>(modified());
     emit(changed(false));
 }
 
-void RulesUI::on_buttonDiscard_clicked()
+void RulesUI::discard()
 {
     *static_cast<Rules*>(modified()) = *static_cast<Rules*>(original());
     setGui();
diff --git a/pokemodr/RulesUI.h b/pokemodr/RulesUI.h
index 631e8f30..7fe26b90 100644
--- a/pokemodr/RulesUI.h
+++ b/pokemodr/RulesUI.h
@@ -35,8 +35,9 @@ class RulesUI : public ObjectUI, private Ui::formRules
         RulesUI(Rules* rules, QWidget* parent);
         ~RulesUI();
     public slots:
-        void on_buttonApply_clicked();
-        void on_buttonDiscard_clicked();
+        void apply();
+        void discard();
+    protected slots:
         void on_boxGenders_toggled(const bool genders);
         void on_varBreeding_toggled(const bool breeding);
         void on_varHeldItems_valueChanged(const int heldItems);
diff --git a/pokemodr/SoundUI.cpp b/pokemodr/SoundUI.cpp
index f6142884..299861ab 100644
--- a/pokemodr/SoundUI.cpp
+++ b/pokemodr/SoundUI.cpp
@@ -38,7 +38,6 @@ SoundUI::SoundUI(Sound* sound, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(sound, new Sound(*sound));
-    connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(setGui()));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(errorMessage(const QString&)));
     connect(modified(), SIGNAL(warning(const QString&)), this, SLOT(warningMessage(const QString&)));
@@ -74,13 +73,13 @@ void SoundUI::setGui()
     varName->setText(static_cast<Sound*>(modified())->name());
 }
 
-void SoundUI::on_buttonApply_clicked()
+void SoundUI::apply()
 {
     *static_cast<Sound*>(original()) = *static_cast<Sound*>(modified());
     emit(changed(false));
 }
 
-void SoundUI::on_buttonDiscard_clicked()
+void SoundUI::discard()
 {
     *static_cast<Sound*>(modified()) = *static_cast<Sound*>(original());
     setGui();
diff --git a/pokemodr/SoundUI.h b/pokemodr/SoundUI.h
index 41125f22..153e0c04 100644
--- a/pokemodr/SoundUI.h
+++ b/pokemodr/SoundUI.h
@@ -39,8 +39,9 @@ class SoundUI : public ObjectUI, private Ui::formSound
         SoundUI(Sound* sound, QWidget* parent);
         ~SoundUI();
     public slots:
-        void on_buttonApply_clicked();
-        void on_buttonDiscard_clicked();
+        void apply();
+        void discard();
+    protected slots:
         void on_varName_textChanged(const QString& name);
         void on_buttonPlayPause_clicked();
         void on_buttonStop_clicked();
diff --git a/pokemodr/SpeciesAbilityUI.cpp b/pokemodr/SpeciesAbilityUI.cpp
index 37b4c9d4..93d28634 100644
--- a/pokemodr/SpeciesAbilityUI.cpp
+++ b/pokemodr/SpeciesAbilityUI.cpp
@@ -29,7 +29,6 @@ SpeciesAbilityUI::SpeciesAbilityUI(SpeciesAbility* ability, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(ability, new SpeciesAbility(*ability));
-    connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(setGui()));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(errorMessage(const QString&)));
     connect(modified(), SIGNAL(warning(const QString&)), this, SLOT(warningMessage(const QString&)));
@@ -58,13 +57,13 @@ void SpeciesAbilityUI::setGui()
     varWeight->setValue(static_cast<SpeciesAbility*>(modified())->weight());
 }
 
-void SpeciesAbilityUI::on_buttonApply_clicked()
+void SpeciesAbilityUI::apply()
 {
     *static_cast<SpeciesAbility*>(original()) = *static_cast<SpeciesAbility*>(modified());
     emit(changed(false));
 }
 
-void SpeciesAbilityUI::on_buttonDiscard_clicked()
+void SpeciesAbilityUI::discard()
 {
     *static_cast<SpeciesAbility*>(modified()) = *static_cast<SpeciesAbility*>(original());
     setGui();
diff --git a/pokemodr/SpeciesAbilityUI.h b/pokemodr/SpeciesAbilityUI.h
index 537b2a89..612b672a 100644
--- a/pokemodr/SpeciesAbilityUI.h
+++ b/pokemodr/SpeciesAbilityUI.h
@@ -35,8 +35,9 @@ class SpeciesAbilityUI : public ObjectUI, private Ui::formSpeciesAbility
         SpeciesAbilityUI(SpeciesAbility* ability, QWidget* parent);
         ~SpeciesAbilityUI();
     public slots:
-        void on_buttonApply_clicked();
-        void on_buttonDiscard_clicked();
+        void apply();
+        void discard();
+    protected slots:
         void on_varAbility_currentIndexChanged(const int ability);
         void on_varWeight_valueChanged(const int weight);
     private slots:
diff --git a/pokemodr/SpeciesEvolutionUI.cpp b/pokemodr/SpeciesEvolutionUI.cpp
index a963b505..b6313b38 100644
--- a/pokemodr/SpeciesEvolutionUI.cpp
+++ b/pokemodr/SpeciesEvolutionUI.cpp
@@ -32,7 +32,6 @@ SpeciesEvolutionUI::SpeciesEvolutionUI(SpeciesEvolution* evolution, QWidget* par
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(evolution, new SpeciesEvolution(*evolution));
-    connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(setGui()));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(errorMessage(const QString&)));
     connect(modified(), SIGNAL(warning(const QString&)), this, SLOT(warningMessage(const QString&)));
@@ -130,13 +129,13 @@ void SpeciesEvolutionUI::setGui()
     varLevel->setValue(static_cast<SpeciesEvolution*>(modified())->level());
 }
 
-void SpeciesEvolutionUI::on_buttonApply_clicked()
+void SpeciesEvolutionUI::apply()
 {
     *static_cast<SpeciesEvolution*>(original()) = *static_cast<SpeciesEvolution*>(modified());
     emit(changed(false));
 }
 
-void SpeciesEvolutionUI::on_buttonDiscard_clicked()
+void SpeciesEvolutionUI::discard()
 {
     *static_cast<SpeciesEvolution*>(modified()) = *static_cast<SpeciesEvolution*>(original());
     setGui();
diff --git a/pokemodr/SpeciesEvolutionUI.h b/pokemodr/SpeciesEvolutionUI.h
index 15f2a32e..d8752c23 100644
--- a/pokemodr/SpeciesEvolutionUI.h
+++ b/pokemodr/SpeciesEvolutionUI.h
@@ -35,8 +35,9 @@ class SpeciesEvolutionUI : public ObjectUI, private Ui::formSpeciesEvolution
         SpeciesEvolutionUI(SpeciesEvolution* evolution, QWidget* parent);
         ~SpeciesEvolutionUI();
     public slots:
-        void on_buttonApply_clicked();
-        void on_buttonDiscard_clicked();
+        void apply();
+        void discard();
+    protected slots:
         void on_varSpecies_currentIndexChanged(const int species);
         void on_varStyle_currentIndexChanged(const int style);
         void on_varValue1_currentIndexChanged(const int value1);
diff --git a/pokemodr/SpeciesItemUI.cpp b/pokemodr/SpeciesItemUI.cpp
index 449cee22..b3d412ed 100644
--- a/pokemodr/SpeciesItemUI.cpp
+++ b/pokemodr/SpeciesItemUI.cpp
@@ -29,7 +29,6 @@ SpeciesItemUI::SpeciesItemUI(SpeciesItem* item, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(item, new SpeciesItem(*item));
-    connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(setGui()));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(errorMessage(const QString&)));
     connect(modified(), SIGNAL(warning(const QString&)), this, SLOT(warningMessage(const QString&)));
@@ -58,13 +57,13 @@ void SpeciesItemUI::setGui()
     varWeight->setValue(static_cast<SpeciesItem*>(modified())->weight());
 }
 
-void SpeciesItemUI::on_buttonApply_clicked()
+void SpeciesItemUI::apply()
 {
     *static_cast<SpeciesItem*>(original()) = *static_cast<SpeciesItem*>(modified());
     emit(changed(false));
 }
 
-void SpeciesItemUI::on_buttonDiscard_clicked()
+void SpeciesItemUI::discard()
 {
     *static_cast<SpeciesItem*>(modified()) = *static_cast<SpeciesItem*>(original());
     setGui();
diff --git a/pokemodr/SpeciesItemUI.h b/pokemodr/SpeciesItemUI.h
index 0b22ef6e..970b0cf0 100644
--- a/pokemodr/SpeciesItemUI.h
+++ b/pokemodr/SpeciesItemUI.h
@@ -35,8 +35,9 @@ class SpeciesItemUI : public ObjectUI, private Ui::formSpeciesItem
         SpeciesItemUI(SpeciesItem* item, QWidget* parent);
         ~SpeciesItemUI();
     public slots:
-        void on_buttonApply_clicked();
-        void on_buttonDiscard_clicked();
+        void apply();
+        void discard();
+    protected slots:
         void on_varItem_currentIndexChanged(const int item);
         void on_varWeight_valueChanged(const int weight);
     private slots:
diff --git a/pokemodr/SpeciesMoveUI.cpp b/pokemodr/SpeciesMoveUI.cpp
index 272a9d1d..0f402c15 100644
--- a/pokemodr/SpeciesMoveUI.cpp
+++ b/pokemodr/SpeciesMoveUI.cpp
@@ -29,7 +29,6 @@ SpeciesMoveUI::SpeciesMoveUI(SpeciesMove* move, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(move, new SpeciesMove(*move));
-    connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(setGui()));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(errorMessage(const QString&)));
     connect(modified(), SIGNAL(warning(const QString&)), this, SLOT(warningMessage(const QString&)));
@@ -61,13 +60,13 @@ void SpeciesMoveUI::setGui()
     varWildLevel->setValue(static_cast<SpeciesMove*>(modified())->wild());
 }
 
-void SpeciesMoveUI::on_buttonApply_clicked()
+void SpeciesMoveUI::apply()
 {
     *static_cast<SpeciesMove*>(original()) = *static_cast<SpeciesMove*>(modified());
     emit(changed(false));
 }
 
-void SpeciesMoveUI::on_buttonDiscard_clicked()
+void SpeciesMoveUI::discard()
 {
     *static_cast<SpeciesMove*>(modified()) = *static_cast<SpeciesMove*>(original());
     setGui();
diff --git a/pokemodr/SpeciesMoveUI.h b/pokemodr/SpeciesMoveUI.h
index c7bfd9c6..8a2c7e87 100644
--- a/pokemodr/SpeciesMoveUI.h
+++ b/pokemodr/SpeciesMoveUI.h
@@ -35,8 +35,9 @@ class SpeciesMoveUI : public ObjectUI, private Ui::formSpeciesMove
         SpeciesMoveUI(SpeciesMove* move, QWidget* parent);
         ~SpeciesMoveUI();
     public slots:
-        void on_buttonApply_clicked();
-        void on_buttonDiscard_clicked();
+        void apply();
+        void discard();
+    protected slots:
         void on_varMove_currentIndexChanged(const int move);
         void on_varLevel_valueChanged(const int level);
         void on_varWildLevel_valueChanged(const int wildLevel);
diff --git a/pokemodr/SpeciesUI.cpp b/pokemodr/SpeciesUI.cpp
index a913c7c3..a75506c2 100644
--- a/pokemodr/SpeciesUI.cpp
+++ b/pokemodr/SpeciesUI.cpp
@@ -33,7 +33,6 @@ SpeciesUI::SpeciesUI(Species* species, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(species, new Species(*species));
-    connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(setGui()));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(errorMessage(const QString&)));
     connect(modified(), SIGNAL(warning(const QString&)), this, SLOT(warningMessage(const QString&)));
@@ -145,13 +144,13 @@ void SpeciesUI::setGui()
     }
 }
 
-void SpeciesUI::on_buttonApply_clicked()
+void SpeciesUI::apply()
 {
     *static_cast<Species*>(original()) = *static_cast<Species*>(modified());
     emit(changed(false));
 }
 
-void SpeciesUI::on_buttonDiscard_clicked()
+void SpeciesUI::discard()
 {
     *static_cast<Species*>(modified()) = *static_cast<Species*>(original());
     setGui();
diff --git a/pokemodr/SpeciesUI.h b/pokemodr/SpeciesUI.h
index 31348d72..ac50bc92 100644
--- a/pokemodr/SpeciesUI.h
+++ b/pokemodr/SpeciesUI.h
@@ -35,8 +35,9 @@ class SpeciesUI : public ObjectUI, private Ui::formSpecies
         SpeciesUI(Species* species, QWidget* parent);
         ~SpeciesUI();
     public slots:
-        void on_buttonApply_clicked();
-        void on_buttonDiscard_clicked();
+        void apply();
+        void discard();
+    protected slots:
         void on_varName_textChanged(const QString& name);
         void on_varBaseStatValue_valueChanged(const int baseStat);
         void on_varEffortValue_valueChanged(const int effortValue);
diff --git a/pokemodr/StoreUI.cpp b/pokemodr/StoreUI.cpp
index e354c966..16428ea1 100644
--- a/pokemodr/StoreUI.cpp
+++ b/pokemodr/StoreUI.cpp
@@ -29,7 +29,6 @@ StoreUI::StoreUI(Store* store, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(store, new Store(*store));
-    connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(setGui()));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(errorMessage(const QString&)));
     connect(modified(), SIGNAL(warning(const QString&)), this, SLOT(warningMessage(const QString&)));
@@ -62,13 +61,13 @@ void StoreUI::setGui()
     }
 }
 
-void StoreUI::on_buttonApply_clicked()
+void StoreUI::apply()
 {
     *static_cast<Store*>(original()) = *static_cast<Store*>(modified());
     emit(changed(false));
 }
 
-void StoreUI::on_buttonDiscard_clicked()
+void StoreUI::discard()
 {
     *static_cast<Store*>(modified()) = *static_cast<Store*>(original());
     setGui();
diff --git a/pokemodr/StoreUI.h b/pokemodr/StoreUI.h
index 966e97d3..655f45cf 100644
--- a/pokemodr/StoreUI.h
+++ b/pokemodr/StoreUI.h
@@ -35,8 +35,9 @@ class StoreUI : public ObjectUI, private Ui::formStore
         StoreUI(Store* store, QWidget* parent);
         ~StoreUI();
     public slots:
-        void on_buttonApply_clicked();
-        void on_buttonDiscard_clicked();
+        void apply();
+        void discard();
+    protected slots:
         void on_varName_textChanged(const QString& name);
         void on_varItems_itemSelectionChanged();
     private slots:
diff --git a/pokemodr/TileUI.cpp b/pokemodr/TileUI.cpp
index d9447880..9f5bd0bb 100644
--- a/pokemodr/TileUI.cpp
+++ b/pokemodr/TileUI.cpp
@@ -31,7 +31,6 @@ TileUI::TileUI(Tile* tile, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(tile, new Tile(*tile));
-    connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(setGui()));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(errorMessage(const QString&)));
     connect(modified(), SIGNAL(warning(const QString&)), this, SLOT(warningMessage(const QString&)));
@@ -82,13 +81,13 @@ void TileUI::setGui()
     varDirection->setEnabled((static_cast<Tile*>(modified())->forceType() != Tile::Stop) && (static_cast<Tile*>(modified())->forceType() != Tile::Slip));
 }
 
-void TileUI::on_buttonApply_clicked()
+void TileUI::apply()
 {
     *static_cast<Tile*>(original()) = *static_cast<Tile*>(modified());
     emit(changed(false));
 }
 
-void TileUI::on_buttonDiscard_clicked()
+void TileUI::discard()
 {
     *static_cast<Tile*>(modified()) = *static_cast<Tile*>(original());
     setGui();
diff --git a/pokemodr/TileUI.h b/pokemodr/TileUI.h
index 4571f005..ce021540 100644
--- a/pokemodr/TileUI.h
+++ b/pokemodr/TileUI.h
@@ -35,8 +35,9 @@ class TileUI : public ObjectUI, private Ui::formTile
         TileUI(Tile* tile, QWidget* parent);
         ~TileUI();
     public slots:
-        void on_buttonApply_clicked();
-        void on_buttonDiscard_clicked();
+        void apply();
+        void discard();
+    protected slots:
         void on_varName_textChanged(const QString& name);
         void on_varSprite_pressed();
         void on_varAccessibility_itemSelectionChanged();
diff --git a/pokemodr/TimeUI.cpp b/pokemodr/TimeUI.cpp
index 1196c15f..d2e9e6b1 100644
--- a/pokemodr/TimeUI.cpp
+++ b/pokemodr/TimeUI.cpp
@@ -27,7 +27,6 @@ TimeUI::TimeUI(Time* time, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(time, new Time(*time));
-    connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(setGui()));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(errorMessage(const QString&)));
     connect(modified(), SIGNAL(warning(const QString&)), this, SLOT(warningMessage(const QString&)));
@@ -45,13 +44,13 @@ void TimeUI::setGui()
     varTime->setTime(QTime(static_cast<Time*>(modified())->hour(), static_cast<Time*>(modified())->minute()));
 }
 
-void TimeUI::on_buttonApply_clicked()
+void TimeUI::apply()
 {
     *static_cast<Time*>(original()) = *static_cast<Time*>(modified());
     emit(changed(false));
 }
 
-void TimeUI::on_buttonDiscard_clicked()
+void TimeUI::discard()
 {
     *static_cast<Time*>(modified()) = *static_cast<Time*>(original());
     setGui();
diff --git a/pokemodr/TimeUI.h b/pokemodr/TimeUI.h
index 33864923..b888776c 100644
--- a/pokemodr/TimeUI.h
+++ b/pokemodr/TimeUI.h
@@ -35,8 +35,9 @@ class TimeUI : public ObjectUI, private Ui::formTime
         TimeUI(Time* time, QWidget* parent);
         ~TimeUI();
     public slots:
-        void on_buttonApply_clicked();
-        void on_buttonDiscard_clicked();
+        void apply();
+        void discard();
+    protected slots:
         void on_varName_textChanged(const QString& n);
         void on_varTime_timeChanged(const QTime& t);
     private slots:
diff --git a/pokemodr/TrainerUI.cpp b/pokemodr/TrainerUI.cpp
index 506cfa7a..03d39792 100644
--- a/pokemodr/TrainerUI.cpp
+++ b/pokemodr/TrainerUI.cpp
@@ -30,7 +30,6 @@ TrainerUI::TrainerUI(Trainer * trainer, QWidget * parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(trainer, new Trainer(*trainer));
-    connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(setGui()));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(errorMessage(const QString&)));
     connect(modified(), SIGNAL(warning(const QString&)), this, SLOT(warningMessage(const QString&)));
@@ -50,13 +49,13 @@ void TrainerUI::setGui()
 //     varAI->setText(QFile::exists(static_cast<Trainer*>(modified())->ai()) ? "Valid" : "Invalid");
 }
 
-void TrainerUI::on_buttonApply_clicked()
+void TrainerUI::apply()
 {
     *static_cast<Trainer*>(original()) = *static_cast<Trainer*>(modified());
     emit(changed(false));
 }
 
-void TrainerUI::on_buttonDiscard_clicked()
+void TrainerUI::discard()
 {
     *static_cast<Trainer*>(modified()) = *static_cast<Trainer*>(original());
     emit(changed(false));
diff --git a/pokemodr/TrainerUI.h b/pokemodr/TrainerUI.h
index e1aa6859..55bb818a 100644
--- a/pokemodr/TrainerUI.h
+++ b/pokemodr/TrainerUI.h
@@ -35,8 +35,9 @@ class TrainerUI : public ObjectUI, private Ui::formTrainer
         TrainerUI(Trainer* trainer, QWidget* parent);
         ~TrainerUI();
     public slots:
-        void on_buttonApply_clicked();
-        void on_buttonDiscard_clicked();
+        void apply();
+        void discard();
+    protected slots:
         void on_varName_textChanged(const QString& name);
         void on_varMoneyFactor_valueChaged(const int moneyFactor);
         void on_varSkin_pressed();
diff --git a/pokemodr/TypeUI.cpp b/pokemodr/TypeUI.cpp
index 49697a24..893c9709 100644
--- a/pokemodr/TypeUI.cpp
+++ b/pokemodr/TypeUI.cpp
@@ -27,7 +27,6 @@ TypeUI::TypeUI(Type* type, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(type, new Type(*type));
-    connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(setGui()));
     connect(modified(), SIGNAL(error(const QString&)), this, SLOT(errorMessage(const QString&)));
     connect(modified(), SIGNAL(warning(const QString&)), this, SLOT(warningMessage(const QString&)));
@@ -45,13 +44,13 @@ void TypeUI::setGui()
     varSTAB->setValue(static_cast<Type*>(modified())->stab());
 }
 
-void TypeUI::on_buttonApply_clicked()
+void TypeUI::apply()
 {
     *static_cast<Type*>(original()) = *static_cast<Type*>(modified());
     emit(changed(false));
 }
 
-void TypeUI::on_buttonDiscard_clicked()
+void TypeUI::discard()
 {
     *static_cast<Type*>(modified()) = *static_cast<Type*>(original());
     setGui();
diff --git a/pokemodr/TypeUI.h b/pokemodr/TypeUI.h
index 73552701..2e3c9632 100644
--- a/pokemodr/TypeUI.h
+++ b/pokemodr/TypeUI.h
@@ -35,8 +35,9 @@ class TypeUI : public ObjectUI, private Ui::formType
         TypeUI(Type* type, QWidget* parent);
         ~TypeUI();
     public slots:
-        void on_buttonApply_clicked();
-        void on_buttonDiscard_clicked();
+        void apply();
+        void discard();
+    protected slots:
         void on_varName_textChanged(const QString& name);
         void on_varSTAB_valueChanged(const Fraction& stab);
     private slots:
diff --git a/pokemodr/gui/ability.ui b/pokemodr/gui/ability.ui
index 8dd6e7c7..3bd91d51 100644
--- a/pokemodr/gui/ability.ui
+++ b/pokemodr/gui/ability.ui
@@ -3,32 +3,6 @@
  <widget class="QWidget" name="formAbility" >
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QGroupBox" name="boxButtons" >
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KPushButton" name="buttonApply" >
-        <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="shortcut" >
-         <string>Ctrl+Return</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KPushButton" name="buttonDiscard" >
-        <property name="text" >
-         <string>&amp;Discard</string>
-        </property>
-        <property name="shortcut" >
-         <string>Esc</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="QGroupBox" name="boxName" >
      <property name="title" >
       <string>Name</string>
diff --git a/pokemodr/gui/abilityeffect.ui b/pokemodr/gui/abilityeffect.ui
index 6a7357d5..2305a554 100644
--- a/pokemodr/gui/abilityeffect.ui
+++ b/pokemodr/gui/abilityeffect.ui
@@ -3,32 +3,6 @@
  <widget class="QWidget" name="formAbilityEffect" >
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QGroupBox" name="boxButtons" >
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KPushButton" name="buttonApply" >
-        <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="shortcut" >
-         <string>Ctrl+Return</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KPushButton" name="buttonDiscard" >
-        <property name="text" >
-         <string>&amp;Discard</string>
-        </property>
-        <property name="shortcut" >
-         <string>Esc</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="QGroupBox" name="boxChance" >
      <property name="title" >
       <string>Chance</string>
diff --git a/pokemodr/gui/author.ui b/pokemodr/gui/author.ui
index 3276152f..10c6c8ad 100644
--- a/pokemodr/gui/author.ui
+++ b/pokemodr/gui/author.ui
@@ -3,32 +3,6 @@
  <widget class="QWidget" name="formAuthor" >
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QGroupBox" name="boxButtons" >
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KPushButton" name="buttonApply" >
-        <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="shortcut" >
-         <string>Ctrl+Return</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KPushButton" name="buttonDiscard" >
-        <property name="text" >
-         <string>&amp;Discard</string>
-        </property>
-        <property name="shortcut" >
-         <string>Esc</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="QGroupBox" name="boxName" >
      <property name="title" >
       <string>Name</string>
diff --git a/pokemodr/gui/badge.ui b/pokemodr/gui/badge.ui
index 952124f8..a838d4a6 100644
--- a/pokemodr/gui/badge.ui
+++ b/pokemodr/gui/badge.ui
@@ -3,32 +3,6 @@
  <widget class="QWidget" name="formBadge" >
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QGroupBox" name="boxButtons" >
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KPushButton" name="buttonApply" >
-        <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="shortcut" >
-         <string>Ctrl+Return</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KPushButton" name="buttonDiscard" >
-        <property name="text" >
-         <string>&amp;Discard</string>
-        </property>
-        <property name="shortcut" >
-         <string>Esc</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="QGroupBox" name="boxName" >
      <property name="title" >
       <string>Name</string>
diff --git a/pokemodr/gui/coinlist.ui b/pokemodr/gui/coinlist.ui
index 523a9446..86b20965 100644
--- a/pokemodr/gui/coinlist.ui
+++ b/pokemodr/gui/coinlist.ui
@@ -3,32 +3,6 @@
  <widget class="QWidget" name="formCoinList" >
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QGroupBox" name="boxButtons" >
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KPushButton" name="buttonApply" >
-        <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="shortcut" >
-         <string>Ctrl+Return</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KPushButton" name="buttonDiscard" >
-        <property name="text" >
-         <string>&amp;Discard</string>
-        </property>
-        <property name="shortcut" >
-         <string>Esc</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="QGroupBox" name="boxName" >
      <property name="title" >
       <string>Name</string>
diff --git a/pokemodr/gui/coinlistobject.ui b/pokemodr/gui/coinlistobject.ui
index 2c512f96..bc6d480e 100644
--- a/pokemodr/gui/coinlistobject.ui
+++ b/pokemodr/gui/coinlistobject.ui
@@ -3,32 +3,6 @@
  <widget class="QWidget" name="formCoinListObject" >
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QGroupBox" name="boxButtons" >
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KPushButton" name="buttonApply" >
-        <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="shortcut" >
-         <string>Ctrl+Return</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KPushButton" name="buttonDiscard" >
-        <property name="text" >
-         <string>&amp;Discard</string>
-        </property>
-        <property name="shortcut" >
-         <string>Esc</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="QGroupBox" name="boxType" >
      <property name="title" >
       <string>Type</string>
diff --git a/pokemodr/gui/dialog.ui b/pokemodr/gui/dialog.ui
index 94a2e9b3..e40bfc9d 100644
--- a/pokemodr/gui/dialog.ui
+++ b/pokemodr/gui/dialog.ui
@@ -3,32 +3,6 @@
  <widget class="QWidget" name="formDialog" >
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QGroupBox" name="boxButtons" >
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KPushButton" name="buttonApply" >
-        <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="shortcut" >
-         <string>Ctrl+Return</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KPushButton" name="buttonDiscard" >
-        <property name="text" >
-         <string>&amp;Discard</string>
-        </property>
-        <property name="shortcut" >
-         <string>Esc</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="QGroupBox" name="boxDialog" >
      <property name="title" >
       <string>Dialog</string>
diff --git a/pokemodr/gui/egggroup.ui b/pokemodr/gui/egggroup.ui
index 1fad2f23..a1e4f0bf 100644
--- a/pokemodr/gui/egggroup.ui
+++ b/pokemodr/gui/egggroup.ui
@@ -3,32 +3,6 @@
  <widget class="QWidget" name="formEggGroup" >
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QGroupBox" name="boxButtons" >
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KPushButton" name="buttonApply" >
-        <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="shortcut" >
-         <string>Ctrl+Return</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KPushButton" name="buttonDiscard" >
-        <property name="text" >
-         <string>&amp;Discard</string>
-        </property>
-        <property name="shortcut" >
-         <string>Esc</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="QGroupBox" name="boxName" >
      <property name="title" >
       <string>Name</string>
diff --git a/pokemodr/gui/item.ui b/pokemodr/gui/item.ui
index 436fb3c7..54e65e27 100644
--- a/pokemodr/gui/item.ui
+++ b/pokemodr/gui/item.ui
@@ -3,32 +3,6 @@
  <widget class="QWidget" name="formItem" >
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QGroupBox" name="boxButtons" >
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KPushButton" name="buttonApply" >
-        <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="shortcut" >
-         <string>Ctrl+Return</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KPushButton" name="buttonDiscard" >
-        <property name="text" >
-         <string>&amp;Discard</string>
-        </property>
-        <property name="shortcut" >
-         <string>Esc</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="QGroupBox" name="boxName" >
      <property name="title" >
       <string>Name</string>
diff --git a/pokemodr/gui/itemeffect.ui b/pokemodr/gui/itemeffect.ui
index 79e3441f..eeb59fcc 100644
--- a/pokemodr/gui/itemeffect.ui
+++ b/pokemodr/gui/itemeffect.ui
@@ -3,32 +3,6 @@
  <widget class="QWidget" name="formItemEffect" >
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QGroupBox" name="boxButtons" >
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KPushButton" name="buttonApply" >
-        <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="shortcut" >
-         <string>Ctrl+Return</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KPushButton" name="buttonDiscard" >
-        <property name="text" >
-         <string>&amp;Discard</string>
-        </property>
-        <property name="shortcut" >
-         <string>Esc</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="QGroupBox" name="boxFlags" >
      <property name="title" >
       <string>Flags</string>
diff --git a/pokemodr/gui/itemtype.ui b/pokemodr/gui/itemtype.ui
index 10e44be8..3f5f2944 100644
--- a/pokemodr/gui/itemtype.ui
+++ b/pokemodr/gui/itemtype.ui
@@ -3,32 +3,6 @@
  <widget class="QWidget" name="formItemType" >
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QGroupBox" name="boxButtons" >
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KPushButton" name="buttonApply" >
-        <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="shortcut" >
-         <string>Ctrl+Return</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KPushButton" name="buttonDiscard" >
-        <property name="text" >
-         <string>&amp;Discard</string>
-        </property>
-        <property name="shortcut" >
-         <string>Esc</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="QGroupBox" name="boxName" >
      <property name="title" >
       <string>Name</string>
diff --git a/pokemodr/gui/map.ui b/pokemodr/gui/map.ui
index f36ac62d..c1a47f36 100644
--- a/pokemodr/gui/map.ui
+++ b/pokemodr/gui/map.ui
@@ -3,32 +3,6 @@
  <widget class="QWidget" name="formMap" >
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QGroupBox" name="boxButtons" >
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KPushButton" name="buttonApply" >
-        <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="shortcut" >
-         <string>Ctrl+Return</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KPushButton" name="buttonDiscard" >
-        <property name="text" >
-         <string>&amp;Discard</string>
-        </property>
-        <property name="shortcut" >
-         <string>Esc</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="QGroupBox" name="boxName" >
      <property name="title" >
       <string>Name</string>
diff --git a/pokemodr/gui/mapeffect.ui b/pokemodr/gui/mapeffect.ui
index 0399d0f8..12d6a248 100644
--- a/pokemodr/gui/mapeffect.ui
+++ b/pokemodr/gui/mapeffect.ui
@@ -3,32 +3,6 @@
  <widget class="QWidget" name="formMapEffect" >
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QGroupBox" name="boxButtons" >
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KPushButton" name="buttonApply" >
-        <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="shortcut" >
-         <string>Ctrl+Return</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KPushButton" name="buttonDiscard" >
-        <property name="text" >
-         <string>&amp;Discard</string>
-        </property>
-        <property name="shortcut" >
-         <string>Esc</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="QGroupBox" name="boxName" >
      <property name="title" >
       <string>Name</string>
diff --git a/pokemodr/gui/maptrainer.ui b/pokemodr/gui/maptrainer.ui
index 2ab7b7ae..e9040213 100644
--- a/pokemodr/gui/maptrainer.ui
+++ b/pokemodr/gui/maptrainer.ui
@@ -3,32 +3,6 @@
  <widget class="QWidget" name="formMapTrainer" >
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QGroupBox" name="boxButtons" >
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KPushButton" name="buttonApply" >
-        <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="shortcut" >
-         <string>Ctrl+Return</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KPushButton" name="buttonDiscard" >
-        <property name="text" >
-         <string>&amp;Discard</string>
-        </property>
-        <property name="shortcut" >
-         <string>Esc</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="QGroupBox" name="boxName" >
      <property name="title" >
       <string>Name</string>
diff --git a/pokemodr/gui/maptrainerteammember.ui b/pokemodr/gui/maptrainerteammember.ui
index 0df51ed4..37a7c3ad 100644
--- a/pokemodr/gui/maptrainerteammember.ui
+++ b/pokemodr/gui/maptrainerteammember.ui
@@ -3,32 +3,6 @@
  <widget class="QWidget" name="formMapTrainerTeamMember" >
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QGroupBox" name="boxButtons" >
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KPushButton" name="buttonApply" >
-        <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="shortcut" >
-         <string>Ctrl+Return</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KPushButton" name="buttonDiscard" >
-        <property name="text" >
-         <string>&amp;Discard</string>
-        </property>
-        <property name="shortcut" >
-         <string>Esc</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="QGroupBox" name="boxSpecies" >
      <property name="title" >
       <string>Species</string>
diff --git a/pokemodr/gui/mapwarp.ui b/pokemodr/gui/mapwarp.ui
index f5536d5b..fa8aa693 100644
--- a/pokemodr/gui/mapwarp.ui
+++ b/pokemodr/gui/mapwarp.ui
@@ -3,32 +3,6 @@
  <widget class="QWidget" name="formMapWarp" >
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QGroupBox" name="boxButtons" >
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KPushButton" name="buttonApply" >
-        <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="shortcut" >
-         <string>Ctrl+Return</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KPushButton" name="buttonDiscard" >
-        <property name="text" >
-         <string>&amp;Discard</string>
-        </property>
-        <property name="shortcut" >
-         <string>Esc</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="QGroupBox" name="boxName" >
      <property name="title" >
       <string>Name</string>
diff --git a/pokemodr/gui/mapwildlist.ui b/pokemodr/gui/mapwildlist.ui
index 24773c9d..1f6400c6 100644
--- a/pokemodr/gui/mapwildlist.ui
+++ b/pokemodr/gui/mapwildlist.ui
@@ -3,32 +3,6 @@
  <widget class="QWidget" name="formMapWildList" >
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QGroupBox" name="boxButtons" >
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KPushButton" name="buttonApply" >
-        <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="shortcut" >
-         <string>Ctrl+Return</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KPushButton" name="buttonDiscard" >
-        <property name="text" >
-         <string>&amp;Discard</string>
-        </property>
-        <property name="shortcut" >
-         <string>Esc</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="QGroupBox" name="boxControl" >
      <property name="title" >
       <string>Control</string>
diff --git a/pokemodr/gui/mapwildlistencounter.ui b/pokemodr/gui/mapwildlistencounter.ui
index 27f66b6a..233f42c6 100644
--- a/pokemodr/gui/mapwildlistencounter.ui
+++ b/pokemodr/gui/mapwildlistencounter.ui
@@ -3,32 +3,6 @@
  <widget class="QWidget" name="formMapWildListEncounter" >
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QGroupBox" name="boxButtons" >
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KPushButton" name="buttonApply" >
-        <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="shortcut" >
-         <string>Ctrl+Return</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KPushButton" name="buttonDiscard" >
-        <property name="text" >
-         <string>&amp;Discard</string>
-        </property>
-        <property name="shortcut" >
-         <string>Esc</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="QGroupBox" name="groupBox" >
      <property name="title" >
       <string>Species</string>
diff --git a/pokemodr/gui/move.ui b/pokemodr/gui/move.ui
index 946c3528..52b8df45 100644
--- a/pokemodr/gui/move.ui
+++ b/pokemodr/gui/move.ui
@@ -3,32 +3,6 @@
  <widget class="QWidget" name="formMove" >
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QGroupBox" name="boxButtons" >
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KPushButton" name="buttonApply" >
-        <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="shortcut" >
-         <string>Ctrl+Return</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KPushButton" name="buttonDiscard" >
-        <property name="text" >
-         <string>&amp;Discard</string>
-        </property>
-        <property name="shortcut" >
-         <string>Esc</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="QGroupBox" name="boxName" >
      <property name="title" >
       <string>Name</string>
diff --git a/pokemodr/gui/moveeffect.ui b/pokemodr/gui/moveeffect.ui
index cd2b2680..b2187647 100644
--- a/pokemodr/gui/moveeffect.ui
+++ b/pokemodr/gui/moveeffect.ui
@@ -3,32 +3,6 @@
  <widget class="QWidget" name="formMoveEffect" >
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QGroupBox" name="boxButtons" >
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KPushButton" name="buttonApply" >
-        <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="shortcut" >
-         <string>Ctrl+Return</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KPushButton" name="buttonDiscard" >
-        <property name="text" >
-         <string>&amp;Discard</string>
-        </property>
-        <property name="shortcut" >
-         <string>Esc</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="QGroupBox" name="boxChance" >
      <property name="title" >
       <string>Chance</string>
diff --git a/pokemodr/gui/nature.ui b/pokemodr/gui/nature.ui
index fa60819b..800e6abf 100644
--- a/pokemodr/gui/nature.ui
+++ b/pokemodr/gui/nature.ui
@@ -3,32 +3,6 @@
  <widget class="QWidget" name="formNature" >
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QGroupBox" name="boxButtons" >
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KPushButton" name="buttonApply" >
-        <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="shortcut" >
-         <string>Ctrl+Return</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KPushButton" name="buttonDiscard" >
-        <property name="text" >
-         <string>&amp;Discard</string>
-        </property>
-        <property name="shortcut" >
-         <string>Esc</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="QGroupBox" name="boxName" >
      <property name="title" >
       <string>Name</string>
diff --git a/pokemodr/gui/point.ui b/pokemodr/gui/point.ui
index d310ae96..cb1db190 100644
--- a/pokemodr/gui/point.ui
+++ b/pokemodr/gui/point.ui
@@ -1,17 +1,6 @@
 <ui version="4.0" >
  <class>formPoint</class>
  <widget class="QWidget" name="formPoint" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>128</width>
-    <height>112</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string/>
-  </property>
   <layout class="QVBoxLayout" >
    <item>
     <widget class="KIntNumInput" name="varX" >
@@ -28,15 +17,9 @@
      <property name="label" >
       <string>y</string>
      </property>
-     <property name="value" >
-      <number>0</number>
-     </property>
      <property name="minimum" >
       <number>0</number>
      </property>
-     <property name="referencePoint" >
-      <number>0</number>
-     </property>
     </widget>
    </item>
   </layout>
diff --git a/pokemodr/gui/pokemod.ui b/pokemodr/gui/pokemod.ui
index 8d0a317e..8759880a 100644
--- a/pokemodr/gui/pokemod.ui
+++ b/pokemodr/gui/pokemod.ui
@@ -3,32 +3,6 @@
  <widget class="QWidget" name="formPokemod" >
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QGroupBox" name="boxButtons" >
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KPushButton" name="buttonApply" >
-        <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="shortcut" >
-         <string>Ctrl+Return</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KPushButton" name="buttonDiscard" >
-        <property name="text" >
-         <string>&amp;Discard</string>
-        </property>
-        <property name="shortcut" >
-         <string>Esc</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="KTabWidget" name="notebookPokemod" >
      <property name="currentIndex" >
       <number>0</number>
diff --git a/pokemodr/gui/pokemodr.ui b/pokemodr/gui/pokemodr.ui
index c1d20a51..6dbf42db 100644
--- a/pokemodr/gui/pokemodr.ui
+++ b/pokemodr/gui/pokemodr.ui
@@ -1,18 +1,7 @@
 <ui version="4.0" >
  <class>formPokeModr</class>
  <widget class="KMainWindow" name="formPokeModr" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>800</width>
-    <height>600</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>PokéModr</string>
-  </property>
-  <widget class="QWidget" name="centralwidget" >
+  <widget class="QWidget" name="frameMain" >
    <layout class="QVBoxLayout" >
     <item>
      <widget class="QSplitter" name="splitter" >
@@ -39,7 +28,46 @@
         <bool>true</bool>
        </property>
       </widget>
-      <widget class="QScrollArea" name="formPanel" />
+      <widget class="QFrame" name="frameEditor" >
+       <layout class="QVBoxLayout" >
+        <item>
+         <widget class="QGroupBox" name="boxButtons" >
+          <layout class="QHBoxLayout" >
+           <item>
+            <widget class="KPushButton" name="buttonApply" >
+             <property name="text" >
+              <string>&amp;Apply</string>
+             </property>
+             <property name="shortcut" >
+              <string>Ctrl+Return</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="KPushButton" name="buttonDiscard" >
+             <property name="text" >
+              <string>&amp;Discard</string>
+             </property>
+             <property name="shortcut" >
+              <string>Esc</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item>
+         <widget class="QScrollArea" name="formPanel" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+            <horstretch>0</horstretch>
+            <verstretch>1</verstretch>
+           </sizepolicy>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
      </widget>
     </item>
    </layout>
@@ -47,6 +75,11 @@
  </widget>
  <customwidgets>
   <customwidget>
+   <class>KPushButton</class>
+   <extends>QPushButton</extends>
+   <header>kpushbutton.h</header>
+  </customwidget>
+  <customwidget>
    <class>QScrollArea</class>
    <extends>QFrame</extends>
    <header>QScrollArea</header>
diff --git a/pokemodr/gui/rules.ui b/pokemodr/gui/rules.ui
index f5454f37..c410f15d 100644
--- a/pokemodr/gui/rules.ui
+++ b/pokemodr/gui/rules.ui
@@ -3,32 +3,6 @@
  <widget class="QWidget" name="formRules" >
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QGroupBox" name="boxButtons" >
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KPushButton" name="buttonApply" >
-        <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="shortcut" >
-         <string>Ctrl+Return</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KPushButton" name="buttonDiscard" >
-        <property name="text" >
-         <string>&amp;Discard</string>
-        </property>
-        <property name="shortcut" >
-         <string>Esc</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="KTabWidget" name="notebookRules" >
      <property name="currentIndex" >
       <number>0</number>
diff --git a/pokemodr/gui/sound.ui b/pokemodr/gui/sound.ui
index a00bfd2f..120a63f3 100644
--- a/pokemodr/gui/sound.ui
+++ b/pokemodr/gui/sound.ui
@@ -3,32 +3,6 @@
  <widget class="QWidget" name="formSound" >
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QGroupBox" name="boxButtons" >
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KPushButton" name="buttonApply" >
-        <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="shortcut" >
-         <string>Ctrl+Return</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KPushButton" name="buttonDiscard" >
-        <property name="text" >
-         <string>&amp;Discard</string>
-        </property>
-        <property name="shortcut" >
-         <string>Esc</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="QGroupBox" name="boxName" >
      <property name="title" >
       <string>Name</string>
diff --git a/pokemodr/gui/species.ui b/pokemodr/gui/species.ui
index 97a0ce77..6c7e4319 100644
--- a/pokemodr/gui/species.ui
+++ b/pokemodr/gui/species.ui
@@ -1,35 +1,8 @@
 <ui version="4.0" >
- <author>Ben Boeckel</author>
  <class>formSpecies</class>
  <widget class="QWidget" name="formSpecies" >
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QGroupBox" name="boxButtons" >
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KPushButton" name="buttonApply" >
-        <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="shortcut" >
-         <string>Ctrl+Return</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KPushButton" name="buttonDiscard" >
-        <property name="text" >
-         <string>&amp;Discard</string>
-        </property>
-        <property name="shortcut" >
-         <string>Esc</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="KTabWidget" name="notebookSpecies" >
      <property name="currentIndex" >
       <number>0</number>
diff --git a/pokemodr/gui/speciesability.ui b/pokemodr/gui/speciesability.ui
index 6fe8e965..f483ce7b 100644
--- a/pokemodr/gui/speciesability.ui
+++ b/pokemodr/gui/speciesability.ui
@@ -3,32 +3,6 @@
  <widget class="QWidget" name="formSpeciesAbility" >
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QGroupBox" name="boxButtons" >
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KPushButton" name="buttonApply" >
-        <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="shortcut" >
-         <string>Ctrl+Return</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KPushButton" name="buttonDiscard" >
-        <property name="text" >
-         <string>&amp;Discard</string>
-        </property>
-        <property name="shortcut" >
-         <string>Esc</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="QGroupBox" name="boxItem" >
      <property name="title" >
       <string>Ability</string>
diff --git a/pokemodr/gui/speciesevolution.ui b/pokemodr/gui/speciesevolution.ui
index 9b7b6de9..98271bb9 100644
--- a/pokemodr/gui/speciesevolution.ui
+++ b/pokemodr/gui/speciesevolution.ui
@@ -3,32 +3,6 @@
  <widget class="QWidget" name="formSpeciesEvolution" >
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QGroupBox" name="boxButtons" >
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KPushButton" name="buttonApply" >
-        <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="shortcut" >
-         <string>Ctrl+Return</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KPushButton" name="buttonDiscard" >
-        <property name="text" >
-         <string>&amp;Discard</string>
-        </property>
-        <property name="shortcut" >
-         <string>Esc</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="QGroupBox" name="boxSpecies" >
      <property name="title" >
       <string>Species</string>
diff --git a/pokemodr/gui/speciesitem.ui b/pokemodr/gui/speciesitem.ui
index b16d0905..19fdbe1c 100644
--- a/pokemodr/gui/speciesitem.ui
+++ b/pokemodr/gui/speciesitem.ui
@@ -3,32 +3,6 @@
  <widget class="QWidget" name="formSpeciesItem" >
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QGroupBox" name="boxButtons" >
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KPushButton" name="buttonApply" >
-        <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="shortcut" >
-         <string>Ctrl+Return</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KPushButton" name="buttonDiscard" >
-        <property name="text" >
-         <string>&amp;Discard</string>
-        </property>
-        <property name="shortcut" >
-         <string>Esc</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="QGroupBox" name="boxItem" >
      <property name="title" >
       <string>Item</string>
diff --git a/pokemodr/gui/speciesmove.ui b/pokemodr/gui/speciesmove.ui
index cf1641c1..5dd3d8ab 100644
--- a/pokemodr/gui/speciesmove.ui
+++ b/pokemodr/gui/speciesmove.ui
@@ -3,32 +3,6 @@
  <widget class="QWidget" name="formSpeciesMove" >
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QGroupBox" name="boxButtons" >
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KPushButton" name="buttonApply" >
-        <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="shortcut" >
-         <string>Ctrl+Return</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KPushButton" name="buttonDiscard" >
-        <property name="text" >
-         <string>&amp;Discard</string>
-        </property>
-        <property name="shortcut" >
-         <string>Esc</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="QGroupBox" name="boxMove" >
      <property name="title" >
       <string>Move</string>
diff --git a/pokemodr/gui/store.ui b/pokemodr/gui/store.ui
index db2c946b..dff1a633 100644
--- a/pokemodr/gui/store.ui
+++ b/pokemodr/gui/store.ui
@@ -3,32 +3,6 @@
  <widget class="QWidget" name="formStore" >
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QGroupBox" name="boxButtons" >
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KPushButton" name="buttonApply" >
-        <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="shortcut" >
-         <string>Ctrl+Return</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KPushButton" name="buttonDiscard" >
-        <property name="text" >
-         <string>&amp;Discard</string>
-        </property>
-        <property name="shortcut" >
-         <string>Esc</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="QGroupBox" name="boxName" >
      <property name="title" >
       <string>Name</string>
diff --git a/pokemodr/gui/tile.ui b/pokemodr/gui/tile.ui
index ed7944ad..0382f871 100644
--- a/pokemodr/gui/tile.ui
+++ b/pokemodr/gui/tile.ui
@@ -3,32 +3,6 @@
  <widget class="QWidget" name="formTile" >
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QGroupBox" name="boxButtons" >
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KPushButton" name="buttonApply" >
-        <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="shortcut" >
-         <string>Ctrl+Return</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KPushButton" name="buttonDiscard" >
-        <property name="text" >
-         <string>&amp;Discard</string>
-        </property>
-        <property name="shortcut" >
-         <string>Esc</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="QGroupBox" name="boxName" >
      <property name="title" >
       <string>Name</string>
diff --git a/pokemodr/gui/time.ui b/pokemodr/gui/time.ui
index e6f169e3..ff1e51b2 100644
--- a/pokemodr/gui/time.ui
+++ b/pokemodr/gui/time.ui
@@ -3,32 +3,6 @@
  <widget class="QWidget" name="formTime" >
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QGroupBox" name="boxButtons" >
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KPushButton" name="buttonApply" >
-        <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="shortcut" >
-         <string>Ctrl+Return</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KPushButton" name="buttonDiscard" >
-        <property name="text" >
-         <string>&amp;Discard</string>
-        </property>
-        <property name="shortcut" >
-         <string>Esc</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="QGroupBox" name="boxName" >
      <property name="title" >
       <string>Name</string>
diff --git a/pokemodr/gui/trainer.ui b/pokemodr/gui/trainer.ui
index b6ffc82a..d95a72d5 100644
--- a/pokemodr/gui/trainer.ui
+++ b/pokemodr/gui/trainer.ui
@@ -3,32 +3,6 @@
  <widget class="QWidget" name="formTrainer" >
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QGroupBox" name="boxButtons" >
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KPushButton" name="buttonApply" >
-        <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="shortcut" >
-         <string>Ctrl+Return</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KPushButton" name="buttonDiscard" >
-        <property name="text" >
-         <string>&amp;Discard</string>
-        </property>
-        <property name="shortcut" >
-         <string>Esc</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="QGroupBox" name="boxName" >
      <property name="title" >
       <string>Name</string>
diff --git a/pokemodr/gui/type.ui b/pokemodr/gui/type.ui
index 6a224eaa..13c2d048 100644
--- a/pokemodr/gui/type.ui
+++ b/pokemodr/gui/type.ui
@@ -3,32 +3,6 @@
  <widget class="QWidget" name="formType" >
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="QGroupBox" name="boxButtons" >
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KPushButton" name="buttonApply" >
-        <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="shortcut" >
-         <string>Ctrl+Return</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KPushButton" name="buttonDiscard" >
-        <property name="text" >
-         <string>&amp;Discard</string>
-        </property>
-        <property name="shortcut" >
-         <string>Esc</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <widget class="QGroupBox" name="boxName" >
      <property name="title" >
       <string>Name</string>