hide clear button in filter line edit, when widget is disabled

qgis · Mar 14, 2013 · 7e598f7 · 7e598f7
1 parent a1b5b92
commit 7e598f7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/src/app/qgsattributedialog.cpp b/src/app/qgsattributedialog.cpp
@@ -204,7 +204,7 @@ QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer *vl, QgsFeature *thepFeat
 
       if ( vl->editType( fldIdx ) != QgsVectorLayer::Immutable )
       {
-        myWidget->setEnabled( vl->isEditable() && vl->fieldEditable(fldIdx) );
+        myWidget->setEnabled( vl->isEditable() && vl->fieldEditable( fldIdx ) );
       }
 
       mypInnerLayout->addWidget( myWidget, index, 1 );
@@ -239,7 +239,7 @@ QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer *vl, QgsFeature *thepFeat
 
         if ( vl->editType( fldIdx ) != QgsVectorLayer::Immutable )
         {
-          ( *itw )->setEnabled( (*itw)->isEnabled() && vl->isEditable() && vl->fieldEditable( fldIdx ) );
+          ( *itw )->setEnabled(( *itw )->isEnabled() && vl->isEditable() && vl->fieldEditable( fldIdx ) );
         }
       }
     }

diff --git a/src/gui/qgsattributeeditor.cpp b/src/gui/qgsattributeeditor.cpp
@@ -1195,6 +1195,6 @@ void QgsStringRelay::changeText( QString str )
   connect( this, SIGNAL( textChanged( QString ) ), sObj, sSlot );
   for ( int i = 0; i < mProxyList.size(); ++i )
   {
-    ( mProxyList[i] )->blockSignals( oldBlockSigs[i] );
+    mProxyList[i]->blockSignals( oldBlockSigs[i] );
   }
 }
diff --git a/src/gui/qgsfilterlineedit.cpp b/src/gui/qgsfilterlineedit.cpp
@@ -59,6 +59,15 @@ void QgsFilterLineEdit::clear()
   setModified( true );
 }
 
+void QgsFilterLineEdit::changeEvent( QEvent *e )
+{
+  QLineEdit::changeEvent( e );
+  if ( !isEnabled() )
+    btnClear->setVisible( false );
+  else
+    btnClear->setVisible( text() != mNullValue );
+}
+
 void QgsFilterLineEdit::toggleClearButton( const QString &text )
 {
   btnClear->setVisible( !isReadOnly() && text != mNullValue );

diff --git a/src/gui/qgsfilterlineedit.h b/src/gui/qgsfilterlineedit.h
@@ -38,6 +38,7 @@ class GUI_EXPORT QgsFilterLineEdit : public QLineEdit
 
   protected:
     void resizeEvent( QResizeEvent * );
+    void changeEvent( QEvent * );
 
   private slots:
     void clear();