Mercurial Repositories > eric / file diff

--- a/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/__init__.py	Wed Nov 09 15:18:07 2022 +0100
+++ b/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/__init__.py	Fri Nov 11 15:30:47 2022 +0100
@@ -19,40 +19,42 @@
     """
     Module function to get a list of supported importers.
 
-    @return list of tuples with an icon (QIcon), readable name (string) and
-        internal name (string)
+    @return list of tuples with an icon, readable name and internal name
+    @rtype list of tuples of (QIcon, str, str)
     """
-    importers = []
-    importers.append(
-        (EricPixmapCache.getIcon("ericWeb48"), "eric Web Browser", "e5browser")
-    )
-    importers.append((EricPixmapCache.getIcon("firefox"), "Mozilla Firefox", "firefox"))
-    importers.append((EricPixmapCache.getIcon("chrome"), "Google Chrome", "chrome"))
+    importers = [
+        (EricPixmapCache.getIcon("ericWeb48"), "eric Web Browser", "e5browser"),
+        (EricPixmapCache.getIcon("firefox"), "Mozilla Firefox", "firefox"),
+        (EricPixmapCache.getIcon("chrome"), "Google Chrome", "chrome"),
+        (EricPixmapCache.getIcon("opera_legacy"), "Opera (Legacy)", "opera_legacy"),
+        (EricPixmapCache.getIcon("safari"), "Apple Safari", "safari"),
+        (
+            EricPixmapCache.getIcon("xbel"),
+            QCoreApplication.translate("BookmarksImporters", "XBEL File"),
+            "xbel",
+        ),
+        (
+            EricPixmapCache.getIcon("html"),
+            QCoreApplication.translate("BookmarksImporters", "HTML File"),
+            "html",
+        ),
+        (EricPixmapCache.getIcon("edge"), "Microsoft Edge", "edge"),
+        (EricPixmapCache.getIcon("vivaldi"), "Vivaldi", "vivaldi"),
+        (EricPixmapCache.getIcon("opera"), "Opera", "opera"),
+        (EricPixmapCache.getIcon("falkon"), "Falkon", "falkon"),
+    ]
+
     if Globals.isLinuxPlatform():
         importers.append((EricPixmapCache.getIcon("chromium"), "Chromium", "chromium"))
         importers.append(
             (EricPixmapCache.getIcon("konqueror"), "Konqueror", "konqueror")
         )
-    importers.append((EricPixmapCache.getIcon("opera"), "Opera", "opera"))
-    importers.append((EricPixmapCache.getIcon("safari"), "Apple Safari", "safari"))
+
     if Globals.isWindowsPlatform():
         importers.append(
             (EricPixmapCache.getIcon("internet_explorer"), "Internet Explorer", "ie")
         )
-    importers.append(
-        (
-            EricPixmapCache.getIcon("xbel"),
-            QCoreApplication.translate("BookmarksImporters", "XBEL File"),
-            "xbel",
-        )
-    )
-    importers.append(
-        (
-            EricPixmapCache.getIcon("html"),
-            QCoreApplication.translate("BookmarksImporters", "HTML File"),
-            "html",
-        )
-    )
+
     return importers
 
 
@@ -99,12 +101,16 @@
         "chrome": ".ChromeImporter",
         "chromium": ".ChromeImporter",
         "e5browser": ".XbelImporter",
+        "edge": ".ChromeImporter",
+        "falkon": ".ChromeImporter",
         "firefox": ".FirefoxImporter",
         "html": ".HtmlImporter",
         "ie": ".IExplorerImporter",
         "konqueror": ".XbelImporter",
-        "opera": ".OperaImporter",
+        "opera": ".ChromeImporter",
+        "opera_legacy": ".OperaImporter",
         "safari": ".SafariImporter",
+        "vivaldi": ".ChromeImporter",
         "xbel": ".XbelImporter",
     }
     if sourceId in importerMapping: