--- a/eric6/QScintilla/EditorButtonsWidget.py Mon Mar 01 17:48:43 2021 +0100 +++ b/eric6/QScintilla/EditorButtonsWidget.py Tue Mar 02 17:17:09 2021 +0100 @@ -60,27 +60,29 @@ self.__outerLayout = QVBoxLayout(self) self.__outerLayout.setContentsMargins(margin, margin, margin, margin) self.__outerLayout.setSpacing(spacing) - self.__outerLayout.setAlignment(Qt.AlignHCenter) + self.__outerLayout.setAlignment(Qt.AlignmentFlag.AlignHCenter) self.__upButton = QToolButton(self) - self.__upButton.setArrowType(Qt.UpArrow) + self.__upButton.setArrowType(Qt.ArrowType.UpArrow) self.__upButton.setSizePolicy( - QSizePolicy.MinimumExpanding, QSizePolicy.Minimum) + QSizePolicy.Policy.MinimumExpanding, QSizePolicy.Policy.Minimum) self.__upButton.setAutoRepeat(True) self.__scroller = QScrollArea(self) self.__scroller.setWidget(self.__buttonsWidget) self.__scroller.setSizePolicy( - QSizePolicy.Minimum, QSizePolicy.Expanding) - self.__scroller.setFrameShape(QFrame.NoFrame) - self.__scroller.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOff) - self.__scroller.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff) + QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding) + self.__scroller.setFrameShape(QFrame.Shape.NoFrame) + self.__scroller.setVerticalScrollBarPolicy( + Qt.ScrollBarPolicy.ScrollBarAlwaysOff) + self.__scroller.setHorizontalScrollBarPolicy( + Qt.ScrollBarPolicy.ScrollBarAlwaysOff) self.__scroller.setWidgetResizable(False) self.__downButton = QToolButton(self) - self.__downButton.setArrowType(Qt.DownArrow) + self.__downButton.setArrowType(Qt.ArrowType.DownArrow) self.__downButton.setSizePolicy( - QSizePolicy.MinimumExpanding, QSizePolicy.Minimum) + QSizePolicy.Policy.MinimumExpanding, QSizePolicy.Policy.Minimum) self.__downButton.setAutoRepeat(True) self.__outerLayout.addWidget(self.__upButton) @@ -186,7 +188,7 @@ self.tr("Header 3")) button = self.__addButton("header", "formatTextHeader", self.tr("Header")) - button.setPopupMode(QToolButton.InstantPopup) + button.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup) button.setMenu(self.__headerMenu) self.__addSeparator() self.__addButton("code", "formatTextInlineCode", @@ -239,10 +241,10 @@ line = QFrame(self.__buttonsWidget) line.setLineWidth(2) if isinstance(self.__layout, QVBoxLayout): - line.setFrameShape(QFrame.HLine) + line.setFrameShape(QFrame.Shape.HLine) else: - line.setFrameShape(QFrame.VLine) - line.setFrameShadow(QFrame.Sunken) + line.setFrameShape(QFrame.Shape.VLine) + line.setFrameShadow(QFrame.Shadow.Sunken) self.__layout.addWidget(line) self.__separators.append(line)