From cc54161abb977751b4499c559fc0f464b9e2399e Mon Sep 17 00:00:00 2001 From: David Gil Date: Wed, 22 May 2013 11:59:39 +0200 Subject: Add getMultiLineText static method to QInputDialog Change-Id: I6d43772f6ee66c6c43d64fb3d18f2a5f0c894a00 Reviewed-by: Gunnar Sletta Reviewed-by: Friedemann Kleint --- examples/widgets/dialogs/standarddialogs/dialog.cpp | 20 +++++++++++++++++++- examples/widgets/dialogs/standarddialogs/dialog.h | 2 ++ 2 files changed, 21 insertions(+), 1 deletion(-) (limited to 'examples/widgets/dialogs') diff --git a/examples/widgets/dialogs/standarddialogs/dialog.cpp b/examples/widgets/dialogs/standarddialogs/dialog.cpp index c626b63b7d..fdd3633950 100644 --- a/examples/widgets/dialogs/standarddialogs/dialog.cpp +++ b/examples/widgets/dialogs/standarddialogs/dialog.cpp @@ -121,6 +121,10 @@ Dialog::Dialog(QWidget *parent) textLabel->setFrameStyle(frameStyle); QPushButton *textButton = new QPushButton(tr("QInputDialog::get&Text()")); + multiLineTextLabel = new QLabel; + multiLineTextLabel->setFrameStyle(frameStyle); + QPushButton *multiLineTextButton = new QPushButton(tr("QInputDialog::get&MultiLineText()")); + colorLabel = new QLabel; colorLabel->setFrameStyle(frameStyle); QPushButton *colorButton = new QPushButton(tr("QColorDialog::get&Color()")); @@ -177,6 +181,7 @@ Dialog::Dialog(QWidget *parent) connect(doubleButton, SIGNAL(clicked()), this, SLOT(setDouble())); connect(itemButton, SIGNAL(clicked()), this, SLOT(setItem())); connect(textButton, SIGNAL(clicked()), this, SLOT(setText())); + connect(multiLineTextButton, SIGNAL(clicked()), this, SLOT(setMultiLineText())); connect(colorButton, SIGNAL(clicked()), this, SLOT(setColor())); connect(fontButton, SIGNAL(clicked()), this, SLOT(setFont())); connect(directoryButton, SIGNAL(clicked()), @@ -206,7 +211,9 @@ Dialog::Dialog(QWidget *parent) layout->addWidget(itemLabel, 2, 1); layout->addWidget(textButton, 3, 0); layout->addWidget(textLabel, 3, 1); - layout->addItem(new QSpacerItem(0, 0, QSizePolicy::Ignored, QSizePolicy::MinimumExpanding), 4, 0); + layout->addWidget(multiLineTextButton, 4, 0); + layout->addWidget(multiLineTextLabel, 4, 1); + layout->addItem(new QSpacerItem(0, 0, QSizePolicy::Ignored, QSizePolicy::MinimumExpanding), 5, 0); toolbox->addItem(page, tr("Input Dialogs")); const QString doNotUseNativeDialog = tr("Do not use native dialog"); @@ -327,6 +334,17 @@ void Dialog::setText() //! [3] } +void Dialog::setMultiLineText() +{ +//! [4] + bool ok; + QString text = QInputDialog::getMultiLineText(this, tr("QInputDialog::getMultiLineText()"), + tr("Address:"), "John Doe\nFreedom Street", &ok); + if (ok && !text.isEmpty()) + multiLineTextLabel->setText(text); +//! [4] +} + void Dialog::setColor() { const QColorDialog::ColorDialogOptions options = QFlag(colorDialogOptionsWidget->value()); diff --git a/examples/widgets/dialogs/standarddialogs/dialog.h b/examples/widgets/dialogs/standarddialogs/dialog.h index 27b1de98cb..d6272c440e 100644 --- a/examples/widgets/dialogs/standarddialogs/dialog.h +++ b/examples/widgets/dialogs/standarddialogs/dialog.h @@ -63,6 +63,7 @@ private slots: void setDouble(); void setItem(); void setText(); + void setMultiLineText(); void setColor(); void setFont(); void setExistingDirectory(); @@ -80,6 +81,7 @@ private: QLabel *doubleLabel; QLabel *itemLabel; QLabel *textLabel; + QLabel *multiLineTextLabel; QLabel *colorLabel; QLabel *fontLabel; QLabel *directoryLabel; -- cgit v1.2.3