Merge pull request #8114 from signedav/bugfix_not_deleting_relation

m-kuhn · web-flow · commit 8fc43780dc42 · 2018-10-29T09:52:41.000+01:00
More intuitive relation reference widget text filter
diff --git a/python/gui/auto_generated/qgsfilterlineedit.sip.in b/python/gui/auto_generated/qgsfilterlineedit.sip.in
@@ -268,6 +268,8 @@ Will select all text when this widget receives the focus.
   protected:
     virtual void focusInEvent( QFocusEvent *e );
 
+    virtual void mouseReleaseEvent( QMouseEvent *e );
+
 
 };
 
diff --git a/src/gui/qgsfeaturelistcombobox.cpp b/src/gui/qgsfeaturelistcombobox.cpp
@@ -51,8 +51,10 @@ QgsFeatureListComboBox::QgsFeatureListComboBox( QWidget *parent )
 
   connect( this, static_cast<void( QgsFeatureListComboBox::* )( int )>( &QgsFeatureListComboBox::currentIndexChanged ), this, &QgsFeatureListComboBox::onCurrentIndexChanged );
 
-  mLineEdit = new QgsFilterLineEdit();
+  mLineEdit = new QgsFilterLineEdit( nullptr, QgsApplication::nullRepresentation() );
   mLineEdit->setSelectOnFocus( true );
+  mLineEdit->setShowClearButton( true );
+
   setEditable( true );
   setLineEdit( mLineEdit );
   setModel( mModel );
@@ -109,7 +111,8 @@ void QgsFeatureListComboBox::onItemSelected( const QModelIndex &index )
 
 void QgsFeatureListComboBox::onCurrentIndexChanged( int i )
 {
-  mIsCurrentlyEdited = false;
+  if ( !mHasStoredEditState )
+    mIsCurrentlyEdited = false;
   QModelIndex modelIndex = mModel->index( i, 0, QModelIndex() );
   mModel->setExtraIdentifierValue( mModel->data( modelIndex, QgsFeatureFilterModel::IdentifierValueRole ) );
   mLineEdit->setText( mModel->data( modelIndex, QgsFeatureFilterModel::ValueRole ).toString() );
@@ -128,13 +131,19 @@ void QgsFeatureListComboBox::onActivated( QModelIndex modelIndex )
 void QgsFeatureListComboBox::storeLineEditState()
 {
   if ( mIsCurrentlyEdited )
+  {
+    mHasStoredEditState = true;
     mLineEditState.store( mLineEdit );
+  }
 }
 
 void QgsFeatureListComboBox::restoreLineEditState()
 {
   if ( mIsCurrentlyEdited )
+  {
+    mHasStoredEditState = false;
     mLineEditState.restore( mLineEdit );
+  }
 }
 
 int QgsFeatureListComboBox::nullIndex() const
diff --git a/src/gui/qgsfeaturelistcombobox.h b/src/gui/qgsfeaturelistcombobox.h
@@ -219,7 +219,10 @@ class GUI_EXPORT QgsFeatureListComboBox : public QComboBox
     QgsFilterLineEdit *mLineEdit;
     bool mPopupRequested = false;
     bool mIsCurrentlyEdited = false;
+    bool mHasStoredEditState = false;
     LineEditState mLineEditState;
+
+    friend class TestQgsFeatureListComboBox;
 };
 
 #endif // QGSFIELDLISTCOMBOBOX_H
diff --git a/src/gui/qgsfilterlineedit.cpp b/src/gui/qgsfilterlineedit.cpp
@@ -90,6 +90,16 @@ void QgsFilterLineEdit::focusInEvent( QFocusEvent *e )
   if ( e->reason() == Qt::MouseFocusReason && ( isNull() || mSelectOnFocus ) )
   {
     mFocusInEvent = true;
+    mWaitingForMouseRelease = true;
+  }
+}
+
+void QgsFilterLineEdit::mouseReleaseEvent( QMouseEvent *e )
+{
+  QLineEdit::mouseReleaseEvent( e );
+  if ( mWaitingForMouseRelease )
+  {
+    mWaitingForMouseRelease = false;
     selectAll();
   }
 }
