sheepy-clone: comparison QTfrontend/ui/widget/selectWeapon.cpp

equal deleted inserted replaced

-:6e8b807bda4b
+:ba39a1d396c0
 #include "selectWeapon.h"
 #include "weaponItem.h"
 #include "hwconsts.h"
+#include <QDebug>
 #include <QPushButton>
 #include <QGridLayout>
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QBitmap>
 SelWeaponWidget::SelWeaponWidget(int numItems, QWidget* parent) :
 QFrame(parent),
 m_numItems(numItems)
 {
-wconf = new QSettings(cfgdir->absolutePath() + "/weapons.ini", QSettings::IniFormat, this);
+wconf = new QMap<QString, QString>();
 for(int i = 0; i < cDefaultAmmos.size(); ++i)
-wconf->setValue(cDefaultAmmos[i].first, cDefaultAmmos[i].second);
+{
+wconf->insert(cDefaultAmmos[i].first, cDefaultAmmos[i].second);
-QStringList keys = wconf->allKeys();
+}
-for(int i = 0; i < keys.size(); i++)
-{
+if (!QDir(cfgdir->absolutePath() + "/Schemes").exists()) {
-if (wconf->value(keys[i]).toString().size() != cDefaultAmmoStore->size())
+QDir().mkdir(cfgdir->absolutePath() + "/Schemes");
-wconf->setValue(keys[i], fixWeaponSet(wconf->value(keys[i]).toString()));
+}
+if (!QDir(cfgdir->absolutePath() + "/Schemes/Ammo").exists()) {
+qDebug("No /Schemes/Ammo directory found. Trying to import weapon schemes from weapons.ini.");
+QDir().mkdir(cfgdir->absolutePath() + "/Schemes/Ammo");
+QSettings old_wconf(cfgdir->absolutePath() + "/weapons.ini", QSettings::IniFormat);
+QStringList defaultAmmos;
+for(int i = 0; i < cDefaultAmmos.size(); ++i)
+{
+defaultAmmos.append(cDefaultAmmos[i].first);
+}
+QStringList keys = old_wconf.allKeys();
+int imported = 0;
+for(int i = 0; i < keys.size(); i++)
+{
+if (!defaultAmmos.contains(keys[i])) {
+wconf->insert(keys[i], fixWeaponSet(old_wconf.value(keys[i]).toString()));
+QFile file(cfgdir->absolutePath() + "/Schemes/Ammo/" + keys[i] + ".hwa");
+if (file.open(QIODevice::WriteOnly)) {
+QTextStream stream( &file );
+stream << old_wconf.value(keys[i]).toString() << endl;
+file.close();
+}
+imported++;
+}
+}
+qDebug("%d weapon scheme(s) imported.", imported);
+} else {
+QStringList schemes = QDir(cfgdir->absolutePath() + "/Schemes/Ammo").entryList(QDir::Files);
+for(int i = 0; i < schemes.size(); i++)
+{
+QFile file(cfgdir->absolutePath() + "/Schemes/Ammo/" + schemes[i]);
+QString config;
+if (file.open(QIODevice::ReadOnly)) {
+QTextStream stream( &file );
+stream >> config;
+file.close();
+}
+// Chop off file name suffix
+QString schemeName = schemes[i];
+if (schemeName.endsWith(".hwa", Qt::CaseInsensitive)) {
+schemeName.chop(4);
+}
+wconf->insert(schemeName, fixWeaponSet(config));
+}
 }
 QString currentState = *cDefaultAmmoStore;
 QTabWidget * tbw = new QTabWidget(this);
 void SelWeaponWidget::setWeapons(const QString& ammo)
 {
 bool enable = true;
 for(int i = 0; i < cDefaultAmmos.size(); i++)
+{
 if (!cDefaultAmmos[i].first.compare(m_name->text()))
 {
 enable = false;
-}
+break;
+}
+}
 for(int i = 0; i < m_numItems; ++i)
 {
 twi::iterator it = weaponItems.find(i);
 if (it == weaponItems.end()) continue;
 it.value()[0]->setItemsNum(ammo[i].digitValue());
 }
 void SelWeaponWidget::setDefault()
 {
 for(int i = 0; i < cDefaultAmmos.size(); i++)
+{
 if (!cDefaultAmmos[i].first.compare(m_name->text()))
 {
 return;
 }
+}
 setWeapons(*cDefaultAmmoStore);
 }
 //Save current weapons set.
 void SelWeaponWidget::save()
 if (curWeaponsName != "")
 {
 // remove old entry
 wconf->remove(curWeaponsName);
 }
-wconf->setValue(m_name->text(), stateFull);
+wconf->insert(m_name->text(), stateFull);
+QFile file(cfgdir->absolutePath() + "/Schemes/Ammo/" + m_name->text()+ ".hwa");
+if (file.open(QIODevice::WriteOnly)) {
+QTextStream stream( &file );
+stream << stateFull << endl;
+file.close();
+}
 emit weaponsEdited(curWeaponsName, m_name->text(), stateFull);
 }
 int SelWeaponWidget::operator [] (unsigned int weaponIndex) const
 {
 return it == weaponItems.end() ? 9 : it.value()[0]->getItemsNum();
 }
 QString SelWeaponWidget::getWeaponsString(const QString& name) const
 {
-return wconf->value(name).toString();
+return wconf->find(name).value();
 }
 void SelWeaponWidget::deleteWeaponsName()
 {
 QString delWeaponsName = curWeaponsName;
 if (delWeaponsName == "") return;
 for(int i = 0; i < cDefaultAmmos.size(); i++)
+{
 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));
 deniedMsg.setWindowModality(Qt::WindowModal);
 deniedMsg.exec();
 return;
 }
