Mercurial Repositories > eric / file diff

--- a/eric7/Templates/TemplateViewer.py	Fri May 21 20:14:48 2021 +0200
+++ b/eric7/Templates/TemplateViewer.py	Sat May 22 11:14:43 2021 +0200
@@ -582,8 +582,7 @@
             self,
             self.tr("Export Templates"),
             "",
-            self.tr("Templates Files (*.ecj);;"
-                    "XML Templates Files (*.e4c);;"
+            self.tr("Templates Files (*.ecj)"
                     "All Files (*)"),
             "",
             E5FileDialog.DontConfirmOverwrite)
@@ -978,29 +977,8 @@
         if filename is None:
             filename = os.path.join(
                 Utilities.getConfigDir(), "eric7templates.ecj")
-        if filename.endswith(".ecj"):
-            # new JSON based file
-            res = self.__templatesFile.writeFile(filename)
-        else:
-            # old XML based file
-            f = QFile(filename)
-            ok = f.open(QIODevice.OpenModeFlag.WriteOnly)
-            if not ok:
-                E5MessageBox.critical(
-                    self,
-                    self.tr("Save Templates"),
-                    self.tr(
-                        "<p>The templates file <b>{0}</b> could not be"
-                        " written.</p>")
-                    .format(filename))
-                res = False
-            else:
-                from E5XML.TemplatesWriter import TemplatesWriter
-                TemplatesWriter(f, self).writeXML()
-                f.close()
-                res = True
         
-        return res
+        return self.__templatesFile.writeFile(filename)
     
     def readTemplates(self, filename=None):
         """
@@ -1025,7 +1003,7 @@
         else:
             f = QFile(filename)
             if f.open(QIODevice.OpenModeFlag.ReadOnly):
-                from E5XML.TemplatesReader import TemplatesReader
+                from EricXML.TemplatesReader import TemplatesReader
                 reader = TemplatesReader(f, viewer=self)
                 reader.readXML()
                 f.close()