Mercurial Repositories > eric / file diff

--- a/eric7/Project/Project.py	Fri May 21 20:14:48 2021 +0200
+++ b/eric7/Project/Project.py	Sat May 22 11:14:43 2021 +0200
@@ -811,7 +811,7 @@
             # old XML based format
             f = QFile(fn)
             if f.open(QIODevice.OpenModeFlag.ReadOnly):
-                from E5XML.ProjectReader import ProjectReader
+                from EricXML.ProjectReader import ProjectReader
                 reader = ProjectReader(f, self)
                 reader.readXML()
                 res = not reader.hasError()
@@ -914,26 +914,8 @@
         if fn is None:
             fn = self.pfile
         
-        if os.path.splitext(fn)[1] == ".epj":
-            # new JSON based format
-            with E5OverrideCursor():
-                res = self.__projectFile.writeFile(fn)
-        else:
-            # old XML based format
-            f = QFile(fn)
-            if f.open(QIODevice.OpenModeFlag.WriteOnly):
-                from E5XML.ProjectWriter import ProjectWriter
-                ProjectWriter(f, os.path.splitext(
-                    os.path.basename(fn))[0]).writeXML()
-                res = True
-            else:
-                E5MessageBox.critical(
-                    self.ui,
-                    self.tr("Save Project File"),
-                    self.tr(
-                        "<p>The project file <b>{0}</b> could not be"
-                        " written.</p>").format(fn))
-                res = False
+        with E5OverrideCursor():
+            res = self.__projectFile.writeFile(fn)
         
         if res:
             self.pfile = os.path.abspath(fn)
@@ -967,7 +949,7 @@
             if os.path.exists(fn):
                 f = QFile(fn)
                 if f.open(QIODevice.OpenModeFlag.ReadOnly):
-                    from E5XML.UserProjectReader import UserProjectReader
+                    from EricXML.UserProjectReader import UserProjectReader
                     reader = UserProjectReader(f, self)
                     reader.readXML()
                     f.close()
@@ -1041,7 +1023,7 @@
             if os.path.exists(fn):
                 f = QFile(fn)
                 if f.open(QIODevice.OpenModeFlag.ReadOnly):
-                    from E5XML.SessionReader import SessionReader
+                    from EricXML.SessionReader import SessionReader
                     reader = SessionReader(f, False)
                     reader.readXML(quiet=quiet)
                     f.close()
@@ -1128,7 +1110,7 @@
             if os.path.exists(fn):
                 f = QFile(fn)
                 if f.open(QIODevice.OpenModeFlag.ReadOnly):
-                    from E5XML.TasksReader import TasksReader
+                    from EricXML.TasksReader import TasksReader
                     reader = TasksReader(f, True)
                     reader.readXML()
                     f.close()
@@ -1206,7 +1188,7 @@
             
             f = QFile(fn)
             if f.open(QIODevice.OpenModeFlag.ReadOnly):
-                from E5XML.DebuggerPropertiesReader import (
+                from EricXML.DebuggerPropertiesReader import (
                     DebuggerPropertiesReader
                 )
                 reader = DebuggerPropertiesReader(f, self)
@@ -3134,10 +3116,9 @@
         )
         fn, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
             self.parent(),
-            self.tr("Save project as"),
+            self.tr("Save Project"),
             defaultPath,
-            self.tr("Project Files (*.epj);;"
-                    "XML Project Files (*.e4p)"),
+            self.tr("Project Files (*.epj)"),
             defaultFilter,
             E5FileDialog.DontConfirmOverwrite)