Update sample code

Author: lpozo

pyqt-calculator-tutorial/examples/dialog.py

@@ -1,39 +1,39 @@
-# Filename: dialog.py
-
-"""Dialog-Style application."""
+"""Dialog-style application."""
 
 import sys
 
-from PyQt5.QtWidgets import QApplication
-from PyQt5.QtWidgets import QDialog
-from PyQt5.QtWidgets import QDialogButtonBox
-from PyQt5.QtWidgets import QFormLayout
-from PyQt5.QtWidgets import QLineEdit
-from PyQt5.QtWidgets import QVBoxLayout
-
+from PyQt6.QtWidgets import (
+    QApplication,
+    QDialog,
+    QDialogButtonBox,
+    QFormLayout,
+    QLineEdit,
+    QVBoxLayout,
+)
 
-class Dialog(QDialog):
-    """Dialog."""
 
-    def __init__(self, parent=None):
-        """Initializer."""
-        super().__init__(parent)
+class Window(QDialog):
+    def __init__(self):
+        super().__init__(parent=None)
         self.setWindowTitle("QDialog")
-        dlgLayout = QVBoxLayout()
+        dialogLayout = QVBoxLayout()
         formLayout = QFormLayout()
         formLayout.addRow("Name:", QLineEdit())
         formLayout.addRow("Age:", QLineEdit())
         formLayout.addRow("Job:", QLineEdit())
         formLayout.addRow("Hobbies:", QLineEdit())
-        dlgLayout.addLayout(formLayout)
-        btns = QDialogButtonBox()
-        btns.setStandardButtons(QDialogButtonBox.Cancel | QDialogButtonBox.Ok)
-        dlgLayout.addWidget(btns)
-        self.setLayout(dlgLayout)
+        dialogLayout.addLayout(formLayout)
+        buttons = QDialogButtonBox()
+        buttons.setStandardButtons(
+            QDialogButtonBox.StandardButton.Cancel
+            | QDialogButtonBox.StandardButton.Ok
+        )
+        dialogLayout.addWidget(buttons)
+        self.setLayout(dialogLayout)
 
 
 if __name__ == "__main__":
-    app = QApplication(sys.argv)
-    dlg = Dialog()
-    dlg.show()
-    sys.exit(app.exec_())
+    app = QApplication([])
+    window = Window()
+    window.show()
+    sys.exit(app.exec())

pyqt-calculator-tutorial/examples/f_layout.py

@@ -1,22 +1,19 @@
-# Filename: f_layout.py
-
 """Form layout example."""
 
 import sys
 
-from PyQt5.QtWidgets import QApplication
-from PyQt5.QtWidgets import QFormLayout
-from PyQt5.QtWidgets import QLineEdit
-from PyQt5.QtWidgets import QWidget
+from PyQt6.QtWidgets import QApplication, QFormLayout, QLineEdit, QWidget
 
-app = QApplication(sys.argv)
+app = QApplication([])
 window = QWidget()
 window.setWindowTitle("QFormLayout")
+
 layout = QFormLayout()
 layout.addRow("Name:", QLineEdit())
 layout.addRow("Age:", QLineEdit())
 layout.addRow("Job:", QLineEdit())
 layout.addRow("Hobbies:", QLineEdit())
 window.setLayout(layout)
+
 window.show()
-sys.exit(app.exec_())
+sys.exit(app.exec())

pyqt-calculator-tutorial/examples/g_layout.py

@@ -1,17 +1,13 @@
-# Filename: g_layout.py
-
 """Grid layout example."""
 
 import sys
 
-from PyQt5.QtWidgets import QApplication
-from PyQt5.QtWidgets import QGridLayout
-from PyQt5.QtWidgets import QPushButton
-from PyQt5.QtWidgets import QWidget
+from PyQt6.QtWidgets import QApplication, QGridLayout, QPushButton, QWidget
 
-app = QApplication(sys.argv)
+app = QApplication([])
 window = QWidget()
 window.setWindowTitle("QGridLayout")
+
 layout = QGridLayout()
 layout.addWidget(QPushButton("Button (0, 0)"), 0, 0)
 layout.addWidget(QPushButton("Button (0, 1)"), 0, 1)
@@ -22,5 +18,6 @@
 layout.addWidget(QPushButton("Button (2, 0)"), 2, 0)
 layout.addWidget(QPushButton("Button (2, 1) + 2 Columns Span"), 2, 1, 1, 2)
 window.setLayout(layout)
