Fixed MapTrainerTeamMember editing

1 files changed, 122 insertions, 30 deletions

diff --git a/sigmodr/MapTrainerTeamMemberUI.cpp b/sigmodr/MapTrainerTeamMemberUI.cpp
index 6491adeb..bf4737ad 100644
--- a/sigmodr/MapTrainerTeamMemberUI.cpp
+++ b/sigmodr/MapTrainerTeamMemberUI.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Ben Boeckel <MathStuf@gmail.com>
+ * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com>
  * 
  * 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
@@ -28,7 +28,8 @@
 #include "../sigmod/Sigmod.h"
 #include "../sigmod/Species.h"
 
-// FIXME: Update GUI to new item storage
+// Qt includes
+#include <QtGui/QListWidgetItem>
 
 Sigmodr::MapTrainerTeamMemberUI::MapTrainerTeamMemberUI(Sigmod::MapTrainerTeamMember* teamMember, QWidget* parent) :
         ObjectUI(parent)
@@ -41,6 +42,11 @@ Sigmodr::MapTrainerTeamMemberUI::~MapTrainerTeamMemberUI()
 {
 }
 
+void Sigmodr::MapTrainerTeamMemberUI::initGui()
+{
+    connect(varItems->selectedListWidget(), SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), this, SLOT(selectedItemChanged(QListWidgetItem*)));
+}
+
 void Sigmodr::MapTrainerTeamMemberUI::refreshGui()
 {
     const bool blockedSpecies = varSpecies->blockSignals(true);
@@ -53,43 +59,51 @@ void Sigmodr::MapTrainerTeamMemberUI::refreshGui()
     varSpecies->blockSignals(blockedSpecies);
     varLevel->setMaximum(sigmod()->rules()->maxLevel());
     const bool blockedAbilities = varAbilities->blockSignals(true);
-    varAbilities->clear();
+    varAbilities->availableListWidget()->clear();
+    varAbilities->selectedListWidget()->clear();
     for (int i = 0; i < sigmod()->abilityCount(); ++i)
     {
         const Sigmod::Ability* ability = sigmod()->ability(i);
-        QListWidgetItem* widgetItem = new QListWidgetItem(ability->name(), varAbilities);
+        QListWidgetItem* widgetItem = new QListWidgetItem(ability->name(), varAbilities->availableListWidget());
         widgetItem->setData(Qt::UserRole, ability->id());
     }
     varAbilities->blockSignals(blockedAbilities);
+    varAbilities->setButtonsEnabled();
     boxAbilities->setEnabled(sigmod()->rules()->maxAbilities());
     const bool blockedItems = varItems->blockSignals(true);
-    varItems->clear();
+    varItems->availableListWidget()->clear();
+    varItems->selectedListWidget()->clear();
     for (int i = 0; i < sigmod()->itemCount(); ++i)
     {
         const Sigmod::Item* item = sigmod()->item(i);
-        QListWidgetItem* widgetItem = new QListWidgetItem(item->name(), varItems);
+        QListWidgetItem* widgetItem = new QListWidgetItem(item->name(), varItems->availableListWidget());
         widgetItem->setData(Qt::UserRole, item->id());
     }
     varItems->blockSignals(blockedItems);
+    varItems->setButtonsEnabled();
     boxItems->setEnabled(sigmod()->rules()->maxHeldItems());
     const bool blockedMoves = varMoves->blockSignals(true);
-    varMoves->clear();
+    varMoves->availableListWidget()->clear();
+    varMoves->selectedListWidget()->clear();
     for (int i = 0; i < sigmod()->abilityCount(); ++i)
     {
         const Sigmod::Move* move = sigmod()->move(i);
-        QListWidgetItem* widgetItem = new QListWidgetItem(move->name(), varMoves);
+        QListWidgetItem* widgetItem = new QListWidgetItem(move->name(), varMoves->availableListWidget());
         widgetItem->setData(Qt::UserRole, move->id());
     }
     varMoves->blockSignals(blockedMoves);
+    varMoves->setButtonsEnabled();
     const bool blockedNatures = varNatures->blockSignals(true);
-    varNatures->clear();
+    varNatures->availableListWidget()->clear();
+    varNatures->selectedListWidget()->clear();
     for (int i = 0; i < sigmod()->natureCount(); ++i)
     {
         const Sigmod::Nature* nature = sigmod()->nature(i);
-        QListWidgetItem* widgetItem = new QListWidgetItem(nature->name(), varNatures);
+        QListWidgetItem* widgetItem = new QListWidgetItem(nature->name(), varNatures->availableListWidget());
         widgetItem->setData(Qt::UserRole, nature->id());
     }
     varNatures->blockSignals(blockedNatures);
+    varNatures->setButtonsEnabled();
     boxNatures->setEnabled(sigmod()->rules()->maxNatures());
 }
 
