diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/tools/uic/baseline/tabbedbrowser.ui | 8 | ||||
-rw-r--r-- | tests/auto/tools/uic/baseline/tabbedbrowser.ui.h | 8 | ||||
-rw-r--r-- | tests/auto/widgets/kernel/qicon/tst_qicon.cpp | 36 | ||||
-rw-r--r-- | tests/manual/windowmodality/dialog.ui | 172 | ||||
-rw-r--r-- | tests/manual/windowmodality/main.cpp | 12 | ||||
-rw-r--r-- | tests/manual/windowmodality/widget.ui | 142 |
6 files changed, 207 insertions, 171 deletions
diff --git a/tests/auto/tools/uic/baseline/tabbedbrowser.ui b/tests/auto/tools/uic/baseline/tabbedbrowser.ui index 7164fb7271..382f49fe5e 100644 --- a/tests/auto/tools/uic/baseline/tabbedbrowser.ui +++ b/tests/auto/tools/uic/baseline/tabbedbrowser.ui @@ -99,7 +99,7 @@ <string/> </property> <property name="icon" > - <iconset resource="assistant.qrc" >:/trolltech/assistant/images/close.png</iconset> + <iconset resource="assistant.qrc" >:/qt-project.org/assistant/images/close.png</iconset> </property> <property name="autoRaise" > <bool>true</bool> @@ -130,7 +130,7 @@ <string>Previous</string> </property> <property name="icon" > - <iconset resource="assistant.qrc" >:/trolltech/assistant/images/win/previous.png</iconset> + <iconset resource="assistant.qrc" >:/qt-project.org/assistant/images/win/previous.png</iconset> </property> <property name="toolButtonStyle" > <enum>Qt::ToolButtonTextBesideIcon</enum> @@ -152,7 +152,7 @@ <string>Next</string> </property> <property name="icon" > - <iconset resource="assistant.qrc" >:/trolltech/assistant/images/win/next.png</iconset> + <iconset resource="assistant.qrc" >:/qt-project.org/assistant/images/win/next.png</iconset> </property> <property name="toolButtonStyle" > <enum>Qt::ToolButtonTextBesideIcon</enum> @@ -194,7 +194,7 @@ </size> </property> <property name="text" > - <string><img src=":/trolltech/assistant/images/wrap.png">&nbsp;Search wrapped</string> + <string><img src=":/qt-project.org/assistant/images/wrap.png">&nbsp;Search wrapped</string> </property> <property name="textFormat" > <enum>Qt::RichText</enum> diff --git a/tests/auto/tools/uic/baseline/tabbedbrowser.ui.h b/tests/auto/tools/uic/baseline/tabbedbrowser.ui.h index 1e99c41312..f2c1f1e3e5 100644 --- a/tests/auto/tools/uic/baseline/tabbedbrowser.ui.h +++ b/tests/auto/tools/uic/baseline/tabbedbrowser.ui.h @@ -125,7 +125,7 @@ public: hboxLayout->setObjectName(QStringLiteral("hboxLayout")); toolClose = new QToolButton(frameFind); toolClose->setObjectName(QStringLiteral("toolClose")); - const QIcon icon = QIcon(QString::fromUtf8(":/trolltech/assistant/images/close.png")); + const QIcon icon = QIcon(QString::fromUtf8(":/qt-project.org/assistant/images/close.png")); toolClose->setIcon(icon); toolClose->setAutoRaise(true); @@ -144,7 +144,7 @@ public: toolPrevious = new QToolButton(frameFind); toolPrevious->setObjectName(QStringLiteral("toolPrevious")); - const QIcon icon1 = QIcon(QString::fromUtf8(":/trolltech/assistant/images/win/previous.png")); + const QIcon icon1 = QIcon(QString::fromUtf8(":/qt-project.org/assistant/images/win/previous.png")); toolPrevious->setIcon(icon1); toolPrevious->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); toolPrevious->setAutoRaise(true); @@ -154,7 +154,7 @@ public: toolNext = new QToolButton(frameFind); toolNext->setObjectName(QStringLiteral("toolNext")); toolNext->setMinimumSize(QSize(0, 0)); - const QIcon icon2 = QIcon(QString::fromUtf8(":/trolltech/assistant/images/win/next.png")); + const QIcon icon2 = QIcon(QString::fromUtf8(":/qt-project.org/assistant/images/win/next.png")); toolNext->setIcon(icon2); toolNext->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); toolNext->setAutoRaise(true); @@ -204,7 +204,7 @@ public: toolNext->setText(QApplication::translate("TabbedBrowser", "Next", 0, QApplication::UnicodeUTF8)); checkCase->setText(QApplication::translate("TabbedBrowser", "Case Sensitive", 0, QApplication::UnicodeUTF8)); checkWholeWords->setText(QApplication::translate("TabbedBrowser", "Whole words", 0, QApplication::UnicodeUTF8)); - labelWrapped->setText(QApplication::translate("TabbedBrowser", "<img src=\":/trolltech/assistant/images/wrap.png\"> Search wrapped", 0, QApplication::UnicodeUTF8)); + labelWrapped->setText(QApplication::translate("TabbedBrowser", "<img src=\":/qt-project.org/assistant/images/wrap.png\"> Search wrapped", 0, QApplication::UnicodeUTF8)); } // retranslateUi }; diff --git a/tests/auto/widgets/kernel/qicon/tst_qicon.cpp b/tests/auto/widgets/kernel/qicon/tst_qicon.cpp index 4a9ab93921..cca0887a21 100644 --- a/tests/auto/widgets/kernel/qicon/tst_qicon.cpp +++ b/tests/auto/widgets/kernel/qicon/tst_qicon.cpp @@ -374,32 +374,32 @@ void tst_QIcon::detach() void tst_QIcon::addFile() { QIcon icon; - icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-16.png")); - icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-32.png")); - icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-128.png")); - icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-save-16.png"), QSize(), QIcon::Selected); - icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-save-32.png"), QSize(), QIcon::Selected); - icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-save-128.png"), QSize(), QIcon::Selected); + icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-16.png")); + icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-32.png")); + icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-128.png")); + icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-16.png"), QSize(), QIcon::Selected); + icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-32.png"), QSize(), QIcon::Selected); + icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-128.png"), QSize(), QIcon::Selected); #ifndef Q_OS_WINCE QVERIFY(icon.pixmap(16, QIcon::Normal).toImage() == - QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-16.png")).toImage()); + QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-16.png")).toImage()); QVERIFY(icon.pixmap(32, QIcon::Normal).toImage() == - QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-32.png")).toImage()); + QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-32.png")).toImage()); QVERIFY(icon.pixmap(128, QIcon::Normal).toImage() == - QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-128.png")).toImage()); + QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-128.png")).toImage()); QVERIFY(icon.pixmap(16, QIcon::Selected).toImage() == - QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-save-16.png")).toImage()); + QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-16.png")).toImage()); QVERIFY(icon.pixmap(32, QIcon::Selected).toImage() == - QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-save-32.png")).toImage()); + QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-32.png")).toImage()); QVERIFY(icon.pixmap(128, QIcon::Selected).toImage() == - QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-save-128.png")).toImage()); + QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-128.png")).toImage()); #else // WinCE only includes the 16x16 images for size reasons QVERIFY(icon.pixmap(16, QIcon::Normal).toImage() == - QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-16.png")).toImage()); + QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-16.png")).toImage()); QVERIFY(icon.pixmap(16, QIcon::Selected).toImage() == - QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-save-16.png")).toImage()); + QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-16.png")).toImage()); #endif } @@ -436,7 +436,7 @@ void tst_QIcon::availableSizes() { // we try to load an icon from resources - QIcon icon(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-16.png")); + QIcon icon(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-16.png")); QList<QSize> availableSizes = icon.availableSizes(); QCOMPARE(availableSizes.size(), 1); QCOMPARE(availableSizes.at(0), QSize(16, 16)); @@ -445,7 +445,7 @@ void tst_QIcon::availableSizes() { // load an icon from binary data. QPixmap pix; - QFile file(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-16.png")); + QFile file(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-16.png")); QVERIFY(file.open(QIODevice::ReadOnly)); uchar *data = file.map(0, file.size()); QVERIFY(data != 0); @@ -617,12 +617,12 @@ void tst_QIcon::fromTheme() void tst_QIcon::task223279_inconsistentAddFile() { QIcon icon1; - icon1.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-16.png")); + icon1.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-16.png")); icon1.addFile(QLatin1String("IconThatDoesntExist"), QSize(32, 32)); QPixmap pm1 = icon1.pixmap(32, 32); QIcon icon2; - icon2.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-16.png")); + icon2.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-16.png")); icon2.addFile(QLatin1String("IconThatDoesntExist")); QPixmap pm2 = icon1.pixmap(32, 32); diff --git a/tests/manual/windowmodality/dialog.ui b/tests/manual/windowmodality/dialog.ui index 91c6bf2dc9..65129ce574 100644 --- a/tests/manual/windowmodality/dialog.ui +++ b/tests/manual/windowmodality/dialog.ui @@ -1,106 +1,125 @@ -<ui version="4.0" > - <author></author> - <comment></comment> - <exportmacro></exportmacro> +<?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> - <width>400</width> - <height>420</height> + <width>565</width> + <height>361</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Dialog</string> </property> - <layout class="QVBoxLayout" > - <property name="margin" > - <number>9</number> - </property> - <property name="spacing" > - <number>6</number> - </property> + <layout class="QVBoxLayout" name="verticalLayout"> <item> - <widget class="QGroupBox" name="groupBox" > - <property name="title" > - <string>Modality Types</string> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Select the type of dialog to create:</string> </property> - <layout class="QVBoxLayout" > - <property name="margin" > - <number>9</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item> - <widget class="QPushButton" name="modelessButton" > - <property name="text" > - <string>Modeless Dialog</string> + <layout class="QGridLayout" name="gridLayout"> + <item row="5" column="0"> + <widget class="QPushButton" name="siblingApplicationModalButton"> + <property name="text"> + <string>Sibling Application Modal Dialog</string> </property> </widget> </item> - <item> - <widget class="QPushButton" name="modelessNoParentButton" > - <property name="text" > - <string>Modeless Dialog w/ no parent</string> + <item row="1" column="0"> + <widget class="QPushButton" name="windowModalButton"> + <property name="text"> + <string>Window Modal Dialog</string> </property> </widget> </item> - <item> - <widget class="QPushButton" name="windowModalButton" > - <property name="text" > - <string>Window Modal Dialog</string> + <item row="7" column="1"> + <widget class="QPushButton" name="applicationModalChildButton"> + <property name="text"> + <string>Application Modal Child Widget</string> </property> </widget> </item> - <item> - <widget class="QPushButton" name="windowModalNoParentButton" > - <property name="text" > - <string>Window Modal Dialog w/ no parent</string> + <item row="2" column="0"> + <widget class="QPushButton" name="siblingWindowModalButton"> + <property name="text"> + <string>Sibling Window Modal Dialog</string> </property> </widget> </item> - <item> - <widget class="QPushButton" name="windowModalChildButton" > - <property name="text" > - <string>Window Modal Child Widget (hidden after 5 seconds)</string> + <item row="0" column="1"> + <widget class="QPushButton" name="modelessNoParentButton"> + <property name="text"> + <string>Modeless Dialog (no parent)</string> </property> </widget> </item> - <item> - <widget class="QPushButton" name="siblingWindowModalButton" > - <property name="text" > - <string>Sibling Window Modal Dialog</string> + <item row="4" column="0"> + <widget class="QPushButton" name="applicationModalButton"> + <property name="text"> + <string>Application Modal</string> </property> </widget> </item> - <item> - <widget class="QPushButton" name="applicationModalButton" > - <property name="text" > - <string>Application Modal</string> + <item row="1" column="1"> + <widget class="QPushButton" name="windowModalNoParentButton"> + <property name="text"> + <string>Window Modal Dialog (no parent)</string> </property> </widget> </item> - <item> - <widget class="QPushButton" name="applicationModalNoParentButton" > - <property name="text" > - <string>Application Modal Dialog w/ no parent</string> + <item row="7" column="0"> + <widget class="QPushButton" name="windowModalChildButton"> + <property name="text"> + <string>Window Modal Child Widget</string> </property> </widget> </item> - <item> - <widget class="QPushButton" name="applicationModalChildButton" > - <property name="text" > - <string>Application Modal Child Widget (hidden after 5 seconds)</string> + <item row="4" column="1"> + <widget class="QPushButton" name="applicationModalNoParentButton"> + <property name="text"> + <string>Application Modal Dialog (no parent)</string> </property> </widget> </item> - <item> - <widget class="QPushButton" name="siblingApplicationModalButton" > - <property name="text" > - <string>Sibling Application Modal Dialog</string> + <item row="6" column="0" colspan="2"> + <widget class="QLabel" name="modalChildWidgetInfoLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="font"> + <font> + <pointsize>11</pointsize> + </font> + </property> + <property name="text"> + <string>Note: Modal Child Widgets are invisible and hidden after 5 seconds.</string> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QPushButton" name="modelessButton"> + <property name="text"> + <string>Modeless Dialog</string> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QCheckBox" name="applicationModalUseExecCheckBox"> + <property name="font"> + <font> + <pointsize>11</pointsize> + </font> + </property> + <property name="text"> + <string>Application Modal Dialogs use exec()</string> + </property> + <property name="checked"> + <bool>true</bool> </property> </widget> </item> @@ -108,19 +127,13 @@ </widget> </item> <item> - <layout class="QHBoxLayout" > - <property name="margin" > - <number>0</number> - </property> - <property name="spacing" > - <number>6</number> - </property> + <layout class="QHBoxLayout"> <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>131</width> <height>31</height> @@ -129,8 +142,8 @@ </spacer> </item> <item> - <widget class="QPushButton" name="okButton" > - <property name="text" > + <widget class="QPushButton" name="okButton"> + <property name="text"> <string>Close</string> </property> </widget> @@ -139,7 +152,6 @@ </item> </layout> </widget> - <pixmapfunction></pixmapfunction> <resources/> <connections> <connection> @@ -148,11 +160,11 @@ <receiver>Dialog</receiver> <slot>accept()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>397</x> <y>338</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>96</x> <y>254</y> </hint> diff --git a/tests/manual/windowmodality/main.cpp b/tests/manual/windowmodality/main.cpp index db3a0b072f..cfd7658064 100644 --- a/tests/manual/windowmodality/main.cpp +++ b/tests/manual/windowmodality/main.cpp @@ -93,7 +93,10 @@ private: Dialog *dialog = new Dialog(parent); dialog->setAttribute(Qt::WA_DeleteOnClose); dialog->setWindowModality(windowModality); - dialog->show(); + if (windowModality == Qt::ApplicationModal && applicationModalUseExecCheckBox->isChecked()) + dialog->exec(); + else + dialog->show(); } void newChildWidget(Qt::WindowModality windowModality) { @@ -107,7 +110,7 @@ private: bool event(QEvent *event) { if (event->type() == QEvent::WindowBlocked) - setPalette(Qt::red); + setPalette(Qt::darkGray); else if (event->type() == QEvent::WindowUnblocked) setPalette(QPalette()); return QWidget::event(event); @@ -156,7 +159,10 @@ private: Dialog *dialog = new Dialog(withParent ? this : 0); dialog->setAttribute(Qt::WA_DeleteOnClose); dialog->setWindowModality(windowModality); - dialog->show(); + if (windowModality == Qt::ApplicationModal && applicationModalUseExecCheckBox->isChecked()) + dialog->exec(); + else + dialog->show(); } void newChildWidget(Qt::WindowModality windowModality) { diff --git a/tests/manual/windowmodality/widget.ui b/tests/manual/windowmodality/widget.ui index cc3bf854ec..96158025a2 100644 --- a/tests/manual/windowmodality/widget.ui +++ b/tests/manual/windowmodality/widget.ui @@ -1,106 +1,125 @@ -<ui version="4.0" > - <author></author> - <comment></comment> - <exportmacro></exportmacro> +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>Widget</class> - <widget class="QWidget" name="Widget" > - <property name="geometry" > + <widget class="QWidget" name="Widget"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>568</width> - <height>473</height> + <width>558</width> + <height>268</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Form</string> </property> - <layout class="QVBoxLayout" > - <property name="margin" > - <number>40</number> - </property> - <property name="spacing" > - <number>6</number> - </property> + <layout class="QVBoxLayout"> <item> - <widget class="QGroupBox" name="groupBox" > - <property name="title" > - <string>New Window Type</string> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Select the type of window to create:</string> </property> - <layout class="QVBoxLayout" > - <property name="margin" > - <number>8</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item> - <widget class="QPushButton" name="windowButton" > - <property name="text" > + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QPushButton" name="windowButton"> + <property name="text"> <string>Window</string> </property> </widget> </item> - <item> - <widget class="QPushButton" name="groupLeaderButton" > - <property name="text" > + <item row="0" column="1"> + <widget class="QPushButton" name="groupLeaderButton"> + <property name="text"> <string>Window (Group Leader)</string> </property> </widget> </item> - <item> - <widget class="QPushButton" name="modelessButton" > - <property name="text" > + <item row="1" column="0"> + <widget class="QPushButton" name="modelessButton"> + <property name="text"> <string>Modeless Dialog</string> </property> </widget> </item> - <item> - <widget class="QPushButton" name="modelessNoParentButton" > - <property name="text" > - <string>Modeless Dialog w/ no parent</string> + <item row="1" column="1"> + <widget class="QPushButton" name="modelessNoParentButton"> + <property name="text"> + <string>Modeless Dialog (no parent)</string> </property> </widget> </item> - <item> - <widget class="QPushButton" name="windowModalButton" > - <property name="text" > + <item row="2" column="0"> + <widget class="QPushButton" name="windowModalButton"> + <property name="text"> <string>Window Modal Dialog</string> </property> </widget> </item> - <item> - <widget class="QPushButton" name="windowModalNoParentButton" > - <property name="text" > - <string>Window Modal Dialog w/ no parent</string> + <item row="2" column="1"> + <widget class="QPushButton" name="windowModalNoParentButton"> + <property name="text"> + <string>Window Modal Dialog (no parent)</string> </property> </widget> </item> - <item> - <widget class="QPushButton" name="windowModalChildButton" > - <property name="text" > - <string>Window Modal Child Widget (hidden after 5 seconds)</string> + <item row="3" column="0" colspan="2"> + <widget class="QCheckBox" name="applicationModalUseExecCheckBox"> + <property name="font"> + <font> + <pointsize>11</pointsize> + </font> + </property> + <property name="text"> + <string>Application Modal Dialogs use exec()</string> + </property> + <property name="checked"> + <bool>true</bool> </property> </widget> </item> - <item> - <widget class="QPushButton" name="applicationModalButton" > - <property name="text" > + <item row="4" column="0"> + <widget class="QPushButton" name="applicationModalButton"> + <property name="text"> <string>Application Modal Dialog</string> </property> </widget> </item> - <item> - <widget class="QPushButton" name="applicationModalNoParentButton" > - <property name="text" > - <string>Application Modal Dialog w/ no parent</string> + <item row="4" column="1"> + <widget class="QPushButton" name="applicationModalNoParentButton"> + <property name="text"> + <string>Application Modal Dialog (no parent)</string> + </property> + </widget> + </item> + <item row="5" column="0" colspan="2"> + <widget class="QLabel" name="modalChildWidgetInfoLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="font"> + <font> + <pointsize>11</pointsize> + </font> + </property> + <property name="text"> + <string>Note: Modal Child Widgets are invisible and hidden after 5 seconds.</string> + </property> + </widget> + </item> + <item row="6" column="0"> + <widget class="QPushButton" name="applicationModalChildButton"> + <property name="text"> + <string>Application Modal Child Widget</string> </property> </widget> </item> - <item> - <widget class="QPushButton" name="applicationModalChildButton" > - <property name="text" > - <string>Application Modal Child Widget (hidden after 5 seconds)</string> + <item row="6" column="1"> + <widget class="QPushButton" name="windowModalChildButton"> + <property name="text"> + <string>Window Modal Child Widget</string> </property> </widget> </item> @@ -109,7 +128,6 @@ </item> </layout> </widget> - <pixmapfunction></pixmapfunction> <resources/> <connections/> </ui> |