diff -r fd477cded1c1 -r 4a0f1f896341 eric6/Preferences/ConfigurationDialog.py
--- a/eric6/Preferences/ConfigurationDialog.py Thu Apr 08 17:27:12 2021 +0200
+++ b/eric6/Preferences/ConfigurationDialog.py Thu Apr 08 18:27:47 2021 +0200
@@ -75,11 +75,11 @@
accepted = pyqtSignal()
rejected = pyqtSignal()
+ # TODO: convert this to 'enum'
DefaultMode = 0
- HelpBrowserMode = 1
- TrayStarterMode = 2
- HexEditorMode = 3
- WebBrowserMode = 4
+ TrayStarterMode = 1
+ HexEditorMode = 2
+ WebBrowserMode = 3
def __init__(self, parent=None, fromEric=True, displayMode=DefaultMode,
expandedEntries=None):
@@ -90,13 +90,21 @@
@param fromEric flag indicating a dialog generation from within the
eric ide (boolean)
@param displayMode mode of the configuration dialog
- (DefaultMode, HelpBrowserMode, TrayStarterMode, HexEditorMode,
- WebBrowserMode)
+ (DefaultMode, TrayStarterMode, HexEditorMode, WebBrowserMode)
@exception RuntimeError raised to indicate an invalid dialog mode
@param expandedEntries list of entries to be shown expanded
(list of strings)
"""
super(ConfigurationWidget, self).__init__(parent)
+
+ if displayMode not in (
+ ConfigurationWidget.DefaultMode,
+ ConfigurationWidget.WebBrowserMode,
+ ConfigurationWidget.TrayStarterMode,
+ ConfigurationWidget.HexEditorMode,
+ ):
+ raise RuntimeError("Illegal mode value: {0}".format(displayMode))
+
self.fromEric = fromEric
self.displayMode = displayMode
self.__webEngine = getWebBrowserSupport() == "QtWebEngine"
@@ -428,9 +436,6 @@
"HexEditorPage", None, None],
}
- else:
- raise RuntimeError("Illegal mode value: {0}".format(displayMode))
-
# generate the list entries
self.__expandedEntries = []
for key in sorted(self.configItems.keys()):
@@ -460,8 +465,7 @@
self.buttonBox.accepted.connect(self.accept)
self.buttonBox.rejected.connect(self.rejected)
- if displayMode in [ConfigurationWidget.HelpBrowserMode,
- ConfigurationWidget.TrayStarterMode,
+ if displayMode in [ConfigurationWidget.TrayStarterMode,
ConfigurationWidget.HexEditorMode,
ConfigurationWidget.WebBrowserMode]:
self.configListSearch.hide()
@@ -920,7 +924,6 @@
masterPasswordChanged = pyqtSignal(str, str)
DefaultMode = ConfigurationWidget.DefaultMode
- HelpBrowserMode = ConfigurationWidget.HelpBrowserMode
TrayStarterMode = ConfigurationWidget.TrayStarterMode
HexEditorMode = ConfigurationWidget.HexEditorMode
WebBrowserMode = ConfigurationWidget.WebBrowserMode
@@ -937,8 +940,7 @@
@param fromEric flag indicating a dialog generation from within the
eric ide (boolean)
@param displayMode mode of the configuration dialog
- (DefaultMode, HelpBrowserMode, TrayStarterMode, HexEditorMode,
- WebBrowserMode)
+ (DefaultMode, TrayStarterMode, HexEditorMode, WebBrowserMode)
@param expandedEntries list of entries to be shown expanded
(list of strings)
"""
