mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-14 00:07:35 -04:00
[BACKPORT] don't change cursor to hourglass for fTools that runs in
separate thread
This commit is contained in:
parent
a00ef42a75
commit
a129207dea
@ -130,7 +130,6 @@ class Dialog( QDialog, Ui_Dialog ):
|
||||
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 )
|
||||
@ -192,7 +191,6 @@ class Dialog( QDialog, Ui_Dialog ):
|
||||
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 )
|
||||
|
@ -90,7 +90,6 @@ class Dialog( QDialog, Ui_Dialog ):
|
||||
def accept( self ):
|
||||
vLayer = ftools_utils.getVectorLayerByName( self.cmbInputLayer.currentText() )
|
||||
|
||||
QApplication.setOverrideCursor( Qt.WaitCursor )
|
||||
self.btnOk.setEnabled( False )
|
||||
|
||||
if self.chkWriteShapefile.isChecked():
|
||||
@ -156,7 +155,6 @@ class Dialog( QDialog, Ui_Dialog ):
|
||||
|
||||
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 )
|
||||
|
@ -108,7 +108,6 @@ class Dialog( QDialog, Ui_Dialog ):
|
||||
self.lstLayers.clear()
|
||||
|
||||
def accept( self ):
|
||||
QApplication.setOverrideCursor( Qt.WaitCursor )
|
||||
self.btnOk.setEnabled( False )
|
||||
|
||||
self.workThread = SpatialIdxThread( self.layers, self.chkExternalFiles.isChecked() )
|
||||
@ -147,7 +146,6 @@ class Dialog( QDialog, Ui_Dialog ):
|
||||
|
||||
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 )
|
||||
|
Loading…
x
Reference in New Issue
Block a user