Mercurial Repositories > eric / file diff

--- a/eric7/UI/UserInterface.py	Fri May 21 20:14:48 2021 +0200
+++ b/eric7/UI/UserInterface.py	Sat May 22 11:14:43 2021 +0200
@@ -6307,8 +6307,7 @@
             None,
             self.tr("Export Keyboard Shortcuts"),
             "",
-            self.tr("Keyboard Shortcuts File (*.ekj);;"
-                    "XML Keyboard Shortcuts File (*.e4k)"),
+            self.tr("Keyboard Shortcuts File (*.ekj)"),
             "",
             E5FileDialog.DontConfirmOverwrite)
         
@@ -6520,7 +6519,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, viewer=self.taskViewer)
                     reader.readXML()
                     f.close()
@@ -6553,25 +6552,7 @@
             fn = os.path.join(Utilities.getConfigDir(),
                               "eric7session.esj")
         
-        if fn.endswith(".esj"):
-            res = self.__sessionFile.writeFile(fn)
-        else:
-            f = QFile(fn)
-            if f.open(QIODevice.OpenModeFlag.WriteOnly):
-                from E5XML.SessionWriter import SessionWriter
-                SessionWriter(f, None).writeXML()
-                f.close()
-                res = True
-            else:
-                E5MessageBox.critical(
-                    self,
-                    self.tr("Save Session"),
-                    self.tr("<p>The session file <b>{0}</b> could not be"
-                            " written.</p>")
-                    .format(fn))
-                res = False
-        
-        return res
+        return self.__sessionFile.writeFile(fn)
     
     def __readSession(self, filename=""):
         """
@@ -6610,7 +6591,7 @@
                 # old XML based format
                 f = QFile(fn)
                 if f.open(QIODevice.OpenModeFlag.ReadOnly):
-                    from E5XML.SessionReader import SessionReader
+                    from EricXML.SessionReader import SessionReader
                     self.__readingSession = True
                     reader = SessionReader(f, True)
                     reader.readXML()
@@ -6638,8 +6619,7 @@
             self,
             self.tr("Save Session"),
             Utilities.getHomeDir(),
-            self.tr("eric Session Files (*.esj);;"
-                    "eric XML Session Files (*.e5s)"),
+            self.tr("eric Session Files (*.esj)"),
             "")
         
         if not sessionFile: