Show commit errors in transaction mode

m-kuhn · m-kuhn · commit e0fc641402b7 · 2016-10-18T15:47:42.000+02:00
diff --git a/python/core/qgsproject.sip b/python/core/qgsproject.sip
@@ -467,8 +467,15 @@ class QgsProject : QObject
      */
     void variablesChanged();
 
-  public slots:
+    /**
+     * Emitted whenever a new transaction group has been created or a
+     * transaction group has been removed.
+     *
+     * @note Added in QGIS 3.0
+     */
+    void transactionGroupsChanged();
 
+  public slots:
     /**
      * Flag the project as dirty (modified). If this flag is set, the user will
      * be asked to save changes to the project before closing the current project.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -2773,6 +2773,8 @@ void QgisApp::setupConnections()
   connect( this, SIGNAL( projectRead() ),
            this, SLOT( fileOpenedOKAfterLaunch() ) );
 
+  connect( QgsProject::instance(), &QgsProject::transactionGroupsChanged, this, &QgisApp::onTransactionGroupsChanged );
+
   // connect preview modes actions
   connect( mActionPreviewModeOff, SIGNAL( triggered() ), this, SLOT( disablePreviewMode() ) );
   connect( mActionPreviewModeGrayscale, SIGNAL( triggered() ), this, SLOT( activateGrayscalePreview() ) );
@@ -11201,6 +11203,14 @@ void QgisApp::keyPressEvent( QKeyEvent * e )
   }
 }
 
+void QgisApp::onTransactionGroupsChanged()
+{
+  Q_FOREACH ( QgsTransactionGroup* tg, QgsProject::instance()->transactionGroups().values() )
+  {
+    connect( tg, SIGNAL( commitError( QString ) ), this, SLOT( displayMessage( QString, QString, QgsMessageBar::MessageLevel ) ), Qt::UniqueConnection );
+  }
+}
+
 void QgisApp::startProfile( const QString& name )
 {
   mProfiler->start( name );
diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -726,6 +726,8 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
 #endif
 
   private slots:
+    void onTransactionGroupsChanged();
+
     //! validate a SRS
     void validateCrs( QgsCoordinateReferenceSystem &crs );
 
diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -995,6 +995,8 @@ void QgsProject::onMapLayersAdded( const QList<QgsMapLayer*>& layers )
 {
   QMap<QString, QgsMapLayer*> existingMaps = QgsMapLayerRegistry::instance()->mapLayers();
 
+  bool tgChanged = false;
+
   Q_FOREACH ( QgsMapLayer* layer, layers )
   {
     QgsVectorLayer* vlayer = qobject_cast<QgsVectorLayer*>( layer );
@@ -1013,15 +1015,17 @@ void QgsProject::onMapLayersAdded( const QList<QgsMapLayer*>& layers )
           {
             tg = new QgsTransactionGroup();
             mTransactionGroups.insert( qMakePair( key, connString ), tg );
-
-            connect( tg, SIGNAL( commitError( QString ) ), this, SLOT( displayMapToolMessage( QString ) ) );
+            tgChanged = true;
           }
           tg->addLayer( vlayer );
         }
       }
       vlayer->dataProvider()->setProviderProperty( QgsVectorDataProvider::EvaluateDefaultValues, evaluateDefaultValues() );
     }
 
+    if ( tgChanged )
+      emit transactionGroupsChanged();
+
     connect( layer, SIGNAL( configChanged() ), this, SLOT( setDirty() ) );
 
     // check if we have to update connections for layers with dependencies
@@ -1039,18 +1043,22 @@ void QgsProject::onMapLayersAdded( const QList<QgsMapLayer*>& layers )
 
 void QgsProject::cleanTransactionGroups( bool force )
 {
+  bool changed = false;
   for ( QMap< QPair< QString, QString>, QgsTransactionGroup*>::Iterator tg = mTransactionGroups.begin(); tg != mTransactionGroups.end(); )
   {
     if ( tg.value()->isEmpty() || force )
     {
       delete tg.value();
       tg = mTransactionGroups.erase( tg );
+      changed = true;
     }
     else
     {
       ++tg;
     }
   }
+  if ( changed )
+    emit transactionGroupsChanged();
 }
 
 bool QgsProject::read( QDomNode &layerNode )
diff --git a/src/core/qgsproject.h b/src/core/qgsproject.h
@@ -513,9 +513,11 @@ class CORE_EXPORT QgsProject : public QObject, public QgsExpressionContextGenera
     //! emitted when an old project file is read.
     void oldProjectVersionWarning( const QString& );
 
-    //! emitted when a layer from a projects was read
-    // @param i current layer
-    // @param n number of layers
+    /**
+     * Emitted when a layer from a projects was read.
+     * @param i current layer
+     * @param n number of layers
+     */
     void layerLoaded( int i, int n );
 
     void loadingLayer( const QString& );