+
 window.show()
-sys.exit(app.exec_())
+sys.exit(app.exec())

pyqt-calculator-tutorial/examples/h_layout.py

@@ -1,21 +1,18 @@
-# Filename: h_layout.py
-
 """Horizontal layout example."""
 
 import sys
 
-from PyQt5.QtWidgets import QApplication
-from PyQt5.QtWidgets import QHBoxLayout
-from PyQt5.QtWidgets import QPushButton
-from PyQt5.QtWidgets import QWidget
+from PyQt6.QtWidgets import QApplication, QHBoxLayout, QPushButton, QWidget
 
-app = QApplication(sys.argv)
+app = QApplication([])
 window = QWidget()
 window.setWindowTitle("QHBoxLayout")
+
 layout = QHBoxLayout()
 layout.addWidget(QPushButton("Left"))
 layout.addWidget(QPushButton("Center"))
 layout.addWidget(QPushButton("Right"))
 window.setLayout(layout)
+
 window.show()
-sys.exit(app.exec_())
+sys.exit(app.exec())

pyqt-calculator-tutorial/examples/hello.py

@@ -1,27 +1,29 @@
-# Filename: hello.py
-
-"""Simple Hello World example with PyQt5."""
+"""Simple Hello World example with PyQt6."""
 
 import sys
 
-# 1. Import `QApplication` and all the required widgets
-from PyQt5.QtWidgets import QApplication
-from PyQt5.QtWidgets import QLabel
-from PyQt5.QtWidgets import QWidget
+# 1. Import QApplication, and all the required widgets
+from PyQt6.QtWidgets import QApplication, QLabel, QWidget
+
+WIN_X = 100
+WIN_Y = 100
+WIDTH = 280
+HEIGHT = 80
+LABEL_X = 60
+LABEL_Y = 15
 
 # 2. Create an instance of QApplication
 app = QApplication(sys.argv)
 
 # 3. Create an instance of your application's GUI
 window = QWidget()
-window.setWindowTitle("PyQt5 App")
-window.setGeometry(100, 100, 280, 80)
-window.move(60, 15)
+window.setWindowTitle("PyQt6 App")
+window.setGeometry(WIN_X, WIN_Y, WIDTH, HEIGHT)
 helloMsg = QLabel("<h1>Hello World!</h1>", parent=window)
-helloMsg.move(60, 15)
+helloMsg.move(LABEL_X, LABEL_Y)
 
 # 4.Show your application's GUI
 window.show()
 
-# 5. Run your application's event loop (or main loop)
-sys.exit(app.exec_())
+# 5. Run your application's event loop
+sys.exit(app.exec())

pyqt-calculator-tutorial/examples/main_window.py

@@ -1,31 +1,28 @@
-# Filename: main_window.py
-
-"""Main Window-Style application."""
+"""Main window-style application."""
 
 import sys
 
-from PyQt5.QtWidgets import QApplication
-from PyQt5.QtWidgets import QLabel
-from PyQt5.QtWidgets import QMainWindow
-from PyQt5.QtWidgets import QStatusBar
-from PyQt5.QtWidgets import QToolBar
+from PyQt6.QtWidgets import (
+    QApplication,
+    QLabel,
+    QMainWindow,
+    QStatusBar,
+    QToolBar,
+)
 
 
 class Window(QMainWindow):
-    """Main Window."""
-
-    def __init__(self, parent=None):
-        """Initializer."""
-        super().__init__(parent)
+    def __init__(self):
+        super().__init__(parent=None)
         self.setWindowTitle("QMainWindow")
         self.setCentralWidget(QLabel("I'm the Central Widget"))
         self._createMenu()
         self._createToolBar()
         self._createStatusBar()
 
     def _createMenu(self):
-        self.menu = self.menuBar().addMenu("&Menu")
-        self.menu.addAction("&Exit", self.close)
+        menu = self.menuBar().addMenu("&Menu")
+        menu.addAction("&Exit", self.close)
 
     def _createToolBar(self):
         tools = QToolBar()
@@ -39,7 +36,7 @@ def _createStatusBar(self):
 
 
 if __name__ == "__main__":
-    app = QApplication(sys.argv)
-    win = Window()
-    win.show()
-    sys.exit(app.exec_())
+    app = QApplication([])
+    window = Window()
+    window.show()
+    sys.exit(app.exec())

