merge the 2 heads. I hope I did it right. also I increased proto and ver number
/* * 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 <QLabel>#include <QLineEdit>#include <QSpinBox>#include <QPushButton>#include <QTextBrowser>#include "pageadmin.h"#include "chatwidget.h"PageAdmin::PageAdmin(QWidget* parent) : AbstractPage(parent){ QGridLayout * pageLayout = new QGridLayout(this); // 0 pbAsk = addButton(tr("Fetch data"), pageLayout, 0, 0, 1, 3); connect(pbAsk, SIGNAL(clicked()), this, SIGNAL(askServerVars())); // 1 QLabel * lblSMN = new QLabel(this); lblSMN->setText(tr("Server message for latest version:")); pageLayout->addWidget(lblSMN, 1, 0); leServerMessageNew = new QLineEdit(this); pageLayout->addWidget(leServerMessageNew, 1, 1); // 2 QLabel * lblSMO = new QLabel(this); lblSMO->setText(tr("Server message for previous versions:")); pageLayout->addWidget(lblSMO, 2, 0); leServerMessageOld = new QLineEdit(this); pageLayout->addWidget(leServerMessageOld, 2, 1); // 3 QLabel * lblP = new QLabel(this); lblP->setText(tr("Latest version protocol number:")); pageLayout->addWidget(lblP, 3, 0); sbProtocol = new QSpinBox(this); pageLayout->addWidget(sbProtocol, 3, 1); // 4 QLabel * lblPreview = new QLabel(this); lblPreview->setText(tr("MOTD preview:")); pageLayout->addWidget(lblPreview, 4, 0); tb = new QTextBrowser(this); tb->setOpenExternalLinks(true); tb->document()->setDefaultStyleSheet(HWChatWidget::STYLE); pageLayout->addWidget(tb, 4, 1, 1, 2); connect(leServerMessageNew, SIGNAL(textEdited(const QString &)), tb, SLOT(setHtml(const QString &))); connect(leServerMessageOld, SIGNAL(textEdited(const QString &)), tb, SLOT(setHtml(const QString &))); // 5 pbClearAccountsCache = addButton(tr("Clear Accounts Cache"), pageLayout, 5, 0); // 6 pbSetSM = addButton(tr("Set data"), pageLayout, 6, 0, 1, 3); // 7 BtnBack = addButton(":/res/Exit.png", pageLayout, 7, 0, true); connect(pbSetSM, SIGNAL(clicked()), this, SLOT(smChanged()));}void PageAdmin::smChanged(){ emit setServerMessageNew(leServerMessageNew->text()); emit setServerMessageOld(leServerMessageOld->text()); emit setProtocol(sbProtocol->value());}void PageAdmin::serverMessageNew(const QString & str){ leServerMessageNew->setText(str);}void PageAdmin::serverMessageOld(const QString & str){ leServerMessageOld->setText(str);}void PageAdmin::protocol(int proto){ sbProtocol->setValue(proto);}