Add a slider for setting the shapeburst fill blur amount

qgis · Mar 21, 2014 · 3adb26a · 3adb26a
1 parent 1d21beb
commit 3adb26a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 23 deletions.
diff --git a/src/gui/symbology-ng/qgssymbollayerv2widget.cpp b/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
@@ -1027,6 +1027,9 @@ QgsShapeburstFillSymbolLayerV2Widget::QgsShapeburstFillSymbolLayerV2Widget( cons
   connect( radioTwoColor, SIGNAL( toggled( bool ) ), this, SLOT( colorModeChanged() ) );
   connect( spinOffsetX, SIGNAL( valueChanged( double ) ), this, SLOT( offsetChanged() ) );
   connect( spinOffsetY, SIGNAL( valueChanged( double ) ), this, SLOT( offsetChanged() ) );
+
+  connect( mBlurSlider, SIGNAL( valueChanged( int ) ), mSpinBlurRadius, SLOT( setValue( int ) ) );
+  connect( mSpinBlurRadius, SIGNAL( valueChanged( int ) ), mBlurSlider, SLOT( setValue( int ) ) );
 }
 
 void QgsShapeburstFillSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer )
@@ -1056,8 +1059,11 @@ void QgsShapeburstFillSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* lay
   }
 
   mSpinBlurRadius->blockSignals( true );
+  mBlurSlider->blockSignals( true );
   mSpinBlurRadius->setValue( mLayer->blurRadius() );
+  mBlurSlider->setValue( mLayer->blurRadius() );
   mSpinBlurRadius->blockSignals( false );
+  mBlurSlider->blockSignals( false );
 
   mSpinMaxDistance->blockSignals( true );
   mSpinMaxDistance->setValue( mLayer->maxDistance() );

diff --git a/src/ui/symbollayer/widget_shapeburstfill.ui b/src/ui/symbollayer/widget_shapeburstfill.ui
@@ -90,16 +90,6 @@
        <widget class="QgsColorRampComboBox" name="cboGradientColorRamp"/>
       </item>
      </layout>
-     <zorder>btnChangeColor2</zorder>
-     <zorder>btnChangeColor</zorder>
-     <zorder>cboGradientColorRamp</zorder>
-     <zorder>radioTwoColor</zorder>
-     <zorder>radioColorRamp</zorder>
-     <zorder>radioTwoColor</zorder>
-     <zorder>radioColorRamp</zorder>
-     <zorder>btnChangeColor</zorder>
-     <zorder>btnChangeColor2</zorder>
-     <zorder>cboGradientColorRamp</zorder>
     </widget>
    </item>
    <item row="1" column="0" colspan="2">
@@ -171,6 +161,25 @@
    </item>
    <item row="2" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout_4">
+     <item>
+      <widget class="QSlider" name="mBlurSlider">
+       <property name="maximum">
+        <number>18</number>
+       </property>
+       <property name="pageStep">
+        <number>3</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="tickPosition">
+        <enum>QSlider::TicksBelow</enum>
+       </property>
+       <property name="tickInterval">
+        <number>1</number>
+       </property>
+      </widget>
+     </item>
      <item>
       <widget class="QSpinBox" name="mSpinBlurRadius">
        <property name="sizePolicy">
@@ -184,19 +193,6 @@
        </property>
       </widget>
      </item>
-     <item>
-      <spacer name="horizontalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
     </layout>
    </item>
    <item row="3" column="0">