--- a/src/eric7/UI/UserInterface.py Fri Jan 05 16:04:03 2024 +0100 +++ b/src/eric7/UI/UserInterface.py Sat Jan 06 15:21:02 2024 +0100 @@ -9,6 +9,7 @@ import contextlib import datetime +import enum import functools import getpass import json @@ -174,6 +175,16 @@ self.__nWrite(self.__bufferedWrite()) +class UserInterfaceSide(enum.Enum): + """ + Class defining the supported sides of the user interface. + """ + + Left = 1 + Bottom = 2 + Right = 3 + + class UserInterface(EricMainWindow): """ Class implementing the main user interface. @@ -201,11 +212,6 @@ maxFilePathLen = 100 maxMenuFilePathLen = 75 - # TODO: change this to an enum - LeftSide = 1 - BottomSide = 2 - RightSide = 3 - ErrorLogFileName = "eric7_error.log" def __init__( @@ -1468,8 +1474,7 @@ Public method to add a widget to the sides. @param side side to add the widget to - @type int (one of UserInterface.LeftSide, UserInterface.BottomSide, - UserInterface.RightSide) + @type UserInterfaceSide @param widget reference to the widget to add @type QWidget @param icon icon to be used @@ -1477,28 +1482,23 @@ @param label label text to be shown @type str """ - if side in [ - UserInterface.LeftSide, - UserInterface.BottomSide, - UserInterface.RightSide, - ]: - if self.__layoutType == "Toolboxes": - if side == UserInterface.LeftSide: - self.lToolbox.addItem(widget, icon, label) - elif side == UserInterface.BottomSide: - self.hToolbox.addItem(widget, icon, label) - elif side == UserInterface.RightSide: - self.rToolbox.addItem(widget, icon, label) - elif self.__layoutType == "Sidebars": - if side == UserInterface.LeftSide: + if self.__layoutType == "Toolboxes": + if side == UserInterfaceSide.Left: + self.lToolbox.addItem(widget, icon, label) + elif side == UserInterfaceSide.Bottom: + self.hToolbox.addItem(widget, icon, label) + elif side == UserInterfaceSide.Right: + self.rToolbox.addItem(widget, icon, label) + elif self.__layoutType == "Sidebars": + if side == UserInterfaceSide.Left: + self.leftSidebar.addTab(widget, icon, label) + elif side == UserInterfaceSide.Bottom: + self.bottomSidebar.addTab(widget, icon, label) + elif side == UserInterfaceSide.Right: + if self.rightSidebar: + self.rightSidebar.addTab(widget, icon, label) + else: self.leftSidebar.addTab(widget, icon, label) - elif side == UserInterface.BottomSide: - self.bottomSidebar.addTab(widget, icon, label) - elif side == UserInterface.RightSide: - if self.rightSidebar: - self.rightSidebar.addTab(widget, icon, label) - else: - self.leftSidebar.addTab(widget, icon, label) def removeSideWidget(self, widget): """