Mercurial Repositories > eric / file diff

--- a/eric7/Preferences/ConfigurationPages/HelpViewersPage.py	Wed Oct 20 19:45:22 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/HelpViewersPage.py	Wed Oct 20 19:47:18 2021 +0200
@@ -34,28 +34,21 @@
         self.customViewerPicker.setMode(EricPathPickerModes.OPEN_FILE_MODE)
         
         self.helpViewerGroup = QButtonGroup()
-        self.helpViewerGroup.addButton(self.helpBrowserButton)
-        self.helpViewerGroup.addButton(self.qtAssistantButton)
-        self.helpViewerGroup.addButton(self.webBrowserButton)
-        self.helpViewerGroup.addButton(self.customViewerButton)
+        self.helpViewerGroup.addButton(self.internalViewerButton, 0)
+        self.helpViewerGroup.addButton(self.helpBrowserButton, 1)
+        self.helpViewerGroup.addButton(self.qtAssistantButton, 2)
+        self.helpViewerGroup.addButton(self.webBrowserButton, 3)
+        self.helpViewerGroup.addButton(self.customViewerButton, 4)
         
         # set initial values
+        hvId = Preferences.getHelp("HelpViewerType")
         webBrowserVariant = getWebBrowserSupport()
-        if webBrowserVariant == "QtWebEngine":
-            hvId = Preferences.getWebBrowser("HelpViewerType")
-        else:
-            # TODO: change default to internal viewer (= 0)
-            hvId = 3
+        if webBrowserVariant != "QtWebEngine":
+            if hvId == 1:
+                hvId = 0
             self.helpBrowserButton.setEnabled(False)
         
-        if hvId == 1:
-            self.helpBrowserButton.setChecked(True)
-        elif hvId == 2:
-            self.qtAssistantButton.setChecked(True)
-        elif hvId == 3:
-            self.webBrowserButton.setChecked(True)
-        else:
-            self.customViewerButton.setChecked(True)
+        self.helpViewerGroup.button(hvId).setChecked(True)
         self.customViewerPicker.setText(
             Preferences.getHelp("CustomViewer"))
         
@@ -63,16 +56,9 @@
         """
         Public slot to save the Help Viewers configuration.
         """
-        if self.helpBrowserButton.isChecked():
-            hvId = 1
-        elif self.qtAssistantButton.isChecked():
-            hvId = 2
-        elif self.webBrowserButton.isChecked():
-            hvId = 3
-        elif self.customViewerButton.isChecked():
-            hvId = 4
-        Preferences.setHelp("HelpViewerType", hvId)
-        Preferences.setWebBrowser("HelpViewerType", hvId)
+        Preferences.setHelp(
+            "HelpViewerType",
+            self.helpViewerGroup.checkedId())
         Preferences.setHelp(
             "CustomViewer",
             self.customViewerPicker.text())