Fixed up final widgets and added the UiTools library to be linked

1 files changed, 64 insertions, 47 deletions

diff --git a/sigmodr/widgets/NatureUI.cpp b/sigmodr/widgets/NatureUI.cpp
index 54e6e3de..e0dfa6eb 100644
--- a/sigmodr/widgets/NatureUI.cpp
+++ b/sigmodr/widgets/NatureUI.cpp
@@ -18,13 +18,23 @@
 // Header include
 #include "NatureUI.h"
 
+// Sigmodr widget includes
+#include "FractionWidget.h"
+
 // Sigmod includes
 #include <sigmod/Game.h>
 #include <sigmod/Nature.h>
 #include <sigmod/Rules.h>
 
+// KDE includes
+#include <KIntNumInput>
+#include <KLineEdit>
+
 // Qt includes
+#include <QtCore/QFile>
 #include <QtGui/QHeaderView>
+#include <QtGui/QTableWidget>
+#include <QtUiTools/QUiLoader>
 
 using namespace Sigcore;
 using namespace Sigmod;
@@ -33,89 +43,96 @@ using namespace Sigmodr::Widgets;
 NatureUI::NatureUI(Nature* nature, QWidget* parent) :
         ObjectUI(parent)
 {
-    setupUi(this);
     setObjects(nature, new Nature(*nature));
 }
 
