From 2cb5ba7001e5a87127f529299a16e687194b83ce Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 27 Jul 2025 17:44:17 +0200 Subject: [PATCH] Import qt6 fixes from ui-rework branch Signed-off-by: falkTX --- source/frontend/qt_compat.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/source/frontend/qt_compat.py b/source/frontend/qt_compat.py index 39a125c64..3cec424a1 100644 --- a/source/frontend/qt_compat.py +++ b/source/frontend/qt_compat.py @@ -91,6 +91,8 @@ elif qt_config == 6: Qt.Key_E = Qt.Key.Key_E Qt.Key_Eacute = Qt.Key.Key_Eacute Qt.Key_Egrave = Qt.Key.Key_Egrave + Qt.Key_End = Qt.Key.Key_End + Qt.Key_Enter = Qt.Key.Key_Enter Qt.Key_Escape = Qt.Key.Key_Escape Qt.Key_F = Qt.Key.Key_F Qt.Key_G = Qt.Key.Key_G @@ -103,12 +105,16 @@ elif qt_config == 6: Qt.Key_N = Qt.Key.Key_N Qt.Key_O = Qt.Key.Key_O Qt.Key_P = Qt.Key.Key_P + Qt.Key_PageDown = Qt.Key.Key_PageDown + Qt.Key_PageUp = Qt.Key.Key_PageUp Qt.Key_ParenLeft = Qt.Key.Key_ParenLeft Qt.Key_Plus = Qt.Key.Key_Plus Qt.Key_Q = Qt.Key.Key_Q Qt.Key_QuoteDbl = Qt.Key.Key_QuoteDbl Qt.Key_R = Qt.Key.Key_R + Qt.Key_Return = Qt.Key.Key_Return Qt.Key_S = Qt.Key.Key_S + Qt.Key_Space = Qt.Key.Key_Space Qt.Key_T = Qt.Key.Key_T Qt.Key_U = Qt.Key.Key_U Qt.Key_V = Qt.Key.Key_V @@ -140,8 +146,10 @@ elif qt_config == 6: Qt.Horizontal = Qt.Orientation.Horizontal Qt.FlatCap = Qt.PenCapStyle.FlatCap + Qt.RoundCap = Qt.PenCapStyle.RoundCap Qt.MiterJoin = Qt.PenJoinStyle.MiterJoin + Qt.RoundJoin = Qt.PenJoinStyle.RoundJoin Qt.DashLine = Qt.PenStyle.DashLine Qt.NoPen = Qt.PenStyle.NoPen @@ -152,6 +160,11 @@ elif qt_config == 6: Qt.AscendingOrder = Qt.SortOrder.AscendingOrder + Qt.TextSelectableByMouse = Qt.TextInteractionFlag.TextSelectableByMouse + + Qt.ToolButtonIconOnly = Qt.ToolButtonStyle.ToolButtonIconOnly + Qt.ToolButtonTextBesideIcon = Qt.ToolButtonStyle.ToolButtonTextBesideIcon + Qt.SmoothTransformation = Qt.TransformationMode.SmoothTransformation Qt.WA_OpaquePaintEvent = Qt.WidgetAttribute.WA_OpaquePaintEvent @@ -181,6 +194,7 @@ elif qt_config == 6: QDialog.exec_ = lambda d: d.exec() + QDialogButtonBox.Ok = QDialogButtonBox.StandardButton.Ok QDialogButtonBox.Reset = QDialogButtonBox.StandardButton.Reset QEvent.EnabledChange = QEvent.Type.EnabledChange @@ -225,6 +239,7 @@ elif qt_config == 6: QGraphicsView.MinimalViewportUpdate = QGraphicsView.ViewportUpdateMode.MinimalViewportUpdate QHeaderView.Fixed = QHeaderView.ResizeMode.Fixed + QHeaderView.ResizeToContents = QHeaderView.ResizeMode.ResizeToContents QLineEdit.Normal = QLineEdit.EchoMode.Normal