diff -r 0ddb100fea61 -r f924be23ffb4 QTfrontend/ammoSchemeModel.cpp --- a/QTfrontend/ammoSchemeModel.cpp Mon Dec 27 23:57:44 2010 +0100 +++ b/QTfrontend/ammoSchemeModel.cpp Tue Jan 04 12:53:46 2011 +0100 @@ -60,6 +60,7 @@ << QVariant(25) // health case amt 34 << QVariant(47) // water rise amt 35 << QVariant(5) // health dec amt 36 + << QVariant(100) // rope modfier 37 ; AmmoSchemeModel::AmmoSchemeModel(QObject* parent, const QString & fileName) : @@ -120,6 +121,7 @@ << "healthcaseamount" // 34 << "waterrise" // 35 << "healthdecrease" // 36 + << "ropepct" // 37 ; QList proMode; @@ -161,6 +163,7 @@ << QVariant(25) // health case amt 34 << QVariant(47) // water rise amt 35 << QVariant(5) // health dec amt 36 + << QVariant(100) // rope modfier 37 ; QList shoppa; @@ -202,6 +205,7 @@ << QVariant(25) // health case amt 34 << QVariant(47) // water rise amt 35 << QVariant(5) // health dec amt 36 + << QVariant(100) // rope modfier 37 ; QList cleanslate; @@ -243,6 +247,7 @@ << QVariant(25) // health case amt 34 << QVariant(47) // water rise amt 35 << QVariant(5) // health dec amt 36 + << QVariant(100) // rope modfier 37 ; QList minefield; @@ -284,6 +289,7 @@ << QVariant(25) // health case amt 34 << QVariant(47) // water rise amt 35 << QVariant(5) // health dec amt 36 + << QVariant(100) // rope modfier 37 ; QList barrelmayhem; @@ -325,6 +331,7 @@ << QVariant(25) // health case amt 34 << QVariant(47) // water rise amt 35 << QVariant(5) // health dec amt 36 + << QVariant(100) // rope modfier 37 ; QList tunnelhogs; @@ -366,6 +373,7 @@ << QVariant(25) // health case amt 34 << QVariant(47) // water rise amt 35 << QVariant(5) // health dec amt 36 + << QVariant(100) // rope modfier 37 ; QList forts; @@ -407,6 +415,7 @@ << QVariant(25) // health case amt 34 << QVariant(47) // water rise amt 35 << QVariant(5) // health dec amt 36 + << QVariant(100) // rope modfier 37 ; QList timeless; @@ -448,6 +457,7 @@ << QVariant(30) // health case amt 34 << QVariant(0) // water rise amt 35 << QVariant(0) // health dec amt 36 + << QVariant(100) // rope modfier 37 ; QList thinkingportals; @@ -489,6 +499,7 @@ << QVariant(25) // health case amt 34 << QVariant(47) // water rise amt 35 << QVariant(5) // health dec amt 36 + << QVariant(100) // rope modfier 37 ; QList kingmode; @@ -507,8 +518,8 @@ << QVariant(false) // artillery 11 << QVariant(true) // random order 12 << QVariant(true) // king 13 - << QVariant(true) // place hog 14 - << QVariant(true) // shared ammo 15 + << QVariant(false) // place hog 14 + << QVariant(false) // shared ammo 15 << QVariant(false) // disable girders 16 << QVariant(false) // disable land objects 17 << QVariant(false) // AI survival 18 @@ -523,13 +534,14 @@ << QVariant(15) // sudden death 27 << QVariant(5) // case prob 28 << QVariant(3) // mines time 29 - << QVariant(3) // mines number 30 - << QVariant(20) // mine dud pct 31 - << QVariant(3) // explosives 32 + << QVariant(4) // mines number 30 + << QVariant(0) // mine dud pct 31 + << QVariant(2) // explosives 32 << QVariant(35) // health case pct 33 - << QVariant(30) // health case amt 34 - << QVariant(30) // water rise amt 35 + << QVariant(25) // health case amt 34 + << QVariant(47) // water rise amt 35 << QVariant(5) // health dec amt 36 + << QVariant(100) // rope modfier 37 ; @@ -565,6 +577,10 @@ QVariant AmmoSchemeModel::headerData(int section, Qt::Orientation orientation, int role) const { + Q_UNUSED(section); + Q_UNUSED(orientation); + Q_UNUSED(role); + return QVariant(); } @@ -586,6 +602,8 @@ Qt::ItemFlags AmmoSchemeModel::flags(const QModelIndex & index) const { + Q_UNUSED(index); + return Qt::ItemIsEnabled | Qt::ItemIsSelectable @@ -608,12 +626,22 @@ bool AmmoSchemeModel::insertRows(int row, int count, const QModelIndex & parent) { - beginInsertRows(parent, row, row); + Q_UNUSED(count); + + beginInsertRows(parent, schemes.size(), schemes.size()); - QList newScheme = defaultScheme; - newScheme[0] = QVariant(tr("new")); - - schemes.insert(row, newScheme); + if (row == -1) + { + QList newScheme = defaultScheme; + newScheme[0] = QVariant(tr("new")); + schemes.insert(schemes.size(), newScheme); + } + else + { + QList newScheme = schemes[row]; + newScheme[0] = QVariant(tr("copy of") + " " + newScheme[0].toString()); + schemes.insert(schemes.size(), newScheme); + } endInsertRows(); @@ -672,6 +700,10 @@ QVariant NetAmmoSchemeModel::headerData(int section, Qt::Orientation orientation, int role) const { + Q_UNUSED(section); + Q_UNUSED(orientation); + Q_UNUSED(role); + return QVariant(); }