[QGIS Commit] r15144 - in trunk/qgis/src: app gui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Tue Feb 8 12:16:32 EST 2011
Author: jef
Date: 2011-02-08 09:16:32 -0800 (Tue, 08 Feb 2011)
New Revision: 15144
Modified:
trunk/qgis/src/app/qgswmssourceselect.cpp
trunk/qgis/src/gui/qgscredentialdialog.cpp
Log:
restore arrow cursor when asking for credentials
Modified: trunk/qgis/src/app/qgswmssourceselect.cpp
===================================================================
--- trunk/qgis/src/app/qgswmssourceselect.cpp 2011-02-08 14:49:43 UTC (rev 15143)
+++ trunk/qgis/src/app/qgswmssourceselect.cpp 2011-02-08 17:16:32 UTC (rev 15144)
@@ -415,6 +415,8 @@
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"
@@ -430,6 +432,8 @@
cbxIgnoreGetMap->setChecked( true );
}
cbxIgnoreGetMap->setEnabled( true );
+
+ QApplication::restoreOverrideCursor();
}
else
{
@@ -439,6 +443,8 @@
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"
@@ -454,6 +460,8 @@
cbxIgnoreGetFeatureInfo->setChecked( true );
}
cbxIgnoreGetFeatureInfo->setEnabled( true );
+
+ QApplication::restoreOverrideCursor();
}
return true;
Modified: trunk/qgis/src/gui/qgscredentialdialog.cpp
===================================================================
--- trunk/qgis/src/gui/qgscredentialdialog.cpp 2011-02-08 14:49:43 UTC (rev 15143)
+++ trunk/qgis/src/gui/qgscredentialdialog.cpp 2011-02-08 17:16:32 UTC (rev 15144)
@@ -38,7 +38,13 @@
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();
More information about the QGIS-commit
mailing list