68 QComboBox::tr("generated map...")); |
70 QComboBox::tr("generated map...")); |
69 chooseMap->addItem( |
71 chooseMap->addItem( |
70 // FIXME - need real icons. Disabling until then |
72 // FIXME - need real icons. Disabling until then |
71 //QIcon(":/res/mapMaze.png"), |
73 //QIcon(":/res/mapMaze.png"), |
72 QComboBox::tr("generated maze...")); |
74 QComboBox::tr("generated maze...")); |
|
75 |
|
76 chooseMap->addItem(QComboBox::tr("hand drawn map...")); |
|
77 chooseMap->insertSeparator(chooseMap->count()); // separator between generators and missions |
|
78 |
73 chooseMap->insertSeparator(chooseMap->count()); // separator between generators and missions |
79 chooseMap->insertSeparator(chooseMap->count()); // separator between generators and missions |
74 |
80 |
75 int missionindex = chooseMap->count(); |
81 int missionindex = chooseMap->count(); |
76 numMissions = 0; |
82 numMissions = 0; |
77 for (int i = 0; i < mapList->size(); ++i) { |
83 for (int i = 0; i < mapList->size(); ++i) { |
250 maze_size_selection->show(); |
256 maze_size_selection->show(); |
251 emit mapChanged("+maze+"); |
257 emit mapChanged("+maze+"); |
252 emit mapgenChanged(mapgen); |
258 emit mapgenChanged(mapgen); |
253 emit themeChanged(chooseMap->itemData(index).toList()[1].toString()); |
259 emit themeChanged(chooseMap->itemData(index).toList()[1].toString()); |
254 break; |
260 break; |
|
261 case MAPGEN_DRAWN: |
|
262 mapgen = MAPGEN_DRAWN; |
|
263 changeImage(); |
|
264 gbThemes->show(); |
|
265 lblFilter->hide(); |
|
266 CB_TemplateFilter->hide(); |
|
267 maze_size_label->hide(); |
|
268 maze_size_selection->hide(); |
|
269 emit mapChanged("+drawn+"); |
|
270 emit mapgenChanged(mapgen); |
|
271 emit themeChanged(chooseMap->itemData(index).toList()[1].toString()); |
|
272 break; |
255 default: |
273 default: |
256 loadMap(index); |
274 loadMap(index); |
257 gbThemes->hide(); |
275 gbThemes->hide(); |
258 lblFilter->hide(); |
276 lblFilter->hide(); |
259 CB_TemplateFilter->hide(); |
277 CB_TemplateFilter->hide(); |
306 } |
324 } |
307 |
325 |
308 pMap = new HWMap(); |
326 pMap = new HWMap(); |
309 connect(pMap, SIGNAL(ImageReceived(const QImage)), this, SLOT(setImage(const QImage))); |
327 connect(pMap, SIGNAL(ImageReceived(const QImage)), this, SLOT(setImage(const QImage))); |
310 connect(pMap, SIGNAL(HHLimitReceived(int)), this, SLOT(setHHLimit(int))); |
328 connect(pMap, SIGNAL(HHLimitReceived(int)), this, SLOT(setHHLimit(int))); |
311 pMap->getImage(m_seed.toStdString(), getTemplateFilter(), mapgen, maze_size); |
329 pMap->getImage(m_seed.toStdString(), getTemplateFilter(), mapgen, maze_size, drawnMapData); |
312 } |
330 } |
313 |
331 |
314 void HWMapContainer::themeSelected(int currentRow) |
332 void HWMapContainer::themeSelected(int currentRow) |
315 { |
333 { |
316 QString theme = Themes->at(currentRow); |
334 QString theme = Themes->at(currentRow); |
317 QList<QVariant> mapInfoRegular; |
335 QList<QVariant> mapInfo; |
318 mapInfoRegular.push_back(QString("+rnd+")); |
336 mapInfo.push_back(QString("+rnd+")); |
319 mapInfoRegular.push_back(theme); |
337 mapInfo.push_back(theme); |
320 mapInfoRegular.push_back(18); |
338 mapInfo.push_back(18); |
321 mapInfoRegular.push_back(false); |
339 mapInfo.push_back(false); |
322 chooseMap->setItemData(0, mapInfoRegular); |
340 chooseMap->setItemData(0, mapInfo); |
323 QList<QVariant> mapInfoMaze; |
341 mapInfo[0] = QString("+maze+"); |
324 mapInfoMaze.push_back(QString("+maze+")); |
342 chooseMap->setItemData(1, mapInfo); |
325 mapInfoMaze.push_back(theme); |
343 mapInfo[0] = QString("+drawn+"); |
326 mapInfoMaze.push_back(18); |
344 chooseMap->setItemData(2, mapInfo); |
327 mapInfoMaze.push_back(false); |
|
328 chooseMap->setItemData(1, mapInfoMaze); |
|
329 gbThemes->setIcon(QIcon(QString("%1/Themes/%2/icon.png").arg(datadir->absolutePath()).arg(theme))); |
345 gbThemes->setIcon(QIcon(QString("%1/Themes/%2/icon.png").arg(datadir->absolutePath()).arg(theme))); |
330 emit themeChanged(theme); |
346 emit themeChanged(theme); |
331 } |
347 } |
332 |
348 |
333 QString HWMapContainer::getCurrentSeed() const |
349 QString HWMapContainer::getCurrentSeed() const |