QTfrontend/pages.cpp
changeset 4143 eb7981f34800
parent 4141 2bd5ecf7b4fb
child 4147 5efa80494e31
--- a/QTfrontend/pages.cpp	Fri Nov 05 21:59:02 2010 -0400
+++ b/QTfrontend/pages.cpp	Fri Nov 05 22:32:00 2010 -0400
@@ -1570,7 +1570,6 @@
     l->setFixedSize(32,32);
     l->setPixmap(QPixmap(":/res/iconDamage.png"));
     glBSLayout->addWidget(l,0,1,1,1);
-
     SB_DamageModifier = new QSpinBox(gbBasicSettings);
     SB_DamageModifier->setRange(10, 300);
     SB_DamageModifier->setValue(100);
@@ -1585,7 +1584,6 @@
     l->setFixedSize(32,32);
     l->setPixmap(QPixmap(":/res/iconTime.png"));
     glBSLayout->addWidget(l,1,1,1,1);
-
     SB_TurnTime = new QSpinBox(gbBasicSettings);
     SB_TurnTime->setRange(1, 9999);
     SB_TurnTime->setValue(45);
@@ -1600,7 +1598,6 @@
     l->setFixedSize(32,32);
     l->setPixmap(QPixmap(":/res/iconHealth.png"));
     glBSLayout->addWidget(l,2,1,1,1);
-
     SB_InitHealth = new QSpinBox(gbBasicSettings);
     SB_InitHealth->setRange(50, 200);
     SB_InitHealth->setValue(100);
@@ -1615,9 +1612,8 @@
     l->setFixedSize(32,32);
     l->setPixmap(QPixmap(":/res/iconSuddenDeath.png"));
     glBSLayout->addWidget(l,3,1,1,1);
-
     SB_SuddenDeath = new QSpinBox(gbBasicSettings);
-    SB_SuddenDeath->setRange(0, 50);
+    SB_SuddenDeath->setRange(0, 999);
     SB_SuddenDeath->setValue(15);
     SB_SuddenDeath->setSingleStep(3);
     glBSLayout->addWidget(SB_SuddenDeath,3,2,1,1);
@@ -1630,70 +1626,97 @@
     l->setFixedSize(32,32);
     l->setPixmap(QPixmap(":/res/iconBox.png"));
     glBSLayout->addWidget(l,4,1,1,1);
-
     SB_CaseProb = new FreqSpinBox(gbBasicSettings);
     SB_CaseProb->setRange(0, 9);
     SB_CaseProb->setValue(5);
     glBSLayout->addWidget(SB_CaseProb,4,2,1,1);
 
     l = new QLabel(gbBasicSettings);
-    l->setText(QLabel::tr("Mines Time"));
+    l->setText(QLabel::tr("% Health Crates"));
     l->setWordWrap(true);
     glBSLayout->addWidget(l,5,0,1,1);
     l = new QLabel(gbBasicSettings);
     l->setFixedSize(32,32);
+    l->setPixmap(QPixmap(":/res/iconHealth.png")); // TODO: icon
+    glBSLayout->addWidget(l,5,1,1,1);
+    SB_HealthCrates = new QSpinBox(gbBasicSettings);
+    SB_HealthCrates->setRange(0, 100);
+    SB_HealthCrates->setValue(35);
+    SB_HealthCrates->setSingleStep(5);
+    glBSLayout->addWidget(SB_HealthCrates,5,2,1,1);
+
+    l = new QLabel(gbBasicSettings);
+    l->setText(QLabel::tr("Health in Crates"));
+    l->setWordWrap(true);
+    glBSLayout->addWidget(l,6,0,1,1);
+    l = new QLabel(gbBasicSettings);
+    l->setFixedSize(32,32);
+    l->setPixmap(QPixmap(":/res/iconHealth.png")); // TODO: icon
+    glBSLayout->addWidget(l,6,1,1,1);
+    SB_CrateHealth = new QSpinBox(gbBasicSettings);
+    SB_CrateHealth->setRange(0, 200);
+    SB_CrateHealth->setValue(25);
+    SB_CrateHealth->setSingleStep(5);
+    glBSLayout->addWidget(SB_CrateHealth,6,2,1,1);
+
+    l = new QLabel(gbBasicSettings);
+    l->setText(QLabel::tr("Mines Time"));
+    l->setWordWrap(true);
+    glBSLayout->addWidget(l,7,0,1,1);
+    l = new QLabel(gbBasicSettings);
+    l->setFixedSize(32,32);
     l->setPixmap(QPixmap(":/res/iconTime.png")); // TODO: icon
