update, using one layer tree view indicator for temporal layers

qgis · Mar 10, 2020 · 86a336c · 86a336c
1 parent 2f0eb95
commit 86a336c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 150 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -235,7 +235,6 @@ Q_GUI_EXPORT extern int qt_defaultDpiX();
 #include "qgslayertreeviewbadlayerindicator.h"
 #include "qgslayertreeviewnonremovableindicator.h"
 #include "qgslayertreeviewnocrsindicator.h"
-#include "qgslayertreeviewprojecttimeindicator.h"
 #include "qgslayertreeviewtemporalindicator.h"
 #include "qgslayout.h"
 #include "qgslayoutatlas.h"
@@ -4503,7 +4502,6 @@ 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 QgsLayerTreeViewProjectTimeIndicatorProvider( mLayerTreeView ); // gets parented to the layer view
   new QgsLayerTreeViewTemporalIndicatorProvider( mLayerTreeView ); // gets parented to the layer view
   new QgsLayerTreeViewNoCrsIndicatorProvider( mLayerTreeView );  // gets parented to the layer view
   QgsLayerTreeViewBadLayerIndicatorProvider *badLayerIndicatorProvider = new QgsLayerTreeViewBadLayerIndicatorProvider( mLayerTreeView );  // gets parented to the layer view

diff --git a/src/app/qgslayertreeviewprojecttimeindicator.cpp b/src/app/qgslayertreeviewprojecttimeindicator.cpp
diff --git a/src/app/qgslayertreeviewprojecttimeindicator.h b/src/app/qgslayertreeviewprojecttimeindicator.h
diff --git a/src/app/qgslayertreeviewtemporalindicator.cpp b/src/app/qgslayertreeviewtemporalindicator.cpp
@@ -53,22 +53,26 @@ bool QgsLayerTreeViewTemporalIndicatorProvider::acceptLayer( QgsMapLayer *layer
 {
   if ( !layer )
     return false;
-  if ( layer->temporalProperties() &&
+  if ( layer->temporalProperties() )
-       layer->temporalProperties()->temporalSource() ==
-       QgsMapLayerTemporalProperties::TemporalSource::Layer )
     return true;
   return false;
 }
 
 QString QgsLayerTreeViewTemporalIndicatorProvider::iconName( QgsMapLayer *layer )
 {
-  Q_UNUSED( layer );
+  if ( layer->temporalProperties()->temporalSource() ==
+       QgsMapLayerTemporalProperties::TemporalSource::Project )
+    return QStringLiteral( "/mIndicatorTimeFromProject.svg" );
+
   return QStringLiteral( "/mIndicatorTemporal.svg" );
 }
 
 QString QgsLayerTreeViewTemporalIndicatorProvider::tooltipText( QgsMapLayer *layer )
 {
-  Q_UNUSED( layer );
+  if ( layer->temporalProperties()->temporalSource() ==
+       QgsMapLayerTemporalProperties::TemporalSource::Project )
+    return tr( "<b>Temporal layer using Project time </b>" );
+
   return tr( "<b>Temporal layer</b>" );
 }