Mercurial Repositories > eric / file diff

--- a/eric6/WebBrowser/WebBrowserWindow.py	Thu Jan 28 13:19:22 2021 +0100
+++ b/eric6/WebBrowser/WebBrowserWindow.py	Thu Jan 28 16:35:28 2021 +0100
@@ -5019,7 +5019,8 @@
             None,
             self.tr("Export Keyboard Shortcuts"),
             "",
-            self.tr("Keyboard shortcut file (*.e4k)"),
+            self.tr("Keyboard Shortcuts File (*.ekj);;"
+                    "XML Keyboard Shortcuts File (*.e4k)"),
             "",
             E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite))
         
@@ -5032,8 +5033,18 @@
             if ex:
                 fn += ex
         
-        from Preferences import Shortcuts
-        Shortcuts.exportShortcuts(fn, helpViewer=self)
+        if os.path.exists(fn):
+            ok = E5MessageBox.yesNo(
+                self,
+                self.tr("Export Keyboard Shortcuts"),
+                self.tr("""<p>The keyboard shortcuts file <b>{0}</b> exists"""
+                        """ already. Overwrite it?</p>""").format(fn))
+        else:
+            ok = True
+        
+        if ok:
+            from Preferences import Shortcuts
+            Shortcuts.exportShortcuts(fn, helpViewer=self)
 
     def __importShortcuts(self):
         """
@@ -5043,7 +5054,8 @@
             None,
             self.tr("Import Keyboard Shortcuts"),
             "",
-            self.tr("Keyboard shortcut file (*.e4k)"))
+            self.tr("Keyboard Shortcuts File (*.ekj);;"
+                    "XML Keyboard shortcut file (*.e4k)"))
         
         if fn:
             from Preferences import Shortcuts