diff options
Diffstat (limited to 'sources/pyside6/doc/tutorials/expenses/steps/10-expenses.py')
| -rw-r--r-- | sources/pyside6/doc/tutorials/expenses/steps/10-expenses.py | 62 |
1 files changed, 23 insertions, 39 deletions
diff --git a/sources/pyside6/doc/tutorials/expenses/steps/10-expenses.py b/sources/pyside6/doc/tutorials/expenses/steps/10-expenses.py index bbed5c389..a3a998470 100644 --- a/sources/pyside6/doc/tutorials/expenses/steps/10-expenses.py +++ b/sources/pyside6/doc/tutorials/expenses/steps/10-expenses.py @@ -3,16 +3,17 @@ import sys from PySide6.QtCore import Qt, 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 QChartView, QPieSeries, QChart class Widget(QWidget): def __init__(self): - QWidget.__init__(self) + super().__init__() self.items = 0 # Example data @@ -32,43 +33,38 @@ 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") 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.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() @@ -76,27 +72,25 @@ 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): @@ -112,10 +106,6 @@ class Widget(QWidget): 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(): @@ -135,7 +125,7 @@ class Widget(QWidget): class MainWindow(QMainWindow): def __init__(self, widget): - QMainWindow.__init__(self) + super().__init__() self.setWindowTitle("Tutorial") # Menu @@ -143,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 |