bring layerAdded signal back to fix synchronize

vinayan · vinayan · commit 0dcd9ebe8eac · 2013-05-13T17:27:16.000+05:30
diff --git a/src/core/qgsofflineediting.cpp b/src/core/qgsofflineediting.cpp
@@ -51,6 +51,7 @@ extern "C"
 
 QgsOfflineEditing::QgsOfflineEditing()
 {
+   connect( QgsMapLayerRegistry::instance(), SIGNAL( layerWasAdded( QgsMapLayer* ) ), this, SLOT( layerAdded( QgsMapLayer* ) ) );
 }
 
 QgsOfflineEditing::~QgsOfflineEditing()
@@ -558,7 +559,6 @@ void QgsOfflineEditing::copyVectorLayer( QgsVectorLayer* layer, sqlite3* db, con
           emit progressUpdated( featureCount++ );
         }
         sqlExec( db, "COMMIT" );
-        listenStartStopEdits( newLayer );
       }
       else
       {
@@ -1219,8 +1219,15 @@ void QgsOfflineEditing::stopListenFeatureChanges()
            this, SLOT( committedGeometriesChanges( const QString&, const QgsGeometryMap& ) ) );
 }
 
-void QgsOfflineEditing::listenStartStopEdits( QgsVectorLayer *vLayer )
+void QgsOfflineEditing::layerAdded( QgsMapLayer* layer )
 {
-  connect( vLayer, SIGNAL( editingStarted() ), this, SLOT( startListenFeatureChanges() ) );
-  connect( vLayer, SIGNAL( editingStopped() ), this, SLOT( stopListenFeatureChanges() ) );
+  // detect offline layer
+  if ( layer->customProperty( CUSTOM_PROPERTY_IS_OFFLINE_EDITABLE, false ).toBool() )
+  {
+    QgsVectorLayer* vLayer = qobject_cast<QgsVectorLayer *>( layer );
+    connect( vLayer, SIGNAL( editingStarted() ), this, SLOT( startListenFeatureChanges() ) );
+    connect( vLayer, SIGNAL( editingStopped() ), this, SLOT( stopListenFeatureChanges() ) );
+  }
 }
+
+
diff --git a/src/core/qgsofflineediting.h b/src/core/qgsofflineediting.h
@@ -134,9 +134,9 @@ class CORE_EXPORT QgsOfflineEditing : public QObject
     };
     typedef QList<GeometryChange> GeometryChanges;
     GeometryChanges sqlQueryGeometryChanges( sqlite3* db, const QString& sql );
-    void listenStartStopEdits( QgsVectorLayer* vLayer );
 
   private slots:
+    void layerAdded( QgsMapLayer* layer );
     void committedAttributesAdded( const QString& qgisLayerId, const QList<QgsField>& addedAttributes );
     void committedFeaturesAdded( const QString& qgisLayerId, const QgsFeatureList& addedFeatures );
     void committedFeaturesRemoved( const QString& qgisLayerId, const QgsFeatureIds& deletedFeatureIds );

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ extern "C"`
`51`	`51`
`52`	`52`	`QgsOfflineEditing::QgsOfflineEditing()`
`53`	`53`	`{`
	`54`	`+ connect( QgsMapLayerRegistry::instance(), SIGNAL( layerWasAdded( QgsMapLayer* ) ), this, SLOT( layerAdded( QgsMapLayer* ) ) );`
`54`	`55`	`}`
`55`	`56`
`56`	`57`	`QgsOfflineEditing::~QgsOfflineEditing()`
`@@ -558,7 +559,6 @@ void QgsOfflineEditing::copyVectorLayer( QgsVectorLayer* layer, sqlite3* db, con`
`558`	`559`	`emit progressUpdated( featureCount++ );`
`559`	`560`	`}`
`560`	`561`	`sqlExec( db, "COMMIT" );`
`561`		`- listenStartStopEdits( newLayer );`
`562`	`562`	`}`
`563`	`563`	`else`
`564`	`564`	`{`
`@@ -1219,8 +1219,15 @@ void QgsOfflineEditing::stopListenFeatureChanges()`
`1219`	`1219`	`this, SLOT( committedGeometriesChanges( const QString&, const QgsGeometryMap& ) ) );`
`1220`	`1220`	`}`
`1221`	`1221`
`1222`		`-void QgsOfflineEditing::listenStartStopEdits( QgsVectorLayer *vLayer )`
	`1222`	`+void QgsOfflineEditing::layerAdded( QgsMapLayer* layer )`
`1223`	`1223`	`{`
`1224`		`- connect( vLayer, SIGNAL( editingStarted() ), this, SLOT( startListenFeatureChanges() ) );`
`1225`		`- connect( vLayer, SIGNAL( editingStopped() ), this, SLOT( stopListenFeatureChanges() ) );`
	`1224`	`+ // detect offline layer`
	`1225`	`+ if ( layer->customProperty( CUSTOM_PROPERTY_IS_OFFLINE_EDITABLE, false ).toBool() )`
	`1226`	`+ {`
	`1227`	`+ QgsVectorLayer* vLayer = qobject_cast<QgsVectorLayer *>( layer );`
	`1228`	`+ connect( vLayer, SIGNAL( editingStarted() ), this, SLOT( startListenFeatureChanges() ) );`
	`1229`	`+ connect( vLayer, SIGNAL( editingStopped() ), this, SLOT( stopListenFeatureChanges() ) );`
	`1230`	`+ }`
`1226`	`1231`	`}`
	`1232`	`+`
	`1233`	`+`