diff options
| author | Friedemann Kleint <[email protected]> | 2024-09-18 08:51:11 +0200 |
|---|---|---|
| committer | Friedemann Kleint <[email protected]> | 2024-09-18 15:17:12 +0200 |
| commit | 496ffda6aa0915ce6982093290aa565b8b464348 (patch) | |
| tree | ae31fd52d1169939526f88c1e52f53444e2d7ba2 | |
| parent | a1e6f107537b6ac2c26254e8c449ef0ec499ed15 (diff) | |
Update Qt Widgets Designer forms
Load and save once so that fully qualified enumerations are used.
Task-number: PYSIDE-2846
Change-Id: I544467c1d9254533bf62e1344c26c90c7d17d118
Reviewed-by: Shyamnath Premnadh <[email protected]>
62 files changed, 378 insertions, 286 deletions
diff --git a/examples/bluetooth/btscanner/service.ui b/examples/bluetooth/btscanner/service.ui index 4ca12ee05..5a4bd637d 100644 --- a/examples/bluetooth/btscanner/service.ui +++ b/examples/bluetooth/btscanner/service.ui @@ -27,7 +27,7 @@ <item> <widget class="QDialogButtonBox" name="buttonBox"> <property name="standardButtons"> - <set>QDialogButtonBox::Close</set> + <set>QDialogButtonBox::StandardButton::Close</set> </property> </widget> </item> diff --git a/examples/bluetooth/btscanner/ui_device.py b/examples/bluetooth/btscanner/ui_device.py index b443b2bc2..bf56002dc 100644 --- a/examples/bluetooth/btscanner/ui_device.py +++ b/examples/bluetooth/btscanner/ui_device.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'device.ui' ## -## Created by: Qt User Interface Compiler version 6.7.0 +## Created by: Qt User Interface Compiler version 6.8.0 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ diff --git a/examples/bluetooth/btscanner/ui_service.py b/examples/bluetooth/btscanner/ui_service.py index ccc36677a..151dacebf 100644 --- a/examples/bluetooth/btscanner/ui_service.py +++ b/examples/bluetooth/btscanner/ui_service.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'service.ui' ## -## Created by: Qt User Interface Compiler version 6.7.0 +## Created by: Qt User Interface Compiler version 6.8.0 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -38,7 +38,7 @@ class Ui_ServiceDiscovery(object): self.buttonBox = QDialogButtonBox(ServiceDiscovery) self.buttonBox.setObjectName(u"buttonBox") - self.buttonBox.setStandardButtons(QDialogButtonBox.Close) + self.buttonBox.setStandardButtons(QDialogButtonBox.StandardButton.Close) self.verticalLayout.addWidget(self.buttonBox) diff --git a/examples/charts/chartthemes/themewidget.ui b/examples/charts/chartthemes/themewidget.ui index ad1e02f06..2e42a9d55 100644 --- a/examples/charts/chartthemes/themewidget.ui +++ b/examples/charts/chartthemes/themewidget.ui @@ -56,7 +56,7 @@ <item> <spacer name="horizontalSpacer"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -77,24 +77,64 @@ <signal>currentIndexChanged(int)</signal> <receiver>ThemeWidgetForm</receiver> <slot>update_ui()</slot> + <hints> + <hint type="sourcelabel"> + <x>20</x> + <y>20</y> + </hint> + <hint type="destinationlabel"> + <x>20</x> + <y>20</y> + </hint> + </hints> </connection> <connection> <sender>antialiasCheckBox</sender> <signal>toggled(bool)</signal> <receiver>ThemeWidgetForm</receiver> <slot>update_ui()</slot> + <hints> + <hint type="sourcelabel"> + <x>20</x> + <y>20</y> + </hint> + <hint type="destinationlabel"> + <x>20</x> + <y>20</y> + </hint> + </hints> </connection> <connection> <sender>legendComboBox</sender> <signal>currentIndexChanged(int)</signal> <receiver>ThemeWidgetForm</receiver> <slot>update_ui()</slot> + <hints> + <hint type="sourcelabel"> + <x>20</x> + <y>20</y> + </hint> + <hint type="destinationlabel"> + <x>20</x> + <y>20</y> + </hint> + </hints> </connection> <connection> <sender>animatedComboBox</sender> <signal>currentIndexChanged(int)</signal> <receiver>ThemeWidgetForm</receiver> <slot>update_ui()</slot> + <hints> + <hint type="sourcelabel"> + <x>20</x> + <y>20</y> + </hint> + <hint type="destinationlabel"> + <x>20</x> + <y>20</y> + </hint> + </hints> </connection> </connections> <slots> diff --git a/examples/charts/chartthemes/ui_themewidget.py b/examples/charts/chartthemes/ui_themewidget.py index 711615b3e..c46e49059 100644 --- a/examples/charts/chartthemes/ui_themewidget.py +++ b/examples/charts/chartthemes/ui_themewidget.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'themewidget.ui' ## -## Created by: Qt User Interface Compiler version 6.7.0 +## Created by: Qt User Interface Compiler version 6.8.0 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ diff --git a/examples/corelib/ipc/sharedmemory/dialog.ui b/examples/corelib/ipc/sharedmemory/dialog.ui index e99d6fb3c..fff08206c 100644 --- a/examples/corelib/ipc/sharedmemory/dialog.ui +++ b/examples/corelib/ipc/sharedmemory/dialog.ui @@ -1,7 +1,8 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>Dialog</class> - <widget class="QDialog" name="Dialog" > - <property name="geometry" > + <widget class="QDialog" name="Dialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,33 +10,33 @@ <height>322</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Dialog</string> </property> - <layout class="QGridLayout" > - <item row="0" column="0" > - <widget class="QPushButton" name="loadFromFileButton" > - <property name="text" > + <layout class="QGridLayout"> + <item row="0" column="0"> + <widget class="QPushButton" name="loadFromFileButton"> + <property name="text"> <string>Load Image From File...</string> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QLabel" name="label" > - <property name="text" > + <item row="1" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> <string>Launch two of these dialogs. In the first, press the top button and load an image from a file. In the second, press the bottom button and display the loaded image from shared memory.</string> </property> - <property name="alignment" > - <set>Qt::AlignCenter</set> + <property name="alignment"> + <set>Qt::AlignmentFlag::AlignCenter</set> </property> - <property name="wordWrap" > + <property name="wordWrap"> <bool>true</bool> </property> </widget> </item> - <item row="2" column="0" > - <widget class="QPushButton" name="loadFromSharedMemoryButton" > - <property name="text" > + <item row="2" column="0"> + <widget class="QPushButton" name="loadFromSharedMemoryButton"> + <property name="text"> <string>Display Image From Shared Memory</string> </property> </widget> diff --git a/examples/corelib/ipc/sharedmemory/ui_dialog.py b/examples/corelib/ipc/sharedmemory/ui_dialog.py index 2cd544f40..8676cecd9 100644 --- a/examples/corelib/ipc/sharedmemory/ui_dialog.py +++ b/examples/corelib/ipc/sharedmemory/ui_dialog.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'dialog.ui' ## -## Created by: Qt User Interface Compiler version 6.7.0 +## Created by: Qt User Interface Compiler version 6.8.0 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -32,7 +32,7 @@ class Ui_Dialog(object): self.label = QLabel(Dialog) self.label.setObjectName(u"label") - self.label.setAlignment(Qt.AlignCenter) + self.label.setAlignment(Qt.AlignmentFlag.AlignCenter) self.label.setWordWrap(True) self.gridLayout.addWidget(self.label, 1, 0, 1, 1) diff --git a/examples/demos/documentviewer/mainwindow.ui b/examples/demos/documentviewer/mainwindow.ui index 482061fc7..3406d6ed5 100644 --- a/examples/demos/documentviewer/mainwindow.ui +++ b/examples/demos/documentviewer/mainwindow.ui @@ -28,11 +28,11 @@ <item> <widget class="QSplitter" name="splitter"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <widget class="QTabWidget" name="tabWidget"> <property name="tabPosition"> - <enum>QTabWidget::West</enum> + <enum>QTabWidget::TabPosition::West</enum> </property> <property name="currentIndex"> <number>0</number> @@ -70,7 +70,7 @@ <x>0</x> <y>0</y> <width>798</width> - <height>479</height> + <height>472</height> </rect> </property> </widget> @@ -88,7 +88,7 @@ <x>0</x> <y>0</y> <width>983</width> - <height>23</height> + <height>26</height> </rect> </property> <widget class="QMenu" name="qtFileMenu"> @@ -234,8 +234,7 @@ </action> <action name="actionQuit"> <property name="icon"> - <iconset theme="application-exit"> - <normaloff>.</normaloff>.</iconset> + <iconset theme="application-exit"/> </property> <property name="text"> <string>Quit</string> diff --git a/examples/demos/documentviewer/ui_mainwindow.py b/examples/demos/documentviewer/ui_mainwindow.py index 5773ae5b8..3c4100472 100644 --- a/examples/demos/documentviewer/ui_mainwindow.py +++ b/examples/demos/documentviewer/ui_mainwindow.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'mainwindow.ui' ## -## Created by: Qt User Interface Compiler version 6.7.0 +## Created by: Qt User Interface Compiler version 6.8.0 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -27,12 +27,12 @@ class Ui_MainWindow(object): MainWindow.setObjectName(u"MainWindow") MainWindow.resize(983, 602) icon = QIcon() - icon.addFile(u":/demos/documentviewer/images/qt-logo.png", QSize(), QIcon.Normal, QIcon.Off) + icon.addFile(u":/demos/documentviewer/images/qt-logo.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) MainWindow.setWindowIcon(icon) self.actionOpen = QAction(MainWindow) self.actionOpen.setObjectName(u"actionOpen") icon1 = QIcon() - icon1.addFile(u":/demos/documentviewer/images/open.png", QSize(), QIcon.Normal, QIcon.Off) + icon1.addFile(u":/demos/documentviewer/images/open.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionOpen.setIcon(icon1) self.actionAbout = QAction(MainWindow) self.actionAbout.setObjectName(u"actionAbout") @@ -41,18 +41,18 @@ class Ui_MainWindow(object): if QIcon.hasThemeIcon(iconThemeName): icon2 = QIcon.fromTheme(iconThemeName) else: - icon2.addFile(u":/demos/documentviewer/images/help-about.svgz", QSize(), QIcon.Normal, QIcon.Off) + icon2.addFile(u":/demos/documentviewer/images/help-about.svgz", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionAbout.setIcon(icon2) self.actionForward = QAction(MainWindow) self.actionForward.setObjectName(u"actionForward") icon3 = QIcon() - icon3.addFile(u":/demos/documentviewer/images/go-next.svgz", QSize(), QIcon.Normal, QIcon.Off) + icon3.addFile(u":/demos/documentviewer/images/go-next.svgz", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionForward.setIcon(icon3) self.actionBack = QAction(MainWindow) self.actionBack.setObjectName(u"actionBack") icon4 = QIcon() - icon4.addFile(u":/demos/documentviewer/images/go-previous.svgz", QSize(), QIcon.Normal, QIcon.Off) + icon4.addFile(u":/demos/documentviewer/images/go-previous.svgz", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionBack.setIcon(icon4) self.actionPrint = QAction(MainWindow) self.actionPrint.setObjectName(u"actionPrint") @@ -62,29 +62,23 @@ class Ui_MainWindow(object): if QIcon.hasThemeIcon(iconThemeName): icon5 = QIcon.fromTheme(iconThemeName) else: - icon5.addFile(u":/demos/documentviewer/images/print2x.png", QSize(), QIcon.Normal, QIcon.Off) + icon5.addFile(u":/demos/documentviewer/images/print2x.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionPrint.setIcon(icon5) self.actionAboutQt = QAction(MainWindow) self.actionAboutQt.setObjectName(u"actionAboutQt") icon6 = QIcon() - icon6.addFile(u":/demos/documentviewer/images/qt-logo.png", QSize(), QIcon.Normal, QIcon.Off) - icon6.addFile(u":/demos/documentviewer/images/qt-logo.png", QSize(), QIcon.Normal, QIcon.On) + icon6.addFile(u":/demos/documentviewer/images/qt-logo.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) + icon6.addFile(u":/demos/documentviewer/images/qt-logo.png", QSize(), QIcon.Mode.Normal, QIcon.State.On) self.actionAboutQt.setIcon(icon6) self.actionRecent = QAction(MainWindow) self.actionRecent.setObjectName(u"actionRecent") icon7 = QIcon() - icon7.addFile(u":/demos/documentviewer/images/document-open-recent.svgz", QSize(), QIcon.Normal, QIcon.Off) + icon7.addFile(u":/demos/documentviewer/images/document-open-recent.svgz", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionRecent.setIcon(icon7) self.actionQuit = QAction(MainWindow) self.actionQuit.setObjectName(u"actionQuit") - icon8 = QIcon() - iconThemeName = u"application-exit" - if QIcon.hasThemeIcon(iconThemeName): - icon8 = QIcon.fromTheme(iconThemeName) - else: - icon8.addFile(u".", QSize(), QIcon.Normal, QIcon.Off) - + icon8 = QIcon(QIcon.fromTheme(u"application-exit")) self.actionQuit.setIcon(icon8) self.centralwidget = QWidget(MainWindow) self.centralwidget.setObjectName(u"centralwidget") @@ -97,10 +91,10 @@ class Ui_MainWindow(object): self.verticalLayout_2.setObjectName(u"verticalLayout_2") self.splitter = QSplitter(self.viewArea) self.splitter.setObjectName(u"splitter") - self.splitter.setOrientation(Qt.Horizontal) + self.splitter.setOrientation(Qt.Orientation.Horizontal) self.tabWidget = QTabWidget(self.splitter) self.tabWidget.setObjectName(u"tabWidget") - self.tabWidget.setTabPosition(QTabWidget.West) + self.tabWidget.setTabPosition(QTabWidget.TabPosition.West) self.bookmarkTab = QWidget() self.bookmarkTab.setObjectName(u"bookmarkTab") self.tabWidget.addTab(self.bookmarkTab, "") @@ -119,7 +113,7 @@ class Ui_MainWindow(object): self.scrollArea.setWidgetResizable(True) self.scrollAreaWidgetContents = QWidget() self.scrollAreaWidgetContents.setObjectName(u"scrollAreaWidgetContents") - self.scrollAreaWidgetContents.setGeometry(QRect(0, 0, 798, 479)) + self.scrollAreaWidgetContents.setGeometry(QRect(0, 0, 798, 472)) self.scrollArea.setWidget(self.scrollAreaWidgetContents) self.splitter.addWidget(self.scrollArea) @@ -131,7 +125,7 @@ class Ui_MainWindow(object): MainWindow.setCentralWidget(self.centralwidget) self.menubar = QMenuBar(MainWindow) self.menubar.setObjectName(u"menubar") - self.menubar.setGeometry(QRect(0, 0, 983, 23)) + self.menubar.setGeometry(QRect(0, 0, 983, 26)) self.qtFileMenu = QMenu(self.menubar) self.qtFileMenu.setObjectName(u"qtFileMenu") self.menuHelp = QMenu(self.menubar) diff --git a/examples/multimedia/camera/camera.ui b/examples/multimedia/camera/camera.ui index 4584e909c..a338fb513 100644 --- a/examples/multimedia/camera/camera.ui +++ b/examples/multimedia/camera/camera.ui @@ -28,7 +28,7 @@ <item row="3" column="0"> <spacer name="verticalSpacer_2"> <property name="orientation"> - <enum>Qt::Vertical</enum> + <enum>Qt::Orientation::Vertical</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -60,10 +60,10 @@ <number>2</number> </property> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="tickPosition"> - <enum>QSlider::TicksAbove</enum> + <enum>QSlider::TickPosition::TicksAbove</enum> </property> </widget> </item> @@ -105,7 +105,7 @@ <item row="3" column="0"> <spacer name="verticalSpacer"> <property name="orientation"> - <enum>Qt::Vertical</enum> + <enum>Qt::Orientation::Vertical</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -232,7 +232,7 @@ </sizepolicy> </property> <property name="frameShape"> - <enum>QFrame::Box</enum> + <enum>QFrame::Shape::Box</enum> </property> <property name="text"> <string/> @@ -251,7 +251,7 @@ <x>0</x> <y>0</y> <width>668</width> - <height>19</height> + <height>26</height> </rect> </property> <widget class="QMenu" name="menuFile"> diff --git a/examples/multimedia/camera/camera_mobile.ui b/examples/multimedia/camera/camera_mobile.ui index 7f269b17b..f36722ff2 100644 --- a/examples/multimedia/camera/camera_mobile.ui +++ b/examples/multimedia/camera/camera_mobile.ui @@ -43,10 +43,10 @@ <number>2</number> </property> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="tickPosition"> - <enum>QSlider::TicksAbove</enum> + <enum>QSlider::TickPosition::TicksAbove</enum> </property> </widget> </item> @@ -116,7 +116,7 @@ <item> <spacer name="verticalSpacer"> <property name="orientation"> - <enum>Qt::Vertical</enum> + <enum>Qt::Orientation::Vertical</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -254,7 +254,7 @@ </sizepolicy> </property> <property name="frameShape"> - <enum>QFrame::Box</enum> + <enum>QFrame::Shape::Box</enum> </property> <property name="text"> <string/> @@ -273,7 +273,7 @@ <x>0</x> <y>0</y> <width>668</width> - <height>22</height> + <height>26</height> </rect> </property> <widget class="QMenu" name="menuFile"> diff --git a/examples/multimedia/camera/imagesettings.ui b/examples/multimedia/camera/imagesettings.ui index 8c59ca01d..6eb37adf7 100644 --- a/examples/multimedia/camera/imagesettings.ui +++ b/examples/multimedia/camera/imagesettings.ui @@ -53,7 +53,7 @@ <number>4</number> </property> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> </widget> </item> @@ -63,7 +63,7 @@ <item row="1" column="0"> <spacer name="verticalSpacer"> <property name="orientation"> - <enum>Qt::Vertical</enum> + <enum>Qt::Orientation::Vertical</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -76,10 +76,10 @@ <item row="2" column="0"> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set> </property> </widget> </item> diff --git a/examples/multimedia/camera/ui_camera.py b/examples/multimedia/camera/ui_camera.py index 690cf3352..db78ecf5a 100644 --- a/examples/multimedia/camera/ui_camera.py +++ b/examples/multimedia/camera/ui_camera.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'camera.ui' ## -## Created by: Qt User Interface Compiler version 6.7.0 +## Created by: Qt User Interface Compiler version 6.8.0 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -62,8 +62,8 @@ class Ui_Camera(object): self.exposureCompensation.setMinimum(-4) self.exposureCompensation.setMaximum(4) self.exposureCompensation.setPageStep(2) - self.exposureCompensation.setOrientation(Qt.Horizontal) - self.exposureCompensation.setTickPosition(QSlider.TicksAbove) + self.exposureCompensation.setOrientation(Qt.Orientation.Horizontal) + self.exposureCompensation.setTickPosition(QSlider.TickPosition.TicksAbove) self.gridLayout.addWidget(self.exposureCompensation, 5, 0, 1, 1) @@ -152,7 +152,7 @@ class Ui_Camera(object): sizePolicy1.setVerticalStretch(0) sizePolicy1.setHeightForWidth(self.lastImagePreviewLabel.sizePolicy().hasHeightForWidth()) self.lastImagePreviewLabel.setSizePolicy(sizePolicy1) - self.lastImagePreviewLabel.setFrameShape(QFrame.Box) + self.lastImagePreviewLabel.setFrameShape(QFrame.Shape.Box) self.gridLayout_4.addWidget(self.lastImagePreviewLabel, 0, 0, 1, 1) @@ -163,7 +163,7 @@ class Ui_Camera(object): Camera.setCentralWidget(self.centralwidget) self.menubar = QMenuBar(Camera) self.menubar.setObjectName(u"menubar") - self.menubar.setGeometry(QRect(0, 0, 668, 19)) + self.menubar.setGeometry(QRect(0, 0, 668, 26)) self.menuFile = QMenu(self.menubar) self.menuFile.setObjectName(u"menuFile") self.menuDevices = QMenu(self.menubar) diff --git a/examples/multimedia/camera/ui_camera_mobile.py b/examples/multimedia/camera/ui_camera_mobile.py index 5cdd81f1e..a9bd4d097 100644 --- a/examples/multimedia/camera/ui_camera_mobile.py +++ b/examples/multimedia/camera/ui_camera_mobile.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'camera_mobile.ui' ## -## Created by: Qt User Interface Compiler version 6.7.0 +## Created by: Qt User Interface Compiler version 6.8.0 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -56,8 +56,8 @@ class Ui_Camera(object): self.exposureCompensation.setMinimum(-4) self.exposureCompensation.setMaximum(4) self.exposureCompensation.setPageStep(2) - self.exposureCompensation.setOrientation(Qt.Horizontal) - self.exposureCompensation.setTickPosition(QSlider.TicksAbove) + self.exposureCompensation.setOrientation(Qt.Orientation.Horizontal) + self.exposureCompensation.setTickPosition(QSlider.TickPosition.TicksAbove) self.gridLayout.addWidget(self.exposureCompensation, 4, 0, 1, 1) @@ -75,7 +75,7 @@ class Ui_Camera(object): self.takeImageButton.setObjectName(u"takeImageButton") self.takeImageButton.setEnabled(False) icon = QIcon() - icon.addFile(u":/images/shutter.svg", QSize(), QIcon.Normal, QIcon.Off) + icon.addFile(u":/images/shutter.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.takeImageButton.setIcon(icon) self.gridLayout.addWidget(self.takeImageButton, 0, 0, 1, 1) @@ -180,7 +180,7 @@ class Ui_Camera(object): sizePolicy4.setVerticalStretch(0) sizePolicy4.setHeightForWidth(self.lastImagePreviewLabel.sizePolicy().hasHeightForWidth()) self.lastImagePreviewLabel.setSizePolicy(sizePolicy4) - self.lastImagePreviewLabel.setFrameShape(QFrame.Box) + self.lastImagePreviewLabel.setFrameShape(QFrame.Shape.Box) self.gridLayout_4.addWidget(self.lastImagePreviewLabel, 0, 0, 1, 1) @@ -191,7 +191,7 @@ class Ui_Camera(object): Camera.setCentralWidget(self.centralwidget) self.menubar = QMenuBar(Camera) self.menubar.setObjectName(u"menubar") - self.menubar.setGeometry(QRect(0, 0, 668, 22)) + self.menubar.setGeometry(QRect(0, 0, 668, 26)) self.menuFile = QMenu(self.menubar) self.menuFile.setObjectName(u"menuFile") self.menuDevices = QMenu(self.menubar) diff --git a/examples/multimedia/camera/ui_imagesettings.py b/examples/multimedia/camera/ui_imagesettings.py index a3fba7789..53fdc86ba 100644 --- a/examples/multimedia/camera/ui_imagesettings.py +++ b/examples/multimedia/camera/ui_imagesettings.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'imagesettings.ui' ## -## Created by: Qt User Interface Compiler version 6.7.0 +## Created by: Qt User Interface Compiler version 6.8.0 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -58,7 +58,7 @@ class Ui_ImageSettingsUi(object): self.imageQualitySlider = QSlider(self.groupBox_2) self.imageQualitySlider.setObjectName(u"imageQualitySlider") self.imageQualitySlider.setMaximum(4) - self.imageQualitySlider.setOrientation(Qt.Horizontal) + self.imageQualitySlider.setOrientation(Qt.Orientation.Horizontal) self.gridLayout_2.addWidget(self.imageQualitySlider, 4, 1, 1, 1) @@ -71,8 +71,8 @@ class Ui_ImageSettingsUi(object): self.buttonBox = QDialogButtonBox(ImageSettingsUi) self.buttonBox.setObjectName(u"buttonBox") - self.buttonBox.setOrientation(Qt.Horizontal) - self.buttonBox.setStandardButtons(QDialogButtonBox.Cancel|QDialogButtonBox.Ok) + self.buttonBox.setOrientation(Qt.Orientation.Horizontal) + self.buttonBox.setStandardButtons(QDialogButtonBox.StandardButton.Cancel|QDialogButtonBox.StandardButton.Ok) self.gridLayout.addWidget(self.buttonBox, 2, 0, 1, 1) diff --git a/examples/multimedia/camera/ui_videosettings.py b/examples/multimedia/camera/ui_videosettings.py index eec626f27..8a443b524 100644 --- a/examples/multimedia/camera/ui_videosettings.py +++ b/examples/multimedia/camera/ui_videosettings.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'videosettings.ui' ## -## Created by: Qt User Interface Compiler version 6.7.0 +## Created by: Qt User Interface Compiler version 6.8.0 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -29,8 +29,8 @@ class Ui_VideoSettingsUi(object): self.gridLayout_3.setObjectName(u"gridLayout_3") self.buttonBox = QDialogButtonBox(VideoSettingsUi) self.buttonBox.setObjectName(u"buttonBox") - self.buttonBox.setOrientation(Qt.Horizontal) - self.buttonBox.setStandardButtons(QDialogButtonBox.Cancel|QDialogButtonBox.Ok) + self.buttonBox.setOrientation(Qt.Orientation.Horizontal) + self.buttonBox.setStandardButtons(QDialogButtonBox.StandardButton.Cancel|QDialogButtonBox.StandardButton.Ok) self.gridLayout_3.addWidget(self.buttonBox, 4, 1, 1, 1) @@ -72,7 +72,7 @@ class Ui_VideoSettingsUi(object): self.fpsSlider = QSlider(self.groupBox_2) self.fpsSlider.setObjectName(u"fpsSlider") - self.fpsSlider.setOrientation(Qt.Horizontal) + self.fpsSlider.setOrientation(Qt.Orientation.Horizontal) self.horizontalLayout.addWidget(self.fpsSlider) @@ -131,7 +131,7 @@ class Ui_VideoSettingsUi(object): self.qualitySlider = QSlider(self.groupBox) self.qualitySlider.setObjectName(u"qualitySlider") self.qualitySlider.setMaximum(4) - self.qualitySlider.setOrientation(Qt.Horizontal) + self.qualitySlider.setOrientation(Qt.Orientation.Horizontal) self.verticalLayout.addWidget(self.qualitySlider) diff --git a/examples/multimedia/camera/ui_videosettings_mobile.py b/examples/multimedia/camera/ui_videosettings_mobile.py index 50fb8e081..ed9b01f71 100644 --- a/examples/multimedia/camera/ui_videosettings_mobile.py +++ b/examples/multimedia/camera/ui_videosettings_mobile.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'videosettings_mobile.ui' ## -## Created by: Qt User Interface Compiler version 6.7.0 +## Created by: Qt User Interface Compiler version 6.8.0 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -24,7 +24,7 @@ class Ui_VideoSettingsUi(object): def setupUi(self, VideoSettingsUi): if not VideoSettingsUi.objectName(): VideoSettingsUi.setObjectName(u"VideoSettingsUi") - VideoSettingsUi.resize(329, 591) + VideoSettingsUi.resize(329, 610) self.gridLayout_3 = QGridLayout(VideoSettingsUi) self.gridLayout_3.setObjectName(u"gridLayout_3") self.widget = QWidget(VideoSettingsUi) @@ -76,7 +76,7 @@ class Ui_VideoSettingsUi(object): self.qualitySlider = QSlider(self.groupBox) self.qualitySlider.setObjectName(u"qualitySlider") self.qualitySlider.setMaximum(4) - self.qualitySlider.setOrientation(Qt.Horizontal) + self.qualitySlider.setOrientation(Qt.Orientation.Horizontal) self.verticalLayout.addWidget(self.qualitySlider) @@ -127,8 +127,8 @@ class Ui_VideoSettingsUi(object): self.buttonBox = QDialogButtonBox(self.groupBox_2) self.buttonBox.setObjectName(u"buttonBox") - self.buttonBox.setOrientation(Qt.Horizontal) - self.buttonBox.setStandardButtons(QDialogButtonBox.Cancel|QDialogButtonBox.Ok) + self.buttonBox.setOrientation(Qt.Orientation.Horizontal) + self.buttonBox.setStandardButtons(QDialogButtonBox.StandardButton.Cancel|QDialogButtonBox.StandardButton.Ok) self.gridLayout_2.addWidget(self.buttonBox, 7, 0, 1, 1) @@ -143,7 +143,7 @@ class Ui_VideoSettingsUi(object): self.fpsSlider = QSlider(self.groupBox_2) self.fpsSlider.setObjectName(u"fpsSlider") - self.fpsSlider.setOrientation(Qt.Horizontal) + self.fpsSlider.setOrientation(Qt.Orientation.Horizontal) self.horizontalLayout.addWidget(self.fpsSlider) diff --git a/examples/multimedia/camera/videosettings.ui b/examples/multimedia/camera/videosettings.ui index 3c1f71f11..ec35e957c 100644 --- a/examples/multimedia/camera/videosettings.ui +++ b/examples/multimedia/camera/videosettings.ui @@ -17,10 +17,10 @@ <item row="4" column="1"> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set> </property> </widget> </item> @@ -65,7 +65,7 @@ <item> <widget class="QSlider" name="fpsSlider"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> </widget> </item> @@ -140,7 +140,7 @@ <number>4</number> </property> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> </widget> </item> @@ -163,7 +163,7 @@ <item row="3" column="0"> <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/multimedia/camera/videosettings_mobile.ui b/examples/multimedia/camera/videosettings_mobile.ui index 6584f07f9..06d20684e 100644 --- a/examples/multimedia/camera/videosettings_mobile.ui +++ b/examples/multimedia/camera/videosettings_mobile.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>329</width> - <height>591</height> + <height>610</height> </rect> </property> <property name="windowTitle"> @@ -80,7 +80,7 @@ <number>4</number> </property> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> </widget> </item> @@ -136,10 +136,10 @@ <item row="7" column="0"> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set> </property> </widget> </item> @@ -158,7 +158,7 @@ <item> <widget class="QSlider" name="fpsSlider"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> </widget> </item> diff --git a/examples/pdfwidgets/pdfviewer/mainwindow.ui b/examples/pdfwidgets/pdfviewer/mainwindow.ui index 7cfcde4b3..3bf46887c 100644 --- a/examples/pdfwidgets/pdfviewer/mainwindow.ui +++ b/examples/pdfwidgets/pdfviewer/mainwindow.ui @@ -54,7 +54,7 @@ <item> <widget class="QSplitter" name="splitter"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <widget class="QTabWidget" name="tabWidget"> <property name="sizePolicy"> @@ -64,7 +64,7 @@ </sizepolicy> </property> <property name="tabPosition"> - <enum>QTabWidget::West</enum> + <enum>QTabWidget::TabPosition::West</enum> </property> <property name="currentIndex"> <number>0</number> @@ -134,7 +134,7 @@ <x>0</x> <y>0</y> <width>700</width> - <height>23</height> + <height>26</height> </rect> </property> <widget class="QMenu" name="menuFile"> diff --git a/examples/pdfwidgets/pdfviewer/ui_mainwindow.py b/examples/pdfwidgets/pdfviewer/ui_mainwindow.py index 9ed525dbf..c31da6ff0 100644 --- a/examples/pdfwidgets/pdfviewer/ui_mainwindow.py +++ b/examples/pdfwidgets/pdfviewer/ui_mainwindow.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'mainwindow.ui' ## -## Created by: Qt User Interface Compiler version 6.7.0 +## Created by: Qt User Interface Compiler version 6.8.0 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -36,7 +36,7 @@ class Ui_MainWindow(object): if QIcon.hasThemeIcon(iconThemeName): icon = QIcon.fromTheme(iconThemeName) else: - icon.addFile(u":/icons/images/document-open.svgz", QSize(), QIcon.Normal, QIcon.Off) + icon.addFile(u":/icons/images/document-open.svgz", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionOpen.setIcon(icon) self.actionQuit = QAction(MainWindow) @@ -56,7 +56,7 @@ class Ui_MainWindow(object): if QIcon.hasThemeIcon(iconThemeName): icon3 = QIcon.fromTheme(iconThemeName) else: - icon3.addFile(u":/icons/images/zoom-in.svgz", QSize(), QIcon.Normal, QIcon.Off) + icon3.addFile(u":/icons/images/zoom-in.svgz", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionZoom_In.setIcon(icon3) self.actionZoom_Out = QAction(MainWindow) @@ -66,7 +66,7 @@ class Ui_MainWindow(object): if QIcon.hasThemeIcon(iconThemeName): icon4 = QIcon.fromTheme(iconThemeName) else: - icon4.addFile(u":/icons/images/zoom-out.svgz", QSize(), QIcon.Normal, QIcon.Off) + icon4.addFile(u":/icons/images/zoom-out.svgz", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionZoom_Out.setIcon(icon4) self.actionPrevious_Page = QAction(MainWindow) @@ -76,7 +76,7 @@ class Ui_MainWindow(object): if QIcon.hasThemeIcon(iconThemeName): icon5 = QIcon.fromTheme(iconThemeName) else: - icon5.addFile(u":/icons/images/go-previous-view-page.svgz", QSize(), QIcon.Normal, QIcon.Off) + icon5.addFile(u":/icons/images/go-previous-view-page.svgz", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionPrevious_Page.setIcon(icon5) self.actionNext_Page = QAction(MainWindow) @@ -86,7 +86,7 @@ class Ui_MainWindow(object): if QIcon.hasThemeIcon(iconThemeName): icon6 = QIcon.fromTheme(iconThemeName) else: - icon6.addFile(u":/icons/images/go-next-view-page.svgz", QSize(), QIcon.Normal, QIcon.Off) + icon6.addFile(u":/icons/images/go-next-view-page.svgz", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionNext_Page.setIcon(icon6) self.actionContinuous = QAction(MainWindow) @@ -96,13 +96,13 @@ class Ui_MainWindow(object): self.actionBack.setObjectName(u"actionBack") self.actionBack.setEnabled(False) icon7 = QIcon() - icon7.addFile(u":/icons/images/go-previous-view.svgz", QSize(), QIcon.Normal, QIcon.Off) + icon7.addFile(u":/icons/images/go-previous-view.svgz", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionBack.setIcon(icon7) self.actionForward = QAction(MainWindow) self.actionForward.setObjectName(u"actionForward") self.actionForward.setEnabled(False) icon8 = QIcon() - icon8.addFile(u":/icons/images/go-next-view.svgz", QSize(), QIcon.Normal, QIcon.Off) + icon8.addFile(u":/icons/images/go-next-view.svgz", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionForward.setIcon(icon8) self.centralWidget = QWidget(MainWindow) self.centralWidget.setObjectName(u"centralWidget") @@ -120,7 +120,7 @@ class Ui_MainWindow(object): self.verticalLayout_2.setContentsMargins(0, 0, 0, 0) self.splitter = QSplitter(self.widget) self.splitter.setObjectName(u"splitter") - self.splitter.setOrientation(Qt.Horizontal) + self.splitter.setOrientation(Qt.Orientation.Horizontal) self.tabWidget = QTabWidget(self.splitter) self.tabWidget.setObjectName(u"tabWidget") sizePolicy = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Expanding) @@ -128,7 +128,7 @@ class Ui_MainWindow(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.tabWidget.sizePolicy().hasHeightForWidth()) self.tabWidget.setSizePolicy(sizePolicy) - self.tabWidget.setTabPosition(QTabWidget.West) + self.tabWidget.setTabPosition(QTabWidget.TabPosition.West) self.tabWidget.setDocumentMode(False) self.bookmarkTab = QWidget() self.bookmarkTab.setObjectName(u"bookmarkTab") @@ -167,7 +167,7 @@ class Ui_MainWindow(object): MainWindow.setCentralWidget(self.centralWidget) self.menuBar = QMenuBar(MainWindow) self.menuBar.setObjectName(u"menuBar") - self.menuBar.setGeometry(QRect(0, 0, 700, 23)) + self.menuBar.setGeometry(QRect(0, 0, 700, 26)) self.menuFile = QMenu(self.menuBar) self.menuFile.setObjectName(u"menuFile") self.menuHelp = QMenu(self.menuBar) diff --git a/examples/serialbus/can/canbusdeviceinfobox.ui b/examples/serialbus/can/canbusdeviceinfobox.ui index d4dd84fb2..39e2dd88e 100644 --- a/examples/serialbus/can/canbusdeviceinfobox.ui +++ b/examples/serialbus/can/canbusdeviceinfobox.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>319</width> - <height>217</height> + <height>257</height> </rect> </property> <property name="windowTitle"> diff --git a/examples/serialbus/can/canbusdeviceinfodialog.ui b/examples/serialbus/can/canbusdeviceinfodialog.ui index 6328a06d1..fc3f63534 100644 --- a/examples/serialbus/can/canbusdeviceinfodialog.ui +++ b/examples/serialbus/can/canbusdeviceinfodialog.ui @@ -29,7 +29,7 @@ <item> <spacer name="horizontalSpacer"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> diff --git a/examples/serialbus/can/connectdialog.ui b/examples/serialbus/can/connectdialog.ui index 97e6e0050..beda14b3d 100644 --- a/examples/serialbus/can/connectdialog.ui +++ b/examples/serialbus/can/connectdialog.ui @@ -66,7 +66,7 @@ <number>10</number> </property> <property name="stepType"> - <enum>QAbstractSpinBox::AdaptiveDecimalStepType</enum> + <enum>QAbstractSpinBox::StepType::AdaptiveDecimalStepType</enum> </property> <property name="value"> <number>1000</number> @@ -116,7 +116,7 @@ <item row="0" column="1"> <widget class="QLineEdit" name="rawFilterEdit"> <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set> </property> </widget> </item> @@ -130,7 +130,7 @@ <item row="1" column="1"> <widget class="QLineEdit" name="errorFilterEdit"> <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set> </property> <property name="placeholderText"> <string>FrameError bits</string> @@ -195,7 +195,7 @@ <item> <spacer name="horizontalSpacer"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> diff --git a/examples/serialbus/can/mainwindow.ui b/examples/serialbus/can/mainwindow.ui index 61c7760e0..8c7ef841f 100644 --- a/examples/serialbus/can/mainwindow.ui +++ b/examples/serialbus/can/mainwindow.ui @@ -33,7 +33,7 @@ <item> <widget class="ReceivedFramesView" name="receivedFramesView"> <property name="editTriggers"> - <set>QAbstractItemView::NoEditTriggers</set> + <set>QAbstractItemView::EditTrigger::NoEditTriggers</set> </property> <property name="showDropIndicator" stdset="0"> <bool>false</bool> @@ -42,7 +42,7 @@ <bool>false</bool> </property> <property name="selectionBehavior"> - <enum>QAbstractItemView::SelectRows</enum> + <enum>QAbstractItemView::SelectionBehavior::SelectRows</enum> </property> </widget> </item> @@ -58,7 +58,7 @@ <item> <spacer name="horizontalSpacer"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -83,7 +83,7 @@ <x>0</x> <y>0</y> <width>634</width> - <height>22</height> + <height>26</height> </rect> </property> <widget class="QMenu" name="menuCalls"> diff --git a/examples/serialbus/can/sendframebox.ui b/examples/serialbus/can/sendframebox.ui index d913e334c..110c7e735 100644 --- a/examples/serialbus/can/sendframebox.ui +++ b/examples/serialbus/can/sendframebox.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>485</width> - <height>206</height> + <width>505</width> + <height>219</height> </rect> </property> <property name="windowTitle"> @@ -18,7 +18,7 @@ </property> <layout class="QVBoxLayout" name="verticalLayout_4"> <property name="sizeConstraint"> - <enum>QLayout::SetMinimumSize</enum> + <enum>QLayout::SizeConstraint::SetMinimumSize</enum> </property> <item> <widget class="QGroupBox" name="frameTypeBox"> @@ -122,7 +122,7 @@ <item> <layout class="QHBoxLayout" name="horizontalLayout_3"> <property name="sizeConstraint"> - <enum>QLayout::SetMinimumSize</enum> + <enum>QLayout::SizeConstraint::SetMinimumSize</enum> </property> <item> <layout class="QVBoxLayout" name="verticalLayout"> diff --git a/examples/serialbus/can/ui_canbusdeviceinfobox.py b/examples/serialbus/can/ui_canbusdeviceinfobox.py index d2f0e74a5..c4d4fc561 100644 --- a/examples/serialbus/can/ui_canbusdeviceinfobox.py +++ b/examples/serialbus/can/ui_canbusdeviceinfobox.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'canbusdeviceinfobox.ui' ## -## Created by: Qt User Interface Compiler version 6.7.0 +## Created by: Qt User Interface Compiler version 6.8.0 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -22,7 +22,7 @@ class Ui_CanBusDeviceInfoBox(object): def setupUi(self, CanBusDeviceInfoBox): if not CanBusDeviceInfoBox.objectName(): CanBusDeviceInfoBox.setObjectName(u"CanBusDeviceInfoBox") - CanBusDeviceInfoBox.resize(319, 217) + CanBusDeviceInfoBox.resize(319, 257) self.verticalLayout = QVBoxLayout(CanBusDeviceInfoBox) self.verticalLayout.setObjectName(u"verticalLayout") self.pluginLabel = QLabel(CanBusDeviceInfoBox) diff --git a/examples/serialbus/can/ui_canbusdeviceinfodialog.py b/examples/serialbus/can/ui_canbusdeviceinfodialog.py index c32e9ca2d..808e8ae95 100644 --- a/examples/serialbus/can/ui_canbusdeviceinfodialog.py +++ b/examples/serialbus/can/ui_canbusdeviceinfodialog.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'canbusdeviceinfodialog.ui' ## -## Created by: Qt User Interface Compiler version 6.7.0 +## Created by: Qt User Interface Compiler version 6.8.0 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ diff --git a/examples/serialbus/can/ui_connectdialog.py b/examples/serialbus/can/ui_connectdialog.py index f01adc4eb..d69f28765 100644 --- a/examples/serialbus/can/ui_connectdialog.py +++ b/examples/serialbus/can/ui_connectdialog.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'connectdialog.ui' ## -## Created by: Qt User Interface Compiler version 6.7.0 +## Created by: Qt User Interface Compiler version 6.8.0 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -63,7 +63,7 @@ class Ui_ConnectDialog(object): self.ringBufferLimitBox.setMinimum(10) self.ringBufferLimitBox.setMaximum(10000000) self.ringBufferLimitBox.setSingleStep(10) - self.ringBufferLimitBox.setStepType(QAbstractSpinBox.AdaptiveDecimalStepType) + self.ringBufferLimitBox.setStepType(QAbstractSpinBox.StepType.AdaptiveDecimalStepType) self.ringBufferLimitBox.setValue(1000) self.horizontalLayout_2.addWidget(self.ringBufferLimitBox) @@ -99,7 +99,7 @@ class Ui_ConnectDialog(object): self.rawFilterEdit = QLineEdit(self.configurationBox) self.rawFilterEdit.setObjectName(u"rawFilterEdit") - self.rawFilterEdit.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) + self.rawFilterEdit.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter) self.gridLayout_4.addWidget(self.rawFilterEdit, 0, 1, 1, 1) @@ -110,7 +110,7 @@ class Ui_ConnectDialog(object): self.errorFilterEdit = QLineEdit(self.configurationBox) self.errorFilterEdit.setObjectName(u"errorFilterEdit") - self.errorFilterEdit.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) + self.errorFilterEdit.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter) self.gridLayout_4.addWidget(self.errorFilterEdit, 1, 1, 1, 1) diff --git a/examples/serialbus/can/ui_mainwindow.py b/examples/serialbus/can/ui_mainwindow.py index 4ba4dd309..e08c093a9 100644 --- a/examples/serialbus/can/ui_mainwindow.py +++ b/examples/serialbus/can/ui_mainwindow.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'mainwindow.ui' ## -## Created by: Qt User Interface Compiler version 6.7.0 +## Created by: Qt User Interface Compiler version 6.8.0 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -33,24 +33,24 @@ class Ui_MainWindow(object): self.actionConnect = QAction(MainWindow) self.actionConnect.setObjectName(u"actionConnect") icon = QIcon() - icon.addFile(u":/images/connect.png", QSize(), QIcon.Normal, QIcon.Off) + icon.addFile(u":/images/connect.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionConnect.setIcon(icon) self.actionDisconnect = QAction(MainWindow) self.actionDisconnect.setObjectName(u"actionDisconnect") icon1 = QIcon() - icon1.addFile(u":/images/disconnect.png", QSize(), QIcon.Normal, QIcon.Off) + icon1.addFile(u":/images/disconnect.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionDisconnect.setIcon(icon1) self.actionQuit = QAction(MainWindow) self.actionQuit.setObjectName(u"actionQuit") icon2 = QIcon() - icon2.addFile(u":/images/application-exit.png", QSize(), QIcon.Normal, QIcon.Off) + icon2.addFile(u":/images/application-exit.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionQuit.setIcon(icon2) self.actionAboutQt = QAction(MainWindow) self.actionAboutQt.setObjectName(u"actionAboutQt") self.actionClearLog = QAction(MainWindow) self.actionClearLog.setObjectName(u"actionClearLog") icon3 = QIcon() - icon3.addFile(u":/images/clear.png", QSize(), QIcon.Normal, QIcon.Off) + icon3.addFile(u":/images/clear.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionClearLog.setIcon(icon3) self.actionPluginDocumentation = QAction(MainWindow) self.actionPluginDocumentation.setObjectName(u"actionPluginDocumentation") @@ -80,10 +80,10 @@ class Ui_MainWindow(object): self.verticalLayout_2.setObjectName(u"verticalLayout_2") self.receivedFramesView = ReceivedFramesView(self.receivedMessagesBox) self.receivedFramesView.setObjectName(u"receivedFramesView") - self.receivedFramesView.setEditTriggers(QAbstractItemView.NoEditTriggers) - self.receivedFramesView.setProperty("showDropIndicator", False) + self.receivedFramesView.setEditTriggers(QAbstractItemView.EditTrigger.NoEditTriggers) + self.receivedFramesView.setProperty(u"showDropIndicator", False) self.receivedFramesView.setDragDropOverwriteMode(False) - self.receivedFramesView.setSelectionBehavior(QAbstractItemView.SelectRows) + self.receivedFramesView.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows) self.verticalLayout_2.addWidget(self.receivedFramesView) @@ -111,7 +111,7 @@ class Ui_MainWindow(object): MainWindow.setCentralWidget(self.centralWidget) self.menuBar = QMenuBar(MainWindow) self.menuBar.setObjectName(u"menuBar") - self.menuBar.setGeometry(QRect(0, 0, 634, 22)) + self.menuBar.setGeometry(QRect(0, 0, 634, 26)) self.menuCalls = QMenu(self.menuBar) self.menuCalls.setObjectName(u"menuCalls") self.menuHelp = QMenu(self.menuBar) diff --git a/examples/serialbus/can/ui_sendframebox.py b/examples/serialbus/can/ui_sendframebox.py index 79f013c89..204defec7 100644 --- a/examples/serialbus/can/ui_sendframebox.py +++ b/examples/serialbus/can/ui_sendframebox.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'sendframebox.ui' ## -## Created by: Qt User Interface Compiler version 6.7.0 +## Created by: Qt User Interface Compiler version 6.8.0 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -23,10 +23,10 @@ class Ui_SendFrameBox(object): def setupUi(self, SendFrameBox): if not SendFrameBox.objectName(): SendFrameBox.setObjectName(u"SendFrameBox") - SendFrameBox.resize(485, 206) + SendFrameBox.resize(505, 219) self.verticalLayout_4 = QVBoxLayout(SendFrameBox) self.verticalLayout_4.setObjectName(u"verticalLayout_4") - self.verticalLayout_4.setSizeConstraint(QLayout.SetMinimumSize) + self.verticalLayout_4.setSizeConstraint(QLayout.SizeConstraint.SetMinimumSize) self.frameTypeBox = QGroupBox(SendFrameBox) self.frameTypeBox.setObjectName(u"frameTypeBox") self.frameTypeBox.setCheckable(False) @@ -78,7 +78,7 @@ class Ui_SendFrameBox(object): self.horizontalLayout_3 = QHBoxLayout() self.horizontalLayout_3.setObjectName(u"horizontalLayout_3") - self.horizontalLayout_3.setSizeConstraint(QLayout.SetMinimumSize) + self.horizontalLayout_3.setSizeConstraint(QLayout.SizeConstraint.SetMinimumSize) self.verticalLayout = QVBoxLayout() self.verticalLayout.setObjectName(u"verticalLayout") self.frameIdLabel = QLabel(SendFrameBox) diff --git a/examples/serialbus/modbus/modbusclient/mainwindow.ui b/examples/serialbus/modbus/modbusclient/mainwindow.ui index 1de381978..0681b99e0 100644 --- a/examples/serialbus/modbus/modbusclient/mainwindow.ui +++ b/examples/serialbus/modbus/modbusclient/mainwindow.ui @@ -6,7 +6,7 @@ <rect> <x>0</x> <y>0</y> - <width>516</width> + <width>601</width> <height>378</height> </rect> </property> @@ -61,7 +61,7 @@ <item row="0" column="4"> <spacer name="horizontalSpacer"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -387,7 +387,7 @@ <item> <spacer name="horizontalSpacer_2"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -437,8 +437,8 @@ <rect> <x>0</x> <y>0</y> - <width>516</width> - <height>21</height> + <width>601</width> + <height>26</height> </rect> </property> <widget class="QMenu" name="menuDevice"> diff --git a/examples/serialbus/modbus/modbusclient/settingsdialog.ui b/examples/serialbus/modbus/modbusclient/settingsdialog.ui index fb594f4d4..68122a1e8 100644 --- a/examples/serialbus/modbus/modbusclient/settingsdialog.ui +++ b/examples/serialbus/modbus/modbusclient/settingsdialog.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>239</width> - <height>256</height> + <width>259</width> + <height>321</height> </rect> </property> <property name="windowTitle"> @@ -17,7 +17,7 @@ <item row="3" column="1"> <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/serialbus/modbus/modbusclient/ui_mainwindow.py b/examples/serialbus/modbus/modbusclient/ui_mainwindow.py index 1535fc8d8..a23e5fc68 100644 --- a/examples/serialbus/modbus/modbusclient/ui_mainwindow.py +++ b/examples/serialbus/modbus/modbusclient/ui_mainwindow.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'mainwindow.ui' ## -## Created by: Qt User Interface Compiler version 6.7.0 +## Created by: Qt User Interface Compiler version 6.8.0 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -28,27 +28,27 @@ class Ui_MainWindow(object): def setupUi(self, MainWindow): if not MainWindow.objectName(): MainWindow.setObjectName(u"MainWindow") - MainWindow.resize(516, 378) + MainWindow.resize(601, 378) MainWindow.setMaximumSize(QSize(16777215, 1000)) self.actionConnect = QAction(MainWindow) self.actionConnect.setObjectName(u"actionConnect") icon = QIcon() - icon.addFile(u":/images/connect.png", QSize(), QIcon.Normal, QIcon.Off) + icon.addFile(u":/images/connect.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionConnect.setIcon(icon) self.actionDisconnect = QAction(MainWindow) self.actionDisconnect.setObjectName(u"actionDisconnect") icon1 = QIcon() - icon1.addFile(u":/images/disconnect.png", QSize(), QIcon.Normal, QIcon.Off) + icon1.addFile(u":/images/disconnect.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionDisconnect.setIcon(icon1) self.actionExit = QAction(MainWindow) self.actionExit.setObjectName(u"actionExit") icon2 = QIcon() - icon2.addFile(u":/images/application-exit.png", QSize(), QIcon.Normal, QIcon.Off) + icon2.addFile(u":/images/application-exit.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionExit.setIcon(icon2) self.actionOptions = QAction(MainWindow) self.actionOptions.setObjectName(u"actionOptions") icon3 = QIcon() - icon3.addFile(u":/images/settings.png", QSize(), QIcon.Normal, QIcon.Off) + icon3.addFile(u":/images/settings.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionOptions.setIcon(icon3) self.centralWidget = QWidget(MainWindow) self.centralWidget.setObjectName(u"centralWidget") @@ -195,7 +195,7 @@ class Ui_MainWindow(object): self.writeValueTable = QTreeView(self.writeGroupBox) self.writeValueTable.setObjectName(u"writeValueTable") - self.writeValueTable.setProperty("showDropIndicator", True) + self.writeValueTable.setProperty(u"showDropIndicator", True) self.writeValueTable.setAlternatingRowColors(True) self.writeValueTable.setRootIsDecorated(False) self.writeValueTable.setUniformRowHeights(True) @@ -286,7 +286,7 @@ class Ui_MainWindow(object): MainWindow.setStatusBar(self.statusBar) self.menuBar = QMenuBar(MainWindow) self.menuBar.setObjectName(u"menuBar") - self.menuBar.setGeometry(QRect(0, 0, 516, 21)) + self.menuBar.setGeometry(QRect(0, 0, 601, 26)) self.menuDevice = QMenu(self.menuBar) self.menuDevice.setObjectName(u"menuDevice") self.menuToo_ls = QMenu(self.menuBar) diff --git a/examples/serialbus/modbus/modbusclient/ui_settingsdialog.py b/examples/serialbus/modbus/modbusclient/ui_settingsdialog.py index af3a0665c..0dfda7a01 100644 --- a/examples/serialbus/modbus/modbusclient/ui_settingsdialog.py +++ b/examples/serialbus/modbus/modbusclient/ui_settingsdialog.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'settingsdialog.ui' ## -## Created by: Qt User Interface Compiler version 6.7.0 +## Created by: Qt User Interface Compiler version 6.8.0 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -23,7 +23,7 @@ class Ui_SettingsDialog(object): def setupUi(self, SettingsDialog): if not SettingsDialog.objectName(): SettingsDialog.setObjectName(u"SettingsDialog") - SettingsDialog.resize(239, 256) + SettingsDialog.resize(259, 321) self.gridLayout = QGridLayout(SettingsDialog) self.gridLayout.setObjectName(u"gridLayout") self.verticalSpacer = QSpacerItem(20, 43, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding) diff --git a/examples/serialport/terminal/mainwindow.ui b/examples/serialport/terminal/mainwindow.ui index 452fdd537..858736e31 100644 --- a/examples/serialport/terminal/mainwindow.ui +++ b/examples/serialport/terminal/mainwindow.ui @@ -22,7 +22,7 @@ <x>0</x> <y>0</y> <width>400</width> - <height>19</height> + <height>26</height> </rect> </property> <widget class="QMenu" name="menuCalls"> diff --git a/examples/serialport/terminal/settingsdialog.ui b/examples/serialport/terminal/settingsdialog.ui index 8f15b1a52..eedd4ccc9 100644 --- a/examples/serialport/terminal/settingsdialog.ui +++ b/examples/serialport/terminal/settingsdialog.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>281</width> - <height>262</height> + <width>392</width> + <height>386</height> </rect> </property> <property name="windowTitle"> @@ -132,7 +132,7 @@ <item> <spacer name="horizontalSpacer"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> diff --git a/examples/serialport/terminal/ui_mainwindow.py b/examples/serialport/terminal/ui_mainwindow.py index 21adbd5c1..e9f7cd97f 100644 --- a/examples/serialport/terminal/ui_mainwindow.py +++ b/examples/serialport/terminal/ui_mainwindow.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'mainwindow.ui' ## -## Created by: Qt User Interface Compiler version 6.7.0 +## Created by: Qt User Interface Compiler version 6.8.0 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -33,27 +33,27 @@ class Ui_MainWindow(object): self.actionConnect = QAction(MainWindow) self.actionConnect.setObjectName(u"actionConnect") icon = QIcon() - icon.addFile(u":/images/connect.png", QSize(), QIcon.Normal, QIcon.Off) + icon.addFile(u":/images/connect.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionConnect.setIcon(icon) self.actionDisconnect = QAction(MainWindow) self.actionDisconnect.setObjectName(u"actionDisconnect") icon1 = QIcon() - icon1.addFile(u":/images/disconnect.png", QSize(), QIcon.Normal, QIcon.Off) + icon1.addFile(u":/images/disconnect.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionDisconnect.setIcon(icon1) self.actionConfigure = QAction(MainWindow) self.actionConfigure.setObjectName(u"actionConfigure") icon2 = QIcon() - icon2.addFile(u":/images/settings.png", QSize(), QIcon.Normal, QIcon.Off) + icon2.addFile(u":/images/settings.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionConfigure.setIcon(icon2) self.actionClear = QAction(MainWindow) self.actionClear.setObjectName(u"actionClear") icon3 = QIcon() - icon3.addFile(u":/images/clear.png", QSize(), QIcon.Normal, QIcon.Off) + icon3.addFile(u":/images/clear.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionClear.setIcon(icon3) self.actionQuit = QAction(MainWindow) self.actionQuit.setObjectName(u"actionQuit") icon4 = QIcon() - icon4.addFile(u":/images/application-exit.png", QSize(), QIcon.Normal, QIcon.Off) + icon4.addFile(u":/images/application-exit.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionQuit.setIcon(icon4) self.centralWidget = QWidget(MainWindow) self.centralWidget.setObjectName(u"centralWidget") @@ -64,7 +64,7 @@ class Ui_MainWindow(object): MainWindow.setCentralWidget(self.centralWidget) self.menuBar = QMenuBar(MainWindow) self.menuBar.setObjectName(u"menuBar") - self.menuBar.setGeometry(QRect(0, 0, 400, 19)) + self.menuBar.setGeometry(QRect(0, 0, 400, 26)) self.menuCalls = QMenu(self.menuBar) self.menuCalls.setObjectName(u"menuCalls") self.menuTools = QMenu(self.menuBar) diff --git a/examples/serialport/terminal/ui_settingsdialog.py b/examples/serialport/terminal/ui_settingsdialog.py index 6c5a417cc..4429322bd 100644 --- a/examples/serialport/terminal/ui_settingsdialog.py +++ b/examples/serialport/terminal/ui_settingsdialog.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'settingsdialog.ui' ## -## Created by: Qt User Interface Compiler version 6.7.0 +## Created by: Qt User Interface Compiler version 6.8.0 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -24,7 +24,7 @@ class Ui_SettingsDialog(object): def setupUi(self, SettingsDialog): if not SettingsDialog.objectName(): SettingsDialog.setObjectName(u"SettingsDialog") - SettingsDialog.resize(281, 262) + SettingsDialog.resize(392, 386) self.gridLayout_3 = QGridLayout(SettingsDialog) self.gridLayout_3.setObjectName(u"gridLayout_3") self.parametersBox = QGroupBox(SettingsDialog) diff --git a/examples/speech/hello_speak/mainwindow.ui b/examples/speech/hello_speak/mainwindow.ui index 6f3accf6c..6c328bcc3 100644 --- a/examples/speech/hello_speak/mainwindow.ui +++ b/examples/speech/hello_speak/mainwindow.ui @@ -46,7 +46,7 @@ Done, over and out.</string> <string>Engine</string> </property> <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set> </property> </widget> </item> @@ -62,7 +62,7 @@ Done, over and out.</string> <string>Pitch:</string> </property> <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set> </property> </widget> </item> @@ -78,7 +78,7 @@ Done, over and out.</string> <string>&Language:</string> </property> <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set> </property> <property name="buddy"> <cstring>language</cstring> @@ -97,7 +97,7 @@ Done, over and out.</string> <number>1</number> </property> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> </widget> </item> @@ -107,7 +107,7 @@ Done, over and out.</string> <string>Voice name:</string> </property> <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set> </property> </widget> </item> @@ -126,7 +126,7 @@ Done, over and out.</string> <number>70</number> </property> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> </widget> </item> @@ -155,7 +155,7 @@ Done, over and out.</string> <string>Rate:</string> </property> <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set> </property> </widget> </item> @@ -171,7 +171,7 @@ Done, over and out.</string> <string>Volume:</string> </property> <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set> </property> </widget> </item> @@ -184,7 +184,7 @@ Done, over and out.</string> <number>10</number> </property> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> </widget> </item> @@ -241,7 +241,7 @@ Done, over and out.</string> <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/speech/hello_speak/ui_mainwindow.py b/examples/speech/hello_speak/ui_mainwindow.py index ab132e7fb..c7c4cb62d 100644 --- a/examples/speech/hello_speak/ui_mainwindow.py +++ b/examples/speech/hello_speak/ui_mainwindow.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'mainwindow.ui' ## -## Created by: Qt User Interface Compiler version 6.7.0 +## Created by: Qt User Interface Compiler version 6.8.0 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -48,7 +48,7 @@ class Ui_MainWindow(object): sizePolicy1.setVerticalStretch(0) sizePolicy1.setHeightForWidth(self.label_5.sizePolicy().hasHeightForWidth()) self.label_5.setSizePolicy(sizePolicy1) - self.label_5.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) + self.label_5.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter) self.gridLayout.addWidget(self.label_5, 4, 0, 1, 1) @@ -56,7 +56,7 @@ class Ui_MainWindow(object): self.label_3.setObjectName(u"label_3") sizePolicy1.setHeightForWidth(self.label_3.sizePolicy().hasHeightForWidth()) self.label_3.setSizePolicy(sizePolicy1) - self.label_3.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) + self.label_3.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter) self.gridLayout.addWidget(self.label_3, 3, 0, 1, 1) @@ -64,7 +64,7 @@ class Ui_MainWindow(object): self.label_4.setObjectName(u"label_4") sizePolicy1.setHeightForWidth(self.label_4.sizePolicy().hasHeightForWidth()) self.label_4.setSizePolicy(sizePolicy1) - self.label_4.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) + self.label_4.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter) self.gridLayout.addWidget(self.label_4, 5, 0, 1, 1) @@ -73,13 +73,13 @@ class Ui_MainWindow(object): self.pitch.setMinimum(-10) self.pitch.setMaximum(10) self.pitch.setSingleStep(1) - self.pitch.setOrientation(Qt.Horizontal) + self.pitch.setOrientation(Qt.Orientation.Horizontal) self.gridLayout.addWidget(self.pitch, 3, 2, 1, 1) self.label_6 = QLabel(self.centralwidget) self.label_6.setObjectName(u"label_6") - self.label_6.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) + self.label_6.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter) self.gridLayout.addWidget(self.label_6, 6, 0, 1, 1) @@ -89,7 +89,7 @@ class Ui_MainWindow(object): self.volume.setSingleStep(5) self.volume.setPageStep(20) self.volume.setValue(70) - self.volume.setOrientation(Qt.Horizontal) + self.volume.setOrientation(Qt.Orientation.Horizontal) self.gridLayout.addWidget(self.volume, 1, 2, 1, 1) @@ -112,7 +112,7 @@ class Ui_MainWindow(object): self.label.setObjectName(u"label") sizePolicy1.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth()) self.label.setSizePolicy(sizePolicy1) - self.label.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) + self.label.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter) self.gridLayout.addWidget(self.label, 2, 0, 1, 1) @@ -120,7 +120,7 @@ class Ui_MainWindow(object): self.label_2.setObjectName(u"label_2") sizePolicy1.setHeightForWidth(self.label_2.sizePolicy().hasHeightForWidth()) self.label_2.setSizePolicy(sizePolicy1) - self.label_2.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) + self.label_2.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter) self.gridLayout.addWidget(self.label_2, 1, 0, 1, 1) @@ -128,7 +128,7 @@ class Ui_MainWindow(object): self.rate.setObjectName(u"rate") self.rate.setMinimum(-10) self.rate.setMaximum(10) - self.rate.setOrientation(Qt.Horizontal) + self.rate.setOrientation(Qt.Orientation.Horizontal) self.gridLayout.addWidget(self.rate, 2, 2, 1, 1) diff --git a/examples/sql/books/bookwindow.ui b/examples/sql/books/bookwindow.ui index ce8f9f933..ecd458ab4 100644 --- a/examples/sql/books/bookwindow.ui +++ b/examples/sql/books/bookwindow.ui @@ -54,7 +54,7 @@ <item> <widget class="QTableView" name="bookTable"> <property name="selectionBehavior"> - <enum>QAbstractItemView::SelectRows</enum> + <enum>QAbstractItemView::SelectionBehavior::SelectRows</enum> </property> </widget> </item> diff --git a/examples/sql/books/ui_bookwindow.py b/examples/sql/books/ui_bookwindow.py index 52795217e..2244dd7d6 100644 --- a/examples/sql/books/ui_bookwindow.py +++ b/examples/sql/books/ui_bookwindow.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'bookwindow.ui' ## -## Created by: Qt User Interface Compiler version 6.7.0 +## Created by: Qt User Interface Compiler version 6.8.0 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -39,7 +39,7 @@ class Ui_BookWindow(object): self.vboxLayout1.setContentsMargins(9, 9, 9, 9) self.bookTable = QTableView(self.groupBox) self.bookTable.setObjectName(u"bookTable") - self.bookTable.setSelectionBehavior(QAbstractItemView.SelectRows) + self.bookTable.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows) self.vboxLayout1.addWidget(self.bookTable) diff --git a/examples/webchannel/standalone/ui_dialog.py b/examples/webchannel/standalone/ui_dialog.py index 36c2fe400..4543c4c83 100644 --- a/examples/webchannel/standalone/ui_dialog.py +++ b/examples/webchannel/standalone/ui_dialog.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'dialog.ui' ## -## Created by: Qt User Interface Compiler version 6.7.0 +## Created by: Qt User Interface Compiler version 6.8.0 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ diff --git a/examples/webenginewidgets/markdowneditor/mainwindow.ui b/examples/webenginewidgets/markdowneditor/mainwindow.ui index f4e29ad95..846f2d70a 100644 --- a/examples/webenginewidgets/markdowneditor/mainwindow.ui +++ b/examples/webenginewidgets/markdowneditor/mainwindow.ui @@ -18,7 +18,7 @@ <item> <widget class="QSplitter" name="splitter"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <widget class="QPlainTextEdit" name="editor"/> <widget class="QWebEngineView" name="preview" native="true"/> @@ -102,6 +102,13 @@ </property> </action> </widget> + <customwidgets> + <customwidget> + <class>QWebEngineView</class> + <extends>QWidget</extends> + <header>qwebengineview.h</header> + </customwidget> + </customwidgets> <resources/> <connections/> </ui> diff --git a/examples/webenginewidgets/markdowneditor/ui_mainwindow.py b/examples/webenginewidgets/markdowneditor/ui_mainwindow.py index 0be769119..d538824f5 100644 --- a/examples/webenginewidgets/markdowneditor/ui_mainwindow.py +++ b/examples/webenginewidgets/markdowneditor/ui_mainwindow.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'mainwindow.ui' ## -## Created by: Qt User Interface Compiler version 6.7.0 +## Created by: Qt User Interface Compiler version 6.8.0 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -42,7 +42,7 @@ class Ui_MainWindow(object): self.horizontalLayout.setObjectName(u"horizontalLayout") self.splitter = QSplitter(self.centralwidget) self.splitter.setObjectName(u"splitter") - self.splitter.setOrientation(Qt.Horizontal) + self.splitter.setOrientation(Qt.Orientation.Horizontal) self.editor = QPlainTextEdit(self.splitter) self.editor.setObjectName(u"editor") self.splitter.addWidget(self.editor) diff --git a/examples/webenginewidgets/simplebrowser/certificateerrordialog.ui b/examples/webenginewidgets/simplebrowser/certificateerrordialog.ui index a97f25b6e..7e8c36075 100644 --- a/examples/webenginewidgets/simplebrowser/certificateerrordialog.ui +++ b/examples/webenginewidgets/simplebrowser/certificateerrordialog.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>370</width> - <height>141</height> + <width>689</width> + <height>204</height> </rect> </property> <property name="windowTitle"> @@ -26,7 +26,7 @@ <string>Icon</string> </property> <property name="alignment"> - <set>Qt::AlignCenter</set> + <set>Qt::AlignmentFlag::AlignCenter</set> </property> </widget> </item> @@ -42,7 +42,7 @@ <string>Error</string> </property> <property name="alignment"> - <set>Qt::AlignCenter</set> + <set>Qt::AlignmentFlag::AlignCenter</set> </property> <property name="wordWrap"> <bool>true</bool> @@ -63,7 +63,7 @@ Do you wish to override the security check and continue ? </string> </property> <property name="alignment"> - <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> + <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set> </property> <property name="wordWrap"> <bool>true</bool> @@ -73,7 +73,7 @@ Do you wish to override the security check and continue ? </string> <item> <spacer name="verticalSpacer"> <property name="orientation"> - <enum>Qt::Vertical</enum> + <enum>Qt::Orientation::Vertical</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -86,10 +86,10 @@ Do you wish to override the security check and continue ? </string> <item> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="standardButtons"> - <set>QDialogButtonBox::No|QDialogButtonBox::Yes</set> + <set>QDialogButtonBox::StandardButton::No|QDialogButtonBox::StandardButton::Yes</set> </property> </widget> </item> diff --git a/examples/webenginewidgets/simplebrowser/downloadmanagerwidget.ui b/examples/webenginewidgets/simplebrowser/downloadmanagerwidget.ui index b7544ac16..aa3b7da21 100644 --- a/examples/webenginewidgets/simplebrowser/downloadmanagerwidget.ui +++ b/examples/webenginewidgets/simplebrowser/downloadmanagerwidget.ui @@ -20,7 +20,7 @@ </property> <layout class="QVBoxLayout" name="m_topLevelLayout"> <property name="sizeConstraint"> - <enum>QLayout::SetNoConstraint</enum> + <enum>QLayout::SizeConstraint::SetNoConstraint</enum> </property> <property name="leftMargin"> <number>0</number> @@ -43,18 +43,26 @@ }</string> </property> <property name="verticalScrollBarPolicy"> - <enum>Qt::ScrollBarAlwaysOn</enum> + <enum>Qt::ScrollBarPolicy::ScrollBarAlwaysOn</enum> </property> <property name="horizontalScrollBarPolicy"> - <enum>Qt::ScrollBarAlwaysOff</enum> + <enum>Qt::ScrollBarPolicy::ScrollBarAlwaysOff</enum> </property> <property name="widgetResizable"> <bool>true</bool> </property> <property name="alignment"> - <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> + <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set> </property> <widget class="QWidget" name="m_items"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>382</width> + <height>208</height> + </rect> + </property> <property name="styleSheet"> <string notr="true">#m_items {background: palette(mid)}</string> </property> @@ -89,7 +97,7 @@ <string>No downloads</string> </property> <property name="alignment"> - <set>Qt::AlignCenter</set> + <set>Qt::AlignmentFlag::AlignCenter</set> </property> </widget> </item> diff --git a/examples/webenginewidgets/simplebrowser/downloadwidget.ui b/examples/webenginewidgets/simplebrowser/downloadwidget.ui index 47f621486..9017f2043 100644 --- a/examples/webenginewidgets/simplebrowser/downloadwidget.ui +++ b/examples/webenginewidgets/simplebrowser/downloadwidget.ui @@ -2,6 +2,14 @@ <ui version="4.0"> <class>DownloadWidget</class> <widget class="QFrame" name="DownloadWidget"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>144</width> + <height>103</height> + </rect> + </property> <property name="styleSheet"> <string notr="true">#DownloadWidget { background: palette(button); @@ -11,7 +19,7 @@ </property> <layout class="QGridLayout" name="m_topLevelLayout"> <property name="sizeConstraint"> - <enum>QLayout::SetMinAndMaxSize</enum> + <enum>QLayout::SizeConstraint::SetMinAndMaxSize</enum> </property> <item row="0" column="0"> <widget class="QLabel" name="m_dstName"> @@ -27,7 +35,10 @@ <item row="0" column="1"> <widget class="QPushButton" name="m_cancelButton"> <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"/> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> <property name="styleSheet"> <string notr="true">QPushButton { diff --git a/examples/webenginewidgets/simplebrowser/passworddialog.ui b/examples/webenginewidgets/simplebrowser/passworddialog.ui index bbf5004f5..623dea571 100644 --- a/examples/webenginewidgets/simplebrowser/passworddialog.ui +++ b/examples/webenginewidgets/simplebrowser/passworddialog.ui @@ -20,7 +20,7 @@ <string>Icon</string> </property> <property name="alignment"> - <set>Qt::AlignCenter</set> + <set>Qt::AlignmentFlag::AlignCenter</set> </property> </widget> </item> @@ -60,17 +60,17 @@ <item row="2" column="1"> <widget class="QLineEdit" name="m_passwordLineEdit"> <property name="echoMode"> - <enum>QLineEdit::Password</enum> + <enum>QLineEdit::EchoMode::Password</enum> </property> </widget> </item> <item row="3" column="0" colspan="2"> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set> </property> </widget> </item> diff --git a/examples/webenginewidgets/simplebrowser/ui_certificateerrordialog.py b/examples/webenginewidgets/simplebrowser/ui_certificateerrordialog.py index a963f0ac0..3bbdcacbb 100644 --- a/examples/webenginewidgets/simplebrowser/ui_certificateerrordialog.py +++ b/examples/webenginewidgets/simplebrowser/ui_certificateerrordialog.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'certificateerrordialog.ui' ## -## Created by: Qt User Interface Compiler version 6.7.0 +## Created by: Qt User Interface Compiler version 6.8.0 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -23,13 +23,13 @@ class Ui_CertificateErrorDialog(object): def setupUi(self, CertificateErrorDialog): if not CertificateErrorDialog.objectName(): CertificateErrorDialog.setObjectName(u"CertificateErrorDialog") - CertificateErrorDialog.resize(370, 141) + CertificateErrorDialog.resize(689, 204) self.verticalLayout = QVBoxLayout(CertificateErrorDialog) self.verticalLayout.setObjectName(u"verticalLayout") self.verticalLayout.setContentsMargins(20, -1, 20, -1) self.m_iconLabel = QLabel(CertificateErrorDialog) self.m_iconLabel.setObjectName(u"m_iconLabel") - self.m_iconLabel.setAlignment(Qt.AlignCenter) + self.m_iconLabel.setAlignment(Qt.AlignmentFlag.AlignCenter) self.verticalLayout.addWidget(self.m_iconLabel) @@ -40,7 +40,7 @@ class Ui_CertificateErrorDialog(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.m_errorLabel.sizePolicy().hasHeightForWidth()) self.m_errorLabel.setSizePolicy(sizePolicy) - self.m_errorLabel.setAlignment(Qt.AlignCenter) + self.m_errorLabel.setAlignment(Qt.AlignmentFlag.AlignCenter) self.m_errorLabel.setWordWrap(True) self.verticalLayout.addWidget(self.m_errorLabel) @@ -52,7 +52,7 @@ class Ui_CertificateErrorDialog(object): sizePolicy1.setVerticalStretch(0) sizePolicy1.setHeightForWidth(self.m_infoLabel.sizePolicy().hasHeightForWidth()) self.m_infoLabel.setSizePolicy(sizePolicy1) - self.m_infoLabel.setAlignment(Qt.AlignLeading|Qt.AlignLeft|Qt.AlignVCenter) + self.m_infoLabel.setAlignment(Qt.AlignmentFlag.AlignLeading|Qt.AlignmentFlag.AlignLeft|Qt.AlignmentFlag.AlignVCenter) self.m_infoLabel.setWordWrap(True) self.verticalLayout.addWidget(self.m_infoLabel) @@ -63,8 +63,8 @@ class Ui_CertificateErrorDialog(object): self.buttonBox = QDialogButtonBox(CertificateErrorDialog) self.buttonBox.setObjectName(u"buttonBox") - self.buttonBox.setOrientation(Qt.Horizontal) - self.buttonBox.setStandardButtons(QDialogButtonBox.No|QDialogButtonBox.Yes) + self.buttonBox.setOrientation(Qt.Orientation.Horizontal) + self.buttonBox.setStandardButtons(QDialogButtonBox.StandardButton.No|QDialogButtonBox.StandardButton.Yes) self.verticalLayout.addWidget(self.buttonBox) diff --git a/examples/webenginewidgets/simplebrowser/ui_downloadmanagerwidget.py b/examples/webenginewidgets/simplebrowser/ui_downloadmanagerwidget.py index f0f61aa75..51f46e087 100644 --- a/examples/webenginewidgets/simplebrowser/ui_downloadmanagerwidget.py +++ b/examples/webenginewidgets/simplebrowser/ui_downloadmanagerwidget.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'downloadmanagerwidget.ui' ## -## Created by: Qt User Interface Compiler version 6.7.0 +## Created by: Qt User Interface Compiler version 6.8.0 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -28,7 +28,7 @@ class Ui_DownloadManagerWidget(object): "}") self.m_topLevelLayout = QVBoxLayout(DownloadManagerWidget) self.m_topLevelLayout.setObjectName(u"m_topLevelLayout") - self.m_topLevelLayout.setSizeConstraint(QLayout.SetNoConstraint) + self.m_topLevelLayout.setSizeConstraint(QLayout.SizeConstraint.SetNoConstraint) self.m_topLevelLayout.setContentsMargins(0, 0, 0, 0) self.m_scrollArea = QScrollArea(DownloadManagerWidget) self.m_scrollArea.setObjectName(u"m_scrollArea") @@ -36,12 +36,13 @@ class Ui_DownloadManagerWidget(object): " margin: 2px;\n" " border: none;\n" "}") - self.m_scrollArea.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOn) - self.m_scrollArea.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff) + self.m_scrollArea.setVerticalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOn) + self.m_scrollArea.setHorizontalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOff) self.m_scrollArea.setWidgetResizable(True) - self.m_scrollArea.setAlignment(Qt.AlignLeading|Qt.AlignLeft|Qt.AlignTop) + self.m_scrollArea.setAlignment(Qt.AlignmentFlag.AlignLeading|Qt.AlignmentFlag.AlignLeft|Qt.AlignmentFlag.AlignTop) self.m_items = QWidget() self.m_items.setObjectName(u"m_items") + self.m_items.setGeometry(QRect(0, 0, 382, 208)) self.m_items.setStyleSheet(u"#m_items {background: palette(mid)}") self.m_itemsLayout = QVBoxLayout(self.m_items) self.m_itemsLayout.setSpacing(2) @@ -55,7 +56,7 @@ class Ui_DownloadManagerWidget(object): sizePolicy.setHeightForWidth(self.m_zeroItemsLabel.sizePolicy().hasHeightForWidth()) self.m_zeroItemsLabel.setSizePolicy(sizePolicy) self.m_zeroItemsLabel.setStyleSheet(u"color: palette(shadow)") - self.m_zeroItemsLabel.setAlignment(Qt.AlignCenter) + self.m_zeroItemsLabel.setAlignment(Qt.AlignmentFlag.AlignCenter) self.m_itemsLayout.addWidget(self.m_zeroItemsLabel) diff --git a/examples/webenginewidgets/simplebrowser/ui_downloadwidget.py b/examples/webenginewidgets/simplebrowser/ui_downloadwidget.py index 58c32fdf8..5204b6885 100644 --- a/examples/webenginewidgets/simplebrowser/ui_downloadwidget.py +++ b/examples/webenginewidgets/simplebrowser/ui_downloadwidget.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'downloadwidget.ui' ## -## Created by: Qt User Interface Compiler version 6.7.0 +## Created by: Qt User Interface Compiler version 6.8.0 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -23,6 +23,7 @@ class Ui_DownloadWidget(object): def setupUi(self, DownloadWidget): if not DownloadWidget.objectName(): DownloadWidget.setObjectName(u"DownloadWidget") + DownloadWidget.resize(144, 103) DownloadWidget.setStyleSheet(u"#DownloadWidget {\n" " background: palette(button);\n" " border: 1px solid palette(dark);\n" @@ -30,7 +31,7 @@ class Ui_DownloadWidget(object): "}") self.m_topLevelLayout = QGridLayout(DownloadWidget) self.m_topLevelLayout.setObjectName(u"m_topLevelLayout") - self.m_topLevelLayout.setSizeConstraint(QLayout.SetMinAndMaxSize) + self.m_topLevelLayout.setSizeConstraint(QLayout.SizeConstraint.SetMinAndMaxSize) self.m_dstName = QLabel(DownloadWidget) self.m_dstName.setObjectName(u"m_dstName") self.m_dstName.setStyleSheet(u"font-weight: bold\n" diff --git a/examples/webenginewidgets/simplebrowser/ui_passworddialog.py b/examples/webenginewidgets/simplebrowser/ui_passworddialog.py index 11e0c4a2e..05bec7b53 100644 --- a/examples/webenginewidgets/simplebrowser/ui_passworddialog.py +++ b/examples/webenginewidgets/simplebrowser/ui_passworddialog.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'passworddialog.ui' ## -## Created by: Qt User Interface Compiler version 6.7.0 +## Created by: Qt User Interface Compiler version 6.8.0 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -28,7 +28,7 @@ class Ui_PasswordDialog(object): self.gridLayout.setObjectName(u"gridLayout") self.m_iconLabel = QLabel(PasswordDialog) self.m_iconLabel.setObjectName(u"m_iconLabel") - self.m_iconLabel.setAlignment(Qt.AlignCenter) + self.m_iconLabel.setAlignment(Qt.AlignmentFlag.AlignCenter) self.gridLayout.addWidget(self.m_iconLabel, 0, 0, 1, 1) @@ -60,14 +60,14 @@ class Ui_PasswordDialog(object): self.m_passwordLineEdit = QLineEdit(PasswordDialog) self.m_passwordLineEdit.setObjectName(u"m_passwordLineEdit") - self.m_passwordLineEdit.setEchoMode(QLineEdit.Password) + self.m_passwordLineEdit.setEchoMode(QLineEdit.EchoMode.Password) self.gridLayout.addWidget(self.m_passwordLineEdit, 2, 1, 1, 1) self.buttonBox = QDialogButtonBox(PasswordDialog) self.buttonBox.setObjectName(u"buttonBox") - self.buttonBox.setOrientation(Qt.Horizontal) - self.buttonBox.setStandardButtons(QDialogButtonBox.Cancel|QDialogButtonBox.Ok) + self.buttonBox.setOrientation(Qt.Orientation.Horizontal) + self.buttonBox.setStandardButtons(QDialogButtonBox.StandardButton.Cancel|QDialogButtonBox.StandardButton.Ok) self.gridLayout.addWidget(self.buttonBox, 3, 0, 1, 2) diff --git a/examples/widgets/animation/easing/ui_form.py b/examples/widgets/animation/easing/ui_form.py index 2925cbae7..7c9ce6abb 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.7.0 +## Created by: Qt User Interface Compiler version 6.8.0 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -37,7 +37,7 @@ class Ui_Form(object): self.easingCurvePicker.setMaximumSize(QSize(16777215, 120)) self.easingCurvePicker.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOff) self.easingCurvePicker.setMovement(QListView.Static) - self.easingCurvePicker.setProperty("isWrapping", False) + self.easingCurvePicker.setProperty(u"isWrapping", False) self.easingCurvePicker.setViewMode(QListView.IconMode) self.easingCurvePicker.setSelectionRectVisible(False) diff --git a/sources/pyside6/tests/QtCore/feature_with_uic/window.ui b/sources/pyside6/tests/QtCore/feature_with_uic/window.ui index 0b85824ea..54a12dc97 100644 --- a/sources/pyside6/tests/QtCore/feature_with_uic/window.ui +++ b/sources/pyside6/tests/QtCore/feature_with_uic/window.ui @@ -34,7 +34,7 @@ <x>0</x> <y>0</y> <width>263</width> - <height>23</height> + <height>26</height> </rect> </property> </widget> diff --git a/sources/pyside6/tests/QtUiTools/action.ui b/sources/pyside6/tests/QtUiTools/action.ui index 9eda559de..47743b15c 100644 --- a/sources/pyside6/tests/QtUiTools/action.ui +++ b/sources/pyside6/tests/QtUiTools/action.ui @@ -1,16 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>main_window</class> - <widget class="QMainWindow" name="main_window"> - <widget class="QWidget" name="centralwidget"/> - <widget class="QMenuBar" name="menubar"/> - <widget class="QStatusBar" name="statusbar"> - <action name="actionFoo"> - <property name="text"> - <string>foo</string> - </property> - </action> - </widget> - </widget> - <resources/> - <connections/> + <class>main_window</class> + <widget class="QMainWindow" name="main_window"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>16</width> + <height>69</height> + </rect> + </property> + <widget class="QWidget" name="centralwidget"/> + <widget class="QMenuBar" name="menubar"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>16</width> + <height>26</height> + </rect> + </property> + </widget> + <widget class="QStatusBar" name="statusbar"> + <action name="actionFoo"> + <property name="text"> + <string>foo</string> + </property> + </action> + </widget> + </widget> + <resources/> + <connections/> </ui> diff --git a/sources/pyside6/tests/QtUiTools/bug_909.ui b/sources/pyside6/tests/QtUiTools/bug_909.ui index b07f62d05..be9153883 100644 --- a/sources/pyside6/tests/QtUiTools/bug_909.ui +++ b/sources/pyside6/tests/QtUiTools/bug_909.ui @@ -20,7 +20,7 @@ <x>0</x> <y>0</y> <width>800</width> - <height>25</height> + <height>26</height> </rect> </property> </widget> diff --git a/sources/pyside6/tests/QtUiTools/bug_965.ui b/sources/pyside6/tests/QtUiTools/bug_965.ui index e324db829..be9153883 100644 --- a/sources/pyside6/tests/QtUiTools/bug_965.ui +++ b/sources/pyside6/tests/QtUiTools/bug_965.ui @@ -1,13 +1,8 @@ -<ui version="4.0" > - <author></author> - <comment></comment> - <exportmacro></exportmacro> +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>MainWindow</class> - <widget class="QMainWindow" name="MainWindow" > - <property name="objectName" > - <string notr="true" >MainWindow</string> - </property> - <property name="geometry" > + <widget class="QMainWindow" name="MainWindow"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -15,13 +10,22 @@ <height>600</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>MainWindow</string> </property> - <widget class="QMenuBar" name="menubar" /> - <widget class="QWidget" name="centralwidget" /> - <widget class="QStatusBar" name="statusbar" /> + <widget class="QWidget" name="centralwidget"/> + <widget class="QMenuBar" name="menubar"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>800</width> + <height>26</height> + </rect> + </property> + </widget> + <widget class="QStatusBar" name="statusbar"/> </widget> - <pixmapfunction></pixmapfunction> + <resources/> <connections/> </ui> diff --git a/sources/pyside6/tests/QtUiTools/minimal.ui b/sources/pyside6/tests/QtUiTools/minimal.ui index c6bb70cda..c63aa8148 100644 --- a/sources/pyside6/tests/QtUiTools/minimal.ui +++ b/sources/pyside6/tests/QtUiTools/minimal.ui @@ -2,5 +2,15 @@ <ui version="4.0"> <class>Form</class> <widget class="QFrame" name="Form"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>100</width> + <height>30</height> + </rect> + </property> </widget> + <resources/> + <connections/> </ui> diff --git a/sources/pyside6/tests/QtUiTools/pycustomwidget2.ui b/sources/pyside6/tests/QtUiTools/pycustomwidget2.ui index 8826ac1fb..e72d71da9 100644 --- a/sources/pyside6/tests/QtUiTools/pycustomwidget2.ui +++ b/sources/pyside6/tests/QtUiTools/pycustomwidget2.ui @@ -13,7 +13,6 @@ <property name="windowTitle"> <string/> </property> - <widget class="MyWidget" name="custom"> <property name="geometry"> <rect> @@ -24,8 +23,7 @@ </rect> </property> </widget> - - <widget class="MyWidget" name="custom2"> + <widget class="MyWidget" name="custom2"> <property name="geometry"> <rect> <x>10</x> @@ -34,7 +32,7 @@ <height>23</height> </rect> </property> - </widget> + </widget> </widget> <customwidgets> <customwidget> diff --git a/sources/pyside6/tests/QtUiTools/test.ui b/sources/pyside6/tests/QtUiTools/test.ui index 60afe22b3..2df30e8ff 100644 --- a/sources/pyside6/tests/QtUiTools/test.ui +++ b/sources/pyside6/tests/QtUiTools/test.ui @@ -23,10 +23,10 @@ </rect> </property> <property name="frameShape"> - <enum>QFrame::StyledPanel</enum> + <enum>QFrame::Shape::StyledPanel</enum> </property> <property name="frameShadow"> - <enum>QFrame::Raised</enum> + <enum>QFrame::Shadow::Raised</enum> </property> <widget class="QPushButton" name="grandson_object"> <property name="geometry"> |