# HG changeset patch # User unc0rr # Date 1218782030 0 # Node ID 090f94cd663ede96b9aab11ef492c2cbfbe3f5ca # Parent 173c79113dfeb679b9b52510123ad826c58df28c - Make border 3px width - Make orange color be #ffcc00 diff -r 173c79113dfe -r 090f94cd663e QTfrontend/gamecfgwidget.cpp --- a/QTfrontend/gamecfgwidget.cpp Fri Aug 15 03:59:36 2008 +0000 +++ b/QTfrontend/gamecfgwidget.cpp Fri Aug 15 06:33:50 2008 +0000 @@ -30,7 +30,7 @@ mainLayout.setMargin(0); mainLayout.setSizeConstraint(QLayout::SetMinimumSize); QGroupBox *GBoxMap = new QGroupBox(this); - GBoxMap->setTitle(QGroupBox::tr("Landscape")); + //GBoxMap->setTitle(QGroupBox::tr("Landscape")); GBoxMap->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); mainLayout.addWidget(GBoxMap); diff -r 173c79113dfe -r 090f94cd663e QTfrontend/main.cpp --- a/QTfrontend/main.cpp Fri Aug 15 03:59:36 2008 +0000 +++ b/QTfrontend/main.cpp Fri Aug 15 06:33:50 2008 +0000 @@ -64,13 +64,13 @@ "QPushButton{" "border: solid;" - "border-width: 4px;" + "border-width: 3px;" "border-radius: 10px;" - "border-color: orange;" + "border-color: #ffcc00;" "background-origin: margin;" "background-position: top left;" "background-color: #00351d;" - "color: orange;" + "color: #ffcc00;" "}" "QPushButton:hover{" "border-color: yellow;" @@ -81,11 +81,11 @@ "QLineEdit{" "border: solid;" - "border-width: 4px;" + "border-width: 3px;" "border-radius: 12px;" - "border-color: orange;" + "border-color: #ffcc00;" "background-color: #0d0544;" - "color: orange;" + "color: #ffcc00;" "font: bold 14px;" "}" "QLineEdit:hover{" @@ -93,18 +93,18 @@ "}" "QLabel{" - "color: orange;" + "color: #ffcc00;" "font: bold 14px;" "}" "QListWidget{" "border: solid;" - "border-width: 4px;" + "border-width: 3px;" "border-radius: 12px;" - "border-color: orange;" + "border-color: #ffcc00;" "background-color: #0d0544;" // "alternate-background-color: #2f213a;" //what's it? - "color: orange;" + "color: #ffcc00;" "font: bold 14px;" "}" "QListWidget:hover{" @@ -116,11 +116,11 @@ "QSpinBox{" "border: solid;" - "border-width: 4px;" + "border-width: 3px;" "border-radius: 12px;" - "border-color: orange;" + "border-color: #ffcc00;" "background-color: #0d0544;" - "color: orange;" + "color: #ffcc00;" "font: bold 14px;" "}" "QSpinBox:hover{" @@ -129,13 +129,13 @@ "QToolBox{" "border: solid;" - "border-width: 4px;" + "border-width: 3px;" "border-radius: 12px;" - "border-color: orange;" + "border-color: #ffcc00;" "background-color: #0d0544;" "}" "QToolBox::tab{" - "color: orange;" + "color: #ffcc00;" "font: bold 14px;" "}" "QToolBox:hover{" @@ -144,11 +144,11 @@ "QComboBox{" "border: solid;" - "border-width: 4px;" + "border-width: 3px;" "border-radius: 15px;" - "border-color: orange;" + "border-color: #ffcc00;" "background-color: #0d0544;" - "color: orange;" + "color: #ffcc00;" "font: bold 14px;" "padding: 3px;" // "text-align: center;" @@ -168,22 +168,22 @@ "}" "QComboBox QAbstractItemView{" "border: solid transparent;" - "border-width: 4px;" + "border-width: 3px;" //"border-radius: 12px;" -- bad corners look - "border-color: orange;" + "border-color: #ffcc00;" "background-color: #0d0544;" - "color: orange;" + "color: #ffcc00;" "font: bold 14px;" "}" "IconedGroupBox{" "border: solid;" - "border-width: 4px;" + "border-width: 3px;" "border-radius: 16px;" - "border-color: orange;" + "border-color: #ffcc00;" "background-color: #130f2c;" - "color: orange;" + "color: #ffcc00;" "font: bold 14px;" "padding: 12px;" "}" @@ -192,12 +192,12 @@ "background-position: bottom center;" "background-repeat: repeat-x;" "border: solid;" - "border-width: 4px;" + "border-width: 3px;" "border-radius: 16px;" - "border-color: orange;" + "border-color: #ffcc00;" "background-color: #040200;" "padding: 6px;" - "color: orange;" + "color: #ffcc00;" "font: bold 14px;" //"margin-top: 24px;" "}" @@ -210,7 +210,7 @@ "}" "QCheckBox{" - "color: orange;" + "color: #ffcc00;" "font: bold 14px;" "}" "QCheckBox::indicator:checked{" @@ -221,7 +221,7 @@ "}" "QRadioButton{" - "color: orange;" + "color: #ffcc00;" "font: bold 14px;" "}" ) diff -r 173c79113dfe -r 090f94cd663e QTfrontend/mapContainer.cpp --- a/QTfrontend/mapContainer.cpp Fri Aug 15 03:59:36 2008 +0000 +++ b/QTfrontend/mapContainer.cpp Fri Aug 15 06:33:50 2008 +0000 @@ -44,7 +44,7 @@ #endif imageButt = new QPushButton(this); imageButt->setObjectName("imageButt"); - imageButt->setFixedSize(256 + 8, 128 + 8); + imageButt->setFixedSize(256 + 6, 128 + 6); imageButt->setFlat(true); imageButt->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);//QSizePolicy::Minimum, QSizePolicy::Minimum); mainLayout.addWidget(imageButt, 0, 0, 1, 2); @@ -80,7 +80,6 @@ gbTLayout->addWidget(lwThemes); lwThemes->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Minimum); - mainLayout.setSizeConstraint(QLayout::SetFixedSize);//SetMinimumSize } @@ -136,10 +135,14 @@ void HWMapContainer::changeImage() { - pMap = new HWMap(); - connect(pMap, SIGNAL(ImageReceived(const QImage)), this, SLOT(setImage(const QImage))); - pMap->getImage(m_seed.toStdString()); - theme = (Themes->size() > 0) ? Themes->at(rand() % Themes->size()) : "steel"; + pMap = new HWMap(); + connect(pMap, SIGNAL(ImageReceived(const QImage)), this, SLOT(setImage(const QImage))); + pMap->getImage(m_seed.toStdString()); + + if(!Themes->size()) return; + quint32 themeNum = rand() % Themes->size(); + theme = Themes->at(themeNum); + lwThemes->setCurrentRow(themeNum); } QString HWMapContainer::getCurrentSeed() const diff -r 173c79113dfe -r 090f94cd663e QTfrontend/res/LocalPlay.png Binary file QTfrontend/res/LocalPlay.png has changed diff -r 173c79113dfe -r 090f94cd663e QTfrontend/res/NetworkPlay.png Binary file QTfrontend/res/NetworkPlay.png has changed diff -r 173c79113dfe -r 090f94cd663e QTfrontend/res/Save.png Binary file QTfrontend/res/Save.png has changed