# HG changeset patch # User Wuzzy # Date 1462553381 -7200 # Node ID 5f21387edff1564b486016900a1cac847aa0f1ee # Parent f73a299c7884e372cd23b981ba620c15706bf734 Slightly better naming of new or copied ammo/game schemes diff -r f73a299c7884 -r 5f21387edff1 QTfrontend/model/ammoSchemeModel.cpp --- a/QTfrontend/model/ammoSchemeModel.cpp Fri May 06 18:35:33 2016 +0200 +++ b/QTfrontend/model/ammoSchemeModel.cpp Fri May 06 18:49:41 2016 +0200 @@ -755,13 +755,13 @@ if (row == -1) { QList newScheme = defaultScheme; - newScheme[0] = QVariant(tr("new")); + newScheme[0] = QVariant(tr("New")); schemes.insert(schemes.size(), newScheme); } else { QList newScheme = schemes[row]; - newScheme[0] = QVariant(tr("copy of %1").arg(newScheme[0].toString())); + newScheme[0] = QVariant(tr("Copy of %1").arg(newScheme[0].toString())); schemes.insert(schemes.size(), newScheme); } diff -r f73a299c7884 -r 5f21387edff1 QTfrontend/ui/widget/selectWeapon.cpp --- a/QTfrontend/ui/widget/selectWeapon.cpp Fri May 06 18:35:33 2016 +0200 +++ b/QTfrontend/ui/widget/selectWeapon.cpp Fri May 06 18:49:41 2016 +0200 @@ -286,12 +286,12 @@ void SelWeaponWidget::newWeaponsName() { - QString newName = tr("new"); + 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")+QString::number(i++))) ; + while(wconf->contains(newName = tr("New (%1)").arg(i++))) ; } setWeaponsName(newName); } @@ -322,12 +322,12 @@ if(wconf->contains(curWeaponsName)) { QString ammo = getWeaponsString(curWeaponsName); - QString newName = tr("copy of %1").arg(curWeaponsName); + QString newName = tr("Copy of %1").arg(curWeaponsName); if(wconf->contains(newName)) { //name already used -> look for an appropriate name: int i=2; - while(wconf->contains(newName = tr("copy of %1").arg(curWeaponsName+QString::number(i++)))); + while(wconf->contains(newName = tr("Copy of %1 (%2)").arg(curWeaponsName, i++))); } setWeaponsName(newName); setWeapons(ammo);