sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

wms provider: add trailing slash, if url path is empty otherwise and clear tileset list, when a tileless wms server is connected

Browse Source
This commit is contained in:
Juergen E. Fischer 2013-05-09 17:08:04 +02:00
parent 85c67beecd
commit b6c7496f8c
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/qgsnewhttpconnection.cpp
View File

@ -154,6 +154,11 @@ void QgsNewHttpConnection::accept()
url.removeEncodedQueryItem( params["FORMAT"].first );
}
if( url.encodedPath().isEmpty() )
{
url.setEncodedPath( "/" );
}
settings.setValue( key + "/url", url.toString() );
if ( mBaseKey == "/Qgis/connections-wms/" || mBaseKey == "/Qgis/connections-wcs/" )
{

6
src/providers/wms/qgswmssourceselect.cpp
View File

@ -418,6 +418,10 @@ bool QgsWMSSourceSelect::populateLayerList( QgsWmsProvider *wmsProvider )
lstTilesets->setSortingEnabled( true );
lstTilesets->sortByColumn( 0, Qt::AscendingOrder );
}
else
{
lstTilesets->setRowCount( 0 );
}
// If we got some layers, let the user add them to the map
if ( lstLayers->topLevelItemCount() == 1 )
@ -890,7 +894,7 @@ void QgsWMSSourceSelect::updateButtons()
// disable tilesets, when layer are selected or no tilesets available
lstLayers->setEnabled( true );
tabServers->setTabEnabled( tabServers->indexOf( tabLayerOrder ), mLayerOrderTreeWidget->topLevelItemCount() > 0 );
tabServers->setTabEnabled( tabServers->indexOf( tabTilesets ), mLayerOrderTreeWidget->topLevelItemCount() == 0 && lstTilesets->rowCount() );
tabServers->setTabEnabled( tabServers->indexOf( tabTilesets ), mLayerOrderTreeWidget->topLevelItemCount() == 0 && lstTilesets->rowCount() > 0 );
btnGrpImageEncoding->setEnabled( true );
}