# HG changeset patch # User sheepluva # Date 1319217428 -7200 # Node ID 8627698134b61da604e25b7ec6ee3f94dfdded62 # Parent 2b17481612782aeb1942444dbe65b9d739d9fa6f fix layout of net page diff -r 2b1748161278 -r 8627698134b6 QTfrontend/ui/page/pagemultiplayer.cpp --- a/QTfrontend/ui/page/pagemultiplayer.cpp Fri Oct 21 18:53:36 2011 +0200 +++ b/QTfrontend/ui/page/pagemultiplayer.cpp Fri Oct 21 19:17:08 2011 +0200 @@ -21,6 +21,7 @@ * @brief PageMultiplayer class implementation */ +#include #include #include diff -r 2b1748161278 -r 8627698134b6 QTfrontend/ui/page/pagenet.cpp --- a/QTfrontend/ui/page/pagenet.cpp Fri Oct 21 18:53:36 2011 +0200 +++ b/QTfrontend/ui/page/pagenet.cpp Fri Oct 21 19:17:08 2011 +0200 @@ -17,6 +17,7 @@ */ #include +#include #include #include #include @@ -35,12 +36,6 @@ pageLayout->setColumnStretch(1, 1); pageLayout->setColumnStretch(2, 1); - BtnNetSvrStart = new QPushButton(this); - BtnNetSvrStart->setFont(*font14); - BtnNetSvrStart->setText(QPushButton::tr("Start server")); - BtnNetSvrStart->setVisible(haveServer); - pageLayout->addWidget(BtnNetSvrStart, 4, 2); - ConnGroupBox = new QGroupBox(this); ConnGroupBox->setTitle(QGroupBox::tr("Net game")); pageLayout->addWidget(ConnGroupBox, 2, 0, 1, 3); @@ -71,6 +66,20 @@ return pageLayout; } +QLayout * PageNet::footerLayoutDefinition() +{ + QHBoxLayout * footerLayout = new QHBoxLayout(); + + BtnNetSvrStart = formattedButton(QPushButton::tr("Start server")); + BtnNetSvrStart->setMinimumWidth(180); + BtnNetSvrStart->setVisible(haveServer); + + footerLayout->addStretch(); + footerLayout->addWidget(BtnNetSvrStart); + + return footerLayout; +} + void PageNet::connectSignals() { connect(BtnNetConnect, SIGNAL(clicked()), this, SLOT(slotConnect())); diff -r 2b1748161278 -r 8627698134b6 QTfrontend/ui/page/pagenet.h --- a/QTfrontend/ui/page/pagenet.h Fri Oct 21 18:53:36 2011 +0200 +++ b/QTfrontend/ui/page/pagenet.h Fri Oct 21 19:17:08 2011 +0200 @@ -42,6 +42,7 @@ private: QLayout * bodyLayoutDefinition(); + QLayout * footerLayoutDefinition(); void connectSignals(); QGroupBox * ConnGroupBox; diff -r 2b1748161278 -r 8627698134b6 QTfrontend/ui/page/pagenetgame.cpp --- a/QTfrontend/ui/page/pagenetgame.cpp Fri Oct 21 18:53:36 2011 +0200 +++ b/QTfrontend/ui/page/pagenetgame.cpp Fri Oct 21 19:17:08 2011 +0200 @@ -17,6 +17,7 @@ */ #include +#include #include #include #include diff -r 2b1748161278 -r 8627698134b6 QTfrontend/ui/page/pagenetserver.cpp --- a/QTfrontend/ui/page/pagenetserver.cpp Fri Oct 21 18:53:36 2011 +0200 +++ b/QTfrontend/ui/page/pagenetserver.cpp Fri Oct 21 19:17:08 2011 +0200 @@ -74,9 +74,8 @@ { QHBoxLayout * bottomLayout = new QHBoxLayout(); - BtnStart = new QPushButton(this); - BtnStart->setFont(*font14); - BtnStart->setText(QPushButton::tr("Start")); + BtnStart = formattedButton(QPushButton::tr("Start")); + BtnStart->setMinimumWidth(180); bottomLayout->addStretch(); bottomLayout->addWidget(BtnStart);