diff options
Diffstat (limited to 'examples')
45 files changed, 203 insertions, 189 deletions
diff --git a/examples/bluetooth/heartrate_game/devicehandler.py b/examples/bluetooth/heartrate_game/devicehandler.py index 67dae024f..8599c0296 100644 --- a/examples/bluetooth/heartrate_game/devicehandler.py +++ b/examples/bluetooth/heartrate_game/devicehandler.py @@ -58,7 +58,7 @@ class DeviceHandler(BluetoothBaseClass): self.m_stop = QDateTime() self.m_measurements = [] - self.m_addressType = QLowEnergyController.PublicAddress + self.m_addressType = QLowEnergyController.RemoteAddressType.PublicAddress self.m_demoTimer = QTimer() @@ -71,16 +71,16 @@ class DeviceHandler(BluetoothBaseClass): @Property(int) def addressType(self): - if self.m_addressType == QLowEnergyController.RandomAddress: + if self.m_addressType == QLowEnergyController.RemoteAddressType.RandomAddress: return DeviceHandler.AddressType.RANDOM_ADDRESS return DeviceHandler.AddressType.PUBLIC_ADDRESS @addressType.setter def addressType(self, type): if type == DeviceHandler.AddressType.PUBLIC_ADDRESS: - self.m_addressType = QLowEnergyController.PublicAddress + self.m_addressType = QLowEnergyController.RemoteAddressType.PublicAddress elif type == DeviceHandler.AddressType.RANDOM_ADDRESS: - self.m_addressType = QLowEnergyController.RandomAddress + self.m_addressType = QLowEnergyController.RemoteAddressType.RandomAddress @Slot(QLowEnergyController.Error) def controllerErrorOccurred(self, device): diff --git a/examples/bluetooth/heartrate_server/heartrate_server.py b/examples/bluetooth/heartrate_server/heartrate_server.py index 59b5af7b2..2bb8e3af0 100644 --- a/examples/bluetooth/heartrate_server/heartrate_server.py +++ b/examples/bluetooth/heartrate_server/heartrate_server.py @@ -29,7 +29,7 @@ if __name__ == '__main__': #! [Advertising Data] advertising_data = QLowEnergyAdvertisingData() - advertising_data.setDiscoverability(QLowEnergyAdvertisingData.DiscoverabilityGeneral) + advertising_data.setDiscoverability(QLowEnergyAdvertisingData.Discoverability.DiscoverabilityGeneral) # noqa: E501 advertising_data.setIncludePowerLevel(True) advertising_data.setLocalName("HeartRateServer") advertising_data.setServices([QBluetoothUuid.ServiceClassUuid.HeartRate]) @@ -39,13 +39,13 @@ if __name__ == '__main__': char_data = QLowEnergyCharacteristicData() char_data.setUuid(QBluetoothUuid.CharacteristicType.HeartRateMeasurement) char_data.setValue(QByteArray(2, 0)) - char_data.setProperties(QLowEnergyCharacteristic.Notify) + char_data.setProperties(QLowEnergyCharacteristic.PropertyType.Notify) client_config = QLowEnergyDescriptorData( QBluetoothUuid.DescriptorType.ClientCharacteristicConfiguration, QByteArray(2, 0)) char_data.addDescriptor(client_config) service_data = QLowEnergyServiceData() - service_data.setType(QLowEnergyServiceData.ServiceTypePrimary) + service_data.setType(QLowEnergyServiceData.ServiceType.ServiceTypePrimary) service_data.setUuid(QBluetoothUuid.ServiceClassUuid.HeartRate) service_data.addCharacteristic(char_data) #! [Service Data] diff --git a/examples/corelib/ipc/sharedmemory/dialog.py b/examples/corelib/ipc/sharedmemory/dialog.py index 8fe6f0534..d957e4721 100644 --- a/examples/corelib/ipc/sharedmemory/dialog.py +++ b/examples/corelib/ipc/sharedmemory/dialog.py @@ -52,7 +52,7 @@ class Dialog(QDialog): # load into shared memory buffer = QBuffer() - buffer.open(QIODeviceBase.WriteOnly) + buffer.open(QIODeviceBase.OpenModeFlag.WriteOnly) out = QDataStream(buffer) out << image buffer.close() @@ -79,7 +79,7 @@ class Dialog(QDialog): mv = memoryview(self._shared_memory.constData()) buffer = QBuffer() buffer.setData(mv.tobytes()) - buffer.open(QBuffer.ReadOnly) + buffer.open(QBuffer.OpenModeFlag.ReadOnly) _in = QDataStream(buffer) image = QImage() _in >> image diff --git a/examples/corelib/mimetypesbrowser/mainwindow.py b/examples/corelib/mimetypesbrowser/mainwindow.py index beed81a53..8842823f7 100644 --- a/examples/corelib/mimetypesbrowser/mainwindow.py +++ b/examples/corelib/mimetypesbrowser/mainwindow.py @@ -41,7 +41,7 @@ class MainWindow(QMainWindow): self.about_action = QAction( "About Qt", self, - shortcut=QKeySequence(QKeySequence.HelpContents), + shortcut=QKeySequence(QKeySequence.StandardKey.HelpContents), triggered=QApplication.aboutQt, ) @@ -64,7 +64,7 @@ class MainWindow(QMainWindow): self.items = self.m_model.findItems( "application/octet-stream", - Qt.MatchContains | Qt.MatchFixedString | Qt.MatchRecursive, + Qt.MatchFlag.MatchContains | Qt.MatchFlag.MatchFixedString | Qt.MatchFlag.MatchRecursive ) if self.items: @@ -107,7 +107,7 @@ class MainWindow(QMainWindow): input_dialog = QInputDialog(self) input_dialog.setWindowTitle("Find") input_dialog.setLabelText("Text") - if input_dialog.exec() != QDialog.Accepted: + if input_dialog.exec() != QDialog.DialogCode.Accepted: return value = input_dialog.textValue().strip() @@ -116,9 +116,9 @@ class MainWindow(QMainWindow): self.m_find_matches.clear() self.m_find_index = 0 - items = self.m_model.findItems( - value, Qt.MatchContains | Qt.MatchFixedString | Qt.MatchRecursive - ) + flags = (Qt.MatchFlag.MatchContains | Qt.MatchFlag.MatchFixedString + | Qt.MatchFlag.MatchRecursive) + items = self.m_model.findItems(value, flags) for item in items: self.m_find_matches.append(self.m_model.indexFromItem(item)) @@ -158,5 +158,5 @@ class MainWindow(QMainWindow): self.m_find_previous_action.setEnabled(self.find_next_previous_enabled) def _select_and_goto(self, index: QModelIndex): - self.m_tree_view.scrollTo(index, QAbstractItemView.PositionAtCenter) + self.m_tree_view.scrollTo(index, QAbstractItemView.ScrollHint.PositionAtCenter) self.m_tree_view.setCurrentIndex(index) diff --git a/examples/corelib/mimetypesbrowser/mimetypemodel.py b/examples/corelib/mimetypesbrowser/mimetypemodel.py index dd10b29ce..12df5c863 100644 --- a/examples/corelib/mimetypesbrowser/mimetypemodel.py +++ b/examples/corelib/mimetypesbrowser/mimetypemodel.py @@ -11,7 +11,7 @@ iconQueriedRole = Qt.ItemDataRole.UserRole + 2 def createRow(t: QMimeType): name_item = QStandardItem(t.name()) - flags = Qt.ItemIsSelectable | Qt.ItemIsEnabled + flags = Qt.ItemFlag.ItemIsSelectable | Qt.ItemFlag.ItemIsEnabled name_item.setData(t, mimeTypeRole) name_item.setData(False, iconQueriedRole) name_item.setFlags(flags) diff --git a/examples/external/matplotlib/widget3d/widget3d.py b/examples/external/matplotlib/widget3d/widget3d.py index 591259527..0da07b403 100644 --- a/examples/external/matplotlib/widget3d/widget3d.py +++ b/examples/external/matplotlib/widget3d/widget3d.py @@ -37,7 +37,8 @@ class ApplicationWindow(QMainWindow): self.menu_file.addAction(exit) self.menu_about = self.menu.addMenu("&About") - about = QAction("About Qt", self, shortcut=QKeySequence(QKeySequence.HelpContents), + about = QAction("About Qt", self, + shortcut=QKeySequence(QKeySequence.StandardKey.HelpContents), triggered=qApp.aboutQt) # noqa: F821 self.menu_about.addAction(about) @@ -64,7 +65,7 @@ class ApplicationWindow(QMainWindow): # Table (Right) self.table = QTableWidget() header = self.table.horizontalHeader() - header.setSectionResizeMode(QHeaderView.Stretch) + header.setSectionResizeMode(QHeaderView.ResizeMode.Stretch) # ComboBox (Right) self.combo = QComboBox() diff --git a/examples/external/networkx/main.py b/examples/external/networkx/main.py index 21a0ed029..696a3f4f2 100644 --- a/examples/external/networkx/main.py +++ b/examples/external/networkx/main.py @@ -211,9 +211,9 @@ class Edge(QGraphicsItem): QPen( QColor(self._color), self._tickness, - Qt.SolidLine, - Qt.RoundCap, - Qt.RoundJoin, + Qt.PenStyle.SolidLine, + Qt.PenCapStyle.RoundCap, + Qt.PenJoinStyle.RoundJoin, ) ) painter.drawLine(self._line) @@ -286,7 +286,7 @@ class GraphView(QGraphicsView): animation = QPropertyAnimation(item, b"pos") animation.setDuration(1000) animation.setEndValue(QPointF(x, y)) - animation.setEasingCurve(QEasingCurve.OutExpo) + animation.setEasingCurve(QEasingCurve.Type.OutExpo) self.animations.addAnimation(animation) self.animations.start() diff --git a/examples/gui/analogclock/main.py b/examples/gui/analogclock/main.py index 04139f8a7..28ce3454c 100644 --- a/examples/gui/analogclock/main.py +++ b/examples/gui/analogclock/main.py @@ -29,10 +29,10 @@ class AnalogClockWindow(QRasterWindow): QPoint(-1, -89), QPoint(1, -89)]) palette = qApp.palette() # noqa: F821 - self._background_color = palette.color(QPalette.Window) - self._hour_color = palette.color(QPalette.Text) - self._minute_color = palette.color(QPalette.Text) - self._seconds_color = palette.color(QPalette.Accent) + self._background_color = palette.color(QPalette.ColorRole.Window) + self._hour_color = palette.color(QPalette.ColorRole.Text) + self._minute_color = palette.color(QPalette.ColorRole.Text) + self._seconds_color = palette.color(QPalette.ColorRole.Accent) def paintEvent(self, e): with QPainter(self) as painter: @@ -51,7 +51,7 @@ class AnalogClockWindow(QRasterWindow): time = QTime.currentTime() - painter.setPen(Qt.NoPen) + painter.setPen(Qt.PenStyle.NoPen) painter.setBrush(self._hour_color) painter.save() diff --git a/examples/multimedia/screencapture/screencapturepreview.py b/examples/multimedia/screencapture/screencapturepreview.py index 774a855a7..498803f60 100644 --- a/examples/multimedia/screencapture/screencapturepreview.py +++ b/examples/multimedia/screencapture/screencapturepreview.py @@ -57,7 +57,7 @@ class ScreenCapturePreview(QWidget): update_action = QAction("Update windows List", self) update_action.triggered.connect(self._window_list_model.populate) self._window_list_view.addAction(update_action) - self._window_list_view.setContextMenuPolicy(Qt.ActionsContextMenu) + self._window_list_view.setContextMenuPolicy(Qt.ContextMenuPolicy.ActionsContextMenu) grid_layout = QGridLayout(self) grid_layout.addWidget(self._screen_label, 0, 0) @@ -82,9 +82,9 @@ class ScreenCapturePreview(QWidget): self._start_stop_button.clicked.connect(self.on_start_stop_button_clicked) self._screen_capture.errorOccurred.connect(self.on_screen_capture_error_occured, - Qt.QueuedConnection) + Qt.ConnectionType.QueuedConnection) self._window_capture.errorOccurred.connect(self.on_window_capture_error_occured, - Qt.QueuedConnection) + Qt.ConnectionType.QueuedConnection) self.update_active(SourceType.Screen, True) @Slot(QItemSelection) diff --git a/examples/network/blockingfortuneclient/blockingfortuneclient.py b/examples/network/blockingfortuneclient/blockingfortuneclient.py index f29cfe25b..73476d473 100644 --- a/examples/network/blockingfortuneclient/blockingfortuneclient.py +++ b/examples/network/blockingfortuneclient/blockingfortuneclient.py @@ -96,10 +96,11 @@ class BlockingClient(QWidget): port_label = QLabel("S&erver port:") for ip_address in QNetworkInterface.allAddresses(): - if ip_address != QHostAddress.LocalHost and ip_address.toIPv4Address() != 0: + if (ip_address != QHostAddress.SpecialAddress.LocalHost + and ip_address.toIPv4Address() != 0): break else: - ip_address = QHostAddress(QHostAddress.LocalHost) + ip_address = QHostAddress(QHostAddress.SpecialAddress.LocalHost) ip_address = ip_address.toString() @@ -121,8 +122,8 @@ class BlockingClient(QWidget): quit_button = QPushButton("Quit") button_box = QDialogButtonBox() - button_box.addButton(self._get_fortune_button, QDialogButtonBox.ActionRole) - button_box.addButton(quit_button, QDialogButtonBox.RejectRole) + button_box.addButton(self._get_fortune_button, QDialogButtonBox.ButtonRole.ActionRole) + button_box.addButton(quit_button, QDialogButtonBox.ButtonRole.RejectRole) self._get_fortune_button.clicked.connect(self.request_new_fortune) quit_button.clicked.connect(self.close) @@ -158,11 +159,11 @@ class BlockingClient(QWidget): self._get_fortune_button.setEnabled(True) def display_error(self, socketError, message): - if socketError == QAbstractSocket.HostNotFoundError: + if socketError == QAbstractSocket.SocketError.HostNotFoundError: QMessageBox.information(self, "Blocking Fortune Client", "The host was not found. Please check the host and port " "settings.") - elif socketError == QAbstractSocket.ConnectionRefusedError: + elif socketError == QAbstractSocket.SocketError.ConnectionRefusedError: QMessageBox.information(self, "Blocking Fortune Client", "The connection was refused by the peer. Make sure the " "fortune server is running, and check that the host name " diff --git a/examples/network/loopback/dialog.py b/examples/network/loopback/dialog.py index 8482a0e44..0790ff5ce 100644 --- a/examples/network/loopback/dialog.py +++ b/examples/network/loopback/dialog.py @@ -30,8 +30,8 @@ class Dialog(QDialog): self.quit_button = QPushButton("&Quit") self.button_box = QDialogButtonBox() - self.button_box.addButton(self.start_button, QDialogButtonBox.ActionRole) - self.button_box.addButton(self.quit_button, QDialogButtonBox.RejectRole) + self.button_box.addButton(self.start_button, QDialogButtonBox.ButtonRole.ActionRole) + self.button_box.addButton(self.quit_button, QDialogButtonBox.ButtonRole.RejectRole) self.start_button.clicked.connect(self.start) self.quit_button.clicked.connect(self.close) @@ -59,7 +59,7 @@ class Dialog(QDialog): self.start_button.setEnabled(False) - QGuiApplication.setOverrideCursor(Qt.WaitCursor) + QGuiApplication.setOverrideCursor(Qt.CursorShape.WaitCursor) self.bytes_written = 0 self.bytes_received = 0 @@ -69,14 +69,15 @@ class Dialog(QDialog): self, "Loopback", f"Unable to start the test {self.tcp_server.errorString()}", - QMessageBox.Retry | QMessageBox.Cancel, + QMessageBox.StandardButton.Retry | QMessageBox.StandardButton.Cancel, ) - if ret == QMessageBox.Cancel: + if ret == QMessageBox.StandardButton.Cancel: return self.server_status_label.setText("Listening") self.client_status_label.setText("Connecting") - self.tcp_client.connectToHost(QHostAddress.LocalHost, self.tcp_server.serverPort()) + self.tcp_client.connectToHost(QHostAddress.SpecialAddress.LocalHost, + self.tcp_server.serverPort()) def accept_connection(self): diff --git a/examples/opengl/contextinfo/contextinfo.py b/examples/opengl/contextinfo/contextinfo.py index 233636853..9770be634 100644 --- a/examples/opengl/contextinfo/contextinfo.py +++ b/examples/opengl/contextinfo/contextinfo.py @@ -74,7 +74,7 @@ colors = numpy.array([1, 0, 0, 0, 1, 0, 0, 0, 1], dtype=numpy.float32) def print_surface_format(surface_format): - if surface_format.profile() == QSurfaceFormat.CoreProfile: + if surface_format.profile() == QSurfaceFormat.OpenGLContextProfile.CoreProfile: profile_name = 'core' else: profile_name = 'compatibility' @@ -86,7 +86,7 @@ def print_surface_format(surface_format): class RenderWindow(QWindow): def __init__(self, fmt): super().__init__() - self.setSurfaceType(QWindow.OpenGLSurface) + self.setSurfaceType(QWindow.SurfaceType.OpenGLSurface) self.setFormat(fmt) self.context = QOpenGLContext(self) self.context.setFormat(self.requestedFormat()) @@ -102,22 +102,22 @@ class RenderWindow(QWindow): self.vbo = QOpenGLBuffer() fmt = self.context.format() - use_new_style_shader = fmt.profile() == QSurfaceFormat.CoreProfile + use_new_style_shader = fmt.profile() == QSurfaceFormat.OpenGLContextProfile.CoreProfile # Try to handle 3.0 & 3.1 that do not have the core/compatibility profile # concept 3.2+ has. This may still fail since version 150 (3.2) is # specified in the sources but it's worth a try. - if (fmt.renderableType() == QSurfaceFormat.OpenGL and fmt.majorVersion() == 3 + if (fmt.renderableType() == QSurfaceFormat.RenderableType.OpenGL and fmt.majorVersion() == 3 and fmt.minorVersion() <= 1): - use_new_style_shader = not fmt.testOption(QSurfaceFormat.DeprecatedFunctions) + use_new_style_shader = not fmt.testOption(QSurfaceFormat.FormatOption.DeprecatedFunctions) # noqa: E501 vertex_shader = vertex_shader_source if use_new_style_shader else vertex_shader_source_110 fragment_shader = (fragment_shader_source if use_new_style_shader else fragment_shader_source_110) - if not self.program.addShaderFromSourceCode(QOpenGLShader.Vertex, vertex_shader): + if not self.program.addShaderFromSourceCode(QOpenGLShader.ShaderTypeBit.Vertex, vertex_shader): # noqa: E501 log = self.program.log() raise Exception("Vertex shader could not be added: {log} ({vertexShader})") - if not self.program.addShaderFromSourceCode(QOpenGLShader.Fragment, fragment_shader): + if not self.program.addShaderFromSourceCode(QOpenGLShader.ShaderTypeBit.Fragment, fragment_shader): # noqa: E501 log = self.program.log() raise Exception(f"Fragment shader could not be added: {log} ({fragment_shader})") if not self.program.link(): @@ -254,11 +254,11 @@ if __name__ == '__main__': help='Use Desktop OpenGL') options = parser.parse_args() if options.gles: - QCoreApplication.setAttribute(Qt.AA_UseOpenGLES) + QCoreApplication.setAttribute(Qt.ApplicationAttribute.AA_UseOpenGLES) elif options.software: - QCoreApplication.setAttribute(Qt.AA_UseSoftwareOpenGL) + QCoreApplication.setAttribute(Qt.ApplicationAttribute.AA_UseSoftwareOpenGL) elif options.desktop: - QCoreApplication.setAttribute(Qt.AA_UseDesktopOpenGL) + QCoreApplication.setAttribute(Qt.ApplicationAttribute.AA_UseDesktopOpenGL) app = QApplication(sys.argv) main_window = MainWindow() diff --git a/examples/opengl/threadedqopenglwidget/renderer.py b/examples/opengl/threadedqopenglwidget/renderer.py index 5461123c8..b20cbe1e9 100644 --- a/examples/opengl/threadedqopenglwidget/renderer.py +++ b/examples/opengl/threadedqopenglwidget/renderer.py @@ -146,10 +146,10 @@ class Renderer(QObject, QOpenGLFunctions): QMetaObject.invokeMethod(self._glwidget, "update") def _init_gl(self): - vshader = QOpenGLShader(QOpenGLShader.Vertex, self) + vshader = QOpenGLShader(QOpenGLShader.ShaderTypeBit.Vertex, self) vshader.compileSourceCode(VERTEX_SHADER) - fshader = QOpenGLShader(QOpenGLShader.Fragment, self) + fshader = QOpenGLShader(QOpenGLShader.ShaderTypeBit.Fragment, self) fshader.compileSourceCode(FRAGMENT_SHADER) self._program.addShader(vshader) diff --git a/examples/quick/rendercontrol/rendercontrol_opengl/cuberenderer.py b/examples/quick/rendercontrol/rendercontrol_opengl/cuberenderer.py index b094584a1..862c38d7b 100644 --- a/examples/quick/rendercontrol/rendercontrol_opengl/cuberenderer.py +++ b/examples/quick/rendercontrol/rendercontrol_opengl/cuberenderer.py @@ -103,9 +103,9 @@ class CubeRenderer(): w.height() * w.devicePixelRatio()) self.m_program = QOpenGLShaderProgram() - self.m_program.addCacheableShaderFromSourceCode(QOpenGLShader.Vertex, + self.m_program.addCacheableShaderFromSourceCode(QOpenGLShader.ShaderTypeBit.Vertex, VERTEXSHADER_SOURCE) - self.m_program.addCacheableShaderFromSourceCode(QOpenGLShader.Fragment, + self.m_program.addCacheableShaderFromSourceCode(QOpenGLShader.ShaderTypeBit.Fragment, FRAGMENTSHADER_SOURCE) self.m_program.bindAttributeLocation("vertex", 0) self.m_program.bindAttributeLocation("coord", 1) diff --git a/examples/quick/rendercontrol/rendercontrol_opengl/window_singlethreaded.py b/examples/quick/rendercontrol/rendercontrol_opengl/window_singlethreaded.py index ef489a2c7..a40be7d33 100644 --- a/examples/quick/rendercontrol/rendercontrol_opengl/window_singlethreaded.py +++ b/examples/quick/rendercontrol/rendercontrol_opengl/window_singlethreaded.py @@ -43,7 +43,7 @@ class WindowSingleThreaded(QWindow): self.m_quickReady = False self.m_dpr = 0 self.m_status_conn_id = None - self.setSurfaceType(QSurface.OpenGLSurface) + self.setSurfaceType(QSurface.SurfaceType.OpenGLSurface) format = QSurfaceFormat() # Qt Quick may need a depth and stencil buffer. Always make sure these diff --git a/examples/quick/scenegraph/scenegraph_customgeometry/main.py b/examples/quick/scenegraph/scenegraph_customgeometry/main.py index 79281afd4..5c588b962 100644 --- a/examples/quick/scenegraph/scenegraph_customgeometry/main.py +++ b/examples/quick/scenegraph/scenegraph_customgeometry/main.py @@ -38,7 +38,7 @@ class BezierCurve(QQuickItem): self._node = None self._geometry = None - self.setFlag(QQuickItem.Flags.ItemHasContents, True) + self.setFlag(QQuickItem.Flag.ItemHasContents, True) def p1(self): return self._p1 @@ -100,11 +100,11 @@ class BezierCurve(QQuickItem): self._node = QSGGeometryNode() self._node.setGeometry(self._geometry) - self._node.setFlag(QSGNode.Flags.OwnsGeometry) + self._node.setFlag(QSGNode.Flag.OwnsGeometry) self._material = QSGFlatColorMaterial() self._material.setColor(QColor(255, 0, 0)) self._node.setMaterial(self._material) - self._node.setFlag(QSGNode.Flags.OwnsMaterial) + self._node.setFlag(QSGNode.Flag.OwnsMaterial) else: self._geometry = self._node.geometry() self._geometry.allocate(self._segmentCount) @@ -124,7 +124,7 @@ class BezierCurve(QQuickItem): self._geometry.setVertexDataAsPoint2D(vertices) - self._node.markDirty(QSGNode.DirtyGeometry) + self._node.markDirty(QSGNode.DirtyStateBit.DirtyGeometry) return self._node p1 = Property(QPointF, p1, setP1, notify=p1Changed) diff --git a/examples/quick3d/customgeometry/examplepoint.py b/examples/quick3d/customgeometry/examplepoint.py index 6f0bfe0e1..3b4984222 100644 --- a/examples/quick3d/customgeometry/examplepoint.py +++ b/examples/quick3d/customgeometry/examplepoint.py @@ -48,5 +48,6 @@ class ExamplePointGeometry(QQuick3DGeometry): self.setPrimitiveType(QQuick3DGeometry.PrimitiveType.Points) self.addAttribute( - QQuick3DGeometry.Attribute.PositionSemantic, 0, QQuick3DGeometry.Attribute.F32Type + QQuick3DGeometry.Attribute.Semantic.PositionSemantic, 0, + QQuick3DGeometry.Attribute.ComponentType.F32Type ) diff --git a/examples/quick3d/customgeometry/exampletriangle.py b/examples/quick3d/customgeometry/exampletriangle.py index 0f9e025a0..996a9f85c 100644 --- a/examples/quick3d/customgeometry/exampletriangle.py +++ b/examples/quick3d/customgeometry/exampletriangle.py @@ -171,14 +171,15 @@ class ExampleTriangleGeometry(QQuick3DGeometry): self.setBounds(QVector3D(-1.0, -1.0, 0.0), QVector3D(+1.0, +1.0, 0.0)) self.setPrimitiveType(QQuick3DGeometry.PrimitiveType.Triangles) self.addAttribute( - QQuick3DGeometry.Attribute.PositionSemantic, 0, QQuick3DGeometry.Attribute.F32Type + QQuick3DGeometry.Attribute.Semantic.PositionSemantic, 0, + QQuick3DGeometry.Attribute.ComponentType.F32Type ) if self._hasNormals: self.addAttribute( - QQuick3DGeometry.Attribute.NormalSemantic, + QQuick3DGeometry.Attribute.Semantic.NormalSemantic, 3 * FLOAT_SIZE, - QQuick3DGeometry.Attribute.F32Type, + QQuick3DGeometry.Attribute.ComponentType.F32Type, ) if self._hasUV: diff --git a/examples/quick3d/proceduraltexture/gradienttexture.py b/examples/quick3d/proceduraltexture/gradienttexture.py index a02849f1c..22df990c4 100644 --- a/examples/quick3d/proceduraltexture/gradienttexture.py +++ b/examples/quick3d/proceduraltexture/gradienttexture.py @@ -77,7 +77,7 @@ class GradientTexture(QQuick3DTextureData): def updateTexture(self): self.setSize(QSize(self._width, self._height)) - self.setFormat(QQuick3DTextureData.RGBA8) + self.setFormat(QQuick3DTextureData.Format.RGBA8) self.setHasTransparency(False) self.setTextureData(self.generate_texture()) diff --git a/examples/remoteobjects/modelview/modelviewserver.py b/examples/remoteobjects/modelview/modelviewserver.py index b7560fcd4..ec85e5214 100644 --- a/examples/remoteobjects/modelview/modelviewserver.py +++ b/examples/remoteobjects/modelview/modelviewserver.py @@ -21,13 +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.ItemDataRole.BackgroundRole) + QColor(Qt.GlobalColor.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.ItemDataRole.BackgroundRole) + QColor(Qt.GlobalColor.green), + Qt.ItemDataRole.BackgroundRole) self._model.setData(self._model.index(i, 1), "InsertedRow", Qt.ItemDataRole.DisplayRole) @@ -38,7 +40,7 @@ class TimerHandler(QObject): item = self._model.item(0, 0) item.setEnabled(False) item = item.child(0, 0) - item.setFlags(item.flags() & Qt.ItemIsSelectable) + item.setFlags(item.flags() & Qt.ItemFlag.ItemIsSelectable) def move_data(self): self._model.moveRows(QModelIndex(), 2, 4, QModelIndex(), 10) @@ -70,7 +72,7 @@ if __name__ == '__main__': first_item.appendRow(add_child(2, 2)) second_item = QStandardItem(f"FancyRow2TextNumber {i}") if i % 2 == 0: - first_item.setBackground(Qt.red) + first_item.setBackground(Qt.GlobalColor.red) row = [first_item, second_item] source_model.invisibleRootItem().appendRow(row) data_list.append(f"FancyTextNumber {i}") diff --git a/examples/serialbus/can/canbusdeviceinfobox.py b/examples/serialbus/can/canbusdeviceinfobox.py index 4028970e7..15f3cc2bc 100644 --- a/examples/serialbus/can/canbusdeviceinfobox.py +++ b/examples/serialbus/can/canbusdeviceinfobox.py @@ -9,8 +9,8 @@ from ui_canbusdeviceinfobox import Ui_CanBusDeviceInfoBox def _set_readonly_and_compact(box): - box.setAttribute(Qt.WA_TransparentForMouseEvents) - box.setFocusPolicy(Qt.NoFocus) + box.setAttribute(Qt.WidgetAttribute.WA_TransparentForMouseEvents) + box.setFocusPolicy(Qt.FocusPolicy.NoFocus) box.setStyleSheet("margin-top:0; margin-bottom:0;") diff --git a/examples/serialbus/can/connectdialog.py b/examples/serialbus/can/connectdialog.py index f2efe1369..bd612ba7c 100644 --- a/examples/serialbus/can/connectdialog.py +++ b/examples/serialbus/can/connectdialog.py @@ -150,7 +150,8 @@ class ConnectDialog(QDialog): if k == key: result = v break - if not result and (key == QCanBusDevice.LoopbackKey or key == QCanBusDevice.ReceiveOwnKey): + if (not result and (key == QCanBusDevice.ConfigurationKey.LoopbackKey + or key == QCanBusDevice.ConfigurationKey.ReceiveOwnKey)): return "unspecified" return str(result) @@ -163,22 +164,22 @@ class ConnectDialog(QDialog): self.m_ui.ringBufferLimitBox.setValue(self.m_currentSettings.model_ring_buffer_size) self.m_ui.autoscrollBox.setChecked(self.m_currentSettings.use_autoscroll) - value = self.configuration_value(QCanBusDevice.LoopbackKey) + value = self.configuration_value(QCanBusDevice.ConfigurationKey.LoopbackKey) self.m_ui.loopbackBox.setCurrentText(value) - value = self.configuration_value(QCanBusDevice.ReceiveOwnKey) + value = self.configuration_value(QCanBusDevice.ConfigurationKey.ReceiveOwnKey) self.m_ui.receiveOwnBox.setCurrentText(value) - value = self.configuration_value(QCanBusDevice.ErrorFilterKey) + value = self.configuration_value(QCanBusDevice.ConfigurationKey.ErrorFilterKey) self.m_ui.errorFilterEdit.setText(value) - value = self.configuration_value(QCanBusDevice.BitRateKey) + value = self.configuration_value(QCanBusDevice.ConfigurationKey.BitRateKey) self.m_ui.bitrateBox.setCurrentText(value) - value = self.configuration_value(QCanBusDevice.CanFdKey) + value = self.configuration_value(QCanBusDevice.ConfigurationKey.CanFdKey) self.m_ui.canFdBox.setCurrentText(value) - value = self.configuration_value(QCanBusDevice.DataBitRateKey) + value = self.configuration_value(QCanBusDevice.ConfigurationKey.DataBitRateKey) self.m_ui.dataBitrateBox.setCurrentText(value) def update_settings(self): diff --git a/examples/serialbus/can/mainwindow.py b/examples/serialbus/can/mainwindow.py index d0fc74fc9..5800af54f 100644 --- a/examples/serialbus/can/mainwindow.py +++ b/examples/serialbus/can/mainwindow.py @@ -136,11 +136,11 @@ class MainWindow(QMainWindow): self.m_ui.actionDisconnect.setEnabled(True) self.m_ui.actionDeviceInformation.setEnabled(True) self.m_ui.sendFrameBox.setEnabled(True) - config_bit_rate = self.m_can_device.configurationParameter(QCanBusDevice.BitRateKey) + config_bit_rate = self.m_can_device.configurationParameter(QCanBusDevice.ConfigurationKey.BitRateKey) # noqa: E501 if config_bit_rate is not None and config_bit_rate > 0: - is_can_fd = bool(self.m_can_device.configurationParameter(QCanBusDevice.CanFdKey)) + is_can_fd = bool(self.m_can_device.configurationParameter(QCanBusDevice.ConfigurationKey.CanFdKey)) # noqa: E501 config_data_bit_rate = self.m_can_device.configurationParameter( - QCanBusDevice.DataBitRateKey) + QCanBusDevice.ConfigurationKey.DataBitRateKey) bit_rate = config_bit_rate / 1000 if is_can_fd and config_data_bit_rate > 0: data_bit_rate = config_data_bit_rate / 1000 diff --git a/examples/serialbus/can/receivedframesview.py b/examples/serialbus/can/receivedframesview.py index bb10ba8e3..c4a7f6653 100644 --- a/examples/serialbus/can/receivedframesview.py +++ b/examples/serialbus/can/receivedframesview.py @@ -13,7 +13,7 @@ class ReceivedFramesView(QTableView): def __init__(self, parent): super().__init__(parent) - self.setContextMenuPolicy(Qt.CustomContextMenu) + self.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu) self.customContextMenuRequested.connect(self._context_menu) @Slot(QPoint) diff --git a/examples/serialbus/modbus/modbusclient/mainwindow.py b/examples/serialbus/modbus/modbusclient/mainwindow.py index 052b7faa8..97de08d19 100644 --- a/examples/serialbus/modbus/modbusclient/mainwindow.py +++ b/examples/serialbus/modbus/modbusclient/mainwindow.py @@ -42,10 +42,11 @@ class MainWindow(QMainWindow): vp = self.ui.writeValueTable.viewport() self._write_model.update_viewport.connect(vp.update) - self.ui.writeTable.addItem("Coils", QModbusDataUnit.Coils) - self.ui.writeTable.addItem("Discrete Inputs", QModbusDataUnit.DiscreteInputs) - self.ui.writeTable.addItem("Input Registers", QModbusDataUnit.InputRegisters) - self.ui.writeTable.addItem("Holding Registers", QModbusDataUnit.HoldingRegisters) + self.ui.writeTable.addItem("Coils", QModbusDataUnit.RegisterType.Coils) + self.ui.writeTable.addItem("Discrete Inputs", QModbusDataUnit.RegisterType.DiscreteInputs) + self.ui.writeTable.addItem("Input Registers", QModbusDataUnit.RegisterType.InputRegisters) + self.ui.writeTable.addItem("Holding Registers", + QModbusDataUnit.RegisterType.HoldingRegisters) self.ui.connectType.setCurrentIndex(0) self.onConnectTypeChanged(0) @@ -132,24 +133,24 @@ class MainWindow(QMainWindow): self.statusBar().clearMessage() md = self._modbus_device - if md.state() != QModbusDevice.ConnectedState: + if md.state() != QModbusDevice.State.ConnectedState: settings = self._settings_dialog.settings() if self.ui.connectType.currentIndex() == ModbusConnection.SERIAL: - md.setConnectionParameter(QModbusDevice.SerialPortNameParameter, + md.setConnectionParameter(QModbusDevice.ConnectionParameter.SerialPortNameParameter, self.ui.portEdit.text()) - md.setConnectionParameter(QModbusDevice.SerialParityParameter, + md.setConnectionParameter(QModbusDevice.ConnectionParameter.SerialParityParameter, settings.parity) - md.setConnectionParameter(QModbusDevice.SerialBaudRateParameter, + md.setConnectionParameter(QModbusDevice.ConnectionParameter.SerialBaudRateParameter, settings.baud) - md.setConnectionParameter(QModbusDevice.SerialDataBitsParameter, + md.setConnectionParameter(QModbusDevice.ConnectionParameter.SerialDataBitsParameter, settings.data_bits) - md.setConnectionParameter(QModbusDevice.SerialStopBitsParameter, + md.setConnectionParameter(QModbusDevice.ConnectionParameter.SerialStopBitsParameter, settings.stop_bits) else: url = QUrl.fromUserInput(self.ui.portEdit.text()) - md.setConnectionParameter(QModbusDevice.NetworkPortParameter, + md.setConnectionParameter(QModbusDevice.ConnectionParameter.NetworkPortParameter, url.port()) - md.setConnectionParameter(QModbusDevice.NetworkAddressParameter, + md.setConnectionParameter(QModbusDevice.ConnectionParameter.NetworkAddressParameter, url.host()) md.setTimeout(settings.response_time) @@ -168,13 +169,13 @@ class MainWindow(QMainWindow): @Slot(int) def onModbusStateChanged(self, state): - connected = (state != QModbusDevice.UnconnectedState) + connected = (state != QModbusDevice.State.UnconnectedState) self.ui.actionConnect.setEnabled(not connected) self.ui.actionDisconnect.setEnabled(connected) - if state == QModbusDevice.UnconnectedState: + if state == QModbusDevice.State.UnconnectedState: self.ui.connectButton.setText("Connect") - elif state == QModbusDevice.ConnectedState: + elif state == QModbusDevice.State.ConnectedState: self.ui.connectButton.setText("Disconnect") @Slot() @@ -236,7 +237,7 @@ class MainWindow(QMainWindow): table = write_unit.registerType() for i in range(0, total): addr = i + write_unit.startAddress() - if table == QModbusDataUnit.Coils: + if table == QModbusDataUnit.RegisterType.Coils: write_unit.setValue(i, self._write_model.m_coils[addr]) else: write_unit.setValue(i, self._write_model.m_holdingRegisters[addr]) diff --git a/examples/serialbus/modbus/modbusclient/settingsdialog.py b/examples/serialbus/modbus/modbusclient/settingsdialog.py index 44c59bac2..d86ea05d2 100644 --- a/examples/serialbus/modbus/modbusclient/settingsdialog.py +++ b/examples/serialbus/modbus/modbusclient/settingsdialog.py @@ -11,10 +11,10 @@ from ui_settingsdialog import Ui_SettingsDialog class Settings: def __init__(self): - self.parity = QSerialPort.EvenParity - self.baud = QSerialPort.Baud19200 - self.data_bits = QSerialPort.Data8 - self.stop_bits = QSerialPort.OneStop + self.parity = QSerialPort.Parity.EvenParity + self.baud = QSerialPort.BaudRate.Baud19200 + self.data_bits = QSerialPort.DataBits.Data8 + self.stop_bits = QSerialPort.StopBits.OneStop self.response_time = 1000 self.number_of_retries = 3 diff --git a/examples/serialbus/modbus/modbusclient/writeregistermodel.py b/examples/serialbus/modbus/modbusclient/writeregistermodel.py index 10c13590d..17b61bcac 100644 --- a/examples/serialbus/modbus/modbusclient/writeregistermodel.py +++ b/examples/serialbus/modbus/modbusclient/writeregistermodel.py @@ -45,7 +45,7 @@ class WriteRegisterModel(QAbstractTableModel): return f"{row}" if column == Column.COILS_COLUMN and role == Qt.ItemDataRole.CheckStateRole: # coils - return Qt.Checked if self.m_coils[row] else Qt.Unchecked + return Qt.CheckState.Checked if self.m_coils[row] else Qt.CheckState.Unchecked # holding registers if column == Column.HOLDING_COLUMN and role == Qt.ItemDataRole.DisplayRole: @@ -77,7 +77,7 @@ class WriteRegisterModel(QAbstractTableModel): if column == Column.COILS_COLUMN and role == Qt.ItemDataRole.CheckStateRole: # coils s = Qt.CheckState(int(value)) - if s == Qt.Checked: + if s == Qt.CheckState.Checked: self.m_coils.setBit(row) else: self.m_coils.clearBit(row) @@ -101,12 +101,12 @@ class WriteRegisterModel(QAbstractTableModel): return flags if row < self.m_address or row >= (self.m_address + self.m_number): - flags &= ~Qt.ItemIsEnabled + flags &= ~Qt.ItemFlag.ItemIsEnabled if column == Column.COILS_COLUMN: # coils - return flags | Qt.ItemIsUserCheckable + return flags | Qt.ItemFlag.ItemIsUserCheckable if column == Column.HOLDING_COLUMN: # holding registers - return flags | Qt.ItemIsEditable + return flags | Qt.ItemFlag.ItemIsEditable return flags @Slot(int) diff --git a/examples/spatialaudio/audiopanning/main.py b/examples/spatialaudio/audiopanning/main.py index 285deeb18..558451e8a 100644 --- a/examples/spatialaudio/audiopanning/main.py +++ b/examples/spatialaudio/audiopanning/main.py @@ -68,9 +68,9 @@ class AudioWidget(QWidget): form.addRow("Reflection gain (0-5):", self._reflection_gain) self._mode = QComboBox() - self._mode.addItem("Surround", QAudioEngine.Surround) - self._mode.addItem("Stereo", QAudioEngine.Stereo) - self._mode.addItem("Headphone", QAudioEngine.Headphone) + self._mode.addItem("Surround", QAudioEngine.OutputMode.Surround) + self._mode.addItem("Stereo", QAudioEngine.OutputMode.Stereo) + self._mode.addItem("Headphone", QAudioEngine.OutputMode.Headphone) form.addRow("Output mode:", self._mode) @@ -93,12 +93,12 @@ class AudioWidget(QWidget): self._engine = QAudioEngine() self._room = QAudioRoom(self._engine) - self._room.setWallMaterial(QAudioRoom.BackWall, QAudioRoom.BrickBare) - self._room.setWallMaterial(QAudioRoom.FrontWall, QAudioRoom.BrickBare) - self._room.setWallMaterial(QAudioRoom.LeftWall, QAudioRoom.BrickBare) - self._room.setWallMaterial(QAudioRoom.RightWall, QAudioRoom.BrickBare) - self._room.setWallMaterial(QAudioRoom.Floor, QAudioRoom.Marble) - self._room.setWallMaterial(QAudioRoom.Ceiling, QAudioRoom.WoodCeiling) + self._room.setWallMaterial(QAudioRoom.Wall.BackWall, QAudioRoom.Material.BrickBare) + self._room.setWallMaterial(QAudioRoom.Wall.FrontWall, QAudioRoom.Material.BrickBare) + self._room.setWallMaterial(QAudioRoom.Wall.LeftWall, QAudioRoom.Material.BrickBare) + self._room.setWallMaterial(QAudioRoom.Wall.RightWall, QAudioRoom.Material.BrickBare) + self._room.setWallMaterial(QAudioRoom.Wall.Floor, QAudioRoom.Material.Marble) + self._room.setWallMaterial(QAudioRoom.Wall.Ceiling, QAudioRoom.Material.WoodCeiling) self.update_room() self._listener = QAudioListener(self._engine) @@ -141,20 +141,20 @@ class AudioWidget(QWidget): def file_changed(self, file): self._sound.setSource(QUrl.fromLocalFile(file)) self._sound.setSize(5) - self._sound.setLoops(QSpatialSound.Infinite) + self._sound.setLoops(QSpatialSound.Loops.Infinite) @Slot() def open_file_dialog(self): if not self._file_dialog: - directory = QStandardPaths.writableLocation(QStandardPaths.MusicLocation) + directory = QStandardPaths.writableLocation(QStandardPaths.StandardLocation.MusicLocation) # noqa: E501 self._file_dialog = QFileDialog(self, "Open Audio File", directory) - self._file_dialog.setAcceptMode(QFileDialog.AcceptOpen) + self._file_dialog.setAcceptMode(QFileDialog.AcceptMode.AcceptOpen) mime_types = ["audio/mpeg", "audio/aac", "audio/x-ms-wma", "audio/x-flac+ogg", "audio/x-wav"] self._file_dialog.setMimeTypeFilters(mime_types) self._file_dialog.selectMimeTypeFilter(mime_types[0]) - if self._file_dialog.exec() == QDialog.Accepted: + if self._file_dialog.exec() == QDialog.DialogCode.Accepted: self._file_edit.setText(self._file_dialog.selectedFiles()[0]) @Slot() diff --git a/examples/widgets/animation/easing/easing.py b/examples/widgets/animation/easing/easing.py index e4fa69a0d..5ae9c0be6 100644 --- a/examples/widgets/animation/easing/easing.py +++ b/examples/widgets/animation/easing/easing.py @@ -65,7 +65,7 @@ class Pixmap(QObject): super().__init__() self.pixmap_item = QGraphicsPixmapItem(pix) - self.pixmap_item.setCacheMode(QGraphicsItem.DeviceCoordinateCache) + self.pixmap_item.setCacheMode(QGraphicsItem.CacheMode.DeviceCoordinateCache) def set_pos(self, pos): self.pixmap_item.setPos(pos) @@ -110,7 +110,7 @@ class Window(QWidget): self._ui.graphicsView.setScene(self._scene) self._anim = Animation(self._item, b'pos') - self._anim.setEasingCurve(QEasingCurve.OutBounce) + self._anim.setEasingCurve(QEasingCurve.Type.OutBounce) self._ui.easingCurvePicker.setCurrentRow(0) self.start_animation() @@ -140,15 +140,15 @@ class Window(QWidget): curve_scale = self._iconSize.height() / 2.0 - painter.setPen(Qt.NoPen) + painter.setPen(Qt.PenStyle.NoPen) # Start point. - painter.setBrush(Qt.red) + painter.setBrush(Qt.GlobalColor.red) start = QPoint(y_axis, x_axis - curve_scale * curve.valueForProgress(0)) painter.drawRect(start.x() - 1, start.y() - 1, 3, 3) # End point. - painter.setBrush(Qt.blue) + painter.setBrush(Qt.GlobalColor.blue) end = QPoint(y_axis + curve_scale, x_axis - curve_scale * curve.valueForProgress(1)) painter.drawRect(end.x() - 1, end.y() - 1, 3, 3) @@ -183,15 +183,16 @@ class Window(QWidget): self._anim.setEasingCurve(curve_type) self._anim.setCurrentTime(0) - is_elastic = (curve_type.value >= QEasingCurve.InElastic.value - and curve_type.value <= QEasingCurve.OutInElastic.value) - is_bounce = (curve_type.value >= QEasingCurve.InBounce.value - and curve_type.value <= QEasingCurve.OutInBounce.value) + is_elastic = (curve_type.value >= QEasingCurve.Type.InElastic.value + and curve_type.value <= QEasingCurve.Type.OutInElastic.value) + is_bounce = (curve_type.value >= QEasingCurve.Type.InBounce.value + and curve_type.value <= QEasingCurve.Type.OutInBounce.value) self._ui.periodSpinBox.setEnabled(is_elastic) self._ui.amplitudeSpinBox.setEnabled(is_elastic or is_bounce) - self._ui.overshootSpinBox.setEnabled(curve_type.value >= QEasingCurve.InBack.value - and curve_type.value <= QEasingCurve.OutInBack.value) + overshoot = (curve_type.value >= QEasingCurve.Type.InBack.value + and curve_type.value <= QEasingCurve.Type.OutInBack.value) + self._ui.overshootSpinBox.setEnabled(overshoot) def path_changed(self, index): self._anim.set_path_type(index) diff --git a/examples/widgets/animation/easing/form.ui b/examples/widgets/animation/easing/form.ui index 364aebeda..1a6340a9d 100644 --- a/examples/widgets/animation/easing/form.ui +++ b/examples/widgets/animation/easing/form.ui @@ -29,16 +29,16 @@ </size> </property> <property name="verticalScrollBarPolicy"> - <enum>Qt::ScrollBarAlwaysOff</enum> + <enum>Qt::ScrollBarPolicy::ScrollBarAlwaysOff</enum> </property> <property name="movement"> - <enum>QListView::Static</enum> + <enum>QListView::Movement::Static</enum> </property> <property name="isWrapping" stdset="0"> <bool>false</bool> </property> <property name="viewMode"> - <enum>QListView::IconMode</enum> + <enum>QListView::ViewMode::IconMode</enum> </property> <property name="selectionRectVisible"> <bool>false</bool> @@ -68,7 +68,7 @@ </size> </property> <property name="layoutDirection"> - <enum>Qt::LeftToRight</enum> + <enum>Qt::LayoutDirection::LeftToRight</enum> </property> <property name="text"> <string>Line</string> @@ -77,7 +77,7 @@ <bool>true</bool> </property> <attribute name="buttonGroup"> - <string>buttonGroup</string> + <string notr="true">buttonGroup</string> </attribute> </widget> </item> @@ -93,7 +93,7 @@ <string>Circle</string> </property> <attribute name="buttonGroup"> - <string>buttonGroup</string> + <string notr="true">buttonGroup</string> </attribute> </widget> </item> @@ -113,7 +113,7 @@ </property> <layout class="QFormLayout" name="formLayout"> <property name="fieldGrowthPolicy"> - <enum>QFormLayout::AllNonFixedFieldsGrow</enum> + <enum>QFormLayout::FieldGrowthPolicy::AllNonFixedFieldsGrow</enum> </property> <item row="0" column="0"> <widget class="QLabel" name="label"> @@ -238,7 +238,7 @@ <item> <spacer name="verticalSpacer"> <property name="orientation"> - <enum>Qt::Vertical</enum> + <enum>Qt::Orientation::Vertical</enum> </property> <property name="sizeHint" stdset="0"> <size> diff --git a/examples/widgets/animation/easing/ui_form.py b/examples/widgets/animation/easing/ui_form.py index 7c9ce6abb..c879bb59d 100644 --- a/examples/widgets/animation/easing/ui_form.py +++ b/examples/widgets/animation/easing/ui_form.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'form.ui' ## -## Created by: Qt User Interface Compiler version 6.8.0 +## Created by: Qt User Interface Compiler version 6.8.1 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -35,10 +35,10 @@ class Ui_Form(object): sizePolicy.setHeightForWidth(self.easingCurvePicker.sizePolicy().hasHeightForWidth()) self.easingCurvePicker.setSizePolicy(sizePolicy) self.easingCurvePicker.setMaximumSize(QSize(16777215, 120)) - self.easingCurvePicker.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOff) - self.easingCurvePicker.setMovement(QListView.Static) + self.easingCurvePicker.setVerticalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOff) + self.easingCurvePicker.setMovement(QListView.Movement.Static) self.easingCurvePicker.setProperty(u"isWrapping", False) - self.easingCurvePicker.setViewMode(QListView.IconMode) + self.easingCurvePicker.setViewMode(QListView.ViewMode.IconMode) self.easingCurvePicker.setSelectionRectVisible(False) self.gridLayout.addWidget(self.easingCurvePicker, 0, 0, 1, 2) @@ -56,7 +56,7 @@ class Ui_Form(object): self.buttonGroup.addButton(self.lineRadio) self.lineRadio.setObjectName(u"lineRadio") self.lineRadio.setMaximumSize(QSize(16777215, 40)) - self.lineRadio.setLayoutDirection(Qt.LeftToRight) + self.lineRadio.setLayoutDirection(Qt.LayoutDirection.LeftToRight) self.lineRadio.setChecked(True) self.gridLayout_2.addWidget(self.lineRadio, 0, 0, 1, 1) @@ -80,7 +80,7 @@ class Ui_Form(object): self.groupBox.setSizePolicy(sizePolicy1) self.formLayout = QFormLayout(self.groupBox) self.formLayout.setObjectName(u"formLayout") - self.formLayout.setFieldGrowthPolicy(QFormLayout.AllNonFixedFieldsGrow) + self.formLayout.setFieldGrowthPolicy(QFormLayout.FieldGrowthPolicy.AllNonFixedFieldsGrow) self.label = QLabel(self.groupBox) self.label.setObjectName(u"label") sizePolicy2 = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Preferred) @@ -90,7 +90,7 @@ class Ui_Form(object): self.label.setSizePolicy(sizePolicy2) self.label.setMinimumSize(QSize(0, 30)) - self.formLayout.setWidget(0, QFormLayout.LabelRole, self.label) + self.formLayout.setWidget(0, QFormLayout.ItemRole.LabelRole, self.label) self.periodSpinBox = QDoubleSpinBox(self.groupBox) self.periodSpinBox.setObjectName(u"periodSpinBox") @@ -105,7 +105,7 @@ class Ui_Form(object): self.periodSpinBox.setSingleStep(0.100000000000000) self.periodSpinBox.setValue(-1.000000000000000) - self.formLayout.setWidget(0, QFormLayout.FieldRole, self.periodSpinBox) + self.formLayout.setWidget(0, QFormLayout.ItemRole.FieldRole, self.periodSpinBox) self.amplitudeSpinBox = QDoubleSpinBox(self.groupBox) self.amplitudeSpinBox.setObjectName(u"amplitudeSpinBox") @@ -115,13 +115,13 @@ class Ui_Form(object): self.amplitudeSpinBox.setSingleStep(0.100000000000000) self.amplitudeSpinBox.setValue(-1.000000000000000) - self.formLayout.setWidget(2, QFormLayout.FieldRole, self.amplitudeSpinBox) + self.formLayout.setWidget(2, QFormLayout.ItemRole.FieldRole, self.amplitudeSpinBox) self.label_3 = QLabel(self.groupBox) self.label_3.setObjectName(u"label_3") self.label_3.setMinimumSize(QSize(0, 30)) - self.formLayout.setWidget(4, QFormLayout.LabelRole, self.label_3) + self.formLayout.setWidget(4, QFormLayout.ItemRole.LabelRole, self.label_3) self.overshootSpinBox = QDoubleSpinBox(self.groupBox) self.overshootSpinBox.setObjectName(u"overshootSpinBox") @@ -131,13 +131,13 @@ class Ui_Form(object): self.overshootSpinBox.setSingleStep(0.100000000000000) self.overshootSpinBox.setValue(-1.000000000000000) - self.formLayout.setWidget(4, QFormLayout.FieldRole, self.overshootSpinBox) + self.formLayout.setWidget(4, QFormLayout.ItemRole.FieldRole, self.overshootSpinBox) self.label_2 = QLabel(self.groupBox) self.label_2.setObjectName(u"label_2") self.label_2.setMinimumSize(QSize(0, 30)) - self.formLayout.setWidget(2, QFormLayout.LabelRole, self.label_2) + self.formLayout.setWidget(2, QFormLayout.ItemRole.LabelRole, self.label_2) self.verticalLayout.addWidget(self.groupBox) diff --git a/examples/widgets/animation/states/states.py b/examples/widgets/animation/states/states.py index 97cdb452a..730aab1b3 100644 --- a/examples/widgets/animation/states/states.py +++ b/examples/widgets/animation/states/states.py @@ -65,7 +65,7 @@ if __name__ == '__main__': # Parent widget. widget = QGraphicsWidget() - layout = QGraphicsLinearLayout(Qt.Vertical, widget) + layout = QGraphicsLinearLayout(Qt.Orientation.Vertical, widget) layout.addItem(edit_proxy) layout.addItem(button_proxy) widget.setLayout(layout) diff --git a/examples/widgets/desktop/systray/window.py b/examples/widgets/desktop/systray/window.py index db1569a7a..ec725239e 100644 --- a/examples/widgets/desktop/systray/window.py +++ b/examples/widgets/desktop/systray/window.py @@ -157,21 +157,21 @@ class Window(QDialog): self._type_label = QLabel("Type:") self._type_combo_box = QComboBox() - self._type_combo_box.addItem("None", QSystemTrayIcon.NoIcon) + self._type_combo_box.addItem("None", QSystemTrayIcon.MessageIcon.NoIcon) self._type_combo_box.addItem( - self.style().standardIcon(QStyle.SP_MessageBoxInformation), + self.style().standardIcon(QStyle.StandardPixmap.SP_MessageBoxInformation), "Information", - QSystemTrayIcon.Information, + QSystemTrayIcon.MessageIcon.Information, ) self._type_combo_box.addItem( - self.style().standardIcon(QStyle.SP_MessageBoxWarning), + self.style().standardIcon(QStyle.StandardPixmap.SP_MessageBoxWarning), "Warning", - QSystemTrayIcon.Warning, + QSystemTrayIcon.MessageIcon.Warning, ) self._type_combo_box.addItem( - self.style().standardIcon(QStyle.SP_MessageBoxCritical), + self.style().standardIcon(QStyle.StandardPixmap.SP_MessageBoxCritical), "Critical", - QSystemTrayIcon.Critical, + QSystemTrayIcon.MessageIcon.Critical, ) self._type_combo_box.addItem(QIcon(), "Custom icon", -1) self._type_combo_box.setCurrentIndex(1) diff --git a/examples/widgets/dialogs/extension/extension.py b/examples/widgets/dialogs/extension/extension.py index 824be89d6..bed9a1a32 100644 --- a/examples/widgets/dialogs/extension/extension.py +++ b/examples/widgets/dialogs/extension/extension.py @@ -33,9 +33,9 @@ class FindDialog(QDialog): more_button.setCheckable(True) more_button.setAutoDefault(False) - button_box = QDialogButtonBox(Qt.Vertical) - button_box.addButton(find_button, QDialogButtonBox.ActionRole) - button_box.addButton(more_button, QDialogButtonBox.ActionRole) + button_box = QDialogButtonBox(Qt.Orientation.Vertical) + button_box.addButton(find_button, QDialogButtonBox.ButtonRole.ActionRole) + button_box.addButton(more_button, QDialogButtonBox.ButtonRole.ActionRole) extension = QWidget() @@ -63,7 +63,7 @@ class FindDialog(QDialog): left_layout.addStretch(1) main_layout = QGridLayout(self) - main_layout.setSizeConstraint(QLayout.SetFixedSize) + main_layout.setSizeConstraint(QLayout.SizeConstraint.SetFixedSize) main_layout.addLayout(left_layout, 0, 0) main_layout.addWidget(button_box, 0, 1) main_layout.addWidget(extension, 1, 0, 1, 2) diff --git a/examples/widgets/dialogs/licensewizard/licensewizard.py b/examples/widgets/dialogs/licensewizard/licensewizard.py index 414062479..0fdeffbdb 100644 --- a/examples/widgets/dialogs/licensewizard/licensewizard.py +++ b/examples/widgets/dialogs/licensewizard/licensewizard.py @@ -32,7 +32,8 @@ class IntroPage(QWizardPage): path = Path(__file__).resolve().parent - self.setPixmap(QWizard.WatermarkPixmap, QPixmap(path / "images" / "watermark.png")) + self.setPixmap(QWizard.WizardPixmap.WatermarkPixmap, + QPixmap(path / "images" / "watermark.png")) self.top_label = QLabel( "This wizard will help you register your copy of " "<i>Super Product One</i>™ or start " @@ -166,7 +167,8 @@ class ConclusionPage(QWizardPage): self.setTitle("Complete Your Registration") path = Path(__file__).resolve().parent - self.setPixmap(QWizard.WatermarkPixmap, QPixmap(path / "images" / "watermark.png")) + self.setPixmap(QWizard.WizardPixmap.WatermarkPixmap, + QPixmap(path / "images" / "watermark.png")) self.bottom_label = QLabel() self.bottom_label.setWordWrap(True) @@ -251,12 +253,12 @@ class LicenseWizard(QWizard): self.setStartId(Pages.Page_Intro) if sys.platform == 'darwin': - self.setWizardStyle(QWizard.ModernStyle) + self.setWizardStyle(QWizard.WizardStyle.ModernStyle) - self.setOption(QWizard.HaveHelpButton, True) + self.setOption(QWizard.WizardOption.HaveHelpButton, True) path = Path(__file__).resolve().parent - self.setPixmap(QWizard.LogoPixmap, QPixmap(path / "images" / "logo.png")) + self.setPixmap(QWizard.WizardPixmap.LogoPixmap, QPixmap(path / "images" / "logo.png")) self.helpRequested.connect(self.show_help) self.setWindowTitle("License Wizard") diff --git a/examples/widgets/gettext/main.py b/examples/widgets/gettext/main.py index 02e6c2e08..6710a2365 100644 --- a/examples/widgets/gettext/main.py +++ b/examples/widgets/gettext/main.py @@ -24,7 +24,7 @@ class Window(QMainWindow): quit_action.triggered.connect(self.close) self._list_widget = QListWidget() - self._list_widget.setSelectionMode(QAbstractItemView.MultiSelection) + self._list_widget.setSelectionMode(QAbstractItemView.SelectionMode.MultiSelection) self._list_widget.selectionModel().selectionChanged.connect(self.selection_changed) self._list_widget.addItem("C++") self._list_widget.addItem("Java") diff --git a/examples/widgets/itemviews/jsonmodel/jsonmodel.py b/examples/widgets/itemviews/jsonmodel/jsonmodel.py index 7d15b6ca0..00ec1478b 100644 --- a/examples/widgets/itemviews/jsonmodel/jsonmodel.py +++ b/examples/widgets/itemviews/jsonmodel/jsonmodel.py @@ -271,7 +271,7 @@ class JsonModel(QAbstractItemModel): flags = super(JsonModel, self).flags(index) if index.column() == 1: - return Qt.ItemIsEditable | flags + return Qt.ItemFlag.ItemIsEditable | flags else: return flags @@ -315,7 +315,7 @@ if __name__ == "__main__": model.load(document) view.show() - view.header().setSectionResizeMode(0, QHeaderView.Stretch) + view.header().setSectionResizeMode(0, QHeaderView.ResizeMode.Stretch) view.setAlternatingRowColors(True) view.resize(500, 300) app.exec() diff --git a/examples/widgets/layouts/flowlayout/flowlayout.py b/examples/widgets/layouts/flowlayout/flowlayout.py index b4e4aeaad..856d64204 100644 --- a/examples/widgets/layouts/flowlayout/flowlayout.py +++ b/examples/widgets/layouts/flowlayout/flowlayout.py @@ -91,10 +91,12 @@ class FlowLayout(QLayout): for item in self._item_list: style = item.widget().style() layout_spacing_x = style.layoutSpacing( - QSizePolicy.PushButton, QSizePolicy.PushButton, Qt.Orientation.Horizontal + QSizePolicy.ControlType.PushButton, QSizePolicy.ControlType.PushButton, + Qt.Orientation.Horizontal ) layout_spacing_y = style.layoutSpacing( - QSizePolicy.PushButton, QSizePolicy.PushButton, Qt.Vertical + QSizePolicy.ControlType.PushButton, QSizePolicy.ControlType.PushButton, + Qt.Orientation.Vertical ) space_x = spacing + layout_spacing_x space_y = spacing + layout_spacing_y diff --git a/examples/widgets/linguist/main.py b/examples/widgets/linguist/main.py index 53dd358f5..0feb00638 100644 --- a/examples/widgets/linguist/main.py +++ b/examples/widgets/linguist/main.py @@ -25,7 +25,7 @@ class Window(QMainWindow): about_qt_action.triggered.connect(qApp.aboutQt) # noqa: F821 self._list_widget = QListWidget() - self._list_widget.setSelectionMode(QAbstractItemView.MultiSelection) + self._list_widget.setSelectionMode(QAbstractItemView.SelectionMode.MultiSelection) self._list_widget.selectionModel().selectionChanged.connect(self.selection_changed) self._list_widget.addItem("C++") self._list_widget.addItem("Java") diff --git a/examples/widgets/tutorials/addressbook/part1.py b/examples/widgets/tutorials/addressbook/part1.py index 87174453f..c3785f416 100644 --- a/examples/widgets/tutorials/addressbook/part1.py +++ b/examples/widgets/tutorials/addressbook/part1.py @@ -23,7 +23,7 @@ class AddressBook(QWidget): main_layout = QGridLayout() main_layout.addWidget(name_label, 0, 0) main_layout.addWidget(self._name_line, 0, 1) - main_layout.addWidget(address_label, 1, 0, Qt.AlignTop) + main_layout.addWidget(address_label, 1, 0, Qt.AlignmentFlag.AlignTop) main_layout.addWidget(self._address_text, 1, 1) self.setLayout(main_layout) diff --git a/examples/widgets/tutorials/addressbook/part2.py b/examples/widgets/tutorials/addressbook/part2.py index e4e509d7b..04550871c 100644 --- a/examples/widgets/tutorials/addressbook/part2.py +++ b/examples/widgets/tutorials/addressbook/part2.py @@ -68,7 +68,7 @@ class AddressBook(QWidget): self._cancel_button.clicked.connect(self.cancel) button_layout_1 = QVBoxLayout() - button_layout_1.addWidget(self._add_button, Qt.AlignTop) + button_layout_1.addWidget(self._add_button, Qt.AlignmentFlag.AlignTop) button_layout_1.addWidget(self._submit_button) button_layout_1.addWidget(self._cancel_button) button_layout_1.addStretch() @@ -76,7 +76,7 @@ class AddressBook(QWidget): main_layout = QGridLayout() main_layout.addWidget(name_label, 0, 0) main_layout.addWidget(self._name_line, 0, 1) - main_layout.addWidget(address_label, 1, 0, Qt.AlignTop) + main_layout.addWidget(address_label, 1, 0, Qt.AlignmentFlag.AlignTop) main_layout.addWidget(self._address_text, 1, 1) main_layout.addLayout(button_layout_1, 1, 2) @@ -91,7 +91,7 @@ class AddressBook(QWidget): self._address_text.clear() self._name_line.setReadOnly(False) - self._name_line.setFocus(Qt.OtherFocusReason) + self._name_line.setFocus(Qt.FocusReason.OtherFocusReason) self._address_text.setReadOnly(False) self._add_button.setEnabled(False) diff --git a/examples/widgets/tutorials/addressbook/part3.py b/examples/widgets/tutorials/addressbook/part3.py index 717e76282..5083afcf3 100644 --- a/examples/widgets/tutorials/addressbook/part3.py +++ b/examples/widgets/tutorials/addressbook/part3.py @@ -74,7 +74,7 @@ class AddressBook(QWidget): self._previous_button.clicked.connect(self.previous) button_layout_1 = QVBoxLayout() - button_layout_1.addWidget(self._add_button, Qt.AlignTop) + button_layout_1.addWidget(self._add_button, Qt.AlignmentFlag.AlignTop) button_layout_1.addWidget(self._submit_button) button_layout_1.addWidget(self._cancel_button) button_layout_1.addStretch() @@ -86,7 +86,7 @@ class AddressBook(QWidget): main_layout = QGridLayout() main_layout.addWidget(name_label, 0, 0) main_layout.addWidget(self._name_line, 0, 1) - main_layout.addWidget(address_label, 1, 0, Qt.AlignTop) + main_layout.addWidget(address_label, 1, 0, Qt.AlignmentFlag.AlignTop) main_layout.addWidget(self._address_text, 1, 1) main_layout.addLayout(button_layout_1, 1, 2) main_layout.addLayout(button_layout_2, 3, 1) @@ -102,7 +102,7 @@ class AddressBook(QWidget): self._address_text.clear() self._name_line.setReadOnly(False) - self._name_line.setFocus(Qt.OtherFocusReason) + self._name_line.setFocus(Qt.FocusReason.OtherFocusReason) self._address_text.setReadOnly(False) self._add_button.setEnabled(False) diff --git a/examples/widgets/tutorials/addressbook/part4.py b/examples/widgets/tutorials/addressbook/part4.py index 3b9c565b5..de4bbfacc 100644 --- a/examples/widgets/tutorials/addressbook/part4.py +++ b/examples/widgets/tutorials/addressbook/part4.py @@ -98,7 +98,7 @@ class AddressBook(QWidget): main_layout = QGridLayout() main_layout.addWidget(name_label, 0, 0) main_layout.addWidget(self._name_line, 0, 1) - main_layout.addWidget(address_label, 1, 0, Qt.AlignTop) + main_layout.addWidget(address_label, 1, 0, Qt.AlignmentFlag.AlignTop) main_layout.addWidget(self._address_text, 1, 1) main_layout.addLayout(button_layout_1, 1, 2) main_layout.addLayout(button_layout_2, 3, 1) @@ -231,7 +231,7 @@ class AddressBook(QWidget): if self._current_mode in (self.AddingMode, self.EditingMode): self._name_line.setReadOnly(False) - self._name_line.setFocus(Qt.OtherFocusReason) + self._name_line.setFocus(Qt.FocusReason.OtherFocusReason) self._address_text.setReadOnly(False) self._add_button.setEnabled(False) diff --git a/examples/widgets/tutorials/addressbook/part5.py b/examples/widgets/tutorials/addressbook/part5.py index 062a81215..13538207b 100644 --- a/examples/widgets/tutorials/addressbook/part5.py +++ b/examples/widgets/tutorials/addressbook/part5.py @@ -104,7 +104,7 @@ class AddressBook(QWidget): main_layout = QGridLayout() main_layout.addWidget(name_label, 0, 0) main_layout.addWidget(self._name_line, 0, 1) - main_layout.addWidget(address_label, 1, 0, Qt.AlignTop) + main_layout.addWidget(address_label, 1, 0, Qt.AlignmentFlag.AlignTop) main_layout.addWidget(self._address_text, 1, 1) main_layout.addLayout(button_layout_1, 1, 2) main_layout.addLayout(button_layout_2, 2, 1) @@ -253,7 +253,7 @@ class AddressBook(QWidget): if self._current_mode in (self.AddingMode, self.EditingMode): self._name_line.setReadOnly(False) - self._name_line.setFocus(Qt.OtherFocusReason) + self._name_line.setFocus(Qt.FocusReason.OtherFocusReason) self._address_text.setReadOnly(False) self._add_button.setEnabled(False) diff --git a/examples/widgets/tutorials/addressbook/part6.py b/examples/widgets/tutorials/addressbook/part6.py index 926796c25..73dcd067d 100644 --- a/examples/widgets/tutorials/addressbook/part6.py +++ b/examples/widgets/tutorials/addressbook/part6.py @@ -115,7 +115,7 @@ class AddressBook(QWidget): main_layout = QGridLayout() main_layout.addWidget(name_label, 0, 0) main_layout.addWidget(self._name_line, 0, 1) - main_layout.addWidget(address_label, 1, 0, Qt.AlignTop) + main_layout.addWidget(address_label, 1, 0, Qt.AlignmentFlag.AlignTop) main_layout.addWidget(self._address_text, 1, 1) main_layout.addLayout(button_layout_1, 1, 2) main_layout.addLayout(button_layout_2, 2, 1) @@ -264,7 +264,7 @@ class AddressBook(QWidget): if self._current_mode in (self.AddingMode, self.EditingMode): self._name_line.setReadOnly(False) - self._name_line.setFocus(Qt.OtherFocusReason) + self._name_line.setFocus(Qt.FocusReason.OtherFocusReason) self._address_text.setReadOnly(False) self._add_button.setEnabled(False) |