Fixed up more widgets to load at runtime

1 files changed, 113 insertions, 89 deletions

diff --git a/sigmodr/widgets/MapTrainerTeamMemberUI.cpp b/sigmodr/widgets/MapTrainerTeamMemberUI.cpp
index c9e57491..0741f42c 100644
--- a/sigmodr/widgets/MapTrainerTeamMemberUI.cpp
+++ b/sigmodr/widgets/MapTrainerTeamMemberUI.cpp
@@ -28,8 +28,17 @@
 #include <sigmod/Rules.h>
 #include <sigmod/Species.h>
 
+// KDE includes
+#include <KActionSelector>
+#include <KComboBox>
+#include <KIntNumInput>
+#include <KLineEdit>
+
 // Qt includes
+#include <QtCore/QFile>
+#include <QtGui/QGroupBox>
 #include <QtGui/QListWidgetItem>
+#include <QtUiTools/QUiLoader>
 
 using namespace Sigmod;
 using namespace Sigmodr::Widgets;
@@ -37,138 +46,153 @@ using namespace Sigmodr::Widgets;
 MapTrainerTeamMemberUI::MapTrainerTeamMemberUI(MapTrainerTeamMember* teamMember, QWidget* parent) :
         ObjectUI(parent)
 {
-    setupUi(this);
     setObjects(teamMember, new MapTrainerTeamMember(*teamMember));
 }
 
