diff --git a/src/gui/editorwidgets/qgsrangeconfigdlg.cpp b/src/gui/editorwidgets/qgsrangeconfigdlg.cpp
index 192ad3062adf..c6948d59d326 100644
--- a/src/gui/editorwidgets/qgsrangeconfigdlg.cpp
+++ b/src/gui/editorwidgets/qgsrangeconfigdlg.cpp
@@ -93,6 +93,11 @@ QgsEditorWidgetConfig QgsRangeConfigDlg::config()
cfg.insert( "Style", rangeWidget->itemData( rangeWidget->currentIndex() ).toString() );
+ if ( suffixLineEdit->text() != "" )
+ {
+ cfg.insert( "Suffix", suffixLineEdit->text() );
+ }
+
return cfg;
}
@@ -107,4 +112,6 @@ void QgsRangeConfigDlg::setConfig( const QgsEditorWidgetConfig& config )
stepSpinBox->setValue( config.value( "Step", 1 ).toInt() );
rangeWidget->setCurrentIndex( rangeWidget->findData( config.value( "Style", "SpinBox" ) ) );
+
+ suffixLineEdit->setText( config.value( "Suffix" ).toString() );
}
diff --git a/src/gui/editorwidgets/qgsrangewidgetfactory.cpp b/src/gui/editorwidgets/qgsrangewidgetfactory.cpp
index 59e9ac00116f..4bd18b037ed1 100644
--- a/src/gui/editorwidgets/qgsrangewidgetfactory.cpp
+++ b/src/gui/editorwidgets/qgsrangewidgetfactory.cpp
@@ -45,6 +45,11 @@ QgsEditorWidgetConfig QgsRangeWidgetFactory::readConfig( const QDomElement& conf
cfg.insert( "Max", configElement.attribute( "Max" ).toInt() );
cfg.insert( "Step", configElement.attribute( "Step" ).toInt() );
+ if ( configElement.hasAttribute( "Suffix" ) )
+ {
+ cfg.insert( "Suffix", configElement.attribute( "Suffix" ) );
+ }
+
return cfg;
}
@@ -58,6 +63,10 @@ void QgsRangeWidgetFactory::writeConfig( const QgsEditorWidgetConfig& config, QD
configElement.setAttribute( "Min", config["Min"].toInt() );
configElement.setAttribute( "Max", config["Max"].toInt() );
configElement.setAttribute( "Step", config["Step"].toInt() );
+ if ( config.contains( "Suffix" ) )
+ {
+ configElement.setAttribute( "Suffix", config["Suffix"].toString() );
+ }
}
bool QgsRangeWidgetFactory::isFieldSupported( QgsVectorLayer* vl, int fieldIdx )
diff --git a/src/gui/editorwidgets/qgsrangewidgetwrapper.cpp b/src/gui/editorwidgets/qgsrangewidgetwrapper.cpp
index c8e32728fb7f..2f8b13d88e3b 100644
--- a/src/gui/editorwidgets/qgsrangewidgetwrapper.cpp
+++ b/src/gui/editorwidgets/qgsrangewidgetwrapper.cpp
@@ -78,6 +78,10 @@ void QgsRangeWidgetWrapper::initWidget( QWidget* editor )
mDoubleSpinBox->setMinimum( config( "Min" ).toDouble() );
mDoubleSpinBox->setMaximum( config( "Max" ).toDouble() );
mDoubleSpinBox->setSingleStep( config( "Step" ).toDouble() );
+ if ( config( "Suffix" ).isValid() )
+ {
+ mDoubleSpinBox->setSuffix( config( "Suffix" ).toString() );
+ }
connect( mDoubleSpinBox, SIGNAL( valueChanged( double ) ), this, SLOT( valueChanged( double ) ) );
}
@@ -86,6 +90,10 @@ void QgsRangeWidgetWrapper::initWidget( QWidget* editor )
mIntSpinBox->setMinimum( config( "Min" ).toInt() );
mIntSpinBox->setMaximum( config( "Max" ).toInt() );
mIntSpinBox->setSingleStep( config( "Step" ).toInt() );
+ if ( config( "Suffix" ).isValid() )
+ {
+ mIntSpinBox->setSuffix( config( "Suffix" ).toString() );
+ }
connect( mIntSpinBox, SIGNAL( valueChanged( int ) ), this, SLOT( valueChanged( int ) ) );
}
diff --git a/src/ui/editorwidgets/qgsrangeconfigdlgbase.ui b/src/ui/editorwidgets/qgsrangeconfigdlgbase.ui
index ecd38dc6166f..cd67f71a0713 100644
--- a/src/ui/editorwidgets/qgsrangeconfigdlgbase.ui
+++ b/src/ui/editorwidgets/qgsrangeconfigdlgbase.ui
@@ -7,7 +7,7 @@
0
0
549
- 318
+ 333
@@ -24,11 +24,21 @@
+ -
+
+
+ Local minimum/maximum = 0/0
+
+
+ true
+
+
+
-
- -
-
+
-
+
Qt::Vertical
@@ -41,123 +51,161 @@
-
-
-
-
-
-
- 0
-
-
-
-
-
-
-
- -999999999
-
-
- 999999999
-
-
-
- -
-
-
- -999999999
-
-
- 999999999
-
-
- 5
-
-
-
- -
-
-
- 999999999
-
-
- 1
-
-
-
-
-
-
-
- -
-
-
- -999999999.990000009536743
-
-
- 999999999.990000009536743
-
-
-
- -
-
-
- -999999999.990000009536743
-
-
- 999999999.990000009536743
-
-
- 5.000000000000000
-
-
-
- -
-
-
- 999999999.990000009536743
-
-
- 1.000000000000000
-
-
-
-
-
-
-
- -
-
-
- Step
-
-
-
- -
-
-
- Maximum
-
-
-
- -
-
-
- Minimum
-
-
-
-
+
+
+ 0
+
+
+
+ -
+
+
+ Minimum
+
+
+
+ -
+
+
+ -999999999
+
+
+ 999999999
+
+
+
+ -
+
+
+ Maximum
+
+
+
+ -
+
+
+ -999999999
+
+
+ 999999999
+
+
+ 5
+
+
+
+ -
+
+
+ Step
+
+
+
+ -
+
+
+ 999999999
+
+
+ 1
+
+
+
+
+
+
+
+ -
+
+
+ Step
+
+
+
+ -
+
+
+ Maximum
+
+
+
+ -
+
+
+ Minimum
+
+
+
+ -
+
+
+ -999999999.990000009536743
+
+
+ 999999999.990000009536743
+
+
+
+ -
+
+
+ -999999999.990000009536743
+
+
+ 999999999.990000009536743
+
+
+ 5.000000000000000
+
+
+
+ -
+
+
+ 999999999.990000009536743
+
+
+ 1.000000000000000
+
+
+
+
+
+
-
-
-
- Local minimum/maximum = 0/0
-
-
- true
+
+
+ Advanced options
+
+
-
+
+
+ Suffix
+
+
+
+ -
+
+
+ Inactive
+
+
+
+
+
+
+ QgsCollapsibleGroupBox
+ QGroupBox
+
+ 1
+
+