-NatureUI::~NatureUI()
-{
-}
-
 void NatureUI::initGui()
 {
-    varStat->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
+    QFile file(":/gui/nature.ui");
+    file.open(QFile::ReadOnly);
+    QWidget *formWidget = QUiLoader().load(&file, this);
+    file.close();
+    ui_name = formWidget->findChild<KLineEdit*>("varName");
+    ui_stat = formWidget->findChild<QTableWidget*>("varStat");
+    ui_statMultiplier = formWidget->findChild<FractionWidget*>("varStatMultiplier");
+    ui_weight = formWidget->findChild<KIntNumInput*>("varWeight");
+    connect(ui_name, SIGNAL(textChanged(QString)), this, SLOT(nameChanged(QString)));
+    connect(ui_stat, SIGNAL(currentCellChanged(int,int,int,int)), this, SLOT(statChanged(int)));
+    connect(ui_statMultiplier, SIGNAL(valueChanged(Sigcore::Fraction)), this, SLOT(statMultiplierChanged(Sigcore::Fraction)));
+    connect(ui_weight, SIGNAL(valueChanged(int)), this, SLOT(weightChanged(int)));
+    ui_stat->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
 }
 
 void NatureUI::refreshGui()
 {
     const bool isSplit = game()->rules()->specialSplit();
-    varStat->clear();
-    varStat->setRowCount((isSplit ? ST_SpecialDefense : ST_Special) - ST_Attack + 1);
-    varStat->setVerticalHeaderLabels((isSplit ? StatGSCStr : StatRBYStr).mid(ST_Attack, (isSplit ? ST_SpecialDefense : ST_Special) - ST_Attack + 1));
-    varStat->setColumnCount(1);
-    varStat->setHorizontalHeaderLabels(QStringList() << "Multiplier");
-    varStat->verticalHeaderItem(ST_Attack - ST_Attack)->setData(Qt::UserRole, QVariant::fromValue(ST_Attack));
-    varStat->verticalHeaderItem(ST_Defense - ST_Attack)->setData(Qt::UserRole, QVariant::fromValue(ST_Defense));
-    varStat->verticalHeaderItem(ST_Speed - ST_Attack)->setData(Qt::UserRole, QVariant::fromValue(ST_Speed));
+    ui_stat->clear();
+    ui_stat->setRowCount((isSplit ? ST_SpecialDefense : ST_Special) - ST_Attack + 1);
+    ui_stat->setVerticalHeaderLabels((isSplit ? StatGSCStr : StatRBYStr).mid(ST_Attack, (isSplit ? ST_SpecialDefense : ST_Special) - ST_Attack + 1));
+    ui_stat->setColumnCount(1);
+    ui_stat->setHorizontalHeaderLabels(QStringList() << "Multiplier");
+    ui_stat->verticalHeaderItem(ST_Attack - ST_Attack)->setData(Qt::UserRole, QVariant::fromValue(ST_Attack));
+    ui_stat->verticalHeaderItem(ST_Defense - ST_Attack)->setData(Qt::UserRole, QVariant::fromValue(ST_Defense));
+    ui_stat->verticalHeaderItem(ST_Speed - ST_Attack)->setData(Qt::UserRole, QVariant::fromValue(ST_Speed));
     if (isSplit)
     {
-        varStat->verticalHeaderItem(ST_SpecialAttack - ST_Attack)->setData(Qt::UserRole, QVariant::fromValue(ST_SpecialAttack));
-        varStat->verticalHeaderItem(ST_SpecialDefense - ST_Attack)->setData(Qt::UserRole, QVariant::fromValue(ST_SpecialDefense));
+        ui_stat->verticalHeaderItem(ST_SpecialAttack - ST_Attack)->setData(Qt::UserRole, QVariant::fromValue(ST_SpecialAttack));
+        ui_stat->verticalHeaderItem(ST_SpecialDefense - ST_Attack)->setData(Qt::UserRole, QVariant::fromValue(ST_SpecialDefense));
     }
     else
-        varStat->verticalHeaderItem(ST_Special - ST_Attack)->setData(Qt::UserRole, QVariant::fromValue(ST_Special));
-    varStat->setItem(ST_Attack - ST_Attack, 0, new QTableWidgetItem);
-    varStat->setItem(ST_Defense- ST_Attack, 0, new QTableWidgetItem);
-    varStat->setItem(ST_Speed - ST_Attack, 0, new QTableWidgetItem);
+        ui_stat->verticalHeaderItem(ST_Special - ST_Attack)->setData(Qt::UserRole, QVariant::fromValue(ST_Special));
+    ui_stat->setItem(ST_Attack - ST_Attack, 0, new QTableWidgetItem);
+    ui_stat->setItem(ST_Defense- ST_Attack, 0, new QTableWidgetItem);
+    ui_stat->setItem(ST_Speed - ST_Attack, 0, new QTableWidgetItem);
     if (isSplit)
     {
-        varStat->setItem(ST_SpecialAttack - ST_Attack, 0, new QTableWidgetItem);
-        varStat->setItem(ST_SpecialDefense - ST_Attack, 0, new QTableWidgetItem);
+        ui_stat->setItem(ST_SpecialAttack - ST_Attack, 0, new QTableWidgetItem);
+        ui_stat->setItem(ST_SpecialDefense - ST_Attack, 0, new QTableWidgetItem);
     }
     else
-        varStat->setItem(ST_Special - ST_Attack, 0, new QTableWidgetItem);
+        ui_stat->setItem(ST_Special - ST_Attack, 0, new QTableWidgetItem);
     QTableWidgetItem* item = new QTableWidgetItem;
     item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-    varStat->setItem(ST_Attack - ST_Attack, 0, item);
-    varStat->setCurrentItem(item);
+    ui_stat->setItem(ST_Attack - ST_Attack, 0, item);
+    ui_stat->setCurrentItem(item);
     item = new QTableWidgetItem;
     item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-    varStat->setItem(ST_Defense- ST_Attack, 0, item);
+    ui_stat->setItem(ST_Defense- ST_Attack, 0, item);
     item = new QTableWidgetItem;
     item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-    varStat->setItem(ST_Speed - ST_Attack, 0, item);
+    ui_stat->setItem(ST_Speed - ST_Attack, 0, item);
     if (isSplit)
     {
         item = new QTableWidgetItem;
         item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-        varStat->setItem(ST_SpecialAttack - ST_Attack, 0, item);
+        ui_stat->setItem(ST_SpecialAttack - ST_Attack, 0, item);
         item = new QTableWidgetItem;
         item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-        varStat->setItem(ST_SpecialDefense - ST_Attack, 0, item);
+        ui_stat->setItem(ST_SpecialDefense - ST_Attack, 0, item);
     }
     else
     {
         item = new QTableWidgetItem;
         item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-        varStat->setItem(ST_Special - ST_Attack, 0, item);
+        ui_stat->setItem(ST_Special - ST_Attack, 0, item);
     }
 }
 
 void NatureUI::setGui()
 {
-    varName->setText(qobject_cast<Nature*>(modified())->name());
-    varStat->item(ST_Attack - ST_Attack, 0)->setData(Qt::DisplayRole, QString::number(qobject_cast<Nature*>(modified())->stat(ST_Attack), 'g', 7));
-    varStat->item(ST_Defense - ST_Attack, 0)->setData(Qt::DisplayRole, QString::number(qobject_cast<Nature*>(modified())->stat(ST_Defense), 'g', 7));
-    varStat->item(ST_Speed - ST_Attack, 0)->setData(Qt::DisplayRole, QString::number(qobject_cast<Nature*>(modified())->stat(ST_Speed), 'g', 7));
+    ui_name->setText(qobject_cast<Nature*>(modified())->name());
+    ui_stat->item(ST_Attack - ST_Attack, 0)->setData(Qt::DisplayRole, QString::number(qobject_cast<Nature*>(modified())->stat(ST_Attack), 'g', 7));
+    ui_stat->item(ST_Defense - ST_Attack, 0)->setData(Qt::DisplayRole, QString::number(qobject_cast<Nature*>(modified())->stat(ST_Defense), 'g', 7));
+    ui_stat->item(ST_Speed - ST_Attack, 0)->setData(Qt::DisplayRole, QString::number(qobject_cast<Nature*>(modified())->stat(ST_Speed), 'g', 7));
     if (game()->rules()->specialSplit())
     {
-        varStat->item(ST_SpecialAttack - ST_Attack, 0)->setData(Qt::DisplayRole, QString::number(qobject_cast<Nature*>(modified())->stat(ST_SpecialAttack), 'g', 7));
-        varStat->item(ST_SpecialDefense - ST_Attack, 0)->setData(Qt::DisplayRole, QString::number(qobject_cast<Nature*>(modified())->stat(ST_SpecialDefense), 'g', 7));
+        ui_stat->item(ST_SpecialAttack - ST_Attack, 0)->setData(Qt::DisplayRole, QString::number(qobject_cast<Nature*>(modified())->stat(ST_SpecialAttack), 'g', 7));
+        ui_stat->item(ST_SpecialDefense - ST_Attack, 0)->setData(Qt::DisplayRole, QString::number(qobject_cast<Nature*>(modified())->stat(ST_SpecialDefense), 'g', 7));
     }
     else
-        varStat->item(ST_Special - ST_Attack, 0)->setData(Qt::DisplayRole, QString::number(qobject_cast<Nature*>(modified())->stat(ST_Special), 'g', 7));
-    varStatMultiplier->setValue(qobject_cast<Nature*>(modified())->stat(varStat->verticalHeaderItem(varStat->currentRow())->data(Qt::UserRole).value<Stat>()));
-    varWeight->setValue(qobject_cast<Nature*>(modified())->weight());
+        ui_stat->item(ST_Special - ST_Attack, 0)->setData(Qt::DisplayRole, QString::number(qobject_cast<Nature*>(modified())->stat(ST_Special), 'g', 7));
+    ui_statMultiplier->setValue(qobject_cast<Nature*>(modified())->stat(ui_stat->verticalHeaderItem(ui_stat->currentRow())->data(Qt::UserRole).value<Stat>()));
+    ui_weight->setValue(qobject_cast<Nature*>(modified())->weight());
 }
 
 void NatureUI::apply()
