Merge pull request #8250 from elpaso/indicators-refactoring

[needs-docs] Indicators refactoring + bad layers indicator
qgis · Oct 24, 2018 · ceaaade · ceaaade
2 parents 1ab7dec + a83d9c9
commit ceaaade
Show file tree

Hide file tree

Showing 15 changed files with 565 additions and 503 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -718,6 +718,7 @@
         <file>themes/default/mActionReverseLine.svg</file>
         <file>themes/default/mActionAdd3DMap.svg</file>
         <file>themes/default/mIndicatorNonRemovable.svg</file>
+        <file>themes/default/mIndicatorBadLayer.svg</file>
         <file>themes/default/mIconFolder.svg</file>
         <file>themes/default/mIconFolderHome.svg</file>
         <file>themes/default/mIconFolderLink.svg</file>

diff --git a/images/themes/default/mIndicatorBadLayer.svg b/images/themes/default/mIndicatorBadLayer.svg
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -60,10 +60,12 @@ SET(QGIS_APP_SRCS
   qgslabelinggui.cpp
   qgslabelingwidget.cpp
   qgslayercapabilitiesmodel.cpp
+  qgslayertreeviewindicatorprovider.cpp
   qgslayertreeviewembeddedindicator.cpp
   qgslayertreeviewfilterindicator.cpp
   qgslayertreeviewmemoryindicator.cpp
   qgslayertreeviewnonremovableindicator.cpp
+  qgslayertreeviewbadlayerindicator.cpp
   qgsmapcanvasdockwidget.cpp
   qgsmaplayerstylecategoriesmodel.cpp
   qgsmaplayerstyleguiutils.cpp
@@ -289,10 +291,12 @@ SET (QGIS_APP_MOC_HDRS
   qgslabelingwidget.h
   qgslabelpropertydialog.h
   qgslayercapabilitiesmodel.h
+  qgslayertreeviewindicatorprovider.h
   qgslayertreeviewembeddedindicator.h
   qgslayertreeviewmemoryindicator.h
   qgslayertreeviewfilterindicator.h
   qgslayertreeviewnonremovableindicator.h
+  qgslayertreeviewbadlayerindicator.h
   qgsmapcanvasdockwidget.h
   qgsmaplayerstylecategoriesmodel.h
   qgsmaplayerstyleguiutils.h

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -209,6 +209,7 @@ Q_GUI_EXPORT extern int qt_defaultDpiX();
 #include "qgslayertreeviewembeddedindicator.h"
 #include "qgslayertreeviewfilterindicator.h"
 #include "qgslayertreeviewmemoryindicator.h"
+#include "qgslayertreeviewbadlayerindicator.h"
 #include "qgslayertreeviewnonremovableindicator.h"
 #include "qgslayout.h"
 #include "qgslayoutatlas.h"
@@ -3891,6 +3892,7 @@ void QgisApp::initLayerTreeView()
   new QgsLayerTreeViewFilterIndicatorProvider( mLayerTreeView );  // gets parented to the layer view
   new QgsLayerTreeViewEmbeddedIndicatorProvider( mLayerTreeView );  // gets parented to the layer view
   new QgsLayerTreeViewMemoryIndicatorProvider( mLayerTreeView );  // gets parented to the layer view
+  new QgsLayerTreeViewBadLayerIndicatorProvider( mLayerTreeView );  // gets parented to the layer view
   new QgsLayerTreeViewNonRemovableIndicatorProvider( mLayerTreeView );  // gets parented to the layer view
 
   setupLayerTreeViewFromSettings();

diff --git a/src/app/qgslayertreeviewbadlayerindicator.cpp b/src/app/qgslayertreeviewbadlayerindicator.cpp
@@ -0,0 +1,59 @@
+/***************************************************************************
+  qgslayertreeviewbadlayerindicatorprovider.cpp - QgsLayerTreeViewBadLayerIndicatorProvider
+
+ ---------------------
+ begin                : 17.10.2018
+ copyright            : (C) 2018 by Alessandro Pasotti
+ email                : elpaso@itopen.it
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "qgslayertreeviewbadlayerindicator.h"
+#include "qgslayertree.h"
+#include "qgslayertreeview.h"
+#include "qgslayertreeutils.h"
+#include "qgslayertreemodel.h"
+#include "qgsvectorlayer.h"
+#include "qgisapp.h"
+
+QgsLayerTreeViewBadLayerIndicatorProvider::QgsLayerTreeViewBadLayerIndicatorProvider( QgsLayerTreeView *view )
+  : QgsLayerTreeViewIndicatorProvider( view )
+{
+}
+
+void QgsLayerTreeViewBadLayerIndicatorProvider::onIndicatorClicked( const QModelIndex &index )
+{
+  QgsLayerTreeNode *node = mLayerTreeView->layerTreeModel()->index2node( index );
+  if ( !QgsLayerTree::isLayer( node ) )
+    return;
+
+  QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( QgsLayerTree::toLayer( node )->layer() );
+  if ( !vlayer )
+    return;
+
+  // TODO: open source select dialog
+}
+
+QString QgsLayerTreeViewBadLayerIndicatorProvider::iconName( QgsMapLayer *layer )
+{
+  Q_UNUSED( layer );
+  return QStringLiteral( "/mIndicatorBadLayer.svg" );
+}
+
+QString QgsLayerTreeViewBadLayerIndicatorProvider::tooltipText( QgsMapLayer *layer )
+{
+  Q_UNUSED( layer );
+  // TODO, click here to set a new data source.
+  return tr( "<b>Bad layer!</b><br>Layer data source could not be found." );
+}
+
+bool QgsLayerTreeViewBadLayerIndicatorProvider::acceptLayer( QgsMapLayer *layer )
+{
+  return ! layer->isValid();
+}
diff --git a/src/app/qgslayertreeviewbadlayerindicator.h b/src/app/qgslayertreeviewbadlayerindicator.h
@@ -0,0 +1,41 @@
+/***************************************************************************
+  qgslayertreeviewbadlayerindicatorprovider.h - QgsLayerTreeViewBadLayerIndicatorProvider
+
+ ---------------------
+ begin                : 17.10.2018
+ copyright            : (C) 2018 by Alessandro Pasotti
+ email                : elpaso@itopen.it
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#ifndef QGSLAYERTREEVIEWBADLAYERINDICATORPROVIDER_H
+#define QGSLAYERTREEVIEWBADLAYERINDICATORPROVIDER_H
+
+#include "qgslayertreeviewindicatorprovider.h"
+
+#include <QObject>
+
+
+//! Indicators for bad layers
+class QgsLayerTreeViewBadLayerIndicatorProvider : public QgsLayerTreeViewIndicatorProvider
+{
+    Q_OBJECT
+
+  public:
+    explicit QgsLayerTreeViewBadLayerIndicatorProvider( QgsLayerTreeView *view );
+
+  protected slots:
+    void onIndicatorClicked( const QModelIndex &index ) override;
+
+  private:
+    QString iconName( QgsMapLayer *layer ) override;
+    QString tooltipText( QgsMapLayer *layer ) override;
+    bool acceptLayer( QgsMapLayer *layer ) override;
+};
+
+#endif // QGSLAYERTREEVIEWBADLAYERINDICATORPROVIDER_H