diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-08-21 08:18:20 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-08-21 08:18:20 +0200 |
commit | d9225ff6dd397af9558a882de2a33a981e994a53 (patch) | |
tree | dd60ba6b8ac7397b347aebc4e801d37c9028e4df /sources/pyside2/doc/codesnippets/examples/dialogs/standarddialogs/dialog.cpp | |
parent | b33f0c3708c16821a846013d28ca600863003b3e (diff) | |
parent | 3a7856eb4b129449da8fd3c9b7185a4cb2d9cc68 (diff) |
Merge remote-tracking branch 'origin/5.14' into dev
Change-Id: I7cec8ab37a9ab0186b16ec0324f971b07d59ef75
Diffstat (limited to 'sources/pyside2/doc/codesnippets/examples/dialogs/standarddialogs/dialog.cpp')
-rw-r--r-- | sources/pyside2/doc/codesnippets/examples/dialogs/standarddialogs/dialog.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sources/pyside2/doc/codesnippets/examples/dialogs/standarddialogs/dialog.cpp b/sources/pyside2/doc/codesnippets/examples/dialogs/standarddialogs/dialog.cpp index d4dde36bc..db11e22f8 100644 --- a/sources/pyside2/doc/codesnippets/examples/dialogs/standarddialogs/dialog.cpp +++ b/sources/pyside2/doc/codesnippets/examples/dialogs/standarddialogs/dialog.cpp @@ -49,32 +49,32 @@ ****************************************************************************/ //! [0] - i = QInputDialog().getInteger(self, self.tr("QInputDialog().getInteger()"), - self.tr("Percentage:"), 25, 0, 100, 1, ok) + i, ok = QInputDialog().getInteger(self, "QInputDialog().getInteger()", + "Percentage:", 25, 0, 100, 1) if ok: - self.integerLabel.setText(self.tr("%1%").arg(i)) + self.integerLabel.setText("{}%".format(i)) //! [0] //! [1] - d = QInputDialog().getDouble(self, self.tr("QInputDialog().getDouble()"), - self.tr("Amount:"), 37.56, -10000, 10000, 2, ok) + d, ok = QInputDialog().getDouble(self, "QInputDialog().getDouble()", + "Amount:", 37.56, -10000, 10000, 2) if ok: - doubleLabel.setText(QString("$%1").arg(d)) + doubleLabel.setText("${}".format()) //! [1] //! [2] - items = [self.tr("Spring"), self.tr("Summer"), self.tr("Fall"), self.tr("Winter")] + items = ["Spring", "Summer", "Fall", "Winter"] - item = QInputDialog().getItem(self, self.tr("QInputDialog().getItem()"), - selftr("Season:"), items, 0, False, ok) + item, ok = QInputDialog().getItem(self, "QInputDialog().getItem()", + "Season:", items, 0, False) if ok and not item.isEmpty(): itemLabel.setText(item) //! [2] //! [3] - text = QInputDialog::getText(self, self.tr("QInputDialog().getText()"), - self.tr("User name:"), QLineEdit.Normal, - QDir().home().dirName(), ok) + text, ok = QInputDialog().getText(self, "QInputDialog().getText()", + "User name:", QLineEdit.Normal, + QDir().home().dirName()) if ok and text: textLabel.setText(text) //! [3] |