# HG changeset patch # User Wuzzy # Date 1460541802 -7200 # Node ID d448b304bc70bb5a4250f8502835fc733bb1e2d1 # Parent 42d7f5dbd8dc9bd69a9cb052c1bf18b624095851 Update scheme editor icons diff -r 42d7f5dbd8dc -r d448b304bc70 QTfrontend/hedgewars.qrc --- a/QTfrontend/hedgewars.qrc Tue Apr 12 15:41:48 2016 -0400 +++ b/QTfrontend/hedgewars.qrc Wed Apr 13 12:03:22 2016 +0200 @@ -122,7 +122,10 @@ res/btnBottomBorder@2x.png res/iconBox.png res/iconHealth.png + res/iconHealthPercent.png res/iconSuddenDeath.png + res/iconSuddenDeathTime.png + res/iconSuddenDeathWater.png res/iconDamage.png res/iconDamageLockG.png res/iconDamageLockR.png @@ -130,9 +133,13 @@ res/iconTimeLockG.png res/iconTimeLockR.png res/iconMine.png + res/iconMineTime.png res/iconDud.png + res/iconExplosive.png + res/iconAirMine.png res/iconRope.png res/iconEarth.png + res/iconScript.png res/dice.png res/Star.png res/inverse-corner-bl.png diff -r 42d7f5dbd8dc -r d448b304bc70 QTfrontend/res/iconAirMine.png Binary file QTfrontend/res/iconAirMine.png has changed diff -r 42d7f5dbd8dc -r d448b304bc70 QTfrontend/res/iconDud.png Binary file QTfrontend/res/iconDud.png has changed diff -r 42d7f5dbd8dc -r d448b304bc70 QTfrontend/res/iconDud@2x.png Binary file QTfrontend/res/iconDud@2x.png has changed diff -r 42d7f5dbd8dc -r d448b304bc70 QTfrontend/res/iconExplosive.png Binary file QTfrontend/res/iconExplosive.png has changed diff -r 42d7f5dbd8dc -r d448b304bc70 QTfrontend/res/iconExplosive@2x.png Binary file QTfrontend/res/iconExplosive@2x.png has changed diff -r 42d7f5dbd8dc -r d448b304bc70 QTfrontend/res/iconHealthPercent.png Binary file QTfrontend/res/iconHealthPercent.png has changed diff -r 42d7f5dbd8dc -r d448b304bc70 QTfrontend/res/iconMine.png Binary file QTfrontend/res/iconMine.png has changed diff -r 42d7f5dbd8dc -r d448b304bc70 QTfrontend/res/iconMine@2x.png Binary file QTfrontend/res/iconMine@2x.png has changed diff -r 42d7f5dbd8dc -r d448b304bc70 QTfrontend/res/iconMineTime.png Binary file QTfrontend/res/iconMineTime.png has changed diff -r 42d7f5dbd8dc -r d448b304bc70 QTfrontend/res/iconScript.png Binary file QTfrontend/res/iconScript.png has changed diff -r 42d7f5dbd8dc -r d448b304bc70 QTfrontend/res/iconScript@2x.png Binary file QTfrontend/res/iconScript@2x.png has changed diff -r 42d7f5dbd8dc -r d448b304bc70 QTfrontend/res/iconSuddenDeathTime.png Binary file QTfrontend/res/iconSuddenDeathTime.png has changed diff -r 42d7f5dbd8dc -r d448b304bc70 QTfrontend/res/iconSuddenDeathWater.png Binary file QTfrontend/res/iconSuddenDeathWater.png has changed diff -r 42d7f5dbd8dc -r d448b304bc70 QTfrontend/ui/page/pagescheme.cpp --- a/QTfrontend/ui/page/pagescheme.cpp Tue Apr 12 15:41:48 2016 -0400 +++ b/QTfrontend/ui/page/pagescheme.cpp Wed Apr 13 12:03:22 2016 +0200 @@ -219,7 +219,7 @@ glBSLayout->addWidget(l,3,0,1,1); l = new QLabel(gbBasicSettings); l->setFixedSize(32,32); - l->setPixmap(QPixmap(":/res/iconSuddenDeath.png")); + l->setPixmap(QPixmap(":/res/iconSuddenDeathTime.png")); glBSLayout->addWidget(l,3,1,1,1); SB_SuddenDeath = new QSpinBox(gbBasicSettings); SB_SuddenDeath->setRange(0, 50); @@ -233,7 +233,7 @@ glBSLayout->addWidget(l,4,0,1,1); l = new QLabel(gbBasicSettings); l->setFixedSize(32,32); - l->setPixmap(QPixmap(":/res/iconSuddenDeath.png")); // TODO: icon + l->setPixmap(QPixmap(":/res/iconSuddenDeathWater.png")); glBSLayout->addWidget(l,4,1,1,1); SB_WaterRise = new QSpinBox(gbBasicSettings); SB_WaterRise->setRange(0, 100); @@ -247,7 +247,7 @@ glBSLayout->addWidget(l,5,0,1,1); l = new QLabel(gbBasicSettings); l->setFixedSize(32,32); - l->setPixmap(QPixmap(":/res/iconSuddenDeath.png")); // TODO: icon + l->setPixmap(QPixmap(":/res/iconSuddenDeath.png")); glBSLayout->addWidget(l,5,1,1,1); SB_HealthDecrease = new QSpinBox(gbBasicSettings); SB_HealthDecrease->setRange(0, 100); @@ -288,7 +288,7 @@ glBSLayout->addWidget(l,8,0,1,1); l = new QLabel(gbBasicSettings); l->setFixedSize(32,32); - l->setPixmap(QPixmap(":/res/iconHealth.png")); // TODO: icon + l->setPixmap(QPixmap(":/res/iconHealthPercent.png")); glBSLayout->addWidget(l,8,1,1,1); SB_HealthCrates = new QSpinBox(gbBasicSettings); SB_HealthCrates->setRange(0, 100); @@ -302,7 +302,7 @@ glBSLayout->addWidget(l,9,0,1,1); l = new QLabel(gbBasicSettings); l->setFixedSize(32,32); - l->setPixmap(QPixmap(":/res/iconHealth.png")); // TODO: icon + l->setPixmap(QPixmap(":/res/iconHealth.png")); glBSLayout->addWidget(l,9,1,1,1); SB_CrateHealth = new QSpinBox(gbBasicSettings); SB_CrateHealth->setRange(0, 200); @@ -316,7 +316,7 @@ glBSLayout->addWidget(l,10,0,1,1); l = new QLabel(gbBasicSettings); l->setFixedSize(32,32); - l->setPixmap(QPixmap(":/res/iconTime.png")); // TODO: icon + l->setPixmap(QPixmap(":/res/iconMineTime.png")); glBSLayout->addWidget(l,10,1,1,1); SB_MinesTime = new QSpinBox(gbBasicSettings); SB_MinesTime->setRange(-1, 5); @@ -332,7 +332,7 @@ glBSLayout->addWidget(l,11,0,1,1); l = new QLabel(gbBasicSettings); l->setFixedSize(32,32); - l->setPixmap(QPixmap(":/res/iconMine.png")); // TODO: icon + l->setPixmap(QPixmap(":/res/iconMine.png")); glBSLayout->addWidget(l,11,1,1,1); SB_Mines = new QSpinBox(gbBasicSettings); SB_Mines->setRange(0, 200); @@ -360,7 +360,7 @@ glBSLayout->addWidget(l,13,0,1,1); l = new QLabel(gbBasicSettings); l->setFixedSize(32,32); - l->setPixmap(QPixmap(":/res/iconDamage.png")); + l->setPixmap(QPixmap(":/res/iconExplosive.png")); glBSLayout->addWidget(l,13,1,1,1); SB_Explosives = new QSpinBox(gbBasicSettings); SB_Explosives->setRange(0, 200); @@ -374,7 +374,7 @@ glBSLayout->addWidget(l,14,0,1,1); l = new QLabel(gbBasicSettings); l->setFixedSize(32,32); - l->setPixmap(QPixmap(":/res/iconMine.png")); // TODO: icon + l->setPixmap(QPixmap(":/res/iconAirMine.png")); glBSLayout->addWidget(l,14,1,1,1); SB_AirMines = new QSpinBox(gbBasicSettings); SB_AirMines->setRange(0, 200); @@ -420,7 +420,7 @@ glBSLayout->addWidget(l,17,0,1,1); l = new QLabel(gbBasicSettings); l->setFixedSize(32,32); - l->setPixmap(QPixmap(":/res/iconBox.png")); + l->setPixmap(QPixmap(":/res/iconScript.png")); glBSLayout->addWidget(l,17,1,1,1); LE_ScriptParam = new QLineEdit(gbBasicSettings);