Skip to content
Permalink
Browse files
[BACKPORT] don't change cursor to hourglass for fTools that runs in
separate thread
  • Loading branch information
alexbruy committed Dec 5, 2011
1 parent 3f423ec commit a5070d029689b1713f966fd7ad9aeba640e98f1d
Showing with 0 additions and 4 deletions.
  1. +0 −2 python/plugins/fTools/tools/doMergeShapes.py
  2. +0 −2 python/plugins/fTools/tools/doSimplify.py
@@ -121,7 +121,6 @@ def accept( self ):
QMessageBox.warning( self, self.tr( "Delete error" ), self.tr( "Can't delete file %1" ).arg( outFileName ) )
return

QApplication.setOverrideCursor( QCursor( Qt.WaitCursor ) )
self.btnOk.setEnabled( False )

self.mergeThread = ShapeMergeThread( baseDir, self.inputFiles, self.outFileName, self.encoding )
@@ -168,7 +167,6 @@ def restoreGui( self ):
self.progressFeatures.setRange( 0, 100 )
self.progressFeatures.setValue( 0 )
self.progressFiles.setValue( 0 )
QApplication.restoreOverrideCursor()
QObject.connect( self.buttonBox, SIGNAL( "rejected()" ), self.reject )
self.btnClose.setText( self.tr( "Close" ) )
self.btnOk.setEnabled( True )
@@ -80,7 +80,6 @@ def selectOutputFile( self ):
def accept( self ):
vLayer = ftools_utils.getVectorLayerByName( self.cmbInputLayer.currentText() )

QApplication.setOverrideCursor( Qt.WaitCursor )
self.okButton.setEnabled( False )

if self.writeShapefileCheck.isChecked():
@@ -139,7 +138,6 @@ def stopProcessing( self ):

def restoreGui( self ):
self.progressBar.setValue( 0 )
QApplication.restoreOverrideCursor()
QObject.connect( self.buttonBox, SIGNAL( "rejected()" ), self.reject )
self.closeButton.setText( self.tr( "Close" ) )
self.okButton.setEnabled( True )

0 comments on commit a5070d0

Please sign in to comment.