-MapTrainerTeamMemberUI::~MapTrainerTeamMemberUI()
-{
-}
-
 void MapTrainerTeamMemberUI::initGui()
 {
-    connect(varItems->selectedListWidget(), SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), this, SLOT(selectedItemChanged(QListWidgetItem*)));
+    QFile file(":/gui/maptrainerteammember.ui");
+    file.open(QFile::ReadOnly);
+    QWidget *formWidget = QUiLoader().load(&file, this);
+    file.close();
+    ui_species = formWidget->findChild<KComboBox*>("varSpecies");
+    ui_level = formWidget->findChild<KIntNumInput*>("varLevel");
+    ui_abilities = formWidget->findChild<KActionSelector*>("varAbilities");
+    ui_boxItems = formWidget->findChild<QGroupBox*>("boxItems");
+    ui_items = formWidget->findChild<KActionSelector*>("varItems");
+    ui_itemCount = formWidget->findChild<KIntNumInput*>("varItemCount");
+    ui_moves = formWidget->findChild<KActionSelector*>("varMoves");
+    ui_natures = formWidget->findChild<KActionSelector*>("varNatures");
+    connect(ui_species, SIGNAL(currentIndexChanged(int)), this, SLOT(speciesChanged(int)));
+    connect(ui_level, SIGNAL(valueChanged(int)), this, SLOT(levelChanged(int)));
+    connect(ui_abilities, SIGNAL(added(QListWidgetItem*)), this, SLOT(abilityAdded(QListWidgetItem*)));
+    connect(ui_abilities, SIGNAL(removed(QListWidgetItem*)), this, SLOT(abilityRemoved(QListWidgetItem*)));
+    connect(ui_items, SIGNAL(added(QListWidgetItem*)), this, SLOT(itemAdded(QListWidgetItem*)));
+    connect(ui_items, SIGNAL(removed(QListWidgetItem*)), this, SLOT(itemRemoved(QListWidgetItem*)));
+    connect(ui_itemCount, SIGNAL(valueChanged(int)), this, SLOT(itemCountChanged(int)));
+    connect(ui_moves, SIGNAL(added(QListWidgetItem*)), this, SLOT(moveAdded(QListWidgetItem*)));
+    connect(ui_moves, SIGNAL(removed(QListWidgetItem*)), this, SLOT(moveRemoved(QListWidgetItem*)));
+    connect(ui_natures, SIGNAL(added(QListWidgetItem*)), this, SLOT(natureAdded(QListWidgetItem*)));
+    connect(ui_natures, SIGNAL(removed(QListWidgetItem*)), this, SLOT(natureRemoved(QListWidgetItem*)));
+    connect(ui_items->selectedListWidget(), SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), this, SLOT(selectedItemChanged(QListWidgetItem*)));
 }
 
 void MapTrainerTeamMemberUI::refreshGui()
 {
-    const bool blockedSpecies = varSpecies->blockSignals(true);
-    varSpecies->clear();
+    const bool blockedSpecies = ui_species->blockSignals(true);
+    ui_species->clear();
     for (int i = 0; i < game()->speciesCount(); ++i)
-    {
-        const Species* species = game()->species(i);
-        varSpecies->addItem(species->name(), species->id());
-    }
-    varSpecies->blockSignals(blockedSpecies);
-    varLevel->setMaximum(game()->rules()->maxLevel());
-    const bool blockedAbilities = varAbilities->blockSignals(true);
-    varAbilities->availableListWidget()->clear();
-    varAbilities->selectedListWidget()->clear();
+        ui_species->addItem(game()->species(i)->name());
+    ui_species->blockSignals(blockedSpecies);
+    ui_level->setMaximum(game()->rules()->maxLevel());
+    const bool blockedAbilities = ui_abilities->blockSignals(true);
+    ui_abilities->availableListWidget()->clear();
+    ui_abilities->selectedListWidget()->clear();
     for (int i = 0; i < game()->abilityCount(); ++i)
     {
         const Ability* ability = game()->ability(i);
-        QListWidgetItem* widgetItem = new QListWidgetItem(ability->name(), varAbilities->availableListWidget());
+        QListWidgetItem* widgetItem = new QListWidgetItem(ability->name(), ui_abilities->availableListWidget());
         widgetItem->setData(Qt::UserRole, ability->id());
     }
-    varAbilities->blockSignals(blockedAbilities);
-    varAbilities->setButtonsEnabled();
-    boxAbilities->setEnabled(game()->rules()->maxAbilities());
-    const bool blockedItems = varItems->blockSignals(true);
-    varItems->availableListWidget()->clear();
-    varItems->selectedListWidget()->clear();
+    ui_abilities->blockSignals(blockedAbilities);
+    ui_abilities->setButtonsEnabled();
+    ui_abilities->setEnabled(game()->rules()->maxAbilities());
+    const bool blockedItems = ui_items->blockSignals(true);
+    ui_items->availableListWidget()->clear();
+    ui_items->selectedListWidget()->clear();
     for (int i = 0; i < game()->itemCount(); ++i)
     {
         const Item* item = game()->item(i);
-        QListWidgetItem* widgetItem = new QListWidgetItem(item->name(), varItems->availableListWidget());
+        QListWidgetItem* widgetItem = new QListWidgetItem(item->name(), ui_items->availableListWidget());
         widgetItem->setData(Qt::UserRole, item->id());
     }
-    varItems->blockSignals(blockedItems);
-    varItems->setButtonsEnabled();
-    boxItems->setEnabled(game()->rules()->maxHeldItems());
-    const bool blockedMoves = varMoves->blockSignals(true);
-    varMoves->availableListWidget()->clear();
-    varMoves->selectedListWidget()->clear();
+    ui_items->blockSignals(blockedItems);
+    ui_items->setButtonsEnabled();
+    ui_boxItems->setEnabled(game()->rules()->maxHeldItems());
+    const bool blockedMoves = ui_moves->blockSignals(true);
+    ui_moves->availableListWidget()->clear();
+    ui_moves->selectedListWidget()->clear();
     for (int i = 0; i < game()->moveCount(); ++i)
     {
         const Move* move = game()->move(i);
-        QListWidgetItem* widgetItem = new QListWidgetItem(move->name(), varMoves->availableListWidget());
+        QListWidgetItem* widgetItem = new QListWidgetItem(move->name(), ui_moves->availableListWidget());
         widgetItem->setData(Qt::UserRole, move->id());
     }
-    varMoves->blockSignals(blockedMoves);
-    varMoves->setButtonsEnabled();
-    const bool blockedNatures = varNatures->blockSignals(true);
-    varNatures->availableListWidget()->clear();
-    varNatures->selectedListWidget()->clear();
+    ui_moves->blockSignals(blockedMoves);
+    ui_moves->setButtonsEnabled();
+    const bool blockedNatures = ui_natures->blockSignals(true);
+    ui_natures->availableListWidget()->clear();
+    ui_natures->selectedListWidget()->clear();
     for (int i = 0; i < game()->natureCount(); ++i)
     {
         const Nature* nature = game()->nature(i);
-        QListWidgetItem* widgetItem = new QListWidgetItem(nature->name(), varNatures->availableListWidget());
+        QListWidgetItem* widgetItem = new QListWidgetItem(nature->name(), ui_natures->availableListWidget());
         widgetItem->setData(Qt::UserRole, nature->id());
     }
-    varNatures->blockSignals(blockedNatures);
-    varNatures->setButtonsEnabled();
-    boxNatures->setEnabled(game()->rules()->maxNatures());
+    ui_natures->blockSignals(blockedNatures);
+    ui_natures->setButtonsEnabled();
+    ui_natures->setEnabled(game()->rules()->maxNatures());
 }
 
 void MapTrainerTeamMemberUI::setGui()
 {
-    varSpecies->setCurrentIndex(varSpecies->findData(qobject_cast<MapTrainerTeamMember*>(modified())->species()));
-    varLevel->setValue(qobject_cast<MapTrainerTeamMember*>(modified())->level());
-    for (int i = 0; i < varAbilities->availableListWidget()->count(); ++i)
+    ui_species->setCurrentIndex(game()->speciesIndex(qobject_cast<MapTrainerTeamMember*>(modified())->species()));
+    ui_level->setValue(qobject_cast<MapTrainerTeamMember*>(modified())->level());
+    for (int i = 0; i < ui_abilities->availableListWidget()->count(); ++i)
     {
-        QListWidgetItem* widgetItem = varAbilities->availableListWidget()->item(i);
+        QListWidgetItem* widgetItem = ui_abilities->availableListWidget()->item(i);
         if (qobject_cast<MapTrainerTeamMember*>(modified())->ability(widgetItem->data(Qt::UserRole).toInt()))
-            varAbilities->selectedListWidget()->addItem(varAbilities->availableListWidget()->takeItem(i--));
+            ui_abilities->selectedListWidget()->addItem(ui_abilities->availableListWidget()->takeItem(i--));
     }
-    for (int i = 0; i < varAbilities->selectedListWidget()->count(); ++i)
+    for (int i = 0; i < ui_abilities->selectedListWidget()->count(); ++i)
     {
-        QListWidgetItem* widgetItem = varAbilities->selectedListWidget()->item(i);
+        QListWidgetItem* widgetItem = ui_abilities->selectedListWidget()->item(i);
         if (!qobject_cast<MapTrainerTeamMember*>(modified())->ability(widgetItem->data(Qt::UserRole).toInt()))
-            varAbilities->availableListWidget()->addItem(varAbilities->selectedListWidget()->takeItem(i--));
+            ui_abilities->availableListWidget()->addItem(ui_abilities->selectedListWidget()->takeItem(i--));
     }
-    varAbilities->setButtonsEnabled();
-    for (int i = 0; i < varItems->availableListWidget()->count(); ++i)
+    ui_abilities->setButtonsEnabled();
+    for (int i = 0; i < ui_items->availableListWidget()->count(); ++i)
     {
-        QListWidgetItem* widgetItem = varItems->availableListWidget()->item(i);
+        QListWidgetItem* widgetItem = ui_items->availableListWidget()->item(i);
         if (qobject_cast<MapTrainerTeamMember*>(modified())->item(widgetItem->data(Qt::UserRole).toInt()))
-            varItems->selectedListWidget()->addItem(varItems->availableListWidget()->takeItem(i--));
+            ui_items->selectedListWidget()->addItem(ui_items->availableListWidget()->takeItem(i--));
     }
-    for (int i = 0; i < varItems->selectedListWidget()->count(); ++i)
+    for (int i = 0; i < ui_items->selectedListWidget()->count(); ++i)
     {
-        QListWidgetItem* widgetItem = varItems->selectedListWidget()->item(i);
+        QListWidgetItem* widgetItem = ui_items->selectedListWidget()->item(i);
         if (!qobject_cast<MapTrainerTeamMember*>(modified())->item(widgetItem->data(Qt::UserRole).toInt()))
-            varItems->availableListWidget()->addItem(varItems->selectedListWidget()->takeItem(i--));
+            ui_items->availableListWidget()->addItem(ui_items->selectedListWidget()->takeItem(i--));
     }
-    varItems->setButtonsEnabled();
-    QListWidgetItem* selectedItem = varItems->selectedListWidget()->currentItem();
+    ui_items->setButtonsEnabled();
+    QListWidgetItem* selectedItem = ui_items->selectedListWidget()->currentItem();
     if (selectedItem)
-        varItemCount->setValue(qobject_cast<MapTrainerTeamMember*>(modified())->item(selectedItem->data(Qt::UserRole).toInt()));
-    for (int i = 0; i < varMoves->availableListWidget()->count(); ++i)
+        ui_itemCount->setValue(qobject_cast<MapTrainerTeamMember*>(modified())->item(selectedItem->data(Qt::UserRole).toInt()));
+    for (int i = 0; i < ui_moves->availableListWidget()->count(); ++i)
     {
-        QListWidgetItem* widgetItem = varMoves->availableListWidget()->item(i);
+        QListWidgetItem* widgetItem = ui_moves->availableListWidget()->item(i);
         if (qobject_cast<MapTrainerTeamMember*>(modified())->move(widgetItem->data(Qt::UserRole).toInt()))
-            varMoves->selectedListWidget()->addItem(varMoves->availableListWidget()->takeItem(i--));
+            ui_moves->selectedListWidget()->addItem(ui_moves->availableListWidget()->takeItem(i--));
     }
-    for (int i = 0; i < varMoves->selectedListWidget()->count(); ++i)
+    for (int i = 0; i < ui_moves->selectedListWidget()->count(); ++i)
     {
-        QListWidgetItem* widgetItem = varMoves->selectedListWidget()->item(i);
+        QListWidgetItem* widgetItem = ui_moves->selectedListWidget()->item(i);
         if (!qobject_cast<MapTrainerTeamMember*>(modified())->move(widgetItem->data(Qt::UserRole).toInt()))
-            varMoves->availableListWidget()->addItem(varMoves->selectedListWidget()->takeItem(i--));
+            ui_moves->availableListWidget()->addItem(ui_moves->selectedListWidget()->takeItem(i--));
     }
-    varMoves->setButtonsEnabled();
-    for (int i = 0; i < varNatures->availableListWidget()->count(); ++i)
+    ui_moves->setButtonsEnabled();
+    for (int i = 0; i < ui_natures->availableListWidget()->count(); ++i)
     {
-        QListWidgetItem* widgetItem = varNatures->availableListWidget()->item(i);
+        QListWidgetItem* widgetItem = ui_natures->availableListWidget()->item(i);
         if (qobject_cast<MapTrainerTeamMember*>(modified())->nature(widgetItem->data(Qt::UserRole).toInt()))
-            varNatures->selectedListWidget()->addItem(varNatures->availableListWidget()->takeItem(i--));
+            ui_natures->selectedListWidget()->addItem(ui_natures->availableListWidget()->takeItem(i--));
     }
-    for (int i = 0; i < varNatures->selectedListWidget()->count(); ++i)
+    for (int i = 0; i < ui_natures->selectedListWidget()->count(); ++i)
     {
-        QListWidgetItem* widgetItem = varNatures->selectedListWidget()->item(i);
+        QListWidgetItem* widgetItem = ui_natures->selectedListWidget()->item(i);
         if (!qobject_cast<MapTrainerTeamMember*>(modified())->nature(widgetItem->data(Qt::UserRole).toInt()))
-            varNatures->availableListWidget()->addItem(varNatures->selectedListWidget()->takeItem(i--));
+            ui_natures->availableListWidget()->addItem(ui_natures->selectedListWidget()->takeItem(i--));
     }
-    varNatures->setButtonsEnabled();
+    ui_natures->setButtonsEnabled();
 }
 
 void MapTrainerTeamMemberUI::apply()
