175 mapLayout->addWidget(maze_size_selection, 2, 1); |
175 mapLayout->addWidget(maze_size_selection, 2, 1); |
176 maze_size_selection->hide(); |
176 maze_size_selection->hide(); |
177 connect(maze_size_selection, SIGNAL(currentIndexChanged(int)), this, SLOT(setMaze_size(int))); |
177 connect(maze_size_selection, SIGNAL(currentIndexChanged(int)), this, SLOT(setMaze_size(int))); |
178 |
178 |
179 gbThemes = new IconedGroupBox(mapWidget); |
179 gbThemes = new IconedGroupBox(mapWidget); |
180 gbThemes->setTitleTextPadding(60); |
180 gbThemes->setTitleTextPadding(80); |
181 gbThemes->setContentTopPadding(6); |
181 gbThemes->setContentTopPadding(15); |
182 gbThemes->setTitle(tr("Themes")); |
182 gbThemes->setTitle(tr("Themes")); |
183 |
183 |
184 //gbThemes->setStyleSheet("padding: 0px"); // doesn't work - stylesheet is set with icon |
184 //gbThemes->setStyleSheet("padding: 0px"); // doesn't work - stylesheet is set with icon |
185 mapLayout->addWidget(gbThemes, 0, 2, 3, 1); |
185 mapLayout->addWidget(gbThemes, 0, 2, 3, 1); |
186 |
186 |
222 mainLayout.addWidget(seedWidget, 1, 0); |
222 mainLayout.addWidget(seedWidget, 1, 0); |
223 |
223 |
224 QGridLayout* seedLayout = new QGridLayout(seedWidget); |
224 QGridLayout* seedLayout = new QGridLayout(seedWidget); |
225 seedLayout->setMargin(0); |
225 seedLayout->setMargin(0); |
226 |
226 |
227 QLabel* seedLabel = new QLabel(tr("Seed"), seedWidget); |
227 seedLabel = new QLabel(tr("Seed"), seedWidget); |
228 seedLayout->addWidget(seedLabel, 3, 0); |
228 seedLayout->addWidget(seedLabel, 3, 0); |
229 seedEdit = new QLineEdit(seedWidget); |
229 seedEdit = new QLineEdit(seedWidget); |
230 seedEdit->setMaxLength(54); |
230 seedEdit->setMaxLength(54); |
231 connect(seedEdit, SIGNAL(returnPressed()), this, SLOT(seedEdited())); |
231 connect(seedEdit, SIGNAL(returnPressed()), this, SLOT(seedEdited())); |
232 seedLayout->addWidget(seedEdit, 3, 1); |
232 seedLayout->addWidget(seedEdit, 3, 1); |
233 seedLayout->setColumnStretch(1, 5); |
233 seedLayout->setColumnStretch(1, 5); |
234 seedSet = new QPushButton(seedWidget); |
234 seedSet = new QPushButton(seedWidget); |
235 seedSet->setText(QPushButton::tr("Set")); |
235 seedSet->setText(QPushButton::tr("more")); |
236 connect(seedSet, SIGNAL(clicked()), this, SLOT(seedEdited())); |
236 connect(seedSet, SIGNAL(clicked()), this, SLOT(seedEdited())); |
237 seedLayout->setColumnStretch(2, 1); |
237 seedLayout->setColumnStretch(2, 1); |
238 seedLayout->addWidget(seedSet, 3, 2); |
238 seedLayout->addWidget(seedSet, 3, 2); |
|
239 |
|
240 seedLabel->setVisible(false); |
|
241 seedEdit->setVisible(false); |
239 |
242 |
240 setRandomSeed(); |
243 setRandomSeed(); |
241 setRandomTheme(); |
244 setRandomTheme(); |
242 } |
245 } |
243 |
246 |
368 chooseMap->setItemData(0, mapInfo); |
371 chooseMap->setItemData(0, mapInfo); |
369 mapInfo[0] = QString("+maze+"); |
372 mapInfo[0] = QString("+maze+"); |
370 chooseMap->setItemData(1, mapInfo); |
373 chooseMap->setItemData(1, mapInfo); |
371 mapInfo[0] = QString("+drawn+"); |
374 mapInfo[0] = QString("+drawn+"); |
372 chooseMap->setItemData(2, mapInfo); |
375 chooseMap->setItemData(2, mapInfo); |
373 gbThemes->setIcon(QIcon(QString("%1/Themes/%2/icon.png").arg(datadir->absolutePath()).arg(theme))); |
376 gbThemes->setIcon(QIcon(QString("%1/Themes/%2/icon@2x.png").arg(datadir->absolutePath()).arg(theme))); |
374 emit themeChanged(theme); |
377 emit themeChanged(theme); |
375 } |
378 } |
376 |
379 |
377 QString HWMapContainer::getCurrentSeed() const |
380 QString HWMapContainer::getCurrentSeed() const |
378 { |
381 { |
559 return drawMapScene.encode(); |
562 return drawMapScene.encode(); |
560 } |
563 } |
561 |
564 |
562 void HWMapContainer::seedEdited() |
565 void HWMapContainer::seedEdited() |
563 { |
566 { |
|
567 if (seedLabel->isVisible() == false ) |
|
568 { |
|
569 seedLabel->setVisible(true); |
|
570 seedEdit->setVisible(true); |
|
571 seedSet->setText(tr("Set")); |
|
572 return; |
|
573 } |
|
574 |
564 if (seedEdit->text().isEmpty()) |
575 if (seedEdit->text().isEmpty()) |
565 seedEdit->setText(m_seed); |
576 seedEdit->setText(m_seed); |
566 else |
577 else |
567 { |
578 { |
568 setSeed(seedEdit->text()); |
579 setSeed(seedEdit->text()); |