src/app/CMakeLists.txt

@@ -134,9 +134,6 @@ SET(QGIS_APP_SRCS
   legend/qgsapplegendinterface.cpp
   legend/qgslegenditem.cpp
   legend/qgslegendlayer.cpp
-  legend/qgslegendpropertygroup.cpp
-  legend/qgslegendpropertyitem.cpp
-  legend/qgslegendsymbologygroup.cpp
   legend/qgslegendsymbologyitem.cpp
   legend/qgslayerorder.cpp
 

src/app/legend/qgslegend.cpp

@@ -22,7 +22,6 @@
 #include "qgslegend.h"
 #include "qgslegendgroup.h"
 #include "qgslegendlayer.h"
-#include "qgslegendpropertygroup.h"
 #include "qgslegendsymbologyitem.h"
 #include "qgsmapcanvas.h"
 #include "qgsmapcanvasmap.h"
@@ -182,8 +181,9 @@ void QgsLegend::showItem( QString msg, QTreeWidgetItem *item )
 
 void QgsLegend::handleCurrentItemChanged( QTreeWidgetItem* current, QTreeWidgetItem* previous )
 {
-  Q_UNUSED( current );
-  Q_UNUSED( previous );
+  if ( legendLayerForItem( current ) == legendLayerForItem( previous ) )
+    return; // do not re-emit signal when not necessary
+
   QgsMapLayer *layer = currentLayer();
 
   if ( mMapCanvas )
@@ -1215,7 +1215,12 @@ void QgsLegend::setLayerVisible( QgsMapLayer * layer, bool visible )
 
 QgsLegendLayer* QgsLegend::currentLegendLayer()
 {
-  QgsLegendItem* citem = dynamic_cast<QgsLegendItem *>( currentItem() );
+  return legendLayerForItem( currentItem() );
+}
+
+QgsLegendLayer* QgsLegend::legendLayerForItem( QTreeWidgetItem* item )
+{
+  QgsLegendItem* citem = dynamic_cast<QgsLegendItem *>( item );
 
   if ( citem )
   {
@@ -1994,8 +1999,7 @@ bool QgsLegend::readXML( QgsLegendGroup *parent, const QDomNode &node )
         }
         else if ( childelem.tagName() == "propertygroup" )
         {
-          QgsLegendPropertyGroup* thePropertyGroup = new QgsLegendPropertyGroup( currentLayer, "Properties" );
-          setItemExpanded( thePropertyGroup, childelem.attribute( "open" ) == "true" );
+          // not used
         }
         else
         {

src/app/legend/qgslegend.h

@@ -86,17 +86,10 @@ struct LegendLayerAction
                         1 or more files can share the same symbology and properties
                         and be treated as they are one layer for things such as hiding /
                         showing, scale dependent visibility etc.</li>
-   <li>QgsLegendSymbologyGroup - a collabsable node that contains symbology items. Can
-                                only exist inside of a QgsLegendLayer</li>
    <li>QgsLegendSymbologyItem - a class break (vector) or pallette entry (raster) etc.
                                 Double clicking on a symbology item will let you change
                                 the properties for only that specific item. Can only exist
-                                inside a symbology group.</li>
-   <li>QgsLegendPropertyGroup - a collapsable node that shows 1 or more properties. Can
-                                only exist inside of a QgsLegendLayer</li>
-   <li>QgsLegendPropertyItem - A list of properties related to the layer. Double clicking
-                              a property item will invoke a dialog that will let you change
-                              the property settings. Can only exist inside a property group</li>
+                                inside a legend layer.</li>
    </ul>
    @note Additional group types may be defined in the future to accommodate WMS, PostGIS etc layers.
    @author Gary E.Sherman, Tim Sutton, Marco Hugentobler and Jens Oberender
@@ -122,6 +115,9 @@ class QgsLegend : public QTreeWidget
     //! Destructor
     ~QgsLegend();
 
+    /** Returns QgsLegendLayer accosiated with given item */
+    QgsLegendLayer* legendLayerForItem( QTreeWidgetItem* item );
+
     /** Returns QgsLegendLayer associated with current layer */
     QgsLegendLayer* currentLegendLayer();
 
@@ -426,7 +422,7 @@ class QgsLegend : public QTreeWidget
      * <li>Groups can be nested by dropping them into each other,</li>
      * <li>Each group can have one or more layers</li>
      * <li>Layers can be ordered by dragging them above or below another layer.</li>
-     * <li>The order for QgsLegendSymbologyGroup, QgsLegendPropertyGroup and QgsLegendLayerGroup
+     * <li>The order for QgsLegendLayerGroup
      * is predefined to sort in that order.</li>
      * </ul>
      * @note Overrides method of the same name in the QListView class.

src/app/legend/qgslegenditem.h

@@ -21,8 +21,6 @@
 class QgsLegend;
 class QgsLegendGroup;
 class QgsLegendLayer;
-class QgsLegendPropertyGroup;
-class QgsLegendPropertyItem;
 
 /**
 This is an abstract base class that all qgis legen items inerit from

src/app/legend/qgslegendlayer.h

@@ -21,7 +21,6 @@
 #include "qgsmapcanvas.h"
 
 class QgsLegendLayer;
-class QgsLegendPropertyGroup;
 class QgsMapLayer;
 class QgsRasterLayer;
 class QgsVectorLayer;