diff options
129 files changed, 383 insertions, 370 deletions
diff --git a/examples/charts/areachart/areachart.py b/examples/charts/areachart/areachart.py index d1e2b7042..4fdd35878 100644 --- a/examples/charts/areachart/areachart.py +++ b/examples/charts/areachart/areachart.py @@ -50,11 +50,11 @@ class TestChart(QMainWindow): self.chart.addSeries(self.series) self.chart.setTitle("Simple areachart example") self.chart.createDefaultAxes() - self.chart.axes(Qt.Horizontal)[0].setRange(0, 20) + self.chart.axes(Qt.Orientation.Horizontal)[0].setRange(0, 20) self.chart.axes(Qt.Vertical)[0].setRange(0, 10) self._chart_view = QChartView(self.chart) - self._chart_view.setRenderHint(QPainter.Antialiasing) + self._chart_view.setRenderHint(QPainter.RenderHint.Antialiasing) self.setCentralWidget(self._chart_view) diff --git a/examples/charts/barchart/barchart.py b/examples/charts/barchart/barchart.py index f542b9fa3..793a013de 100644 --- a/examples/charts/barchart/barchart.py +++ b/examples/charts/barchart/barchart.py @@ -56,7 +56,7 @@ class TestChart(QMainWindow): self.chart.legend().setAlignment(Qt.AlignBottom) self._chart_view = QChartView(self.chart) - self._chart_view.setRenderHint(QPainter.Antialiasing) + self._chart_view.setRenderHint(QPainter.RenderHint.Antialiasing) self.setCentralWidget(self._chart_view) diff --git a/examples/charts/callout/callout.py b/examples/charts/callout/callout.py index 08c34fb6d..d8ba8e6e8 100644 --- a/examples/charts/callout/callout.py +++ b/examples/charts/callout/callout.py @@ -149,7 +149,7 @@ class View(QGraphicsView): self._chart.createDefaultAxes() self._chart.setAcceptHoverEvents(True) - self.setRenderHint(QPainter.Antialiasing) + self.setRenderHint(QPainter.RenderHint.Antialiasing) self.scene().addItem(self._chart) self._coordX = QGraphicsSimpleTextItem(self._chart) diff --git a/examples/charts/chartthemes/main.py b/examples/charts/chartthemes/main.py index 1157f270e..b7a57029a 100644 --- a/examples/charts/chartthemes/main.py +++ b/examples/charts/chartthemes/main.py @@ -145,7 +145,7 @@ class ThemeWidget(QWidget): lower_series = upper_series chart.createDefaultAxes() - axis_x = chart.axes(Qt.Horizontal)[0] + axis_x = chart.axes(Qt.Orientation.Horizontal)[0] axis_x.setRange(0, self.value_count - 1) axis_y = chart.axes(Qt.Vertical)[0] axis_y.setRange(0, self.value_max) @@ -188,7 +188,7 @@ class ThemeWidget(QWidget): chart.addSeries(series) chart.createDefaultAxes() - axis_x = chart.axes(Qt.Horizontal)[0] + axis_x = chart.axes(Qt.Orientation.Horizontal)[0] axis_x.setRange(0, self.value_max) axis_y = chart.axes(Qt.Vertical)[0] axis_y.setRange(0, self.value_count) @@ -227,7 +227,7 @@ class ThemeWidget(QWidget): chart.addSeries(series) chart.createDefaultAxes() - axis_x = chart.axes(Qt.Horizontal)[0] + axis_x = chart.axes(Qt.Orientation.Horizontal)[0] axis_x.setRange(0, self.value_max) axis_y = chart.axes(Qt.Vertical)[0] axis_y.setRange(0, self.value_count) @@ -248,7 +248,7 @@ class ThemeWidget(QWidget): chart.addSeries(series) chart.createDefaultAxes() - axis_x = chart.axes(Qt.Horizontal)[0] + axis_x = chart.axes(Qt.Orientation.Horizontal)[0] axis_x.setRange(0, self.value_max) axis_y = chart.axes(Qt.Vertical)[0] axis_y.setRange(0, self.value_count) @@ -294,7 +294,7 @@ class ThemeWidget(QWidget): # Update antialiasing checked = self.ui.antialiasCheckBox.isChecked() for chart in self.charts: - chart.setRenderHint(QPainter.Antialiasing, checked) + chart.setRenderHint(QPainter.RenderHint.Antialiasing, checked) # Update animation options idx = self.ui.animatedComboBox.currentIndex() diff --git a/examples/charts/donutbreakdown/donutbreakdown.py b/examples/charts/donutbreakdown/donutbreakdown.py index c4340931d..d6792357a 100644 --- a/examples/charts/donutbreakdown/donutbreakdown.py +++ b/examples/charts/donutbreakdown/donutbreakdown.py @@ -139,7 +139,7 @@ if __name__ == "__main__": window = QMainWindow() chart_view = QChartView(donut_breakdown) - chart_view.setRenderHint(QPainter.Antialiasing) + chart_view.setRenderHint(QPainter.RenderHint.Antialiasing) window.setCentralWidget(chart_view) available_geometry = window.screen().availableGeometry() size = available_geometry.height() * 0.75 diff --git a/examples/charts/dynamicspline/main.py b/examples/charts/dynamicspline/main.py index cbb5109f1..f74614e55 100644 --- a/examples/charts/dynamicspline/main.py +++ b/examples/charts/dynamicspline/main.py @@ -18,9 +18,9 @@ if __name__ == "__main__": chart = Chart() chart.setTitle("Dynamic spline chart") chart.legend().hide() - chart.setAnimationOptions(QChart.AllAnimations) + chart.setAnimationOptions(QChart.AnimationOption.AllAnimations) chart_view = QChartView(chart) - chart_view.setRenderHint(QPainter.Antialiasing) + chart_view.setRenderHint(QPainter.RenderHint.Antialiasing) window.setCentralWidget(chart_view) window.resize(400, 300) window.show() diff --git a/examples/charts/legend/legend.py b/examples/charts/legend/legend.py index 36c5b6ed0..cdc420520 100644 --- a/examples/charts/legend/legend.py +++ b/examples/charts/legend/legend.py @@ -100,7 +100,7 @@ class MainWidget(QWidget): self.chart.legend().setVisible(True) self.chart.legend().setAlignment(Qt.AlignBottom) - self.chart_view.setRenderHint(QPainter.Antialiasing) + self.chart_view.setRenderHint(QPainter.RenderHint.Antialiasing) def show_legend_spinbox(self): self.legend_settings.setVisible(True) diff --git a/examples/charts/lineandbar/lineandbar.py b/examples/charts/lineandbar/lineandbar.py index e824b3aa1..fe559a64e 100644 --- a/examples/charts/lineandbar/lineandbar.py +++ b/examples/charts/lineandbar/lineandbar.py @@ -67,7 +67,7 @@ class TestChart(QMainWindow): self.chart.legend().setAlignment(Qt.AlignBottom) self._chart_view = QChartView(self.chart) - self._chart_view.setRenderHint(QPainter.Antialiasing) + self._chart_view.setRenderHint(QPainter.RenderHint.Antialiasing) self.setCentralWidget(self._chart_view) diff --git a/examples/charts/linechart/linechart.py b/examples/charts/linechart/linechart.py index b618cbc33..3a779e83e 100644 --- a/examples/charts/linechart/linechart.py +++ b/examples/charts/linechart/linechart.py @@ -34,7 +34,7 @@ class TestChart(QMainWindow): self.chart.setTitle("Simple line chart example") self._chart_view = QChartView(self.chart) - self._chart_view.setRenderHint(QPainter.Antialiasing) + self._chart_view.setRenderHint(QPainter.RenderHint.Antialiasing) self.setCentralWidget(self._chart_view) diff --git a/examples/charts/logvalueaxis/logvalueaxis.py b/examples/charts/logvalueaxis/logvalueaxis.py index be58ca0a4..5e86eaf22 100644 --- a/examples/charts/logvalueaxis/logvalueaxis.py +++ b/examples/charts/logvalueaxis/logvalueaxis.py @@ -43,7 +43,7 @@ class TestChart(QMainWindow): self.series.attachAxis(self._axis_y) self._chart_view = QChartView(self.chart) - self._chart_view.setRenderHint(QPainter.Antialiasing) + self._chart_view.setRenderHint(QPainter.RenderHint.Antialiasing) self.setCentralWidget(self._chart_view) diff --git a/examples/charts/modeldata/modeldata.py b/examples/charts/modeldata/modeldata.py index f12eb8999..5fd88be32 100644 --- a/examples/charts/modeldata/modeldata.py +++ b/examples/charts/modeldata/modeldata.py @@ -38,10 +38,10 @@ class CustomTableModel(QAbstractTableModel): return self.column_count def headerData(self, section, orientation, role): - if role != Qt.DisplayRole: + if role != Qt.ItemDataRole.DisplayRole: return None - if orientation == Qt.Horizontal: + if orientation == Qt.Orientation.Horizontal: if section % 2 == 0: return "x" else: @@ -49,12 +49,12 @@ class CustomTableModel(QAbstractTableModel): else: return str(section + 1) - def data(self, index, role=Qt.DisplayRole): - if role == Qt.DisplayRole: + def data(self, index, role=Qt.ItemDataRole.DisplayRole): + if role == Qt.ItemDataRole.DisplayRole: return self.input_data[index.row()][index.column()] - elif role == Qt.EditRole: + elif role == Qt.ItemDataRole.EditRole: return self.input_data[index.row()][index.column()] - elif role == Qt.BackgroundRole: + elif role == Qt.ItemDataRole.BackgroundRole: for color, rect in self.mapping.items(): if rect.contains(index.column(), index.row()): return QColor(color) @@ -62,8 +62,8 @@ class CustomTableModel(QAbstractTableModel): return QColor(Qt.white) return None - def setData(self, index, value, role=Qt.EditRole): - if index.isValid() and role == Qt.EditRole: + def setData(self, index, value, role=Qt.ItemDataRole.EditRole): + if index.isValid() and role == Qt.ItemDataRole.EditRole: self.input_data[index.row()][index.column()] = float(value) self.dataChanged.emit(index, index) return True @@ -123,7 +123,7 @@ class TableWidget(QWidget): self.chart.createDefaultAxes() self.chart_view = QChartView(self.chart) - self.chart_view.setRenderHint(QPainter.Antialiasing) + self.chart_view.setRenderHint(QPainter.RenderHint.Antialiasing) self.chart_view.setMinimumSize(640, 480) # create main layout diff --git a/examples/charts/nesteddonuts/nesteddonuts.py b/examples/charts/nesteddonuts/nesteddonuts.py index cfc2f80e9..bb566ffa6 100644 --- a/examples/charts/nesteddonuts/nesteddonuts.py +++ b/examples/charts/nesteddonuts/nesteddonuts.py @@ -22,7 +22,7 @@ class Widget(QWidget): self.setMinimumSize(800, 600) self.donuts = [] self.chart_view = QChartView() - self.chart_view.setRenderHint(QPainter.Antialiasing) + self.chart_view.setRenderHint(QPainter.RenderHint.Antialiasing) self.chart = self.chart_view.chart() self.chart.legend().setVisible(False) self.chart.setTitle("Nested donuts demo") diff --git a/examples/charts/percentbarchart/percentbarchart.py b/examples/charts/percentbarchart/percentbarchart.py index e518c1721..82f64e993 100644 --- a/examples/charts/percentbarchart/percentbarchart.py +++ b/examples/charts/percentbarchart/percentbarchart.py @@ -51,7 +51,7 @@ class MainWindow(QMainWindow): chart.legend().setAlignment(Qt.AlignBottom) chart_view = QChartView(chart) - chart_view.setRenderHint(QPainter.Antialiasing) + chart_view.setRenderHint(QPainter.RenderHint.Antialiasing) self.setCentralWidget(chart_view) diff --git a/examples/charts/piechart/piechart.py b/examples/charts/piechart/piechart.py index d866ef9ed..317e17fec 100644 --- a/examples/charts/piechart/piechart.py +++ b/examples/charts/piechart/piechart.py @@ -36,7 +36,7 @@ class TestChart(QMainWindow): self.chart.legend().hide() self._chart_view = QChartView(self.chart) - self._chart_view.setRenderHint(QPainter.Antialiasing) + self._chart_view.setRenderHint(QPainter.RenderHint.Antialiasing) self.setCentralWidget(self._chart_view) diff --git a/examples/charts/pointselectionandmarkers/pointselectionandmarkers.py b/examples/charts/pointselectionandmarkers/pointselectionandmarkers.py index f151287f6..0416d0063 100644 --- a/examples/charts/pointselectionandmarkers/pointselectionandmarkers.py +++ b/examples/charts/pointselectionandmarkers/pointselectionandmarkers.py @@ -49,7 +49,7 @@ if __name__ == "__main__": chart.legend().setVisible(False) chart_view = QChartView(chart) - chart_view.setRenderHint(QPainter.Antialiasing) + chart_view.setRenderHint(QPainter.RenderHint.Antialiasing) control_widget = QWidget(window) control_layout = QGridLayout(control_widget) diff --git a/examples/charts/pointselectionandmarkers/utilities.py b/examples/charts/pointselectionandmarkers/utilities.py index 5b47dddc5..124cdad4d 100644 --- a/examples/charts/pointselectionandmarkers/utilities.py +++ b/examples/charts/pointselectionandmarkers/utilities.py @@ -12,7 +12,7 @@ def rectangle(point_type, image_size): image = QImage(image_size, image_size, QImage.Format_RGB32) painter = QPainter() painter.begin(image) - painter.setRenderHint(QPainter.Antialiasing) + painter.setRenderHint(QPainter.RenderHint.Antialiasing) painter.fillRect(0, 0, image_size, image_size, point_type[2]) painter.end() return image @@ -27,7 +27,7 @@ def circle(point_type, image_size): image.fill(QColor(0, 0, 0, 0)) painter = QPainter() painter.begin(image) - painter.setRenderHint(QPainter.Antialiasing) + painter.setRenderHint(QPainter.RenderHint.Antialiasing) painter.setBrush(point_type[2]) pen = painter.pen() pen.setWidth(0) diff --git a/examples/charts/temperaturerecords/temperaturerecords.py b/examples/charts/temperaturerecords/temperaturerecords.py index ef129c073..ad1cdbf72 100644 --- a/examples/charts/temperaturerecords/temperaturerecords.py +++ b/examples/charts/temperaturerecords/temperaturerecords.py @@ -48,7 +48,7 @@ class MainWindow(QMainWindow): chart.legend().setAlignment(Qt.AlignBottom) chart_view = QChartView(chart) - chart_view.setRenderHint(QPainter.Antialiasing) + chart_view.setRenderHint(QPainter.RenderHint.Antialiasing) self.setCentralWidget(chart_view) diff --git a/examples/corelib/mimetypesbrowser/mimetypemodel.py b/examples/corelib/mimetypesbrowser/mimetypemodel.py index 96ad4e290..dd10b29ce 100644 --- a/examples/corelib/mimetypesbrowser/mimetypemodel.py +++ b/examples/corelib/mimetypesbrowser/mimetypemodel.py @@ -5,8 +5,8 @@ from __future__ import annotations from PySide6.QtCore import QMimeDatabase, QMimeType, QModelIndex, QObject, Qt, qWarning from PySide6.QtGui import QStandardItem, QStandardItemModel -mimeTypeRole = Qt.UserRole + 1 -iconQueriedRole = Qt.UserRole + 2 +mimeTypeRole = Qt.ItemDataRole.UserRole + 1 +iconQueriedRole = Qt.ItemDataRole.UserRole + 2 def createRow(t: QMimeType): diff --git a/examples/corelib/settingseditor/settingseditor.py b/examples/corelib/settingseditor/settingseditor.py index bd5766adb..f5a83afd6 100644 --- a/examples/corelib/settingseditor/settingseditor.py +++ b/examples/corelib/settingseditor/settingseditor.py @@ -529,7 +529,7 @@ class SettingsTree(QTreeWidget): key = ancestor.text(0) + '/' + key ancestor = ancestor.parent() - self.settings.setValue(key, item.data(2, Qt.UserRole)) + self.settings.setValue(key, item.data(2, Qt.ItemDataRole.UserRole)) if self.auto_refresh: self.refresh() @@ -543,7 +543,7 @@ class SettingsTree(QTreeWidget): child = self.child_at(parent, child_index) child.setText(1, '') child.setText(2, '') - child.setData(2, Qt.UserRole, None) + child.setData(2, Qt.ItemDataRole.UserRole, None) self.move_item_forward(parent, child_index, divider_index) else: child = self.create_item(group, parent, divider_index) @@ -581,7 +581,7 @@ class SettingsTree(QTreeWidget): value = self.settings.value(key, type=value_type) child.setText(1, value.__class__.__name__) child.setText(2, VariantDelegate.display_text(value)) - child.setData(2, Qt.UserRole, value) + child.setData(2, Qt.ItemDataRole.UserRole, value) while divider_index < self.child_count(parent): self.delete_item(parent, divider_index) @@ -638,7 +638,7 @@ class VariantDelegate(QItemDelegate): def paint(self, painter, option, index): if index.column() == 2: - value = index.model().data(index, Qt.UserRole) + value = index.model().data(index, Qt.ItemDataRole.UserRole) if not self.is_supported_type(value): my_option = QStyleOptionViewItem(option) my_option.state &= ~QStyle.State_Enabled @@ -651,7 +651,7 @@ class VariantDelegate(QItemDelegate): if index.column() != 2: return None - original_value = index.model().data(index, Qt.UserRole) + original_value = index.model().data(index, Qt.ItemDataRole.UserRole) if not self.is_supported_type(original_value): return None @@ -672,7 +672,7 @@ class VariantDelegate(QItemDelegate): def setEditorData(self, editor, index): if not editor: return - value = index.model().data(index, Qt.UserRole) + value = index.model().data(index, Qt.ItemDataRole.UserRole) if isinstance(editor, QCheckBox): editor.setCheckState(Qt.Checked if value else Qt.Unchecked) elif isinstance(editor, QSpinBox): @@ -689,7 +689,7 @@ class VariantDelegate(QItemDelegate): state, text, _ = validator.validate(text, 0) if state != QValidator.Acceptable: return None - original_value = index.model().data(index, Qt.UserRole) + original_value = index.model().data(index, Qt.ItemDataRole.UserRole) return self._type_checker.from_string(text, original_value) def setModelData(self, editor, model, index): @@ -701,8 +701,8 @@ class VariantDelegate(QItemDelegate): else: value = self.value_from_lineedit(editor, model, index) if value is not None: - model.setData(index, value, Qt.UserRole) - model.setData(index, self.display_text(value), Qt.DisplayRole) + model.setData(index, value, Qt.ItemDataRole.UserRole) + model.setData(index, self.display_text(value), Qt.ItemDataRole.DisplayRole) @staticmethod def is_supported_type(value): diff --git a/examples/datavisualization/graphgallery/bargraph.py b/examples/datavisualization/graphgallery/bargraph.py index b89560dd8..6d72c6959 100644 --- a/examples/datavisualization/graphgallery/bargraph.py +++ b/examples/datavisualization/graphgallery/bargraph.py @@ -124,20 +124,20 @@ class BarGraph(QObject): reflectionCheckBox.setText("Show reflections") reflectionCheckBox.setChecked(False) - rotationSliderX = QSlider(Qt.Horizontal, self._barsWidget) + rotationSliderX = QSlider(Qt.Orientation.Horizontal, self._barsWidget) rotationSliderX.setTickInterval(30) rotationSliderX.setTickPosition(QSlider.TicksBelow) rotationSliderX.setMinimum(-180) rotationSliderX.setValue(0) rotationSliderX.setMaximum(180) - rotationSliderY = QSlider(Qt.Horizontal, self._barsWidget) + rotationSliderY = QSlider(Qt.Orientation.Horizontal, self._barsWidget) rotationSliderY.setTickInterval(15) rotationSliderY.setTickPosition(QSlider.TicksAbove) rotationSliderY.setMinimum(-90) rotationSliderY.setValue(0) rotationSliderY.setMaximum(90) - fontSizeSlider = QSlider(Qt.Horizontal, self._barsWidget) + fontSizeSlider = QSlider(Qt.Orientation.Horizontal, self._barsWidget) fontSizeSlider.setTickInterval(10) fontSizeSlider.setTickPosition(QSlider.TicksBelow) fontSizeSlider.setMinimum(1) @@ -177,7 +177,7 @@ class BarGraph(QObject): axisTitlesFixedCB.setText("Axis titles fixed") axisTitlesFixedCB.setChecked(True) - axisLabelRotationSlider = QSlider(Qt.Horizontal, self._barsWidget) + axisLabelRotationSlider = QSlider(Qt.Orientation.Horizontal, self._barsWidget) axisLabelRotationSlider.setTickInterval(10) axisLabelRotationSlider.setTickPosition(QSlider.TicksBelow) axisLabelRotationSlider.setMinimum(0) diff --git a/examples/datavisualization/graphgallery/surfacegraph.py b/examples/datavisualization/graphgallery/surfacegraph.py index 78d5cdcf5..1ecd0d4d5 100644 --- a/examples/datavisualization/graphgallery/surfacegraph.py +++ b/examples/datavisualization/graphgallery/surfacegraph.py @@ -128,19 +128,19 @@ class SurfaceGraph(QObject): selectionVBox.addWidget(modeSliceColumnRB) selectionGroupBox.setLayout(selectionVBox) axisGroupBox = QGroupBox("Axis ranges") - axisMinSliderX = QSlider(Qt.Horizontal) + axisMinSliderX = QSlider(Qt.Orientation.Horizontal) axisMinSliderX.setMinimum(0) axisMinSliderX.setTickInterval(1) axisMinSliderX.setEnabled(True) - axisMaxSliderX = QSlider(Qt.Horizontal) + axisMaxSliderX = QSlider(Qt.Orientation.Horizontal) axisMaxSliderX.setMinimum(1) axisMaxSliderX.setTickInterval(1) axisMaxSliderX.setEnabled(True) - axisMinSliderZ = QSlider(Qt.Horizontal) + axisMinSliderZ = QSlider(Qt.Orientation.Horizontal) axisMinSliderZ.setMinimum(0) axisMinSliderZ.setTickInterval(1) axisMinSliderZ.setEnabled(True) - axisMaxSliderZ = QSlider(Qt.Horizontal) + axisMaxSliderZ = QSlider(Qt.Orientation.Horizontal) axisMaxSliderZ.setMinimum(1) axisMaxSliderZ.setTickInterval(1) axisMaxSliderZ.setEnabled(True) diff --git a/examples/datavisualization/minimalsurface/main.py b/examples/datavisualization/minimalsurface/main.py index df5e905a1..6b455bc42 100644 --- a/examples/datavisualization/minimalsurface/main.py +++ b/examples/datavisualization/minimalsurface/main.py @@ -24,7 +24,7 @@ if __name__ == '__main__': print(DESCRIPTION) surface = Q3DSurface() - surface.setFlags(surface.flags() ^ Qt.FramelessWindowHint) + surface.setFlags(surface.flags() ^ Qt.WindowType.FramelessWindowHint) axis = surface.axisX() axis.setTitle("X") axis.setTitleVisible(True) diff --git a/examples/datavisualization/qmlsurfacegallery/main.py b/examples/datavisualization/qmlsurfacegallery/main.py index f1d3216e3..edc41eaf5 100644 --- a/examples/datavisualization/qmlsurfacegallery/main.py +++ b/examples/datavisualization/qmlsurfacegallery/main.py @@ -32,7 +32,7 @@ if __name__ == "__main__": qml_file = Path(__file__).resolve().parent / "qml" / "qmlsurfacegallery" / "main.qml" viewer.setSource(QUrl.fromLocalFile(qml_file)) - viewer.setResizeMode(QQuickView.SizeRootObjectToView) + viewer.setResizeMode(QQuickView.ResizeMode.SizeRootObjectToView) viewer.show() ex = app.exec() diff --git a/examples/datavisualization/surface/main.py b/examples/datavisualization/surface/main.py index 11756b805..7f91f1e92 100644 --- a/examples/datavisualization/surface/main.py +++ b/examples/datavisualization/surface/main.py @@ -78,19 +78,19 @@ class Window(QWidget): selection_vbox.addWidget(mode_slice_column_rb) selection_group_box.setLayout(selection_vbox) - axis_min_slider_x = QSlider(Qt.Horizontal, self) + axis_min_slider_x = QSlider(Qt.Orientation.Horizontal, self) axis_min_slider_x.setMinimum(0) axis_min_slider_x.setTickInterval(1) axis_min_slider_x.setEnabled(True) - axis_max_slider_x = QSlider(Qt.Horizontal, self) + axis_max_slider_x = QSlider(Qt.Orientation.Horizontal, self) axis_max_slider_x.setMinimum(1) axis_max_slider_x.setTickInterval(1) axis_max_slider_x.setEnabled(True) - axis_min_slider_z = QSlider(Qt.Horizontal, self) + axis_min_slider_z = QSlider(Qt.Orientation.Horizontal, self) axis_min_slider_z.setMinimum(0) axis_min_slider_z.setTickInterval(1) axis_min_slider_z.setEnabled(True) - axis_max_slider_z = QSlider(Qt.Horizontal, self) + axis_max_slider_z = QSlider(Qt.Orientation.Horizontal, self) axis_max_slider_z.setMinimum(1) axis_max_slider_z.setTickInterval(1) axis_max_slider_z.setEnabled(True) diff --git a/examples/datavisualization/surface_model_numpy/main.py b/examples/datavisualization/surface_model_numpy/main.py index 11756b805..7f91f1e92 100644 --- a/examples/datavisualization/surface_model_numpy/main.py +++ b/examples/datavisualization/surface_model_numpy/main.py @@ -78,19 +78,19 @@ class Window(QWidget): selection_vbox.addWidget(mode_slice_column_rb) selection_group_box.setLayout(selection_vbox) - axis_min_slider_x = QSlider(Qt.Horizontal, self) + axis_min_slider_x = QSlider(Qt.Orientation.Horizontal, self) axis_min_slider_x.setMinimum(0) axis_min_slider_x.setTickInterval(1) axis_min_slider_x.setEnabled(True) - axis_max_slider_x = QSlider(Qt.Horizontal, self) + axis_max_slider_x = QSlider(Qt.Orientation.Horizontal, self) axis_max_slider_x.setMinimum(1) axis_max_slider_x.setTickInterval(1) axis_max_slider_x.setEnabled(True) - axis_min_slider_z = QSlider(Qt.Horizontal, self) + axis_min_slider_z = QSlider(Qt.Orientation.Horizontal, self) axis_min_slider_z.setMinimum(0) axis_min_slider_z.setTickInterval(1) axis_min_slider_z.setEnabled(True) - axis_max_slider_z = QSlider(Qt.Horizontal, self) + axis_max_slider_z = QSlider(Qt.Orientation.Horizontal, self) axis_max_slider_z.setMinimum(1) axis_max_slider_z.setTickInterval(1) axis_max_slider_z.setEnabled(True) diff --git a/examples/datavisualization/surface_model_numpy/surfacegraph.py b/examples/datavisualization/surface_model_numpy/surfacegraph.py index 3e885d9c2..30b49b8a6 100644 --- a/examples/datavisualization/surface_model_numpy/surfacegraph.py +++ b/examples/datavisualization/surface_model_numpy/surfacegraph.py @@ -24,9 +24,9 @@ SAMPLE_MIN = -8.0 SAMPLE_MAX = 8.0 -X_ROLE = Qt.UserRole + 1 -Y_ROLE = Qt.UserRole + 2 -Z_ROLE = Qt.UserRole + 3 +X_ROLE = Qt.ItemDataRole.UserRole + 1 +Y_ROLE = Qt.ItemDataRole.UserRole + 2 +Z_ROLE = Qt.ItemDataRole.UserRole + 3 class SqrtSinModel(QAbstractTableModel): @@ -65,7 +65,7 @@ class SqrtSinModel(QAbstractTableModel): def columnCount(self, index=QModelIndex()): return self._x.size - def data(self, index, role=Qt.DisplayRole): + def data(self, index, role=Qt.ItemDataRole.DisplayRole): row = index.row() col = index.column() if role == X_ROLE: diff --git a/examples/datavisualization/surface_numpy/main.py b/examples/datavisualization/surface_numpy/main.py index 11756b805..7f91f1e92 100644 --- a/examples/datavisualization/surface_numpy/main.py +++ b/examples/datavisualization/surface_numpy/main.py @@ -78,19 +78,19 @@ class Window(QWidget): selection_vbox.addWidget(mode_slice_column_rb) selection_group_box.setLayout(selection_vbox) - axis_min_slider_x = QSlider(Qt.Horizontal, self) + axis_min_slider_x = QSlider(Qt.Orientation.Horizontal, self) axis_min_slider_x.setMinimum(0) axis_min_slider_x.setTickInterval(1) axis_min_slider_x.setEnabled(True) - axis_max_slider_x = QSlider(Qt.Horizontal, self) + axis_max_slider_x = QSlider(Qt.Orientation.Horizontal, self) axis_max_slider_x.setMinimum(1) axis_max_slider_x.setTickInterval(1) axis_max_slider_x.setEnabled(True) - axis_min_slider_z = QSlider(Qt.Horizontal, self) + axis_min_slider_z = QSlider(Qt.Orientation.Horizontal, self) axis_min_slider_z.setMinimum(0) axis_min_slider_z.setTickInterval(1) axis_min_slider_z.setEnabled(True) - axis_max_slider_z = QSlider(Qt.Horizontal, self) + axis_max_slider_z = QSlider(Qt.Orientation.Horizontal, self) axis_max_slider_z.setMinimum(1) axis_max_slider_z.setTickInterval(1) axis_max_slider_z.setEnabled(True) diff --git a/examples/demos/colorpaletteclient/paginatedresource.py b/examples/demos/colorpaletteclient/paginatedresource.py index 4c463e5d5..db399a7dc 100644 --- a/examples/demos/colorpaletteclient/paginatedresource.py +++ b/examples/demos/colorpaletteclient/paginatedresource.py @@ -28,9 +28,9 @@ class ColorUser: @QmlElement class ColorUserModel (QAbstractListModel): - IdRole = Qt.UserRole + 1 - EmailRole = Qt.UserRole + 2 - AvatarRole = Qt.UserRole + 3 + IdRole = Qt.ItemDataRole.UserRole + 1 + EmailRole = Qt.ItemDataRole.UserRole + 2 + AvatarRole = Qt.ItemDataRole.UserRole + 3 def __init__(self, parent=None): super().__init__(parent) @@ -87,10 +87,10 @@ class Color: @QmlElement class ColorModel (QAbstractListModel): - IdRole = Qt.UserRole + 1 - ColorRole = Qt.UserRole + 2 - NameRole = Qt.UserRole + 3 - PantoneValueRole = Qt.UserRole + 4 + IdRole = Qt.ItemDataRole.UserRole + 1 + ColorRole = Qt.ItemDataRole.UserRole + 2 + NameRole = Qt.ItemDataRole.UserRole + 3 + PantoneValueRole = Qt.ItemDataRole.UserRole + 4 def __init__(self, parent=None): super().__init__(parent) diff --git a/examples/demos/documentviewer/jsonviewer/jsonviewer.py b/examples/demos/documentviewer/jsonviewer/jsonviewer.py index 98ca997cc..7923265ba 100644 --- a/examples/demos/documentviewer/jsonviewer/jsonviewer.py +++ b/examples/demos/documentviewer/jsonviewer/jsonviewer.py @@ -105,19 +105,20 @@ class JsonItemModel(QAbstractItemModel): return None item = self.itemFromIndex(index) - if role == Qt.DisplayRole: + if role == Qt.ItemDataRole.DisplayRole: if index.column() == 0: return item.key() if index.column() == 1: return item.value() - elif role == Qt.EditRole: + elif role == Qt.ItemDataRole.EditRole: if index.column() == 1: return item.value() return None def headerData(self, section, orientation, role): return (self._headers[section] - if role == Qt.DisplayRole and orientation == Qt.Horizontal else None) + if role == Qt.ItemDataRole.DisplayRole and orientation == Qt.Orientation.Horizontal + else None) def index(self, row, column, parent=QModelIndex()): if not self.hasIndex(row, column, parent): @@ -218,7 +219,7 @@ class JsonViewer(AbstractViewer): index = self._tree.model().index(i, 0) self._toplevel.addItem(index.data()) item = self._toplevel.item(i) - item.setData(Qt.UserRole, index) + item.setData(Qt.ItemDataRole.UserRole, index) item.setToolTip(f"Toplevel Item {i}") self._toplevel.setAcceptDrops(True) @@ -278,7 +279,7 @@ class JsonViewer(AbstractViewer): return self._tree.model() is not None def indexOf(self, item): - return QModelIndex(item.data(Qt.UserRole)) + return QModelIndex(item.data(Qt.ItemDataRole.UserRole)) @Slot(QListWidgetItem) def onTopLevelItemClicked(self, item): @@ -360,14 +361,14 @@ class JsonViewer(AbstractViewer): if not index.isValid(): return - item = QListWidgetItem(index.data(Qt.DisplayRole), self._toplevel) - item.setData(Qt.UserRole, index) + item = QListWidgetItem(index.data(Qt.ItemDataRole.DisplayRole), self._toplevel) + item.setData(Qt.ItemDataRole.UserRole, index) # Set a tooltip that shows where the item is located in the tree parent = index.parent() - tooltip = index.data(Qt.DisplayRole).toString() + tooltip = index.data(Qt.ItemDataRole.DisplayRole).toString() while parent.isValid(): - tooltip = parent.data(Qt.DisplayRole).toString() + "." + tooltip + tooltip = parent.data(Qt.ItemDataRole.DisplayRole).toString() + "." + tooltip parent = parent.parent() item.setToolTip(tooltip) diff --git a/examples/designer/taskmenuextension/tictactoe.py b/examples/designer/taskmenuextension/tictactoe.py index 9e8118bb4..a1a3fc906 100644 --- a/examples/designer/taskmenuextension/tictactoe.py +++ b/examples/designer/taskmenuextension/tictactoe.py @@ -64,7 +64,7 @@ class TicTacToe(QWidget): def paintEvent(self, event): with QPainter(self) as painter: - painter.setRenderHint(QPainter.Antialiasing) + painter.setRenderHint(QPainter.RenderHint.Antialiasing) painter.setPen(QPen(Qt.darkGreen, 1)) painter.drawLine(self._cell_width(), 0, diff --git a/examples/external/matplotlib/widget3d/widget3d.py b/examples/external/matplotlib/widget3d/widget3d.py index 01ead09c8..591259527 100644 --- a/examples/external/matplotlib/widget3d/widget3d.py +++ b/examples/external/matplotlib/widget3d/widget3d.py @@ -48,8 +48,8 @@ class ApplicationWindow(QMainWindow): # Sliders (Left) min = 0 max = 360 - self.slider_azim = QSlider(minimum=min, maximum=max, orientation=Qt.Horizontal) - self.slider_elev = QSlider(minimum=min, maximum=max, orientation=Qt.Horizontal) + self.slider_azim = QSlider(minimum=min, maximum=max, orientation=Qt.Orientation.Horizontal) + self.slider_elev = QSlider(minimum=min, maximum=max, orientation=Qt.Orientation.Horizontal) self.slider_azim_layout = QHBoxLayout() self.slider_azim_layout.addWidget(QLabel(f"{min}")) diff --git a/examples/external/networkx/main.py b/examples/external/networkx/main.py index 8b88b5c30..21a0ed029 100644 --- a/examples/external/networkx/main.py +++ b/examples/external/networkx/main.py @@ -34,9 +34,9 @@ class Node(QGraphicsObject): self._radius = 30 self._rect = QRectF(0, 0, self._radius * 2, self._radius * 2) - self.setFlag(QGraphicsItem.ItemIsMovable) - self.setFlag(QGraphicsItem.ItemSendsGeometryChanges) - self.setCacheMode(QGraphicsItem.DeviceCoordinateCache) + self.setFlag(QGraphicsItem.GraphicsItemFlag.ItemIsMovable) + self.setFlag(QGraphicsItem.GraphicsItemFlag.ItemSendsGeometryChanges) + self.setCacheMode(QGraphicsItem.CacheMode.DeviceCoordinateCache) def boundingRect(self) -> QRectF: """Override from QGraphicsItem @@ -55,20 +55,20 @@ class Node(QGraphicsObject): painter (QPainter) option (QStyleOptionGraphicsItem) """ - painter.setRenderHints(QPainter.Antialiasing) + painter.setRenderHints(QPainter.RenderHint.Antialiasing) painter.setPen( QPen( QColor(self._color).darker(), 2, - Qt.SolidLine, - Qt.RoundCap, - Qt.RoundJoin, + Qt.PenStyle.SolidLine, + Qt.PenCapStyle.RoundCap, + Qt.PenJoinStyle.RoundJoin, ) ) painter.setBrush(QBrush(QColor(self._color))) painter.drawEllipse(self.boundingRect()) painter.setPen(QPen(QColor("white"))) - painter.drawText(self.boundingRect(), Qt.AlignCenter, self._name) + painter.drawText(self.boundingRect(), Qt.AlignmentFlag.AlignCenter, self._name) def add_edge(self, edge): """Add an edge to this node @@ -88,7 +88,7 @@ class Node(QGraphicsObject): Returns: Any """ - if change == QGraphicsItem.ItemPositionHasChanged: + if change == QGraphicsItem.GraphicsItemChange.ItemPositionHasChanged: for edge in self._edges: edge.adjust() @@ -205,7 +205,7 @@ class Edge(QGraphicsItem): """ if self._source and self._dest: - painter.setRenderHints(QPainter.Antialiasing) + painter.setRenderHints(QPainter.RenderHint.Antialiasing) painter.setPen( QPen( diff --git a/examples/external/pandas/dataframe_model.py b/examples/external/pandas/dataframe_model.py index 142d4c722..bd741f977 100644 --- a/examples/external/pandas/dataframe_model.py +++ b/examples/external/pandas/dataframe_model.py @@ -43,7 +43,7 @@ class PandasModel(QAbstractTableModel): if not index.isValid(): return None - if role == Qt.DisplayRole: + if role == Qt.ItemDataRole.DisplayRole: return str(self._dataframe.iloc[index.row(), index.column()]) return None @@ -55,8 +55,8 @@ class PandasModel(QAbstractTableModel): Return dataframe index as vertical header data and columns as horizontal header data. """ - if role == Qt.DisplayRole: - if orientation == Qt.Horizontal: + if role == Qt.ItemDataRole.DisplayRole: + if orientation == Qt.Orientation.Horizontal: return str(self._dataframe.columns[section]) if orientation == Qt.Vertical: diff --git a/examples/graphs/3d/widgetgraphgallery/bargraph.py b/examples/graphs/3d/widgetgraphgallery/bargraph.py index 11ee67d4d..24a6541fb 100644 --- a/examples/graphs/3d/widgetgraphgallery/bargraph.py +++ b/examples/graphs/3d/widgetgraphgallery/bargraph.py @@ -121,20 +121,20 @@ class BarGraph(QObject): reflectionCheckBox.setText("Show reflections") reflectionCheckBox.setChecked(False) - rotationSliderX = QSlider(Qt.Horizontal, self._barsWidget) + rotationSliderX = QSlider(Qt.Orientation.Horizontal, self._barsWidget) rotationSliderX.setTickInterval(30) rotationSliderX.setTickPosition(QSlider.TicksBelow) rotationSliderX.setMinimum(-180) rotationSliderX.setValue(0) rotationSliderX.setMaximum(180) - rotationSliderY = QSlider(Qt.Horizontal, self._barsWidget) + rotationSliderY = QSlider(Qt.Orientation.Horizontal, self._barsWidget) rotationSliderY.setTickInterval(15) rotationSliderY.setTickPosition(QSlider.TicksAbove) rotationSliderY.setMinimum(-90) rotationSliderY.setValue(0) rotationSliderY.setMaximum(90) - fontSizeSlider = QSlider(Qt.Horizontal, self._barsWidget) + fontSizeSlider = QSlider(Qt.Orientation.Horizontal, self._barsWidget) fontSizeSlider.setTickInterval(10) fontSizeSlider.setTickPosition(QSlider.TicksBelow) fontSizeSlider.setMinimum(1) @@ -174,7 +174,7 @@ class BarGraph(QObject): axisTitlesFixedCB.setText("Axis titles fixed") axisTitlesFixedCB.setChecked(True) - axisLabelRotationSlider = QSlider(Qt.Horizontal, self._barsWidget) + axisLabelRotationSlider = QSlider(Qt.Orientation.Horizontal, self._barsWidget) axisLabelRotationSlider.setTickInterval(10) axisLabelRotationSlider.setTickPosition(QSlider.TicksBelow) axisLabelRotationSlider.setMinimum(0) diff --git a/examples/graphs/3d/widgetgraphgallery/surfacegraph.py b/examples/graphs/3d/widgetgraphgallery/surfacegraph.py index db57090e4..d80691b0d 100644 --- a/examples/graphs/3d/widgetgraphgallery/surfacegraph.py +++ b/examples/graphs/3d/widgetgraphgallery/surfacegraph.py @@ -123,19 +123,19 @@ class SurfaceGraph(QObject): selectionVBox.addWidget(modeSliceColumnRB) selectionGroupBox.setLayout(selectionVBox) axisGroupBox = QGroupBox("Axis ranges") - axisMinSliderX = QSlider(Qt.Horizontal) + axisMinSliderX = QSlider(Qt.Orientation.Horizontal) axisMinSliderX.setMinimum(0) axisMinSliderX.setTickInterval(1) axisMinSliderX.setEnabled(True) - axisMaxSliderX = QSlider(Qt.Horizontal) + axisMaxSliderX = QSlider(Qt.Orientation.Horizontal) axisMaxSliderX.setMinimum(1) axisMaxSliderX.setTickInterval(1) axisMaxSliderX.setEnabled(True) - axisMinSliderZ = QSlider(Qt.Horizontal) + axisMinSliderZ = QSlider(Qt.Orientation.Horizontal) axisMinSliderZ.setMinimum(0) axisMinSliderZ.setTickInterval(1) axisMinSliderZ.setEnabled(True) - axisMaxSliderZ = QSlider(Qt.Horizontal) + axisMaxSliderZ = QSlider(Qt.Orientation.Horizontal) axisMaxSliderZ.setMinimum(1) axisMaxSliderZ.setTickInterval(1) axisMaxSliderZ.setEnabled(True) diff --git a/examples/gui/analogclock/main.py b/examples/gui/analogclock/main.py index cae9811e0..04139f8a7 100644 --- a/examples/gui/analogclock/main.py +++ b/examples/gui/analogclock/main.py @@ -45,7 +45,7 @@ class AnalogClockWindow(QRasterWindow): side = min(width, height) painter.fillRect(0, 0, width, height, self._background_color) - painter.setRenderHint(QPainter.Antialiasing) + painter.setRenderHint(QPainter.RenderHint.Antialiasing) painter.translate(width / 2, height / 2) painter.scale(side / 200.0, side / 200.0) diff --git a/examples/gui/rhiwindow/main.py b/examples/gui/rhiwindow/main.py index 634a42064..6c0f313b0 100644 --- a/examples/gui/rhiwindow/main.py +++ b/examples/gui/rhiwindow/main.py @@ -15,11 +15,11 @@ if __name__ == "__main__": app = QGuiApplication(sys.argv) # Use platform-specific defaults when no command-line arguments given. - graphicsApi = QRhi.OpenGLES2 + graphicsApi = QRhi.Implementation.OpenGLES2 if sys.platform == "win32": - graphicsApi = QRhi.D3D11 + graphicsApi = QRhi.Implementation.D3D11 elif sys.platform == "darwin": - graphicsApi = QRhi.Metal + graphicsApi = QRhi.Implementation.Metal parser = ArgumentParser(formatter_class=RawDescriptionHelpFormatter, description="QRhi render example") @@ -33,15 +33,15 @@ if __name__ == "__main__": help="Metal") args = parser.parse_args() if args.null: - graphicsApi = QRhi.Null + graphicsApi = QRhi.Implementation.Null elif args.opengl: - graphicsApi = QRhi.OpenGLES2 + graphicsApi = QRhi.Implementation.OpenGLES2 elif args.d3d11: - graphicsApi = QRhi.D3D11 + graphicsApi = QRhi.Implementation.D3D11 elif args.d3d12: - graphicsApi = QRhi.D3D12 + graphicsApi = QRhi.Implementation.D3D12 elif args.metal: - graphicsApi = QRhi.Metal + graphicsApi = QRhi.Implementation.Metal # graphicsApi = QRhi.Vulkan? detect? needs QVulkanInstance @@ -57,7 +57,7 @@ if __name__ == "__main__": # we get on macOS is not sufficient. if sys.platform == "darwin": fmt.setVersion(4, 1) - fmt.setProfile(QSurfaceFormat.CoreProfile) + fmt.setProfile(QSurfaceFormat.OpenGLContextProfile.CoreProfile) QSurfaceFormat.setDefaultFormat(fmt) window = HelloWindow(graphicsApi) diff --git a/examples/multimedia/audiooutput/audiooutput.py b/examples/multimedia/audiooutput/audiooutput.py index c2cbd730f..5da00bc83 100644 --- a/examples/multimedia/audiooutput/audiooutput.py +++ b/examples/multimedia/audiooutput/audiooutput.py @@ -140,7 +140,8 @@ class AudioTest(QMainWindow): volume_box = QHBoxLayout() volume_label = QLabel("Volume:") - self.m_volumeSlider = QSlider(Qt.Horizontal, minimum=0, maximum=100, singleStep=10) + self.m_volumeSlider = QSlider(Qt.Orientation.Horizontal, + minimum=0, maximum=100, singleStep=10) self.m_volumeSlider.valueChanged.connect(self.volume_changed) volume_box.addWidget(volume_label) diff --git a/examples/multimedia/audiosource/audiosource.py b/examples/multimedia/audiosource/audiosource.py index 5b4fe523c..f4e415882 100644 --- a/examples/multimedia/audiosource/audiosource.py +++ b/examples/multimedia/audiosource/audiosource.py @@ -134,7 +134,7 @@ class InputTest(QWidget): self.m_device_box.activated[int].connect(self.device_changed) self.layout.addWidget(self.m_device_box) - self.m_volume_slider = QSlider(Qt.Horizontal, self) + self.m_volume_slider = QSlider(Qt.Orientation.Horizontal, self) self.m_volume_slider.setRange(0, 100) self.m_volume_slider.setValue(100) self.m_volume_slider.valueChanged.connect(self.slider_changed) diff --git a/examples/multimedia/player/player.py b/examples/multimedia/player/player.py index e0e328b5d..9487bbc7f 100644 --- a/examples/multimedia/player/player.py +++ b/examples/multimedia/player/player.py @@ -88,7 +88,7 @@ class MainWindow(QMainWindow): play_menu.addAction(self._stop_action) self._volume_slider = QSlider() - self._volume_slider.setOrientation(Qt.Horizontal) + self._volume_slider.setOrientation(Qt.Orientation.Horizontal) self._volume_slider.setMinimum(0) self._volume_slider.setMaximum(100) available_width = self.screen().availableGeometry().width() diff --git a/examples/multimedia/screencapture/screenlistmodel.py b/examples/multimedia/screencapture/screenlistmodel.py index dbb13e918..7e92c3a3d 100644 --- a/examples/multimedia/screencapture/screenlistmodel.py +++ b/examples/multimedia/screencapture/screenlistmodel.py @@ -21,7 +21,7 @@ class ScreenListModel(QAbstractListModel): def data(self, index, role): screen_list = QGuiApplication.screens() - if role == Qt.DisplayRole: + if role == Qt.ItemDataRole.DisplayRole: screen = screen_list[index.row()] w = screen.size().width() h = screen.size().height() diff --git a/examples/multimedia/screencapture/windowlistmodel.py b/examples/multimedia/screencapture/windowlistmodel.py index bffaba875..4f6223318 100644 --- a/examples/multimedia/screencapture/windowlistmodel.py +++ b/examples/multimedia/screencapture/windowlistmodel.py @@ -16,7 +16,7 @@ class WindowListModel(QAbstractListModel): return len(self._window_list) def data(self, index, role): - if role == Qt.DisplayRole: + if role == Qt.ItemDataRole.DisplayRole: window = self._window_list[index.row()] return window.description() return None diff --git a/examples/network/googlesuggest/googlesuggest.py b/examples/network/googlesuggest/googlesuggest.py index 6c384a20b..c03244687 100644 --- a/examples/network/googlesuggest/googlesuggest.py +++ b/examples/network/googlesuggest/googlesuggest.py @@ -45,28 +45,28 @@ class GSuggestCompletion(QObject): def eventFilter(self, obj: QObject, ev: QEvent): if obj is not self.popup: return False - if ev.type() == QEvent.MouseButtonPress: + if ev.type() == QEvent.Type.MouseButtonPress: self.popup.hide() self.editor.setFocus() return True - if ev.type() == QEvent.KeyPress: + if ev.type() == QEvent.Type.KeyPress: consumed = False key = ev.key() - if key in (Qt.Key_Enter, Qt.Key_Return): + if key in (Qt.Key.Key_Enter, Qt.Key.Key_Return): self.done_completion() consumed = True - elif key == Qt.Key_Escape: + elif key == Qt.Key.Key_Escape: self.editor.setFocus() self.popup.hide() consumed = True elif key in ( - Qt.Key_Up, - Qt.Key_Down, - Qt.Key_Home, - Qt.Key_End, - Qt.Key_PageUp, - Qt.Key_PageDown, + Qt.Key.Key_Up, + Qt.Key.Key_Down, + Qt.Key.Key_Home, + Qt.Key.Key_End, + Qt.Key.Key_PageUp, + Qt.Key.Key_PageDown, ): pass else: @@ -80,7 +80,7 @@ class GSuggestCompletion(QObject): if not choices: return pal = self.editor.palette() - color = pal.color(QPalette.Disabled, QPalette.WindowText) + color = pal.color(QPalette.ColorGroup.Disabled, QPalette.ColorRole.WindowText) self.popup.setUpdatesEnabled(False) self.popup.clear() @@ -119,14 +119,14 @@ class GSuggestCompletion(QObject): @Slot(QNetworkReply) def handle_network_data(self, network_reply: QNetworkReply): - if network_reply.error() == QNetworkReply.NoError: + if network_reply.error() == QNetworkReply.NetworkError.NoError: choices: list[str] = [] response: QByteArray = network_reply.readAll() xml = QXmlStreamReader(str(response)) while not xml.atEnd(): xml.readNext() - if xml.tokenType() == QXmlStreamReader.StartElement: + if xml.tokenType() == QXmlStreamReader.TokenType.StartElement: if xml.name() == "suggestion": s = xml.attributes().value("data") choices.append(s) diff --git a/examples/network/loopback/dialog.py b/examples/network/loopback/dialog.py index d46efecab..8482a0e44 100644 --- a/examples/network/loopback/dialog.py +++ b/examples/network/loopback/dialog.py @@ -132,7 +132,7 @@ class Dialog(QDialog): self.client_status_label.setText(f"Sent {self.bytes_written / (1024 ** 2)} MB") def display_error(self, socket_error: QAbstractSocket.SocketError): - if socket_error == QAbstractSocket.RemoteHostClosedError: + if socket_error == QAbstractSocket.SocketError.RemoteHostClosedError: return QMessageBox.information( diff --git a/examples/networkauth/redditclient/redditmodel.py b/examples/networkauth/redditclient/redditmodel.py index 5c2e6a0d4..f2503f19c 100644 --- a/examples/networkauth/redditclient/redditmodel.py +++ b/examples/networkauth/redditclient/redditmodel.py @@ -31,7 +31,7 @@ class RedditModel(QAbstractTableModel): def data(self, index, role): if not index.isValid(): return None - if role == Qt.DisplayRole: + if role == Qt.ItemDataRole.DisplayRole: children_object = self._threads[index.row()] data_object = children_object["data"] return data_object["title"] diff --git a/examples/opengl/hellogl2/main.py b/examples/opengl/hellogl2/main.py index 41884ab12..6bce36b01 100644 --- a/examples/opengl/hellogl2/main.py +++ b/examples/opengl/hellogl2/main.py @@ -17,9 +17,9 @@ try: from glwidget import GLWidget except ImportError: app = QApplication(sys.argv) - message_box = QMessageBox(QMessageBox.Critical, "OpenGL hellogl", + message_box = QMessageBox(QMessageBox.Icon.Critical, "OpenGL hellogl", "PyOpenGL must be installed to run this example.", - QMessageBox.Close) + QMessageBox.StandardButton.Close) message_box.setDetailedText("Run:\npip install PyOpenGL PyOpenGL_accelerate") message_box.exec() sys.exit(1) @@ -43,15 +43,15 @@ if __name__ == '__main__': fmt.setSamples(4) if options.coreprofile: fmt.setVersion(3, 2) - fmt.setProfile(QSurfaceFormat.CoreProfile) + fmt.setProfile(QSurfaceFormat.OpenGLContextProfile.CoreProfile) QSurfaceFormat.setDefaultFormat(fmt) GLWidget.set_transparent(options.transparent) main_window = MainWindow() if options.transparent: - main_window.setAttribute(Qt.WA_TranslucentBackground) - main_window.setAttribute(Qt.WA_NoSystemBackground, False) + main_window.setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground) + main_window.setAttribute(Qt.WidgetAttribute.WA_NoSystemBackground, False) main_window.show() diff --git a/examples/opengl/threadedqopenglwidget/main.py b/examples/opengl/threadedqopenglwidget/main.py index 0d4c14ccf..302ac438f 100644 --- a/examples/opengl/threadedqopenglwidget/main.py +++ b/examples/opengl/threadedqopenglwidget/main.py @@ -17,9 +17,9 @@ try: except ImportError: app = QApplication(sys.argv) message = "PyOpenGL must be installed to run this example." - message_box = QMessageBox(QMessageBox.Critical, + message_box = QMessageBox(QMessageBox.Icon.Critical, "Threaded QOpenGLWidget Example", - message, QMessageBox.Close) + message, QMessageBox.StandardButton.Close) detail = "Run:\npip install PyOpenGL PyOpenGL_accelerate" message_box.setDetailedText(detail) message_box.exec() @@ -70,9 +70,9 @@ if __name__ == "__main__": top_gl_widget.setToolTip(tool_tip) print(tool_tip) - close_shortcut = QShortcut(Qt.CTRL | Qt.Key_Q, top_gl_widget) + close_shortcut = QShortcut(Qt.Modifier.CTRL | Qt.Key.Key_Q, top_gl_widget) close_shortcut.activated.connect(QApplication.closeAllWindows) - close_shortcut.setContext(Qt.ApplicationShortcut) + close_shortcut.setContext(Qt.ShortcutContext.ApplicationShortcut) mw1 = None mw2 = None diff --git a/examples/qml/editingmodel/model.py b/examples/qml/editingmodel/model.py index 08feb6408..c89aea7a4 100644 --- a/examples/qml/editingmodel/model.py +++ b/examples/qml/editingmodel/model.py @@ -16,7 +16,7 @@ QML_IMPORT_MAJOR_VERSION = 1 @QmlElement class BaseModel(QAbstractListModel): - RatioRole = Qt.UserRole + 1 + RatioRole = Qt.ItemDataRole.UserRole + 1 def __init__(self, parent=None): super().__init__(parent=parent) @@ -28,7 +28,7 @@ class BaseModel(QAbstractListModel): def roleNames(self): default = super().roleNames() default[self.RatioRole] = QByteArray(b"ratio") - default[Qt.BackgroundRole] = QByteArray(b"backgroundColor") + default[Qt.ItemDataRole.BackgroundRole] = QByteArray(b"backgroundColor") return default def data(self, index, role: int): @@ -36,9 +36,9 @@ class BaseModel(QAbstractListModel): ret = None elif not index.isValid(): ret = None - elif role == Qt.DisplayRole: + elif role == Qt.ItemDataRole.DisplayRole: ret = self.db[index.row()]["text"] - elif role == Qt.BackgroundRole: + elif role == Qt.ItemDataRole.BackgroundRole: ret = self.db[index.row()]["bgColor"] elif role == self.RatioRole: ret = self.db[index.row()]["ratio"] @@ -49,7 +49,7 @@ class BaseModel(QAbstractListModel): def setData(self, index, value, role): if not index.isValid(): return False - if role == Qt.EditRole: + if role == Qt.ItemDataRole.EditRole: self.db[index.row()]["text"] = value return True diff --git a/examples/qml/signals/pytoqml1/main.py b/examples/qml/signals/pytoqml1/main.py index bb4311e54..65806ac78 100644 --- a/examples/qml/signals/pytoqml1/main.py +++ b/examples/qml/signals/pytoqml1/main.py @@ -18,7 +18,7 @@ if __name__ == '__main__': view = QQuickView() qml_file = os.fspath(Path(__file__).resolve().parent / 'view.qml') view.setSource(QUrl.fromLocalFile(qml_file)) - if view.status() == QQuickView.Error: + if view.status() == QQuickView.Status.Error: sys.exit(-1) root = view.rootObject() diff --git a/examples/qml/signals/pytoqml2/main.py b/examples/qml/signals/pytoqml2/main.py index 9868656e9..cb8844621 100644 --- a/examples/qml/signals/pytoqml2/main.py +++ b/examples/qml/signals/pytoqml2/main.py @@ -42,7 +42,7 @@ if __name__ == '__main__': qml_file = os.fspath(Path(__file__).resolve().parent / 'view.qml') view.setSource(QUrl.fromLocalFile(qml_file)) - if view.status() == QQuickView.Error: + if view.status() == QQuickView.Status.Error: sys.exit(-1) timer.timeout.connect(rotatevalue.increment) diff --git a/examples/qml/signals/qmltopy1/main.py b/examples/qml/signals/qmltopy1/main.py index 1849f343f..0644e4c9b 100644 --- a/examples/qml/signals/qmltopy1/main.py +++ b/examples/qml/signals/qmltopy1/main.py @@ -41,7 +41,7 @@ if __name__ == '__main__': qml_file = os.fspath(Path(__file__).resolve().parent / 'view.qml') view.setSource(QUrl.fromLocalFile(qml_file)) - if view.status() == QQuickView.Error: + if view.status() == QQuickView.Status.Error: sys.exit(-1) view.show() res = app.exec() diff --git a/examples/qml/signals/qmltopy2/main.py b/examples/qml/signals/qmltopy2/main.py index 3b692e3c7..aeb8b3b7f 100644 --- a/examples/qml/signals/qmltopy2/main.py +++ b/examples/qml/signals/qmltopy2/main.py @@ -36,7 +36,7 @@ if __name__ == '__main__': qml_file = os.fspath(Path(__file__).resolve().parent / 'view.qml') view.setSource(QUrl.fromLocalFile(qml_file)) - if view.status() == QQuickView.Error: + if view.status() == QQuickView.Status.Error: sys.exit(-1) view.show() res = app.exec() diff --git a/examples/qml/signals/qmltopy3/main.py b/examples/qml/signals/qmltopy3/main.py index 34f2896a3..7656154d8 100644 --- a/examples/qml/signals/qmltopy3/main.py +++ b/examples/qml/signals/qmltopy3/main.py @@ -19,7 +19,7 @@ if __name__ == '__main__': view = QQuickView() qml_file = os.fspath(Path(__file__).resolve().parent / 'view.qml') view.setSource(QUrl.fromLocalFile(qml_file)) - if view.status() == QQuickView.Error: + if view.status() == QQuickView.Status.Error: sys.exit(-1) root = view.rootObject() diff --git a/examples/qml/signals/qmltopy4/main.py b/examples/qml/signals/qmltopy4/main.py index a5ea78f48..a6bd1e069 100644 --- a/examples/qml/signals/qmltopy4/main.py +++ b/examples/qml/signals/qmltopy4/main.py @@ -19,7 +19,7 @@ if __name__ == '__main__': view = QQuickView() qml_file = os.fspath(Path(__file__).resolve().parent / 'view.qml') view.setSource(QUrl.fromLocalFile(qml_file)) - if view.status() == QQuickView.Error: + if view.status() == QQuickView.Status.Error: sys.exit(-1) root = view.rootObject() diff --git a/examples/qml/tutorials/extending-qml/chapter1-basics/basics.py b/examples/qml/tutorials/extending-qml/chapter1-basics/basics.py index 9ff5fa318..d9b974b53 100644 --- a/examples/qml/tutorials/extending-qml/chapter1-basics/basics.py +++ b/examples/qml/tutorials/extending-qml/chapter1-basics/basics.py @@ -32,7 +32,7 @@ class PieChart (QQuickPaintedItem): def paint(self, painter): pen = QPen(self.color, 2) painter.setPen(pen) - painter.setRenderHints(QPainter.Antialiasing, True) + painter.setRenderHints(QPainter.RenderHint.Antialiasing, True) painter.drawPie(self.boundingRect().adjusted(1, 1, -1, -1), 90 * 16, 290 * 16) @Property(QColor, final=True) @@ -59,7 +59,7 @@ if __name__ == '__main__': view.setResizeMode(QQuickView.SizeRootObjectToView) qml_file = os.fspath(Path(__file__).resolve().parent / 'app.qml') view.setSource(QUrl.fromLocalFile(qml_file)) - if view.status() == QQuickView.Error: + if view.status() == QQuickView.Status.Error: sys.exit(-1) view.show() res = app.exec() diff --git a/examples/qml/tutorials/extending-qml/chapter2-methods/methods.py b/examples/qml/tutorials/extending-qml/chapter2-methods/methods.py index a02384ad7..48ea30de3 100644 --- a/examples/qml/tutorials/extending-qml/chapter2-methods/methods.py +++ b/examples/qml/tutorials/extending-qml/chapter2-methods/methods.py @@ -33,7 +33,7 @@ class PieChart(QQuickPaintedItem): def paint(self, painter): pen = QPen(self.color, 2) painter.setPen(pen) - painter.setRenderHints(QPainter.Antialiasing, True) + painter.setRenderHints(QPainter.RenderHint.Antialiasing, True) painter.drawPie(self.boundingRect().adjusted(1, 1, -1, -1), 90 * 16, 290 * 16) @Property(QColor, final=True) @@ -66,7 +66,7 @@ if __name__ == '__main__': view.setResizeMode(QQuickView.SizeRootObjectToView) qml_file = os.fspath(Path(__file__).resolve().parent / 'app.qml') view.setSource(QUrl.fromLocalFile(qml_file)) - if view.status() == QQuickView.Error: + if view.status() == QQuickView.Status.Error: sys.exit(-1) view.show() res = app.exec() diff --git a/examples/qml/tutorials/extending-qml/chapter3-bindings/bindings.py b/examples/qml/tutorials/extending-qml/chapter3-bindings/bindings.py index 91d3abe50..082de19cc 100644 --- a/examples/qml/tutorials/extending-qml/chapter3-bindings/bindings.py +++ b/examples/qml/tutorials/extending-qml/chapter3-bindings/bindings.py @@ -34,7 +34,7 @@ class PieChart (QQuickPaintedItem): def paint(self, painter): pen = QPen(self._color, 2) painter.setPen(pen) - painter.setRenderHints(QPainter.Antialiasing, True) + painter.setRenderHints(QPainter.RenderHint.Antialiasing, True) painter.drawPie(self.boundingRect().adjusted(1, 1, -1, -1), 90 * 16, 290 * 16) @Property(QColor, notify=colorChanged, final=True) @@ -70,7 +70,7 @@ if __name__ == '__main__': view.setResizeMode(QQuickView.SizeRootObjectToView) qml_file = os.fspath(Path(__file__).resolve().parent / 'app.qml') view.setSource(QUrl.fromLocalFile(qml_file)) - if view.status() == QQuickView.Error: + if view.status() == QQuickView.Status.Error: sys.exit(-1) view.show() res = app.exec() diff --git a/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/customPropertyTypes.py b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/customPropertyTypes.py index 74dfa1871..3530ed12e 100644 --- a/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/customPropertyTypes.py +++ b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/customPropertyTypes.py @@ -38,7 +38,7 @@ class PieSlice (QQuickPaintedItem): def paint(self, painter): pen = QPen(self._color, 2) painter.setPen(pen) - painter.setRenderHints(QPainter.Antialiasing, True) + painter.setRenderHints(QPainter.RenderHint.Antialiasing, True) painter.drawPie(self.boundingRect().adjusted(1, 1, -1, -1), 90 * 16, 290 * 16) @@ -74,7 +74,7 @@ if __name__ == '__main__': view.setResizeMode(QQuickView.SizeRootObjectToView) qml_file = os.fspath(Path(__file__).resolve().parent / 'app.qml') view.setSource(QUrl.fromLocalFile(qml_file)) - if view.status() == QQuickView.Error: + if view.status() == QQuickView.Status.Error: sys.exit(-1) view.show() res = app.exec() diff --git a/examples/qml/tutorials/extending-qml/chapter5-listproperties/listproperties.py b/examples/qml/tutorials/extending-qml/chapter5-listproperties/listproperties.py index f52d84820..31510fd9e 100644 --- a/examples/qml/tutorials/extending-qml/chapter5-listproperties/listproperties.py +++ b/examples/qml/tutorials/extending-qml/chapter5-listproperties/listproperties.py @@ -54,7 +54,7 @@ class PieSlice (QQuickPaintedItem): def paint(self, painter): pen = QPen(self._color, 2) painter.setPen(pen) - painter.setRenderHints(QPainter.Antialiasing, True) + painter.setRenderHints(QPainter.RenderHint.Antialiasing, True) painter.drawPie( self.boundingRect().adjusted(1, 1, -1, -1), self._fromAngle * 16, self._angleSpan * 16) @@ -88,7 +88,7 @@ if __name__ == '__main__': view.setResizeMode(QQuickView.SizeRootObjectToView) qml_file = os.fspath(Path(__file__).resolve().parent / 'app.qml') view.setSource(QUrl.fromLocalFile(qml_file)) - if view.status() == QQuickView.Error: + if view.status() == QQuickView.Status.Error: sys.exit(-1) view.show() res = app.exec() diff --git a/examples/qml/usingmodel/usingmodel.py b/examples/qml/usingmodel/usingmodel.py index d02fb8524..80413316d 100644 --- a/examples/qml/usingmodel/usingmodel.py +++ b/examples/qml/usingmodel/usingmodel.py @@ -25,7 +25,7 @@ class Person: @QmlElement @QmlSingleton class PersonModel (QAbstractListModel): - MyRole = Qt.UserRole + 1 + MyRole = Qt.ItemDataRole.UserRole + 1 def __init__(self, data, parent=None): super().__init__(parent) @@ -34,7 +34,7 @@ class PersonModel (QAbstractListModel): def roleNames(self): roles = { PersonModel.MyRole: QByteArray(b'myrole'), - Qt.DisplayRole: QByteArray(b'display') + Qt.ItemDataRole.DisplayRole: QByteArray(b'display') } return roles @@ -43,9 +43,9 @@ class PersonModel (QAbstractListModel): def data(self, index, role): d = self._data[index.row()] - if role == Qt.DisplayRole: + if role == Qt.ItemDataRole.DisplayRole: return d.name - if role == Qt.DecorationRole: + if role == Qt.ItemDataRole.DecorationRole: return Qt.black if role == PersonModel.MyRole: return d.myrole @@ -64,7 +64,7 @@ if __name__ == '__main__': qml_file = os.fspath(Path(__file__).resolve().parent / 'view.qml') view.setSource(QUrl.fromLocalFile(qml_file)) - if view.status() == QQuickView.Error: + if view.status() == QQuickView.Status.Error: sys.exit(-1) view.show() diff --git a/examples/quick/painteditem/painteditem.py b/examples/quick/painteditem/painteditem.py index f6c3f0bf2..7bc617e9e 100644 --- a/examples/quick/painteditem/painteditem.py +++ b/examples/quick/painteditem/painteditem.py @@ -41,7 +41,7 @@ class TextBalloon(QQuickPaintedItem): painter.setBrush(brush) painter.setPen(Qt.NoPen) - painter.setRenderHint(QPainter.Antialiasing) + painter.setRenderHint(QPainter.RenderHint.Antialiasing) itemSize = self.size() @@ -77,7 +77,7 @@ if __name__ == "__main__": qml_file = Path(__file__).parent / "main.qml" view.setSource(QUrl.fromLocalFile(qml_file)) - if view.status() == QQuickView.Error: + if view.status() == QQuickView.Status.Error: sys.exit(-1) view.show() diff --git a/examples/quick/rendercontrol/rendercontrol_opengl/main.py b/examples/quick/rendercontrol/rendercontrol_opengl/main.py index ede663bb5..340d35a9f 100644 --- a/examples/quick/rendercontrol/rendercontrol_opengl/main.py +++ b/examples/quick/rendercontrol/rendercontrol_opengl/main.py @@ -12,7 +12,7 @@ from window_singlethreaded import WindowSingleThreaded if __name__ == "__main__": app = QGuiApplication(sys.argv) # only functional when Qt Quick is also using OpenGL - QQuickWindow.setGraphicsApi(QSGRendererInterface.OpenGLRhi) + QQuickWindow.setGraphicsApi(QSGRendererInterface.GraphicsApi.OpenGLRhi) window = WindowSingleThreaded() window.resize(1024, 768) window.show() diff --git a/examples/quick/scenegraph/openglunderqml/main.py b/examples/quick/scenegraph/openglunderqml/main.py index e452f6907..a7ff6a223 100644 --- a/examples/quick/scenegraph/openglunderqml/main.py +++ b/examples/quick/scenegraph/openglunderqml/main.py @@ -14,14 +14,14 @@ from squircle import Squircle # noqa: F401 if __name__ == "__main__": app = QGuiApplication(sys.argv) - QQuickWindow.setGraphicsApi(QSGRendererInterface.OpenGL) + QQuickWindow.setGraphicsApi(QSGRendererInterface.GraphicsApi.OpenGL) view = QQuickView() - view.setResizeMode(QQuickView.SizeRootObjectToView) + view.setResizeMode(QQuickView.ResizeMode.SizeRootObjectToView) qml_file = Path(__file__).parent / "main.qml" view.setSource(QUrl.fromLocalFile(qml_file)) - if view.status() == QQuickView.Error: + if view.status() == QQuickView.Status.Error: sys.exit(-1) view.show() diff --git a/examples/quickcontrols/contactslist/contactmodel.py b/examples/quickcontrols/contactslist/contactmodel.py index 5f65b9045..9f17786ce 100644 --- a/examples/quickcontrols/contactslist/contactmodel.py +++ b/examples/quickcontrols/contactslist/contactmodel.py @@ -19,10 +19,10 @@ class ContactModel(QAbstractListModel): @QEnum class ContactRole(IntEnum): - FullNameRole = Qt.DisplayRole - AddressRole = Qt.UserRole - CityRole = Qt.UserRole + 1 - NumberRole = Qt.UserRole + 2 + FullNameRole = Qt.ItemDataRole.DisplayRole + AddressRole = Qt.ItemDataRole.UserRole + CityRole = Qt.ItemDataRole.UserRole + 1 + NumberRole = Qt.ItemDataRole.UserRole + 2 @dataclass class Contact: diff --git a/examples/remoteobjects/modelview/modelviewserver.py b/examples/remoteobjects/modelview/modelviewserver.py index 518dc72c8..b7560fcd4 100644 --- a/examples/remoteobjects/modelview/modelviewserver.py +++ b/examples/remoteobjects/modelview/modelviewserver.py @@ -21,15 +21,15 @@ class TimerHandler(QObject): def change_data(self): for i in range(10, 50): self._model.setData(self._model.index(i, 1), - QColor(Qt.blue), Qt.BackgroundRole) + QColor(Qt.blue), Qt.ItemDataRole.BackgroundRole) def insert_data(self): self._model.insertRows(2, 9) for i in range(2, 11): self._model.setData(self._model.index(i, 1), - QColor(Qt.green), Qt.BackgroundRole) + QColor(Qt.green), Qt.ItemDataRole.BackgroundRole) self._model.setData(self._model.index(i, 1), - "InsertedRow", Qt.DisplayRole) + "InsertedRow", Qt.ItemDataRole.DisplayRole) def remove_data(self): self._model.removeRows(2, 4) @@ -77,12 +77,12 @@ if __name__ == '__main__': # Needed by QMLModelViewClient role_names = { - Qt.DisplayRole: QByteArray(b'_text'), - Qt.BackgroundRole: QByteArray(b'_color') + Qt.ItemDataRole.DisplayRole: QByteArray(b'_text'), + Qt.ItemDataRole.BackgroundRole: QByteArray(b'_color') } source_model.setItemRoleNames(role_names) - roles = [Qt.DisplayRole, Qt.BackgroundRole] + roles = [Qt.ItemDataRole.DisplayRole, Qt.ItemDataRole.BackgroundRole] print("Creating registry host") node = QRemoteObjectRegistryHost(QUrl("local:registry")) diff --git a/examples/serialbus/can/receivedframesmodel.py b/examples/serialbus/can/receivedframesmodel.py index 0d0f19c39..d9f843a39 100644 --- a/examples/serialbus/can/receivedframesmodel.py +++ b/examples/serialbus/can/receivedframesmodel.py @@ -17,12 +17,15 @@ class ReceivedFramesModelColumns(IntEnum): count = 6 -clipboard_text_role = Qt.UserRole + 1 +clipboard_text_role = Qt.ItemDataRole.UserRole + 1 -column_alignment = [Qt.AlignRight | Qt.AlignVCenter, Qt.AlignRight | Qt.AlignVCenter, - Qt.AlignCenter, Qt.AlignRight | Qt.AlignVCenter, - Qt.AlignRight | Qt.AlignVCenter, Qt.AlignLeft | Qt.AlignVCenter] +column_alignment = [Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignVCenter, + Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignVCenter, + Qt.AlignmentFlag.AlignCenter, + Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignVCenter, + Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignVCenter, + Qt.AlignmentFlag.AlignLeft | Qt.AlignmentFlag.AlignVCenter] class ReceivedFramesModel(QAbstractTableModel): @@ -40,7 +43,7 @@ class ReceivedFramesModel(QAbstractTableModel): return True def headerData(self, section, orientation, role): - if role == Qt.DisplayRole and orientation == Qt.Horizontal: + if role == Qt.AlignmentFlag.DisplayRole and orientation == Qt.AlignmentFlag.Horizontal: if section == ReceivedFramesModelColumns.number: return "#" if section == ReceivedFramesModelColumns.timestamp: @@ -54,7 +57,7 @@ class ReceivedFramesModel(QAbstractTableModel): if section == ReceivedFramesModelColumns.data: return "Data" - if role == Qt.SizeHintRole and orientation == Qt.Horizontal: + if role == Qt.AlignmentFlag.SizeHintRole and orientation == Qt.AlignmentFlag.Horizontal: if section == ReceivedFramesModelColumns.number: return QSize(80, 25) if section == ReceivedFramesModelColumns.timestamp: @@ -74,9 +77,9 @@ class ReceivedFramesModel(QAbstractTableModel): return None row = index.row() column = index.column() - if role == Qt.TextAlignmentRole: + if role == Qt.AlignmentFlag.TextAlignmentRole: return column_alignment[index.column()] - if role == Qt.DisplayRole: + if role == Qt.AlignmentFlag.DisplayRole: return self.m_framesQueue[row][column] if role == clipboard_text_role: f = self.m_framesQueue[row][column] diff --git a/examples/serialbus/can/receivedframesview.py b/examples/serialbus/can/receivedframesview.py index 02d52d1c6..bb10ba8e3 100644 --- a/examples/serialbus/can/receivedframesview.py +++ b/examples/serialbus/can/receivedframesview.py @@ -32,7 +32,7 @@ class ReceivedFramesView(QTableView): def set_model(self, model): super().setModel(model) for i in range(0, model.columnCount()): - size = model.headerData(i, Qt.Horizontal, Qt.SizeHintRole) + size = model.headerData(i, Qt.Orientation.Horizontal, Qt.ItemDataRole.SizeHintRole) self.setColumnWidth(i, size.width()) def keyPressEvent(self, event): diff --git a/examples/serialbus/modbus/modbusclient/writeregistermodel.py b/examples/serialbus/modbus/modbusclient/writeregistermodel.py index e88f4a835..10c13590d 100644 --- a/examples/serialbus/modbus/modbusclient/writeregistermodel.py +++ b/examples/serialbus/modbus/modbusclient/writeregistermodel.py @@ -41,23 +41,23 @@ class WriteRegisterModel(QAbstractTableModel): assert self.m_coils.size() == Column.ROW_COUNT assert len(self.m_holdingRegisters) == Column.ROW_COUNT - if column == Column.NUM_COLUMN and role == Qt.DisplayRole: + if column == Column.NUM_COLUMN and role == Qt.ItemDataRole.DisplayRole: return f"{row}" - if column == Column.COILS_COLUMN and role == Qt.CheckStateRole: # coils + if column == Column.COILS_COLUMN and role == Qt.ItemDataRole.CheckStateRole: # coils return Qt.Checked if self.m_coils[row] else Qt.Unchecked # holding registers - if column == Column.HOLDING_COLUMN and role == Qt.DisplayRole: + if column == Column.HOLDING_COLUMN and role == Qt.ItemDataRole.DisplayRole: reg = self.m_holdingRegisters[row] return f"0x{reg:x}" return None def headerData(self, section, orientation, role): - if role != Qt.DisplayRole: + if role != Qt.ItemDataRole.DisplayRole: return None - if orientation == Qt.Horizontal: + if orientation == Qt.Orientation.Horizontal: if section == Column.NUM_COLUMN: return "#" if section == Column.COILS_COLUMN: @@ -75,7 +75,7 @@ class WriteRegisterModel(QAbstractTableModel): assert self.m_coils.size() == Column.ROW_COUNT assert len(self.m_holdingRegisters) == Column.ROW_COUNT - if column == Column.COILS_COLUMN and role == Qt.CheckStateRole: # coils + if column == Column.COILS_COLUMN and role == Qt.ItemDataRole.CheckStateRole: # coils s = Qt.CheckState(int(value)) if s == Qt.Checked: self.m_coils.setBit(row) @@ -84,7 +84,8 @@ class WriteRegisterModel(QAbstractTableModel): self.dataChanged.emit(index, index) return True - if column == Column.HOLDING_COLUMN and role == Qt.EditRole: # holding registers + if column == Column.HOLDING_COLUMN and role == Qt.ItemDataRole.EditRole: + # holding registers base = 16 if value.startswith("0x") else 10 self.m_holdingRegisters[row] = int(value, base=base) self.dataChanged.emit(index, index) diff --git a/examples/serialport/terminal/console.py b/examples/serialport/terminal/console.py index bedb1ed96..036e46a7f 100644 --- a/examples/serialport/terminal/console.py +++ b/examples/serialport/terminal/console.py @@ -7,8 +7,8 @@ from PySide6.QtGui import QPalette from PySide6.QtWidgets import QPlainTextEdit -UNHANDLED_KEYS = [Qt.Key_Backspace, Qt.Key_Left, Qt.Key_Right, Qt.Key_Up, - Qt.Key_Down] +UNHANDLED_KEYS = [Qt.Key.Key_Backspace, Qt.Key.Key_Left, Qt.Key.Key_Right, Qt.Key.Key_Up, + Qt.Key.Key_Down] class Console(QPlainTextEdit): diff --git a/examples/spatialaudio/audiopanning/main.py b/examples/spatialaudio/audiopanning/main.py index db879610f..285deeb18 100644 --- a/examples/spatialaudio/audiopanning/main.py +++ b/examples/spatialaudio/audiopanning/main.py @@ -35,34 +35,34 @@ class AudioWidget(QWidget): file_layout.addWidget(self._file_dialog_button) form.addRow(file_layout) - self._azimuth = QSlider(Qt.Horizontal) + self._azimuth = QSlider(Qt.Orientation.Horizontal) self._azimuth.setRange(-180, 180) form.addRow("Azimuth (-180 - 180 degree):", self._azimuth) - self._elevation = QSlider(Qt.Horizontal) + self._elevation = QSlider(Qt.Orientation.Horizontal) self._elevation.setRange(-90, 90) form.addRow("Elevation (-90 - 90 degree)", self._elevation) - self._distance = QSlider(Qt.Horizontal) + self._distance = QSlider(Qt.Orientation.Horizontal) self._distance.setRange(0, 1000) self._distance.setValue(100) form.addRow("Distance (0 - 10 meter):", self._distance) - self._occlusion = QSlider(Qt.Horizontal) + self._occlusion = QSlider(Qt.Orientation.Horizontal) self._occlusion.setRange(0, 400) form.addRow("Occlusion (0 - 4):", self._occlusion) - self._room_dimension = QSlider(Qt.Horizontal) + self._room_dimension = QSlider(Qt.Orientation.Horizontal) self._room_dimension.setRange(0, 10000) self._room_dimension.setValue(1000) form.addRow("Room dimension (0 - 100 meter):", self._room_dimension) - self._reverb_gain = QSlider(Qt.Horizontal) + self._reverb_gain = QSlider(Qt.Orientation.Horizontal) self._reverb_gain.setRange(0, 500) self._reverb_gain.setValue(0) form.addRow("Reverb gain (0-5):", self._reverb_gain) - self._reflection_gain = QSlider(Qt.Horizontal) + self._reflection_gain = QSlider(Qt.Orientation.Horizontal) self._reflection_gain.setRange(0, 500) self._reflection_gain.setValue(0) form.addRow("Reflection gain (0-5):", self._reflection_gain) diff --git a/examples/sql/books/bookdelegate.py b/examples/sql/books/bookdelegate.py index 742b1fb46..897d0a63a 100644 --- a/examples/sql/books/bookdelegate.py +++ b/examples/sql/books/bookdelegate.py @@ -46,7 +46,7 @@ class BookDelegate(QSqlRelationalDelegate): if option.state & QStyle.State_Selected: painter.fillRect(option.rect, option.palette.color(color_group, QPalette.Highlight)) - rating = model.data(index, Qt.DisplayRole) + rating = model.data(index, Qt.ItemDataRole.DisplayRole) width = self.star.width() height = self.star.height() x = option.rect.x() diff --git a/examples/sql/books/bookwindow.py b/examples/sql/books/bookwindow.py index 6aa82992b..e913a228c 100644 --- a/examples/sql/books/bookwindow.py +++ b/examples/sql/books/bookwindow.py @@ -35,11 +35,12 @@ class BookWindow(QMainWindow, Ui_BookWindow): model.setRelation(genre_idx, QSqlRelation("genres", "id", "name")) # Set the localized header captions: - model.setHeaderData(author_idx, Qt.Horizontal, self.tr("Author Name")) - model.setHeaderData(genre_idx, Qt.Horizontal, self.tr("Genre")) - model.setHeaderData(model.fieldIndex("title"), Qt.Horizontal, self.tr("Title")) - model.setHeaderData(model.fieldIndex("year"), Qt.Horizontal, self.tr("Year")) - model.setHeaderData(model.fieldIndex("rating"), Qt.Horizontal, self.tr("Rating")) + model.setHeaderData(author_idx, Qt.Orientation.Horizontal, self.tr("Author Name")) + model.setHeaderData(genre_idx, Qt.Orientation.Horizontal, self.tr("Genre")) + model.setHeaderData(model.fieldIndex("title"), Qt.Orientation.Horizontal, self.tr("Title")) + model.setHeaderData(model.fieldIndex("year"), Qt.Orientation.Horizontal, self.tr("Year")) + model.setHeaderData(model.fieldIndex("rating"), + Qt.Orientation.Horizontal, self.tr("Rating")) if not model.select(): print(model.lastError()) diff --git a/examples/sql/relationaltablemodel/relationaltablemodel.py b/examples/sql/relationaltablemodel/relationaltablemodel.py index 520390666..47328e728 100644 --- a/examples/sql/relationaltablemodel/relationaltablemodel.py +++ b/examples/sql/relationaltablemodel/relationaltablemodel.py @@ -20,11 +20,11 @@ def initializeModel(model): model.setEditStrategy(QSqlRelationalTableModel.OnManualSubmit) model.setRelation(2, QSqlRelation("city", "id", "name")) model.setRelation(3, QSqlRelation("country", "id", "name")) - model.setHeaderData(0, Qt.Horizontal, QObject().tr("ID")) + model.setHeaderData(0, Qt.Orientation.Horizontal, QObject().tr("ID")) - model.setHeaderData(1, Qt.Horizontal, QObject().tr("Name")) - model.setHeaderData(2, Qt.Horizontal, QObject().tr("City")) - model.setHeaderData(3, Qt.Horizontal, QObject().tr("Country")) + model.setHeaderData(1, Qt.Orientation.Horizontal, QObject().tr("Name")) + model.setHeaderData(2, Qt.Orientation.Horizontal, QObject().tr("City")) + model.setHeaderData(3, Qt.Orientation.Horizontal, QObject().tr("Country")) model.select() diff --git a/examples/statemachine/trafficlight/trafficlight.py b/examples/statemachine/trafficlight/trafficlight.py index fb3384f1e..7dba4df55 100644 --- a/examples/statemachine/trafficlight/trafficlight.py +++ b/examples/statemachine/trafficlight/trafficlight.py @@ -38,7 +38,7 @@ class LightWidget(QWidget): if not self._on_val: return with QPainter(self) as painter: - painter.setRenderHint(QPainter.Antialiasing) + painter.setRenderHint(QPainter.RenderHint.Antialiasing) painter.setBrush(self.color) painter.drawEllipse(0, 0, self.width(), self.height()) diff --git a/examples/webchannel/standalone/main.py b/examples/webchannel/standalone/main.py index 8459b1a92..b344ec795 100644 --- a/examples/webchannel/standalone/main.py +++ b/examples/webchannel/standalone/main.py @@ -1,4 +1,5 @@ -# Copyright (C) 2016 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Milian Wolff <milian.wolff@kdab.com> +# Copyright (C) 2016 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, +# author Milian Wolff <milian.wolff@kdab.com> # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause from __future__ import annotations @@ -32,8 +33,8 @@ if __name__ == '__main__': # setup the QWebSocketServer server = QWebSocketServer("QWebChannel Standalone Example Server", - QWebSocketServer.NonSecureMode) - if not server.listen(QHostAddress.LocalHost, 12345): + QWebSocketServer.SslMode.NonSecureMode) + if not server.listen(QHostAddress.SpecialAddress.LocalHost, 12345): print("Failed to open web socket server.") sys.exit(-1) diff --git a/examples/webenginewidgets/notifications/main.py b/examples/webenginewidgets/notifications/main.py index c51af957b..6a96c360a 100644 --- a/examples/webenginewidgets/notifications/main.py +++ b/examples/webenginewidgets/notifications/main.py @@ -38,10 +38,11 @@ if __name__ == '__main__': view.setPage(WebEnginePage(view)) def set_feature_permission(origin: QUrl, feature: QWebEnginePage.Feature): - if feature != QWebEnginePage.Notifications: + if feature != QWebEnginePage.Feature.Notifications: return - view.page().setFeaturePermission(origin, feature, QWebEnginePage.PermissionGrantedByUser) + view.page().setFeaturePermission(origin, feature, + QWebEnginePage.PermissionPolicy.PermissionGrantedByUser) view.page().featurePermissionRequested.connect(set_feature_permission) profile = view.page().profile() diff --git a/examples/webenginewidgets/notifications/notificationpopup.py b/examples/webenginewidgets/notifications/notificationpopup.py index 803bfef92..86ff5c8e4 100644 --- a/examples/webenginewidgets/notifications/notificationpopup.py +++ b/examples/webenginewidgets/notifications/notificationpopup.py @@ -14,7 +14,7 @@ class NotificationPopup(QWidget): super().__init__(parent) self.notification = None self.m_icon, self.m_title, self.m_message = QLabel(), QLabel(), QLabel() - self.setWindowFlags(Qt.ToolTip) + self.setWindowFlags(Qt.WindowType.ToolTip) rootLayout = QHBoxLayout(self) rootLayout.addWidget(self.m_icon) @@ -26,7 +26,7 @@ class NotificationPopup(QWidget): bodyLayout.addLayout(titleLayout) titleLayout.addWidget(self.m_title) - titleLayout.addItem(QSpacerItem(0, 0, QSizePolicy.Expanding)) + titleLayout.addItem(QSpacerItem(0, 0, QSizePolicy.Policy.Expanding)) close = QPushButton("Close") titleLayout.addWidget(close) @@ -64,6 +64,6 @@ class NotificationPopup(QWidget): def mouseReleaseEvent(self, event: QMouseEvent) -> None: QWidget.mouseReleaseEvent(event) - if self.notification and event.button() == Qt.LeftButton: + if self.notification and event.button() == Qt.MouseButton.LeftButton: self.notification.click() self.onClosed() diff --git a/examples/widgets/animation/animatedtiles/animatedtiles.py b/examples/widgets/animation/animatedtiles/animatedtiles.py index 5be56b0e4..b26ac024b 100644 --- a/examples/widgets/animation/animatedtiles/animatedtiles.py +++ b/examples/widgets/animation/animatedtiles/animatedtiles.py @@ -191,7 +191,7 @@ if __name__ == '__main__': view.setViewportUpdateMode(QGraphicsView.BoundingRectViewportUpdate) view.setBackgroundBrush(QBrush(bg_pix)) view.setCacheMode(QGraphicsView.CacheBackground) - view.setRenderHints(QPainter.Antialiasing | QPainter.SmoothPixmapTransform) + view.setRenderHints(QPainter.RenderHint.Antialiasing | QPainter.SmoothPixmapTransform) view.show() states = QStateMachine() diff --git a/examples/widgets/animation/easing/easing.py b/examples/widgets/animation/easing/easing.py index 5ea2348d1..e4fa69a0d 100644 --- a/examples/widgets/animation/easing/easing.py +++ b/examples/widgets/animation/easing/easing.py @@ -162,9 +162,9 @@ class Window(QWidget): curve_path.lineTo(to) t += 1.0 / curve_scale - painter.setRenderHint(QPainter.Antialiasing, True) + painter.setRenderHint(QPainter.RenderHint.Antialiasing, True) painter.strokePath(curve_path, QColor(32, 32, 32)) - painter.setRenderHint(QPainter.Antialiasing, False) + painter.setRenderHint(QPainter.RenderHint.Antialiasing, False) item = QListWidgetItem() item.setIcon(QIcon(pix)) diff --git a/examples/widgets/dialogs/licensewizard/licensewizard.py b/examples/widgets/dialogs/licensewizard/licensewizard.py index ea8198154..414062479 100644 --- a/examples/widgets/dialogs/licensewizard/licensewizard.py +++ b/examples/widgets/dialogs/licensewizard/licensewizard.py @@ -207,14 +207,14 @@ class ConclusionPage(QWizardPage): def setVisible(self, visible: bool): super().setVisible(visible) if visible: - self.wizard().setButtonText(QWizard.CustomButton1, "&Print") - self.wizard().setOption(QWizard.HaveCustomButton1, True) + self.wizard().setButtonText(QWizard.WizardButton.CustomButton1, "&Print") + self.wizard().setOption(QWizard.WizardOption.HaveCustomButton1, True) if not self.custom_button_clicked_signal_connected: self.custom_button_clicked_signal_connected = True self.wizard().customButtonClicked.connect(self.print_button_clicked) else: - self.wizard().setOption(QWizard.HaveCustomButton1, False) + self.wizard().setOption(QWizard.WizardOption.HaveCustomButton1, False) if self.custom_button_clicked_signal_connected: self.custom_button_clicked_signal_connected = False diff --git a/examples/widgets/effects/blurpicker/blurpicker.py b/examples/widgets/effects/blurpicker/blurpicker.py index a0cad5edc..b44271549 100644 --- a/examples/widgets/effects/blurpicker/blurpicker.py +++ b/examples/widgets/effects/blurpicker/blurpicker.py @@ -37,7 +37,7 @@ class BlurPicker(QGraphicsView): self._animation.setDuration(400) self._animation.setEasingCurve(QEasingCurve.InOutSine) - self.setRenderHint(QPainter.Antialiasing, True) + self.setRenderHint(QPainter.RenderHint.Antialiasing, True) self.setFrameStyle(QFrame.NoFrame) @Property(float) diff --git a/examples/widgets/effects/lighting/lighting.py b/examples/widgets/effects/lighting/lighting.py index bec09aa94..4d98b8148 100644 --- a/examples/widgets/effects/lighting/lighting.py +++ b/examples/widgets/effects/lighting/lighting.py @@ -32,7 +32,7 @@ class Lighting(QGraphicsView): timer.setInterval(30) timer.start() - self.setRenderHint(QPainter.Antialiasing) + self.setRenderHint(QPainter.RenderHint.Antialiasing) self.setFrameStyle(QFrame.NoFrame) def setup_scene(self): diff --git a/examples/widgets/graphicsview/collidingmice/collidingmice.py b/examples/widgets/graphicsview/collidingmice/collidingmice.py index 7f1a3d233..c0f427668 100644 --- a/examples/widgets/graphicsview/collidingmice/collidingmice.py +++ b/examples/widgets/graphicsview/collidingmice/collidingmice.py @@ -164,7 +164,7 @@ if __name__ == '__main__': scene.addItem(mouse) view = QGraphicsView(scene) - view.setRenderHint(QPainter.Antialiasing) + view.setRenderHint(QPainter.RenderHint.Antialiasing) view.setBackgroundBrush(QBrush(QPixmap(':/images/cheese.jpg'))) view.setCacheMode(QGraphicsView.CacheBackground) view.setViewportUpdateMode(QGraphicsView.BoundingRectViewportUpdate) diff --git a/examples/widgets/graphicsview/dragdroprobot/dragdroprobot.py b/examples/widgets/graphicsview/dragdroprobot/dragdroprobot.py index b3ec221fe..75d1c61c4 100644 --- a/examples/widgets/graphicsview/dragdroprobot/dragdroprobot.py +++ b/examples/widgets/graphicsview/dragdroprobot/dragdroprobot.py @@ -78,7 +78,7 @@ class ColorItem(QGraphicsItem): with QPainter(pixmap) as painter: painter.translate(15, 15) - painter.setRenderHint(QPainter.Antialiasing) + painter.setRenderHint(QPainter.RenderHint.Antialiasing) self.paint(painter, None, None) pixmap.setMask(pixmap.createHeuristicMask()) @@ -245,7 +245,7 @@ if __name__ == '__main__': scene.addItem(robot) view = QGraphicsView(scene) - view.setRenderHint(QPainter.Antialiasing) + view.setRenderHint(QPainter.RenderHint.Antialiasing) view.setViewportUpdateMode(QGraphicsView.BoundingRectViewportUpdate) view.setBackgroundBrush(QColor(230, 200, 167)) view.setWindowTitle("Drag and Drop Robot") diff --git a/examples/widgets/graphicsview/elasticnodes/elasticnodes.py b/examples/widgets/graphicsview/elasticnodes/elasticnodes.py index d41981dce..35607770c 100644 --- a/examples/widgets/graphicsview/elasticnodes/elasticnodes.py +++ b/examples/widgets/graphicsview/elasticnodes/elasticnodes.py @@ -244,7 +244,7 @@ class GraphWidget(QGraphicsView): scene.setSceneRect(-200, -200, 400, 400) self.setScene(scene) self.setCacheMode(QGraphicsView.CacheBackground) - self.setRenderHint(QPainter.Antialiasing) + self.setRenderHint(QPainter.RenderHint.Antialiasing) self.setTransformationAnchor(QGraphicsView.AnchorUnderMouse) self.setResizeAnchor(QGraphicsView.AnchorViewCenter) diff --git a/examples/widgets/itemviews/address_book/addresswidget.py b/examples/widgets/itemviews/address_book/addresswidget.py index 5852263e1..a584dcbea 100644 --- a/examples/widgets/itemviews/address_book/addresswidget.py +++ b/examples/widgets/itemviews/address_book/addresswidget.py @@ -68,11 +68,11 @@ class AddressWidget(QTabWidget): # Step 2: get the index of the newly created row and use it. # to set the name ix = self._table_model.index(0, 0, QModelIndex()) - self._table_model.setData(ix, address["name"], Qt.EditRole) + self._table_model.setData(ix, address["name"], Qt.ItemDataRole.EditRole) # Step 3: lather, rinse, repeat for the address. ix = self._table_model.index(0, 1, QModelIndex()) - self._table_model.setData(ix, address["address"], Qt.EditRole) + self._table_model.setData(ix, address["address"], Qt.ItemDataRole.EditRole) # Remove the newAddressTab, as we now have at least one # address in the model. @@ -99,9 +99,9 @@ class AddressWidget(QTabWidget): row = proxy_model.mapToSource(indexes[0]).row() ix = self._table_model.index(row, 0, QModelIndex()) - name = self._table_model.data(ix, Qt.DisplayRole) + name = self._table_model.data(ix, Qt.ItemDataRole.DisplayRole) ix = self._table_model.index(row, 1, QModelIndex()) - address = self._table_model.data(ix, Qt.DisplayRole) + address = self._table_model.data(ix, Qt.ItemDataRole.DisplayRole) # Open an addDialogWidget, and only allow the user to edit the address. add_dialog = AddDialogWidget() @@ -116,7 +116,7 @@ class AddressWidget(QTabWidget): new_address = add_dialog.address if new_address != address: ix = self._table_model.index(row, 1, QModelIndex()) - self._table_model.setData(ix, new_address, Qt.EditRole) + self._table_model.setData(ix, new_address, Qt.ItemDataRole.EditRole) @Slot() def remove_entry(self): diff --git a/examples/widgets/itemviews/address_book/tablemodel.py b/examples/widgets/itemviews/address_book/tablemodel.py index 9a69be24e..8e9f5b76a 100644 --- a/examples/widgets/itemviews/address_book/tablemodel.py +++ b/examples/widgets/itemviews/address_book/tablemodel.py @@ -24,7 +24,7 @@ class TableModel(QAbstractTableModel): """ Returns the number of columns the model holds. """ return 2 - def data(self, index, role=Qt.DisplayRole): + def data(self, index, role=Qt.ItemDataRole.DisplayRole): """ Depending on the index and role given, return data. If not returning data, return None (PySide equivalent of QT's "invalid QVariant"). @@ -35,7 +35,7 @@ class TableModel(QAbstractTableModel): if not 0 <= index.row() < len(self.addresses): return None - if role == Qt.DisplayRole: + if role == Qt.ItemDataRole.DisplayRole: name = self.addresses[index.row()]["name"] address = self.addresses[index.row()]["address"] @@ -46,12 +46,12 @@ class TableModel(QAbstractTableModel): return None - def headerData(self, section, orientation, role=Qt.DisplayRole): + def headerData(self, section, orientation, role=Qt.ItemDataRole.DisplayRole): """ Set the headers to be displayed. """ - if role != Qt.DisplayRole: + if role != Qt.ItemDataRole.DisplayRole: return None - if orientation == Qt.Horizontal: + if orientation == Qt.Orientation.Horizontal: if section == 0: return "Name" elif section == 1: @@ -78,11 +78,11 @@ class TableModel(QAbstractTableModel): self.endRemoveRows() return True - def setData(self, index, value, role=Qt.EditRole): + def setData(self, index, value, role=Qt.ItemDataRole.EditRole): """ Adjust the data (set it to <value>) depending on the given index and role. """ - if role != Qt.EditRole: + if role != Qt.ItemDataRole.EditRole: return False if index.isValid() and 0 <= index.row() < len(self.addresses): diff --git a/examples/widgets/itemviews/basicfiltermodel/basicsortfiltermodel.py b/examples/widgets/itemviews/basicfiltermodel/basicsortfiltermodel.py index 7ee69c183..2bfe9d71e 100644 --- a/examples/widgets/itemviews/basicfiltermodel/basicsortfiltermodel.py +++ b/examples/widgets/itemviews/basicfiltermodel/basicsortfiltermodel.py @@ -143,9 +143,9 @@ def add_mail(model, subject, sender, date): def create_mail_model(parent): model = QStandardItemModel(0, 3, parent) - model.setHeaderData(0, Qt.Horizontal, "Subject") - model.setHeaderData(1, Qt.Horizontal, "Sender") - model.setHeaderData(2, Qt.Horizontal, "Date") + model.setHeaderData(0, Qt.Orientation.Horizontal, "Subject") + model.setHeaderData(1, Qt.Orientation.Horizontal, "Sender") + model.setHeaderData(2, Qt.Orientation.Horizontal, "Date") add_mail(model, "Happy New Year!", "Grace K. <grace@software-inc.com>", QDateTime(QDate(2006, 12, 31), QTime(17, 3))) diff --git a/examples/widgets/itemviews/editabletreemodel/mainwindow.py b/examples/widgets/itemviews/editabletreemodel/mainwindow.py index 2691c0139..e33220e8c 100644 --- a/examples/widgets/itemviews/editabletreemodel/mainwindow.py +++ b/examples/widgets/itemviews/editabletreemodel/mainwindow.py @@ -21,8 +21,8 @@ class MainWindow(QMainWindow): self.view = QTreeView() self.view.setAlternatingRowColors(True) - self.view.setSelectionBehavior(QAbstractItemView.SelectItems) - self.view.setHorizontalScrollMode(QAbstractItemView.ScrollPerPixel) + self.view.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectItems) + self.view.setHorizontalScrollMode(QAbstractItemView.ScrollMode.ScrollPerPixel) self.view.setAnimated(False) self.view.setAllColumnsShowFocus(True) self.setCentralWidget(self.view) @@ -91,13 +91,13 @@ class MainWindow(QMainWindow): for column in range(model.columnCount(index)): child: QModelIndex = model.index(0, column, index) - model.setData(child, "[No data]", Qt.EditRole) - if not model.headerData(column, Qt.Horizontal): - model.setHeaderData(column, Qt.Horizontal, "[No header]", - Qt.EditRole) + model.setData(child, "[No data]", Qt.ItemDataRole.EditRole) + if not model.headerData(column, Qt.Orientation.Horizontal): + model.setHeaderData(column, Qt.Orientation.Horizontal, "[No header]", + Qt.ItemDataRole.EditRole) selection_model.setCurrentIndex( - model.index(0, 0, index), QItemSelectionModel.ClearAndSelect + model.index(0, 0, index), QItemSelectionModel.SelectionFlag.ClearAndSelect ) self.update_actions() @@ -108,8 +108,8 @@ class MainWindow(QMainWindow): changed: bool = model.insertColumn(column + 1) if changed: - model.setHeaderData(column + 1, Qt.Horizontal, "[No header]", - Qt.EditRole) + model.setHeaderData(column + 1, Qt.Orientation.Horizontal, "[No header]", + Qt.ItemDataRole.EditRole) self.update_actions() @@ -126,7 +126,7 @@ class MainWindow(QMainWindow): for column in range(model.columnCount(parent)): child: QModelIndex = model.index(index.row() + 1, column, parent) - model.setData(child, "[No data]", Qt.EditRole) + model.setData(child, "[No data]", Qt.ItemDataRole.EditRole) @Slot() def remove_column(self) -> None: diff --git a/examples/widgets/itemviews/editabletreemodel/treemodel.py b/examples/widgets/itemviews/editabletreemodel/treemodel.py index ac27fe795..98e4d4752 100644 --- a/examples/widgets/itemviews/editabletreemodel/treemodel.py +++ b/examples/widgets/itemviews/editabletreemodel/treemodel.py @@ -23,7 +23,7 @@ class TreeModel(QAbstractItemModel): if not index.isValid(): return None - if role != Qt.DisplayRole and role != Qt.EditRole: + if role != Qt.ItemDataRole.DisplayRole and role != Qt.ItemDataRole.EditRole: return None item: TreeItem = self.get_item(index) @@ -32,9 +32,9 @@ class TreeModel(QAbstractItemModel): def flags(self, index: QModelIndex) -> Qt.ItemFlags: if not index.isValid(): - return Qt.NoItemFlags + return Qt.ItemFlag.NoItemFlags - return Qt.ItemIsEditable | QAbstractItemModel.flags(self, index) + return Qt.ItemFlag.ItemIsEditable | QAbstractItemModel.flags(self, index) def get_item(self, index: QModelIndex = QModelIndex()) -> TreeItem: if index.isValid(): @@ -45,8 +45,8 @@ class TreeModel(QAbstractItemModel): return self.root_item def headerData(self, section: int, orientation: Qt.Orientation, - role: int = Qt.DisplayRole): - if orientation == Qt.Horizontal and role == Qt.DisplayRole: + role: int = Qt.ItemDataRole.DisplayRole): + if orientation == Qt.Orientation.Horizontal and role == Qt.ItemDataRole.DisplayRole: return self.root_item.data(section) return None @@ -133,20 +133,21 @@ class TreeModel(QAbstractItemModel): return parent_item.child_count() def setData(self, index: QModelIndex, value, role: int) -> bool: - if role != Qt.EditRole: + if role != Qt.ItemDataRole.EditRole: return False item: TreeItem = self.get_item(index) result: bool = item.set_data(index.column(), value) if result: - self.dataChanged.emit(index, index, [Qt.DisplayRole, Qt.EditRole]) + self.dataChanged.emit(index, index, + [Qt.ItemDataRole.DisplayRole, Qt.ItemDataRole.EditRole]) return result def setHeaderData(self, section: int, orientation: Qt.Orientation, value, role: int = None) -> bool: - if role != Qt.EditRole or orientation != Qt.Horizontal: + if role != Qt.ItemDataRole.EditRole or orientation != Qt.Orientation.Horizontal: return False result: bool = self.root_item.set_data(section, value) diff --git a/examples/widgets/itemviews/fetchmore/fetchmore.py b/examples/widgets/itemviews/fetchmore/fetchmore.py index 1b9202f2f..c1c84f0f2 100644 --- a/examples/widgets/itemviews/fetchmore/fetchmore.py +++ b/examples/widgets/itemviews/fetchmore/fetchmore.py @@ -37,7 +37,7 @@ class FileListModel(QAbstractListModel): def rowCount(self, parent=QModelIndex()): return self._file_count - def data(self, index, role=Qt.DisplayRole): + def data(self, index, role=Qt.ItemDataRole.DisplayRole): if not index.isValid(): return None @@ -45,15 +45,15 @@ class FileListModel(QAbstractListModel): if row >= len(self._file_list) or row < 0: return None - if role == Qt.DisplayRole: + if role == Qt.ItemDataRole.DisplayRole: return self._file_list[row].fileName() - if role == Qt.BackgroundRole: + if role == Qt.ItemDataRole.BackgroundRole: batch = row // BATCH_SIZE palette = qApp.palette() # noqa: F821 return palette.base() if batch % 2 == 0 else palette.alternateBase() - if role == Qt.DecorationRole: + if role == Qt.ItemDataRole.DecorationRole: return self._icon_provider.icon(self._file_list[row]) return None diff --git a/examples/widgets/itemviews/jsonmodel/jsonmodel.py b/examples/widgets/itemviews/jsonmodel/jsonmodel.py index 0ff14e67c..7d15b6ca0 100644 --- a/examples/widgets/itemviews/jsonmodel/jsonmodel.py +++ b/examples/widgets/itemviews/jsonmodel/jsonmodel.py @@ -156,14 +156,14 @@ class JsonModel(QAbstractItemModel): item = index.internalPointer() - if role == Qt.DisplayRole: + if role == Qt.ItemDataRole.DisplayRole: if index.column() == 0: return item.key if index.column() == 1: return item.value - elif role == Qt.EditRole: + elif role == Qt.ItemDataRole.EditRole: if index.column() == 1: return item.value @@ -178,12 +178,12 @@ class JsonModel(QAbstractItemModel): role (Qt.ItemDataRole) """ - if role == Qt.EditRole: + if role == Qt.ItemDataRole.EditRole: if index.column() == 1: item = index.internalPointer() item.value = str(value) - self.dataChanged.emit(index, index, [Qt.EditRole]) + self.dataChanged.emit(index, index, [Qt.ItemDataRole.EditRole]) return True @@ -197,10 +197,10 @@ class JsonModel(QAbstractItemModel): For the JsonModel, it returns only data for columns (orientation = Horizontal) """ - if role != Qt.DisplayRole: + if role != Qt.ItemDataRole.DisplayRole: return None - if orientation == Qt.Horizontal: + if orientation == Qt.Orientation.Horizontal: return self._headers[section] def index(self, row: int, column: int, parent=QModelIndex()) -> QModelIndex: diff --git a/examples/widgets/itemviews/spinboxdelegate/spinboxdelegate.py b/examples/widgets/itemviews/spinboxdelegate/spinboxdelegate.py index f701d32fe..11bdeddb2 100644 --- a/examples/widgets/itemviews/spinboxdelegate/spinboxdelegate.py +++ b/examples/widgets/itemviews/spinboxdelegate/spinboxdelegate.py @@ -33,7 +33,7 @@ class SpinBoxDelegate(QStyledItemDelegate): #! [2] def setEditorData(self, editor, index): - value = index.model().data(index, Qt.EditRole) + value = index.model().data(index, Qt.ItemDataRole.EditRole) editor.setValue(value) #! [2] @@ -41,7 +41,7 @@ class SpinBoxDelegate(QStyledItemDelegate): def setModelData(self, editor, model, index): editor.interpretText() value = editor.value() - model.setData(index, value, Qt.EditRole) + model.setData(index, value, Qt.ItemDataRole.EditRole) #! [3] #! [4] diff --git a/examples/widgets/itemviews/spreadsheet/main.py b/examples/widgets/itemviews/spreadsheet/main.py index b21059ffe..e811f6291 100644 --- a/examples/widgets/itemviews/spreadsheet/main.py +++ b/examples/widgets/itemviews/spreadsheet/main.py @@ -15,6 +15,6 @@ if __name__ == "__main__": sheet = SpreadSheet(10, 6) sheet.setWindowIcon(QPixmap(":/images/interview.png")) sheet.show() - sheet.layout().setSizeConstraint(QLayout.SetFixedSize) + sheet.layout().setSizeConstraint(QLayout.SizeConstraint.SetFixedSize) sys.exit(app.exec()) diff --git a/examples/widgets/itemviews/spreadsheet/spreadsheet.py b/examples/widgets/itemviews/spreadsheet/spreadsheet.py index 342b60f26..88357ae14 100644 --- a/examples/widgets/itemviews/spreadsheet/spreadsheet.py +++ b/examples/widgets/itemviews/spreadsheet/spreadsheet.py @@ -76,30 +76,30 @@ class SpreadSheet(QMainWindow): self._cell_sum_action.triggered.connect(self.action_sum) self._cell_add_action = QAction("&Add", self) - self._cell_add_action.setShortcut(Qt.CTRL | Qt.Key_Plus) + self._cell_add_action.setShortcut(Qt.Modifier.CTRL | Qt.Key.Key_Plus) self._cell_add_action.triggered.connect(self.action_add) self._cell_sub_action = QAction("&Subtract", self) - self._cell_sub_action.setShortcut(Qt.CTRL | Qt.Key_Minus) + self._cell_sub_action.setShortcut(Qt.Modifier.CTRL | Qt.Key.Key_Minus) self._cell_sub_action.triggered.connect(self.action_subtract) self._cell_mul_action = QAction("&Multiply", self) - self._cell_mul_action.setShortcut(Qt.CTRL | Qt.Key_multiply) + self._cell_mul_action.setShortcut(Qt.Modifier.CTRL | Qt.Key.Key_multiply) self._cell_mul_action.triggered.connect(self.action_multiply) self._cell_div_action = QAction("&Divide", self) - self._cell_div_action.setShortcut(Qt.CTRL | Qt.Key_division) + self._cell_div_action.setShortcut(Qt.Modifier.CTRL | Qt.Key.Key_division) self._cell_div_action.triggered.connect(self.action_divide) self._font_action = QAction("Font...", self) - self._font_action.setShortcut(Qt.CTRL | Qt.Key_F) + self._font_action.setShortcut(Qt.Modifier.CTRL | Qt.Key.Key_F) self._font_action.triggered.connect(self.select_font) self._color_action = QAction(QPixmap(16, 16), "Background &Color...", self) self._color_action.triggered.connect(self.select_color) self._clear_action = QAction("Clear", self) - self._clear_action.setShortcut(Qt.Key_Delete) + self._clear_action.setShortcut(Qt.Key.Key_Delete) self._clear_action.triggered.connect(self.clear) self._about_spreadsheet = QAction("About Spreadsheet", self) @@ -137,7 +137,7 @@ class SpreadSheet(QMainWindow): @Slot(QTableWidgetItem) def update_status(self, item: QTableWidgetItem) -> None: if item and item == self._table.currentItem(): - self.statusBar().showMessage(str(item.data(Qt.StatusTipRole)), 1000) + self.statusBar().showMessage(str(item.data(Qt.ItemDataRole.StatusTipRole)), 1000) self._cell_label.setText( "Cell: ({})".format( SpreadSheetItem.encode_pos(self._table.row(item), self._table.column(item)) @@ -174,7 +174,7 @@ class SpreadSheet(QMainWindow): if item != self._table.currentItem(): return if item: - self._formula_input.setText(str(item.data(Qt.EditRole))) + self._formula_input.setText(str(item.data(Qt.ItemDataRole.EditRole))) else: self._formula_input.clear() @@ -187,7 +187,7 @@ class SpreadSheet(QMainWindow): if not item: self._table.setItem(row, col, SpreadSheetItem(text)) else: - item.setData(Qt.EditRole, text) + item.setData(Qt.ItemDataRole.EditRole, text) self._table.viewport().update() @Slot() @@ -248,7 +248,7 @@ class SpreadSheet(QMainWindow): cell1_col_input.setCurrentIndex(c1_col) operator_label = QLabel(opText, group) - operator_label.setAlignment(Qt.AlignHCenter) + operator_label.setAlignment(Qt.AlignmentFlag.AlignHCenter) cell2_label = QLabel(c2Text, group) cell2_row_input = QComboBox(group) @@ -260,7 +260,7 @@ class SpreadSheet(QMainWindow): cell2_col_input.setCurrentIndex(c2_col) equals_label = QLabel("=", group) - equals_label.setAlignment(Qt.AlignHCenter) + equals_label.setAlignment(Qt.AlignmentFlag.AlignHCenter) out_label = QLabel(outText, group) out_row_input = QComboBox(group) @@ -405,10 +405,10 @@ class SpreadSheet(QMainWindow): self.addAction(self._font_action) self.addAction(self._second_separator) self.addAction(self._clear_action) - self.setContextMenuPolicy(Qt.ActionsContextMenu) + self.setContextMenuPolicy(Qt.ContextMenuPolicy.ActionsContextMenu) def setup_contents(self) -> None: - title_background = QBrush(Qt.lightGray) + title_background = QBrush(Qt.GlobalColor.lightGray) title_font = self._table.font() title_font.setBold(True) @@ -469,7 +469,7 @@ class SpreadSheet(QMainWindow): self._table.setItem(8, 2, SpreadSheetItem("1240")) self._table.setItem(9, 2, SpreadSheetItem()) - self._table.item(9, 2).setBackground(Qt.lightGray) + self._table.item(9, 2).setBackground(Qt.GlobalColor.lightGray) # column 3 self._table.setItem(0, 3, SpreadSheetItem("Currency")) @@ -487,7 +487,7 @@ class SpreadSheet(QMainWindow): self._table.setItem(8, 3, SpreadSheetItem("USD")) self._table.setItem(9, 3, SpreadSheetItem()) - self._table.item(9, 3).setBackground(Qt.lightGray) + self._table.item(9, 3).setBackground(Qt.GlobalColor.lightGray) # column 4 self._table.setItem(0, 4, SpreadSheetItem("Ex. Rate")) diff --git a/examples/widgets/itemviews/spreadsheet/spreadsheetdelegate.py b/examples/widgets/itemviews/spreadsheet/spreadsheetdelegate.py index c098a6fbb..a6d81223f 100644 --- a/examples/widgets/itemviews/spreadsheet/spreadsheetdelegate.py +++ b/examples/widgets/itemviews/spreadsheet/spreadsheetdelegate.py @@ -26,7 +26,8 @@ class SpreadSheetDelegate(QStyledItemDelegate): # create a completer with the strings in the column as model allStrings = QStringListModel() for i in range(1, index.model().rowCount()): - strItem = str(index.model().data(index.sibling(i, index.column()), Qt.EditRole)) + strItem = str(index.model().data(index.sibling(i, index.column()), + Qt.ItemDataRole.EditRole)) if not allStrings.contains(strItem): allStrings.append(strItem) @@ -45,14 +46,14 @@ class SpreadSheetDelegate(QStyledItemDelegate): def set_editor_data(self, editor: QWidget, index: QModelIndex) -> None: edit = QLineEdit(editor) if edit: - edit.setText(str(index.model().data(index, Qt.EditRole))) + edit.setText(str(index.model().data(index, Qt.ItemDataRole.EditRole))) return dateEditor = QDateTimeEdit(editor) if dateEditor: dateEditor.setDate( QDate.fromString( - str(index.model().data(index, Qt.EditRole)), "d/M/yyyy")) + str(index.model().data(index, Qt.ItemDataRole.EditRole)), "d/M/yyyy")) def set_model_data(self, editor: QWidget, model: QAbstractItemModel, index: QModelIndex) -> None: diff --git a/examples/widgets/itemviews/spreadsheet/spreadsheetitem.py b/examples/widgets/itemviews/spreadsheet/spreadsheetitem.py index 9dcdc47d6..8f1f9b428 100644 --- a/examples/widgets/itemviews/spreadsheet/spreadsheetitem.py +++ b/examples/widgets/itemviews/spreadsheet/spreadsheetitem.py @@ -14,25 +14,25 @@ class SpreadSheetItem(QTableWidgetItem): return super().__init_subclass__() def data(self, role: int) -> Any: - if role == Qt.EditRole or role == Qt.StatusTipRole: + if role == Qt.ItemDataRole.EditRole or role == Qt.ItemDataRole.StatusTipRole: return self.formula() - if role == Qt.DisplayRole: + if role == Qt.ItemDataRole.DisplayRole: return self.display() t = str(self.display()) - if role == Qt.ForegroundRole: + if role == Qt.ItemDataRole.ForegroundRole: try: number = int(t) - color = Qt.red if number < 0 else Qt.blue + color = Qt.GlobalColor.red if number < 0 else Qt.GlobalColor.blue except ValueError: - color = Qt.black + color = Qt.GlobalColor.black return color - if role == Qt.TextAlignmentRole: + if role == Qt.ItemDataRole.TextAlignmentRole: if t and (t[0].isdigit() or t[0] == '-'): - return int(Qt.AlignRight | Qt.AlignVCenter) + return int(Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignVCenter) return super().data(role) @@ -52,7 +52,7 @@ class SpreadSheetItem(QTableWidgetItem): return result def formula(self) -> None: - return str(super().data(Qt.DisplayRole)) + return str(super().data(Qt.ItemDataRole.DisplayRole)) def compute_formula(self, formula: str, widget: QTableWidget, this) -> QMetaType.Type.QVariant: # check if the string is actually a formula or not diff --git a/examples/widgets/itemviews/stardelegate/starrating.py b/examples/widgets/itemviews/stardelegate/starrating.py index e457e2f50..a3576c69e 100644 --- a/examples/widgets/itemviews/stardelegate/starrating.py +++ b/examples/widgets/itemviews/stardelegate/starrating.py @@ -41,7 +41,7 @@ class StarRating(object): """ Paint the stars (and/or diamonds if we're in editing mode). """ painter.save() - painter.setRenderHint(QPainter.Antialiasing, True) + painter.setRenderHint(QPainter.RenderHint.Antialiasing, True) painter.setPen(Qt.NoPen) if isEditable: diff --git a/examples/widgets/layouts/borderlayout/borderlayout.py b/examples/widgets/layouts/borderlayout/borderlayout.py index 19ba3e94b..ac62a4163 100644 --- a/examples/widgets/layouts/borderlayout/borderlayout.py +++ b/examples/widgets/layouts/borderlayout/borderlayout.py @@ -63,7 +63,7 @@ class BorderLayout(QLayout): self.add(QWidgetItem(widget), position) def expandingDirections(self) -> Qt.Orientations: - return Qt.Horizontal | Qt.Vertical + return Qt.Orientation.Horizontal | Qt.Vertical def hasHeightForWidth(self) -> bool: return False diff --git a/examples/widgets/layouts/dynamiclayouts/dynamiclayouts.py b/examples/widgets/layouts/dynamiclayouts/dynamiclayouts.py index 419b4e97c..268e2056f 100644 --- a/examples/widgets/layouts/dynamiclayouts/dynamiclayouts.py +++ b/examples/widgets/layouts/dynamiclayouts/dynamiclayouts.py @@ -64,7 +64,7 @@ class Dialog(QDialog): self._button_box.setOrientation(orientation) new_size_hint = self._button_box.sizeHint() + QSize(spacing, spacing) - if orientation == Qt.Horizontal: + if orientation == Qt.Orientation.Horizontal: self._main_layout.addWidget(self._button_box, 2, 0) self.resize(self.size() + QSize(-old_size_hint.width(), new_size_hint.height())) else: @@ -101,7 +101,7 @@ class Dialog(QDialog): buttons_orientation_label = QLabel("Orientation of buttons:") buttons_orientation_combo_box = QComboBox() - buttons_orientation_combo_box.addItem("Horizontal", Qt.Horizontal) + buttons_orientation_combo_box.addItem("Horizontal", Qt.Orientation.Horizontal) buttons_orientation_combo_box.addItem("Vertical", Qt.Vertical) buttons_orientation_combo_box.currentIndexChanged[int].connect( self.buttons_orientation_changed) diff --git a/examples/widgets/layouts/flowlayout/flowlayout.py b/examples/widgets/layouts/flowlayout/flowlayout.py index 4764de70a..b4e4aeaad 100644 --- a/examples/widgets/layouts/flowlayout/flowlayout.py +++ b/examples/widgets/layouts/flowlayout/flowlayout.py @@ -91,7 +91,7 @@ class FlowLayout(QLayout): for item in self._item_list: style = item.widget().style() layout_spacing_x = style.layoutSpacing( - QSizePolicy.PushButton, QSizePolicy.PushButton, Qt.Horizontal + QSizePolicy.PushButton, QSizePolicy.PushButton, Qt.Orientation.Horizontal ) layout_spacing_y = style.layoutSpacing( QSizePolicy.PushButton, QSizePolicy.PushButton, Qt.Vertical diff --git a/examples/widgets/linguist/main.py b/examples/widgets/linguist/main.py index dd6ef4d09..53dd358f5 100644 --- a/examples/widgets/linguist/main.py +++ b/examples/widgets/linguist/main.py @@ -42,7 +42,7 @@ class Window(QMainWindow): if __name__ == '__main__': app = QApplication(sys.argv) - path = QLibraryInfo.path(QLibraryInfo.TranslationsPath) + path = QLibraryInfo.path(QLibraryInfo.LibraryPath.TranslationsPath) translator = QTranslator(app) if translator.load(QLocale.system(), 'qtbase', '_', path): app.installTranslator(translator) diff --git a/examples/widgets/painting/basicdrawing/basicdrawing.py b/examples/widgets/painting/basicdrawing/basicdrawing.py index cdc7fd9d5..75fdffad6 100644 --- a/examples/widgets/painting/basicdrawing/basicdrawing.py +++ b/examples/widgets/painting/basicdrawing/basicdrawing.py @@ -82,7 +82,7 @@ class RenderArea(QWidget): painter.setPen(self.pen) painter.setBrush(self.brush) if self.antialiased: - painter.setRenderHint(QPainter.Antialiasing) + painter.setRenderHint(QPainter.RenderHint.Antialiasing) for x in range(0, self.width(), 100): for y in range(0, self.height(), 100): @@ -130,7 +130,7 @@ class RenderArea(QWidget): painter.drawRect(QRect(0, 0, self.width() - 1, self.height() - 1)) -id_role = Qt.UserRole +id_role = Qt.ItemDataRole.UserRole class Window(QWidget): diff --git a/examples/widgets/painting/concentriccircles/concentriccircles.py b/examples/widgets/painting/concentriccircles/concentriccircles.py index 297ab1db7..df415fb0f 100644 --- a/examples/widgets/painting/concentriccircles/concentriccircles.py +++ b/examples/widgets/painting/concentriccircles/concentriccircles.py @@ -43,7 +43,7 @@ class CircleWidget(QWidget): def paintEvent(self, event): with QPainter(self) as painter: - painter.setRenderHint(QPainter.Antialiasing, self.antialiased) + painter.setRenderHint(QPainter.RenderHint.Antialiasing, self.antialiased) painter.translate(self.width() / 2, self.height() / 2) for diameter in range(0, 256, 9): diff --git a/examples/widgets/painting/painter/painter.py b/examples/widgets/painting/painter/painter.py index 1c06a4b47..b1d280c3b 100644 --- a/examples/widgets/painting/painter/painter.py +++ b/examples/widgets/painting/painter/painter.py @@ -72,7 +72,7 @@ class PainterWidget(QWidget): """ current_pos = event.position().toPoint() self.painter.begin(self.pixmap) - self.painter.setRenderHints(QPainter.Antialiasing, True) + self.painter.setRenderHints(QPainter.RenderHint.Antialiasing, True) self.painter.setPen(self.pen) self.painter.drawLine(self.previous_pos, current_pos) self.painter.end() diff --git a/examples/widgets/richtext/orderform/orderform.py b/examples/widgets/richtext/orderform/orderform.py index b8f99cac4..66a9c2d02 100644 --- a/examples/widgets/richtext/orderform/orderform.py +++ b/examples/widgets/richtext/orderform/orderform.py @@ -228,7 +228,7 @@ class DetailsDialog(QDialog): for row in range(len(self.items)): text = self._items_table.item(row, 0).text() - quantity = int(self._items_table.item(row, 1).data(Qt.DisplayRole)) + quantity = int(self._items_table.item(row, 1).data(Qt.ItemDataRole.DisplayRole)) order_list.append((text, max(0, quantity))) return order_list diff --git a/examples/widgets/tutorials/cannon/t10.py b/examples/widgets/tutorials/cannon/t10.py index 710d4e253..d516104bc 100644 --- a/examples/widgets/tutorials/cannon/t10.py +++ b/examples/widgets/tutorials/cannon/t10.py @@ -21,7 +21,7 @@ class LCDRange(QWidget): super().__init__(parent) lcd = QLCDNumber(2) - self.slider = QSlider(Qt.Horizontal) + self.slider = QSlider(Qt.Orientation.Horizontal) self.slider.setRange(0, 99) self.slider.setValue(0) diff --git a/examples/widgets/tutorials/cannon/t11.py b/examples/widgets/tutorials/cannon/t11.py index 010d22c0c..71d6e3cd3 100644 --- a/examples/widgets/tutorials/cannon/t11.py +++ b/examples/widgets/tutorials/cannon/t11.py @@ -23,7 +23,7 @@ class LCDRange(QWidget): super().__init__(parent) lcd = QLCDNumber(2) - self.slider = QSlider(Qt.Horizontal) + self.slider = QSlider(Qt.Orientation.Horizontal) self.slider.setRange(0, 99) self.slider.setValue(0) diff --git a/examples/widgets/tutorials/cannon/t12.py b/examples/widgets/tutorials/cannon/t12.py index 551eb058e..827755008 100644 --- a/examples/widgets/tutorials/cannon/t12.py +++ b/examples/widgets/tutorials/cannon/t12.py @@ -34,7 +34,7 @@ class LCDRange(QWidget): def init(self): lcd = QLCDNumber(2) - self.slider = QSlider(Qt.Horizontal) + self.slider = QSlider(Qt.Orientation.Horizontal) self.slider.setRange(0, 99) self.slider.setValue(0) self.label = QLabel() diff --git a/examples/widgets/tutorials/cannon/t13.py b/examples/widgets/tutorials/cannon/t13.py index f5ed124ec..d15ef6831 100644 --- a/examples/widgets/tutorials/cannon/t13.py +++ b/examples/widgets/tutorials/cannon/t13.py @@ -35,7 +35,7 @@ class LCDRange(QWidget): def init(self): lcd = QLCDNumber(2) - self.slider = QSlider(Qt.Horizontal) + self.slider = QSlider(Qt.Orientation.Horizontal) self.slider.setRange(0, 99) self.slider.setValue(0) self.label = QLabel() diff --git a/examples/widgets/tutorials/cannon/t14.py b/examples/widgets/tutorials/cannon/t14.py index 77c61b893..ed35ede09 100644 --- a/examples/widgets/tutorials/cannon/t14.py +++ b/examples/widgets/tutorials/cannon/t14.py @@ -36,7 +36,7 @@ class LCDRange(QWidget): def init(self): lcd = QLCDNumber(2) - self.slider = QSlider(Qt.Horizontal) + self.slider = QSlider(Qt.Orientation.Horizontal) self.slider.setRange(0, 99) self.slider.setValue(0) self.label = QLabel() diff --git a/examples/widgets/tutorials/cannon/t5.py b/examples/widgets/tutorials/cannon/t5.py index e56991629..507204d9c 100644 --- a/examples/widgets/tutorials/cannon/t5.py +++ b/examples/widgets/tutorials/cannon/t5.py @@ -22,7 +22,7 @@ class MyWidget(QWidget): lcd = QLCDNumber(2) - slider = QSlider(Qt.Horizontal) + slider = QSlider(Qt.Orientation.Horizontal) slider.setRange(0, 99) slider.setValue(0) diff --git a/examples/widgets/tutorials/cannon/t6.py b/examples/widgets/tutorials/cannon/t6.py index 98dd9ec11..155760154 100644 --- a/examples/widgets/tutorials/cannon/t6.py +++ b/examples/widgets/tutorials/cannon/t6.py @@ -18,7 +18,7 @@ class LCDRange(QWidget): super().__init__(parent) lcd = QLCDNumber(2) - slider = QSlider(Qt.Horizontal) + slider = QSlider(Qt.Orientation.Horizontal) slider.setRange(0, 99) slider.setValue(0) slider.valueChanged.connect(lcd.display) diff --git a/examples/widgets/tutorials/cannon/t7.py b/examples/widgets/tutorials/cannon/t7.py index d0a0704b0..e7864bdc5 100644 --- a/examples/widgets/tutorials/cannon/t7.py +++ b/examples/widgets/tutorials/cannon/t7.py @@ -22,7 +22,7 @@ class LCDRange(QWidget): lcd = QLCDNumber(2) - self.slider = QSlider(Qt.Horizontal) + self.slider = QSlider(Qt.Orientation.Horizontal) self.slider.setRange(0, 99) self.slider.setValue(0) diff --git a/examples/widgets/tutorials/cannon/t8.py b/examples/widgets/tutorials/cannon/t8.py index 33f18a0a0..3b298f492 100644 --- a/examples/widgets/tutorials/cannon/t8.py +++ b/examples/widgets/tutorials/cannon/t8.py @@ -21,7 +21,7 @@ class LCDRange(QWidget): super().__init__(parent) lcd = QLCDNumber(2) - self.slider = QSlider(Qt.Horizontal) + self.slider = QSlider(Qt.Orientation.Horizontal) self.slider.setRange(0, 99) self.slider.setValue(0) diff --git a/examples/widgets/tutorials/cannon/t9.py b/examples/widgets/tutorials/cannon/t9.py index 37c753118..566f76d84 100644 --- a/examples/widgets/tutorials/cannon/t9.py +++ b/examples/widgets/tutorials/cannon/t9.py @@ -21,7 +21,7 @@ class LCDRange(QWidget): super().__init__(parent) lcd = QLCDNumber(2) - self.slider = QSlider(Qt.Horizontal) + self.slider = QSlider(Qt.Orientation.Horizontal) self.slider.setRange(0, 99) self.slider.setValue(0) diff --git a/examples/widgets/tutorials/modelview/1_readonly.py b/examples/widgets/tutorials/modelview/1_readonly.py index 4606bc47b..92402eb26 100644 --- a/examples/widgets/tutorials/modelview/1_readonly.py +++ b/examples/widgets/tutorials/modelview/1_readonly.py @@ -21,8 +21,8 @@ class MyModel(QAbstractTableModel): def columnCount(self, parent=None): return 3 - def data(self, index, role=Qt.DisplayRole): - if role == Qt.DisplayRole: + def data(self, index, role=Qt.ItemDataRole.DisplayRole): + if role == Qt.ItemDataRole.DisplayRole: row = index.row() + 1 column = index.column() + 1 return f"Row{row}, Column{column}" diff --git a/examples/widgets/tutorials/modelview/2_formatting.py b/examples/widgets/tutorials/modelview/2_formatting.py index 70cbda03b..07833bbd5 100644 --- a/examples/widgets/tutorials/modelview/2_formatting.py +++ b/examples/widgets/tutorials/modelview/2_formatting.py @@ -22,34 +22,34 @@ class MyModel(QAbstractTableModel): return 3 #! [1] - def data(self, index, role=Qt.DisplayRole): + def data(self, index, role=Qt.ItemDataRole.DisplayRole): row = index.row() col = index.column() # generate a log message when this method gets called print(f"row {row}, col{col}, role {role}") - if role == Qt.DisplayRole: + if role == Qt.ItemDataRole.DisplayRole: if row == 0 and col == 1: return "<--left" if row == 1 and col == 1: return "right-->" return f"Row{row}, Column{col + 1}" - elif role == Qt.FontRole: + elif role == Qt.ItemDataRole.FontRole: if row == 0 and col == 0: # change font only for cell(0,0) bold_font = QFont() bold_font.setBold(True) return bold_font - elif role == Qt.BackgroundRole: + elif role == Qt.ItemDataRole.BackgroundRole: if row == 1 and col == 2: # change background only for cell(1,2) return QBrush(Qt.red) - elif role == Qt.TextAlignmentRole: + elif role == Qt.ItemDataRole.TextAlignmentRole: if row == 1 and col == 1: # change text alignment only for cell(1,1) return Qt.AlignRight | Qt.AlignVCenter - elif role == Qt.CheckStateRole: + elif role == Qt.ItemDataRole.CheckStateRole: if row == 1 and col == 0: # add a checkbox to cell(1,0) return Qt.Checked diff --git a/examples/widgets/tutorials/modelview/3_changingmodel.py b/examples/widgets/tutorials/modelview/3_changingmodel.py index bc6661e66..251940221 100644 --- a/examples/widgets/tutorials/modelview/3_changingmodel.py +++ b/examples/widgets/tutorials/modelview/3_changingmodel.py @@ -27,10 +27,10 @@ class MyModel(QAbstractTableModel): return 3 #! [2] - def data(self, index, role=Qt.DisplayRole): + def data(self, index, role=Qt.ItemDataRole.DisplayRole): row = index.row() col = index.column() - if role == Qt.DisplayRole and row == 0 and col == 0: + if role == Qt.ItemDataRole.DisplayRole and row == 0 and col == 0: return QTime.currentTime().toString() return None #! [2] @@ -41,7 +41,7 @@ class MyModel(QAbstractTableModel): # we identify the top left cell top_left = self.createIndex(0, 0) # emit a signal to make the view reread identified data - self.dataChanged.emit(top_left, top_left, [Qt.DisplayRole]) + self.dataChanged.emit(top_left, top_left, [Qt.ItemDataRole.DisplayRole]) #! [3] diff --git a/examples/widgets/tutorials/modelview/4_headers.py b/examples/widgets/tutorials/modelview/4_headers.py index 91fbe16a7..12815abf3 100644 --- a/examples/widgets/tutorials/modelview/4_headers.py +++ b/examples/widgets/tutorials/modelview/4_headers.py @@ -20,8 +20,8 @@ class MyModel(QAbstractTableModel): def columnCount(self, parent=None): return 3 - def data(self, index, role=Qt.DisplayRole): - if role == Qt.DisplayRole: + def data(self, index, role=Qt.ItemDataRole.DisplayRole): + if role == Qt.ItemDataRole.DisplayRole: row = index.row() + 1 column = index.column() + 1 return f"Row{row}, Column{column}" @@ -29,7 +29,7 @@ class MyModel(QAbstractTableModel): #! [1] def headerData(self, section, orientation, role): - if role == Qt.DisplayRole and orientation == Qt.Horizontal: + if role == Qt.ItemDataRole.DisplayRole and orientation == Qt.Orientation.Horizontal: return ["first", "second", "third"][section] return None #! [1] diff --git a/examples/widgets/tutorials/modelview/5_edit.py b/examples/widgets/tutorials/modelview/5_edit.py index 450ac5072..ae57634b1 100644 --- a/examples/widgets/tutorials/modelview/5_edit.py +++ b/examples/widgets/tutorials/modelview/5_edit.py @@ -29,14 +29,14 @@ class MyModel(QAbstractTableModel): def columnCount(self, parent=None): return COLS - def data(self, index, role=Qt.DisplayRole): - if role == Qt.DisplayRole and self.checkIndex(index): + def data(self, index, role=Qt.ItemDataRole.DisplayRole): + if role == Qt.ItemDataRole.DisplayRole and self.checkIndex(index): return self._grid_data[index.row()][index.column()] return None #! [1] def setData(self, index, value, role): - if role != Qt.EditRole or not self.checkIndex(index): + if role != Qt.ItemDataRole.EditRole or not self.checkIndex(index): return False # save value from editor to member m_gridData self._grid_data[index.row()][index.column()] = value diff --git a/examples/widgets/tutorials/modelview/7_selections.py b/examples/widgets/tutorials/modelview/7_selections.py index 0a4638bcf..180fd9b11 100644 --- a/examples/widgets/tutorials/modelview/7_selections.py +++ b/examples/widgets/tutorials/modelview/7_selections.py @@ -54,7 +54,7 @@ class MainWindow(QMainWindow): def selection_changed_slot(self, new_selection, old_selection): # get the text of the selected item index = self._tree_view.selectionModel().currentIndex() - selected_text = index.data(Qt.DisplayRole) + selected_text = index.data(Qt.ItemDataRole.DisplayRole) # find out the hierarchy level of the selected item hierarchy_level = 1 seek_root = index diff --git a/examples/widgets/widgetsgallery/widgetgallery.py b/examples/widgets/widgetsgallery/widgetgallery.py index 75e6d4245..7a238b443 100644 --- a/examples/widgets/widgetsgallery/widgetgallery.py +++ b/examples/widgets/widgetsgallery/widgetgallery.py @@ -356,12 +356,12 @@ class WidgetGallery(QDialog): slider = QSlider() init_widget(slider, "slider") - slider.setOrientation(Qt.Horizontal) + slider.setOrientation(Qt.Orientation.Horizontal) slider.setValue(40) scrollbar = QScrollBar() init_widget(scrollbar, "scrollBar") - scrollbar.setOrientation(Qt.Horizontal) + scrollbar.setOrientation(Qt.Orientation.Horizontal) scrollbar.setValue(60) dial = QDial() diff --git a/sources/pyside6/tests/QtCore/qsharedmemory_client.py b/sources/pyside6/tests/QtCore/qsharedmemory_client.py index 05640d7fe..04d1a6fd5 100644 --- a/sources/pyside6/tests/QtCore/qsharedmemory_client.py +++ b/sources/pyside6/tests/QtCore/qsharedmemory_client.py @@ -26,7 +26,8 @@ if __name__ == '__main__': print('Pass segment name', file=sys.stderr) sys.exit(-1) shared_memory = QSharedMemory(sys.argv[1]) - if not shared_memory.attach(QSharedMemory.ReadOnly): + name = "I have no name" # Fixme: What should be there? + if not shared_memory.attach(QSharedMemory.AccessMode.ReadOnly): raise SystemError(f'attach to "{name}" failed') if not shared_memory.lock(): raise SystemError(f'lock of "{name}" failed') diff --git a/sources/pyside6/tests/QtGui/bug_716.py b/sources/pyside6/tests/QtGui/bug_716.py index fd5745078..d9d0654ac 100644 --- a/sources/pyside6/tests/QtGui/bug_716.py +++ b/sources/pyside6/tests/QtGui/bug_716.py @@ -17,5 +17,4 @@ if __name__ == '__main__': stringListModel = QStringListModel(['one', 'two']) idx = stringListModel.index(1, 0) persistentModelIndex = QPersistentModelIndex(idx) - stringListModel.data(persistentModelIndex, Qt.DisplayRole) - + stringListModel.data(persistentModelIndex, Qt.ItemDataRole.DisplayRole) diff --git a/sources/pyside6/tests/QtWidgets/bug_728.py b/sources/pyside6/tests/QtWidgets/bug_728.py index a2bbd025c..768c6bb95 100644 --- a/sources/pyside6/tests/QtWidgets/bug_728.py +++ b/sources/pyside6/tests/QtWidgets/bug_728.py @@ -36,5 +36,7 @@ timer.setInterval(50) timer.timeout.connect(timerHandler) timer.start() -# This test for a dead lock in QFileDialog.getOpenFileNames, the test fail with a timeout if the dead lock exists. -QFileDialog.getOpenFileNames(None, "caption", QDir.homePath(), None, "", QFileDialog.DontUseNativeDialog) +# This test for a dead lock in QFileDialog.getOpenFileNames, +# the test fail with a timeout if the dead lock exists. +QFileDialog.getOpenFileNames(None, "caption", QDir.homePath(), None, "", + QFileDialog.Option.DontUseNativeDialog) diff --git a/sources/pyside6/tests/QtWidgets/bug_834.py b/sources/pyside6/tests/QtWidgets/bug_834.py index efa1a835b..e49760a9d 100644 --- a/sources/pyside6/tests/QtWidgets/bug_834.py +++ b/sources/pyside6/tests/QtWidgets/bug_834.py @@ -25,8 +25,8 @@ window = Window() dock1 = QDockWidget() dock2 = QDockWidget() -window.addDockWidget(Qt.LeftDockWidgetArea, dock1) -window.addDockWidget(Qt.LeftDockWidgetArea, dock2) +window.addDockWidget(Qt.DockWidgetArea.LeftDockWidgetArea, dock1) +window.addDockWidget(Qt.DockWidgetArea.LeftDockWidgetArea, dock2) window.tabifyDockWidget(dock1, dock2) window.show() diff --git a/sources/pyside6/tests/QtWidgets/qabstracttextdocumentlayout_test.py b/sources/pyside6/tests/QtWidgets/qabstracttextdocumentlayout_test.py index 091adfc39..3431eb406 100644 --- a/sources/pyside6/tests/QtWidgets/qabstracttextdocumentlayout_test.py +++ b/sources/pyside6/tests/QtWidgets/qabstracttextdocumentlayout_test.py @@ -30,7 +30,7 @@ class Foo(QPyTextObject): class QAbstractTextDocumentLayoutTest(UsesQApplication): - objectType = QTextFormat.UserObject + 1 + objectType = QTextFormat.ObjectTypes.UserObject + 1 def foo(self): fmt = QTextCharFormat() @@ -47,7 +47,8 @@ class QAbstractTextDocumentLayoutTest(UsesQApplication): self.textEdit.show() interface = Foo() - self.textEdit.document().documentLayout().registerHandler(QAbstractTextDocumentLayoutTest.objectType, interface) + self.textEdit.document().documentLayout().registerHandler( + QAbstractTextDocumentLayoutTest.objectType, interface) QTimer.singleShot(0, self.foo) self.app.exec() @@ -57,4 +58,3 @@ class QAbstractTextDocumentLayoutTest(UsesQApplication): if __name__ == "__main__": unittest.main() - diff --git a/sources/pyside6/tests/signals/signal_newenum_test.py b/sources/pyside6/tests/signals/signal_newenum_test.py index 839c9e2af..64d171037 100644 --- a/sources/pyside6/tests/signals/signal_newenum_test.py +++ b/sources/pyside6/tests/signals/signal_newenum_test.py @@ -19,7 +19,7 @@ class Receiver(QObject): super().__init__() self.result = 0 - @Slot(Qt.Alignment, str) + @Slot(Qt.AlignmentFlag, str) def handler(self, e, s): print('handler', e, "type=", type(e).__name__, s) self.result += 1 |