Skip to content

Commit

Permalink
restore arrow cursor when asking for credentials
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15144 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Feb 8, 2011
1 parent 5589cc8 commit c427cec
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
8 changes: 8 additions & 0 deletions src/app/qgswmssourceselect.cpp
Expand Up @@ -415,6 +415,8 @@ bool QgsWMSSourceSelect::populateLayerList( QgsWmsProvider *wmsProvider )

if ( wmsProvider->baseUrl() != wmsProvider->getMapUrl() )
{
QApplication::setOverrideCursor( Qt::ArrowCursor );

if ( QMessageBox::information( this,
tr( "WMS Provider" ),
tr( "Advertised GetMap URL\n\n %2\n\nis different from GetCapabilities URL\n\n %1\n\n"
Expand All @@ -430,6 +432,8 @@ bool QgsWMSSourceSelect::populateLayerList( QgsWmsProvider *wmsProvider )
cbxIgnoreGetMap->setChecked( true );
}
cbxIgnoreGetMap->setEnabled( true );

QApplication::restoreOverrideCursor();
}
else
{
Expand All @@ -439,6 +443,8 @@ bool QgsWMSSourceSelect::populateLayerList( QgsWmsProvider *wmsProvider )

if ( wmsProvider->baseUrl() != wmsProvider->getFeatureInfoUrl() )
{
QApplication::setOverrideCursor( Qt::ArrowCursor );

if ( QMessageBox::information( this,
tr( "WMS Provider" ),
tr( "Advertised GetFeatureInfo URL\n\n %2\n\nis different from GetCapabilities URL\n\n %1\n\n"
Expand All @@ -454,6 +460,8 @@ bool QgsWMSSourceSelect::populateLayerList( QgsWmsProvider *wmsProvider )
cbxIgnoreGetFeatureInfo->setChecked( true );
}
cbxIgnoreGetFeatureInfo->setEnabled( true );

QApplication::restoreOverrideCursor();
}

return true;
Expand Down
8 changes: 7 additions & 1 deletion src/gui/qgscredentialdialog.cpp
Expand Up @@ -38,7 +38,13 @@ bool QgsCredentialDialog::request( QString realm, QString &username, QString &pa
labelMessage->setText( message );
labelMessage->setHidden( message.isEmpty() );

if ( exec() == QDialog::Accepted )
QApplication::setOverrideCursor( Qt::ArrowCursor );

int res = exec();

QApplication::restoreOverrideCursor();

if ( res == QDialog::Accepted )
{
username = leUsername->text();
password = lePassword->text();
Expand Down

0 comments on commit c427cec

Please sign in to comment.