[FEATURE] Merge of legend refactoring work

This replaces the existing tree widget implementation with more modular approach. In summary:
- tree hierarchy in CORE library: QgsLayerTreeNode, QgsLayerTreeLayer, QgsLayerTreeGroup
- model/view based tree view: QgsLayerTreeModel, QgsLayerTreeView
- tree synchronization with map layer registry: QgsLayerTreeRegistryBridge
- controlling of map canvas: QgsLayerTreeCanvasBridge

Conflicts:
	src/ui/qgisapp.ui

Author: wonder-sk

python/CMakeLists.txt

@@ -86,6 +86,7 @@ INCLUDE_DIRECTORIES(
   ../src/gui/attributetable
   ../src/gui/editorwidgets
   ../src/gui/editorwidgets/core
+  ../src/gui/layertree
 
   ${CMAKE_BINARY_DIR}  # qgsconfig.h, qgsversion.h
 )

python/gui/gui.sip

@@ -76,6 +76,7 @@
 %Include qgsrubberband.sip
 %Include qgsscalecombobox.sip
 %Include qgsscalerangewidget.sip
+%Include qgsscalevisibilitydialog.sip
 %Include qgssearchquerybuilder.sip
 %Include qgstextannotationitem.sip
 %Include qgsvertexmarker.sip
@@ -146,3 +147,5 @@
 %Include editorwidgets/core/qgseditorwidgetfactory.sip
 %Include editorwidgets/core/qgseditorwidgetregistry.sip
 %Include editorwidgets/core/qgseditorwidgetwrapper.sip
+
+%Include layertree/qgslayertreeview.sip

python/gui/qgisinterface.sip

@@ -32,6 +32,8 @@ class QgisInterface : QObject
 
     virtual QgsPluginManagerInterface* pluginManagerInterface() = 0;
 
+    virtual QgsLayerTreeView* layerTreeView() = 0;
+
   public slots: // TODO: do these functions really need to be slots?
 
     /* Exposed functions */

python/gui/qgsscalevisibilitydialog.sip

@@ -0,0 +1,30 @@
+class QgsScaleVisibilityDialog : QObject
+{
+%TypeHeaderCode
+#include <qgsscalevisibilitydialog.h>
+%End
+
+  public:
+    explicit QgsScaleVisibilityDialog( QWidget *parent = 0, QString title = QString(), QgsMapCanvas* mapCanvas = 0 );
+
+    //! return if scale visibilty is enabled
+    bool hasScaleVisibility();
+
+    //! return minimum scale (true scale, not scale denominator)
+    double minimumScale();
+
+    //! return maximum scale (true scale, not scale denominator)
+    double maximumScale();
+
+
+  public slots:
+    //! set if scale visibility is enabled
+    void setScaleVisiblity( bool hasScaleVisibility );
+
+    //! set minimum scale (true scale, not scale denominator)
+    void setMinimumScale( double minScale );
+
+    //! set maximum scale (true scale, not scale denominator)
+    void setMaximumScale( double maxScale );
+
+};

src/app/CMakeLists.txt

