Merge pull request #32472 from troopa81/feature_selectionwidget_in_fe…

…atureselectiondialog Selection widget in feature selection dialog
qgis · Dec 16, 2019 · b42a31e · b42a31e
2 parents 3b4437b + a8f46ac
commit b42a31e
Show file tree

Hide file tree

Showing 18 changed files with 1,275 additions and 826 deletions.
diff --git a/python/core/auto_generated/qgsvectorlayerutils.sip.in b/python/core/auto_generated/qgsvectorlayerutils.sip.in
@@ -291,7 +291,8 @@ The following operations will be performed to convert the input features:
     static QString getFeatureDisplayString( const QgsVectorLayer *layer, const QgsFeature &feature );
 %Docstring
 
-:return: the ``layer`` ``feature`` display string
+:return: a descriptive string for a ``feature``, suitable for displaying to the user.
+         The definition is taken from the ``displayExpression`` property of ``layer``.
 
 .. versionadded:: 3.12
 %End

diff --git a/python/gui/auto_generated/qgsfeatureselectiondlg.sip.in b/python/gui/auto_generated/qgsfeatureselectiondlg.sip.in
@@ -29,7 +29,7 @@ class QgsFeatureSelectionDlg : QDialog
 %End
   public:
 
-    explicit QgsFeatureSelectionDlg( QgsVectorLayer *vl, QgsAttributeEditorContext &context, QWidget *parent /TransferThis/ = 0 );
+    explicit QgsFeatureSelectionDlg( QgsVectorLayer *vl, const QgsAttributeEditorContext &context, QWidget *parent /TransferThis/ = 0 );
 %Docstring
 Constructor for QgsFeatureSelectionDlg
 %End
@@ -50,11 +50,15 @@ Set the selected features
 
   protected:
 
+    virtual void keyPressEvent( QKeyEvent *evt );
+
+
     virtual void showEvent( QShowEvent *event );
 
 %Docstring
 Make sure the dialog does not grow too much
 %End
+
 };
 
 /************************************************************************