# HG changeset patch # User nemo # Date 1414855237 14400 # Node ID dd3cf0c91cc926810b90fc65ce0af4e203a08150 # Parent 482c744b272c143629326302648219e45b532a89 A slider for controlling things like bumpiness of map and tunnel sizes. diff -r 482c744b272c -r dd3cf0c91cc9 QTfrontend/res/css/qt.css --- a/QTfrontend/res/css/qt.css Thu Oct 30 18:47:51 2014 -0400 +++ b/QTfrontend/res/css/qt.css Sat Nov 01 11:20:37 2014 -0400 @@ -275,6 +275,21 @@ height: 6px; border-radius: 3px; } +#mapFeatureSize { +margin-left: 3px; +} + +#mapFeatureSize::groove::horizontal { +/* background-color: #141250; +background-color: rgba(20, 18, 80, 50%); +*/ +background-color: rgba(0, 0, 0, 60%); +} +#mapFeatureSize::handle { +/* background-color: #141250; */ +background-color: rgba(0, 0, 0, 60%); +border-radius: 5px; +} HatButton, ThemeButton { text-align: left; diff -r 482c744b272c -r dd3cf0c91cc9 QTfrontend/ui/widget/mapContainer.cpp --- a/QTfrontend/ui/widget/mapContainer.cpp Thu Oct 30 18:47:51 2014 -0400 +++ b/QTfrontend/ui/widget/mapContainer.cpp Sat Nov 01 11:20:37 2014 -0400 @@ -16,27 +16,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include #include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include +#include #include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include #include "hwconsts.h" #include "mapContainer.h" @@ -152,6 +153,15 @@ leftLayout->addWidget(mapPreview, 0); connect(mapPreview, SIGNAL(clicked()), this, SLOT(previewClicked())); + mapFeatureSize = new QSlider(Qt::Horizontal, this); + mapFeatureSize->setObjectName("mapFeatureSize"); + //mapFeatureSize->setTickPosition(QSlider::TicksBelow); + mapFeatureSize->setMaximum(100); + mapFeatureSize->setMinimum(1); + mapFeatureSize->setFixedWidth(259); + mapFeatureSize->setValue(50); + leftLayout->addWidget(mapFeatureSize, 0); + /* Bottom-Left layout */ QVBoxLayout * bottomLeftLayout = new QVBoxLayout(); diff -r 482c744b272c -r dd3cf0c91cc9 QTfrontend/ui/widget/mapContainer.h --- a/QTfrontend/ui/widget/mapContainer.h Thu Oct 30 18:47:51 2014 -0400 +++ b/QTfrontend/ui/widget/mapContainer.h Sat Nov 01 11:20:37 2014 -0400 @@ -20,13 +20,14 @@ #ifndef _HWMAP_CONTAINER_INCLUDED #define _HWMAP_CONTAINER_INCLUDED -#include -#include -#include +#include #include +#include #include -#include #include +#include +#include +#include #include "DataManager.h" @@ -117,6 +118,7 @@ private: QVBoxLayout mainLayout; QPushButton* mapPreview; + QSlider* mapFeatureSize; QComboBox* chooseMap; MapModel * m_staticMapModel; MapModel * m_missionMapModel;