# HG changeset patch
# User sheepluva
# Date 1461525368 -7200
# Node ID 3301d4d734a636030cc1715a03235414ed58a467
# Parent 989b2d54bed344eee3e63666ee608a911f9b5e66# Parent d448b304bc70bb5a4250f8502835fc733bb1e2d1
merge Wuzzy's new scheme icons
diff -r 989b2d54bed3 -r 3301d4d734a6 QTfrontend/hedgewars.qrc
--- a/QTfrontend/hedgewars.qrc Sun Apr 24 21:08:12 2016 +0200
+++ b/QTfrontend/hedgewars.qrc Sun Apr 24 21:16:08 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 989b2d54bed3 -r 3301d4d734a6 QTfrontend/res/iconAirMine.png
Binary file QTfrontend/res/iconAirMine.png has changed
diff -r 989b2d54bed3 -r 3301d4d734a6 QTfrontend/res/iconDud.png
Binary file QTfrontend/res/iconDud.png has changed
diff -r 989b2d54bed3 -r 3301d4d734a6 QTfrontend/res/iconDud@2x.png
Binary file QTfrontend/res/iconDud@2x.png has changed
diff -r 989b2d54bed3 -r 3301d4d734a6 QTfrontend/res/iconExplosive.png
Binary file QTfrontend/res/iconExplosive.png has changed
diff -r 989b2d54bed3 -r 3301d4d734a6 QTfrontend/res/iconExplosive@2x.png
Binary file QTfrontend/res/iconExplosive@2x.png has changed
diff -r 989b2d54bed3 -r 3301d4d734a6 QTfrontend/res/iconHealthPercent.png
Binary file QTfrontend/res/iconHealthPercent.png has changed
diff -r 989b2d54bed3 -r 3301d4d734a6 QTfrontend/res/iconMine.png
Binary file QTfrontend/res/iconMine.png has changed
diff -r 989b2d54bed3 -r 3301d4d734a6 QTfrontend/res/iconMine@2x.png
Binary file QTfrontend/res/iconMine@2x.png has changed
diff -r 989b2d54bed3 -r 3301d4d734a6 QTfrontend/res/iconMineTime.png
Binary file QTfrontend/res/iconMineTime.png has changed
diff -r 989b2d54bed3 -r 3301d4d734a6 QTfrontend/res/iconScript.png
Binary file QTfrontend/res/iconScript.png has changed
diff -r 989b2d54bed3 -r 3301d4d734a6 QTfrontend/res/iconScript@2x.png
Binary file QTfrontend/res/iconScript@2x.png has changed
diff -r 989b2d54bed3 -r 3301d4d734a6 QTfrontend/res/iconSuddenDeathTime.png
Binary file QTfrontend/res/iconSuddenDeathTime.png has changed
diff -r 989b2d54bed3 -r 3301d4d734a6 QTfrontend/res/iconSuddenDeathWater.png
Binary file QTfrontend/res/iconSuddenDeathWater.png has changed
diff -r 989b2d54bed3 -r 3301d4d734a6 QTfrontend/ui/page/pagescheme.cpp
--- a/QTfrontend/ui/page/pagescheme.cpp Sun Apr 24 21:08:12 2016 +0200
+++ b/QTfrontend/ui/page/pagescheme.cpp Sun Apr 24 21:16:08 2016 +0200
@@ -218,7 +218,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);
@@ -232,7 +232,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);
@@ -246,7 +246,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);
@@ -287,7 +287,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);
@@ -301,7 +301,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);
@@ -315,7 +315,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);
@@ -331,7 +331,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);
@@ -359,7 +359,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);
@@ -373,7 +373,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);
@@ -419,7 +419,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);