Mercurial Repositories > eric / changeset

--- a/eric7/Preferences/ConfigurationPages/WebBrowserPage.py	Sun Aug 29 17:50:13 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/WebBrowserPage.py	Sun Aug 29 20:21:41 2021 +0200
@@ -144,8 +144,10 @@
             idx = 5
         self.expireHistory.setCurrentIndex(idx)
         
-        # FIXME: fix this issue
-        for language in range(2, QLocale.Language.LastLanguage + 1):
+        for language in QLocale.Language:
+            if language == QLocale.Language.C:
+                continue
+            
             countries = [
                 loc.country()
                 for loc in QLocale.matchingLocales(
@@ -158,7 +160,8 @@
                     QLocale.languageToString(language), language)
         self.languageCombo.model().sort(0)
         self.languageCombo.insertSeparator(0)
-        self.languageCombo.insertItem(0, QLocale.languageToString(0), 0)
+        self.languageCombo.insertItem(
+            0, QLocale.languageToString(QLocale.Language.AnyLanguage), 0)
         index = self.languageCombo.findData(
             Preferences.getWebBrowser("SearchLanguage"))
         if index > -1:

--- a/eric7/Preferences/__init__.py	Sun Aug 29 17:50:13 2021 +0200
+++ b/eric7/Preferences/__init__.py	Sun Aug 29 20:21:41 2021 +0200
@@ -1144,6 +1144,10 @@
             "DnsPrefetchEnabled":
                 webEngineSettings.testAttribute(
                     QWebEngineSettings.WebAttribute.DnsPrefetchEnabled),
+            # TODO: add support for these attributes
+#            "HyperlinkAuditingEnabled"
+#            "Accelerated2dCanvasEnabled"
+#            "AutoLoadIconsForPage"
         })
         with contextlib.suppress(AttributeError):
             # Qt 5.13
@@ -2784,7 +2788,7 @@
     elif key in ["StartupBehavior", "HistoryLimit",
                  "DownloadManagerRemovePolicy", "SyncType", "SyncFtpPort",
                  "SyncFtpIdleTimeout", "SyncEncryptionKeyLength",
-                 "SearchLanguage", "DefaultFontSize", "DefaultFixedFontSize",
+                 "DefaultFontSize", "DefaultFixedFontSize",
                  "MinimumFontSize", "MinimumLogicalFontSize",
                  "DiskCacheSize", "AcceptCookies", "KeepCookiesUntil",
                  "AdBlockUpdatePeriod", "TabManagerGroupByType",