QTfrontend/mapContainer.cpp
changeset 3141 70d65353bd60
parent 3133 1ab5f18f4df8
child 3163 fdc351144b5e
equal deleted inserted replaced
3140:749682ae8926 3141:70d65353bd60
   111     CB_TemplateFilter->addItem(tr("Wacky"), 5);
   111     CB_TemplateFilter->addItem(tr("Wacky"), 5);
   112     mainLayout.addWidget(CB_TemplateFilter, 2, 1);
   112     mainLayout.addWidget(CB_TemplateFilter, 2, 1);
   113 
   113 
   114     connect(CB_TemplateFilter, SIGNAL(currentIndexChanged(int)), this, SLOT(templateFilterChanged(int)));
   114     connect(CB_TemplateFilter, SIGNAL(currentIndexChanged(int)), this, SLOT(templateFilterChanged(int)));
   115 
   115 
   116     maze_size_label = new QLabel("Size", this);
   116     maze_size_label = new QLabel("Tunnel size", this);
   117     mainLayout.addWidget(maze_size_label, 2, 0);
   117     mainLayout.addWidget(maze_size_label, 2, 0);
   118     maze_size_label->hide();
   118     maze_size_label->hide();
   119     maze_size_selection = new QComboBox(this);
   119     maze_size_selection = new QComboBox(this);
   120     maze_size_selection->addItem(tr("Small"), 0);
   120     maze_size_selection->addItem(tr("Small"), 0);
   121     maze_size_selection->addItem(tr("Medium"), 1);
   121     maze_size_selection->addItem(tr("Medium"), 1);
   122     maze_size_selection->addItem(tr("Large"), 2);
   122     maze_size_selection->addItem(tr("Large"), 2);
       
   123     maze_size_selection->setCurrentIndex(1);
       
   124     maze_size = 1;
   123     mainLayout.addWidget(maze_size_selection, 2, 1);
   125     mainLayout.addWidget(maze_size_selection, 2, 1);
   124     maze_size_selection->hide();
   126     maze_size_selection->hide();
   125     connect(maze_size_selection, SIGNAL(currentIndexChanged(int)), this, SLOT(setMaze_size(int)));
   127     connect(maze_size_selection, SIGNAL(currentIndexChanged(int)), this, SLOT(setMaze_size(int)));
   126 
   128 
   127     gbThemes = new IconedGroupBox(this);
   129     gbThemes = new IconedGroupBox(this);
   216         gbThemes->show();
   218         gbThemes->show();
   217         lblFilter->hide();
   219         lblFilter->hide();
   218         CB_TemplateFilter->hide();
   220         CB_TemplateFilter->hide();
   219         maze_size_label->show();
   221         maze_size_label->show();
   220         maze_size_selection->show();
   222         maze_size_selection->show();
   221         emit mapChanged("+rnd+");
   223         emit mapChanged("+maze+");
   222         emit mapgenChanged(mapgen);
   224         emit mapgenChanged(mapgen);
   223         emit themeChanged(chooseMap->itemData(index).toList()[1].toString());
   225         emit themeChanged(chooseMap->itemData(index).toList()[1].toString());
   224         break;
   226         break;
   225     default:
   227     default:
   226         loadMap(index);
   228         loadMap(index);
   282 }
   284 }
   283 
   285 
   284 void HWMapContainer::themeSelected(int currentRow)
   286 void HWMapContainer::themeSelected(int currentRow)
   285 {
   287 {
   286     QString theme = Themes->at(currentRow);
   288     QString theme = Themes->at(currentRow);
   287     QList<QVariant> mapInfo;
   289     QList<QVariant> mapInfoRegular;
   288     mapInfo.push_back(QString("+rnd+"));
   290     mapInfoRegular.push_back(QString("+rnd+"));
   289     mapInfo.push_back(theme);
   291     mapInfoRegular.push_back(theme);
   290     mapInfo.push_back(18);
   292     mapInfoRegular.push_back(18);
   291     mapInfo.push_back(false);
   293     mapInfoRegular.push_back(false);
   292     chooseMap->setItemData(0, mapInfo);
   294     chooseMap->setItemData(0, mapInfoRegular);
   293     chooseMap->setItemData(1, mapInfo);
   295     QList<QVariant> mapInfoMaze;
       
   296     mapInfoMaze.push_back(QString("+maze+"));
       
   297     mapInfoMaze.push_back(theme);
       
   298     mapInfoMaze.push_back(18);
       
   299     mapInfoMaze.push_back(false);
       
   300     chooseMap->setItemData(1, mapInfoMaze);
   294     gbThemes->setIcon(QIcon(QString("%1/Themes/%2/icon.png").arg(datadir->absolutePath()).arg(theme)));
   301     gbThemes->setIcon(QIcon(QString("%1/Themes/%2/icon.png").arg(datadir->absolutePath()).arg(theme)));
   295     emit themeChanged(theme);
   302     emit themeChanged(theme);
   296 }
   303 }
   297 
   304 
   298 QString HWMapContainer::getCurrentSeed() const
   305 QString HWMapContainer::getCurrentSeed() const
   338     changeImage();
   345     changeImage();
   339 }
   346 }
   340 
   347 
   341 void HWMapContainer::setMap(const QString & map)
   348 void HWMapContainer::setMap(const QString & map)
   342 {
   349 {
   343     if(map == "+rnd+")
   350     if(map == "+rnd+" || map == "+maze+")
   344     {
   351     {
   345         changeImage();
   352         changeImage();
   346         return;
   353         return;
   347     }
   354     }
   348 
   355 
   409 }
   416 }
   410 
   417 
   411 void HWMapContainer::setMaze_size(int size)
   418 void HWMapContainer::setMaze_size(int size)
   412 {
   419 {
   413     maze_size = size;
   420     maze_size = size;
       
   421     maze_size_selection->setCurrentIndex(size);
   414     emit maze_sizeChanged(size);
   422     emit maze_sizeChanged(size);
   415 //    emit mapChanged("+rnd+");
       
   416     changeImage();
   423     changeImage();
   417 }
   424 }
   418 
   425 
   419 void HWMapContainer::setMapgen(MapGenerator m)
   426 void HWMapContainer::setMapgen(MapGenerator m)
   420 {
   427 {
   421     mapgen = m;
   428     mapgen = m;
   422     emit mapgenChanged(m);
   429     emit mapgenChanged(m);
   423 //    emit mapChanged("+rnd+");
       
   424     changeImage();
   430     changeImage();
   425 }
   431 }