-    glBSLayout->addWidget(l,5,1,1,1);
+    glBSLayout->addWidget(l,7,1,1,1);
     SB_MinesTime = new QSpinBox(gbBasicSettings);
     SB_MinesTime->setRange(-1, 5);
     SB_MinesTime->setValue(3);
     SB_MinesTime->setSingleStep(1);
     SB_MinesTime->setSpecialValueText(tr("Random"));
     SB_MinesTime->setSuffix(" "+ tr("Seconds"));
-    glBSLayout->addWidget(SB_MinesTime,5,2,1,1);
+    glBSLayout->addWidget(SB_MinesTime,7,2,1,1);
 
     l = new QLabel(gbBasicSettings);
     l->setText(QLabel::tr("Mines"));
     l->setWordWrap(true);
-    glBSLayout->addWidget(l,6,0,1,1);
+    glBSLayout->addWidget(l,8,0,1,1);
     l = new QLabel(gbBasicSettings);
     l->setFixedSize(32,32);
     l->setPixmap(QPixmap(":/res/iconMine.png")); // TODO: icon
-    glBSLayout->addWidget(l,6,1,1,1);
+    glBSLayout->addWidget(l,8,1,1,1);
     SB_Mines = new QSpinBox(gbBasicSettings);
     SB_Mines->setRange(0, 80);
     SB_Mines->setValue(0);
     SB_Mines->setSingleStep(5);
-    glBSLayout->addWidget(SB_Mines,6,2,1,1);
+    glBSLayout->addWidget(SB_Mines,8,2,1,1);
 
     l = new QLabel(gbBasicSettings);
     l->setText(QLabel::tr("% Dud Mines"));
     l->setWordWrap(true);
-    glBSLayout->addWidget(l,7,0,1,1);
+    glBSLayout->addWidget(l,9,0,1,1);
     l = new QLabel(gbBasicSettings);
     l->setFixedSize(32,32);
     l->setPixmap(QPixmap(":/res/iconDud.png"));
-    glBSLayout->addWidget(l,7,1,1,1);
+    glBSLayout->addWidget(l,9,1,1,1);
     SB_MineDuds = new QSpinBox(gbBasicSettings);
     SB_MineDuds->setRange(0, 100);
     SB_MineDuds->setValue(0);
     SB_MineDuds->setSingleStep(5);
-    glBSLayout->addWidget(SB_MineDuds,7,2,1,1);
+    glBSLayout->addWidget(SB_MineDuds,9,2,1,1);
 
 
     l = new QLabel(gbBasicSettings);
     l->setText(QLabel::tr("Explosives"));
     l->setWordWrap(true);
-    glBSLayout->addWidget(l,8,0,1,1);
+    glBSLayout->addWidget(l,10,0,1,1);
     l = new QLabel(gbBasicSettings);
     l->setFixedSize(32,32);
     l->setPixmap(QPixmap(":/res/iconDamage.png"));
-    glBSLayout->addWidget(l,8,1,1,1);
+    glBSLayout->addWidget(l,10,1,1,1);
     SB_Explosives = new QSpinBox(gbBasicSettings);
     SB_Explosives->setRange(0, 40);
     SB_Explosives->setValue(0);
     SB_Explosives->setSingleStep(1);
-    glBSLayout->addWidget(SB_Explosives,8,2,1,1);
+    glBSLayout->addWidget(SB_Explosives,10,2,1,1);
 
 
     l = new QLabel(gbBasicSettings);
@@ -1755,6 +1778,8 @@
     mapper->addMapping(SB_Mines, 28);
     mapper->addMapping(SB_MineDuds, 29);
     mapper->addMapping(SB_Explosives, 30);
+    mapper->addMapping(SB_HealthCrates, 31);
+    mapper->addMapping(SB_CrateHealth, 32);
 
     mapper->toFirst();
 }