+}
 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(delWeaponsName));
 if (reallyDeleteMsg.exec() == QMessageBox::Ok)
 {
 isDeleting = true;
 wconf->remove(delWeaponsName);
+QFile(cfgdir->absolutePath() + "/Schemes/Ammo/" + curWeaponsName + ".hwa").remove();
 emit weaponsDeleted(delWeaponsName);
 }
 }
 void SelWeaponWidget::newWeaponsName()
 //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);
+wconf->insert(newName, *cEmptyAmmoStore);
 emit weaponsAdded(newName, *cEmptyAmmoStore);
 }
 void SelWeaponWidget::setWeaponsName(const QString& name)
 {
 curWeaponsName = name;
 if(name != "" && wconf->contains(name))
 {
-setWeapons(wconf->value(name).toString());
+setWeapons(wconf->find(name).value());
 }
 else
 {
 setWeapons(*cEmptyAmmoStore);
 }
 setWeaponsName(name);
 }
 QStringList SelWeaponWidget::getWeaponNames() const
 {
-return wconf->allKeys();
+return wconf->keys();
 }
 void SelWeaponWidget::copy()
 {
 save();
 int i=2;
 while(wconf->contains(newName = tr("Copy of %1 (%2)").arg(curWeaponsName).arg(i++)));
 }
 setWeaponsName(newName);
 setWeapons(ammo);
-wconf->setValue(newName, ammo);
+wconf->insert(newName, ammo);
 emit weaponsAdded(newName, ammo);
 }
 }
 QString SelWeaponWidget::fixWeaponSet(const QString &s)
 << s.mid(thisSetLength * 2, thisSetLength)
 << s.right(thisSetLength)
 ;
 for(int i = sl.length() - 1; i >= 0; --i)
+{
 sl[i] = sl[i].leftJustified(neededLength, '0', true);
+}
 return sl.join(QString());
 }
 void SelWeaponWidget::deletionDone()

branch	ios-develop
changeset 13418	ba39a1d396c0
parent 13325	b024cf25bde1
child 13560	43b72629d453