diff options
author | Cristián Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2022-10-05 11:19:04 +0200 |
---|---|---|
committer | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2022-10-06 06:34:00 +0000 |
commit | 23374ffc4215c2492d52a2d3b34c1dd7af61afb2 (patch) | |
tree | 115eeff447a90b9db5127e65a4119cbb74e051e4 | |
parent | e1a2fd9524578f4f4e27eb92a8646f7d53a4c1b8 (diff) |
examples: adapt widgets examples
Fixing issues related to deprecated methods, Enums,
and more.
Pick-to: 6.3
Change-Id: I07be29601f0ad257f5fcfb0a5bc4891cb7f9648c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-rw-r--r-- | examples/widgets/animation/easing/easing.py | 25 | ||||
-rw-r--r-- | examples/widgets/animation/easing/form.ui | 105 | ||||
-rw-r--r-- | examples/widgets/animation/easing/ui_form.py | 61 | ||||
-rw-r--r-- | examples/widgets/layouts/dynamiclayouts/dynamiclayouts.py | 2 | ||||
-rw-r--r-- | examples/widgets/linguist/main.py | 2 | ||||
-rw-r--r-- | examples/widgets/painting/painter/painter.py | 13 | ||||
-rw-r--r-- | examples/widgets/tutorials/cannon/t14.py | 2 | ||||
-rw-r--r-- | examples/widgets/widgetsgallery/main.py | 2 |
8 files changed, 145 insertions, 67 deletions
diff --git a/examples/widgets/animation/easing/easing.py b/examples/widgets/animation/easing/easing.py index 88c57eaa1..f8cba0060 100644 --- a/examples/widgets/animation/easing/easing.py +++ b/examples/widgets/animation/easing/easing.py @@ -110,7 +110,7 @@ class Window(QWidget): self._anim = Animation(self._item, b'pos') self._anim.setEasingCurve(QEasingCurve.OutBounce) - self._ui.easingCurvePicker.setCurrentRow(int(QEasingCurve.OutBounce)) + self._ui.easingCurvePicker.setCurrentRow(0) self.start_animation() @@ -123,15 +123,8 @@ class Window(QWidget): brush = QBrush(gradient) - # The original C++ code uses undocumented calls to get the names of the - # different curve types. We do the Python equivalant (but without - # cheating) - curve_types = [(n, c) for n, c in QEasingCurve.__dict__.items() - if (isinstance(c, QEasingCurve.Type) - and c != QEasingCurve.Custom - and c != QEasingCurve.NCurveTypes - and c != QEasingCurve.TCBSpline)] - curve_types.sort(key=lambda ct: ct[1]) + curve_types = [(f"QEasingCurve.{e.name}", e) for e in QEasingCurve.Type if e.value <= 40] + with QPainter(pix) as painter: @@ -191,15 +184,15 @@ class Window(QWidget): self._anim.setEasingCurve(curve_type) self._anim.setCurrentTime(0) - is_elastic = (curve_type >= QEasingCurve.InElastic - and curve_type <= QEasingCurve.OutInElastic) - is_bounce = (curve_type >= QEasingCurve.InBounce - and curve_type <= QEasingCurve.OutInBounce) + 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) self._ui.periodSpinBox.setEnabled(is_elastic) self._ui.amplitudeSpinBox.setEnabled(is_elastic or is_bounce) - self._ui.overshootSpinBox.setEnabled(curve_type >= QEasingCurve.InBack - and curve_type <= QEasingCurve.OutInBack) + self._ui.overshootSpinBox.setEnabled(curve_type.value >= QEasingCurve.InBack.value + and curve_type.value <= QEasingCurve.OutInBack.value) 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 2397b1787..364aebeda 100644 --- a/examples/widgets/animation/easing/form.ui +++ b/examples/widgets/animation/easing/form.ui @@ -49,12 +49,27 @@ <layout class="QVBoxLayout" name="verticalLayout"> <item> <widget class="QGroupBox" name="groupBox_2"> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>16777215</height> + </size> + </property> <property name="title"> <string>Path type</string> </property> - <layout class="QVBoxLayout" name="verticalLayout_2"> - <item> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0"> <widget class="QRadioButton" name="lineRadio"> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>40</height> + </size> + </property> + <property name="layoutDirection"> + <enum>Qt::LeftToRight</enum> + </property> <property name="text"> <string>Line</string> </property> @@ -62,17 +77,23 @@ <bool>true</bool> </property> <attribute name="buttonGroup"> - <string notr="true">buttonGroup</string> + <string>buttonGroup</string> </attribute> </widget> </item> - <item> + <item row="1" column="0"> <widget class="QRadioButton" name="circleRadio"> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>40</height> + </size> + </property> <property name="text"> <string>Circle</string> </property> <attribute name="buttonGroup"> - <string notr="true">buttonGroup</string> + <string>buttonGroup</string> </attribute> </widget> </item> @@ -96,6 +117,18 @@ </property> <item row="0" column="0"> <widget class="QLabel" name="label"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>30</height> + </size> + </property> <property name="text"> <string>Period</string> </property> @@ -106,6 +139,18 @@ <property name="enabled"> <bool>false</bool> </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>30</height> + </size> + </property> <property name="minimum"> <double>-1.000000000000000</double> </property> @@ -117,18 +162,17 @@ </property> </widget> </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string>Amplitude</string> - </property> - </widget> - </item> - <item row="1" column="1"> + <item row="2" column="1"> <widget class="QDoubleSpinBox" name="amplitudeSpinBox"> <property name="enabled"> <bool>false</bool> </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>30</height> + </size> + </property> <property name="minimum"> <double>-1.000000000000000</double> </property> @@ -140,18 +184,30 @@ </property> </widget> </item> - <item row="2" column="0"> + <item row="4" column="0"> <widget class="QLabel" name="label_3"> + <property name="minimumSize"> + <size> + <width>0</width> + <height>30</height> + </size> + </property> <property name="text"> <string>Overshoot</string> </property> </widget> </item> - <item row="2" column="1"> + <item row="4" column="1"> <widget class="QDoubleSpinBox" name="overshootSpinBox"> <property name="enabled"> <bool>false</bool> </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>30</height> + </size> + </property> <property name="minimum"> <double>-1.000000000000000</double> </property> @@ -163,6 +219,19 @@ </property> </widget> </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_2"> + <property name="minimumSize"> + <size> + <width>0</width> + <height>30</height> + </size> + </property> + <property name="text"> + <string>Amplitude</string> + </property> + </widget> + </item> </layout> </widget> </item> @@ -196,10 +265,6 @@ <resources/> <connections/> <buttongroups> - <buttongroup name="buttonGroup"> - <property name="exclusive"> - <bool>true</bool> - </property> - </buttongroup> + <buttongroup name="buttonGroup"/> </buttongroups> </ui> diff --git a/examples/widgets/animation/easing/ui_form.py b/examples/widgets/animation/easing/ui_form.py index 07bfa8fb3..0ff7a1547 100644 --- a/examples/widgets/animation/easing/ui_form.py +++ b/examples/widgets/animation/easing/ui_form.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- ################################################################################ -## Form generated from reading UI file 'form.ui' +## Form generated from reading UI file 'form2.ui' ## -## Created by: Qt User Interface Compiler version 6.2.3 +## Created by: Qt User Interface Compiler version 6.4.0 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -47,23 +47,26 @@ class Ui_Form(object): self.verticalLayout.setObjectName(u"verticalLayout") self.groupBox_2 = QGroupBox(Form) self.groupBox_2.setObjectName(u"groupBox_2") - self.verticalLayout_2 = QVBoxLayout(self.groupBox_2) - self.verticalLayout_2.setObjectName(u"verticalLayout_2") + self.groupBox_2.setMaximumSize(QSize(16777215, 16777215)) + self.gridLayout_2 = QGridLayout(self.groupBox_2) + self.gridLayout_2.setObjectName(u"gridLayout_2") self.lineRadio = QRadioButton(self.groupBox_2) self.buttonGroup = QButtonGroup(Form) self.buttonGroup.setObjectName(u"buttonGroup") - self.buttonGroup.setExclusive(True) self.buttonGroup.addButton(self.lineRadio) self.lineRadio.setObjectName(u"lineRadio") + self.lineRadio.setMaximumSize(QSize(16777215, 40)) + self.lineRadio.setLayoutDirection(Qt.LeftToRight) self.lineRadio.setChecked(True) - self.verticalLayout_2.addWidget(self.lineRadio) + self.gridLayout_2.addWidget(self.lineRadio, 0, 0, 1, 1) self.circleRadio = QRadioButton(self.groupBox_2) self.buttonGroup.addButton(self.circleRadio) self.circleRadio.setObjectName(u"circleRadio") + self.circleRadio.setMaximumSize(QSize(16777215, 40)) - self.verticalLayout_2.addWidget(self.circleRadio) + self.gridLayout_2.addWidget(self.circleRadio, 1, 0, 1, 1) self.verticalLayout.addWidget(self.groupBox_2) @@ -80,45 +83,61 @@ class Ui_Form(object): self.formLayout.setFieldGrowthPolicy(QFormLayout.AllNonFixedFieldsGrow) self.label = QLabel(self.groupBox) self.label.setObjectName(u"label") + sizePolicy2 = QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred) + sizePolicy2.setHorizontalStretch(0) + sizePolicy2.setVerticalStretch(0) + sizePolicy2.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth()) + self.label.setSizePolicy(sizePolicy2) + self.label.setMinimumSize(QSize(0, 30)) self.formLayout.setWidget(0, QFormLayout.LabelRole, self.label) self.periodSpinBox = QDoubleSpinBox(self.groupBox) self.periodSpinBox.setObjectName(u"periodSpinBox") self.periodSpinBox.setEnabled(False) + sizePolicy3 = QSizePolicy(QSizePolicy.Minimum, QSizePolicy.Fixed) + sizePolicy3.setHorizontalStretch(0) + sizePolicy3.setVerticalStretch(0) + sizePolicy3.setHeightForWidth(self.periodSpinBox.sizePolicy().hasHeightForWidth()) + self.periodSpinBox.setSizePolicy(sizePolicy3) + self.periodSpinBox.setMinimumSize(QSize(0, 30)) self.periodSpinBox.setMinimum(-1.000000000000000) self.periodSpinBox.setSingleStep(0.100000000000000) self.periodSpinBox.setValue(-1.000000000000000) self.formLayout.setWidget(0, QFormLayout.FieldRole, self.periodSpinBox) - self.label_2 = QLabel(self.groupBox) - self.label_2.setObjectName(u"label_2") - - self.formLayout.setWidget(1, QFormLayout.LabelRole, self.label_2) - self.amplitudeSpinBox = QDoubleSpinBox(self.groupBox) self.amplitudeSpinBox.setObjectName(u"amplitudeSpinBox") self.amplitudeSpinBox.setEnabled(False) + self.amplitudeSpinBox.setMinimumSize(QSize(0, 30)) self.amplitudeSpinBox.setMinimum(-1.000000000000000) self.amplitudeSpinBox.setSingleStep(0.100000000000000) self.amplitudeSpinBox.setValue(-1.000000000000000) - self.formLayout.setWidget(1, QFormLayout.FieldRole, self.amplitudeSpinBox) + self.formLayout.setWidget(2, QFormLayout.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(2, QFormLayout.LabelRole, self.label_3) + self.formLayout.setWidget(4, QFormLayout.LabelRole, self.label_3) self.overshootSpinBox = QDoubleSpinBox(self.groupBox) self.overshootSpinBox.setObjectName(u"overshootSpinBox") self.overshootSpinBox.setEnabled(False) + self.overshootSpinBox.setMinimumSize(QSize(0, 30)) self.overshootSpinBox.setMinimum(-1.000000000000000) self.overshootSpinBox.setSingleStep(0.100000000000000) self.overshootSpinBox.setValue(-1.000000000000000) - self.formLayout.setWidget(2, QFormLayout.FieldRole, self.overshootSpinBox) + self.formLayout.setWidget(4, QFormLayout.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.verticalLayout.addWidget(self.groupBox) @@ -132,11 +151,11 @@ class Ui_Form(object): self.graphicsView = QGraphicsView(Form) self.graphicsView.setObjectName(u"graphicsView") - sizePolicy2 = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding) - sizePolicy2.setHorizontalStretch(0) - sizePolicy2.setVerticalStretch(0) - sizePolicy2.setHeightForWidth(self.graphicsView.sizePolicy().hasHeightForWidth()) - self.graphicsView.setSizePolicy(sizePolicy2) + sizePolicy4 = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding) + sizePolicy4.setHorizontalStretch(0) + sizePolicy4.setVerticalStretch(0) + sizePolicy4.setHeightForWidth(self.graphicsView.sizePolicy().hasHeightForWidth()) + self.graphicsView.setSizePolicy(sizePolicy4) self.gridLayout.addWidget(self.graphicsView, 1, 1, 1, 1) @@ -153,7 +172,7 @@ class Ui_Form(object): self.circleRadio.setText(QCoreApplication.translate("Form", u"Circle", None)) self.groupBox.setTitle(QCoreApplication.translate("Form", u"Properties", None)) self.label.setText(QCoreApplication.translate("Form", u"Period", None)) - self.label_2.setText(QCoreApplication.translate("Form", u"Amplitude", None)) self.label_3.setText(QCoreApplication.translate("Form", u"Overshoot", None)) + self.label_2.setText(QCoreApplication.translate("Form", u"Amplitude", None)) # retranslateUi diff --git a/examples/widgets/layouts/dynamiclayouts/dynamiclayouts.py b/examples/widgets/layouts/dynamiclayouts/dynamiclayouts.py index a9eec159a..4e3791519 100644 --- a/examples/widgets/layouts/dynamiclayouts/dynamiclayouts.py +++ b/examples/widgets/layouts/dynamiclayouts/dynamiclayouts.py @@ -50,7 +50,7 @@ class Dialog(QDialog): self._main_layout.setSizeConstraint(QLayout.SetNoConstraint) self.setMinimumSize(0, 0) - orientation = Qt.Orientation(int(self._buttons_orientation_combo_box.itemData(index))) + orientation = Qt.Orientation(self._buttons_orientation_combo_box.itemData(index)) if orientation == self._button_box.orientation(): return diff --git a/examples/widgets/linguist/main.py b/examples/widgets/linguist/main.py index 7c97e6d9a..16655432c 100644 --- a/examples/widgets/linguist/main.py +++ b/examples/widgets/linguist/main.py @@ -41,7 +41,7 @@ class Window(QMainWindow): if __name__ == '__main__': app = QApplication(sys.argv) - path = QLibraryInfo.location(QLibraryInfo.TranslationsPath) + path = QLibraryInfo.path(QLibraryInfo.TranslationsPath) translator = QTranslator(app) if translator.load(QLocale.system(), 'qtbase', '_', path): app.installTranslator(translator) diff --git a/examples/widgets/painting/painter/painter.py b/examples/widgets/painting/painter/painter.py index 3cb6ba5b8..58584baff 100644 --- a/examples/widgets/painting/painter/painter.py +++ b/examples/widgets/painting/painter/painter.py @@ -136,7 +136,8 @@ class MainWindow(QMainWindow): self.setCentralWidget(self.painter_widget) - self.set_color(Qt.black) + self.color = Qt.black + self.set_color(self.color) self.mime_type_filters = ["image/png", "image/jpeg"] @@ -175,19 +176,21 @@ class MainWindow(QMainWindow): @Slot() def on_color_clicked(self): - color = QColorDialog.getColor(Qt.black, self) + color = QColorDialog.getColor(self.color, self) + if color: self.set_color(color) def set_color(self, color: QColor = Qt.black): + self.color = color # Create color icon pix_icon = QPixmap(32, 32) - pix_icon.fill(color) + pix_icon.fill(self.color) self.color_action.setIcon(QIcon(pix_icon)) - self.painter_widget.pen.setColor(color) - self.color_action.setText(QColor(color).name()) + self.painter_widget.pen.setColor(self.color) + self.color_action.setText(QColor(self.color).name()) if __name__ == "__main__": diff --git a/examples/widgets/tutorials/cannon/t14.py b/examples/widgets/tutorials/cannon/t14.py index 50b1d4c9f..e4f1c350d 100644 --- a/examples/widgets/tutorials/cannon/t14.py +++ b/examples/widgets/tutorials/cannon/t14.py @@ -341,7 +341,7 @@ class GameBoard(QWidget): QShortcut(QKeySequence(Qt.Key_Enter), self, self.fire) QShortcut(QKeySequence(Qt.Key_Return), self, self.fire) - QShortcut(QKeySequence(Qt.CTRL + Qt.Key_Q), self, self.close) + QShortcut(QKeySequence(Qt.CTRL | Qt.Key_Q), self, self.close) top_layout = QHBoxLayout() top_layout.addWidget(shoot) diff --git a/examples/widgets/widgetsgallery/main.py b/examples/widgets/widgetsgallery/main.py index 1b034d323..dadd1a91a 100644 --- a/examples/widgets/widgetsgallery/main.py +++ b/examples/widgets/widgetsgallery/main.py @@ -11,8 +11,6 @@ from widgetgallery import WidgetGallery if __name__ == '__main__': - QCoreApplication.setAttribute(Qt.AA_EnableHighDpiScaling) - QCoreApplication.setAttribute(Qt.AA_UseHighDpiPixmaps) app = QApplication() gallery = WidgetGallery() gallery.show() |