equal
deleted
inserted
replaced
291 lblFilter->show(); |
291 lblFilter->show(); |
292 cbTemplateFilter->show(); |
292 cbTemplateFilter->show(); |
293 maze_size_label->hide(); |
293 maze_size_label->hide(); |
294 cbMazeSize->hide(); |
294 cbMazeSize->hide(); |
295 emit mapChanged("+rnd+"); |
295 emit mapChanged("+rnd+"); |
296 emit mapgenChanged(mapgen); |
|
297 emit themeChanged(chooseMap->itemData(index).toList()[1].toString()); |
296 emit themeChanged(chooseMap->itemData(index).toList()[1].toString()); |
298 break; |
297 break; |
299 case MAPGEN_MAZE: |
298 case MAPGEN_MAZE: |
300 mapgen = MAPGEN_MAZE; |
299 mapgen = MAPGEN_MAZE; |
301 updatePreview(); |
300 updatePreview(); |
303 lblFilter->hide(); |
302 lblFilter->hide(); |
304 cbTemplateFilter->hide(); |
303 cbTemplateFilter->hide(); |
305 maze_size_label->show(); |
304 maze_size_label->show(); |
306 cbMazeSize->show(); |
305 cbMazeSize->show(); |
307 emit mapChanged("+maze+"); |
306 emit mapChanged("+maze+"); |
308 emit mapgenChanged(mapgen); |
|
309 emit themeChanged(chooseMap->itemData(index).toList()[1].toString()); |
307 emit themeChanged(chooseMap->itemData(index).toList()[1].toString()); |
310 break; |
308 break; |
311 case MAPGEN_DRAWN: |
309 case MAPGEN_DRAWN: |
312 mapgen = MAPGEN_DRAWN; |
310 mapgen = MAPGEN_DRAWN; |
313 updatePreview(); |
311 updatePreview(); |
315 lblFilter->hide(); |
313 lblFilter->hide(); |
316 cbTemplateFilter->hide(); |
314 cbTemplateFilter->hide(); |
317 maze_size_label->hide(); |
315 maze_size_label->hide(); |
318 cbMazeSize->hide(); |
316 cbMazeSize->hide(); |
319 emit mapChanged("+drawn+"); |
317 emit mapChanged("+drawn+"); |
320 emit mapgenChanged(mapgen); |
|
321 emit themeChanged(chooseMap->itemData(index).toList()[1].toString()); |
318 emit themeChanged(chooseMap->itemData(index).toList()[1].toString()); |
322 break; |
319 break; |
323 default: |
320 default: |
|
321 mapgen = MAPGEN_MAP; |
324 updatePreview(); |
322 updatePreview(); |
325 gbThemes->hide(); |
323 gbThemes->hide(); |
326 lblFilter->hide(); |
324 lblFilter->hide(); |
327 cbTemplateFilter->hide(); |
325 cbTemplateFilter->hide(); |
328 maze_size_label->hide(); |
326 maze_size_label->hide(); |
329 cbMazeSize->hide(); |
327 cbMazeSize->hide(); |
330 emit mapChanged(chooseMap->itemData(index).toList()[0].toString()); |
328 emit mapChanged(chooseMap->itemData(index).toList()[0].toString()); |
331 } |
329 } |
|
330 |
|
331 emit mapgenChanged(mapgen); |
332 } |
332 } |
333 |
333 |
334 // Should this add text to identify map size? |
334 // Should this add text to identify map size? |
335 void HWMapContainer::addInfoToPreview(QPixmap image) |
335 void HWMapContainer::addInfoToPreview(QPixmap image) |
336 { |
336 { |
445 } |
445 } |
446 |
446 |
447 void HWMapContainer::setSeed(const QString & seed) |
447 void HWMapContainer::setSeed(const QString & seed) |
448 { |
448 { |
449 intSetSeed(seed); |
449 intSetSeed(seed); |
450 if (chooseMap->currentIndex() < MAPGEN_MAP) |
450 if (chooseMap->currentIndex() < MAPGEN_DRAWN) |
451 updatePreview(); |
451 updatePreview(); |
452 } |
452 } |
453 |
453 |
454 void HWMapContainer::intSetMap(const QString & map) |
454 void HWMapContainer::intSetMap(const QString & map) |
455 { |
455 { |
516 } |
516 } |
517 |
517 |
518 void HWMapContainer::setRandomMission() |
518 void HWMapContainer::setRandomMission() |
519 { |
519 { |
520 int i = MAPGEN_MAP + 2 + rand() % numMissions; |
520 int i = MAPGEN_MAP + 2 + rand() % numMissions; |
521 qDebug() << i << MAPGEN_MAP << numMissions; |
|
522 chooseMap->setCurrentIndex(i); |
521 chooseMap->setCurrentIndex(i); |
523 setRandomSeed(); |
522 setRandomSeed(); |
524 } |
523 } |
525 |
524 |
526 void HWMapContainer::setRandomSeed() |
525 void HWMapContainer::setRandomSeed() |
646 case MAPGEN_DRAWN: |
645 case MAPGEN_DRAWN: |
647 askForGeneratedPreview(); |
646 askForGeneratedPreview(); |
648 break; |
647 break; |
649 default: |
648 default: |
650 QPixmap mapImage; |
649 QPixmap mapImage; |
651 qDebug() << "Map data" << curIndex << chooseMap->currentText() << chooseMap->itemData(curIndex); |
|
652 QFile tmpfile; |
650 QFile tmpfile; |
653 tmpfile.setFileName(cfgdir->absolutePath() + "/Data//Maps/" + chooseMap->itemData(curIndex).toList()[0].toString() + "/preview.png"); |
651 tmpfile.setFileName(cfgdir->absolutePath() + "/Data/Maps/" + chooseMap->itemData(curIndex).toList()[0].toString() + "/preview.png"); |
654 if (!tmpfile.exists()) tmpfile.setFileName(datadir->absolutePath() + "/Maps/" + chooseMap->itemData(curIndex).toList()[0].toString() + "/preview.png"); |
652 if (!tmpfile.exists()) tmpfile.setFileName(datadir->absolutePath() + "/Maps/" + chooseMap->itemData(curIndex).toList()[0].toString() + "/preview.png"); |
655 if(!mapImage.load(QFileInfo(tmpfile).absoluteFilePath())) { |
653 if(!mapImage.load(QFileInfo(tmpfile).absoluteFilePath())) { |
656 imageButt->setIcon(QIcon()); |
654 imageButt->setIcon(QIcon()); |
657 return; |
655 return; |
658 } |
656 } |