@@ -3,6 +3,7 @@ SET(QGIS_APP_SRCS
   qgisappinterface.cpp
   qgisappstylesheet.cpp
   qgsabout.cpp
+  qgsapplayertreeviewmenuprovider.cpp
   qgssponsors.cpp
   qgsaddattrdialog.cpp
   qgsaddtaborgroup.cpp
@@ -129,13 +130,7 @@ SET(QGIS_APP_SRCS
   composer/qgscompositionwidget.cpp
   composer/qgsatlascompositionwidget.cpp
 
-  legend/qgslegendgroup.cpp
-  legend/qgslegend.cpp
   legend/qgsapplegendinterface.cpp
-  legend/qgslegenditem.cpp
-  legend/qgslegendlayer.cpp
-  legend/qgslegendsymbologyitem.cpp
-  legend/qgslayerorder.cpp
 
   ogr/qgsogrhelperfunctions.cpp
   ogr/qgsopenvectorlayerdialog.cpp
@@ -272,10 +267,7 @@ SET (QGIS_APP_MOC_HDRS
   composer/qgscompositionwidget.h
   composer/qgsatlascompositionwidget.h
 
-  legend/qgslegend.h
   legend/qgsapplegendinterface.h
-  legend/qgslegendlayer.h
-  legend/qgslayerorder.h
 
   ogr/qgsopenvectorlayerdialog.h
   ogr/qgsnewogrconnection.h
@@ -428,11 +420,22 @@ INCLUDE_DIRECTORIES(
   ${QWT_INCLUDE_DIR}
   ${QT_QTUITOOLS_INCLUDE_DIR}
   ${QEXTSERIALPORT_INCLUDE_DIR}
-  ../analysis/raster ../analysis/openstreetmap
+  ../analysis/raster
+  ../analysis/openstreetmap
   ../core
   ../core/gps
-  ../core/composer ../core/dxf ../core/raster ../core/symbology-ng
-  ../gui ../gui/symbology-ng ../gui/attributetable ../gui/raster ../gui/editorwidgets ../gui/editorwidgets/core
+  ../core/composer
+  ../core/dxf
+  ../core/layertree
+  ../core/raster
+  ../core/symbology-ng
+  ../gui
+  ../gui/symbology-ng
+  ../gui/attributetable
+  ../gui/raster
+  ../gui/editorwidgets
+  ../gui/editorwidgets/core
+  ../gui/layertree
   ../plugins
   ../python
   gps

src/app/composer/qgscomposerlegendwidget.cpp

@@ -922,7 +922,7 @@ void QgsComposerLegendWidget::updateLegend()
 
 
     //and also group info
-    QgsAppLegendInterface legendIface( app->legend() );
+    QgsAppLegendInterface legendIface( app->layerTreeView() );
     QList< GroupLayerInfo > groupInfo = legendIface.groupLayerRelationship();
     mLegend->model()->setLayerSetAndGroups( layerIdList, groupInfo );
     mLegend->endCommand();

src/app/gps/qgsgpsinformationwidget.cpp

@@ -15,25 +15,27 @@
  *                                                                         *
  ***************************************************************************/
 #include "qgsgpsinformationwidget.h"
-#include "qgsnmeaconnection.h"
-#include "qgsgpsconnectionregistry.h"
-#include "qgsgpsdetector.h"
+
 #include "info.h"
+
+#include "qgisapp.h"
+#include "qgsapplication.h"
 #include "qgscoordinatetransform.h"
+#include "qgsfeatureaction.h"
+#include "qgsgeometry.h"
+#include "qgsgpsconnectionregistry.h"
+#include "qgsgpsdetector.h"
+#include "qgslayertreeview.h"
+#include "qgslogger.h"
+#include "qgsmaprenderer.h"
+#include "qgsmaptooladdfeature.h"
+#include "qgsnmeaconnection.h"
 #include "qgspoint.h"
+#include "qgsproject.h"
 #include "qgsrubberband.h"
-#include "qgsmaprenderer.h"
 #include "qgsvectordataprovider.h"
 #include "qgsvectorlayer.h"
-#include "qgsproject.h"
-#include "qgsapplication.h"
-#include "qgslogger.h"
-#include "qgsfeatureaction.h"
-#include "qgsgeometry.h"
-#include "qgisapp.h"
 
-//for avoid intersections static method
-#include "qgsmaptooladdfeature.h"
 
 // QWT Charting widget
 #include <qwt_global.h>
@@ -66,8 +68,6 @@ QgsGPSInformationWidget::QgsGPSInformationWidget( QgsMapCanvas * thepCanvas, QWi
 {
   setupUi( this );
 
-  // to connect signals that layers have changed (which layer, edit state)
-  mpLegend = QgisApp::instance()->legend();
   mpLastLayer = 0;
 
   mLastGpsPosition = QgsPoint( 0.0, 0.0 );
@@ -232,7 +232,7 @@ QgsGPSInformationWidget::QgsGPSInformationWidget( QgsMapCanvas * thepCanvas, QWi
   //SLM - added functionality
   mLogFile = 0;
 
-  connect( mpLegend, SIGNAL( currentLayerChanged( QgsMapLayer* ) ),
+  connect( QgisApp::instance()->layerTreeView(), SIGNAL( currentLayerChanged( QgsMapLayer* ) ),
            this, SLOT( updateCloseFeatureButton( QgsMapLayer* ) ) );
 
   mStackedWidget->setCurrentIndex( 3 ); // force to Options

src/app/gps/qgsgpsinformationwidget.h

@@ -31,7 +31,6 @@ class QgsGPSConnection;
 class QgsGPSTrackerThread;
 struct QgsGPSInformation;
 
-class QgsLegend;
 class QFile;
 class QColor;
 
@@ -96,7 +95,6 @@ class QgsGPSInformationWidget: public QWidget, private Ui::QgsGPSInformationWidg
     QList<QgsPoint> mCaptureList;
     FixStatus mLastFixStatus;
     QString mDateTimeFormat; // user specified format string in registry (no UI presented)
-    QgsLegend * mpLegend;
     QgsVectorLayer * mpLastLayer;
     QFile * mLogFile;
     QTextStream mLogFileTextStream;