hedgewars: comparison QTfrontend/ui/widget/selectWeapon.cpp

equal deleted inserted replaced

-:943b258d5443
+:5664ec82aed7
 return;
 }
 setWeapons(*cDefaultAmmoStore);
 }
+//Save current weapons set.
 void SelWeaponWidget::save()
 {
+//The save() function is called by ANY change of the combo box.
+//If an entry is deleted, this code would just re-add the deleted
+//item. We use isDeleted to check if we are currently deleting to
+//prevent this.
+if (isDeleting)
+return;
 // TODO make this return if success or not, so that the page can react
 // properly and not goBack if saving failed
-if (m_name->text() == "") return;
+if (m_name->text() == "")
+return;
 QString state1;
 QString state2;
 QString state3;
 QString state4;
 {
 // remove old entry
 wconf->remove(curWeaponsName);
 }
 wconf->setValue(m_name->text(), stateFull);
-emit weaponsChanged();
+emit weaponsEdited(curWeaponsName, m_name->text(), stateFull);
 }
 int SelWeaponWidget::operator [] (unsigned int weaponIndex) const
 {
 twi::const_iterator it = weaponItems.find(weaponIndex);
 return wconf->value(name).toString();
 }
 void SelWeaponWidget::deleteWeaponsName()
 {
-if (curWeaponsName == "") return;
+QString delWeaponsName = curWeaponsName;
+if (delWeaponsName == "") return;
 for(int i = 0; i < cDefaultAmmos.size(); i++)
-if (!cDefaultAmmos[i].first.compare(m_name->text()))
+if (!cDefaultAmmos[i].first.compare(delWeaponsName))
 {
 QMessageBox deniedMsg(this);
 deniedMsg.setIcon(QMessageBox::Warning);
 deniedMsg.setWindowTitle(QMessageBox::tr("Weapons - Warning"));
 deniedMsg.setText(QMessageBox::tr("Cannot delete default weapon set '%1'!").arg(cDefaultAmmos[i].first));
 }
 QMessageBox reallyDeleteMsg(this);
 reallyDeleteMsg.setIcon(QMessageBox::Question);
 reallyDeleteMsg.setWindowTitle(QMessageBox::tr("Weapons - Are you sure?"));
-reallyDeleteMsg.setText(QMessageBox::tr("Do you really want to delete the weapon set '%1'?").arg(curWeaponsName));
+reallyDeleteMsg.setText(QMessageBox::tr("Do you really want to delete the weapon set '%1'?").arg(delWeaponsName));
 reallyDeleteMsg.setWindowModality(Qt::WindowModal);
 reallyDeleteMsg.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
 if (reallyDeleteMsg.exec() == QMessageBox::Ok)
 {
-wconf->remove(curWeaponsName);
+isDeleting = true;
-emit weaponsDeleted();
+wconf->remove(delWeaponsName);
+emit weaponsDeleted(delWeaponsName);
 }
 }
 void SelWeaponWidget::newWeaponsName()
 {
+save();
 QString newName = tr("New");
 if(wconf->contains(newName))
 {
 //name already used -> look for an appropriate name:
 int i=2;
 while(wconf->contains(newName = tr("New (%1)").arg(i++))) ;
 }
 setWeaponsName(newName);
+wconf->setValue(newName, *cEmptyAmmoStore);
+emit weaponsAdded(newName, *cEmptyAmmoStore);
 }
 void SelWeaponWidget::setWeaponsName(const QString& name)
 {
 m_name->setText(name);
 {
 setWeapons(*cEmptyAmmoStore);
 }
 }
+void SelWeaponWidget::switchWeapons(const QString& name)
+{
+// Rescue old weapons set, then select new one
+save();
+setWeaponsName(name);
+}
 QStringList SelWeaponWidget::getWeaponNames() const
 {
 return wconf->allKeys();
 }
 void SelWeaponWidget::copy()
 {
+save();
 if(wconf->contains(curWeaponsName))
 {
 QString ammo = getWeaponsString(curWeaponsName);
 QString newName = tr("Copy of %1").arg(curWeaponsName);
 if(wconf->contains(newName))
 int i=2;
 while(wconf->contains(newName = tr("Copy of %1 (%2)").arg(curWeaponsName).arg(i++)));
 }
 setWeaponsName(newName);
 setWeapons(ammo);
+wconf->setValue(newName, ammo);
+emit weaponsAdded(newName, ammo);
 }
 }
 QString SelWeaponWidget::fixWeaponSet(const QString &s)
 {
 for(int i = sl.length() - 1; i >= 0; --i)
 sl[i] = sl[i].leftJustified(neededLength, '0', true);
 return sl.join(QString());
 }
+void SelWeaponWidget::deletionDone()
+{
+isDeleting = false;
+}

changeset 12665	5664ec82aed7
parent 12663	d7492247a368
child 12689	5b135c26f320