--- a/QTfrontend/CMakeLists.txt Wed Oct 19 22:32:26 2011 -0400
+++ b/QTfrontend/CMakeLists.txt Thu Oct 20 02:56:58 2011 +0200
@@ -83,7 +83,6 @@
HWApplication.cpp
hwform.cpp
main.cpp
- mapContainer.cpp
SDLs.cpp
team.cpp
ui_hwform.cpp
@@ -122,7 +121,6 @@
gameuiconfig.h
HWApplication.h
hwform.h
- mapContainer.h
SDLs.h
)
--- a/QTfrontend/mapContainer.cpp Wed Oct 19 22:32:26 2011 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,677 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2011 Igor Ulyanov <iulyanov@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 <QPushButton>
-#include <QBuffer>
-#include <QUuid>
-#include <QBitmap>
-#include <QPainter>
-#include <QLinearGradient>
-#include <QColor>
-#include <QTextStream>
-#include <QLabel>
-#include <QListView>
-#include <QVBoxLayout>
-#include <QIcon>
-#include <QLineEdit>
-#include <QMessageBox>
-#include <QStringListModel>
-
-#include "hwconsts.h"
-#include "mapContainer.h"
-#include "igbox.h"
-#include "HWApplication.h"
-
-HWMapContainer::HWMapContainer(QWidget * parent) :
- QWidget(parent),
- mainLayout(this),
- pMap(0),
- mapgen(MAPGEN_REGULAR)
-{
- hhSmall.load(":/res/hh_small.png");
- hhLimit = 18;
- templateFilter = 0;
-
- mainLayout.setContentsMargins(HWApplication::style()->pixelMetric(QStyle::PM_LayoutLeftMargin),
- 1,
- HWApplication::style()->pixelMetric(QStyle::PM_LayoutRightMargin),
- HWApplication::style()->pixelMetric(QStyle::PM_LayoutBottomMargin));
-
- QWidget* mapWidget = new QWidget(this);
- mainLayout.addWidget(mapWidget, 0, 0, Qt::AlignHCenter);
-
- QGridLayout* mapLayout = new QGridLayout(mapWidget);
- mapLayout->setMargin(0);
-
- imageButt = new QPushButton(mapWidget);
- imageButt->setObjectName("imageButt");
- imageButt->setFixedSize(256 + 6, 128 + 6);
- imageButt->setFlat(true);
- imageButt->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);//QSizePolicy::Minimum, QSizePolicy::Minimum);
- mapLayout->addWidget(imageButt, 0, 0, 1, 2);
- connect(imageButt, SIGNAL(clicked()), this, SLOT(setRandomMap()));
-
- chooseMap = new QComboBox(mapWidget);
- chooseMap->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
- chooseMap->addItem(
-// FIXME - need real icons. Disabling until then
-//QIcon(":/res/mapRandom.png"),
-QComboBox::tr("generated map..."));
- chooseMap->addItem(
-// FIXME - need real icons. Disabling until then
-//QIcon(":/res/mapMaze.png"),
-QComboBox::tr("generated maze..."));
-
- chooseMap->addItem(QComboBox::tr("hand drawn map..."));
- chooseMap->insertSeparator(chooseMap->count()); // separator between generators and missions
-
- chooseMap->insertSeparator(chooseMap->count()); // separator between generators and missions
-
- int missionindex = chooseMap->count();
- numMissions = 0;
- QFile mapLuaFile;
- QFile mapCfgFile;
- for (int i = 0; i < mapList->size(); ++i) {
- QString map = (*mapList)[i];
- mapCfgFile.setFileName(
- QString("%1/Data/Maps/%2/map.cfg")
- .arg(cfgdir->absolutePath())
- .arg(map));
- if (mapCfgFile.exists()) {
- mapLuaFile.setFileName(
- QString("%1/Data/Maps/%2/map.lua")
- .arg(cfgdir->absolutePath())
- .arg(map));
- } else {
- mapCfgFile.setFileName(
- QString("%1/Maps/%2/map.cfg")
- .arg(datadir->absolutePath())
- .arg(map));
- mapLuaFile.setFileName(
- QString("%1/Maps/%2/map.lua")
- .arg(datadir->absolutePath())
- .arg(map));
- }
-
- if (mapCfgFile.open(QFile::ReadOnly)) {
- QString theme;
- quint32 limit = 0;
- QString scheme;
- QString weapons;
- QList<QVariant> mapInfo;
- bool isMission = mapLuaFile.exists();
-
- QTextStream input(&mapCfgFile);
- input >> theme;
- input >> limit;
- input >> scheme;
- input >> weapons;
- mapInfo.push_back(map);
- mapInfo.push_back(theme);
- if (limit)
- mapInfo.push_back(limit);
- else
- mapInfo.push_back(18);
-
-
- mapInfo.push_back(isMission);
-
- if (scheme.isEmpty())
- scheme = "locked";
- scheme.replace("_", " ");
-
- if (weapons.isEmpty())
- weapons = "locked";
- weapons.replace("_", " ");
-
- mapInfo.push_back(scheme);
- mapInfo.push_back(weapons);
-
- if(isMission)
- {
- chooseMap->insertItem(missionindex++,
-// FIXME - need real icons. Disabling until then
-//QIcon(":/res/mapMission.png"),
-QComboBox::tr("Mission") + ": " + map, mapInfo);
- numMissions++;
- }
- else
- chooseMap->addItem(
-// FIXME - need real icons. Disabling until then
-//QIcon(":/res/mapCustom.png"),
-map, mapInfo);
- mapCfgFile.close();
- }
- }
- chooseMap->insertSeparator(missionindex); // separator between missions and maps
-
- connect(chooseMap, SIGNAL(activated(int)), this, SLOT(mapChanged(int)));
- mapLayout->addWidget(chooseMap, 1, 1);
-
- QLabel * lblMap = new QLabel(tr("Map"), mapWidget);
- mapLayout->addWidget(lblMap, 1, 0);
-
- lblFilter = new QLabel(tr("Filter"), mapWidget);
- mapLayout->addWidget(lblFilter, 2, 0);
-
- cbTemplateFilter = new QComboBox(mapWidget);
- cbTemplateFilter->addItem(tr("All"), 0);
- cbTemplateFilter->addItem(tr("Small"), 1);
- cbTemplateFilter->addItem(tr("Medium"), 2);
- cbTemplateFilter->addItem(tr("Large"), 3);
- cbTemplateFilter->addItem(tr("Cavern"), 4);
- cbTemplateFilter->addItem(tr("Wacky"), 5);
- mapLayout->addWidget(cbTemplateFilter, 2, 1);
-
- connect(cbTemplateFilter, SIGNAL(activated(int)), this, SLOT(setTemplateFilter(int)));
-
- maze_size_label = new QLabel(tr("Type"), mapWidget);
- mapLayout->addWidget(maze_size_label, 2, 0);
- maze_size_label->hide();
- cbMazeSize = new QComboBox(mapWidget);
- cbMazeSize->addItem(tr("Small tunnels"), 0);
- cbMazeSize->addItem(tr("Medium tunnels"), 1);
- cbMazeSize->addItem(tr("Large tunnels"), 2);
- cbMazeSize->addItem(tr("Small floating islands"), 3);
- cbMazeSize->addItem(tr("Medium floating islands"), 4);
- cbMazeSize->addItem(tr("Large floating islands"), 5);
- cbMazeSize->setCurrentIndex(1);
-
- mapLayout->addWidget(cbMazeSize, 2, 1);
- cbMazeSize->hide();
- connect(cbMazeSize, SIGNAL(activated(int)), this, SLOT(setMazeSize(int)));
-
- gbThemes = new IconedGroupBox(mapWidget);
- gbThemes->setTitleTextPadding(80);
- gbThemes->setContentTopPadding(15);
- gbThemes->setTitle(tr("Themes"));
-
- //gbThemes->setStyleSheet("padding: 0px"); // doesn't work - stylesheet is set with icon
- mapLayout->addWidget(gbThemes, 0, 2, 3, 1);
-
- QVBoxLayout * gbTLayout = new QVBoxLayout(gbThemes);
- gbTLayout->setContentsMargins(0, 0, 0 ,0);
- gbTLayout->setSpacing(0);
- lvThemes = new QListView(mapWidget);
- lvThemes->setMinimumHeight(30);
- lvThemes->setFixedWidth(140);
- lvThemes->setModel(themesModel);
- lvThemes->setIconSize(QSize(16, 16));
- lvThemes->setEditTriggers(QListView::NoEditTriggers);
-
- connect(lvThemes->selectionModel(), SIGNAL(currentRowChanged( const QModelIndex &, const QModelIndex &)), this, SLOT(themeSelected( const QModelIndex &, const QModelIndex &)));
-
- // override default style to tighten up theme scroller
- lvThemes->setStyleSheet(QString(
- "QListView{"
- "border: solid;"
- "border-width: 0px;"
- "border-radius: 0px;"
- "border-color: transparent;"
- "background-color: #0d0544;"
- "color: #ffcc00;"
- "font: bold 13px;"
- "}"
- )
- );
-
- gbTLayout->addWidget(lvThemes);
- lvThemes->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Minimum);
-
- mapLayout->setSizeConstraint(QLayout::SetFixedSize);
-
- QWidget* seedWidget = new QWidget(this);
- mainLayout.addWidget(seedWidget, 1, 0);
-
- QGridLayout* seedLayout = new QGridLayout(seedWidget);
- seedLayout->setMargin(0);
-
- seedLabel = new QLabel(tr("Seed"), seedWidget);
- seedLayout->addWidget(seedLabel, 3, 0);
- seedEdit = new QLineEdit(seedWidget);
- seedEdit->setMaxLength(54);
- connect(seedEdit, SIGNAL(returnPressed()), this, SLOT(seedEdited()));
- seedLayout->addWidget(seedEdit, 3, 1);
- seedLayout->setColumnStretch(1, 5);
- seedSet = new QPushButton(seedWidget);
- seedSet->setText(QPushButton::tr("more"));
- connect(seedSet, SIGNAL(clicked()), this, SLOT(seedEdited()));
- seedLayout->setColumnStretch(2, 1);
- seedLayout->addWidget(seedSet, 3, 2);
-
- seedLabel->setVisible(false);
- seedEdit->setVisible(false);
-
- setRandomSeed();
- setRandomTheme();
-}
-
-void HWMapContainer::setImage(const QImage newImage)
-{
- QPixmap px(256, 128);
- QPixmap pxres(256, 128);
- QPainter p(&pxres);
-
- px.fill(Qt::yellow);
- QBitmap bm = QBitmap::fromImage(newImage);
- px.setMask(bm);
-
- QLinearGradient linearGrad(QPoint(128, 0), QPoint(128, 128));
- linearGrad.setColorAt(1, QColor(0, 0, 192));
- linearGrad.setColorAt(0, QColor(66, 115, 225));
- p.fillRect(QRect(0, 0, 256, 128), linearGrad);
- p.drawPixmap(QPoint(0, 0), px);
-
- addInfoToPreview(pxres);
- //chooseMap->setCurrentIndex(mapgen);
- pMap = 0;
-}
-
-void HWMapContainer::setHHLimit(int newHHLimit)
-{
- hhLimit = newHHLimit;
-}
-
-void HWMapContainer::mapChanged(int index)
-{
- switch(index) {
- case MAPGEN_REGULAR:
- mapgen = MAPGEN_REGULAR;
- updatePreview();
- gbThemes->show();
- lblFilter->show();
- cbTemplateFilter->show();
- maze_size_label->hide();
- cbMazeSize->hide();
- emit mapChanged("+rnd+");
- emit themeChanged(chooseMap->itemData(index).toList()[1].toString());
- break;
- case MAPGEN_MAZE:
- mapgen = MAPGEN_MAZE;
- updatePreview();
- gbThemes->show();
- lblFilter->hide();
- cbTemplateFilter->hide();
- maze_size_label->show();
- cbMazeSize->show();
- emit mapChanged("+maze+");
- emit themeChanged(chooseMap->itemData(index).toList()[1].toString());
- break;
- case MAPGEN_DRAWN:
- mapgen = MAPGEN_DRAWN;
- updatePreview();
- gbThemes->show();
- lblFilter->hide();
- cbTemplateFilter->hide();
- maze_size_label->hide();
- cbMazeSize->hide();
- emit mapChanged("+drawn+");
- emit themeChanged(chooseMap->itemData(index).toList()[1].toString());
- break;
- default:
- mapgen = MAPGEN_MAP;
- updatePreview();
- gbThemes->hide();
- lblFilter->hide();
- cbTemplateFilter->hide();
- maze_size_label->hide();
- cbMazeSize->hide();
- emit mapChanged(chooseMap->itemData(index).toList()[0].toString());
- }
-
- emit mapgenChanged(mapgen);
-}
-
-// Should this add text to identify map size?
-void HWMapContainer::addInfoToPreview(QPixmap image)
-{
- QPixmap finalImage = QPixmap(image.size());
- finalImage.fill(QColor(0, 0, 0, 0));
-
- QPainter p(&finalImage);
- p.drawPixmap(image.rect(), image);
- //p.setPen(QColor(0xf4,0x9e,0xe9));
- p.setPen(QColor(0xff,0xcc,0x00));
- p.setBrush(QColor(0, 0, 0));
- p.drawRect(image.rect().width() - hhSmall.rect().width() - 28, 3, 40, 20);
- p.setFont(QFont("MS Shell Dlg", 10));
- p.drawText(image.rect().width() - hhSmall.rect().width() - 14 - (hhLimit > 9 ? 10 : 0), 18, QString::number(hhLimit));
- p.drawPixmap(image.rect().width() - hhSmall.rect().width() - 5, 5, hhSmall.rect().width(), hhSmall.rect().height(), hhSmall);
-
- imageButt->setIcon(finalImage);
- imageButt->setIconSize(image.size());
-}
-
-void HWMapContainer::askForGeneratedPreview()
-{
- if (pMap)
- {
- disconnect(pMap, 0, this, SLOT(setImage(const QImage)));
- disconnect(pMap, 0, this, SLOT(setHHLimit(int)));
- pMap = 0;
- }
-
- pMap = new HWMap();
- connect(pMap, SIGNAL(ImageReceived(const QImage)), this, SLOT(setImage(const QImage)));
- connect(pMap, SIGNAL(HHLimitReceived(int)), this, SLOT(setHHLimit(int)));
- pMap->getImage(m_seed,
- getTemplateFilter(),
- get_mapgen(),
- getMazeSize(),
- getDrawnMapData()
- );
-}
-
-void HWMapContainer::themeSelected(const QModelIndex & current, const QModelIndex &)
-{
- QString theme = current.data().toString();
- QList<QVariant> mapInfo;
- mapInfo.push_back(QString("+rnd+"));
- mapInfo.push_back(theme);
- mapInfo.push_back(18);
- mapInfo.push_back(false);
- chooseMap->setItemData(0, mapInfo);
- mapInfo[0] = QString("+maze+");
- chooseMap->setItemData(1, mapInfo);
- mapInfo[0] = QString("+drawn+");
- chooseMap->setItemData(2, mapInfo);
-
- gbThemes->setIcon(qVariantValue<QIcon>(current.data(Qt::UserRole)));
- emit themeChanged(theme);
-}
-
-QString HWMapContainer::getCurrentSeed() const
-{
- return m_seed;
-}
-
-QString HWMapContainer::getCurrentMap() const
-{
- if(chooseMap->currentIndex() < MAPGEN_MAP) return QString();
- return chooseMap->itemData(chooseMap->currentIndex()).toList()[0].toString();
-}
-
-QString HWMapContainer::getCurrentTheme() const
-{
- return chooseMap->itemData(chooseMap->currentIndex()).toList()[1].toString();
-}
-
-bool HWMapContainer::getCurrentIsMission() const
-{
- if(!chooseMap->currentIndex()) return false;
- return chooseMap->itemData(chooseMap->currentIndex()).toList()[3].toBool();
-}
-
-int HWMapContainer::getCurrentHHLimit() const
-{
- return hhLimit;
-}
-
-QString HWMapContainer::getCurrentScheme() const
-{
- return chooseMap->itemData(chooseMap->currentIndex()).toList()[4].toString();
-}
-
-QString HWMapContainer::getCurrentWeapons() const
-{
- return chooseMap->itemData(chooseMap->currentIndex()).toList()[5].toString();
-}
-
-quint32 HWMapContainer::getTemplateFilter() const
-{
- return cbTemplateFilter->itemData(cbTemplateFilter->currentIndex()).toInt();
-}
-
-void HWMapContainer::resizeEvent ( QResizeEvent * event )
-{
- Q_UNUSED(event);
- //imageButt->setIconSize(imageButt->size());
-}
-
-void HWMapContainer::intSetSeed(const QString & seed)
-{
- m_seed = seed;
- if (seed != seedEdit->text())
- seedEdit->setText(seed);
-}
-
-void HWMapContainer::setSeed(const QString & seed)
-{
- intSetSeed(seed);
- if (chooseMap->currentIndex() < MAPGEN_DRAWN)
- updatePreview();
-}
-
-void HWMapContainer::intSetMap(const QString & map)
-{
- int id = 0;
- for(int i = 0; i < chooseMap->count(); i++)
- if(!chooseMap->itemData(i).isNull() && chooseMap->itemData(i).toList()[0].toString() == map)
- {
- id = i;
- break;
- }
-
- if(id > 0) {
- if (pMap)
- {
- disconnect(pMap, 0, this, SLOT(setImage(const QImage)));
- disconnect(pMap, 0, this, SLOT(setHHLimit(int)));
- pMap = 0;
- }
- chooseMap->setCurrentIndex(id);
- }
-}
-
-void HWMapContainer::setMap(const QString &map)
-{
- intSetMap(map);
- updatePreview();
-}
-
-void HWMapContainer::setTheme(const QString & theme)
-{
- QModelIndexList mdl = themesModel->match(themesModel->index(0), Qt::DisplayRole, theme);
-
- if(mdl.size())
- lvThemes->setCurrentIndex(mdl.at(0));
-}
-
-void HWMapContainer::setRandomMap()
-{
- setRandomSeed();
- switch(chooseMap->currentIndex())
- {
- case MAPGEN_REGULAR:
- case MAPGEN_MAZE:
- setRandomTheme();
- break;
- case MAPGEN_DRAWN:
- emit drawMapRequested();
- break;
- default:
- if(chooseMap->currentIndex() <= numMissions + MAPGEN_MAP + 1)
- setRandomMission();
- else
- setRandomStatic();
- break;
- }
-}
-
-void HWMapContainer::setRandomStatic()
-{
- int i = MAPGEN_MAP + 3 + numMissions + rand() % (chooseMap->count() - MAPGEN_MAP - 3 - numMissions);
- chooseMap->setCurrentIndex(i);
- mapChanged(i);
-}
-
-void HWMapContainer::setRandomMission()
-{
- int i = MAPGEN_MAP + 2 + rand() % numMissions;
- chooseMap->setCurrentIndex(i);
- mapChanged(i);
-}
-
-void HWMapContainer::setRandomSeed()
-{
- m_seed = QUuid::createUuid().toString();
- seedEdit->setText(m_seed);
- emit seedChanged(m_seed);
- if (chooseMap->currentIndex() < MAPGEN_MAP)
- updatePreview();
-}
-
-void HWMapContainer::setRandomTheme()
-{
- if(!themesModel->rowCount()) return;
- quint32 themeNum = rand() % themesModel->rowCount();
- lvThemes->setCurrentIndex(themesModel->index(themeNum));
-}
-
-void HWMapContainer::intSetTemplateFilter(int filter)
-{
- cbTemplateFilter->setCurrentIndex(filter);
- emit newTemplateFilter(filter);
-}
-
-void HWMapContainer::setTemplateFilter(int filter)
-{
- intSetTemplateFilter(filter);
- updatePreview();
-}
-
-MapGenerator HWMapContainer::get_mapgen(void) const
-{
- return mapgen;
-}
-
-int HWMapContainer::getMazeSize(void) const
-{
- return cbMazeSize->currentIndex();
-}
-
-void HWMapContainer::intSetMazeSize(int size)
-{
- cbMazeSize->setCurrentIndex(size);
- emit mazeSizeChanged(size);
-}
-
-void HWMapContainer::setMazeSize(int size)
-{
- intSetMazeSize(size);
- updatePreview();
-}
-
-void HWMapContainer::intSetMapgen(MapGenerator m)
-{
- mapgen = m;
-
- if(m != MAPGEN_MAP)
- chooseMap->setCurrentIndex(m);
-
- emit mapgenChanged(m);
-}
-
-void HWMapContainer::setMapgen(MapGenerator m)
-{
- intSetMapgen(m);
- updatePreview();
-}
-
-void HWMapContainer::setDrawnMapData(const QByteArray & ar)
-{
- drawMapScene.decode(ar);
- updatePreview();
-}
-
-QByteArray HWMapContainer::getDrawnMapData()
-{
- return drawMapScene.encode();
-}
-
-void HWMapContainer::seedEdited()
-{
- if (seedLabel->isVisible() == false )
- {
- seedLabel->setVisible(true);
- seedEdit->setVisible(true);
- seedSet->setText(tr("Set"));
- return;
- }
-
- if (seedEdit->text().isEmpty())
- seedEdit->setText(m_seed);
- else
- {
- setSeed(seedEdit->text());
- emit seedChanged(seedEdit->text());
- }
-}
-
-DrawMapScene * HWMapContainer::getDrawMapScene()
-{
- return &drawMapScene;
-}
-
-void HWMapContainer::mapDrawingFinished()
-{
- emit drawnMapChanged(getDrawnMapData());
-
- updatePreview();
-}
-
-void HWMapContainer::updatePreview()
-{
- int curIndex = chooseMap->currentIndex();
-
- switch(curIndex)
- {
- case MAPGEN_REGULAR:
- askForGeneratedPreview();
- break;
- case MAPGEN_MAZE:
- askForGeneratedPreview();
- break;
- case MAPGEN_DRAWN:
- askForGeneratedPreview();
- break;
- default:
- QPixmap mapImage;
- QFile tmpfile;
- tmpfile.setFileName(cfgdir->absolutePath() + "/Data/Maps/" + chooseMap->itemData(curIndex).toList()[0].toString() + "/preview.png");
- if (!tmpfile.exists()) tmpfile.setFileName(datadir->absolutePath() + "/Maps/" + chooseMap->itemData(curIndex).toList()[0].toString() + "/preview.png");
- if(!mapImage.load(QFileInfo(tmpfile).absoluteFilePath())) {
- imageButt->setIcon(QIcon());
- return;
- }
-
- hhLimit = chooseMap->itemData(curIndex).toList()[2].toInt();
- addInfoToPreview(mapImage);
- }
-}
-
-void HWMapContainer::setAllMapParameters(const QString &map, MapGenerator m, int mazesize, const QString &seed, int tmpl)
-{
- intSetMap(map);
- intSetMapgen(m);
- intSetMazeSize(mazesize);
- intSetSeed(seed);
- intSetTemplateFilter(tmpl);
-
- updatePreview();
-}
--- a/QTfrontend/mapContainer.h Wed Oct 19 22:32:26 2011 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,128 +0,0 @@
-/*
- * Hedgewars, a free turn based strategy game
- * Copyright (c) 2006-2007 Igor Ulyanov <iulyanov@gmail.com>
- * Copyright (c) 2007-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
- */
-
-#ifndef _HWMAP_CONTAINER_INCLUDED
-#define _HWMAP_CONTAINER_INCLUDED
-
-#include <QWidget>
-#include <QGridLayout>
-#include <QComboBox>
-#include <QLabel>
-#include <QByteArray>
-#include <QLineEdit>
-
-#include "hwmap.h"
-#include "drawmapscene.h"
-
-class QPushButton;
-class IconedGroupBox;
-class QListView;
-
-class MapFileErrorException
-{
-};
-
-class HWMapContainer : public QWidget
-{
- Q_OBJECT
-
- public:
- HWMapContainer(QWidget * parent=0);
- QString getCurrentSeed() const;
- QString getCurrentMap() const;
- QString getCurrentTheme() const;
- int getCurrentHHLimit() const;
- QString getCurrentScheme() const;
- QString getCurrentWeapons() const;
- quint32 getTemplateFilter() const;
- MapGenerator get_mapgen(void) const;
- int getMazeSize(void) const;
- bool getCurrentIsMission() const;
- QByteArray getDrawnMapData();
- DrawMapScene * getDrawMapScene();
- void mapDrawingFinished();
- QLineEdit* seedEdit;
-
- public slots:
- void askForGeneratedPreview();
- void setSeed(const QString & seed);
- void setMap(const QString & map);
- void setTheme(const QString & theme);
- void setTemplateFilter(int);
- void setMapgen(MapGenerator m);
- void setMazeSize(int size);
- void setDrawnMapData(const QByteArray & ar);
- void setAllMapParameters(const QString & map, MapGenerator m, int mazesize, const QString & seed, int tmpl);
-
- signals:
- void seedChanged(const QString & seed);
- void mapChanged(const QString & map);
- void themeChanged(const QString & theme);
- void newTemplateFilter(int filter);
- void mapgenChanged(MapGenerator m);
- void mazeSizeChanged(int s);
- void drawMapRequested();
- void drawnMapChanged(const QByteArray & data);
-
- private slots:
- void setImage(const QImage newImage);
- void setHHLimit(int hhLimit);
- void mapChanged(int index);
- void setRandomSeed();
- void setRandomTheme();
- void setRandomMap();
- void setRandomStatic();
- void setRandomMission();
- void themeSelected(const QModelIndex & current, const QModelIndex &);
- void addInfoToPreview(QPixmap image);
- void seedEdited();
-
- protected:
- virtual void resizeEvent ( QResizeEvent * event );
-
- private:
- QGridLayout mainLayout;
- QPushButton* imageButt;
- QComboBox* chooseMap;
- IconedGroupBox* gbThemes;
- QListView* lvThemes;
- HWMap* pMap;
- QString m_seed;
- QPushButton* seedSet;
- QLabel* seedLabel;
- int hhLimit;
- int templateFilter;
- QPixmap hhSmall;
- QLabel* lblFilter;
- QComboBox* cbTemplateFilter;
- QLabel *maze_size_label;
- QComboBox *cbMazeSize;
- MapGenerator mapgen;
- int numMissions;
- DrawMapScene drawMapScene;
-
- void intSetSeed(const QString & seed);
- void intSetMap(const QString & map);
- void intSetMapgen(MapGenerator m);
- void intSetTemplateFilter(int);
- void intSetMazeSize(int size);
- void updatePreview();
-};
-
-#endif // _HWMAP_CONTAINER_INCLUDED
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/mapContainer.cpp Thu Oct 20 02:56:58 2011 +0200
@@ -0,0 +1,677 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2011 Igor Ulyanov <iulyanov@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 <QPushButton>
+#include <QBuffer>
+#include <QUuid>
+#include <QBitmap>
+#include <QPainter>
+#include <QLinearGradient>
+#include <QColor>
+#include <QTextStream>
+#include <QLabel>
+#include <QListView>
+#include <QVBoxLayout>
+#include <QIcon>
+#include <QLineEdit>
+#include <QMessageBox>
+#include <QStringListModel>
+
+#include "hwconsts.h"
+#include "mapContainer.h"
+#include "igbox.h"
+#include "HWApplication.h"
+
+HWMapContainer::HWMapContainer(QWidget * parent) :
+ QWidget(parent),
+ mainLayout(this),
+ pMap(0),
+ mapgen(MAPGEN_REGULAR)
+{
+ hhSmall.load(":/res/hh_small.png");
+ hhLimit = 18;
+ templateFilter = 0;
+
+ mainLayout.setContentsMargins(HWApplication::style()->pixelMetric(QStyle::PM_LayoutLeftMargin),
+ 1,
+ HWApplication::style()->pixelMetric(QStyle::PM_LayoutRightMargin),
+ HWApplication::style()->pixelMetric(QStyle::PM_LayoutBottomMargin));
+
+ QWidget* mapWidget = new QWidget(this);
+ mainLayout.addWidget(mapWidget, 0, 0, Qt::AlignHCenter);
+
+ QGridLayout* mapLayout = new QGridLayout(mapWidget);
+ mapLayout->setMargin(0);
+
+ imageButt = new QPushButton(mapWidget);
+ imageButt->setObjectName("imageButt");
+ imageButt->setFixedSize(256 + 6, 128 + 6);
+ imageButt->setFlat(true);
+ imageButt->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);//QSizePolicy::Minimum, QSizePolicy::Minimum);
+ mapLayout->addWidget(imageButt, 0, 0, 1, 2);
+ connect(imageButt, SIGNAL(clicked()), this, SLOT(setRandomMap()));
+
+ chooseMap = new QComboBox(mapWidget);
+ chooseMap->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+ chooseMap->addItem(
+// FIXME - need real icons. Disabling until then
+//QIcon(":/res/mapRandom.png"),
+QComboBox::tr("generated map..."));
+ chooseMap->addItem(
+// FIXME - need real icons. Disabling until then
+//QIcon(":/res/mapMaze.png"),
+QComboBox::tr("generated maze..."));
+
+ chooseMap->addItem(QComboBox::tr("hand drawn map..."));
+ chooseMap->insertSeparator(chooseMap->count()); // separator between generators and missions
+
+ chooseMap->insertSeparator(chooseMap->count()); // separator between generators and missions
+
+ int missionindex = chooseMap->count();
+ numMissions = 0;
+ QFile mapLuaFile;
+ QFile mapCfgFile;
+ for (int i = 0; i < mapList->size(); ++i) {
+ QString map = (*mapList)[i];
+ mapCfgFile.setFileName(
+ QString("%1/Data/Maps/%2/map.cfg")
+ .arg(cfgdir->absolutePath())
+ .arg(map));
+ if (mapCfgFile.exists()) {
+ mapLuaFile.setFileName(
+ QString("%1/Data/Maps/%2/map.lua")
+ .arg(cfgdir->absolutePath())
+ .arg(map));
+ } else {
+ mapCfgFile.setFileName(
+ QString("%1/Maps/%2/map.cfg")
+ .arg(datadir->absolutePath())
+ .arg(map));
+ mapLuaFile.setFileName(
+ QString("%1/Maps/%2/map.lua")
+ .arg(datadir->absolutePath())
+ .arg(map));
+ }
+
+ if (mapCfgFile.open(QFile::ReadOnly)) {
+ QString theme;
+ quint32 limit = 0;
+ QString scheme;
+ QString weapons;
+ QList<QVariant> mapInfo;
+ bool isMission = mapLuaFile.exists();
+
+ QTextStream input(&mapCfgFile);
+ input >> theme;
+ input >> limit;
+ input >> scheme;
+ input >> weapons;
+ mapInfo.push_back(map);
+ mapInfo.push_back(theme);
+ if (limit)
+ mapInfo.push_back(limit);
+ else
+ mapInfo.push_back(18);
+
+
+ mapInfo.push_back(isMission);
+
+ if (scheme.isEmpty())
+ scheme = "locked";
+ scheme.replace("_", " ");
+
+ if (weapons.isEmpty())
+ weapons = "locked";
+ weapons.replace("_", " ");
+
+ mapInfo.push_back(scheme);
+ mapInfo.push_back(weapons);
+
+ if(isMission)
+ {
+ chooseMap->insertItem(missionindex++,
+// FIXME - need real icons. Disabling until then
+//QIcon(":/res/mapMission.png"),
+QComboBox::tr("Mission") + ": " + map, mapInfo);
+ numMissions++;
+ }
+ else
+ chooseMap->addItem(
+// FIXME - need real icons. Disabling until then
+//QIcon(":/res/mapCustom.png"),
+map, mapInfo);
+ mapCfgFile.close();
+ }
+ }
+ chooseMap->insertSeparator(missionindex); // separator between missions and maps
+
+ connect(chooseMap, SIGNAL(activated(int)), this, SLOT(mapChanged(int)));
+ mapLayout->addWidget(chooseMap, 1, 1);
+
+ QLabel * lblMap = new QLabel(tr("Map"), mapWidget);
+ mapLayout->addWidget(lblMap, 1, 0);
+
+ lblFilter = new QLabel(tr("Filter"), mapWidget);
+ mapLayout->addWidget(lblFilter, 2, 0);
+
+ cbTemplateFilter = new QComboBox(mapWidget);
+ cbTemplateFilter->addItem(tr("All"), 0);
+ cbTemplateFilter->addItem(tr("Small"), 1);
+ cbTemplateFilter->addItem(tr("Medium"), 2);
+ cbTemplateFilter->addItem(tr("Large"), 3);
+ cbTemplateFilter->addItem(tr("Cavern"), 4);
+ cbTemplateFilter->addItem(tr("Wacky"), 5);
+ mapLayout->addWidget(cbTemplateFilter, 2, 1);
+
+ connect(cbTemplateFilter, SIGNAL(activated(int)), this, SLOT(setTemplateFilter(int)));
+
+ maze_size_label = new QLabel(tr("Type"), mapWidget);
+ mapLayout->addWidget(maze_size_label, 2, 0);
+ maze_size_label->hide();
+ cbMazeSize = new QComboBox(mapWidget);
+ cbMazeSize->addItem(tr("Small tunnels"), 0);
+ cbMazeSize->addItem(tr("Medium tunnels"), 1);
+ cbMazeSize->addItem(tr("Large tunnels"), 2);
+ cbMazeSize->addItem(tr("Small floating islands"), 3);
+ cbMazeSize->addItem(tr("Medium floating islands"), 4);
+ cbMazeSize->addItem(tr("Large floating islands"), 5);
+ cbMazeSize->setCurrentIndex(1);
+
+ mapLayout->addWidget(cbMazeSize, 2, 1);
+ cbMazeSize->hide();
+ connect(cbMazeSize, SIGNAL(activated(int)), this, SLOT(setMazeSize(int)));
+
+ gbThemes = new IconedGroupBox(mapWidget);
+ gbThemes->setTitleTextPadding(80);
+ gbThemes->setContentTopPadding(15);
+ gbThemes->setTitle(tr("Themes"));
+
+ //gbThemes->setStyleSheet("padding: 0px"); // doesn't work - stylesheet is set with icon
+ mapLayout->addWidget(gbThemes, 0, 2, 3, 1);
+
+ QVBoxLayout * gbTLayout = new QVBoxLayout(gbThemes);
+ gbTLayout->setContentsMargins(0, 0, 0 ,0);
+ gbTLayout->setSpacing(0);
+ lvThemes = new QListView(mapWidget);
+ lvThemes->setMinimumHeight(30);
+ lvThemes->setFixedWidth(140);
+ lvThemes->setModel(themesModel);
+ lvThemes->setIconSize(QSize(16, 16));
+ lvThemes->setEditTriggers(QListView::NoEditTriggers);
+
+ connect(lvThemes->selectionModel(), SIGNAL(currentRowChanged( const QModelIndex &, const QModelIndex &)), this, SLOT(themeSelected( const QModelIndex &, const QModelIndex &)));
+
+ // override default style to tighten up theme scroller
+ lvThemes->setStyleSheet(QString(
+ "QListView{"
+ "border: solid;"
+ "border-width: 0px;"
+ "border-radius: 0px;"
+ "border-color: transparent;"
+ "background-color: #0d0544;"
+ "color: #ffcc00;"
+ "font: bold 13px;"
+ "}"
+ )
+ );
+
+ gbTLayout->addWidget(lvThemes);
+ lvThemes->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Minimum);
+
+ mapLayout->setSizeConstraint(QLayout::SetFixedSize);
+
+ QWidget* seedWidget = new QWidget(this);
+ mainLayout.addWidget(seedWidget, 1, 0);
+
+ QGridLayout* seedLayout = new QGridLayout(seedWidget);
+ seedLayout->setMargin(0);
+
+ seedLabel = new QLabel(tr("Seed"), seedWidget);
+ seedLayout->addWidget(seedLabel, 3, 0);
+ seedEdit = new QLineEdit(seedWidget);
+ seedEdit->setMaxLength(54);
+ connect(seedEdit, SIGNAL(returnPressed()), this, SLOT(seedEdited()));
+ seedLayout->addWidget(seedEdit, 3, 1);
+ seedLayout->setColumnStretch(1, 5);
+ seedSet = new QPushButton(seedWidget);
+ seedSet->setText(QPushButton::tr("more"));
+ connect(seedSet, SIGNAL(clicked()), this, SLOT(seedEdited()));
+ seedLayout->setColumnStretch(2, 1);
+ seedLayout->addWidget(seedSet, 3, 2);
+
+ seedLabel->setVisible(false);
+ seedEdit->setVisible(false);
+
+ setRandomSeed();
+ setRandomTheme();
+}
+
+void HWMapContainer::setImage(const QImage newImage)
+{
+ QPixmap px(256, 128);
+ QPixmap pxres(256, 128);
+ QPainter p(&pxres);
+
+ px.fill(Qt::yellow);
+ QBitmap bm = QBitmap::fromImage(newImage);
+ px.setMask(bm);
+
+ QLinearGradient linearGrad(QPoint(128, 0), QPoint(128, 128));
+ linearGrad.setColorAt(1, QColor(0, 0, 192));
+ linearGrad.setColorAt(0, QColor(66, 115, 225));
+ p.fillRect(QRect(0, 0, 256, 128), linearGrad);
+ p.drawPixmap(QPoint(0, 0), px);
+
+ addInfoToPreview(pxres);
+ //chooseMap->setCurrentIndex(mapgen);
+ pMap = 0;
+}
+
+void HWMapContainer::setHHLimit(int newHHLimit)
+{
+ hhLimit = newHHLimit;
+}
+
+void HWMapContainer::mapChanged(int index)
+{
+ switch(index) {
+ case MAPGEN_REGULAR:
+ mapgen = MAPGEN_REGULAR;
+ updatePreview();
+ gbThemes->show();
+ lblFilter->show();
+ cbTemplateFilter->show();
+ maze_size_label->hide();
+ cbMazeSize->hide();
+ emit mapChanged("+rnd+");
+ emit themeChanged(chooseMap->itemData(index).toList()[1].toString());
+ break;
+ case MAPGEN_MAZE:
+ mapgen = MAPGEN_MAZE;
+ updatePreview();
+ gbThemes->show();
+ lblFilter->hide();
+ cbTemplateFilter->hide();
+ maze_size_label->show();
+ cbMazeSize->show();
+ emit mapChanged("+maze+");
+ emit themeChanged(chooseMap->itemData(index).toList()[1].toString());
+ break;
+ case MAPGEN_DRAWN:
+ mapgen = MAPGEN_DRAWN;
+ updatePreview();
+ gbThemes->show();
+ lblFilter->hide();
+ cbTemplateFilter->hide();
+ maze_size_label->hide();
+ cbMazeSize->hide();
+ emit mapChanged("+drawn+");
+ emit themeChanged(chooseMap->itemData(index).toList()[1].toString());
+ break;
+ default:
+ mapgen = MAPGEN_MAP;
+ updatePreview();
+ gbThemes->hide();
+ lblFilter->hide();
+ cbTemplateFilter->hide();
+ maze_size_label->hide();
+ cbMazeSize->hide();
+ emit mapChanged(chooseMap->itemData(index).toList()[0].toString());
+ }
+
+ emit mapgenChanged(mapgen);
+}
+
+// Should this add text to identify map size?
+void HWMapContainer::addInfoToPreview(QPixmap image)
+{
+ QPixmap finalImage = QPixmap(image.size());
+ finalImage.fill(QColor(0, 0, 0, 0));
+
+ QPainter p(&finalImage);
+ p.drawPixmap(image.rect(), image);
+ //p.setPen(QColor(0xf4,0x9e,0xe9));
+ p.setPen(QColor(0xff,0xcc,0x00));
+ p.setBrush(QColor(0, 0, 0));
+ p.drawRect(image.rect().width() - hhSmall.rect().width() - 28, 3, 40, 20);
+ p.setFont(QFont("MS Shell Dlg", 10));
+ p.drawText(image.rect().width() - hhSmall.rect().width() - 14 - (hhLimit > 9 ? 10 : 0), 18, QString::number(hhLimit));
+ p.drawPixmap(image.rect().width() - hhSmall.rect().width() - 5, 5, hhSmall.rect().width(), hhSmall.rect().height(), hhSmall);
+
+ imageButt->setIcon(finalImage);
+ imageButt->setIconSize(image.size());
+}
+
+void HWMapContainer::askForGeneratedPreview()
+{
+ if (pMap)
+ {
+ disconnect(pMap, 0, this, SLOT(setImage(const QImage)));
+ disconnect(pMap, 0, this, SLOT(setHHLimit(int)));
+ pMap = 0;
+ }
+
+ pMap = new HWMap();
+ connect(pMap, SIGNAL(ImageReceived(const QImage)), this, SLOT(setImage(const QImage)));
+ connect(pMap, SIGNAL(HHLimitReceived(int)), this, SLOT(setHHLimit(int)));
+ pMap->getImage(m_seed,
+ getTemplateFilter(),
+ get_mapgen(),
+ getMazeSize(),
+ getDrawnMapData()
+ );
+}
+
+void HWMapContainer::themeSelected(const QModelIndex & current, const QModelIndex &)
+{
+ QString theme = current.data().toString();
+ QList<QVariant> mapInfo;
+ mapInfo.push_back(QString("+rnd+"));
+ mapInfo.push_back(theme);
+ mapInfo.push_back(18);
+ mapInfo.push_back(false);
+ chooseMap->setItemData(0, mapInfo);
+ mapInfo[0] = QString("+maze+");
+ chooseMap->setItemData(1, mapInfo);
+ mapInfo[0] = QString("+drawn+");
+ chooseMap->setItemData(2, mapInfo);
+
+ gbThemes->setIcon(qVariantValue<QIcon>(current.data(Qt::UserRole)));
+ emit themeChanged(theme);
+}
+
+QString HWMapContainer::getCurrentSeed() const
+{
+ return m_seed;
+}
+
+QString HWMapContainer::getCurrentMap() const
+{
+ if(chooseMap->currentIndex() < MAPGEN_MAP) return QString();
+ return chooseMap->itemData(chooseMap->currentIndex()).toList()[0].toString();
+}
+
+QString HWMapContainer::getCurrentTheme() const
+{
+ return chooseMap->itemData(chooseMap->currentIndex()).toList()[1].toString();
+}
+
+bool HWMapContainer::getCurrentIsMission() const
+{
+ if(!chooseMap->currentIndex()) return false;
+ return chooseMap->itemData(chooseMap->currentIndex()).toList()[3].toBool();
+}
+
+int HWMapContainer::getCurrentHHLimit() const
+{
+ return hhLimit;
+}
+
+QString HWMapContainer::getCurrentScheme() const
+{
+ return chooseMap->itemData(chooseMap->currentIndex()).toList()[4].toString();
+}
+
+QString HWMapContainer::getCurrentWeapons() const
+{
+ return chooseMap->itemData(chooseMap->currentIndex()).toList()[5].toString();
+}
+
+quint32 HWMapContainer::getTemplateFilter() const
+{
+ return cbTemplateFilter->itemData(cbTemplateFilter->currentIndex()).toInt();
+}
+
+void HWMapContainer::resizeEvent ( QResizeEvent * event )
+{
+ Q_UNUSED(event);
+ //imageButt->setIconSize(imageButt->size());
+}
+
+void HWMapContainer::intSetSeed(const QString & seed)
+{
+ m_seed = seed;
+ if (seed != seedEdit->text())
+ seedEdit->setText(seed);
+}
+
+void HWMapContainer::setSeed(const QString & seed)
+{
+ intSetSeed(seed);
+ if (chooseMap->currentIndex() < MAPGEN_DRAWN)
+ updatePreview();
+}
+
+void HWMapContainer::intSetMap(const QString & map)
+{
+ int id = 0;
+ for(int i = 0; i < chooseMap->count(); i++)
+ if(!chooseMap->itemData(i).isNull() && chooseMap->itemData(i).toList()[0].toString() == map)
+ {
+ id = i;
+ break;
+ }
+
+ if(id > 0) {
+ if (pMap)
+ {
+ disconnect(pMap, 0, this, SLOT(setImage(const QImage)));
+ disconnect(pMap, 0, this, SLOT(setHHLimit(int)));
+ pMap = 0;
+ }
+ chooseMap->setCurrentIndex(id);
+ }
+}
+
+void HWMapContainer::setMap(const QString &map)
+{
+ intSetMap(map);
+ updatePreview();
+}
+
+void HWMapContainer::setTheme(const QString & theme)
+{
+ QModelIndexList mdl = themesModel->match(themesModel->index(0), Qt::DisplayRole, theme);
+
+ if(mdl.size())
+ lvThemes->setCurrentIndex(mdl.at(0));
+}
+
+void HWMapContainer::setRandomMap()
+{
+ setRandomSeed();
+ switch(chooseMap->currentIndex())
+ {
+ case MAPGEN_REGULAR:
+ case MAPGEN_MAZE:
+ setRandomTheme();
+ break;
+ case MAPGEN_DRAWN:
+ emit drawMapRequested();
+ break;
+ default:
+ if(chooseMap->currentIndex() <= numMissions + MAPGEN_MAP + 1)
+ setRandomMission();
+ else
+ setRandomStatic();
+ break;
+ }
+}
+
+void HWMapContainer::setRandomStatic()
+{
+ int i = MAPGEN_MAP + 3 + numMissions + rand() % (chooseMap->count() - MAPGEN_MAP - 3 - numMissions);
+ chooseMap->setCurrentIndex(i);
+ mapChanged(i);
+}
+
+void HWMapContainer::setRandomMission()
+{
+ int i = MAPGEN_MAP + 2 + rand() % numMissions;
+ chooseMap->setCurrentIndex(i);
+ mapChanged(i);
+}
+
+void HWMapContainer::setRandomSeed()
+{
+ m_seed = QUuid::createUuid().toString();
+ seedEdit->setText(m_seed);
+ emit seedChanged(m_seed);
+ if (chooseMap->currentIndex() < MAPGEN_MAP)
+ updatePreview();
+}
+
+void HWMapContainer::setRandomTheme()
+{
+ if(!themesModel->rowCount()) return;
+ quint32 themeNum = rand() % themesModel->rowCount();
+ lvThemes->setCurrentIndex(themesModel->index(themeNum));
+}
+
+void HWMapContainer::intSetTemplateFilter(int filter)
+{
+ cbTemplateFilter->setCurrentIndex(filter);
+ emit newTemplateFilter(filter);
+}
+
+void HWMapContainer::setTemplateFilter(int filter)
+{
+ intSetTemplateFilter(filter);
+ updatePreview();
+}
+
+MapGenerator HWMapContainer::get_mapgen(void) const
+{
+ return mapgen;
+}
+
+int HWMapContainer::getMazeSize(void) const
+{
+ return cbMazeSize->currentIndex();
+}
+
+void HWMapContainer::intSetMazeSize(int size)
+{
+ cbMazeSize->setCurrentIndex(size);
+ emit mazeSizeChanged(size);
+}
+
+void HWMapContainer::setMazeSize(int size)
+{
+ intSetMazeSize(size);
+ updatePreview();
+}
+
+void HWMapContainer::intSetMapgen(MapGenerator m)
+{
+ mapgen = m;
+
+ if(m != MAPGEN_MAP)
+ chooseMap->setCurrentIndex(m);
+
+ emit mapgenChanged(m);
+}
+
+void HWMapContainer::setMapgen(MapGenerator m)
+{
+ intSetMapgen(m);
+ updatePreview();
+}
+
+void HWMapContainer::setDrawnMapData(const QByteArray & ar)
+{
+ drawMapScene.decode(ar);
+ updatePreview();
+}
+
+QByteArray HWMapContainer::getDrawnMapData()
+{
+ return drawMapScene.encode();
+}
+
+void HWMapContainer::seedEdited()
+{
+ if (seedLabel->isVisible() == false )
+ {
+ seedLabel->setVisible(true);
+ seedEdit->setVisible(true);
+ seedSet->setText(tr("Set"));
+ return;
+ }
+
+ if (seedEdit->text().isEmpty())
+ seedEdit->setText(m_seed);
+ else
+ {
+ setSeed(seedEdit->text());
+ emit seedChanged(seedEdit->text());
+ }
+}
+
+DrawMapScene * HWMapContainer::getDrawMapScene()
+{
+ return &drawMapScene;
+}
+
+void HWMapContainer::mapDrawingFinished()
+{
+ emit drawnMapChanged(getDrawnMapData());
+
+ updatePreview();
+}
+
+void HWMapContainer::updatePreview()
+{
+ int curIndex = chooseMap->currentIndex();
+
+ switch(curIndex)
+ {
+ case MAPGEN_REGULAR:
+ askForGeneratedPreview();
+ break;
+ case MAPGEN_MAZE:
+ askForGeneratedPreview();
+ break;
+ case MAPGEN_DRAWN:
+ askForGeneratedPreview();
+ break;
+ default:
+ QPixmap mapImage;
+ QFile tmpfile;
+ tmpfile.setFileName(cfgdir->absolutePath() + "/Data/Maps/" + chooseMap->itemData(curIndex).toList()[0].toString() + "/preview.png");
+ if (!tmpfile.exists()) tmpfile.setFileName(datadir->absolutePath() + "/Maps/" + chooseMap->itemData(curIndex).toList()[0].toString() + "/preview.png");
+ if(!mapImage.load(QFileInfo(tmpfile).absoluteFilePath())) {
+ imageButt->setIcon(QIcon());
+ return;
+ }
+
+ hhLimit = chooseMap->itemData(curIndex).toList()[2].toInt();
+ addInfoToPreview(mapImage);
+ }
+}
+
+void HWMapContainer::setAllMapParameters(const QString &map, MapGenerator m, int mazesize, const QString &seed, int tmpl)
+{
+ intSetMap(map);
+ intSetMapgen(m);
+ intSetMazeSize(mazesize);
+ intSetSeed(seed);
+ intSetTemplateFilter(tmpl);
+
+ updatePreview();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/ui/widget/mapContainer.h Thu Oct 20 02:56:58 2011 +0200
@@ -0,0 +1,128 @@
+/*
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2006-2007 Igor Ulyanov <iulyanov@gmail.com>
+ * Copyright (c) 2007-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
+ */
+
+#ifndef _HWMAP_CONTAINER_INCLUDED
+#define _HWMAP_CONTAINER_INCLUDED
+
+#include <QWidget>
+#include <QGridLayout>
+#include <QComboBox>
+#include <QLabel>
+#include <QByteArray>
+#include <QLineEdit>
+
+#include "hwmap.h"
+#include "drawmapscene.h"
+
+class QPushButton;
+class IconedGroupBox;
+class QListView;
+
+class MapFileErrorException
+{
+};
+
+class HWMapContainer : public QWidget
+{
+ Q_OBJECT
+
+ public:
+ HWMapContainer(QWidget * parent=0);
+ QString getCurrentSeed() const;
+ QString getCurrentMap() const;
+ QString getCurrentTheme() const;
+ int getCurrentHHLimit() const;
+ QString getCurrentScheme() const;
+ QString getCurrentWeapons() const;
+ quint32 getTemplateFilter() const;
+ MapGenerator get_mapgen(void) const;
+ int getMazeSize(void) const;
+ bool getCurrentIsMission() const;
+ QByteArray getDrawnMapData();
+ DrawMapScene * getDrawMapScene();
+ void mapDrawingFinished();
+ QLineEdit* seedEdit;
+
+ public slots:
+ void askForGeneratedPreview();
+ void setSeed(const QString & seed);
+ void setMap(const QString & map);
+ void setTheme(const QString & theme);
+ void setTemplateFilter(int);
+ void setMapgen(MapGenerator m);
+ void setMazeSize(int size);
+ void setDrawnMapData(const QByteArray & ar);
+ void setAllMapParameters(const QString & map, MapGenerator m, int mazesize, const QString & seed, int tmpl);
+
+ signals:
+ void seedChanged(const QString & seed);
+ void mapChanged(const QString & map);
+ void themeChanged(const QString & theme);
+ void newTemplateFilter(int filter);
+ void mapgenChanged(MapGenerator m);
+ void mazeSizeChanged(int s);
+ void drawMapRequested();
+ void drawnMapChanged(const QByteArray & data);
+
+ private slots:
+ void setImage(const QImage newImage);
+ void setHHLimit(int hhLimit);
+ void mapChanged(int index);
+ void setRandomSeed();
+ void setRandomTheme();
+ void setRandomMap();
+ void setRandomStatic();
+ void setRandomMission();
+ void themeSelected(const QModelIndex & current, const QModelIndex &);
+ void addInfoToPreview(QPixmap image);
+ void seedEdited();
+
+ protected:
+ virtual void resizeEvent ( QResizeEvent * event );
+
+ private:
+ QGridLayout mainLayout;
+ QPushButton* imageButt;
+ QComboBox* chooseMap;
+ IconedGroupBox* gbThemes;
+ QListView* lvThemes;
+ HWMap* pMap;
+ QString m_seed;
+ QPushButton* seedSet;
+ QLabel* seedLabel;
+ int hhLimit;
+ int templateFilter;
+ QPixmap hhSmall;
+ QLabel* lblFilter;
+ QComboBox* cbTemplateFilter;
+ QLabel *maze_size_label;
+ QComboBox *cbMazeSize;
+ MapGenerator mapgen;
+ int numMissions;
+ DrawMapScene drawMapScene;
+
+ void intSetSeed(const QString & seed);
+ void intSetMap(const QString & map);
+ void intSetMapgen(MapGenerator m);
+ void intSetTemplateFilter(int);
+ void intSetMazeSize(int size);
+ void updatePreview();
+};
+
+#endif // _HWMAP_CONTAINER_INCLUDED
--- a/project_files/hedgewars.pro Wed Oct 19 22:32:26 2011 -0400
+++ b/project_files/hedgewars.pro Thu Oct 20 02:56:58 2011 +0200
@@ -69,6 +69,7 @@
../QTfrontend/ui/widget/selectWeapon.h \
../QTfrontend/ui/widget/weaponItem.h \
../QTfrontend/ui/widget/gamecfgwidget.h \
+ ../QTfrontend/ui/widget/mapContainer.h \
../QTfrontend/ui/widget/HistoryLineEdit.h \
../QTfrontend/ui/widget/SmartLineEdit.h \
../QTfrontend/net/netregister.h \
@@ -86,7 +87,6 @@
../QTfrontend/gameuiconfig.h \
../QTfrontend/HWApplication.h \
../QTfrontend/hwform.h \
- ../QTfrontend/mapContainer.h \
../QTfrontend/SDLs.h \
../QTfrontend/team.h \
../QTfrontend/achievements.h \
@@ -143,6 +143,7 @@
../QTfrontend/ui/widget/teamselhelper.cpp \
../QTfrontend/ui/widget/drawmapwidget.cpp \
../QTfrontend/ui/widget/weaponItem.cpp \
+ ../QTfrontend/ui/widget/mapContainer.cpp \
../QTfrontend/ui/widget/HistoryLineEdit.cpp \
../QTfrontend/ui/widget/SmartLineEdit.cpp \
../QTfrontend/net/tcpBase.cpp \
@@ -163,7 +164,6 @@
../QTfrontend/HWApplication.cpp \
../QTfrontend/hwform.cpp \
../QTfrontend/main.cpp \
- ../QTfrontend/mapContainer.cpp \
../QTfrontend/SDLs.cpp \
../QTfrontend/team.cpp \
../QTfrontend/ui_hwform.cpp \