Skip to content

Commit a129207

Browse files
committed
[BACKPORT] don't change cursor to hourglass for fTools that runs in
separate thread
1 parent a00ef42 commit a129207

File tree

3 files changed

+0
-6
lines changed

3 files changed

+0
-6
lines changed

python/plugins/fTools/tools/doMergeShapes.py

-2
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ def accept( self ):
130130
if self.inEncoding == None:
131131
self.inEncoding = "System"
132132

133-
QApplication.setOverrideCursor( QCursor( Qt.WaitCursor ) )
134133
self.btnOk.setEnabled( False )
135134

136135
self.mergeThread = ShapeMergeThread( baseDir, self.inputFiles, self.inEncoding, self.outFileName, self.encoding )
@@ -192,7 +191,6 @@ def restoreGui( self ):
192191
self.progressFeatures.setRange( 0, 100 )
193192
self.progressFeatures.setValue( 0 )
194193
self.progressFiles.setValue( 0 )
195-
QApplication.restoreOverrideCursor()
196194
QObject.connect( self.buttonBox, SIGNAL( "rejected()" ), self.reject )
197195
self.btnClose.setText( self.tr( "Close" ) )
198196
self.btnOk.setEnabled( True )

python/plugins/fTools/tools/doSimplify.py

-2
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ def selectOutputFile( self ):
9090
def accept( self ):
9191
vLayer = ftools_utils.getVectorLayerByName( self.cmbInputLayer.currentText() )
9292

93-
QApplication.setOverrideCursor( Qt.WaitCursor )
9493
self.btnOk.setEnabled( False )
9594

9695
if self.chkWriteShapefile.isChecked():
@@ -156,7 +155,6 @@ def stopProcessing( self ):
156155

157156
def restoreGui( self ):
158157
self.progressBar.setValue( 0 )
159-
QApplication.restoreOverrideCursor()
160158
QObject.connect( self.buttonBox, SIGNAL( "rejected()" ), self.reject )
161159
self.btnClose.setText( self.tr( "Close" ) )
162160
self.btnOk.setEnabled( True )

python/plugins/fTools/tools/doSpatialIndex.py

-2
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ def clearList( self ):
108108
self.lstLayers.clear()
109109

110110
def accept( self ):
111-
QApplication.setOverrideCursor( Qt.WaitCursor )
112111
self.btnOk.setEnabled( False )
113112

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

148147
def restoreGui( self ):
149148
self.progressBar.setValue( 0 )
150-
QApplication.restoreOverrideCursor()
151149
QObject.connect( self.buttonBox, SIGNAL( "rejected()" ), self.reject )
152150
self.btnClose.setText( self.tr( "Close" ) )
153151
self.btnOk.setEnabled( True )

0 commit comments

Comments
 (0)