Better tooltips for map layers

nyalldawson · nyalldawson · commit b19213ec4292 · 2017-05-09T11:56:39.000+10:00
Including CRS information (cherry-picked from 1012f25)
diff --git a/src/core/layertree/qgslayertreemodel.cpp b/src/core/layertree/qgslayertreemodel.cpp
@@ -318,14 +318,22 @@ QVariant QgsLayerTreeModel::data( const QModelIndex &index, int role ) const
   {
     if ( QgsLayerTree::isLayer( node ) )
     {
-      if ( QgsMapLayer* layer = QgsLayerTree::toLayer( node )->layer() )
+      if ( QgsMapLayer *layer = QgsLayerTree::toLayer( node )->layer() )
       {
-        QString tooltip = "<b>" +
-                          ( layer->title().isEmpty() ? layer->shortName() : layer->title() ) + "</b>";
+        QStringList parts;
+        QString title = layer->title().isEmpty() ? layer->shortName() : layer->title();
+        if ( title.isEmpty() )
+          title = layer->name();
+        title = "<b>" + title + "</b>";
+        if ( layer->crs().isValid() )
+          title = tr( "%1 (%2)" ).arg( title, layer->crs().authid() );
+
+        parts << title;
+
         if ( !layer->abstract().isEmpty() )
-          tooltip += "<br/>" + layer->abstract().replace( "\n", "<br/>" );
-        tooltip += "<br/><i>" + layer->publicSource() + "</i>";
-        return tooltip;
+          parts << "<br/>" + layer->abstract().replace( QLatin1String( "\n" ), QLatin1String( "<br/>" ) );
+        parts << "<i>" + layer->publicSource() + "</i>";
+        return parts.join( "<br/>" );
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -318,14 +318,22 @@ QVariant QgsLayerTreeModel::data( const QModelIndex &index, int role ) const`
`318`	`318`	`{`
`319`	`319`	`if ( QgsLayerTree::isLayer( node ) )`
`320`	`320`	`{`
`321`		`- if ( QgsMapLayer* layer = QgsLayerTree::toLayer( node )->layer() )`
	`321`	`+ if ( QgsMapLayer *layer = QgsLayerTree::toLayer( node )->layer() )`
`322`	`322`	`{`
`323`		`- QString tooltip = "<b>" +`
`324`		`- ( layer->title().isEmpty() ? layer->shortName() : layer->title() ) + "</b>";`
	`323`	`+ QStringList parts;`
	`324`	`+ QString title = layer->title().isEmpty() ? layer->shortName() : layer->title();`
	`325`	`+ if ( title.isEmpty() )`
	`326`	`+ title = layer->name();`
	`327`	`+ title = "<b>" + title + "</b>";`
	`328`	`+ if ( layer->crs().isValid() )`
	`329`	`+ title = tr( "%1 (%2)" ).arg( title, layer->crs().authid() );`
	`330`	`+`
	`331`	`+ parts << title;`
	`332`	`+`
`325`	`333`	`if ( !layer->abstract().isEmpty() )`
`326`		`- tooltip += "<br/>" + layer->abstract().replace( "\n", "<br/>" );`
`327`		`- tooltip += "<br/><i>" + layer->publicSource() + "</i>";`
`328`		`- return tooltip;`
	`334`	`+ parts << "<br/>" + layer->abstract().replace( QLatin1String( "\n" ), QLatin1String( "<br/>" ) );`
	`335`	`+ parts << "<i>" + layer->publicSource() + "</i>";`
	`336`	`+ return parts.join( "<br/>" );`
`329`	`337`	`}`
`330`	`338`	`}`
`331`	`339`	`}`