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

jef-n · jef-n · commit b6c7496f8c10 · 2013-05-09T17:08:04.000+02:00
diff --git 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
@@ -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 );
   }
 

Original file line number	Diff line number	Diff line change
`@@ -154,6 +154,11 @@ void QgsNewHttpConnection::accept()`
`154`	`154`	`url.removeEncodedQueryItem( params["FORMAT"].first );`
`155`	`155`	`}`
`156`	`156`
	`157`	`+ if( url.encodedPath().isEmpty() )`
	`158`	`+ {`
	`159`	`+ url.setEncodedPath( "/" );`
	`160`	`+ }`
	`161`	`+`
`157`	`162`	`settings.setValue( key + "/url", url.toString() );`
`158`	`163`	`if ( mBaseKey == "/Qgis/connections-wms/" \|\| mBaseKey == "/Qgis/connections-wcs/" )`
`159`	`164`	`{`