Fixed an issue in the pysvn dialog mixin (second attempt). 6_0_x

Mon, 24 Aug 2015 17:46:02 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Mon, 24 Aug 2015 17:46:02 +0200
branch
6_0_x
changeset 4391
396718aa7910
parent 4389
71cec460a5f3
child 4394
064305c201c9

Fixed an issue in the pysvn dialog mixin (second attempt).
(grafted from c0d9ef07020be6a4674da3292ebfc58e1922ce2d)

Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py file | annotate | diff | comparison | revisions
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py	Mon Aug 24 17:27:17 2015 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py	Mon Aug 24 17:46:02 2015 +0200
@@ -10,6 +10,7 @@
 
 from __future__ import unicode_literals
 
+from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import QApplication, QDialog, QWidget
 
 
@@ -70,7 +71,7 @@
         dlg = SvnLoginDialog(realm, username, may_save, parent)
         res = dlg.exec_()
         if cursor is not None:
-            QApplication.setOverrideCursor(cursor)
+            QApplication.setOverrideCursor(Qt.WaitCursor)
         if res == QDialog.Accepted:
             loginData = dlg.getData()
             return (True, loginData[0], loginData[1], loginData[2])
@@ -120,7 +121,7 @@
         msgBox.addButton(self.tr("&Reject"), E5MessageBox.RejectRole)
         msgBox.exec_()
         if cursor is not None:
-            QApplication.setOverrideCursor(cursor)
+            QApplication.setOverrideCursor(Qt.WaitCursor)
         if msgBox.clickedButton() == permButton:
             return (True, trust_dict["failures"], True)
         elif msgBox.clickedButton() == tempButton:

eric ide

mercurial