Show embedded layers in italic

qgis · Jun 8, 2011 · 8bc8d54 · 8bc8d54
1 parent d9c853f
commit 8bc8d54
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/src/app/legend/qgslegend.cpp b/src/app/legend/qgslegend.cpp
@@ -636,6 +636,12 @@ void QgsLegend::addLayer( QgsMapLayer * layer )
   }
 
   QgsLegendLayer* llayer = new QgsLegendLayer( layer );
+  if( !QgsProject::instance()->layerIsEmbedded( layer->id() ).isEmpty() )
+  {
+    QFont itemFont;
+    itemFont.setItalic( true );
+    llayer->setFont( 0, itemFont );
+  }
 
   //set the correct check states
   blockSignals( true );

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -5055,7 +5055,7 @@ void QgisApp::embedLayers()
 
   //hardcoded for debugging
   QString filepath="/home/marco/geodaten/projekte/composertest.qgs";
-  QString id="komb113320110516093016594";
+  QString id="komb113320110531113659299";
 
   QList<QDomNode> brokenNodes;
   QList< QPair< QgsVectorLayer*, QDomElement > > vectorLayerList;

diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -1653,7 +1653,16 @@ bool QgsProject::createEmbeddedLayer( const QString& layerId, const QString& pro
     QString id = mapLayerElem.firstChildElement("id").text();
     if( id == layerId )
     {
-      return addLayer( mapLayerElem, brokenNodes, vectorLayerList );
+      mEmbeddedLayers.insert( layerId, projectFilePath );
+      if( addLayer( mapLayerElem, brokenNodes, vectorLayerList ) )
+      {
+        return true;
+      }
+      else
+      {
+        mEmbeddedLayers.remove( layerId );
+        return false;
+      }
 #if 0
       QString type = mapLayerElem.attribute("type");
       QgsMapLayer* layer = 0;

diff --git a/src/core/qgsproject.h b/src/core/qgsproject.h
@@ -337,7 +337,8 @@ class CORE_EXPORT QgsProject : public QObject
 
     QgsProjectBadLayerHandler* mBadLayerHandler;
 
-    /**Embeded layers which are defined in other projects. Key: layer id, value: project file path*/
+    /**Embeded layers which are defined in other projects. Key: layer id, value: project file path.
+       If the project file path is empty, QgsProject is going to ignore the layer for saving (e.g. because it is part and managed by an embedded group)*/
     QHash< QString, QString > mEmbeddedLayers;
 
 }; // QgsProject