@@ -184,74 +208,74 @@ void MapTrainerTeamMemberUI::discard()
     emit(changed(false));
 }
 
-void MapTrainerTeamMemberUI::on_varSpecies_activated(const int species)
+void MapTrainerTeamMemberUI::speciesChanged(const int species)
 {
-    qobject_cast<MapTrainerTeamMember*>(modified())->setSpecies(varSpecies->itemData(species).toInt());
+    qobject_cast<MapTrainerTeamMember*>(modified())->setSpecies(game()->species(species)->id());
 }
 
-void MapTrainerTeamMemberUI::on_varLevel_valueChanged(const int level)
+void MapTrainerTeamMemberUI::levelChanged(const int level)
 {
     qobject_cast<MapTrainerTeamMember*>(modified())->setLevel(level);
 }
 
-void MapTrainerTeamMemberUI::on_varAbilities_added(QListWidgetItem* item)
+void MapTrainerTeamMemberUI::abilityAdded(QListWidgetItem* item)
 {
     qobject_cast<MapTrainerTeamMember*>(modified())->setAbility(item->data(Qt::UserRole).toInt(), true);
     setGui();
 }
 
-void MapTrainerTeamMemberUI::on_varAbilities_removed(QListWidgetItem* item)
+void MapTrainerTeamMemberUI::abilityRemoved(QListWidgetItem* item)
 {
     qobject_cast<MapTrainerTeamMember*>(modified())->setAbility(item->data(Qt::UserRole).toInt(), false);
     setGui();
 }
 
