Mercurial Repositories > eric / file diff

--- a/eric6/MultiProject/MultiProject.py	Fri Oct 09 17:19:29 2020 +0200
+++ b/eric6/MultiProject/MultiProject.py	Sat Oct 10 12:20:51 2020 +0200
@@ -12,9 +12,8 @@
 import shutil
 
 from PyQt5.QtCore import (
-    pyqtSignal, pyqtSlot, Qt, QFileInfo, QFile, QIODevice, QObject, QUuid
+    pyqtSignal, pyqtSlot, QFileInfo, QFile, QIODevice, QObject, QUuid
 )
-from PyQt5.QtGui import QCursor
 from PyQt5.QtWidgets import QMenu, QApplication, QDialog, QToolBar
 
 from Globals import recentNameMultiProject
@@ -22,6 +21,7 @@
 from E5Gui.E5Action import E5Action, createActionGroup
 from E5Gui import E5FileDialog, E5MessageBox, E5PathPickerDialog
 from E5Gui.E5PathPickerDialog import E5PathPickerModes
+from E5Gui.E5OverrideCursor import E5OverrideCursor
 
 import UI.PixmapCache
 
@@ -225,14 +225,14 @@
         """
         f = QFile(fn)
         if f.open(QIODevice.ReadOnly):
-            from E5XML.MultiProjectReader import MultiProjectReader
-            reader = MultiProjectReader(f, self)
-            reader.readXML()
-            f.close()
+            with E5OverrideCursor():
+                from E5XML.MultiProjectReader import MultiProjectReader
+                reader = MultiProjectReader(f, self)
+                reader.readXML()
+                f.close()
             if reader.hasError():
                 return False
         else:
-            QApplication.restoreOverrideCursor()
             E5MessageBox.critical(
                 self.ui,
                 self.tr("Read multiproject file"),
@@ -553,13 +553,10 @@
         QApplication.processEvents()
         
         if fn is not None:
-            QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
-            QApplication.processEvents()
             self.closeMultiProject()
-            if self.__readMultiProject(fn):
+            ok = self.__readMultiProject(fn)
+            if ok:
                 self.opened = True
-                QApplication.restoreOverrideCursor()
-                QApplication.processEvents()
                 
                 self.closeAct.setEnabled(True)
                 self.saveasAct.setEnabled(True)
@@ -571,8 +568,6 @@
                 if openMaster and Preferences.getMultiProject(
                         "OpenMasterAutomatically"):
                     self.__openMasterProject(False)
-            else:
-                QApplication.restoreOverrideCursor()
     
     def saveMultiProject(self):
         """