summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2008-01-30 19:31:11 +0000
committerBen Boeckel <MathStuf@gmail.com>2008-01-30 19:31:11 +0000
commitebbb362f9e70dc67354706fc2cbfc77d8dfcba4c (patch)
tree9805e26a60e64e868d54629f3f54d7f877337370
parent008dc40e274450a3de3452fb6175615d7b078148 (diff)
downloadsigen-ebbb362f9e70dc67354706fc2cbfc77d8dfcba4c.tar.gz
sigen-ebbb362f9e70dc67354706fc2cbfc77d8dfcba4c.tar.xz
sigen-ebbb362f9e70dc67354706fc2cbfc77d8dfcba4c.zip
[ADD] BadgeUI, AuthorUI, and AbilityUI
[FIX] Fix up UI forms [FIX] win32 builds now allow exceptions [FIX] Tidy up other UI logic files git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@50 6ecfd1a5-f3ed-3746-8530-beee90d26b22
-rw-r--r--Changelog10
-rw-r--r--general/general.pro4
-rw-r--r--pokemod/pokemod.pro4
-rw-r--r--pokemodr/AbilityUI.cpp64
-rw-r--r--pokemodr/AbilityUI.h55
-rw-r--r--pokemodr/AuthorUI.cpp78
-rw-r--r--pokemodr/AuthorUI.h57
-rw-r--r--pokemodr/BadgeUI.cpp138
-rw-r--r--pokemodr/BadgeUI.h62
-rw-r--r--pokemodr/NatureUI.cpp2
-rw-r--r--pokemodr/TimeUI.cpp2
-rw-r--r--pokemodr/TimeUI.h1
-rw-r--r--pokemodr/gui/ability.ui2
-rw-r--r--pokemodr/gui/badge.ui8
-rw-r--r--pokemodr/gui/dialog.ui2
-rw-r--r--pokemodr/gui/item.ui2
-rw-r--r--pokemodr/gui/mapeffect.ui2
-rw-r--r--pokemodr/gui/maptrainer.ui8
-rw-r--r--pokemodr/gui/maptrainerteammember.ui2
-rw-r--r--pokemodr/gui/mapwildlist.ui2
-rw-r--r--pokemodr/gui/move.ui2
-rw-r--r--pokemodr/gui/pokemod.ui2
-rw-r--r--pokemodr/gui/species.ui2
-rw-r--r--pokemodr/gui/speciesability.ui6
-rw-r--r--pokemodr/gui/speciesmove.ui6
-rw-r--r--pokemodr/gui/tile.ui2
-rw-r--r--pokemodr/pokemodr.pro1
27 files changed, 497 insertions, 29 deletions
diff --git a/Changelog b/Changelog
index 095b7349..002419e6 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,14 @@
-----------------
+Rev: 50
+Date: 30 January 2008
+User: MathStuf
+-----------------
+[ADD] BadgeUI, AuthorUI, and AbilityUI
+[FIX] Fix up UI forms
+[FIX] win32 builds now allow exceptions
+[FIX] Tidy up other UI logic files
+
+-----------------
Rev: 49
Date: 25 January 2008
User: MathStuf
diff --git a/general/general.pro b/general/general.pro
index 7323ed4f..4db3741e 100644
--- a/general/general.pro
+++ b/general/general.pro
@@ -3,11 +3,12 @@ DESTDIR = ../../lib
MOC_DIR = .moc
LANGUAGE = C++
TEMPLATE = lib
-LIBS += -lphonon
+LIBS += -lphonon -lkdeui -lkdecore
INCLUDEPATH+=/usr/include/kde4
# Following is reformatted from the KTIGCC .pro file
win32 {
+ CONFIG += exceptions
KDEPREFIX = $$(KDEPREFIX)
isEmpty(KDEPREFIX) {
# Try running kde4-config, however chances are it's not in the path or it was compiled with a bad prefix.
@@ -46,7 +47,6 @@ win32 {
}
}
-
CONFIG += qt warn_on dll
SOURCES += *.cpp
diff --git a/pokemod/pokemod.pro b/pokemod/pokemod.pro
index 3d3ebbca..3e40ad85 100644
--- a/pokemod/pokemod.pro
+++ b/pokemod/pokemod.pro
@@ -4,6 +4,10 @@ LANGUAGE = C++
TEMPLATE = lib
LIBS += -L../../lib -lgeneral
+win32 {
+ CONFIG += exceptions
+}
+
CONFIG += qt warn_on dll
SOURCES += *.cpp
diff --git a/pokemodr/AbilityUI.cpp b/pokemodr/AbilityUI.cpp
new file mode 100644
index 00000000..d6c1eed8
--- /dev/null
+++ b/pokemodr/AbilityUI.cpp
@@ -0,0 +1,64 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name: pokegen/AbilityUI.cpp
+// Purpose: Ability UI form handling
+// Author: Ben Boeckel
+// Modified by: Ben Boeckel
+// Created: Sun Jan 27 12:31:08 2008
+// Copyright: ©2007-2008 Ben Boeckel and Nerdy Productions
+// Licence:
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program. If not, see <http://www.gnu.org/licenses/>.
+/////////////////////////////////////////////////////////////////////////////
+
+#include <QMetaObject>
+#include "../general/Exception.h"
+#include "AbilityUI.h"
+
+AbilityUI::AbilityUI(Ability* a, QWidget* parent) :
+ ObjectUI(parent),
+ ability(a),
+ ability_mod(new Ability(a->getPokemod(), *a, a->getId()))
+{
+ setupUi(this);
+ QMetaObject::connectSlotsByName(this);
+ setObjects(ability, ability_mod);
+ setGui();
+}
+
+// KToolbar AbilityUI::getToolbar(QWidget* parent)
+// {
+// }
+
+void AbilityUI::setGui()
+{
+ varName->setText(ability_mod->getName());
+}
+
+void AbilityUI::on_buttonApply_clicked()
+{
+ *ability = *ability_mod;
+ emit(setChanged(false));
+}
+
+void AbilityUI::on_buttonDiscard_clicked()
+{
+ *ability_mod = *ability;
+ emit(setChanged(false));
+ setGui();
+}
+
+void AbilityUI::on_varName_textChanged(const QString& n)
+{
+ ability_mod->setName(n);
+ emit(setChanged(true));
+}
diff --git a/pokemodr/AbilityUI.h b/pokemodr/AbilityUI.h
new file mode 100644
index 00000000..8f9c183f
--- /dev/null
+++ b/pokemodr/AbilityUI.h
@@ -0,0 +1,55 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name: pokegen/AbilityUI.h
+// Purpose: Ability UI form handling
+// Author: Ben Boeckel
+// Modified by: Ben Boeckel
+// Created: Sun Jan 27 12:29:48 2008
+// Copyright: ©2007-2008 Ben Boeckel and Nerdy Productions
+// Licence:
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program. If not, see <http://www.gnu.org/licenses/>.
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __POKEMODR_ABILITYUI__
+#define __POKEMODR_ABILITYUI__
+
+#include <ktoolbar.h>
+#include <QString>
+#include "../pokemod/Ability.h"
+#include "ObjectUI.h"
+#include "ui_ability.h"
+
+class AbilityUI : public ObjectUI, private Ui::formAbility
+{
+ Q_OBJECT
+
+ public:
+ AbilityUI(Ability* a, QWidget* parent);
+ ~AbilityUI()
+ {
+ delete ability_mod;
+ }
+
+// KToolbar getToolbar(QWidget* parent);
+ public slots:
+ void on_buttonApply_clicked();
+ void on_buttonDiscard_clicked();
+ void on_varName_textChanged(const QString& n);
+ private:
+ void setGui();
+
+ Ability* ability;
+ Ability* ability_mod;
+};
+
+#endif
diff --git a/pokemodr/AuthorUI.cpp b/pokemodr/AuthorUI.cpp
new file mode 100644
index 00000000..bab3847b
--- /dev/null
+++ b/pokemodr/AuthorUI.cpp
@@ -0,0 +1,78 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name: pokegen/AuthorUI.cpp
+// Purpose: Author UI form handling
+// Author: Ben Boeckel
+// Modified by: Ben Boeckel
+// Created: Sun Jan 27 12:45:04 2008
+// Copyright: ©2007-2008 Ben Boeckel and Nerdy Productions
+// Licence:
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program. If not, see <http://www.gnu.org/licenses/>.
+/////////////////////////////////////////////////////////////////////////////
+
+#include <QMetaObject>
+#include "../general/Exception.h"
+#include "AuthorUI.h"
+
+AuthorUI::AuthorUI(Author* a, QWidget* parent) :
+ ObjectUI(parent),
+ author(a),
+ author_mod(new Author(a->getPokemod(), *a, a->getId()))
+{
+ setupUi(this);
+ QMetaObject::connectSlotsByName(this);
+ setObjects(author, author_mod);
+ setGui();
+}
+
+// KToolbar AuthorUI::getToolbar(QWidget* parent)
+// {
+// }
+
+void AuthorUI::setGui()
+{
+ varName->setText(author_mod->getName());
+ varEmail->setText(author_mod->getEmail());
+ varRole->setText(author_mod->getRole());
+}
+
+void AuthorUI::on_buttonApply_clicked()
+{
+ *author = *author_mod;
+ emit(setChanged(false));
+}
+
+void AuthorUI::on_buttonDiscard_clicked()
+{
+ *author_mod = *author;
+ emit(setChanged(false));
+ setGui();
+}
+
+void AuthorUI::on_varName_textChanged(const QString& n)
+{
+ author_mod->setName(n);
+ emit(setChanged(true));
+}
+
+void AuthorUI::on_varEmail_textChanged(const QString& e)
+{
+ author_mod->setEmail(e);
+ emit(setChanged(true));
+}
+
+void AuthorUI::on_varRole_textChanged(const QString& r)
+{
+ author_mod->setRole(r);
+ emit(setChanged(true));
+}
diff --git a/pokemodr/AuthorUI.h b/pokemodr/AuthorUI.h
new file mode 100644
index 00000000..7ad46ba7
--- /dev/null
+++ b/pokemodr/AuthorUI.h
@@ -0,0 +1,57 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name: pokegen/AuthorUI.h
+// Purpose: Author UI form handling
+// Author: Ben Boeckel
+// Modified by: Ben Boeckel
+// Created: Sun Jan 27 12:35:59 2008
+// Copyright: ©2007-2008 Ben Boeckel and Nerdy Productions
+// Licence:
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program. If not, see <http://www.gnu.org/licenses/>.
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __POKEMODR_AUTHORUI__
+#define __POKEMODR_AUTHORUI__
+
+#include <ktoolbar.h>
+#include <QString>
+#include "../pokemod/Author.h"
+#include "ObjectUI.h"
+#include "ui_author.h"
+
+class AuthorUI : public ObjectUI, private Ui::formAuthor
+{
+ Q_OBJECT
+
+ public:
+ AuthorUI(Author* a, QWidget* parent);
+ ~AuthorUI()
+ {
+ delete author_mod;
+ }
+
+// KToolbar getToolbar(QWidget* parent);
+ public slots:
+ void on_buttonApply_clicked();
+ void on_buttonDiscard_clicked();
+ void on_varName_textChanged(const QString& n);
+ void on_varEmail_textChanged(const QString& e);
+ void on_varRole_textChanged(const QString& r);
+ private:
+ void setGui();
+
+ Author* author;
+ Author* author_mod;
+};
+
+#endif
diff --git a/pokemodr/BadgeUI.cpp b/pokemodr/BadgeUI.cpp
new file mode 100644
index 00000000..e668e515
--- /dev/null
+++ b/pokemodr/BadgeUI.cpp
@@ -0,0 +1,138 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name: pokegen/BadgeUI.cpp
+// Purpose: Badge UI form handling
+// Author: Ben Boeckel
+// Modified by: Ben Boeckel
+// Created: Sun Jan 27 13:10:47 2008
+// Copyright: ©2007-2008 Ben Boeckel and Nerdy Productions
+// Licence:
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program. If not, see <http://www.gnu.org/licenses/>.
+/////////////////////////////////////////////////////////////////////////////
+
+#include <QMetaObject>
+#include "../general/Exception.h"
+#include "BadgeUI.h"
+
+BadgeUI::BadgeUI(Badge* b, QWidget* parent) :
+ ObjectUI(parent),
+ badge(b),
+ badge_mod(new Badge(b->getPokemod(), *b, b->getId()))
+{
+ setupUI(this);
+ QMetaObject::connectSlotsByName(this);
+ setObjects(badge, badge_mod);
+ setGui();
+}
+
+// KToolbar getToolbar(QWidget* parent)
+// {
+//
+// }
+
+void BadgeUI::setGui();
+{
+
+}
+
+void BadgeUI::on_buttonApply_clicked()
+{
+ *badge = *badge_mod;
+ emit(setChanged(false));
+}
+
+void BadgeUI::on_buttonDiscard_clicked()
+{
+ *badge_mod = *badge;
+ emit(setChanged(false));
+ setGui();
+}
+
+void BadgeUI::on_varName_textChanged(const QString& n)
+{
+ badge_mod->setName(n);
+ emit(setChanged(true));
+}
+
+void BadgeUI::on_varObey_valueChanged(const QString& o)
+{
+ badge_mod->setObey(o);
+ emit(setChanged(true));
+}
+
+void BadgeUI::on_varBadge_customContextMenuRequested(const QPoint& p)
+{
+
+ emit(setChanged(true));
+}
+
+void BadgeUI::on_varFace_customContextMenuRequested(const QPoint& p)
+{
+
+ emit(setChanged(true));
+}
+
+void BadgeUI::on_varStat_currentIndexChanged(const QString& s)
+{
+ try
+ {
+ const QStringList& statList = badge_mod->getPokemod().getRules().getSpecialSplit() ? StatRBYStr : StatGSCStr;
+ if (statList.contains(s))
+ curStat = statList.indexOf(s);
+ else
+ throw(BoundsException("BadgeUI", "stat"));
+ emit(setChanged(true));
+ }
+ catch (BoundsException& e)
+ {
+ BugCatcher::report(e);
+ }
+ setGui();
+}
+
+void BadgeUI::on_varMultiplierNum_valueChanged(const QString& m)
+{
+ try
+ {
+ badge_mod->setMultiplierNum(curStat, m);
+ varMultiplier->setText(QString::number(badge_mod->getMultiplier(curStat), 'g', 15));
+ emit(setChanged(true));
+ }
+ catch (BoundsException& e)
+ {
+ BugCatcher::report(e);
+ setGui();
+ }
+}
+
+void BadgeUI::on_varMultiplierDenom_valueChanged(const QString& m)
+{
+ try
+ {
+ badge_mod->setStatDenom(curStat, m);
+ varMultiplierNum->setMaximum(m);
+ varMultiplier->setText(QString::number(nature_mod->getStat(curStat), 'g', 15));
+ emit(setChanged(true));
+ }
+ catch (BoundsException& e)
+ {
+ BugCatcher::report(e);
+ setGui();
+ }
+}
+
+void BadgeUI::on_varHMs_itemSelectionChanged()
+{
+
+ emit(setChanged(true));
+}
diff --git a/pokemodr/BadgeUI.h b/pokemodr/BadgeUI.h
new file mode 100644
index 00000000..8c53978e
--- /dev/null
+++ b/pokemodr/BadgeUI.h
@@ -0,0 +1,62 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name: pokegen/BadgeUI.h
+// Purpose: Badge UI form handling
+// Author: Ben Boeckel
+// Modified by: Ben Boeckel
+// Created: Sun Jan 27 12:52:44 2008
+// Copyright: ©2007-2008 Ben Boeckel and Nerdy Productions
+// Licence:
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program. If not, see <http://www.gnu.org/licenses/>.
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __POKEMODR_BADGEUI__
+#define __POKEMODR_BADGEUI__
+
+#include <ktoolbar.h>
+#include <QString>
+#include "../pokemod/Badge.h"
+#include "ObjectUI.h"
+#include "ui_badge.h"
+
+class BadgeUI : public ObjectUI, private Ui::formBadge
+{
+ Q_OBJECT
+
+ public:
+ BadgeUI(Badge* b, QWidget* parent);
+ ~BadgeUI()
+ {
+ delete badge_mod;
+ }
+
+// KToolbar getToolbar(QWidget* parent);
+ public slots:
+ void on_buttonApply_clicked();
+ void on_buttonDiscard_clicked();
+ void on_varName_textChanged(const QString& n);
+ void on_varObey_valueChanged(const QString& o);
+ void on_varBadge_customContextMenuRequested(const QPoint& p);
+ void on_varFace_customContextMenuRequested(const QPoint& p);
+ void on_varStat_currentIndexChanged(const QString& s);
+ void on_varMultiplierNum_valueChanged(const QString& m);
+ void on_varMultiplierDenom_valueChanged(const QString& m);
+ void on_varHMs_itemSelectionChanged();
+ private:
+ void setGui();
+
+ Badge* badge;
+ Badge* badge_mod;
+};
+
+#endif
diff --git a/pokemodr/NatureUI.cpp b/pokemodr/NatureUI.cpp
index ce975772..3e25afd1 100644
--- a/pokemodr/NatureUI.cpp
+++ b/pokemodr/NatureUI.cpp
@@ -91,8 +91,8 @@ void NatureUI::on_varStat_currentIndexChanged(const QString& s)
catch (BoundsException& e)
{
BugCatcher::report(e);
- setGui();
}
+ setGui();
}
void NatureUI::on_varStatMultiplierNum_valueChanged(const int s)
diff --git a/pokemodr/TimeUI.cpp b/pokemodr/TimeUI.cpp
index 7dc411e5..43ee3427 100644
--- a/pokemodr/TimeUI.cpp
+++ b/pokemodr/TimeUI.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: pokegen/TimeUI.h
+// Name: pokegen/TimeUI.cpp
// Purpose: Time UI form handling
// Author: Ben Boeckel
// Modified by: Ben Boeckel
diff --git a/pokemodr/TimeUI.h b/pokemodr/TimeUI.h
index 7d04bd0e..d8cb823d 100644
--- a/pokemodr/TimeUI.h
+++ b/pokemodr/TimeUI.h
@@ -54,5 +54,4 @@ class TimeUI : public ObjectUI, private Ui::formTime
Time* time_mod;
};
-
#endif
diff --git a/pokemodr/gui/ability.ui b/pokemodr/gui/ability.ui
index 539b2e72..d181d0c9 100644
--- a/pokemodr/gui/ability.ui
+++ b/pokemodr/gui/ability.ui
@@ -5,7 +5,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>201</width>
+ <width>211</width>
<height>179</height>
</rect>
</property>
diff --git a/pokemodr/gui/badge.ui b/pokemodr/gui/badge.ui
index 7c3da553..351b54c7 100644
--- a/pokemodr/gui/badge.ui
+++ b/pokemodr/gui/badge.ui
@@ -6,7 +6,7 @@
<x>0</x>
<y>0</y>
<width>244</width>
- <height>720</height>
+ <height>722</height>
</rect>
</property>
<layout class="QVBoxLayout" >
@@ -78,13 +78,13 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox" >
+ <widget class="QGroupBox" name="boxImages" >
<property name="title" >
<string>Images</string>
</property>
<layout class="QHBoxLayout" >
<item>
- <widget class="QGraphicsView" name="graphicsView_2" >
+ <widget class="QGraphicsView" name="varBadge" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
@@ -109,7 +109,7 @@
</widget>
</item>
<item>
- <widget class="QGraphicsView" name="graphicsView" >
+ <widget class="QGraphicsView" name="varFace" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
diff --git a/pokemodr/gui/dialog.ui b/pokemodr/gui/dialog.ui
index 69c6dbdb..d3ea7e4b 100644
--- a/pokemodr/gui/dialog.ui
+++ b/pokemodr/gui/dialog.ui
@@ -6,7 +6,7 @@
<x>0</x>
<y>0</y>
<width>191</width>
- <height>264</height>
+ <height>266</height>
</rect>
</property>
<layout class="QVBoxLayout" >
diff --git a/pokemodr/gui/item.ui b/pokemodr/gui/item.ui
index f51c5daa..5fb9b341 100644
--- a/pokemodr/gui/item.ui
+++ b/pokemodr/gui/item.ui
@@ -6,7 +6,7 @@
<x>0</x>
<y>0</y>
<width>226</width>
- <height>466</height>
+ <height>468</height>
</rect>
</property>
<layout class="QVBoxLayout" >
diff --git a/pokemodr/gui/mapeffect.ui b/pokemodr/gui/mapeffect.ui
index 9242fd38..b2ee4ef9 100644
--- a/pokemodr/gui/mapeffect.ui
+++ b/pokemodr/gui/mapeffect.ui
@@ -6,7 +6,7 @@
<x>0</x>
<y>0</y>
<width>290</width>
- <height>1047</height>
+ <height>1040</height>
</rect>
</property>
<layout class="QVBoxLayout" >
diff --git a/pokemodr/gui/maptrainer.ui b/pokemodr/gui/maptrainer.ui
index a1b72fa2..0a183ea8 100644
--- a/pokemodr/gui/maptrainer.ui
+++ b/pokemodr/gui/maptrainer.ui
@@ -1,16 +1,16 @@
<ui version="4.0" >
- <class>Form</class>
- <widget class="QWidget" name="Form" >
+ <class>formMapTrainer</class>
+ <widget class="QWidget" name="formMapTrainer" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>290</width>
- <height>1227</height>
+ <height>1220</height>
</rect>
</property>
<property name="windowTitle" >
- <string>Form</string>
+ <string/>
</property>
<layout class="QVBoxLayout" >
<item>
diff --git a/pokemodr/gui/maptrainerteammember.ui b/pokemodr/gui/maptrainerteammember.ui
index 646d1c4f..f15b0c6d 100644
--- a/pokemodr/gui/maptrainerteammember.ui
+++ b/pokemodr/gui/maptrainerteammember.ui
@@ -6,7 +6,7 @@
<x>0</x>
<y>0</y>
<width>226</width>
- <height>419</height>
+ <height>421</height>
</rect>
</property>
<property name="windowTitle" >
diff --git a/pokemodr/gui/mapwildlist.ui b/pokemodr/gui/mapwildlist.ui
index f95b1178..bea9cd92 100644
--- a/pokemodr/gui/mapwildlist.ui
+++ b/pokemodr/gui/mapwildlist.ui
@@ -6,7 +6,7 @@
<x>0</x>
<y>0</y>
<width>244</width>
- <height>400</height>
+ <height>402</height>
</rect>
</property>
<property name="windowTitle" >
diff --git a/pokemodr/gui/move.ui b/pokemodr/gui/move.ui
index 6ae05ab9..07125953 100644
--- a/pokemodr/gui/move.ui
+++ b/pokemodr/gui/move.ui
@@ -6,7 +6,7 @@
<x>0</x>
<y>0</y>
<width>244</width>
- <height>1124</height>
+ <height>1126</height>
</rect>
</property>
<property name="windowTitle" >
diff --git a/pokemodr/gui/pokemod.ui b/pokemodr/gui/pokemod.ui
index 86becf1b..8333506e 100644
--- a/pokemodr/gui/pokemod.ui
+++ b/pokemodr/gui/pokemod.ui
@@ -6,7 +6,7 @@
<x>0</x>
<y>0</y>
<width>244</width>
- <height>687</height>
+ <height>689</height>
</rect>
</property>
<layout class="QVBoxLayout" >
diff --git a/pokemodr/gui/species.ui b/pokemodr/gui/species.ui
index 5de86c39..3febcc25 100644
--- a/pokemodr/gui/species.ui
+++ b/pokemodr/gui/species.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>244</width>
- <height>2064</height>
+ <height>2077</height>
</rect>
</property>
<property name="windowTitle" >
diff --git a/pokemodr/gui/speciesability.ui b/pokemodr/gui/speciesability.ui
index 707584ae..5c01cb8c 100644
--- a/pokemodr/gui/speciesability.ui
+++ b/pokemodr/gui/speciesability.ui
@@ -1,6 +1,6 @@
<ui version="4.0" >
- <class>Form</class>
- <widget class="QWidget" name="Form" >
+ <class>formSpeciesAbility</class>
+ <widget class="QWidget" name="formSpeciesAbility" >
<property name="geometry" >
<rect>
<x>0</x>
@@ -10,7 +10,7 @@
</rect>
</property>
<property name="windowTitle" >
- <string>Form</string>
+ <string/>
</property>
<layout class="QVBoxLayout" >
<item>
diff --git a/pokemodr/gui/speciesmove.ui b/pokemodr/gui/speciesmove.ui
index e1661924..9d14b224 100644
--- a/pokemodr/gui/speciesmove.ui
+++ b/pokemodr/gui/speciesmove.ui
@@ -1,6 +1,6 @@
<ui version="4.0" >
- <class>forSpeciesMove</class>
- <widget class="QWidget" name="forSpeciesMove" >
+ <class>formSpeciesMove</class>
+ <widget class="QWidget" name="formSpeciesMove" >
<property name="geometry" >
<rect>
<x>0</x>
@@ -10,7 +10,7 @@
</rect>
</property>
<property name="windowTitle" >
- <string>Form</string>
+ <string/>
</property>
<layout class="QVBoxLayout" >
<item>
diff --git a/pokemodr/gui/tile.ui b/pokemodr/gui/tile.ui
index dbfc1f73..8198b4e6 100644
--- a/pokemodr/gui/tile.ui
+++ b/pokemodr/gui/tile.ui
@@ -6,7 +6,7 @@
<x>0</x>
<y>0</y>
<width>226</width>
- <height>949</height>
+ <height>953</height>
</rect>
</property>
<layout class="QVBoxLayout" >
diff --git a/pokemodr/pokemodr.pro b/pokemodr/pokemodr.pro
index 1d48b189..7d51a69b 100644
--- a/pokemodr/pokemodr.pro
+++ b/pokemodr/pokemodr.pro
@@ -8,6 +8,7 @@ LIBS += -lkdecore -lkdeui -L../../lib -lgeneral -lpokemod
# Following is reformatted from the KTIGCC .pro file
win32 {
+ CONFIG += exceptions
KDEPREFIX = $$(KDEPREFIX)
isEmpty(KDEPREFIX) {
# Try running kde4-config, however chances are it's not in the path or it was compiled with a bad prefix.