[fix #11300] make edit form non modal on feature creation too

3nids · 3nids · commit c5652a52e252 · 2014-10-02T17:38:29.000+02:00
diff --git a/src/app/qgsfeatureaction.cpp b/src/app/qgsfeatureaction.cpp
@@ -128,7 +128,7 @@ bool QgsFeatureAction::editFeature( bool showModal )
   return true;
 }
 
-bool QgsFeatureAction::addFeature( const QgsAttributeMap& defaultAttributes )
+bool QgsFeatureAction::addFeature( const QgsAttributeMap& defaultAttributes, bool showModal )
 {
   if ( !mLayer || !mLayer->isEditable() )
     return false;
@@ -194,7 +194,15 @@ bool QgsFeatureAction::addFeature( const QgsAttributeMap& defaultAttributes )
 
     connect( dialog->attributeForm(), SIGNAL( featureSaved( QgsFeature ) ), this, SLOT( onFeatureSaved( QgsFeature ) ) );
 
-    dialog->exec();
+    if ( showModal )
+    {
+      dialog->exec();
+    }
+    else
+    {
+      dialog->show();
+      return true;
+    }
   }
 
   // Will be set in the onFeatureSaved SLOT
diff --git a/src/app/qgsfeatureaction.h b/src/app/qgsfeatureaction.h
@@ -48,9 +48,9 @@ class APP_EXPORT QgsFeatureAction : public QAction
      *
      * @param defaultAttributes  Provide some default attributes here if desired.
      *
-     * @return true if feature was added
+     * @return true if feature was added if showModal is true. If showModal is false, returns true in every case
      */
-    bool addFeature( const QgsAttributeMap& defaultAttributes = QgsAttributeMap() );
+    bool addFeature(const QgsAttributeMap& defaultAttributes = QgsAttributeMap() , bool showModal = true );
 
   private slots:
     void onFeatureSaved( const QgsFeature& feature );
diff --git a/src/app/qgsmaptooladdfeature.cpp b/src/app/qgsmaptooladdfeature.cpp
@@ -38,10 +38,10 @@ QgsMapToolAddFeature::~QgsMapToolAddFeature()
 {
 }
 
-bool QgsMapToolAddFeature::addFeature( QgsVectorLayer *vlayer, QgsFeature *f )
+bool QgsMapToolAddFeature::addFeature(QgsVectorLayer *vlayer, QgsFeature *f, bool showModal )
 {
   QgsFeatureAction action( tr( "add feature" ), *f, vlayer, -1, -1, this );
-  return action.addFeature();
+  return action.addFeature( QgsAttributeMap(), showModal );
 }
 
 void QgsMapToolAddFeature::activate()
@@ -50,7 +50,7 @@ void QgsMapToolAddFeature::activate()
   if ( vlayer && vlayer->geometryType() == QGis::NoGeometry )
   {
     QgsFeature f;
-    addFeature( vlayer, &f );
+    addFeature( vlayer, &f, false );
     return;
   }
 
@@ -138,7 +138,7 @@ void QgsMapToolAddFeature::canvasReleaseEvent( QMouseEvent * e )
 
       f.setGeometry( g );
 
-      addFeature( vlayer, &f );
+      addFeature( vlayer, &f, false );
 
       mCanvas->refresh();
     }
@@ -285,7 +285,7 @@ void QgsMapToolAddFeature::canvasReleaseEvent( QMouseEvent * e )
         }
       }
 
-      if ( addFeature( vlayer, f ) )
+      if ( addFeature( vlayer, f, false ) )
       {
         //add points to other features to keep topology up-to-date
         int topologicalEditing = QgsProject::instance()->readNumEntry( "Digitizing", "/TopologicalEditing", 0 );
diff --git a/src/app/qgsmaptooladdfeature.h b/src/app/qgsmaptooladdfeature.h
@@ -25,6 +25,6 @@ class APP_EXPORT QgsMapToolAddFeature : public QgsMapToolCapture
     virtual ~QgsMapToolAddFeature();
     void canvasReleaseEvent( QMouseEvent * e );
 
-    bool addFeature( QgsVectorLayer *vlayer, QgsFeature *f );
+    bool addFeature(QgsVectorLayer *vlayer, QgsFeature *f , bool showModal = true );
     void activate();
 };

Original file line number	Diff line number	Diff line change
`@@ -48,9 +48,9 @@ class APP_EXPORT QgsFeatureAction : public QAction`
`48`	`48`	`*`
`49`	`49`	`* @param defaultAttributes Provide some default attributes here if desired.`
`50`	`50`	`*`
`51`		`- * @return true if feature was added`
	`51`	`+ * @return true if feature was added if showModal is true. If showModal is false, returns true in every case`
`52`	`52`	`*/`
`53`		`- bool addFeature( const QgsAttributeMap& defaultAttributes = QgsAttributeMap() );`
	`53`	`+ bool addFeature(const QgsAttributeMap& defaultAttributes = QgsAttributeMap() , bool showModal = true );`
`54`	`54`
`55`	`55`	`private slots:`
`56`	`56`	`void onFeatureSaved( const QgsFeature& feature );`
Original file line number	Diff line number	Diff line change
`@@ -38,10 +38,10 @@ QgsMapToolAddFeature::~QgsMapToolAddFeature()`
`38`	`38`	`{`
`39`	`39`	`}`
`40`	`40`
`41`		`-bool QgsMapToolAddFeature::addFeature( QgsVectorLayer vlayer, QgsFeature f )`
	`41`	`+bool QgsMapToolAddFeature::addFeature(QgsVectorLayer vlayer, QgsFeature f, bool showModal )`
`42`	`42`	`{`
`43`	`43`	`QgsFeatureAction action( tr( "add feature" ), *f, vlayer, -1, -1, this );`
`44`		`- return action.addFeature();`
	`44`	`+ return action.addFeature( QgsAttributeMap(), showModal );`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`void QgsMapToolAddFeature::activate()`
`@@ -50,7 +50,7 @@ void QgsMapToolAddFeature::activate()`
`50`	`50`	`if ( vlayer && vlayer->geometryType() == QGis::NoGeometry )`
`51`	`51`	`{`
`52`	`52`	`QgsFeature f;`
`53`		`- addFeature( vlayer, &f );`
	`53`	`+ addFeature( vlayer, &f, false );`
`54`	`54`	`return;`
`55`	`55`	`}`
`56`	`56`
`@@ -138,7 +138,7 @@ void QgsMapToolAddFeature::canvasReleaseEvent( QMouseEvent * e )`
`138`	`138`
`139`	`139`	`f.setGeometry( g );`
`140`	`140`
`141`		`- addFeature( vlayer, &f );`
	`141`	`+ addFeature( vlayer, &f, false );`
`142`	`142`
`143`	`143`	`mCanvas->refresh();`
`144`	`144`	`}`
`@@ -285,7 +285,7 @@ void QgsMapToolAddFeature::canvasReleaseEvent( QMouseEvent * e )`
`285`	`285`	`}`
`286`	`286`	`}`
`287`	`287`
`288`		`- if ( addFeature( vlayer, f ) )`
	`288`	`+ if ( addFeature( vlayer, f, false ) )`
`289`	`289`	`{`
`290`	`290`	`//add points to other features to keep topology up-to-date`
`291`	`291`	`int topologicalEditing = QgsProject::instance()->readNumEntry( "Digitizing", "/TopologicalEditing", 0 );`