[QGIS Commit] r12594 - trunk/qgis/src/app/legend

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-12-23 08:32:58 -0500 (Wed, 23 Dec 2009)
New Revision: 12594

Modified:
   trunk/qgis/src/app/legend/qgslegend.cpp
   trunk/qgis/src/app/legend/qgslegendlayer.cpp
Log:
followup r12593

Modified: trunk/qgis/src/app/legend/qgslegend.cpp
===================================================================
--- trunk/qgis/src/app/legend/qgslegend.cpp	2009-12-23 13:01:48 UTC (rev 12593)
+++ trunk/qgis/src/app/legend/qgslegend.cpp	2009-12-23 13:32:58 UTC (rev 12594)
@@ -504,9 +504,6 @@
 
   QgsLegendLayer* llayer = new QgsLegendLayer( layer );
 
-  llayer->updateIcon();
-  llayer->setToolTip( 0, layer->publicSource() );
-
   //set the correct check states
   blockSignals( true );
   if ( llayer->isVisible() )
@@ -1045,20 +1042,8 @@
   // load layer's visibility and 'show in overview' flag
   ll->setInOverview( atoi( fileElem.attribute( "isInOverview" ).toUtf8() ) );
 
-  //set the layer type icon
-  ll->updateIcon();
-  ll->setToolTip( 0, theMapLayer->publicSource() );
-
-  // setup connections that will update the layer icons
-  if ( qobject_cast<QgsVectorLayer *>( theMapLayer ) )
-  {
-    QgsDebugMsg( "Connecting signals for updating icons, layer " + theMapLayer->name() );
-    connect( theMapLayer, SIGNAL( editingStarted() ), ll, SLOT( updateIcon() ) );
-    connect( theMapLayer, SIGNAL( editingStopped() ), ll, SLOT( updateIcon() ) );
-  }
-
   // expanded or collapsed
-  isOpen = ( childelem.attribute( "open" ) == "true" );
+  isOpen = childelem.attribute( "open" ) == "true";
 
   //set the checkbox of the legend layer to the right state
   blockSignals( true );

Modified: trunk/qgis/src/app/legend/qgslegendlayer.cpp
===================================================================
--- trunk/qgis/src/app/legend/qgslegendlayer.cpp	2009-12-23 13:01:48 UTC (rev 12593)
+++ trunk/qgis/src/app/legend/qgslegendlayer.cpp	2009-12-23 13:32:58 UTC (rev 12594)
@@ -85,6 +85,9 @@
     connect( layer, SIGNAL( editingStopped() ), this, SLOT( updateIcon() ) );
   }
   connect( layer, SIGNAL( layerNameChanged() ), this, SLOT( layerNameChanged() ) );
+
+  updateIcon();
+  setToolTip( 0, layer->publicSource() );
 }
 
 QgsLegendLayer::~QgsLegendLayer()