--- a/QTfrontend/gamecfgwidget.cpp	Wed Mar 11 14:32:28 2009 +0000
+++ b/QTfrontend/gamecfgwidget.cpp	Thu Mar 12 13:54:32 2009 +0000
@@ -24,6 +24,7 @@
 #include <QLabel>
 #include <QMessageBox>
 #include <QTableView>
+#include <QPushButton>
 
 #include "gamecfgwidget.h"
 #include "igbox.h"
@@ -48,68 +49,17 @@
 	QTableView * tv = new QTableView(this);
 	tv->setModel(new AmmoSchemeModel);
 	GBoxOptionsLayout->addWidget(tv, 0, 0, 1, 2);
+
+	QPushButton * goToSchemePage = new QPushButton(GBoxOptions);
+	goToSchemePage->setText(tr("Edit schemes"));
+	GBoxOptionsLayout->addWidget(goToSchemePage, 1, 0, 1, 2);
+	connect(goToSchemePage, SIGNAL(clicked()), this, SIGNAL(goToSchemes()));
 	
-	CB_mode_Forts = new QCheckBox(GBoxOptions);
-	CB_mode_Forts->setText(QCheckBox::tr("Forts mode"));
-	GBoxOptionsLayout->addWidget(CB_mode_Forts, 9, 0, 1, 2);
-
-	CB_teamsDivide = new QCheckBox(GBoxOptions);
-	CB_teamsDivide->setText(QCheckBox::tr("Divide teams"));
-	GBoxOptionsLayout->addWidget(CB_teamsDivide, 1, 0, 1, 2);
-
-	CB_solid = new QCheckBox(GBoxOptions);
-	CB_solid->setText(QCheckBox::tr("Solid land"));
-	GBoxOptionsLayout->addWidget(CB_solid, 2, 0, 1, 2);
-
-	CB_border = new QCheckBox(GBoxOptions);
-	CB_border->setText(QCheckBox::tr("Add Border"));
-	GBoxOptionsLayout->addWidget(CB_border, 3, 0, 1, 2);
-
-	L_TurnTime = new QLabel(QLabel::tr("Turn time"), GBoxOptions);
-	L_InitHealth = new QLabel(QLabel::tr("Initial health"), GBoxOptions);
-	L_SuddenDeath = new QLabel(QLabel::tr("Turns before SD"), GBoxOptions);
-	L_CaseProb = new QLabel(QLabel::tr("Crate drops"), GBoxOptions);
-	GBoxOptionsLayout->addWidget(L_TurnTime, 4, 0);
-	GBoxOptionsLayout->addWidget(L_InitHealth, 5, 0);
-	GBoxOptionsLayout->addWidget(L_SuddenDeath, 6, 0);
-	GBoxOptionsLayout->addWidget(L_CaseProb, 7, 0);
 	GBoxOptionsLayout->addWidget(new QLabel(QLabel::tr("Weapons"), GBoxOptions), 8, 0);
 
-	SB_TurnTime = new QSpinBox(GBoxOptions);
-	SB_TurnTime->setRange(1, 99);
-	SB_TurnTime->setValue(45);
-	SB_TurnTime->setSingleStep(15);
-	
-	SB_InitHealth = new QSpinBox(GBoxOptions);
-	SB_InitHealth->setRange(50, 200);
-	SB_InitHealth->setValue(100);
-	SB_InitHealth->setSingleStep(25);
-	
-	SB_SuddenDeath = new QSpinBox(GBoxOptions);
-	SB_SuddenDeath->setRange(0, 50);
-	SB_SuddenDeath->setValue(15);
-	SB_SuddenDeath->setSingleStep(3);
-	
-	SB_CaseProb = new FreqSpinBox(GBoxOptions);
-	SB_CaseProb->setRange(0, 9);
-	SB_CaseProb->setValue(5);
-
-	GBoxOptionsLayout->addWidget(SB_TurnTime, 4, 1);
-	GBoxOptionsLayout->addWidget(SB_InitHealth, 5, 1);
-	GBoxOptionsLayout->addWidget(SB_SuddenDeath, 6, 1);
-	GBoxOptionsLayout->addWidget(SB_CaseProb, 7, 1);
-	
 	WeaponsName = new QComboBox(GBoxOptions);
 	GBoxOptionsLayout->addWidget(WeaponsName, 8, 1);
 	
-	connect(SB_InitHealth, SIGNAL(valueChanged(int)), this, SLOT(initHealthChanged(int)));
-	connect(SB_TurnTime, SIGNAL(valueChanged(int)), this, SLOT(turnTimeChanged(int)));
-	connect(SB_SuddenDeath, SIGNAL(valueChanged(int)), this, SLOT(suddenDeathTurnsChanged(int)));
-	connect(SB_CaseProb, SIGNAL(valueChanged(int)), this, SLOT(caseProbabilityChanged(int)));
-	connect(CB_mode_Forts, SIGNAL(toggled(bool)), this, SLOT(fortsModeChanged(bool)));
-	connect(CB_teamsDivide, SIGNAL(toggled(bool)), this, SLOT(teamsDivideChanged(bool)));
-	connect(CB_solid, SIGNAL(toggled(bool)), this, SLOT(solidChanged(bool)));
-	connect(CB_border, SIGNAL(toggled(bool)), this, SLOT(borderChanged(bool)));
 	connect(WeaponsName, SIGNAL(currentIndexChanged(int)), this, SLOT(ammoChanged(int)));
 
 	connect(pMapContainer, SIGNAL(seedChanged(const QString &)), this, SLOT(seedChanged(const QString &)));
