From 87c428ea1a188ce16986afdf943c6d440ad64f34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= <michael@thunderk.net>
Date: Thu, 20 Jun 2013 17:56:15 +0200
Subject: [PATCH] Improve terrain brush settings in dialog

---
 src/editing/terrain/dialogterrainpainting.ui | 12 +++---------
 src/editing/terrain/paintingbrush.cpp        |  7 ++++---
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/editing/terrain/dialogterrainpainting.ui b/src/editing/terrain/dialogterrainpainting.ui
index 4607833..eb2b84b 100644
--- a/src/editing/terrain/dialogterrainpainting.ui
+++ b/src/editing/terrain/dialogterrainpainting.ui
@@ -546,7 +546,7 @@
                </item>
                <item>
                 <property name="text">
-                 <string>Restore to default (F12)</string>
+                 <string>Restore to base shape (F12)</string>
                 </property>
                </item>
               </widget>
@@ -560,14 +560,11 @@
              </item>
              <item row="1" column="1">
               <widget class="QSlider" name="input_brush_size">
-               <property name="minimum">
-                <number>5</number>
-               </property>
                <property name="maximum">
                 <number>100</number>
                </property>
                <property name="value">
-                <number>20</number>
+                <number>40</number>
                </property>
                <property name="orientation">
                 <enum>Qt::Horizontal</enum>
@@ -587,7 +584,7 @@
                 <number>100</number>
                </property>
                <property name="value">
-                <number>80</number>
+                <number>100</number>
                </property>
                <property name="orientation">
                 <enum>Qt::Horizontal</enum>
@@ -603,9 +600,6 @@
              </item>
              <item row="3" column="1">
               <widget class="QSlider" name="input_brush_strength">
-               <property name="minimum">
-                <number>10</number>
-               </property>
                <property name="maximum">
                 <number>100</number>
                </property>
diff --git a/src/editing/terrain/paintingbrush.cpp b/src/editing/terrain/paintingbrush.cpp
index f0c71f6..7ec28db 100644
--- a/src/editing/terrain/paintingbrush.cpp
+++ b/src/editing/terrain/paintingbrush.cpp
@@ -30,7 +30,8 @@ void PaintingBrush::setSize(double value)
 
 void PaintingBrush::setSize(QAbstractSlider* slider)
 {
-    setSize(20.0 * (double)slider->value() / (double)slider->maximum());
+    double value = (double)slider->value() / (double)slider->maximum();
+    setSize(2.0 + value * value * 28.0);
 }
 
 void PaintingBrush::setSmoothing(double value)
@@ -50,7 +51,7 @@ void PaintingBrush::setStrength(double value)
 
 void PaintingBrush::setStrength(QAbstractSlider* slider)
 {
-    setStrength((double)slider->value() / (double)slider->maximum());
+    setStrength(0.1 + 0.9 * (double)slider->value() / (double)slider->maximum());
 }
 
 void PaintingBrush::randomizeNoise()
@@ -91,7 +92,7 @@ QString PaintingBrush::getHelpText()
     case PAINTING_BRUSH_FLATTEN:
         return QObject::tr("<strong>Left click</strong>: flatten at height picked with right click<br><br><strong>Right click</strong>: pick height at center");
     case PAINTING_BRUSH_RESTORE:
-        return QObject::tr("<strong>Left click</strong>: cancel all modifications on terrain");
+        return QObject::tr("<strong>Left click</strong>: remove your manual modifications from terrain");
     }
     return QString("");
 }