diff options
Diffstat (limited to 'sources/pyside6/doc/tutorials/expenses/steps')
10 files changed, 137 insertions, 620 deletions
diff --git a/sources/pyside6/doc/tutorials/expenses/steps/01-expenses.py b/sources/pyside6/doc/tutorials/expenses/steps/01-expenses.py index c4dc9b3f6..27f2aef65 100644 --- a/sources/pyside6/doc/tutorials/expenses/steps/01-expenses.py +++ b/sources/pyside6/doc/tutorials/expenses/steps/01-expenses.py @@ -1,42 +1,5 @@ -############################################################################# -## -## Copyright (C) 2019 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the Qt for Python examples of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:BSD$ -## You may use this file under the terms of the BSD license as follows: -## -## "Redistribution and use in source and binary forms, with or without -## modification, are permitted provided that the following conditions are -## met: -## * Redistributions of source code must retain the above copyright -## notice, this list of conditions and the following disclaimer. -## * Redistributions in binary form must reproduce the above copyright -## notice, this list of conditions and the following disclaimer in -## the documentation and/or other materials provided with the -## distribution. -## * Neither the name of The Qt Company Ltd nor the names of its -## contributors may be used to endorse or promote products derived -## from this software without specific prior written permission. -## -## -## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -## "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -## LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -## A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -## OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -## DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -## -## $QT_END_LICENSE$ -## -############################################################################# +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import sys from PySide6.QtWidgets import QApplication, QMainWindow @@ -44,7 +7,7 @@ from PySide6.QtWidgets import QApplication, QMainWindow class MainWindow(QMainWindow): def __init__(self): - QMainWindow.__init__(self) + super().__init__() self.setWindowTitle("Tutorial") if __name__ == "__main__": diff --git a/sources/pyside6/doc/tutorials/expenses/steps/02-expenses.py b/sources/pyside6/doc/tutorials/expenses/steps/02-expenses.py index 5899ae798..039b818df 100644 --- a/sources/pyside6/doc/tutorials/expenses/steps/02-expenses.py +++ b/sources/pyside6/doc/tutorials/expenses/steps/02-expenses.py @@ -1,51 +1,13 @@ -############################################################################# -## -## Copyright (C) 2019 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the Qt for Python examples of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:BSD$ -## You may use this file under the terms of the BSD license as follows: -## -## "Redistribution and use in source and binary forms, with or without -## modification, are permitted provided that the following conditions are -## met: -## * Redistributions of source code must retain the above copyright -## notice, this list of conditions and the following disclaimer. -## * Redistributions in binary form must reproduce the above copyright -## notice, this list of conditions and the following disclaimer in -## the documentation and/or other materials provided with the -## distribution. -## * Neither the name of The Qt Company Ltd nor the names of its -## contributors may be used to endorse or promote products derived -## from this software without specific prior written permission. -## -## -## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -## "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -## LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -## A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -## OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -## DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -## -## $QT_END_LICENSE$ -## -############################################################################# +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import sys -from PySide6.QtGui import QAction from PySide6.QtWidgets import QApplication, QMainWindow class MainWindow(QMainWindow): def __init__(self): - QMainWindow.__init__(self) + super().__init__() self.setWindowTitle("Tutorial") # Menu @@ -53,11 +15,9 @@ class MainWindow(QMainWindow): self.file_menu = self.menu.addMenu("File") # Exit QAction - exit_action = QAction("Exit", self) + exit_action = self.file_menu.addAction("Exit", self.close) exit_action.setShortcut("Ctrl+Q") - self.file_menu.addAction(exit_action) - if __name__ == "__main__": # Qt Application diff --git a/sources/pyside6/doc/tutorials/expenses/steps/03-expenses.py b/sources/pyside6/doc/tutorials/expenses/steps/03-expenses.py index d0ecd6844..039b818df 100644 --- a/sources/pyside6/doc/tutorials/expenses/steps/03-expenses.py +++ b/sources/pyside6/doc/tutorials/expenses/steps/03-expenses.py @@ -1,53 +1,13 @@ -############################################################################# -## -## Copyright (C) 2019 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the Qt for Python examples of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:BSD$ -## You may use this file under the terms of the BSD license as follows: -## -## "Redistribution and use in source and binary forms, with or without -## modification, are permitted provided that the following conditions are -## met: -## * Redistributions of source code must retain the above copyright -## notice, this list of conditions and the following disclaimer. -## * Redistributions in binary form must reproduce the above copyright -## notice, this list of conditions and the following disclaimer in -## the documentation and/or other materials provided with the -## distribution. -## * Neither the name of The Qt Company Ltd nor the names of its -## contributors may be used to endorse or promote products derived -## from this software without specific prior written permission. -## -## -## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -## "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -## LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -## A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -## OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -## DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -## -## $QT_END_LICENSE$ -## -############################################################################# +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import sys -from PySide6.QtCore import Slot -from PySide6.QtGui import QAction from PySide6.QtWidgets import QApplication, QMainWindow -from PySide6.QtCharts import QtCharts class MainWindow(QMainWindow): def __init__(self): - QMainWindow.__init__(self) + super().__init__() self.setWindowTitle("Tutorial") # Menu @@ -55,15 +15,8 @@ class MainWindow(QMainWindow): self.file_menu = self.menu.addMenu("File") # Exit QAction - exit_action = QAction("Exit", self) + exit_action = self.file_menu.addAction("Exit", self.close) exit_action.setShortcut("Ctrl+Q") - exit_action.triggered.connect(self.exit_app) - - self.file_menu.addAction(exit_action) - - @Slot() - def exit_app(self, checked): - QApplication.quit() if __name__ == "__main__": diff --git a/sources/pyside6/doc/tutorials/expenses/steps/04-expenses.py b/sources/pyside6/doc/tutorials/expenses/steps/04-expenses.py index 7f7df478a..6723690a8 100644 --- a/sources/pyside6/doc/tutorials/expenses/steps/04-expenses.py +++ b/sources/pyside6/doc/tutorials/expenses/steps/04-expenses.py @@ -1,52 +1,13 @@ -############################################################################# -## -## Copyright (C) 2019 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the Qt for Python examples of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:BSD$ -## You may use this file under the terms of the BSD license as follows: -## -## "Redistribution and use in source and binary forms, with or without -## modification, are permitted provided that the following conditions are -## met: -## * Redistributions of source code must retain the above copyright -## notice, this list of conditions and the following disclaimer. -## * Redistributions in binary form must reproduce the above copyright -## notice, this list of conditions and the following disclaimer in -## the documentation and/or other materials provided with the -## distribution. -## * Neither the name of The Qt Company Ltd nor the names of its -## contributors may be used to endorse or promote products derived -## from this software without specific prior written permission. -## -## -## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -## "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -## LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -## A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -## OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -## DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -## -## $QT_END_LICENSE$ -## -############################################################################# +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import sys -from PySide6.QtCore import Slot -from PySide6.QtGui import QAction from PySide6.QtWidgets import QApplication, QMainWindow, QWidget class Widget(QWidget): def __init__(self): - QWidget.__init__(self) + super().__init__() # Example data self._data = {"Water": 24.5, "Electricity": 55.1, "Rent": 850.0, @@ -56,7 +17,7 @@ class Widget(QWidget): class MainWindow(QMainWindow): def __init__(self, widget): - QMainWindow.__init__(self) + super().__init__() self.setWindowTitle("Tutorial") # Menu @@ -64,17 +25,11 @@ class MainWindow(QMainWindow): self.file_menu = self.menu.addMenu("File") # Exit QAction - exit_action = QAction("Exit", self) + exit_action = self.file_menu.addAction("Exit", self.close) exit_action.setShortcut("Ctrl+Q") - exit_action.triggered.connect(self.exit_app) - self.file_menu.addAction(exit_action) self.setCentralWidget(widget) - @Slot() - def exit_app(self, checked): - QApplication.quit() - if __name__ == "__main__": # Qt Application diff --git a/sources/pyside6/doc/tutorials/expenses/steps/05-expenses.py b/sources/pyside6/doc/tutorials/expenses/steps/05-expenses.py index b88c9a7d8..df0362fde 100644 --- a/sources/pyside6/doc/tutorials/expenses/steps/05-expenses.py +++ b/sources/pyside6/doc/tutorials/expenses/steps/05-expenses.py @@ -1,53 +1,15 @@ -############################################################################# -## -## Copyright (C) 2019 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the Qt for Python examples of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:BSD$ -## You may use this file under the terms of the BSD license as follows: -## -## "Redistribution and use in source and binary forms, with or without -## modification, are permitted provided that the following conditions are -## met: -## * Redistributions of source code must retain the above copyright -## notice, this list of conditions and the following disclaimer. -## * Redistributions in binary form must reproduce the above copyright -## notice, this list of conditions and the following disclaimer in -## the documentation and/or other materials provided with the -## distribution. -## * Neither the name of The Qt Company Ltd nor the names of its -## contributors may be used to endorse or promote products derived -## from this software without specific prior written permission. -## -## -## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -## "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -## LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -## A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -## OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -## DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -## -## $QT_END_LICENSE$ -## -############################################################################# +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import sys -from PySide6.QtCore import Slot -from PySide6.QtGui import QAction -from PySide6.QtWidgets import (QApplication, QHeaderView, QHBoxLayout, QMainWindow, - QTableWidget, QTableWidgetItem, QWidget) +from PySide6.QtWidgets import (QApplication, QHeaderView, QHBoxLayout, + QMainWindow, QTableWidget, QTableWidgetItem, + QWidget) class Widget(QWidget): def __init__(self): - QWidget.__init__(self) + super().__init__() self.items = 0 # Example data @@ -62,14 +24,9 @@ class Widget(QWidget): self.table.horizontalHeader().setSectionResizeMode(QHeaderView.Stretch) # QWidget Layout - self.layout = QHBoxLayout() - - #self.table_view.setSizePolicy(size) + self.layout = QHBoxLayout(self) self.layout.addWidget(self.table) - # Set the layout to the QWidget - self.setLayout(self.layout) - # Fill example data self.fill_table() @@ -84,7 +41,7 @@ class Widget(QWidget): class MainWindow(QMainWindow): def __init__(self, widget): - QMainWindow.__init__(self) + super().__init__() self.setWindowTitle("Tutorial") # Menu @@ -92,17 +49,11 @@ class MainWindow(QMainWindow): self.file_menu = self.menu.addMenu("File") # Exit QAction - exit_action = QAction("Exit", self) + exit_action = self.file_menu.addAction("Exit", self.close) exit_action.setShortcut("Ctrl+Q") - exit_action.triggered.connect(self.exit_app) - self.file_menu.addAction(exit_action) self.setCentralWidget(widget) - @Slot() - def exit_app(self, checked): - QApplication.quit() - if __name__ == "__main__": # Qt Application diff --git a/sources/pyside6/doc/tutorials/expenses/steps/06-expenses.py b/sources/pyside6/doc/tutorials/expenses/steps/06-expenses.py index f65ede982..d19a6220f 100644 --- a/sources/pyside6/doc/tutorials/expenses/steps/06-expenses.py +++ b/sources/pyside6/doc/tutorials/expenses/steps/06-expenses.py @@ -1,54 +1,16 @@ -############################################################################# -## -## Copyright (C) 2019 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the Qt for Python examples of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:BSD$ -## You may use this file under the terms of the BSD license as follows: -## -## "Redistribution and use in source and binary forms, with or without -## modification, are permitted provided that the following conditions are -## met: -## * Redistributions of source code must retain the above copyright -## notice, this list of conditions and the following disclaimer. -## * Redistributions in binary form must reproduce the above copyright -## notice, this list of conditions and the following disclaimer in -## the documentation and/or other materials provided with the -## distribution. -## * Neither the name of The Qt Company Ltd nor the names of its -## contributors may be used to endorse or promote products derived -## from this software without specific prior written permission. -## -## -## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -## "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -## LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -## A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -## OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -## DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -## -## $QT_END_LICENSE$ -## -############################################################################# +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import sys -from PySide6.QtCore import Slot -from PySide6.QtGui import QAction -from PySide6.QtWidgets import (QApplication, QHeaderView, QHBoxLayout, QLabel, QLineEdit, - QMainWindow, QPushButton, QTableWidget, QTableWidgetItem, - QVBoxLayout, QWidget) +from PySide6.QtWidgets import (QApplication, QFormLayout, QHeaderView, + QHBoxLayout, QLineEdit, QMainWindow, QPushButton, + QTableWidget, QTableWidgetItem, QVBoxLayout, + QWidget) class Widget(QWidget): def __init__(self): - QWidget.__init__(self) + super().__init__() self.items = 0 # Example data @@ -64,32 +26,27 @@ class Widget(QWidget): # Right self.description = QLineEdit() + self.description.setClearButtonEnabled(True) self.price = QLineEdit() + self.price.setClearButtonEnabled(True) + self.add = QPushButton("Add") self.clear = QPushButton("Clear") - self.quit = QPushButton("Quit") + form_layout = QFormLayout() + form_layout.addRow("Description", self.description) + form_layout.addRow("Price", self.price) self.right = QVBoxLayout() - self.right.setMargin(10) - self.right.addWidget(QLabel("Description")) - self.right.addWidget(self.description) - self.right.addWidget(QLabel("Price")) - self.right.addWidget(self.price) + self.right.addLayout(form_layout) self.right.addWidget(self.add) self.right.addStretch() self.right.addWidget(self.clear) - self.right.addWidget(self.quit) # QWidget Layout - self.layout = QHBoxLayout() - - #self.table_view.setSizePolicy(size) + self.layout = QHBoxLayout(self) self.layout.addWidget(self.table) self.layout.addLayout(self.right) - # Set the layout to the QWidget - self.setLayout(self.layout) - # Fill example data self.fill_table() @@ -104,7 +61,7 @@ class Widget(QWidget): class MainWindow(QMainWindow): def __init__(self, widget): - QMainWindow.__init__(self) + super().__init__() self.setWindowTitle("Tutorial") # Menu @@ -112,17 +69,11 @@ class MainWindow(QMainWindow): self.file_menu = self.menu.addMenu("File") # Exit QAction - exit_action = QAction("Exit", self) + exit_action = self.file_menu.addAction("Exit", self.close) exit_action.setShortcut("Ctrl+Q") - exit_action.triggered.connect(self.exit_app) - self.file_menu.addAction(exit_action) self.setCentralWidget(widget) - @Slot() - def exit_app(self, checked): - QApplication.quit() - if __name__ == "__main__": # Qt Application diff --git a/sources/pyside6/doc/tutorials/expenses/steps/07-expenses.py b/sources/pyside6/doc/tutorials/expenses/steps/07-expenses.py index cdae2a847..b1ed3fecc 100644 --- a/sources/pyside6/doc/tutorials/expenses/steps/07-expenses.py +++ b/sources/pyside6/doc/tutorials/expenses/steps/07-expenses.py @@ -1,54 +1,17 @@ -############################################################################# -## -## Copyright (C) 2019 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the Qt for Python examples of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:BSD$ -## You may use this file under the terms of the BSD license as follows: -## -## "Redistribution and use in source and binary forms, with or without -## modification, are permitted provided that the following conditions are -## met: -## * Redistributions of source code must retain the above copyright -## notice, this list of conditions and the following disclaimer. -## * Redistributions in binary form must reproduce the above copyright -## notice, this list of conditions and the following disclaimer in -## the documentation and/or other materials provided with the -## distribution. -## * Neither the name of The Qt Company Ltd nor the names of its -## contributors may be used to endorse or promote products derived -## from this software without specific prior written permission. -## -## -## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -## "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -## LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -## A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -## OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -## DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -## -## $QT_END_LICENSE$ -## -############################################################################# +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import sys from PySide6.QtCore import Slot -from PySide6.QtGui import QAction -from PySide6.QtWidgets import (QApplication, QHeaderView, QHBoxLayout, QLabel, QLineEdit, - QMainWindow, QPushButton, QTableWidget, QTableWidgetItem, - QVBoxLayout, QWidget) +from PySide6.QtWidgets import (QApplication, QFormLayout, QHeaderView, + QHBoxLayout, QLineEdit, QMainWindow, QPushButton, + QTableWidget, QTableWidgetItem, QVBoxLayout, + QWidget) class Widget(QWidget): def __init__(self): - QWidget.__init__(self) + super().__init__() self.items = 0 # Example data @@ -64,34 +27,28 @@ class Widget(QWidget): # Right self.description = QLineEdit() + self.description.setClearButtonEnabled(True) self.price = QLineEdit() + self.price.setClearButtonEnabled(True) + self.add = QPushButton("Add") self.clear = QPushButton("Clear") - self.quit = QPushButton("Quit") + form_layout = QFormLayout() + form_layout.addRow("Description", self.description) + form_layout.addRow("Price", self.price) self.right = QVBoxLayout() - self.right.setMargin(10) - self.right.addWidget(QLabel("Description")) - self.right.addWidget(self.description) - self.right.addWidget(QLabel("Price")) - self.right.addWidget(self.price) + self.right.addLayout(form_layout) self.right.addWidget(self.add) self.right.addStretch() - self.right.addWidget(self.quit) # QWidget Layout - self.layout = QHBoxLayout() - - #self.table_view.setSizePolicy(size) + self.layout = QHBoxLayout(self) self.layout.addWidget(self.table) self.layout.addLayout(self.right) - # Set the layout to the QWidget - self.setLayout(self.layout) - # Signals and Slots self.add.clicked.connect(self.add_element) - self.quit.clicked.connect(self.quit_application) self.clear.clicked.connect(self.clear_table) # Fill example data @@ -106,15 +63,11 @@ class Widget(QWidget): self.table.setItem(self.items, 0, QTableWidgetItem(des)) self.table.setItem(self.items, 1, QTableWidgetItem(price)) - self.description.setText("") - self.price.setText("") + self.description.clear() + self.price.clear() self.items += 1 - @Slot() - def quit_application(self): - QApplication.quit() - def fill_table(self, data=None): data = self._data if not data else data for desc, price in data.items(): @@ -131,7 +84,7 @@ class Widget(QWidget): class MainWindow(QMainWindow): def __init__(self, widget): - QMainWindow.__init__(self) + super().__init__() self.setWindowTitle("Tutorial") # Menu @@ -139,17 +92,11 @@ class MainWindow(QMainWindow): self.file_menu = self.menu.addMenu("File") # Exit QAction - exit_action = QAction("Exit", self) + exit_action = self.file_menu.addAction("Exit", self.close) exit_action.setShortcut("Ctrl+Q") - exit_action.triggered.connect(self.exit_app) - self.file_menu.addAction(exit_action) self.setCentralWidget(widget) - @Slot() - def exit_app(self, checked): - QApplication.quit() - if __name__ == "__main__": # Qt Application diff --git a/sources/pyside6/doc/tutorials/expenses/steps/08-expenses.py b/sources/pyside6/doc/tutorials/expenses/steps/08-expenses.py index 907ee253b..0e7e21a32 100644 --- a/sources/pyside6/doc/tutorials/expenses/steps/08-expenses.py +++ b/sources/pyside6/doc/tutorials/expenses/steps/08-expenses.py @@ -1,54 +1,17 @@ -############################################################################# -## -## Copyright (C) 2019 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the Qt for Python examples of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:BSD$ -## You may use this file under the terms of the BSD license as follows: -## -## "Redistribution and use in source and binary forms, with or without -## modification, are permitted provided that the following conditions are -## met: -## * Redistributions of source code must retain the above copyright -## notice, this list of conditions and the following disclaimer. -## * Redistributions in binary form must reproduce the above copyright -## notice, this list of conditions and the following disclaimer in -## the documentation and/or other materials provided with the -## distribution. -## * Neither the name of The Qt Company Ltd nor the names of its -## contributors may be used to endorse or promote products derived -## from this software without specific prior written permission. -## -## -## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -## "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -## LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -## A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -## OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -## DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -## -## $QT_END_LICENSE$ -## -############################################################################# +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import sys from PySide6.QtCore import Slot -from PySide6.QtGui import QAction -from PySide6.QtWidgets import (QApplication, QHeaderView, QHBoxLayout, QLabel, QLineEdit, - QMainWindow, QPushButton, QTableWidget, QTableWidgetItem, - QVBoxLayout, QWidget) +from PySide6.QtWidgets import (QApplication, QFormLayout, QHeaderView, + QHBoxLayout, QLineEdit, QMainWindow, QPushButton, + QTableWidget, QTableWidgetItem, QVBoxLayout, + QWidget) class Widget(QWidget): def __init__(self): - QWidget.__init__(self) + super().__init__() self.items = 0 # Example data @@ -64,41 +27,35 @@ class Widget(QWidget): # Right self.description = QLineEdit() + self.description.setClearButtonEnabled(True) self.price = QLineEdit() + self.price.setClearButtonEnabled(True) + self.add = QPushButton("Add") self.clear = QPushButton("Clear") - self.quit = QPushButton("Quit") # Disabling 'Add' button self.add.setEnabled(False) + form_layout = QFormLayout() + form_layout.addRow("Description", self.description) + form_layout.addRow("Price", self.price) self.right = QVBoxLayout() - self.right.setMargin(10) - self.right.addWidget(QLabel("Description")) - self.right.addWidget(self.description) - self.right.addWidget(QLabel("Price")) - self.right.addWidget(self.price) + self.right.addLayout(form_layout) self.right.addWidget(self.add) self.right.addStretch() self.right.addWidget(self.clear) - self.right.addWidget(self.quit) # QWidget Layout - self.layout = QHBoxLayout() - - #self.table_view.setSizePolicy(size) + self.layout = QHBoxLayout(self) self.layout.addWidget(self.table) self.layout.addLayout(self.right) - # Set the layout to the QWidget - self.setLayout(self.layout) - # Signals and Slots self.add.clicked.connect(self.add_element) - self.quit.clicked.connect(self.quit_application) self.clear.clicked.connect(self.clear_table) - self.description.textChanged[str].connect(self.check_disable) - self.price.textChanged[str].connect(self.check_disable) + self.description.textChanged.connect(self.check_disable) + self.price.textChanged.connect(self.check_disable) # Fill example data self.fill_table() @@ -112,21 +69,15 @@ class Widget(QWidget): self.table.setItem(self.items, 0, QTableWidgetItem(des)) self.table.setItem(self.items, 1, QTableWidgetItem(price)) - self.description.setText("") - self.price.setText("") + self.description.clear() + self.price.clear() self.items += 1 @Slot() def check_disable(self, s): - if not self.description.text() or not self.price.text(): - self.add.setEnabled(False) - else: - self.add.setEnabled(True) - - @Slot() - def quit_application(self): - QApplication.quit() + enabled = bool(self.description.text() and self.price.text()) + self.add.setEnabled(enabled) def fill_table(self, data=None): data = self._data if not data else data @@ -144,7 +95,7 @@ class Widget(QWidget): class MainWindow(QMainWindow): def __init__(self, widget): - QMainWindow.__init__(self) + super().__init__() self.setWindowTitle("Tutorial") # Menu @@ -152,17 +103,11 @@ class MainWindow(QMainWindow): self.file_menu = self.menu.addMenu("File") # Exit QAction - exit_action = QAction("Exit", self) + exit_action = self.file_menu.addAction("Exit", self.close) exit_action.setShortcut("Ctrl+Q") - exit_action.triggered.connect(self.exit_app) - self.file_menu.addAction(exit_action) self.setCentralWidget(widget) - @Slot() - def exit_app(self, checked): - QApplication.quit() - if __name__ == "__main__": # Qt Application diff --git a/sources/pyside6/doc/tutorials/expenses/steps/09-expenses.py b/sources/pyside6/doc/tutorials/expenses/steps/09-expenses.py index 7c4f7b252..279a46512 100644 --- a/sources/pyside6/doc/tutorials/expenses/steps/09-expenses.py +++ b/sources/pyside6/doc/tutorials/expenses/steps/09-expenses.py @@ -1,55 +1,19 @@ -############################################################################# -## -## Copyright (C) 2019 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the Qt for Python examples of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:BSD$ -## You may use this file under the terms of the BSD license as follows: -## -## "Redistribution and use in source and binary forms, with or without -## modification, are permitted provided that the following conditions are -## met: -## * Redistributions of source code must retain the above copyright -## notice, this list of conditions and the following disclaimer. -## * Redistributions in binary form must reproduce the above copyright -## notice, this list of conditions and the following disclaimer in -## the documentation and/or other materials provided with the -## distribution. -## * Neither the name of The Qt Company Ltd nor the names of its -## contributors may be used to endorse or promote products derived -## from this software without specific prior written permission. -## -## -## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -## "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -## LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -## A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -## OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -## DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -## -## $QT_END_LICENSE$ -## -############################################################################# +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import sys from PySide6.QtCore import Slot -from PySide6.QtGui import QAction, QPainter -from PySide6.QtWidgets import (QApplication, QHeaderView, QHBoxLayout, QLabel, QLineEdit, - QMainWindow, QPushButton, QTableWidget, QTableWidgetItem, +from PySide6.QtGui import QPainter +from PySide6.QtWidgets import (QApplication, QFormLayout, QHeaderView, + QHBoxLayout, QLineEdit, QMainWindow, + QPushButton, QTableWidget, QTableWidgetItem, QVBoxLayout, QWidget) -from PySide6.QtCharts import QtCharts +from PySide6.QtCharts import QChartView class Widget(QWidget): def __init__(self): - QWidget.__init__(self) + super().__init__() self.items = 0 # Example data @@ -64,48 +28,42 @@ class Widget(QWidget): self.table.horizontalHeader().setSectionResizeMode(QHeaderView.Stretch) # Chart - self.chart_view = QtCharts.QChartView() + self.chart_view = QChartView() self.chart_view.setRenderHint(QPainter.Antialiasing) # Right self.description = QLineEdit() + self.description.setClearButtonEnabled(True) self.price = QLineEdit() + self.price.setClearButtonEnabled(True) self.add = QPushButton("Add") self.clear = QPushButton("Clear") - self.quit = QPushButton("Quit") self.plot = QPushButton("Plot") # Disabling 'Add' button self.add.setEnabled(False) + form_layout = QFormLayout() + form_layout.addRow("Description", self.description) + form_layout.addRow("Price", self.price) self.right = QVBoxLayout() - self.right.setMargin(10) - self.right.addWidget(QLabel("Description")) - self.right.addWidget(self.description) - self.right.addWidget(QLabel("Price")) - self.right.addWidget(self.price) + self.right.addLayout(form_layout) self.right.addWidget(self.add) self.right.addWidget(self.plot) self.right.addWidget(self.chart_view) self.right.addWidget(self.clear) - self.right.addWidget(self.quit) # QWidget Layout - self.layout = QHBoxLayout() + self.layout = QHBoxLayout(self) - #self.table_view.setSizePolicy(size) self.layout.addWidget(self.table) self.layout.addLayout(self.right) - # Set the layout to the QWidget - self.setLayout(self.layout) - # Signals and Slots self.add.clicked.connect(self.add_element) - self.quit.clicked.connect(self.quit_application) self.clear.clicked.connect(self.clear_table) - self.description.textChanged[str].connect(self.check_disable) - self.price.textChanged[str].connect(self.check_disable) + self.description.textChanged.connect(self.check_disable) + self.price.textChanged.connect(self.check_disable) # Fill example data self.fill_table() @@ -119,21 +77,15 @@ class Widget(QWidget): self.table.setItem(self.items, 0, QTableWidgetItem(des)) self.table.setItem(self.items, 1, QTableWidgetItem(price)) - self.description.setText("") - self.price.setText("") + self.description.clear() + self.price.clear() self.items += 1 @Slot() def check_disable(self, s): - if not self.description.text() or not self.price.text(): - self.add.setEnabled(False) - else: - self.add.setEnabled(True) - - @Slot() - def quit_application(self): - QApplication.quit() + enabled = bool(self.description.text() and self.price.text()) + self.add.setEnabled(enabled) def fill_table(self, data=None): data = self._data if not data else data @@ -151,7 +103,7 @@ class Widget(QWidget): class MainWindow(QMainWindow): def __init__(self, widget): - QMainWindow.__init__(self) + super().__init__() self.setWindowTitle("Tutorial") # Menu @@ -159,17 +111,11 @@ class MainWindow(QMainWindow): self.file_menu = self.menu.addMenu("File") # Exit QAction - exit_action = QAction("Exit", self) + exit_action = self.file_menu.addAction("Exit", self.close) exit_action.setShortcut("Ctrl+Q") - exit_action.triggered.connect(self.exit_app) - self.file_menu.addAction(exit_action) self.setCentralWidget(widget) - @Slot() - def exit_app(self, checked): - QApplication.quit() - if __name__ == "__main__": # Qt Application diff --git a/sources/pyside6/doc/tutorials/expenses/steps/10-expenses.py b/sources/pyside6/doc/tutorials/expenses/steps/10-expenses.py index 1ad6c3743..a3a998470 100644 --- a/sources/pyside6/doc/tutorials/expenses/steps/10-expenses.py +++ b/sources/pyside6/doc/tutorials/expenses/steps/10-expenses.py @@ -1,55 +1,19 @@ -############################################################################# -## -## Copyright (C) 2019 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the Qt for Python examples of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:BSD$ -## You may use this file under the terms of the BSD license as follows: -## -## "Redistribution and use in source and binary forms, with or without -## modification, are permitted provided that the following conditions are -## met: -## * Redistributions of source code must retain the above copyright -## notice, this list of conditions and the following disclaimer. -## * Redistributions in binary form must reproduce the above copyright -## notice, this list of conditions and the following disclaimer in -## the documentation and/or other materials provided with the -## distribution. -## * Neither the name of The Qt Company Ltd nor the names of its -## contributors may be used to endorse or promote products derived -## from this software without specific prior written permission. -## -## -## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -## "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -## LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -## A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -## OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -## DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -## -## $QT_END_LICENSE$ -## -############################################################################# +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import sys from PySide6.QtCore import Qt, Slot -from PySide6.QtGui import QAction, QPainter -from PySide6.QtWidgets import (QQApplication, QHeaderView, QHBoxLayout, QLabel, QLineEdit, - QMainWindow, QPushButton, QTableWidget, QTableWidgetItem, +from PySide6.QtGui import QPainter +from PySide6.QtWidgets import (QApplication, QFormLayout, QHeaderView, + QHBoxLayout, QLineEdit, QMainWindow, + QPushButton, QTableWidget, QTableWidgetItem, QVBoxLayout, QWidget) -from PySide6.QtCharts import QtCharts +from PySide6.QtCharts import QChartView, QPieSeries, QChart class Widget(QWidget): def __init__(self): - QWidget.__init__(self) + super().__init__() self.items = 0 # Example data @@ -64,49 +28,43 @@ class Widget(QWidget): self.table.horizontalHeader().setSectionResizeMode(QHeaderView.Stretch) # Chart - self.chart_view = QtCharts.QChartView() + self.chart_view = QChartView() self.chart_view.setRenderHint(QPainter.Antialiasing) # Right self.description = QLineEdit() + self.description.setClearButtonEnabled(True) self.price = QLineEdit() + self.price.setClearButtonEnabled(True) + self.add = QPushButton("Add") self.clear = QPushButton("Clear") - self.quit = QPushButton("Quit") self.plot = QPushButton("Plot") # Disabling 'Add' button self.add.setEnabled(False) + form_layout = QFormLayout() + form_layout.addRow("Description", self.description) + form_layout.addRow("Price", self.price) self.right = QVBoxLayout() - self.right.setMargin(10) - self.right.addWidget(QLabel("Description")) - self.right.addWidget(self.description) - self.right.addWidget(QLabel("Price")) - self.right.addWidget(self.price) + self.right.addLayout(form_layout) self.right.addWidget(self.add) self.right.addWidget(self.plot) self.right.addWidget(self.chart_view) self.right.addWidget(self.clear) - self.right.addWidget(self.quit) # QWidget Layout - self.layout = QHBoxLayout() - - #self.table_view.setSizePolicy(size) + self.layout = QHBoxLayout(self) self.layout.addWidget(self.table) self.layout.addLayout(self.right) - # Set the layout to the QWidget - self.setLayout(self.layout) - # Signals and Slots self.add.clicked.connect(self.add_element) - self.quit.clicked.connect(self.quit_application) self.plot.clicked.connect(self.plot_data) self.clear.clicked.connect(self.clear_table) - self.description.textChanged[str].connect(self.check_disable) - self.price.textChanged[str].connect(self.check_disable) + self.description.textChanged.connect(self.check_disable) + self.price.textChanged.connect(self.check_disable) # Fill example data self.fill_table() @@ -114,46 +72,40 @@ class Widget(QWidget): @Slot() def add_element(self): des = self.description.text() - price = self.price.text() + price = float(self.price.text()) self.table.insertRow(self.items) description_item = QTableWidgetItem(des) - price_item = QTableWidgetItem(f"{float(price):.2f}") + price_item = QTableWidgetItem(f"{price:.2f}") price_item.setTextAlignment(Qt.AlignRight) self.table.setItem(self.items, 0, description_item) self.table.setItem(self.items, 1, price_item) - self.description.setText("") - self.price.setText("") + self.description.clear() + self.price.clear() self.items += 1 @Slot() def check_disable(self, s): - if not self.description.text() or not self.price.text(): - self.add.setEnabled(False) - else: - self.add.setEnabled(True) + enabled = bool(self.description.text() and self.price.text()) + self.add.setEnabled(enabled) @Slot() def plot_data(self): # Get table information - series = QtCharts.QPieSeries() + series = QPieSeries() for i in range(self.table.rowCount()): text = self.table.item(i, 0).text() number = float(self.table.item(i, 1).text()) series.append(text, number) - chart = QtCharts.QChart() + chart = QChart() chart.addSeries(series) chart.legend().setAlignment(Qt.AlignLeft) self.chart_view.setChart(chart) - @Slot() - def quit_application(self): - QApplication.quit() - def fill_table(self, data=None): data = self._data if not data else data for desc, price in data.items(): @@ -173,7 +125,7 @@ class Widget(QWidget): class MainWindow(QMainWindow): def __init__(self, widget): - QMainWindow.__init__(self) + super().__init__() self.setWindowTitle("Tutorial") # Menu @@ -181,17 +133,11 @@ class MainWindow(QMainWindow): self.file_menu = self.menu.addMenu("File") # Exit QAction - exit_action = QAction("Exit", self) + exit_action = self.file_menu.addAction("Exit", self.close) exit_action.setShortcut("Ctrl+Q") - exit_action.triggered.connect(self.exit_app) - self.file_menu.addAction(exit_action) self.setCentralWidget(widget) - @Slot() - def exit_app(self, checked): - QApplication.quit() - if __name__ == "__main__": # Qt Application |