@@ -122,21 +72,21 @@
 {
 	quint32 result = 0;
 
-	if (CB_mode_Forts->isChecked())
+/*	if (CB_mode_Forts->isChecked())
 		result |= 0x01;
 	if (CB_teamsDivide->isChecked())
 		result |= 0x10;
 	if (CB_solid->isChecked())
 		result |= 0x04;
 	if (CB_border->isChecked())
-		result |= 0x08;
+		result |= 0x08;*/
 
 	return result;
 }
 
 quint32 GameCFGWidget::getInitHealth() const
 {
-	return SB_InitHealth->value();
+//	return SB_InitHealth->value();
 }
 
 QStringList GameCFGWidget::getFullConfig() const
@@ -144,9 +94,9 @@
 	QStringList sl;
 	sl.append("eseed " + pMapContainer->getCurrentSeed());
 	sl.append(QString("e$gmflags %1").arg(getGameFlags()));
-	sl.append(QString("e$turntime %1").arg(SB_TurnTime->value() * 1000));
-	sl.append(QString("e$sd_turns %1").arg(SB_SuddenDeath->value()));
-	sl.append(QString("e$casefreq %1").arg(SB_CaseProb->value()));
+//	sl.append(QString("e$turntime %1").arg(SB_TurnTime->value() * 1000));
+//	sl.append(QString("e$sd_turns %1").arg(SB_SuddenDeath->value()));
+//	sl.append(QString("e$casefreq %1").arg(SB_CaseProb->value()));
 	sl.append(QString("e$template_filter %1").arg(pMapContainer->getTemplateFilter()));
 
 	QString currentMap = pMapContainer->getCurrentMap();
@@ -175,17 +125,9 @@
 {
 	ammoChanged(WeaponsName->currentIndex());
 	
-	borderChanged(CB_border->isChecked());
-	caseProbabilityChanged(SB_CaseProb->value());
-	fortsModeChanged(CB_mode_Forts->isChecked());
-	initHealthChanged(SB_InitHealth->value());
 	seedChanged(pMapContainer->getCurrentSeed());
-	solidChanged(CB_solid->isChecked());
-	suddenDeathTurnsChanged(SB_SuddenDeath->value());
-	teamsDivideChanged(CB_teamsDivide->isChecked());
 	templateFilterChanged(pMapContainer->getTemplateFilter());
 	themeChanged(pMapContainer->getCurrentTheme());
-	turnTimeChanged(SB_TurnTime->value());
 
 	// map must be the last
 	QString map = pMapContainer->getCurrentMap();
@@ -211,35 +153,35 @@
 			return;
 		}
 		if (param == "HEALTH") {
-			SB_InitHealth->setValue(value.toUInt());
+//			SB_InitHealth->setValue(value.toUInt());
 			return;
 		}
 		if (param == "TURNTIME") {
-			SB_TurnTime->setValue(value.toUInt());
+//			SB_TurnTime->setValue(value.toUInt());
 			return;
 		}
 		if (param == "SD_TURNS") {
-			SB_SuddenDeath->setValue(value.toUInt());
+//			SB_SuddenDeath->setValue(value.toUInt());
 			return;
 		}
 		if (param == "CASEFACTOR") {
-			SB_CaseProb->setValue(value.toUInt());
+//			SB_CaseProb->setValue(value.toUInt());
 			return;
 		}
 		if (param == "FORTSMODE") {
-			CB_mode_Forts->setChecked(value.toUInt() != 0);
+//			CB_mode_Forts->setChecked(value.toUInt() != 0);
 			return;
 		}
 		if (param == "DIVIDETEAMS") {
-			CB_teamsDivide->setChecked(value.toUInt() != 0);
+//			CB_teamsDivide->setChecked(value.toUInt() != 0);
 			return;
 		}
 		if (param == "SOLIDLAND") {
-			CB_solid->setChecked(value.toUInt() != 0);
+//			CB_solid->setChecked(value.toUInt() != 0);
 			return;
 		}
 		if (param == "BORDER") {
-			CB_border->setChecked(value.toUInt() != 0);
+//			CB_border->setChecked(value.toUInt() != 0);
 			return;
 		}
 		if (param == "TEMPLATE") {
@@ -266,26 +208,6 @@
 		);
 }
 
-void GameCFGWidget::borderChanged(bool value)
-{
-	emit paramChanged("BORDER", QStringList(value ? "1" : "0"));
-}
-
-void GameCFGWidget::caseProbabilityChanged(int value)
-{
-	emit paramChanged("CASEFACTOR", QStringList(QString::number(value)));
-}
-
-void GameCFGWidget::fortsModeChanged(bool value)
-{
-	emit paramChanged("FORTSMODE", QStringList(value ? "1" : "0"));
-}
-
-void GameCFGWidget::initHealthChanged(int value)
-{
-	emit paramChanged("HEALTH", QStringList(QString::number(value)));
-}
-
 void GameCFGWidget::mapChanged(const QString & value)
 {
 	emit paramChanged("MAP", QStringList(value));
@@ -301,27 +223,7 @@
 	emit paramChanged("SEED", QStringList(value));
 }
 
-void GameCFGWidget::solidChanged(bool value)
-{
-	emit paramChanged("SOLIDLAND", QStringList(value ? "1" : "0"));
-}
-
-void GameCFGWidget::suddenDeathTurnsChanged(int value)
-{
-	emit paramChanged("SD_TURNS", QStringList(QString::number(value)));
-}
-
-void GameCFGWidget::teamsDivideChanged(bool value)
-{
-	emit paramChanged("DIVIDETEAMS", QStringList(value ? "1" : "0"));
-}
-
 void GameCFGWidget::themeChanged(const QString & value)
 {
 	emit paramChanged("THEME", QStringList(value));
 }
-
-void GameCFGWidget::turnTimeChanged(int value)
-{
-	emit paramChanged("TURNTIME", QStringList(QString::number(value)));
-}