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/graphicsview | |
| 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/graphicsview')
| -rw-r--r-- | examples/widgets/graphicsview/diagramscene/diagramscene.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/examples/widgets/graphicsview/diagramscene/diagramscene.py b/examples/widgets/graphicsview/diagramscene/diagramscene.py index 3890782c4..048681bdb 100644 --- a/examples/widgets/graphicsview/diagramscene/diagramscene.py +++ b/examples/widgets/graphicsview/diagramscene/diagramscene.py @@ -607,38 +607,38 @@ class MainWindow(QtWidgets.QMainWindow): self.toolBox.addItem(backgroundWidget, "Backgrounds") def createActions(self): - self.toFrontAction = QtWidgets.QAction( + self.toFrontAction = QtGui.QAction( QtGui.QIcon(':/images/bringtofront.png'), "Bring to &Front", self, shortcut="Ctrl+F", statusTip="Bring item to front", triggered=self.bringToFront) - self.sendBackAction = QtWidgets.QAction( + self.sendBackAction = QtGui.QAction( QtGui.QIcon(':/images/sendtoback.png'), "Send to &Back", self, shortcut="Ctrl+B", statusTip="Send item to back", triggered=self.sendToBack) - self.deleteAction = QtWidgets.QAction(QtGui.QIcon(':/images/delete.png'), + self.deleteAction = QtGui.QAction(QtGui.QIcon(':/images/delete.png'), "&Delete", self, shortcut="Delete", statusTip="Delete item from diagram", triggered=self.deleteItem) - self.exitAction = QtWidgets.QAction("E&xit", self, shortcut="Ctrl+X", + self.exitAction = QtGui.QAction("E&xit", self, shortcut="Ctrl+X", statusTip="Quit Scenediagram example", triggered=self.close) - self.boldAction = QtWidgets.QAction(QtGui.QIcon(':/images/bold.png'), + self.boldAction = QtGui.QAction(QtGui.QIcon(':/images/bold.png'), "Bold", self, checkable=True, shortcut="Ctrl+B", triggered=self.handleFontChange) - self.italicAction = QtWidgets.QAction(QtGui.QIcon(':/images/italic.png'), + self.italicAction = QtGui.QAction(QtGui.QIcon(':/images/italic.png'), "Italic", self, checkable=True, shortcut="Ctrl+I", triggered=self.handleFontChange) - self.underlineAction = QtWidgets.QAction( + self.underlineAction = QtGui.QAction( QtGui.QIcon(':/images/underline.png'), "Underline", self, checkable=True, shortcut="Ctrl+U", triggered=self.handleFontChange) - self.aboutAction = QtWidgets.QAction("A&bout", self, shortcut="Ctrl+B", + self.aboutAction = QtGui.QAction("A&bout", self, shortcut="Ctrl+B", triggered=self.about) def createMenus(self): @@ -780,7 +780,7 @@ class MainWindow(QtWidgets.QMainWindow): colorMenu = QtWidgets.QMenu(self) for color, name in zip(colors, names): - action = QtWidgets.QAction(self.createColorIcon(color), name, self, + action = QtGui.QAction(self.createColorIcon(color), name, self, triggered=slot) action.setData(QtGui.QColor(color)) colorMenu.addAction(action) |