Mercurial Repositories > eric / file diff

--- a/WebBrowser/WebBrowserWindow.py	Fri Dec 14 19:52:38 2018 +0100
+++ b/WebBrowser/WebBrowserWindow.py	Sat Dec 15 16:21:38 2018 +0100
@@ -129,15 +129,15 @@
         @type QWidget
         @param name name of this window
         @type str
-        @keyparam searchWord word to search for
+        @param searchWord word to search for
         @type str
-        @keyparam private flag indicating a private browsing window
+        @param private flag indicating a private browsing window
         @type bool
-        @keyparam qthelp flag indicating to enable the QtHelp support
+        @param qthelp flag indicating to enable the QtHelp support
         @type bool
-        @keyparam settingsDir directory to be used for the settings files
+        @param settingsDir directory to be used for the settings files
         @type str
-        @keyparam restoreSession flag indicating a restore session action
+        @param restoreSession flag indicating a restore session action
         @type bool
         @param single flag indicating to start in single application mode
         @type bool
@@ -2359,6 +2359,7 @@
         settingstb.setObjectName("SettingsToolBar")
         settingstb.setIconSize(UI.Config.ToolBarIconSize)
         settingstb.addAction(self.prefAct)
+        settingstb.addAction(self.shortcutsAct)
         settingstb.addAction(self.acceptedLanguagesAct)
         settingstb.addAction(self.cookiesAct)
         settingstb.addAction(self.flashCookiesAct)
@@ -3198,7 +3199,7 @@
         """
         from Preferences.ConfigurationDialog import ConfigurationDialog
         dlg = ConfigurationDialog(
-            self, 'Configuration', True, fromEric=self.__fromEric,
+            self, 'Configuration', True, fromEric=False,
             displayMode=ConfigurationDialog.WebBrowserMode)
         dlg.preferencesChanged.connect(self.preferencesChanged)
         dlg.masterPasswordChanged.connect(
@@ -3586,10 +3587,11 @@
         """
         Private slot to remove non-existing documentation from the help engine.
         """
-        for namespace in self.__helpEngine.registeredDocumentations():
-            docFile = self.__helpEngine.documentationFileName(namespace)
-            if not os.path.exists(docFile):
-                self.__helpEngine.unregisterDocumentation(namespace)
+        if WebBrowserWindow._useQtHelp:
+            for namespace in self.__helpEngine.registeredDocumentations():
+                docFile = self.__helpEngine.documentationFileName(namespace)
+                if not os.path.exists(docFile):
+                    self.__helpEngine.unregisterDocumentation(namespace)
         
     def __lookForNewDocumentation(self):
         """