# HG changeset patch
# User nemo
# Date 1293395344 18000
# Node ID 58d92602404055f26a0140e941f975ad701e704e
# Parent 8d58de7127388677eb67faf7e962c208d2fb6abb# Parent 7ed88cfc99b1ccd690c0296fbfb4208a548366d6
oh. and koda's revision too
diff -r 8d58de712738 -r 58d926024040 QTfrontend/mapContainer.cpp
--- a/QTfrontend/mapContainer.cpp Sun Dec 26 15:28:44 2010 -0500
+++ b/QTfrontend/mapContainer.cpp Sun Dec 26 15:29:04 2010 -0500
@@ -177,8 +177,8 @@
connect(maze_size_selection, SIGNAL(currentIndexChanged(int)), this, SLOT(setMaze_size(int)));
gbThemes = new IconedGroupBox(mapWidget);
- gbThemes->setTitleTextPadding(60);
- gbThemes->setContentTopPadding(6);
+ gbThemes->setTitleTextPadding(80);
+ gbThemes->setContentTopPadding(15);
gbThemes->setTitle(tr("Themes"));
//gbThemes->setStyleSheet("padding: 0px"); // doesn't work - stylesheet is set with icon
@@ -224,7 +224,7 @@
QGridLayout* seedLayout = new QGridLayout(seedWidget);
seedLayout->setMargin(0);
- QLabel* seedLabel = new QLabel(tr("Seed"), seedWidget);
+ seedLabel = new QLabel(tr("Seed"), seedWidget);
seedLayout->addWidget(seedLabel, 3, 0);
seedEdit = new QLineEdit(seedWidget);
seedEdit->setMaxLength(54);
@@ -232,11 +232,14 @@
seedLayout->addWidget(seedEdit, 3, 1);
seedLayout->setColumnStretch(1, 5);
seedSet = new QPushButton(seedWidget);
- seedSet->setText(QPushButton::tr("Set"));
+ 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();
}
@@ -370,7 +373,7 @@
chooseMap->setItemData(1, mapInfo);
mapInfo[0] = QString("+drawn+");
chooseMap->setItemData(2, mapInfo);
- gbThemes->setIcon(QIcon(QString("%1/Themes/%2/icon.png").arg(datadir->absolutePath()).arg(theme)));
+ gbThemes->setIcon(QIcon(QString("%1/Themes/%2/icon@2x.png").arg(datadir->absolutePath()).arg(theme)));
emit themeChanged(theme);
}
@@ -561,6 +564,14 @@
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
diff -r 8d58de712738 -r 58d926024040 QTfrontend/mapContainer.h
--- a/QTfrontend/mapContainer.h Sun Dec 26 15:28:44 2010 -0500
+++ b/QTfrontend/mapContainer.h Sun Dec 26 15:29:04 2010 -0500
@@ -104,6 +104,7 @@
QString m_seed;
QLineEdit* seedEdit;
QPushButton* seedSet;
+ QLabel* seedLabel;
int hhLimit;
int templateFilter;
QPixmap hhSmall;
diff -r 8d58de712738 -r 58d926024040 project_files/HedgewarsMobile/Resources/Settings/settings.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/settings.plist Sun Dec 26 15:28:44 2010 -0500
+++ b/project_files/HedgewarsMobile/Resources/Settings/settings.plist Sun Dec 26 15:29:04 2010 -0500
@@ -17,7 +17,7 @@
password_length
0
enhanced
-
+
multitasking