From b6c7496f8c1007f4ca4dca8972cad994876b85f3 Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Thu, 9 May 2013 17:08:04 +0200 Subject: [PATCH] wms provider: add trailing slash, if url path is empty otherwise and clear tileset list, when a tileless wms server is connected --- src/gui/qgsnewhttpconnection.cpp | 5 +++++ src/providers/wms/qgswmssourceselect.cpp | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/gui/qgsnewhttpconnection.cpp b/src/gui/qgsnewhttpconnection.cpp index a0deba661cae..b49d6f683b0c 100644 --- a/src/gui/qgsnewhttpconnection.cpp +++ b/src/gui/qgsnewhttpconnection.cpp @@ -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/" ) { diff --git a/src/providers/wms/qgswmssourceselect.cpp b/src/providers/wms/qgswmssourceselect.cpp index 90202953d298..d3d3988ce060 100644 --- a/src/providers/wms/qgswmssourceselect.cpp +++ b/src/providers/wms/qgswmssourceselect.cpp @@ -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 ); }