Fixed up more widgets to load at runtime

1 files changed, 58 insertions, 36 deletions

diff --git a/sigmodr/widgets/MapTrainerUI.cpp b/sigmodr/widgets/MapTrainerUI.cpp
index 4f3bda2f..58cb7690 100644
--- a/sigmodr/widgets/MapTrainerUI.cpp
+++ b/sigmodr/widgets/MapTrainerUI.cpp
@@ -18,6 +18,9 @@
 // Header include
 #include "MapTrainerUI.h"
 
+// Sigmodr widget includes
+#include "ScriptWidget.h"
+
 // Sigmod includes
 #include <sigmod/Game.h>
 #include <sigmod/MapTrainer.h>
@@ -26,9 +29,17 @@
 #include <sigmod/Species.h>
 #include <sigmod/Trainer.h>
 
+// KDE includes
+#include <KActionSelector>
+#include <KComboBox>
+#include <KIntNumInput>
+#include <KLineEdit>
+
 // Qt includes
+#include <QtCore/QFile>
 #include <QtGui/QListWidget>
 #include <QtGui/QListWidgetItem>
+#include <QtUiTools/QUiLoader>
 
 using namespace Sigcore;
 using namespace Sigmod;
@@ -37,60 +48,71 @@ using namespace Sigmodr::Widgets;
 MapTrainerUI::MapTrainerUI(MapTrainer* trainer, QWidget* parent) :
         ObjectUI(parent)
 {
-    setupUi(this);
     setObjects(trainer, new MapTrainer(*trainer));
 }
 
-MapTrainerUI::~MapTrainerUI()
+void MapTrainerUI::initGui()
 {
+    QFile file(":/gui/maptrainer.ui");
+    file.open(QFile::ReadOnly);
+    QWidget *formWidget = QUiLoader().load(&file, this);
+    file.close();
+    ui_name = formWidget->findChild<KLineEdit*>("varName");
+    ui_trainerClass = formWidget->findChild<KComboBox*>("varTrainerClass");
+    ui_numberFight = formWidget->findChild<KIntNumInput*>("varNumberFight");
+    ui_script = formWidget->findChild<ScriptWidget*>("varScript");
+    ui_leadTeamMembers = formWidget->findChild<KActionSelector*>("varLeadTeamMembers");
+    connect(ui_name, SIGNAL(textChanged(QString)), this, SLOT(nameChanged(QString)));
+    connect(ui_trainerClass, SIGNAL(currentIndexChanged(int)), this, SLOT(trainerClassChanged(int)));
+    connect(ui_numberFight, SIGNAL(valueChanged(int)), this, SLOT(numberFightChanged(int)));
+    connect(ui_script, SIGNAL(valueChanged(Sigcore::Script)), this, SLOT(scriptChanged(Sigcore::Script)));
+    connect(ui_leadTeamMembers, SIGNAL(added(QListWidgetItem*)), this, SLOT(leadTeamMemberAdded(QListWidgetItem*)));
+    connect(ui_leadTeamMembers, SIGNAL(removed(QListWidgetItem*)), this, SLOT(leadTeamMemberRemoved(QListWidgetItem*)));
 }
 
 void MapTrainerUI::refreshGui()
 {
-    const bool blockedTrainerClass = varTrainerClass->blockSignals(true);
-    varTrainerClass->clear();
+    const bool blockedTrainerClass = ui_trainerClass->blockSignals(true);
+    ui_trainerClass->clear();
     for (int i = 0; i < game()->trainerCount(); ++i)
-    {
-        const Trainer* trainer = game()->trainer(i);
-        varTrainerClass->addItem(trainer->name(), trainer->id());
-    }
-    varTrainerClass->blockSignals(blockedTrainerClass);
-    varNumberFight->setMaximum(game()->rules()->maxFight());
-    const bool blockedLeadTeamMember = varLeadTeamMember->blockSignals(true);
-    varLeadTeamMember->availableListWidget()->clear();
-    varLeadTeamMember->selectedListWidget()->clear();
+        ui_trainerClass->addItem(game()->trainer(i)->name());
+    ui_trainerClass->blockSignals(blockedTrainerClass);
+    ui_numberFight->setMaximum(game()->rules()->maxFight());
+    const bool blockedLeadTeamMember = ui_leadTeamMembers->blockSignals(true);
+    ui_leadTeamMembers->availableListWidget()->clear();
+    ui_leadTeamMembers->selectedListWidget()->clear();
     for (int i = 0; i < qobject_cast<MapTrainer*>(original())->teamMemberCount(); ++i)
     {
         QString speciesName;
         const MapTrainerTeamMember* teamMember = qobject_cast<MapTrainer*>(original())->teamMember(i);
         const Species* species = game()->species(teamMember->species());
         speciesName = species ? species->name() : "(Invalid)";
-        QListWidgetItem* widgetItem = new QListWidgetItem(QString("%1 level %2 (%3)").arg(speciesName, teamMember->level(), i), varLeadTeamMember->availableListWidget());
+        QListWidgetItem* widgetItem = new QListWidgetItem(QString("%1 level %2 (%3)").arg(speciesName, teamMember->level(), i), ui_leadTeamMembers->availableListWidget());
         widgetItem->setData(Qt::UserRole, teamMember->id());
     }
-    varLeadTeamMember->blockSignals(blockedLeadTeamMember);
-    varLeadTeamMember->setButtonsEnabled();
+    ui_leadTeamMembers->blockSignals(blockedLeadTeamMember);
+    ui_leadTeamMembers->setButtonsEnabled();
 }
 
 void MapTrainerUI::setGui()
 {
-    varName->setText(qobject_cast<MapTrainer*>(modified())->name());
-    varTrainerClass->setCurrentIndex(varTrainerClass->findData(qobject_cast<MapTrainer*>(modified())->trainerClass()));
-    varNumberFight->setValue(qobject_cast<MapTrainer*>(modified())->numberFight());
-    varScript->setValue(qobject_cast<MapTrainer*>(modified())->script());
-    for (int i = 0; i < varLeadTeamMember->availableListWidget()->count(); ++i)
+    ui_name->setText(qobject_cast<MapTrainer*>(modified())->name());
+    ui_trainerClass->setCurrentIndex(game()->trainerIndex(qobject_cast<MapTrainer*>(modified())->trainerClass()));
+    ui_numberFight->setValue(qobject_cast<MapTrainer*>(modified())->numberFight());
+    ui_script->setValue(qobject_cast<MapTrainer*>(modified())->script());
+    for (int i = 0; i < ui_leadTeamMembers->availableListWidget()->count(); ++i)
     {
-        QListWidgetItem* widgetItem = varLeadTeamMember->availableListWidget()->item(i);
+        QListWidgetItem* widgetItem = ui_leadTeamMembers->availableListWidget()->item(i);
         if (qobject_cast<MapTrainer*>(modified())->leadTeamMember(widgetItem->data(Qt::UserRole).toInt()))
-            varLeadTeamMember->selectedListWidget()->addItem(varLeadTeamMember->availableListWidget()->takeItem(i--));
+            ui_leadTeamMembers->selectedListWidget()->addItem(ui_leadTeamMembers->availableListWidget()->takeItem(i--));
     }
-    for (int i = 0; i < varLeadTeamMember->selectedListWidget()->count(); ++i)
+    for (int i = 0; i < ui_leadTeamMembers->selectedListWidget()->count(); ++i)
     {
-        QListWidgetItem* widgetItem = varLeadTeamMember->selectedListWidget()->item(i);
+        QListWidgetItem* widgetItem = ui_leadTeamMembers->selectedListWidget()->item(i);
         if (!qobject_cast<MapTrainer*>(modified())->leadTeamMember(widgetItem->data(Qt::UserRole).toInt()))
-            varLeadTeamMember->availableListWidget()->addItem(varLeadTeamMember->selectedListWidget()->takeItem(i--));
+            ui_leadTeamMembers->availableListWidget()->addItem(ui_leadTeamMembers->selectedListWidget()->takeItem(i--));
     }
-    varLeadTeamMember->setButtonsEnabled();
+    ui_leadTeamMembers->setButtonsEnabled();
 }
 
 void MapTrainerUI::apply()