@@ -97,26 +111,61 @@ void Sigmodr::MapTrainerTeamMemberUI::setGui()
 {
     varSpecies->setCurrentIndex(varSpecies->findData(qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->species()));
     varLevel->setValue(qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->level());
-    for (int i = 0; i < varAbilities->count(); ++i)
+    for (int i = 0; i < varAbilities->availableListWidget()->count(); ++i)
+    {
+        QListWidgetItem* widgetItem = varAbilities->availableListWidget()->item(i);
+        if (qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->ability(widgetItem->data(Qt::UserRole).toInt()))
+            varAbilities->selectedListWidget()->addItem(varAbilities->availableListWidget()->takeItem(i--));
+    }
+    for (int i = 0; i < varAbilities->selectedListWidget()->count(); ++i)
     {
-        QListWidgetItem* widgetItem = varAbilities->item(i);
-        widgetItem->setSelected(qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->ability(widgetItem->data(Qt::UserRole).toInt()));
+        QListWidgetItem* widgetItem = varAbilities->selectedListWidget()->item(i);
+        if (!qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->ability(widgetItem->data(Qt::UserRole).toInt()))
+            varAbilities->availableListWidget()->addItem(varAbilities->selectedListWidget()->takeItem(i--));
     }
-    for (int i = 0; i < varItems->count(); ++i)
+    varAbilities->setButtonsEnabled();
+    for (int i = 0; i < varItems->availableListWidget()->count(); ++i)
     {
-        QListWidgetItem* widgetItem = varItems->item(i);
-        widgetItem->setSelected(qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->item(widgetItem->data(Qt::UserRole).toInt()));
+        QListWidgetItem* widgetItem = varItems->availableListWidget()->item(i);
+        if (qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->item(widgetItem->data(Qt::UserRole).toInt()))
+            varItems->selectedListWidget()->addItem(varItems->availableListWidget()->takeItem(i--));
     }
-    for (int i = 0; i < varMoves->count(); ++i)
+    for (int i = 0; i < varItems->selectedListWidget()->count(); ++i)
     {
-        QListWidgetItem* widgetItem = varMoves->item(i);
-        widgetItem->setSelected(qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->move(widgetItem->data(Qt::UserRole).toInt()));
+        QListWidgetItem* widgetItem = varItems->selectedListWidget()->item(i);
+        if (!qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->item(widgetItem->data(Qt::UserRole).toInt()))
+            varItems->availableListWidget()->addItem(varItems->selectedListWidget()->takeItem(i--));
     }
-    for (int i = 0; i < varNatures->count(); ++i)
+    varItems->setButtonsEnabled();
+    QListWidgetItem* selectedItem = varItems->selectedListWidget()->currentItem();
+    if (selectedItem)
+        varItemCount->setValue(qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->item(selectedItem->data(Qt::UserRole).toInt()));
+    for (int i = 0; i < varMoves->availableListWidget()->count(); ++i)
     {
-        QListWidgetItem* widgetItem = varNatures->item(i);
-        widgetItem->setSelected(qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->nature(widgetItem->data(Qt::UserRole).toInt()));
+        QListWidgetItem* widgetItem = varMoves->availableListWidget()->item(i);
+        if (qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->move(widgetItem->data(Qt::UserRole).toInt()))
+            varMoves->selectedListWidget()->addItem(varMoves->availableListWidget()->takeItem(i--));
     }
+    for (int i = 0; i < varMoves->selectedListWidget()->count(); ++i)
+    {
+        QListWidgetItem* widgetItem = varMoves->selectedListWidget()->item(i);
+        if (!qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->move(widgetItem->data(Qt::UserRole).toInt()))
+            varMoves->availableListWidget()->addItem(varMoves->selectedListWidget()->takeItem(i--));
+    }
+    varMoves->setButtonsEnabled();
+    for (int i = 0; i < varNatures->availableListWidget()->count(); ++i)
+    {
+        QListWidgetItem* widgetItem = varNatures->availableListWidget()->item(i);
+        if (qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->nature(widgetItem->data(Qt::UserRole).toInt()))
+            varNatures->selectedListWidget()->addItem(varNatures->availableListWidget()->takeItem(i--));
+    }
+    for (int i = 0; i < varNatures->selectedListWidget()->count(); ++i)
+    {
+        QListWidgetItem* widgetItem = varNatures->selectedListWidget()->item(i);
+        if (!qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->nature(widgetItem->data(Qt::UserRole).toInt()))
+            varNatures->availableListWidget()->addItem(varNatures->selectedListWidget()->takeItem(i--));
+    }
+    varNatures->setButtonsEnabled();
 }
 
 void Sigmodr::MapTrainerTeamMemberUI::apply()