-void MapTrainerTeamMemberUI::on_varItems_added(QListWidgetItem* item)
+void MapTrainerTeamMemberUI::itemAdded(QListWidgetItem* item)
 {
     qobject_cast<MapTrainerTeamMember*>(modified())->setItem(item->data(Qt::UserRole).toInt(), 1);
     setGui();
 }
 
-void MapTrainerTeamMemberUI::on_varItems_removed(QListWidgetItem* item)
+void MapTrainerTeamMemberUI::itemRemoved(QListWidgetItem* item)
 {
     qobject_cast<MapTrainerTeamMember*>(modified())->setItem(item->data(Qt::UserRole).toInt(), 0);
     setGui();
 }
 
-void MapTrainerTeamMemberUI::selectedItemChanged(QListWidgetItem* item)
+void MapTrainerTeamMemberUI::itemChanged(QListWidgetItem* item)
 {
     if (item)
-        varItemCount->setValue(qobject_cast<MapTrainerTeamMember*>(modified())->item(item->data(Qt::UserRole).toInt()));
+        ui_itemCount->setValue(qobject_cast<MapTrainerTeamMember*>(modified())->item(item->data(Qt::UserRole).toInt()));
     else
-        varItemCount->setEnabled(false);
+        ui_itemCount->setEnabled(false);
 }
 
