diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2024-12-20 08:35:46 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2025-01-06 11:52:18 +0100 |
| commit | 7189a4c5ec193d30c6bd4e68701038880cbc5982 (patch) | |
| tree | 87e4ec00d7e9d31e5df0c11b155e46ffd3726362 /examples/demos/documentviewer | |
| parent | ab8b330123cb557f66306b237f4c3aa8c0004f39 (diff) | |
Use fully qualified enumerations in more examples
Pick-to: 6.8
Task-number: PYSIDE-1735
Change-Id: Ic2c478ef363d73f65f366e21529c0429c86539aa
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'examples/demos/documentviewer')
5 files changed, 21 insertions, 20 deletions
diff --git a/examples/demos/documentviewer/abstractviewer.py b/examples/demos/documentviewer/abstractviewer.py index 87eaf6fc3..2c07c10c6 100644 --- a/examples/demos/documentviewer/abstractviewer.py +++ b/examples/demos/documentviewer/abstractviewer.py @@ -148,10 +148,10 @@ class AbstractViewer(QObject): if not self.hasContent(): self.statusMessage("No content to print.", type) return - printer = QPrinter(QPrinter.HighResolution) + printer = QPrinter(QPrinter.PrinterMode.HighResolution) dlg = QPrintDialog(printer, self.mainWindow()) dlg.setWindowTitle("Print Document") - if dlg.exec() == QDialog.Accepted: + if dlg.exec() == QDialog.DialogCode.Accepted: self.printDocument(printer) else: self.statusMessage("Printing canceled!", type) diff --git a/examples/demos/documentviewer/jsonviewer/jsonviewer.py b/examples/demos/documentviewer/jsonviewer/jsonviewer.py index 7923265ba..0cdf53692 100644 --- a/examples/demos/documentviewer/jsonviewer/jsonviewer.py +++ b/examples/demos/documentviewer/jsonviewer/jsonviewer.py @@ -189,14 +189,14 @@ class JsonViewer(AbstractViewer): zoomInIcon = QIcon.fromTheme(QIcon.ThemeIcon.ZoomIn) a = menu.addAction(zoomInIcon, "&+Expand all", self._tree.expandAll) tb.addAction(a) - a.setPriority(QAction.LowPriority) - a.setShortcut(QKeySequence.New) + a.setPriority(QAction.Priority.LowPriority) + a.setShortcut(QKeySequence.StandardKey.New) zoomOutIcon = QIcon.fromTheme(QIcon.ThemeIcon.ZoomOut) a = menu.addAction(zoomOutIcon, "&-Collapse all", self._tree.collapseAll) tb.addAction(a) - a.setPriority(QAction.LowPriority) - a.setShortcut(QKeySequence.New) + a.setPriority(QAction.Priority.LowPriority) + a.setShortcut(QKeySequence.StandardKey.New) if not self._searchKey: self._searchKey = QLineEdit(tb) @@ -224,8 +224,8 @@ class JsonViewer(AbstractViewer): self._toplevel.setAcceptDrops(True) self._tree.setDragEnabled(True) - self._tree.setContextMenuPolicy(Qt.CustomContextMenu) - self._toplevel.setContextMenuPolicy(Qt.CustomContextMenu) + self._tree.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu) + self._toplevel.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu) self._toplevel.itemClicked.connect(self.onTopLevelItemClicked) self._toplevel.itemDoubleClicked.connect(self.onTopLevelItemDoubleClicked) @@ -260,7 +260,7 @@ class JsonViewer(AbstractViewer): self.disablePrinting() file_name = QDir.toNativeSeparators(self._file.fileName()) type = "open" - self._file.open(QIODevice.ReadOnly) + self._file.open(QIODevice.OpenModeFlag.ReadOnly) self._text = self._file.readAll().data().decode("utf-8") self._file.close() diff --git a/examples/demos/documentviewer/mainwindow.py b/examples/demos/documentviewer/mainwindow.py index c3e853f38..d72cca283 100644 --- a/examples/demos/documentviewer/mainwindow.py +++ b/examples/demos/documentviewer/mainwindow.py @@ -67,7 +67,7 @@ class MainWindow(QMainWindow): def onActionOpenTriggered(self): fileDialog = QFileDialog(self, "Open Document", self._currentDir.absolutePath()) - while (fileDialog.exec() == QDialog.Accepted + while (fileDialog.exec() == QDialog.DialogCode.Accepted and not self.openFile(fileDialog.selectedFiles()[0])): pass diff --git a/examples/demos/documentviewer/pdfviewer/pdfviewer.py b/examples/demos/documentviewer/pdfviewer/pdfviewer.py index 049653381..a1f4e7447 100644 --- a/examples/demos/documentviewer/pdfviewer/pdfviewer.py +++ b/examples/demos/documentviewer/pdfviewer/pdfviewer.py @@ -126,7 +126,7 @@ class PdfViewer(AbstractViewer): def openPdfFile(self): self.disablePrinting() - if self._file.open(QIODevice.ReadOnly): + if self._file.open(QIODevice.OpenModeFlag.ReadOnly): self._document.load(self._file) documentTitle = self._document.metaData(QPdfDocument.MetaDataField.Title) diff --git a/examples/demos/documentviewer/txtviewer/txtviewer.py b/examples/demos/documentviewer/txtviewer/txtviewer.py index f2fe5bd37..31754eae2 100644 --- a/examples/demos/documentviewer/txtviewer/txtviewer.py +++ b/examples/demos/documentviewer/txtviewer/txtviewer.py @@ -32,7 +32,7 @@ class TxtViewer(AbstractViewer): cutIcon = QIcon.fromTheme(QIcon.ThemeIcon.EditCut, QIcon(":/demos/documentviewer/images/cut.png")) cutAct = QAction(cutIcon, "Cut", self) - cutAct.setShortcuts(QKeySequence.Cut) + cutAct.setShortcuts(QKeySequence.StandardKey.Cut) cutAct.setStatusTip("Cut the current selection's contents to the clipboard") cutAct.triggered.connect(self._textEdit.cut) editMenu.addAction(cutAct) @@ -41,7 +41,7 @@ class TxtViewer(AbstractViewer): copyIcon = QIcon.fromTheme(QIcon.ThemeIcon.EditCopy, QIcon(":/demos/documentviewer/images/copy.png")) copyAct = QAction(copyIcon, "Copy", self) - copyAct.setShortcuts(QKeySequence.Copy) + copyAct.setShortcuts(QKeySequence.StandardKey.Copy) copyAct.setStatusTip("Copy the current selection's contents to the clipboard") copyAct.triggered.connect(self._textEdit.copy) editMenu.addAction(copyAct) @@ -50,7 +50,7 @@ class TxtViewer(AbstractViewer): pasteIcon = QIcon.fromTheme(QIcon.ThemeIcon.EditPaste, QIcon(":/demos/documentviewer/images/paste.png")) pasteAct = QAction(pasteIcon, "Paste", self) - pasteAct.setShortcuts(QKeySequence.Paste) + pasteAct.setShortcuts(QKeySequence.StandardKey.Paste) pasteAct.setStatusTip("Paste the clipboard's contents into the current selection") pasteAct.triggered.connect(self._textEdit.paste) editMenu.addAction(pasteAct) @@ -88,13 +88,14 @@ class TxtViewer(AbstractViewer): def openFile(self): type = "open" file_name = QDir.toNativeSeparators(self._file.fileName()) - if not self._file.open(QFile.ReadOnly | QFile.Text): + if not self._file.open(QFile.OpenModeFlag.ReadOnly + | QFile.OpenModeFlag.Text): err = self._file.errorString() self.statusMessage(f"Cannot read file {file_name}:\n{err}.", type) return in_str = QTextStream(self._file) - QGuiApplication.setOverrideCursor(Qt.WaitCursor) + QGuiApplication.setOverrideCursor(Qt.CursorShape.WaitCursor) if self._textEdit.toPlainText(): self._textEdit.clear() self.disablePrinting() @@ -117,8 +118,8 @@ class TxtViewer(AbstractViewer): def saveFile(self, file): file_name = QDir.toNativeSeparators(self._file.fileName()) errorMessage = "" - QGuiApplication.setOverrideCursor(Qt.WaitCursor) - if file.open(QFile.WriteOnly | QFile.Text): + QGuiApplication.setOverrideCursor(Qt.CursorShape.WaitCursor) + if file.open(QFile.OpenModeFlag.WriteOnly | QFile.OpenModeFlag.Text): out = QTextStream(file) out << self._textEdit.toPlainText() else: @@ -136,8 +137,8 @@ class TxtViewer(AbstractViewer): def saveDocumentAs(self): dialog = QFileDialog(self.mainWindow()) dialog.setWindowModality(Qt.WindowModal) - dialog.setAcceptMode(QFileDialog.AcceptSave) - if dialog.exec() != QDialog.Accepted: + dialog.setAcceptMode(QFileDialog.AcceptMode.AcceptSave) + if dialog.exec() != QDialog.DialogCode.Accepted: return False files = dialog.selectedFiles() |