diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-19 08:12:33 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-19 08:12:33 +0200 |
commit | d8bd1449361835a3fe67f8ad33e82cec78940f1c (patch) | |
tree | 279e019b83fb2aa9e0673d00b5df4c432315ea51 /examples/widgets/mainwindows/mdi | |
parent | b4098737b13c91ca85b69362426f0f30768c49b1 (diff) | |
parent | 7dba09d7c4007e96fb0a39bf6f6e740cd207324a (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I42955abfeb1fe8b7c6443a9b334154984286b9cc
Diffstat (limited to 'examples/widgets/mainwindows/mdi')
-rw-r--r-- | examples/widgets/mainwindows/mdi/mdi.py | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/examples/widgets/mainwindows/mdi/mdi.py b/examples/widgets/mainwindows/mdi/mdi.py index b3c1c1eb9..9daca826d 100644 --- a/examples/widgets/mainwindows/mdi/mdi.py +++ b/examples/widgets/mainwindows/mdi/mdi.py @@ -43,7 +43,7 @@ """PySide2 port of the widgets/draganddrop/draggabletext example from Qt v5.x, originating from PyQt""" from PySide2.QtCore import (QFile, QFileInfo, QPoint, QSettings, QSignalMapper, - QSize, QTextStream, Qt) + QSaveFile, QSize, QTextStream, Qt) from PySide2.QtGui import QIcon, QKeySequence from PySide2.QtWidgets import (QAction, QApplication, QFileDialog, QMainWindow, QMdiArea, QMessageBox, QTextEdit, QWidget) @@ -100,18 +100,22 @@ class MdiChild(QTextEdit): return self.saveFile(fileName) def saveFile(self, fileName): - file = QFile(fileName) - - if not file.open(QFile.WriteOnly | QFile.Text): - QMessageBox.warning(self, "MDI", - "Cannot write file %s:\n%s." % (fileName, file.errorString())) - return False - - outstr = QTextStream(file) + error = None QApplication.setOverrideCursor(Qt.WaitCursor) - outstr << self.toPlainText() + file = QSaveFile(fileName) + if file.open(QFile.WriteOnly | QFile.Text): + outstr = QTextStream(file) + outstr << self.toPlainText() + if not file.commit(): + error = "Cannot write file %s:\n%s." % (fileName, file.errorString()) + else: + error = "Cannot open file %s:\n%s." % (fileName, file.errorString()) QApplication.restoreOverrideCursor() + if error: + QMessageBox.warning(self, "MDI", error) + return False + self.setCurrentFile(fileName) return True |