@@ -142,22 +191,65 @@ void Sigmodr::MapTrainerTeamMemberUI::on_varLevel_valueChanged(const int level)
     qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setLevel(level);
 }
 
-void Sigmodr::MapTrainerTeamMemberUI::on_varAbilities_itemClicked(QListWidgetItem* item)
+void Sigmodr::MapTrainerTeamMemberUI::on_varAbilities_added(QListWidgetItem* item)
+{
+    qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setAbility(item->data(Qt::UserRole).toInt(), true);
+    setGui();
+}
+
+void Sigmodr::MapTrainerTeamMemberUI::on_varAbilities_removed(QListWidgetItem* item)
+{
+    qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setAbility(item->data(Qt::UserRole).toInt(), false);
+    setGui();
+}
+
+void Sigmodr::MapTrainerTeamMemberUI::on_varItems_added(QListWidgetItem* item)
 {
-    qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setAbility(item->data(Qt::UserRole).toInt(), item->isSelected());
+    qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setItem(item->data(Qt::UserRole).toInt(), 1);
+    setGui();
+}
+
+void Sigmodr::MapTrainerTeamMemberUI::on_varItems_removed(QListWidgetItem* item)
+{
+    qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setItem(item->data(Qt::UserRole).toInt(), 0);
+    setGui();
 }
 
-void Sigmodr::MapTrainerTeamMemberUI::on_varItems_itemClicked(QListWidgetItem* item)
+void Sigmodr::MapTrainerTeamMemberUI::selectedItemChanged(QListWidgetItem* item)
 {
-    qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setItem(item->data(Qt::UserRole).toInt(), item->isSelected());
+    if (item)
+        varItemCount->setValue(qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->item(item->data(Qt::UserRole).toInt()));
+    else
+        varItemCount->setEnabled(false);
 }
 
-void Sigmodr::MapTrainerTeamMemberUI::on_varMoves_itemClicked(QListWidgetItem* item)
+void Sigmodr::MapTrainerTeamMemberUI::on_varItemCount_valueChanged(const int itemCount)
 {
-    qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setMove(item->data(Qt::UserRole).toInt(), item->isSelected());
+    QListWidgetItem* item = varItems->selectedListWidget()->currentItem();
+    qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setItem(item->data(Qt::UserRole).toInt(), itemCount);
+    setGui();
+}
+
+void Sigmodr::MapTrainerTeamMemberUI::on_varMoves_added(QListWidgetItem* item)
+{
+    qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setMove(item->data(Qt::UserRole).toInt(), true);
+    setGui();
 }
 
-void Sigmodr::MapTrainerTeamMemberUI::on_varNatures_itemClicked(QListWidgetItem* item)
+void Sigmodr::MapTrainerTeamMemberUI::on_varMoves_removed(QListWidgetItem* item)
 {
-    qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setNature(item->data(Qt::UserRole).toInt(), item->isSelected());
+    qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setMove(item->data(Qt::UserRole).toInt(), false);
+    setGui();
+}
+
+void Sigmodr::MapTrainerTeamMemberUI::on_varNatures_added(QListWidgetItem* item)
+{
+    qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setNature(item->data(Qt::UserRole).toInt(), true);
+    setGui();
+}
+
+void Sigmodr::MapTrainerTeamMemberUI::on_varNatures_removed(QListWidgetItem* item)
+{
+    qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setNature(item->data(Qt::UserRole).toInt(), false);
+    setGui();
 }