diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-19 11:55:10 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-03 15:40:57 +0000 |
commit | ceeb82693a0240b1dd4f51605ba21413927ee558 (patch) | |
tree | 8363fe26b1f00823ff0b8f4c2d7af38bc3e4d087 /examples/widgets/mainwindows | |
parent | 0eec9fecd241a178ca8f09218b9286ae763f29b3 (diff) |
Initial port of Core,Gui,Widgets,Network,Qml,Quick to Qt 6
Test failures:
shiboken2:testmodifyfunction
pyside2:QtCore::qbytearray_test
pyside2:QtGui::bug_PYSIDE-41
pyside2:QtGui::deepcopy_test
pyside2:QtGui::qfontmetrics_test
pyside2:QtGui::qpixmapcache_test
pyside2:QtWidgets::api2_test (QTBUG-85417)
pyside2:QtWidgets::bug_632
pyside2:QtWidgets::bug_714
pyside2:QtWidgets::bug_785
pyside2:QtWidgets::qshortcut_test
pyside2:QtQml::bug_825
pyside2:QtQml::bug_1029
pyside2:QtQml::registertype
pyside2:QtQml::qqmlincubator_incubateWhile
pyside2:QtQml::signal_arguments
Task-number: PYSIDE-1339
Task-number: PYSIDE-904
Change-Id: Ia43d7ed037dfdd07def0edd76bada2243e73d335
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'examples/widgets/mainwindows')
-rw-r--r-- | examples/widgets/mainwindows/application/application.py | 20 | ||||
-rw-r--r-- | examples/widgets/mainwindows/dockwidgets/dockwidgets.py | 6 | ||||
-rw-r--r-- | examples/widgets/mainwindows/mdi/mdi.py | 4 |
3 files changed, 15 insertions, 15 deletions
diff --git a/examples/widgets/mainwindows/application/application.py b/examples/widgets/mainwindows/application/application.py index 8c4626f9b..d68e77b41 100644 --- a/examples/widgets/mainwindows/application/application.py +++ b/examples/widgets/mainwindows/application/application.py @@ -106,46 +106,46 @@ class MainWindow(QtWidgets.QMainWindow): self.setWindowModified(self.textEdit.document().isModified()) def createActions(self): - self.newAct = QtWidgets.QAction(QtGui.QIcon(':/images/new.png'), "&New", + self.newAct = QtGui.QAction(QtGui.QIcon(':/images/new.png'), "&New", self, shortcut=QtGui.QKeySequence.New, statusTip="Create a new file", triggered=self.newFile) - self.openAct = QtWidgets.QAction(QtGui.QIcon(':/images/open.png'), + self.openAct = QtGui.QAction(QtGui.QIcon(':/images/open.png'), "&Open...", self, shortcut=QtGui.QKeySequence.Open, statusTip="Open an existing file", triggered=self.open) - self.saveAct = QtWidgets.QAction(QtGui.QIcon(':/images/save.png'), + self.saveAct = QtGui.QAction(QtGui.QIcon(':/images/save.png'), "&Save", self, shortcut=QtGui.QKeySequence.Save, statusTip="Save the document to disk", triggered=self.save) - self.saveAsAct = QtWidgets.QAction("Save &As...", self, + self.saveAsAct = QtGui.QAction("Save &As...", self, shortcut=QtGui.QKeySequence.SaveAs, statusTip="Save the document under a new name", triggered=self.saveAs) - self.exitAct = QtWidgets.QAction("E&xit", self, shortcut="Ctrl+Q", + self.exitAct = QtGui.QAction("E&xit", self, shortcut="Ctrl+Q", statusTip="Exit the application", triggered=self.close) - self.cutAct = QtWidgets.QAction(QtGui.QIcon(':/images/cut.png'), "Cu&t", + self.cutAct = QtGui.QAction(QtGui.QIcon(':/images/cut.png'), "Cu&t", self, shortcut=QtGui.QKeySequence.Cut, statusTip="Cut the current selection's contents to the clipboard", triggered=self.textEdit.cut) - self.copyAct = QtWidgets.QAction(QtGui.QIcon(':/images/copy.png'), + self.copyAct = QtGui.QAction(QtGui.QIcon(':/images/copy.png'), "&Copy", self, shortcut=QtGui.QKeySequence.Copy, statusTip="Copy the current selection's contents to the clipboard", triggered=self.textEdit.copy) - self.pasteAct = QtWidgets.QAction(QtGui.QIcon(':/images/paste.png'), + self.pasteAct = QtGui.QAction(QtGui.QIcon(':/images/paste.png'), "&Paste", self, shortcut=QtGui.QKeySequence.Paste, statusTip="Paste the clipboard's contents into the current selection", triggered=self.textEdit.paste) - self.aboutAct = QtWidgets.QAction("&About", self, + self.aboutAct = QtGui.QAction("&About", self, statusTip="Show the application's About box", triggered=self.about) - self.aboutQtAct = QtWidgets.QAction("About &Qt", self, + self.aboutQtAct = QtGui.QAction("About &Qt", self, statusTip="Show the Qt library's About box", triggered=qApp.aboutQt) diff --git a/examples/widgets/mainwindows/dockwidgets/dockwidgets.py b/examples/widgets/mainwindows/dockwidgets/dockwidgets.py index 53f6f7818..3f8e7dbf7 100644 --- a/examples/widgets/mainwindows/dockwidgets/dockwidgets.py +++ b/examples/widgets/mainwindows/dockwidgets/dockwidgets.py @@ -43,10 +43,10 @@ """PySide2 port of the widgets/mainwindows/dockwidgets example from Qt v5.x, originating from PyQt""" from PySide2.QtCore import QDate, QFile, Qt, QTextStream -from PySide2.QtGui import (QFont, QIcon, QKeySequence, QTextCharFormat, - QTextCursor, QTextTableFormat) +from PySide2.QtGui import (QAction, QFont, QIcon, QKeySequence, + QTextCharFormat, QTextTableFormat) from PySide2.QtPrintSupport import QPrintDialog, QPrinter -from PySide2.QtWidgets import (QAction, QApplication, QDialog, QDockWidget, +from PySide2.QtWidgets import (QApplication, QDialog, QDockWidget, QFileDialog, QListWidget, QMainWindow, QMessageBox, QTextEdit) import dockwidgets_rc diff --git a/examples/widgets/mainwindows/mdi/mdi.py b/examples/widgets/mainwindows/mdi/mdi.py index 9daca826d..f9d90767e 100644 --- a/examples/widgets/mainwindows/mdi/mdi.py +++ b/examples/widgets/mainwindows/mdi/mdi.py @@ -44,8 +44,8 @@ from PySide2.QtCore import (QFile, QFileInfo, QPoint, QSettings, QSignalMapper, QSaveFile, QSize, QTextStream, Qt) -from PySide2.QtGui import QIcon, QKeySequence -from PySide2.QtWidgets import (QAction, QApplication, QFileDialog, QMainWindow, +from PySide2.QtGui import QAction, QIcon, QKeySequence +from PySide2.QtWidgets import (QApplication, QFileDialog, QMainWindow, QMdiArea, QMessageBox, QTextEdit, QWidget) import mdi_rc |