@@ -106,35 +128,35 @@ void MapTrainerUI::discard()
     emit(changed(false));
 }
 
-void MapTrainerUI::on_varName_textChanged(const QString& name)
+void MapTrainerUI::nameChanged(const QString& name)
 {
-    const int cursor = varName->cursorPosition();
+    const int cursor = ui_name->cursorPosition();
     qobject_cast<MapTrainer*>(modified())->setName(name);
-    varName->setCursorPosition(cursor);
+    ui_name->setCursorPosition(cursor);
 }
 
-void MapTrainerUI::on_varTrainerClass_activated(const int trainerClass)
+void MapTrainerUI::trainerClassChanged(const int trainerClass)
 {
-    qobject_cast<MapTrainer*>(modified())->setTrainerClass(varTrainerClass->itemData(trainerClass).toInt());
+    qobject_cast<MapTrainer*>(modified())->setTrainerClass(game()->trainer(trainerClass)->id());
 }
 
-void MapTrainerUI::on_varNumberFight_valueChanged(const int numberFight)
+void MapTrainerUI::numberFightChanged(const int numberFight)
 {
     qobject_cast<MapTrainer*>(modified())->setNumberFight(numberFight);
 }
 
-void MapTrainerUI::on_varScript_valueChanged(const Script& script)
+void MapTrainerUI::scriptChanged(const Script& script)
 {
     qobject_cast<MapTrainer*>(modified())->setScript(script);
 }
 
-void MapTrainerUI::on_varLeadTeamMember_added(QListWidgetItem* item)
+void MapTrainerUI::leadTeamMemberAdded(QListWidgetItem* item)
 {
     qobject_cast<MapTrainer*>(modified())->setLeadTeamMember(item->data(Qt::UserRole).toInt(), true);
     setGui();
 }
 
-void MapTrainerUI::on_varLeadTeamMember_removed(QListWidgetItem* item)
+void MapTrainerUI::leadTeamMemberRemoved(QListWidgetItem* item)
 {
     qobject_cast<MapTrainer*>(modified())->setLeadTeamMember(item->data(Qt::UserRole).toInt(), false);
     setGui();