Made the rest of the widgets use pimpl

1 files changed, 58 insertions, 51 deletions

diff --git a/sigmodr/widgets/NatureUI.cpp b/sigmodr/widgets/NatureUI.cpp
index fd6753f4..f6d53be1 100644
--- a/sigmodr/widgets/NatureUI.cpp
+++ b/sigmodr/widgets/NatureUI.cpp
@@ -17,6 +17,7 @@
 
 // Header include
 #include "NatureUI.h"
+#include "NatureUI_p.h"
 
 // Sigmodr core widget includes
 #include <sigmodr/corewidgets/FractionWidget.h>
@@ -31,11 +32,8 @@
 #include <KLineEdit>
 
 // Qt includes
-#include <QtCore/QFile>
 #include <QtGui/QHeaderView>
 #include <QtGui/QTableWidget>
-#include <QtGui/QVBoxLayout>
-#include <QtUiTools/QUiLoader>
 
 using namespace Sigcore;
 using namespace Sigmod;
@@ -43,34 +41,54 @@ using namespace Sigmodr::CoreWidgets;
 using namespace Sigmodr::Widgets;
 
 NatureUI::NatureUI(Nature* nature, QWidget* parent) :
-        ObjectUI(parent)
+        ObjectUI(nature, parent),
+        d(new Private(new Nature(*nature)))
 {
-    setObjects(nature, new Nature(*nature));
+    setWidget(d->makeWidgets(this));
 }
 
-void NatureUI::initGui()
+void NatureUI::apply()
+{
+    *qobject_cast<Nature*>(m_object) = *d->m_nature;
+    ObjectUI::apply();
+}
+
+void NatureUI::discard()
+{
+    *d->m_nature = *qobject_cast<Nature*>(m_object);
+    d->resetGui();
+    ObjectUI::discard();
+}
+
+NatureUI::Private::Private(Nature* nature) :
+        ObjectUIPrivate(nature),
+        m_nature(nature)
+{
+}
+
+NatureUI::Private::~Private()
 {
-    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");
+    delete m_nature;
+}
+
+QWidget* NatureUI::Private::makeWidgets(ObjectUI* widget)
+{
+    QWidget *form = openUiFile(":/gui/nature.ui", widget);
+    ui_name = form->findChild<KLineEdit*>("varName");
+    ui_stat = form->findChild<QTableWidget*>("varStat");
+    ui_statMultiplier = form->findChild<FractionWidget*>("varStatMultiplier");
+    ui_weight = form->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)));
-    QVBoxLayout* layout = new QVBoxLayout;
-    layout->addWidget(formWidget);
-    setLayout(layout);
     ui_stat->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
+    return form;
 }
 
-void NatureUI::refreshGui()
+void NatureUI::Private::refreshGui()
 {
-    const bool isSplit = game()->rules()->specialSplit();
+    const bool isSplit = m_nature->game()->rules()->specialSplit();
     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));
@@ -96,6 +114,7 @@ void NatureUI::refreshGui()
     }
     else
         ui_stat->setItem(ST_Special - ST_Attack, 0, new QTableWidgetItem);
+    ui_statMultiplier->setEnabled(false);
     QTableWidgetItem* item = new QTableWidgetItem;
     item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
     ui_stat->setItem(ST_Attack - ST_Attack, 0, item);
@@ -123,54 +142,42 @@ void NatureUI::refreshGui()
     }
 }
 
-void NatureUI::setGui()
+void NatureUI::Private::resetGui()
 {
-    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())
+    ui_name->setText(m_nature->name());
+    ui_stat->item(ST_Attack - ST_Attack, 0)->setData(Qt::DisplayRole, QString::number(m_nature->stat(ST_Attack), 'g', 7));
+    ui_stat->item(ST_Defense - ST_Attack, 0)->setData(Qt::DisplayRole, QString::number(m_nature->stat(ST_Defense), 'g', 7));
+    ui_stat->item(ST_Speed - ST_Attack, 0)->setData(Qt::DisplayRole, QString::number(m_nature->stat(ST_Speed), 'g', 7));
+    if (m_nature->game()->rules()->specialSplit())
     {
-        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));
+        ui_stat->item(ST_SpecialAttack - ST_Attack, 0)->setData(Qt::DisplayRole, QString::number(m_nature->stat(ST_SpecialAttack), 'g', 7));
+        ui_stat->item(ST_SpecialDefense - ST_Attack, 0)->setData(Qt::DisplayRole, QString::number(m_nature->stat(ST_SpecialDefense), 'g', 7));
     }
     else
-        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()
-{
-    *qobject_cast<Nature*>(original()) = *qobject_cast<Nature*>(modified());
-    emit(changed(false));
-}
-
-void NatureUI::discard()
-{
-    *qobject_cast<Nature*>(modified()) = *qobject_cast<Nature*>(original());
-    setGui();
-    emit(changed(false));
+        ui_stat->item(ST_Special - ST_Attack, 0)->setData(Qt::DisplayRole, QString::number(m_nature->stat(ST_Special), 'g', 7));
+    ui_weight->setValue(m_nature->weight());
 }
 
-void NatureUI::nameChanged(const QString& name)
+void NatureUI::Private::nameChanged(const QString& name)
 {
     const int cursor = ui_name->cursorPosition();
-    qobject_cast<Nature*>(modified())->setName(name);
+    m_nature->setName(name);
     ui_name->setCursorPosition(cursor);
 }
 
-void NatureUI::statChanged(const int row)
+void NatureUI::Private::statChanged(const int row)
 {
-    ui_statMultiplier->setValue(qobject_cast<Nature*>(modified())->stat(ui_stat->verticalHeaderItem(row)->data(Qt::UserRole).value<Stat>()));
+    ui_statMultiplier->setEnabled(true);
+    ui_statMultiplier->setValue(m_nature->stat(ui_stat->verticalHeaderItem(row)->data(Qt::UserRole).value<Stat>()));
 }
 
-void NatureUI::statMultiplierChanged(const Fraction& multiplier)
+void NatureUI::Private::statMultiplierChanged(const Fraction& multiplier)
 {
-    qobject_cast<Nature*>(modified())->setStat(ui_stat->verticalHeaderItem(ui_stat->currentRow())->data(Qt::UserRole).value<Stat>(), multiplier);
+    m_nature->setStat(ui_stat->verticalHeaderItem(ui_stat->currentRow())->data(Qt::UserRole).value<Stat>(), multiplier);
+    emit(changed());
 }
 
-void NatureUI::weightChanged(const int weight)
+void NatureUI::Private::weightChanged(const int weight)
 {
-    qobject_cast<Nature*>(modified())->setWeight(weight);
+    m_nature->setWeight(weight);
 }