diff -r 313e09453306 -r f32d7965a17e eric6/WebBrowser/OpenSearch/OpenSearchManager.py
--- a/eric6/WebBrowser/OpenSearch/OpenSearchManager.py Thu Sep 24 19:51:19 2020 +0200
+++ b/eric6/WebBrowser/OpenSearch/OpenSearchManager.py Sat Sep 26 10:58:18 2020 +0200
@@ -7,7 +7,6 @@
Module implementing a manager for open search engines.
"""
-
import os
from PyQt5.QtCore import (
@@ -423,40 +422,16 @@
"""
Public method to restore the default search engines.
"""
- # TODO: convert this to not use .qrc
from .OpenSearchReader import OpenSearchReader
- from .DefaultSearchEngines import DefaultSearchEngines_rc
- # __IGNORE_WARNING__
-
- defaultEngineFiles = [
- "Amazoncom.xml",
- "Bing.xml",
- "DeEn_Beolingus.xml",
- "DuckDuckGo.xml",
- "Facebook.xml",
- "Google.xml",
- "Google_Im_Feeling_Lucky.xml",
- "LEO_DeuEng.xml",
- "LinuxMagazin.xml",
- "MetaGer_MetaGer2.xml",
- "PyPI.xml",
- "Qwant.xml",
- "Reddit.xml",
- "StartPage.xml",
- "StartPage_en.xml",
- "Wikia.xml",
- "Wikia_en.xml",
- "Wikipedia.xml",
- "Wiktionary.xml",
- "Yahoo.xml",
- "YouTube.xml",
- "searxme.xml",
- ]
- # Keep this list in sync with the contents of the resource file.
reader = OpenSearchReader()
- for engineFileName in defaultEngineFiles:
- engineFile = QFile(":/" + engineFileName)
+ defaultEnginesDirectory = os.path.join(os.path.dirname(__file__),
+ "DefaultSearchEngines")
+ for engineFileName in (
+ QDir(defaultEnginesDirectory, "*.xml").entryList()
+ ):
+ engineFile = QFile(os.path.join(defaultEnginesDirectory,
+ engineFileName))
if not engineFile.open(QIODevice.ReadOnly):
continue
engine = reader.read(engineFile)