@@ -198,7 +208,7 @@ bool QgsFilterLineEdit::shouldShowClear() const
 
 bool QgsFilterLineEdit::event( QEvent *event )
 {
-  if ( event->type() == QEvent::ReadOnlyChange )
+  if ( event->type() == QEvent::ReadOnlyChange || event->type() == QEvent::EnabledChange )
     updateClearIcon();
 
   return QLineEdit::event( event );;
diff --git a/src/gui/qgsfilterlineedit.h b/src/gui/qgsfilterlineedit.h
@@ -265,6 +265,7 @@ class GUI_EXPORT QgsFilterLineEdit : public QLineEdit
 
   protected:
     void focusInEvent( QFocusEvent *e ) override;
+    void mouseReleaseEvent( QMouseEvent *e ) override;
 
   private slots:
     void onTextChanged( const QString &text );
@@ -286,12 +287,15 @@ class GUI_EXPORT QgsFilterLineEdit : public QLineEdit
     QString mDefaultValue;
     QString mStyleSheet;
     bool mFocusInEvent = false;
+    bool mWaitingForMouseRelease = false;
     bool mSelectOnFocus = false;
 
     QgsAnimatedIcon *mBusySpinnerAnimatedIcon = nullptr;
 
     //! Returns true if clear button should be shown
     bool shouldShowClear() const;
+
+    friend class TestQgsFeatureListComboBox;
 };
 
 /// @cond PRIVATE
diff --git a/tests/src/gui/testqgsfeaturelistcombobox.cpp b/tests/src/gui/testqgsfeaturelistcombobox.cpp
@@ -18,6 +18,7 @@
 
 #include "qgsapplication.h"
 #include "qgsfeaturelistcombobox.h"
+#include "qgsfilterlineedit.h"
 #include "qgsvectorlayer.h"
 #include "qgsfeaturefiltermodel.h"
 #include "qgsgui.h"
@@ -26,6 +27,8 @@
 
 #include <QLineEdit>
 
+class QgsFilterLineEdit;
+
 class TestQgsFeatureListComboBox : public QObject
 {
     Q_OBJECT
@@ -41,12 +44,15 @@ class TestQgsFeatureListComboBox : public QObject
     void testSetGetLayer();
     void testSetGetForeignKey();
     void testAllowNull();
+    void testValuesAndSelection();
     void nullRepresentation();
 
   private:
     void waitForLoaded( QgsFeatureListComboBox *cb );
 
     std::unique_ptr<QgsVectorLayer> mLayer;
+
+    friend class QgsFeatureListComboBox;
 };
 
 void TestQgsFeatureListComboBox::initTestCase()
@@ -137,6 +143,46 @@ void TestQgsFeatureListComboBox::testAllowNull()
   // Note to self: implement this!
 }
 
