Skip to content

Commit

Permalink
[BACKPORT] don't change cursor to hourglass for fTools that runs in
Browse files Browse the repository at this point in the history
separate thread
  • Loading branch information
alexbruy committed Dec 5, 2011
1 parent a00ef42 commit a129207
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 6 deletions.
2 changes: 0 additions & 2 deletions python/plugins/fTools/tools/doMergeShapes.py
Expand Up @@ -130,7 +130,6 @@ def accept( self ):
if self.inEncoding == None:
self.inEncoding = "System"

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

self.mergeThread = ShapeMergeThread( baseDir, self.inputFiles, self.inEncoding, self.outFileName, self.encoding )
Expand Down Expand Up @@ -192,7 +191,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 )
Expand Down
2 changes: 0 additions & 2 deletions python/plugins/fTools/tools/doSimplify.py
Expand Up @@ -90,7 +90,6 @@ def selectOutputFile( self ):
def accept( self ):
vLayer = ftools_utils.getVectorLayerByName( self.cmbInputLayer.currentText() )

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

if self.chkWriteShapefile.isChecked():
Expand Down Expand Up @@ -156,7 +155,6 @@ def stopProcessing( self ):

def restoreGui( self ):
self.progressBar.setValue( 0 )
QApplication.restoreOverrideCursor()
QObject.connect( self.buttonBox, SIGNAL( "rejected()" ), self.reject )
self.btnClose.setText( self.tr( "Close" ) )
self.btnOk.setEnabled( True )
Expand Down
2 changes: 0 additions & 2 deletions python/plugins/fTools/tools/doSpatialIndex.py
Expand Up @@ -108,7 +108,6 @@ def clearList( self ):
self.lstLayers.clear()

def accept( self ):
QApplication.setOverrideCursor( Qt.WaitCursor )
self.btnOk.setEnabled( False )

self.workThread = SpatialIdxThread( self.layers, self.chkExternalFiles.isChecked() )
Expand Down Expand Up @@ -147,7 +146,6 @@ def stopProcessing( self ):

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

0 comments on commit a129207

Please sign in to comment.