# HG changeset patch
# User koda
# Date 1301763346 -7200
# Node ID a71bf5a786d1cd4d502bf82baf977a944b424124
# Parent  85318bb2983e3c9668b9c459f27c3365055143cd# Parent  2d2422772832a68a713b24e5d7133550bed55d5b
merge -- this time i tested

diff -r 85318bb2983e -r a71bf5a786d1 QTfrontend/pagenetserver.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/pagenetserver.cpp	Sat Apr 02 18:55:46 2011 +0200
@@ -0,0 +1,88 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QGridLayout>
+#include <QPushButton>
+#include <QGroupBox>
+#include <QLabel>
+#include <QLineEdit>
+#include <QSpinBox>
+
+#include "pages.h"
+
+PageNetServer::PageNetServer(QWidget* parent) : AbstractPage(parent)
+{
+    QFont * font14 = new QFont("MS Shell Dlg", 14);
+    QGridLayout * pageLayout = new QGridLayout(this);
+    pageLayout->setColumnStretch(0, 1);
+    pageLayout->setColumnStretch(1, 1);
+    pageLayout->setColumnStretch(2, 1);
+
+    pageLayout->setRowStretch(0, 1);
+    pageLayout->setRowStretch(1, 0);
+
+    BtnBack =addButton(":/res/Exit.png", pageLayout, 1, 0, true);
+
+    BtnStart = new QPushButton(this);
+    BtnStart->setFont(*font14);
+    BtnStart->setText(QPushButton::tr("Start"));
+    pageLayout->addWidget(BtnStart, 1, 2);
+
+    QWidget * wg = new QWidget(this);
+    pageLayout->addWidget(wg, 0, 0, 1, 3);
+
+    QGridLayout * wgLayout = new QGridLayout(wg);
+    wgLayout->setColumnStretch(0, 1);
+    wgLayout->setColumnStretch(1, 3);
+    wgLayout->setColumnStretch(2, 1);
+
+    wgLayout->setRowStretch(0, 0);
+    wgLayout->setRowStretch(1, 1);
+
+    QGroupBox * gb = new QGroupBox(wg);
+    wgLayout->addWidget(gb, 0, 1);
+
+    QGridLayout * gbLayout = new QGridLayout(gb);
+
+    labelSD = new QLabel(gb);
+    labelSD->setText(QLabel::tr("Server name:"));
+    gbLayout->addWidget(labelSD, 0, 0);
+
+    leServerDescr = new QLineEdit(gb);
+    gbLayout->addWidget(leServerDescr, 0, 1);
+
+    labelPort = new QLabel(gb);
+    labelPort->setText(QLabel::tr("Server port:"));
+    gbLayout->addWidget(labelPort, 1, 0);
+
+    sbPort = new QSpinBox(gb);
+    sbPort->setMinimum(0);
+    sbPort->setMaximum(65535);
+    gbLayout->addWidget(sbPort, 1, 1);
+
+    BtnDefault = new QPushButton(gb);
+    BtnDefault->setText(QPushButton::tr("default"));
+    gbLayout->addWidget(BtnDefault, 1, 2);
+
+    connect(BtnDefault, SIGNAL(clicked()), this, SLOT(setDefaultPort()));
+}
+
+void PageNetServer::setDefaultPort()
+{
+    sbPort->setValue(46631);
+}
diff -r 85318bb2983e -r a71bf5a786d1 QTfrontend/pagesingleplayer.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/pagesingleplayer.cpp	Sat Apr 02 18:55:46 2011 +0200
@@ -0,0 +1,64 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <QGridLayout>
+#include <QPushButton>
+
+#include "pages.h"
+#include "gamecfgwidget.h"
+
+PageSinglePlayer::PageSinglePlayer(QWidget* parent) : AbstractPage(parent)
+{
+    QVBoxLayout * vLayout = new QVBoxLayout(this);
+    QHBoxLayout * topLine = new QHBoxLayout();
+    QHBoxLayout * middleLine = new QHBoxLayout();
+    QHBoxLayout * bottomLine = new QHBoxLayout();
+    vLayout->addStretch();
+    vLayout->addLayout(topLine);
+    vLayout->addSpacing(30);
+    vLayout->addLayout(middleLine);
+    vLayout->addStretch();
+    vLayout->addLayout(bottomLine);
+
+    topLine->addStretch();
+    BtnSimpleGamePage = addButton(":/res/SimpleGame.png", topLine, 0, true);
+    BtnSimpleGamePage->setToolTip(tr("Simple Game (a quick game against the computer, settings are chosen for you)"));
+    topLine->addSpacing(60);
+    BtnMultiplayer = addButton(":/res/Multiplayer.png", topLine, 1, true);
+    BtnMultiplayer->setToolTip(tr("Multiplayer (play a hotseat game against your friends, or AI teams)"));
+    topLine->addStretch();
+
+
+    BtnCampaignPage = addButton(":/res/Campaign.png", middleLine, 0, true);
+    BtnCampaignPage->setToolTip(tr("Campaign Mode (...). IN DEVELOPMENT"));
+    //BtnCampaignPage->setVisible(false);
+
+    BtnTrainPage = addButton(":/res/Trainings.png", middleLine, 1, true);
+    BtnTrainPage->setToolTip(tr("Training Mode (Practice your skills in a range of training missions). IN DEVELOPMENT"));
+
+    BtnBack = addButton(":/res/Exit.png", bottomLine, 0, true);
+    bottomLine->addStretch();
+
+    BtnDemos = addButton(":/res/Record.png", bottomLine, 1, true);
+    BtnDemos->setToolTip(tr("Demos (Watch recorded demos)"));
+    BtnLoad = addButton(":/res/Save.png", bottomLine, 2, true);
+    BtnLoad->setStyleSheet("QPushButton{margin: 12px 0px 12px 0px;}");
+    BtnLoad->setToolTip(tr("Load (Load a previously saved game)"));
+    BtnBack->setFixedHeight(BtnLoad->height());
+    BtnBack->setStyleSheet("QPushButton{margin-top: 31px;}");
+}