# HG changeset patch
# User nemo
# Date 1415017341 18000
# Node ID 79fe4266b2cab2d4f49a338a667299ba127b6cda
# Parent  dd3cf0c91cc926810b90fc65ce0af4e203a08150# Parent  987ac036c4537baea43301e5b8dad5c0a0bda6df
Merge of unc0rr's last change against default.

diff -r 987ac036c453 -r 79fe4266b2ca QTfrontend/res/css/qt.css
--- a/QTfrontend/res/css/qt.css	Sun Nov 02 23:36:01 2014 +0300
+++ b/QTfrontend/res/css/qt.css	Mon Nov 03 07:22:21 2014 -0500
@@ -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 987ac036c453 -r 79fe4266b2ca QTfrontend/ui/widget/mapContainer.cpp
--- a/QTfrontend/ui/widget/mapContainer.cpp	Sun Nov 02 23:36:01 2014 +0300
+++ b/QTfrontend/ui/widget/mapContainer.cpp	Mon Nov 03 07:22:21 2014 -0500
@@ -16,27 +16,28 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <QPushButton>
+#include <QBitmap>
 #include <QBuffer>
-#include <QUuid>
-#include <QBitmap>
-#include <QPainter>
-#include <QLinearGradient>
 #include <QColor>
-#include <QTextStream>
-#include <QLabel>
-#include <QListView>
-#include <QVBoxLayout>
-#include <QIcon>
-#include <QLineEdit>
-#include <QStringListModel>
-#include <QListWidget>
-#include <QListWidgetItem>
 #include <QDebug>
 #include <QFile>
 #include <QFileDialog>
+#include <QIcon>
 #include <QInputDialog>
+#include <QLabel>
+#include <QLinearGradient>
+#include <QLineEdit>
+#include <QListView>
+#include <QListWidget>
+#include <QListWidgetItem>
 #include <QMessageBox>
+#include <QPainter>
+#include <QPushButton>
+#include <QSlider>
+#include <QStringListModel>
+#include <QTextStream>
+#include <QUuid>
+#include <QVBoxLayout>
 
 #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 987ac036c453 -r 79fe4266b2ca QTfrontend/ui/widget/mapContainer.h
--- a/QTfrontend/ui/widget/mapContainer.h	Sun Nov 02 23:36:01 2014 +0300
+++ b/QTfrontend/ui/widget/mapContainer.h	Mon Nov 03 07:22:21 2014 -0500
@@ -20,13 +20,14 @@
 #ifndef _HWMAP_CONTAINER_INCLUDED
 #define _HWMAP_CONTAINER_INCLUDED
 
-#include <QWidget>
-#include <QGridLayout>
-#include <QVBoxLayout>
+#include <QByteArray>
 #include <QComboBox>
+#include <QGridLayout>
 #include <QLabel>
-#include <QByteArray>
 #include <QLineEdit>
+#include <QSlider>
+#include <QVBoxLayout>
+#include <QWidget>
 
 #include "DataManager.h"
 
@@ -117,6 +118,7 @@
     private:
         QVBoxLayout mainLayout;
         QPushButton* mapPreview;
+        QSlider* mapFeatureSize;
         QComboBox* chooseMap;
         MapModel * m_staticMapModel;
         MapModel * m_missionMapModel;