Mercurial Repositories > eric / file diff

diff -r b728bb00886e -r e4dbcb22d912 Preferences/ConfigurationPages/WebBrowserAppearancePage.py
--- a/Preferences/ConfigurationPages/WebBrowserAppearancePage.py	Tue Jul 12 12:48:11 2016 +0200
+++ b/Preferences/ConfigurationPages/WebBrowserAppearancePage.py	Tue Jul 12 14:40:23 2016 +0200
@@ -72,6 +72,14 @@
         self.fantasyFontCombo.setCurrentFont(
             QFont(Preferences.getWebBrowser("FantasyFontFamily"),
                   defaultFontSize, QFont.Normal, False))
+        try:
+            # Qt 5.7+
+            self.pictographFontCombo.setCurrentFont(
+                QFont(Preferences.getWebBrowser("PictographFontFamily"),
+                      defaultFontSize, QFont.Normal, False))
+        except KeyError:
+            self.pictographFontLabel.setEnabled(False)
+            self.pictographFontCombo.setEnabled(False)
         
         self.initColour("SaveUrlColor", self.secureURLsColourButton,
                         Preferences.getWebBrowser)
@@ -128,6 +136,10 @@
         Preferences.setWebBrowser(
             "FantasyFontFamily",
             self.fantasyFontCombo.currentFont().family())
+        if self.pictographFontCombo.isEnabled():
+            Preferences.setWebBrowser(
+                "PictographFontFamily",
+                self.pictographFontCombo.currentFont().family())
         
         Preferences.setWebBrowser(
             "DefaultFontSize",