@@ -536,8 +538,15 @@ class CORE_EXPORT QgsProject : public QObject, public QgsExpressionContextGenera
      */
     void variablesChanged();
 
-  public slots:
+    /**
+     * Emitted whenever a new transaction group has been created or a
+     * transaction group has been removed.
+     *
+     * @note Added in QGIS 3.0
+     */
+    void transactionGroupsChanged();
 
+  public slots:
     /**
      * Flag the project as dirty (modified). If this flag is set, the user will
      * be asked to save changes to the project before closing the current project.

Original file line number	Diff line number	Diff line change
`@@ -995,6 +995,8 @@ void QgsProject::onMapLayersAdded( const QList<QgsMapLayer*>& layers )`
`995`	`995`	`{`
`996`	`996`	`QMap<QString, QgsMapLayer*> existingMaps = QgsMapLayerRegistry::instance()->mapLayers();`
`997`	`997`
	`998`	`+ bool tgChanged = false;`
	`999`	`+`
`998`	`1000`	`Q_FOREACH ( QgsMapLayer* layer, layers )`
`999`	`1001`	`{`
`1000`	`1002`	`QgsVectorLayer* vlayer = qobject_cast<QgsVectorLayer*>( layer );`
`@@ -1013,15 +1015,17 @@ void QgsProject::onMapLayersAdded( const QList<QgsMapLayer*>& layers )`
`1013`	`1015`	`{`
`1014`	`1016`	`tg = new QgsTransactionGroup();`
`1015`	`1017`	`mTransactionGroups.insert( qMakePair( key, connString ), tg );`
`1016`		`-`
`1017`		`- connect( tg, SIGNAL( commitError( QString ) ), this, SLOT( displayMapToolMessage( QString ) ) );`
	`1018`	`+ tgChanged = true;`
`1018`	`1019`	`}`
`1019`	`1020`	`tg->addLayer( vlayer );`
`1020`	`1021`	`}`
`1021`	`1022`	`}`
`1022`	`1023`	`vlayer->dataProvider()->setProviderProperty( QgsVectorDataProvider::EvaluateDefaultValues, evaluateDefaultValues() );`
`1023`	`1024`	`}`
`1024`	`1025`
	`1026`	`+ if ( tgChanged )`
	`1027`	`+ emit transactionGroupsChanged();`
	`1028`	`+`
`1025`	`1029`	`connect( layer, SIGNAL( configChanged() ), this, SLOT( setDirty() ) );`
`1026`	`1030`
`1027`	`1031`	`// check if we have to update connections for layers with dependencies`
`@@ -1039,18 +1043,22 @@ void QgsProject::onMapLayersAdded( const QList<QgsMapLayer*>& layers )`
`1039`	`1043`
`1040`	`1044`	`void QgsProject::cleanTransactionGroups( bool force )`
`1041`	`1045`	`{`
	`1046`	`+ bool changed = false;`
`1042`	`1047`	`for ( QMap< QPair< QString, QString>, QgsTransactionGroup*>::Iterator tg = mTransactionGroups.begin(); tg != mTransactionGroups.end(); )`
`1043`	`1048`	`{`
`1044`	`1049`	`if ( tg.value()->isEmpty() \|\| force )`
`1045`	`1050`	`{`
`1046`	`1051`	`delete tg.value();`
`1047`	`1052`	`tg = mTransactionGroups.erase( tg );`
	`1053`	`+ changed = true;`
`1048`	`1054`	`}`
`1049`	`1055`	`else`
`1050`	`1056`	`{`
`1051`	`1057`	`++tg;`
`1052`	`1058`	`}`
`1053`	`1059`	`}`
	`1060`	`+ if ( changed )`
	`1061`	`+ emit transactionGroupsChanged();`
`1054`	`1062`	`}`
`1055`	`1063`
`1056`	`1064`	`bool QgsProject::read( QDomNode &layerNode )`