Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
wmts: use title instead of identifier (fixes #9391)
  • Loading branch information
jef-n committed Feb 15, 2014
1 parent b5897c7 commit edfce68
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
12 changes: 9 additions & 3 deletions src/providers/wms/qgswmssourceselect.cpp
Expand Up @@ -376,11 +376,17 @@ bool QgsWMSSourceSelect::populateLayerList( QgsWmsProvider *wmsProvider )

lstTilesets->setItem( row, 0, item );
lstTilesets->setItem( row, 1, new QTableWidgetItem( format ) );
lstTilesets->setItem( row, 2, new QTableWidgetItem( style.identifier ) );
QTableWidgetItem *styleItem = new QTableWidgetItem( l.title );

QTableWidgetItem *titleItem = new QTableWidgetItem( l.title.isEmpty() ? l.identifier : l.title );
if ( !l.abstract.isEmpty() )
styleItem->setToolTip( "<p>" + l.abstract + "</p>" );
titleItem->setToolTip( "<p>" + l.abstract + "</p>" );
lstTilesets->setItem( row, 2, titleItem );

QTableWidgetItem *styleItem = new QTableWidgetItem( style.title.isEmpty() ? style.identifier : style.title );
if ( !style.abstract.isEmpty() )
titleItem->setToolTip( "<p>" + style.abstract + "</p>" );
lstTilesets->setItem( row, 3, styleItem );

lstTilesets->setItem( row, 4, new QTableWidgetItem( setLink.tileMatrixSet ) );
lstTilesets->setItem( row, 5, new QTableWidgetItem( tileMatrixSets[ setLink.tileMatrixSet ].crs ) );

Expand Down
4 changes: 2 additions & 2 deletions src/ui/qgswmssourceselectbase.ui
Expand Up @@ -356,12 +356,12 @@
</column>
<column>
<property name="text">
<string>Style</string>
<string>Title</string>
</property>
</column>
<column>
<property name="text">
<string>Title</string>
<string>Style</string>
</property>
</column>
<column>
Expand Down

0 comments on commit edfce68

Please sign in to comment.