--- a/QTfrontend/gamecfgwidget.cpp Sun Feb 18 14:43:35 2007 +0000
+++ b/QTfrontend/gamecfgwidget.cpp Sun Feb 18 15:28:47 2007 +0000
@@ -28,6 +28,7 @@
QWidget(parent), mainLayout(this)
{
mainLayout.setMargin(0);
+ mainLayout.setSizeConstraint(QLayout::SetMinimumSize);
QGroupBox *GBoxMap = new QGroupBox(this);
GBoxMap->setTitle(QGroupBox::tr("Landscape"));
GBoxMap->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
--- a/QTfrontend/mapContainer.cpp Sun Feb 18 14:43:35 2007 +0000
+++ b/QTfrontend/mapContainer.cpp Sun Feb 18 15:28:47 2007 +0000
@@ -35,7 +35,7 @@
imageButt=new QPushButton(this);
imageButt->setFixedSize(256, 128);
imageButt->setFlat(true);
- imageButt->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+ imageButt->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);//QSizePolicy::Minimum, QSizePolicy::Minimum);
mainLayout.addWidget(imageButt);
connect(imageButt, SIGNAL(clicked()), this, SLOT(setRandomSeed()));
setRandomSeed();
@@ -51,6 +51,7 @@
connect(chooseMap, SIGNAL(activated(int)), this, SLOT(mapChanged(int)));
mainLayout.addWidget(chooseMap);
+ mainLayout.setSizeConstraint(QLayout::SetFixedSize);//SetMinimumSize
}
void HWMapContainer::setImage(const QImage newImage)
--- a/QTfrontend/pages.cpp Sun Feb 18 14:43:35 2007 +0000
+++ b/QTfrontend/pages.cpp Sun Feb 18 15:28:47 2007 +0000
@@ -28,6 +28,7 @@
#include <QListWidget>
#include <QApplication>
#include <QSpinBox>
+#include <QTextEdit>
#include "pages.h"
#include "sdlkeys.h"
@@ -509,23 +510,31 @@
{
QFont * font14 = new QFont("MS Shell Dlg", 14);
QGridLayout * pageLayout = new QGridLayout(this);
+ pageLayout->setSizeConstraint(QLayout::SetMinimumSize);
+
+ chatText = new QListWidget(this);
+ //chatText->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+ pageLayout->addWidget(chatText, 1, 0);
+
+ chatEditLine = new QLineEdit(this);
+ pageLayout->addWidget(chatEditLine, 2, 0);
pGameCFG = new GameCFGWidget(this);
pageLayout->addWidget(pGameCFG, 0, 0);
pNetTeamsWidget = new TeamSelWidget(this);
pNetTeamsWidget->setAcceptOuter(true);
- pageLayout->addWidget(pNetTeamsWidget, 0, 1);
+ pageLayout->addWidget(pNetTeamsWidget, 0, 1, 3, 1);
BtnBack = new QPushButton(this);
BtnBack->setFont(*font14);
BtnBack->setText(QPushButton::tr("Back"));
- pageLayout->addWidget(BtnBack, 1, 0);
+ pageLayout->addWidget(BtnBack, 3, 0);
BtnGo = new QPushButton(this);
BtnGo->setFont(*font14);
BtnGo->setText(QPushButton::tr("Go!"));
- pageLayout->addWidget(BtnGo, 1, 1);
+ pageLayout->addWidget(BtnGo, 3, 1);
}
PageInfo::PageInfo(QWidget* parent) : QWidget(parent)
--- a/QTfrontend/pages.h Sun Feb 18 14:43:35 2007 +0000
+++ b/QTfrontend/pages.h Sun Feb 18 15:28:47 2007 +0000
@@ -40,6 +40,7 @@
class QSpinBox;
class FPSEdit;
class HWNetUdpWidget;
+class QTextEdit;
class PageMain : public QWidget
{
@@ -194,6 +195,8 @@
QPushButton *BtnBack;
QPushButton *BtnGo;
+ QListWidget* chatText;
+ QLineEdit* chatEditLine;
TeamSelWidget* pNetTeamsWidget;
GameCFGWidget* pGameCFG;