Mercurial Repositories > eric / file diff

--- a/Helpviewer/Bookmarks/BookmarksImporters/__init__.py	Sun Mar 18 15:05:38 2012 +0100
+++ b/Helpviewer/Bookmarks/BookmarksImporters/__init__.py	Sun Mar 18 16:15:50 2012 +0100
@@ -22,18 +22,14 @@
     """
     importers = []
     importers.append(
-        (UI.PixmapCache.getIcon("ericWeb48.png"),
-         "eric5 Web Browser",
-         "e5browser"))
+        (UI.PixmapCache.getIcon("ericWeb48.png"), "eric5 Web Browser", "e5browser"))
     importers.append(
-        (UI.PixmapCache.getIcon("chrome.png"),
-         "Google Chrome",
-         "chrome"))
+        (UI.PixmapCache.getIcon("chrome.png"), "Google Chrome", "chrome"))
     if not Globals.isWindowsPlatform() and not Globals.isMacPlatform():
         importers.append(
-            (UI.PixmapCache.getIcon("chromium.png"),
-             "Chromium",
-             "chromium"))
+            (UI.PixmapCache.getIcon("chromium.png"), "Chromium", "chromium"))
+    importers.append(
+        (UI.PixmapCache.getIcon("opera.png"), "Opera", "opera"))
     importers.append(
         (UI.PixmapCache.getIcon("xbel.png"),
          QCoreApplication.translate("BookmarksImporters", "XBEL File"),
@@ -43,6 +39,7 @@
          QCoreApplication.translate("BookmarksImporters", "HTML File"),
          "html"))
     return importers
+    # TODO: importers for Safari, Firefox, IE
 
 
 def getImporterInfo(id):
@@ -63,6 +60,9 @@
     elif id in ["chrome", "chromium"]:
         from . import ChromeImporter
         return ChromeImporter.getImporterInfo(id)
+    elif id == "opera":
+        from . import OperaImporter
+        return OperaImporter.getImporterInfo(id)
     else:
         raise ValueError("Invalid importer ID given ({0}).".format(id))
 
@@ -83,5 +83,8 @@
     elif id in ["chrome", "chromium"]:
         from . import ChromeImporter
         return ChromeImporter.ChromeImporter(id, parent)
+    elif id == "opera":
+        from . import OperaImporter
+        return OperaImporter.OperaImporter(id, parent)
     else:
         raise ValueError("No importer for ID {0}.".format(id))