Use wait cursor during lengthy operations in style manager dialog

nyalldawson · nyalldawson · commit 8714e42612e4 · 2018-04-17T10:25:46.000+10:00
diff --git a/src/gui/symbology/qgsstyleexportimportdialog.cpp b/src/gui/symbology/qgsstyleexportimportdialog.cpp
@@ -23,6 +23,7 @@
 #include "qgscolorramp.h"
 #include "qgslogger.h"
 #include "qgsstylegroupselectiondialog.h"
+#include "qgsguiutils.h"
 
 #include <QInputDialog>
 #include <QCloseEvent>
@@ -143,23 +144,27 @@ void QgsStyleExportImportDialog::doExportImport()
 
     mFileName = fileName;
 
+    QgsTemporaryCursorOverride override( Qt::WaitCursor );
     moveStyles( &selection, mStyle, mTempStyle );
     if ( !mTempStyle->exportXml( mFileName ) )
     {
+      override.release();
       QMessageBox::warning( this, tr( "Export Symbols" ),
                             tr( "Error when saving selected symbols to file:\n%1" )
                             .arg( mTempStyle->errorString() ) );
       return;
     }
     else
     {
+      override.release();
       QMessageBox::information( this, tr( "Export Symbols" ),
                                 tr( "The selected symbols were successfully exported to file:\n%1" )
                                 .arg( mFileName ) );
     }
   }
   else // import
   {
+    QgsTemporaryCursorOverride override( Qt::WaitCursor );
     moveStyles( &selection, mTempStyle, mStyle );
 
     // clear model
@@ -174,12 +179,15 @@ void QgsStyleExportImportDialog::doExportImport()
 
 bool QgsStyleExportImportDialog::populateStyles( QgsStyle *style )
 {
+  QgsTemporaryCursorOverride override( Qt::WaitCursor );
+
   // load symbols and color ramps from file
   if ( mDialogMode == Import )
   {
     // NOTE mTempStyle is style here
     if ( !style->importXml( mFileName ) )
     {
+      override.release();
       QMessageBox::warning( this, tr( "Import Symbols or Color Ramps" ),
                             tr( "An error occurred during import:\n%1" ).arg( style->errorString() ) );
       return false;
diff --git a/src/gui/symbology/qgsstylemanagerdialog.cpp b/src/gui/symbology/qgsstylemanagerdialog.cpp
@@ -778,6 +778,8 @@ bool QgsStyleManagerDialog::removeSymbol()
        QMessageBox::No ) )
     return false;
 
+  QgsTemporaryCursorOverride override( Qt::WaitCursor );
+
   Q_FOREACH ( const QModelIndex &index, indexes )
   {
     QString symbolName = index.data().toString();
@@ -798,6 +800,8 @@ bool QgsStyleManagerDialog::removeColorRamp()
        QMessageBox::No ) )
     return false;
 
+  QgsTemporaryCursorOverride override( Qt::WaitCursor );
+
   Q_FOREACH ( const QModelIndex &index, indexes )
   {
     QString rampName = index.data().toString();

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`#include "qgscolorramp.h"`
`24`	`24`	`#include "qgslogger.h"`
`25`	`25`	`#include "qgsstylegroupselectiondialog.h"`
	`26`	`+#include "qgsguiutils.h"`
`26`	`27`
`27`	`28`	`#include <QInputDialog>`
`28`	`29`	`#include <QCloseEvent>`
`@@ -143,23 +144,27 @@ void QgsStyleExportImportDialog::doExportImport()`
`143`	`144`
`144`	`145`	`mFileName = fileName;`
`145`	`146`
	`147`	`+ QgsTemporaryCursorOverride override( Qt::WaitCursor );`
`146`	`148`	`moveStyles( &selection, mStyle, mTempStyle );`
`147`	`149`	`if ( !mTempStyle->exportXml( mFileName ) )`
`148`	`150`	`{`
	`151`	`+ override.release();`
`149`	`152`	`QMessageBox::warning( this, tr( "Export Symbols" ),`
`150`	`153`	`tr( "Error when saving selected symbols to file:\n%1" )`
`151`	`154`	`.arg( mTempStyle->errorString() ) );`
`152`	`155`	`return;`
`153`	`156`	`}`
`154`	`157`	`else`
`155`	`158`	`{`
	`159`	`+ override.release();`
`156`	`160`	`QMessageBox::information( this, tr( "Export Symbols" ),`
`157`	`161`	`tr( "The selected symbols were successfully exported to file:\n%1" )`
`158`	`162`	`.arg( mFileName ) );`
`159`	`163`	`}`
`160`	`164`	`}`
`161`	`165`	`else // import`
`162`	`166`	`{`
	`167`	`+ QgsTemporaryCursorOverride override( Qt::WaitCursor );`
`163`	`168`	`moveStyles( &selection, mTempStyle, mStyle );`
`164`	`169`
`165`	`170`	`// clear model`
`@@ -174,12 +179,15 @@ void QgsStyleExportImportDialog::doExportImport()`
`174`	`179`
`175`	`180`	`bool QgsStyleExportImportDialog::populateStyles( QgsStyle *style )`
`176`	`181`	`{`
	`182`	`+ QgsTemporaryCursorOverride override( Qt::WaitCursor );`
	`183`	`+`
`177`	`184`	`// load symbols and color ramps from file`
`178`	`185`	`if ( mDialogMode == Import )`
`179`	`186`	`{`
`180`	`187`	`// NOTE mTempStyle is style here`
`181`	`188`	`if ( !style->importXml( mFileName ) )`
`182`	`189`	`{`
	`190`	`+ override.release();`
`183`	`191`	`QMessageBox::warning( this, tr( "Import Symbols or Color Ramps" ),`
`184`	`192`	`tr( "An error occurred during import:\n%1" ).arg( style->errorString() ) );`
`185`	`193`	`return false;`