# HG changeset patch # User Henek # Date 1292264780 -3600 # Node ID aee36896d46b78e2d5a417812dcc308bb59f1c62 # Parent ce95df0398fbdddbb0098fa99f66d4195144ec69 exposing seed for editing and viewing diff -r ce95df0398fb -r aee36896d46b QTfrontend/mapContainer.cpp --- a/QTfrontend/mapContainer.cpp Mon Dec 13 20:54:18 2010 +0300 +++ b/QTfrontend/mapContainer.cpp Mon Dec 13 19:26:20 2010 +0100 @@ -29,6 +29,7 @@ #include #include #include +#include #include "hwconsts.h" #include "mapContainer.h" @@ -211,6 +212,12 @@ gbTLayout->addWidget(lwThemes); lwThemes->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Minimum); + QLabel* seedLabel = new QLabel(tr("Seed"), this); + mainLayout.addWidget(seedLabel, 3, 0); + seedEdit = new QLineEdit(this); + mainLayout.addWidget(seedEdit, 3, 1, 1, 2); + connect(seedEdit, SIGNAL(textChanged(const QString&)), this, SLOT(seedEdited(const QString&))); + mainLayout.setSizeConstraint(QLayout::SetFixedSize);//SetMinimumSize setRandomSeed(); @@ -408,6 +415,8 @@ void HWMapContainer::setSeed(const QString & seed) { m_seed = seed; + if (seed != seedEdit->text()) + seedEdit->setText(seed); if (chooseMap->currentIndex() < MAPGEN_LAST) changeImage(); } @@ -483,6 +492,7 @@ void HWMapContainer::setRandomSeed() { m_seed = QUuid::createUuid().toString(); + seedEdit->setText(m_seed); emit seedChanged(m_seed); if (chooseMap->currentIndex() < MAPGEN_LAST) changeImage(); @@ -535,3 +545,14 @@ { return drawnMapData; } + +void HWMapContainer::seedEdited(const QString & seed) +{ + if (seed.isEmpty() || seed.size() > 54) + seedEdit->setText(m_seed); + else + { + setSeed(seed); + emit seedChanged(seed); + } +} diff -r ce95df0398fb -r aee36896d46b QTfrontend/mapContainer.h --- a/QTfrontend/mapContainer.h Mon Dec 13 20:54:18 2010 +0300 +++ b/QTfrontend/mapContainer.h Mon Dec 13 19:26:20 2010 +0100 @@ -24,6 +24,7 @@ #include #include #include +#include #include "hwmap.h" @@ -83,6 +84,7 @@ void themeSelected(int currentRow); void addInfoToPreview(QPixmap image); void templateFilterChanged(int filter); + void seedEdited(const QString & seed); protected: virtual void resizeEvent ( QResizeEvent * event ); @@ -95,6 +97,7 @@ QListWidget* lwThemes; HWMap* pMap; QString m_seed; + QLineEdit* seedEdit; int hhLimit; int templateFilter; QPixmap hhSmall;