line edit: do not display clear icon when read only

3nids · 3nids · commit ce486da41ea2 · 2014-09-24T08:30:30.000+02:00
diff --git a/src/gui/editorwidgets/qgstexteditwrapper.cpp b/src/gui/editorwidgets/qgstexteditwrapper.cpp
@@ -139,5 +139,11 @@ void QgsTextEditWrapper::setEnabled( bool enabled )
     mPlainTextEdit->setReadOnly( !enabled );
 
   if ( mLineEdit )
-    mLineEdit->setReadOnly( !enabled );
+  {
+    QgsFilterLineEdit* qgsWidget = dynamic_cast<QgsFilterLineEdit*>( mLineEdit );
+    if ( qgsWidget )
+      qgsWidget->setReadOnly( !enabled );
+    else
+      mLineEdit->setReadOnly( !enabled );
+  }
 }
diff --git a/src/gui/qgsfilterlineedit.cpp b/src/gui/qgsfilterlineedit.cpp
@@ -81,15 +81,19 @@ void QgsFilterLineEdit::clear()
 void QgsFilterLineEdit::changeEvent( QEvent *e )
 {
   QLineEdit::changeEvent( e );
-  if ( !isEnabled() || isReadOnly() )
-    btnClear->setVisible( false );
-  else
-    btnClear->setVisible( text() != mNullValue );
+  btnClear->setVisible( isEnabled() && !isReadOnly() && !isNull() );
 }
 
+void QgsFilterLineEdit::setReadOnly( bool readOnly )
+{
+  QLineEdit::setReadOnly( readOnly );
+  btnClear->setVisible( isEnabled() && !isReadOnly() && !isNull() );
+}
+
+
 void QgsFilterLineEdit::onTextChanged( const QString &text )
 {
-  btnClear->setVisible( !isEnabled() && !isReadOnly() && text != mNullValue );
+  btnClear->setVisible( isEnabled() && !isReadOnly() && !isNull() );
 
   if ( isNull() )
   {
diff --git a/src/gui/qgsfilterlineedit.h b/src/gui/qgsfilterlineedit.h
@@ -58,6 +58,12 @@ class GUI_EXPORT QgsFilterLineEdit : public QLineEdit
      */
     inline bool isNull() const { return text() == mNullValue; }
 
+    /**
+     * @brief setReadOnly set the line edit to be read only and hide the clear button
+     * @note Since QLineEdit::setReadOnly() is not virtual, it needs to be called for QgsFilterLineEdit
+     */
+    void setReadOnly( bool readOnly );
+
   signals:
     void cleared();
 

Original file line number	Diff line number	Diff line change
`@@ -81,15 +81,19 @@ void QgsFilterLineEdit::clear()`
`81`	`81`	`void QgsFilterLineEdit::changeEvent( QEvent *e )`
`82`	`82`	`{`
`83`	`83`	`QLineEdit::changeEvent( e );`
`84`		`- if ( !isEnabled() \|\| isReadOnly() )`
`85`		`- btnClear->setVisible( false );`
`86`		`- else`
`87`		`- btnClear->setVisible( text() != mNullValue );`
	`84`	`+ btnClear->setVisible( isEnabled() && !isReadOnly() && !isNull() );`
`88`	`85`	`}`
`89`	`86`
	`87`	`+void QgsFilterLineEdit::setReadOnly( bool readOnly )`
	`88`	`+{`
	`89`	`+ QLineEdit::setReadOnly( readOnly );`
	`90`	`+ btnClear->setVisible( isEnabled() && !isReadOnly() && !isNull() );`
	`91`	`+}`
	`92`	`+`
	`93`	`+`
`90`	`94`	`void QgsFilterLineEdit::onTextChanged( const QString &text )`
`91`	`95`	`{`
`92`		`- btnClear->setVisible( !isEnabled() && !isReadOnly() && text != mNullValue );`
	`96`	`+ btnClear->setVisible( isEnabled() && !isReadOnly() && !isNull() );`
`93`	`97`
`94`	`98`	`if ( isNull() )`
`95`	`99`	`{`