pyqt-calculator-tutorial/examples/signals_slots_partial.py

@@ -1,21 +1,18 @@
-# Filename: v_layout.py
-
 """Vertical layout example."""
 
 import sys
 
-from PyQt5.QtWidgets import QApplication
-from PyQt5.QtWidgets import QPushButton
-from PyQt5.QtWidgets import QVBoxLayout
-from PyQt5.QtWidgets import QWidget
+from PyQt6.QtWidgets import QApplication, QPushButton, QVBoxLayout, QWidget
 
-app = QApplication(sys.argv)
+app = QApplication([])
 window = QWidget()
 window.setWindowTitle("QVBoxLayout")
+
 layout = QVBoxLayout()
 layout.addWidget(QPushButton("Top"))
 layout.addWidget(QPushButton("Center"))
 layout.addWidget(QPushButton("Bottom"))
 window.setLayout(layout)
+
 window.show()
-sys.exit(app.exec_())
+sys.exit(app.exec())

pyqt-calculator-tutorial/examples/v_layout.py

@@ -1,53 +1,41 @@
 # PyCalc
 
-PyCalc is a sample calculator implemented using Python 3 and with a [PyQt5](https://www.riverbankcomputing.com/static/Docs/PyQt5/introduction.html) GUI. PyCalc implements the most basic math operations, that is, division, multiplication, addition, and subtraction.
+PyCalc is a sample calculator implemented using Python 3 and with a [PyQt6](https://www.riverbankcomputing.com/static/Docs/PyQt6/introduction.html) GUI. PyCalc implements basic math operations, including division, multiplication, addition, and subtraction.
 
-PyCalc is intended to be a demonstrative example on how you can implement a Python + PyQt5 GUI application using the Model-View-Controller (MVC) pattern.
+PyCalc is intended to be a demonstrative example of how to build a Python + PyQt6 GUI application using the Model-View-Controller (MVC) pattern.
 
 ## Screenshot
 
 ![Screenshot](screenshot.png)
 
 ## Requirements
 
-For PyCalc to work, you need to have a proper installation of [Python](https://www.python.org) >= 3.6. Then you need to install the PyQt5 library in your system. This can be done by using `pip3` as follows:
+For PyCalc to work, you need to have [Python](https://www.python.org) >= 3.6.1. Then you need to install the PyQt6 library. You can do this by using `pip` in a Python virtual environment:
 
 ```console
-$ sudo pip3 install pyqt5
+$ python -m venv venv
+$ source venv/bin/activate
+$ python -m pip install pyqt6
 ```
 
-We don't recommend you to install PyCalc's requirements directly into your system, as PyCalc is just a sample application. So, you can use a virtual environment to test PyCalc out. To do that, you can run the following commands:
-
-```console
-$ python3 -m venv pycalc
-$ source pycalc/bin/activate
-$ pip install pyqt5
-```
-
-After this steps are finished, you can run and test PyCalc as described in the next section.
-
-**Note**: For more information on how to install PyQt5, you can take a look at the related topic on the [project's documentation](https://www.riverbankcomputing.com/static/Docs/PyQt5/installation.html).
+After these commands have finished, you can run PyCalc as described in the next section.
 
 ## How to Run PyCalc
 
-To run PyCalc from your system's command-line and try it out, you can execute the following command:
+To run PyCalc from your system's command line or terminal, execute the following command:
 
 ```console
-$ python3 pycalc.py
+$ python pycalc.py
 ```
 
-After running this command, you'll see PyCalc running on your screen.
+After running this command, you'll get PyCalc running on your machine.
 
 ## How to Use PyCalc
 
-To use PyCalc, you just need to enter a valid math expression using your mouse and then press `Enter` or click on the `=` sign:
+To use PyCalc, just enter a valid math expression using your mouse and then press `Enter` or click the `=` button to get the result:
 
 ![Screenshot](pycalc-howto.gif)
 
 ## About the Author
 
-My name is Leodanis Pozo Ramos. I'm a **freelance Python Developer, and [author](https://realpython.com/team/lpozoramos/)**. If you need more information about me, and my work, then you can take a look at my [personal page](https://lpozo.github.com/).
-
-## License
-
-PyCalc is released under the [MIT License](https://opensource.org/licenses/MIT).
+Leodanis Pozo Ramos is a **self-taught Python Developer, and [content creator](https://realpython.com/team/lpozoramos/)** at Real Python.