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 /examples/webenginewidgets/simplebrowser | |
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]>
Diffstat (limited to 'examples/webenginewidgets/simplebrowser')
8 files changed, 60 insertions, 39 deletions
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) |