-void MapTrainerTeamMemberUI::on_varItemCount_valueChanged(const int itemCount)
+void MapTrainerTeamMemberUI::itemCountChanged(const int itemCount)
 {
-    QListWidgetItem* item = varItems->selectedListWidget()->currentItem();
+    QListWidgetItem* item = ui_items->selectedListWidget()->currentItem();
     qobject_cast<MapTrainerTeamMember*>(modified())->setItem(item->data(Qt::UserRole).toInt(), itemCount);
     setGui();
 }
 
-void MapTrainerTeamMemberUI::on_varMoves_added(QListWidgetItem* item)
+void MapTrainerTeamMemberUI::moveAdded(QListWidgetItem* item)
 {
     qobject_cast<MapTrainerTeamMember*>(modified())->setMove(item->data(Qt::UserRole).toInt(), true);
     setGui();
 }
 
-void MapTrainerTeamMemberUI::on_varMoves_removed(QListWidgetItem* item)
+void MapTrainerTeamMemberUI::moveRemoved(QListWidgetItem* item)
 {
     qobject_cast<MapTrainerTeamMember*>(modified())->setMove(item->data(Qt::UserRole).toInt(), false);
     setGui();
 }
 
-void MapTrainerTeamMemberUI::on_varNatures_added(QListWidgetItem* item)
+void MapTrainerTeamMemberUI::natureAdded(QListWidgetItem* item)
 {
     qobject_cast<MapTrainerTeamMember*>(modified())->setNature(item->data(Qt::UserRole).toInt(), true);
     setGui();
 }
 
-void MapTrainerTeamMemberUI::on_varNatures_removed(QListWidgetItem* item)
+void MapTrainerTeamMemberUI::natureRemoved(QListWidgetItem* item)
 {
     qobject_cast<MapTrainerTeamMember*>(modified())->setNature(item->data(Qt::UserRole).toInt(), false);
     setGui();