Editor widgets: Show NULL value on numeric line edit

m-kuhn · m-kuhn · commit 3f8a860503c7 · 2014-09-24T17:11:26.000+02:00
diff --git a/src/gui/editorwidgets/qgstexteditwrapper.cpp b/src/gui/editorwidgets/qgstexteditwrapper.cpp
@@ -95,7 +95,11 @@ void QgsTextEditWrapper::initWidget( QWidget* editor )
     mLineEdit->setValidator( new QgsFieldValidator( mLineEdit, field() ) );
 
     QgsFilterLineEdit *fle = qobject_cast<QgsFilterLineEdit*>( mLineEdit );
-    if ( fle && !( field().type() == QVariant::Int || field().type() == QVariant::Double || field().type() == QVariant::LongLong || field().type() == QVariant::Date ) )
+    if ( field().type() == QVariant::Int || field().type() == QVariant::Double || field().type() == QVariant::LongLong || field().type() == QVariant::Date )
+    {
+      mLineEdit->setPlaceholderText( QSettings().value( "qgis/nullValue", "NULL" ).toString() );
+    }
+    else if ( fle )
     {
       fle->setNullValue( QSettings().value( "qgis/nullValue", "NULL" ).toString() );
     }

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,11 @@ void QgsTextEditWrapper::initWidget( QWidget* editor )`
`95`	`95`	`mLineEdit->setValidator( new QgsFieldValidator( mLineEdit, field() ) );`
`96`	`96`
`97`	`97`	`QgsFilterLineEdit fle = qobject_cast<QgsFilterLineEdit>( mLineEdit );`
`98`		`- if ( fle && !( field().type() == QVariant::Int \|\| field().type() == QVariant::Double \|\| field().type() == QVariant::LongLong \|\| field().type() == QVariant::Date ) )`
	`98`	`+ if ( field().type() == QVariant::Int \|\| field().type() == QVariant::Double \|\| field().type() == QVariant::LongLong \|\| field().type() == QVariant::Date )`
	`99`	`+ {`
	`100`	`+ mLineEdit->setPlaceholderText( QSettings().value( "qgis/nullValue", "NULL" ).toString() );`
	`101`	`+ }`
	`102`	`+ else if ( fle )`
`99`	`103`	`{`
`100`	`104`	`fle->setNullValue( QSettings().value( "qgis/nullValue", "NULL" ).toString() );`
`101`	`105`	`}`