pass QgsAttributeEditorContext from QgisApp

qgis · Jul 1, 2020 · a360f53 · a360f53
1 parent 059f9fa
commit a360f53
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -10214,7 +10214,14 @@ void QgisApp::pasteFromClipboard( QgsMapLayer *destinationLayer )
     {
       newFeatures.clear();
 
-      QgsFixAttributeDialog *dialog = new QgsFixAttributeDialog( pasteVectorLayer, invalidFeatures, this );
+      QgsAttributeEditorContext context( createAttributeEditorContext() );
+      context.setAllowCustomUi( false );
+      context.setFormMode( QgsAttributeEditorContext::StandaloneDialog );
+      context.setVectorLayerTools( mVectorLayerTools );
+      context.setCadDockWidget( mAdvancedDigitizingDockWidget );
+      context.setMapCanvas( mMapCanvas );
+
+      QgsFixAttributeDialog *dialog = new QgsFixAttributeDialog( pasteVectorLayer, invalidFeatures, this, context );
       int feedback = dialog->exec();
 
       switch ( feedback )

diff --git a/src/app/qgsfixattributedialog.cpp b/src/app/qgsfixattributedialog.cpp
@@ -20,21 +20,19 @@
 
 #include <QtWidgets/QPushButton>
 
-QgsFixAttributeDialog::QgsFixAttributeDialog( QgsVectorLayer *vl, QgsFeatureList &features, QWidget *parent )
+
+QgsFixAttributeDialog::QgsFixAttributeDialog( QgsVectorLayer *vl, QgsFeatureList &features, QWidget *parent, const QgsAttributeEditorContext &context )
   : QDialog( parent )
   , mFeatures( features )
 {
-  init( vl );
+  init( vl, context );
 }
 
-void QgsFixAttributeDialog::init( QgsVectorLayer *layer )
+void QgsFixAttributeDialog::init( QgsVectorLayer *layer, const QgsAttributeEditorContext &context )
 {
-  QgsAttributeEditorContext context;
   setWindowTitle( tr( "%1 - Fix Pasted Features" ).arg( layer->name() ) );
   setLayout( new QGridLayout() );
   layout()->setMargin( 0 );
-  context.setFormMode( QgsAttributeEditorContext::StandaloneDialog );
-  context.setVectorLayerTools( QgisApp::instance()->vectorLayerTools() );
 
   mUnfixedFeatures = mFeatures;
   mCurrentFeature = mFeatures.begin();

diff --git a/src/app/qgsfixattributedialog.h b/src/app/qgsfixattributedialog.h
@@ -52,7 +52,7 @@ class APP_EXPORT QgsFixAttributeDialog : public QDialog
     /**
      * Constructor for QgsFixAttributeDialog
      */
-    QgsFixAttributeDialog( QgsVectorLayer *vl, QgsFeatureList &features, QWidget *parent SIP_TRANSFERTHIS = nullptr );
+    QgsFixAttributeDialog( QgsVectorLayer *vl, QgsFeatureList &features, QWidget *parent SIP_TRANSFERTHIS = nullptr, const QgsAttributeEditorContext &context = QgsAttributeEditorContext() );
 
     /**
      * Returns fixed features
@@ -69,7 +69,7 @@ class APP_EXPORT QgsFixAttributeDialog : public QDialog
     void reject() override;
 
   private:
-    void init( QgsVectorLayer *layer );
+    void init( QgsVectorLayer *layer, const QgsAttributeEditorContext &context );
     QString descriptionText();
 
     QgsFeatureList mFeatures;