+void TestQgsFeatureListComboBox::testValuesAndSelection()
+{
+  QgsApplication::setNullRepresentation( QStringLiteral( "nope" ) );
+  std::unique_ptr<QgsFeatureListComboBox> cb( new QgsFeatureListComboBox() );
+
+  cb->setSourceLayer( mLayer.get() );
+  cb->setDisplayExpression( QStringLiteral( "\"raccord\"" ) );
+  cb->setAllowNull( true );
+
+  //check if everything is fine:
+  waitForLoaded( cb.get() );
+  QCOMPARE( cb->currentIndex(), cb->nullIndex() );
+  QCOMPARE( cb->currentText(), QStringLiteral( "nope" ) );
+
+  //check if text correct, selected and if the clear button disappeared:
+  cb->mLineEdit->clearValue();
+  waitForLoaded( cb.get() );
+  QCOMPARE( cb->currentIndex(), cb->nullIndex() );
+  QCOMPARE( cb->currentText(), QStringLiteral( "nope" ) );
+  QCOMPARE( cb->lineEdit()->selectedText(), QStringLiteral( "nope" ) );
+  QVERIFY( ! cb->mLineEdit->mClearAction );
+
+  //check if text is selected after receiving focus
+  cb->setFocus();
+  waitForLoaded( cb.get() );
+  QCOMPARE( cb->currentIndex(), cb->nullIndex() );
+  QCOMPARE( cb->currentText(), QStringLiteral( "nope" ) );
+  QCOMPARE( cb->lineEdit()->selectedText(), QStringLiteral( "nope" ) );
+  QVERIFY( ! cb->mLineEdit->mClearAction );
+
+  //check with another entry, clear button needs to be there then:
+  QTest::keyClicks( cb.get(), QStringLiteral( "sleeve" ) );
+  //QTest::keyClick(cb.get(), Qt::Key_Enter );
+  waitForLoaded( cb.get() );
+  QCOMPARE( cb->currentText(), QStringLiteral( "sleeve" ) );
+  QVERIFY( cb->mLineEdit->mClearAction );
+  //QVERIFY( cb->currentIndex() != cb->nullIndex());
+  //QCOMPARE( cb->model()->data( cb->currentModelIndex() ).toString(), QStringLiteral( "sleeve" )  );
+}
+
 void TestQgsFeatureListComboBox::nullRepresentation()
 {
 
diff --git a/tests/src/python/test_qgsfilterlineedit.py b/tests/src/python/test_qgsfilterlineedit.py
@@ -119,6 +119,18 @@ def testClearToDefault(self):
         self.assertEqual(w.text(), 'def')
         self.assertFalse(w.isNull())
 
+    def test_selectedText(self):
+        """ test that NULL value is selected on focus and not-null value is not"""
+        w = qgis.gui.QgsFilterLineEdit(nullValue='my_null_value')
+        w.clearValue()
+        self.assertEqual(w.selectedText(), 'my_null_value')
+
+        w.setValue('my new value')
+        self.assertEqual(w.selectedText(), '')
+
+        w.clearValue()
+        self.assertEqual(w.selectedText(), 'my_null_value')
+
     @unittest.skipIf(not use_signal_spy, "No QSignalSpy available")
     def test_ChangedSignals(self):
         """ test that signals are correctly emitted when clearing"""

Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,16 @@ void QgsFilterLineEdit::focusInEvent( QFocusEvent *e )`
`90`	`90`	`if ( e->reason() == Qt::MouseFocusReason && ( isNull() \|\| mSelectOnFocus ) )`
`91`	`91`	`{`
`92`	`92`	`mFocusInEvent = true;`
	`93`	`+ mWaitingForMouseRelease = true;`
	`94`	`+ }`
	`95`	`+}`
	`96`	`+`
	`97`	`+void QgsFilterLineEdit::mouseReleaseEvent( QMouseEvent *e )`
	`98`	`+{`
	`99`	`+ QLineEdit::mouseReleaseEvent( e );`
	`100`	`+ if ( mWaitingForMouseRelease )`
	`101`	`+ {`
	`102`	`+ mWaitingForMouseRelease = false;`
`93`	`103`	`selectAll();`
`94`	`104`	`}`
`95`	`105`	`}`
`@@ -198,7 +208,7 @@ bool QgsFilterLineEdit::shouldShowClear() const`
`198`	`208`
`199`	`209`	`bool QgsFilterLineEdit::event( QEvent *event )`
`200`	`210`	`{`
`201`		`- if ( event->type() == QEvent::ReadOnlyChange )`
	`211`	`+ if ( event->type() == QEvent::ReadOnlyChange \|\| event->type() == QEvent::EnabledChange )`
`202`	`212`	`updateClearIcon();`
`203`	`213`
`204`	`214`	`return QLineEdit::event( event );;`