@@ -131,24 +148,24 @@ void NatureUI::discard()
     emit(changed(false));
 }
 
-void NatureUI::on_varName_textChanged(const QString& name)
+void NatureUI::nameChanged(const QString& name)
 {
-    const int cursor = varName->cursorPosition();
+    const int cursor = ui_name->cursorPosition();
     qobject_cast<Nature*>(modified())->setName(name);
-    varName->setCursorPosition(cursor);
+    ui_name->setCursorPosition(cursor);
 }
 
-void NatureUI::on_varStat_currentCellChanged(const int row)
+void NatureUI::statChanged(const int row)
 {
-    varStatMultiplier->setValue(qobject_cast<Nature*>(modified())->stat(varStat->verticalHeaderItem(row)->data(Qt::UserRole).value<Stat>()));
+    ui_statMultiplier->setValue(qobject_cast<Nature*>(modified())->stat(ui_stat->verticalHeaderItem(row)->data(Qt::UserRole).value<Stat>()));
 }
 
-void NatureUI::on_varStatMultiplier_valueChanged(const Fraction& multiplier)
+void NatureUI::statMultiplierChanged(const Fraction& multiplier)
 {
-    qobject_cast<Nature*>(modified())->setStat(varStat->verticalHeaderItem(varStat->currentRow())->data(Qt::UserRole).value<Stat>(), multiplier);
+    qobject_cast<Nature*>(modified())->setStat(ui_stat->verticalHeaderItem(ui_stat->currentRow())->data(Qt::UserRole).value<Stat>(), multiplier);
 }
 
-void NatureUI::on_varWeight_valueChanged(const int weight)
+void NatureUI::weightChanged(const int weight)
 {
     qobject_cast<Nature*>(modified())->setWeight(weight);
 }