# HG changeset patch # User unc0rr # Date 1218720884 0 # Node ID 7f6cb1d7be2ae8bea686555437c19b4224b278ef # Parent 9f4704f3c6ea8b085387269c19a51e4f38661d7f Start remaking multiplayer page diff -r 9f4704f3c6ea -r 7f6cb1d7be2a QTfrontend/igbox.cpp --- a/QTfrontend/igbox.cpp Wed Aug 13 22:35:27 2008 +0000 +++ b/QTfrontend/igbox.cpp Thu Aug 14 13:34:44 2008 +0000 @@ -31,6 +31,20 @@ void IconedGroupBox::setIcon(const QIcon & icon) { this->icon = icon; + setStyleSheet( + "IconedGroupBox{" + "margin-top: 46px;" + "margin-left: 12px;" + "padding-top: 22px;" + "}" + "IconedGroupBox::title{" + "subcontrol-origin: margin;" + "subcontrol-position: top left;" + "padding-left: 82px;" + "padding-top: 26px;" + "text-align: left;" + "}" + ); } void IconedGroupBox::paintEvent(QPaintEvent * event) diff -r 9f4704f3c6ea -r 7f6cb1d7be2a QTfrontend/main.cpp --- a/QTfrontend/main.cpp Wed Aug 13 22:35:27 2008 +0000 +++ b/QTfrontend/main.cpp Thu Aug 14 13:34:44 2008 +0000 @@ -182,16 +182,6 @@ "color: orange;" "font: bold 14px;" "padding: 12px;" - "margin-top: 46px;" - "margin-left: 12px;" - "padding-top: 22px;" - "}" - "IconedGroupBox::title{" - "subcontrol-origin: margin;" - "subcontrol-position: top left;" - "padding-left: 82px;" - "padding-top: 26px;" - "text-align: left;" "}" ".QGroupBox{" "background-image: url(\":/res/panelbg.png\");" @@ -205,7 +195,7 @@ "padding: 6px;" "color: orange;" "font: bold 14px;" - "margin-top: 24px;" + //"margin-top: 24px;" "}" ".QGroupBox::title{" "subcontrol-origin: margin;" diff -r 9f4704f3c6ea -r 7f6cb1d7be2a QTfrontend/mapContainer.cpp --- a/QTfrontend/mapContainer.cpp Wed Aug 13 22:35:27 2008 +0000 +++ b/QTfrontend/mapContainer.cpp Thu Aug 14 13:34:44 2008 +0000 @@ -25,9 +25,13 @@ #include #include #include +#include +#include +#include #include "hwconsts.h" #include "mapContainer.h" +#include "igbox.h" HWMapContainer::HWMapContainer(QWidget * parent) : QWidget(parent), mainLayout(this) @@ -38,16 +42,17 @@ QApplication::style()->pixelMetric(QStyle::PM_LayoutRightMargin), QApplication::style()->pixelMetric(QStyle::PM_LayoutBottomMargin)); #endif - imageButt=new QPushButton(this); + imageButt = new QPushButton(this); imageButt->setObjectName("imageButt"); imageButt->setFixedSize(256 + 8, 128 + 8); imageButt->setFlat(true); imageButt->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);//QSizePolicy::Minimum, QSizePolicy::Minimum); - mainLayout.addWidget(imageButt); + mainLayout.addWidget(imageButt, 0, 0, 1, 2); connect(imageButt, SIGNAL(clicked()), this, SLOT(setRandomSeed())); setRandomSeed(); - chooseMap=new QComboBox(this); + chooseMap = new QComboBox(this); + chooseMap->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); QDir tmpdir; tmpdir.cd(datadir->absolutePath()); tmpdir.cd("Maps"); @@ -56,8 +61,22 @@ mapList.push_front(QComboBox::tr("generated map...")); chooseMap->addItems(mapList); connect(chooseMap, SIGNAL(activated(int)), this, SLOT(mapChanged(int))); + mainLayout.addWidget(chooseMap, 1, 1); - mainLayout.addWidget(chooseMap); + QLabel * lblMap = new QLabel(tr("Map"), this); + mainLayout.addWidget(lblMap, 1, 0); + + gbThemes = new IconedGroupBox(this); + gbThemes->setTitle(tr("Themes")); + gbThemes->setStyleSheet("padding: 0px;"); + mainLayout.addWidget(gbThemes, 0, 2, 2, 1); + QVBoxLayout * gbTLayout = new QVBoxLayout(gbThemes); + lwThemes = new QListWidget(this); + lwThemes->setFixedWidth(100); + gbTLayout->addWidget(lwThemes); + lwThemes->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Minimum); + + mainLayout.setSizeConstraint(QLayout::SetFixedSize);//SetMinimumSize } diff -r 9f4704f3c6ea -r 7f6cb1d7be2a QTfrontend/mapContainer.h --- a/QTfrontend/mapContainer.h Wed Aug 13 22:35:27 2008 +0000 +++ b/QTfrontend/mapContainer.h Thu Aug 14 13:34:44 2008 +0000 @@ -22,10 +22,12 @@ #include "hwmap.h" #include -#include +#include #include class QPushButton; +class IconedGroupBox; +class QListWidget; class MapFileErrorException { @@ -62,9 +64,11 @@ virtual void resizeEvent ( QResizeEvent * event ); private: - QVBoxLayout mainLayout; + QGridLayout mainLayout; QPushButton* imageButt; QComboBox* chooseMap; + IconedGroupBox* gbThemes; + QListWidget* lwThemes; HWMap* pMap; QString m_seed; QString theme; diff -r 9f4704f3c6ea -r 7f6cb1d7be2a hedgewars.kdevelop --- a/hedgewars.kdevelop Wed Aug 13 22:35:27 2008 +0000 +++ b/hedgewars.kdevelop Thu Aug 14 13:34:44 2008 +0000 @@ -19,20 +19,20 @@ hedgewars . false - + kdevsubversion - + executable / bin/hedgewars - + -style plastique false true - + /usr/home/unC0Rr/Sources/Hedgewars/Hedgewars-FF/trunk false false @@ -55,16 +55,16 @@ make - + true 4 0 false - - - + + + default @@ -72,9 +72,9 @@ 0 - - - + + + default @@ -83,12 +83,12 @@ - + - - - - + + + + true false false @@ -194,7 +194,7 @@ false - + set m_,_ theValue @@ -213,7 +213,7 @@ false - + true false