Mercurial Repositories > eric / file diff

--- a/eric7/MultiProject/MultiProject.py	Fri May 21 20:14:48 2021 +0200
+++ b/eric7/MultiProject/MultiProject.py	Sat May 22 11:14:43 2021 +0200
@@ -236,7 +236,7 @@
             f = QFile(fn)
             if f.open(QIODevice.OpenModeFlag.ReadOnly):
                 with E5OverrideCursor():
-                    from E5XML.MultiProjectReader import MultiProjectReader
+                    from EricXML.MultiProjectReader import MultiProjectReader
                     reader = MultiProjectReader(f, self)
                     reader.readXML()
                     f.close()
@@ -280,28 +280,7 @@
         if fn is None:
             fn = self.pfile
         
-        if os.path.splitext(fn)[1] == ".emj":
-            # new JSON based format
-            res = self.__multiProjectFile.writeFile(fn)
-        else:
-            # old XML based format
-            f = QFile(fn)
-            if f.open(QIODevice.OpenModeFlag.WriteOnly):
-                from E5XML.MultiProjectWriter import MultiProjectWriter
-                MultiProjectWriter(
-                    f,
-                    self, os.path.splitext(os.path.basename(fn))[0]
-                ).writeXML()
-                res = True
-            else:
-                E5MessageBox.critical(
-                    self.ui,
-                    self.tr("Save Multi Project File"),
-                    self.tr(
-                        "<p>The multi project file <b>{0}</b> could not be "
-                        "written.</p>").format(fn))
-                res = False
-        
+        res = self.__multiProjectFile.writeFile(fn)
         if res:
             self.pfile = os.path.abspath(fn)
             self.ppath = os.path.abspath(os.path.dirname(fn))
@@ -624,10 +603,9 @@
         )
         fn, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
             self.parent(),
-            self.tr("Save multiproject as"),
+            self.tr("Save Multiproject"),
             defaultPath,
-            self.tr("Multi Project Files (*.emj);;"
-                    "XML Multi Project Files (*.e5m)"),
+            self.tr("Multi Project Files (*.emj)"),
             defaultFilter,
             E5FileDialog.DontConfirmOverwrite)