aboutsummaryrefslogtreecommitdiffstats
path: root/examples/widgets
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2021-03-24 11:23:58 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2021-03-24 11:46:30 +0100
commit76043639abc918feafe8d59c6019775e7e7684cd (patch)
tree2f3b516ab229b46ad2e8f75b65d0feadda9cc548 /examples/widgets
parentca2b448344b3b1ed8715fba85ddbb3be9f766fbb (diff)
Port the widget tutorials to snake case
Task-number: PYSIDE-1112 Change-Id: I60056e1cf0bac1279b7ff780fba908643339847e Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'examples/widgets')
-rw-r--r--examples/widgets/tutorials/addressbook/part1.py24
-rw-r--r--examples/widgets/tutorials/addressbook/part2.py130
-rw-r--r--examples/widgets/tutorials/addressbook/part3.py184
-rw-r--r--examples/widgets/tutorials/addressbook/part4.py234
-rw-r--r--examples/widgets/tutorials/addressbook/part5.py286
-rw-r--r--examples/widgets/tutorials/addressbook/part6.py324
-rw-r--r--examples/widgets/tutorials/addressbook/part7.py368
-rw-r--r--examples/widgets/tutorials/cannon/t10.py84
-rw-r--r--examples/widgets/tutorials/cannon/t11.py152
-rw-r--r--examples/widgets/tutorials/cannon/t12.py178
-rw-r--r--examples/widgets/tutorials/cannon/t13.py268
-rw-r--r--examples/widgets/tutorials/cannon/t14.py304
-rw-r--r--examples/widgets/tutorials/cannon/t7.py18
-rw-r--r--examples/widgets/tutorials/cannon/t8.py50
-rw-r--r--examples/widgets/tutorials/cannon/t9.py50
15 files changed, 1327 insertions, 1327 deletions
diff --git a/examples/widgets/tutorials/addressbook/part1.py b/examples/widgets/tutorials/addressbook/part1.py
index a8356a7b5..3aff8de19 100644
--- a/examples/widgets/tutorials/addressbook/part1.py
+++ b/examples/widgets/tutorials/addressbook/part1.py
@@ -47,19 +47,19 @@ class AddressBook(QtWidgets.QWidget):
def __init__(self, parent=None):
super(AddressBook, self).__init__(parent)
- nameLabel = QtWidgets.QLabel("Name:")
- self.nameLine = QtWidgets.QLineEdit()
+ name_label = QtWidgets.QLabel("Name:")
+ self._name_line = QtWidgets.QLineEdit()
- addressLabel = QtWidgets.QLabel("Address:")
- self.addressText = QtWidgets.QTextEdit()
+ address_label = QtWidgets.QLabel("Address:")
+ self._address_text = QtWidgets.QTextEdit()
- mainLayout = QtWidgets.QGridLayout()
- mainLayout.addWidget(nameLabel, 0, 0)
- mainLayout.addWidget(self.nameLine, 0, 1)
- mainLayout.addWidget(addressLabel, 1, 0, QtCore.Qt.AlignTop)
- mainLayout.addWidget(self.addressText, 1, 1)
+ main_layout = QtWidgets.QGridLayout()
+ main_layout.addWidget(name_label, 0, 0)
+ main_layout.addWidget(self._name_line, 0, 1)
+ main_layout.addWidget(address_label, 1, 0, QtCore.Qt.AlignTop)
+ main_layout.addWidget(self._address_text, 1, 1)
- self.setLayout(mainLayout)
+ self.setLayout(main_layout)
self.setWindowTitle("Simple Address Book")
@@ -68,7 +68,7 @@ if __name__ == '__main__':
app = QtWidgets.QApplication(sys.argv)
- addressBook = AddressBook()
- addressBook.show()
+ address_book = AddressBook()
+ address_book.show()
sys.exit(app.exec_())
diff --git a/examples/widgets/tutorials/addressbook/part2.py b/examples/widgets/tutorials/addressbook/part2.py
index 68446d3d0..84838d801 100644
--- a/examples/widgets/tutorials/addressbook/part2.py
+++ b/examples/widgets/tutorials/addressbook/part2.py
@@ -77,61 +77,61 @@ class AddressBook(QtWidgets.QWidget):
super(AddressBook, self).__init__(parent)
self.contacts = SortedDict()
- self.oldName = ''
- self.oldAddress = ''
-
- nameLabel = QtWidgets.QLabel("Name:")
- self.nameLine = QtWidgets.QLineEdit()
- self.nameLine.setReadOnly(True)
-
- addressLabel = QtWidgets.QLabel("Address:")
- self.addressText = QtWidgets.QTextEdit()
- self.addressText.setReadOnly(True)
-
- self.addButton = QtWidgets.QPushButton("&Add")
- self.submitButton = QtWidgets.QPushButton("&Submit")
- self.submitButton.hide()
- self.cancelButton = QtWidgets.QPushButton("&Cancel")
- self.cancelButton.hide()
-
- self.addButton.clicked.connect(self.addContact)
- self.submitButton.clicked.connect(self.submitContact)
- self.cancelButton.clicked.connect(self.cancel)
-
- buttonLayout1 = QtWidgets.QVBoxLayout()
- buttonLayout1.addWidget(self.addButton, QtCore.Qt.AlignTop)
- buttonLayout1.addWidget(self.submitButton)
- buttonLayout1.addWidget(self.cancelButton)
- buttonLayout1.addStretch()
-
- mainLayout = QtWidgets.QGridLayout()
- mainLayout.addWidget(nameLabel, 0, 0)
- mainLayout.addWidget(self.nameLine, 0, 1)
- mainLayout.addWidget(addressLabel, 1, 0, QtCore.Qt.AlignTop)
- mainLayout.addWidget(self.addressText, 1, 1)
- mainLayout.addLayout(buttonLayout1, 1, 2)
-
- self.setLayout(mainLayout)
+ self._old_name = ''
+ self._old_address = ''
+
+ name_label = QtWidgets.QLabel("Name:")
+ self._name_line = QtWidgets.QLineEdit()
+ self._name_line.setReadOnly(True)
+
+ address_label = QtWidgets.QLabel("Address:")
+ self._address_text = QtWidgets.QTextEdit()
+ self._address_text.setReadOnly(True)
+
+ self._add_button = QtWidgets.QPushButton("&Add")
+ self._submit_button = QtWidgets.QPushButton("&Submit")
+ self._submit_button.hide()
+ self._cancel_button = QtWidgets.QPushButton("&Cancel")
+ self._cancel_button.hide()
+
+ self._add_button.clicked.connect(self.add_contact)
+ self._submit_button.clicked.connect(self.submit_contact)
+ self._cancel_button.clicked.connect(self.cancel)
+
+ button_layout_1 = QtWidgets.QVBoxLayout()
+ button_layout_1.addWidget(self._add_button, QtCore.Qt.AlignTop)
+ button_layout_1.addWidget(self._submit_button)
+ button_layout_1.addWidget(self._cancel_button)
+ button_layout_1.addStretch()
+
+ main_layout = QtWidgets.QGridLayout()
+ main_layout.addWidget(name_label, 0, 0)
+ main_layout.addWidget(self._name_line, 0, 1)
+ main_layout.addWidget(address_label, 1, 0, QtCore.Qt.AlignTop)
+ main_layout.addWidget(self._address_text, 1, 1)
+ main_layout.addLayout(button_layout_1, 1, 2)
+
+ self.setLayout(main_layout)
self.setWindowTitle("Simple Address Book")
- def addContact(self):
- self.oldName = self.nameLine.text()
- self.oldAddress = self.addressText.toPlainText()
+ def add_contact(self):
+ self._old_name = self._name_line.text()
+ self._old_address = self._address_text.toPlainText()
- self.nameLine.clear()
- self.addressText.clear()
+ self._name_line.clear()
+ self._address_text.clear()
- self.nameLine.setReadOnly(False)
- self.nameLine.setFocus(QtCore.Qt.OtherFocusReason)
- self.addressText.setReadOnly(False)
+ self._name_line.setReadOnly(False)
+ self._name_line.setFocus(QtCore.Qt.OtherFocusReason)
+ self._address_text.setReadOnly(False)
- self.addButton.setEnabled(False)
- self.submitButton.show()
- self.cancelButton.show()
+ self._add_button.setEnabled(False)
+ self._submit_button.show()
+ self._cancel_button.show()
- def submitContact(self):
- name = self.nameLine.text()
- address = self.addressText.toPlainText()
+ def submit_contact(self):
+ name = self._name_line.text()
+ address = self._address_text.toPlainText()
if name == "" or address == "":
QtWidgets.QMessageBox.information(self, "Empty Field",
@@ -148,25 +148,25 @@ class AddressBook(QtWidgets.QWidget):
return
if not self.contacts:
- self.nameLine.clear()
- self.addressText.clear()
+ self._name_line.clear()
+ self._address_text.clear()
- self.nameLine.setReadOnly(True)
- self.addressText.setReadOnly(True)
- self.addButton.setEnabled(True)
- self.submitButton.hide()
- self.cancelButton.hide()
+ self._name_line.setReadOnly(True)
+ self._address_text.setReadOnly(True)
+ self._add_button.setEnabled(True)
+ self._submit_button.hide()
+ self._cancel_button.hide()
def cancel(self):
- self.nameLine.setText(self.oldName)
- self.nameLine.setReadOnly(True)
+ self._name_line.setText(self._old_name)
+ self._name_line.setReadOnly(True)
- self.addressText.setText(self.oldAddress)
- self.addressText.setReadOnly(True)
+ self._address_text.setText(self._old_address)
+ self._address_text.setReadOnly(True)
- self.addButton.setEnabled(True)
- self.submitButton.hide()
- self.cancelButton.hide()
+ self._add_button.setEnabled(True)
+ self._submit_button.hide()
+ self._cancel_button.hide()
if __name__ == '__main__':
@@ -174,7 +174,7 @@ if __name__ == '__main__':
app = QtWidgets.QApplication(sys.argv)
- addressBook = AddressBook()
- addressBook.show()
+ address_book = AddressBook()
+ address_book.show()
sys.exit(app.exec_())
diff --git a/examples/widgets/tutorials/addressbook/part3.py b/examples/widgets/tutorials/addressbook/part3.py
index cfb150d7f..b93e2fe09 100644
--- a/examples/widgets/tutorials/addressbook/part3.py
+++ b/examples/widgets/tutorials/addressbook/part3.py
@@ -77,74 +77,74 @@ class AddressBook(QtWidgets.QWidget):
super(AddressBook, self).__init__(parent)
self.contacts = SortedDict()
- self.oldName = ''
- self.oldAddress = ''
-
- nameLabel = QtWidgets.QLabel("Name:")
- self.nameLine = QtWidgets.QLineEdit()
- self.nameLine.setReadOnly(True)
-
- addressLabel = QtWidgets.QLabel("Address:")
- self.addressText = QtWidgets.QTextEdit()
- self.addressText.setReadOnly(True)
-
- self.addButton = QtWidgets.QPushButton("&Add")
- self.submitButton = QtWidgets.QPushButton("&Submit")
- self.submitButton.hide()
- self.cancelButton = QtWidgets.QPushButton("&Cancel")
- self.cancelButton.hide()
- self.nextButton = QtWidgets.QPushButton("&Next")
- self.nextButton.setEnabled(False)
- self.previousButton = QtWidgets.QPushButton("&Previous")
- self.previousButton.setEnabled(False)
-
- self.addButton.clicked.connect(self.addContact)
- self.submitButton.clicked.connect(self.submitContact)
- self.cancelButton.clicked.connect(self.cancel)
- self.nextButton.clicked.connect(self.next)
- self.previousButton.clicked.connect(self.previous)
-
- buttonLayout1 = QtWidgets.QVBoxLayout()
- buttonLayout1.addWidget(self.addButton, QtCore.Qt.AlignTop)
- buttonLayout1.addWidget(self.submitButton)
- buttonLayout1.addWidget(self.cancelButton)
- buttonLayout1.addStretch()
-
- buttonLayout2 = QtWidgets.QHBoxLayout()
- buttonLayout2.addWidget(self.previousButton)
- buttonLayout2.addWidget(self.nextButton)
-
- mainLayout = QtWidgets.QGridLayout()
- mainLayout.addWidget(nameLabel, 0, 0)
- mainLayout.addWidget(self.nameLine, 0, 1)
- mainLayout.addWidget(addressLabel, 1, 0, QtCore.Qt.AlignTop)
- mainLayout.addWidget(self.addressText, 1, 1)
- mainLayout.addLayout(buttonLayout1, 1, 2)
- mainLayout.addLayout(buttonLayout2, 3, 1)
-
- self.setLayout(mainLayout)
+ self._old_name = ''
+ self._old_address = ''
+
+ name_label = QtWidgets.QLabel("Name:")
+ self._name_line = QtWidgets.QLineEdit()
+ self._name_line.setReadOnly(True)
+
+ address_label = QtWidgets.QLabel("Address:")
+ self._address_text = QtWidgets.QTextEdit()
+ self._address_text.setReadOnly(True)
+
+ self._add_button = QtWidgets.QPushButton("&Add")
+ self._submit_button = QtWidgets.QPushButton("&Submit")
+ self._submit_button.hide()
+ self._cancel_button = QtWidgets.QPushButton("&Cancel")
+ self._cancel_button.hide()
+ self._next_button = QtWidgets.QPushButton("&Next")
+ self._next_button.setEnabled(False)
+ self._previous_button = QtWidgets.QPushButton("&Previous")
+ self._previous_button.setEnabled(False)
+
+ self._add_button.clicked.connect(self.add_contact)
+ self._submit_button.clicked.connect(self.submit_contact)
+ self._cancel_button.clicked.connect(self.cancel)
+ self._next_button.clicked.connect(self.next)
+ self._previous_button.clicked.connect(self.previous)
+
+ button_layout_1 = QtWidgets.QVBoxLayout()
+ button_layout_1.addWidget(self._add_button, QtCore.Qt.AlignTop)
+ button_layout_1.addWidget(self._submit_button)
+ button_layout_1.addWidget(self._cancel_button)
+ button_layout_1.addStretch()
+
+ button_layout_2 = QtWidgets.QHBoxLayout()
+ button_layout_2.addWidget(self._previous_button)
+ button_layout_2.addWidget(self._next_button)
+
+ main_layout = QtWidgets.QGridLayout()
+ main_layout.addWidget(name_label, 0, 0)
+ main_layout.addWidget(self._name_line, 0, 1)
+ main_layout.addWidget(address_label, 1, 0, QtCore.Qt.AlignTop)
+ main_layout.addWidget(self._address_text, 1, 1)
+ main_layout.addLayout(button_layout_1, 1, 2)
+ main_layout.addLayout(button_layout_2, 3, 1)
+
+ self.setLayout(main_layout)
self.setWindowTitle("Simple Address Book")
- def addContact(self):
- self.oldName = self.nameLine.text()
- self.oldAddress = self.addressText.toPlainText()
+ def add_contact(self):
+ self._old_name = self._name_line.text()
+ self._old_address = self._address_text.toPlainText()
- self.nameLine.clear()
- self.addressText.clear()
+ self._name_line.clear()
+ self._address_text.clear()
- self.nameLine.setReadOnly(False)
- self.nameLine.setFocus(QtCore.Qt.OtherFocusReason)
- self.addressText.setReadOnly(False)
+ self._name_line.setReadOnly(False)
+ self._name_line.setFocus(QtCore.Qt.OtherFocusReason)
+ self._address_text.setReadOnly(False)
- self.addButton.setEnabled(False)
- self.nextButton.setEnabled(False)
- self.previousButton.setEnabled(False)
- self.submitButton.show()
- self.cancelButton.show()
+ self._add_button.setEnabled(False)
+ self._next_button.setEnabled(False)
+ self._previous_button.setEnabled(False)
+ self._submit_button.show()
+ self._cancel_button.show()
- def submitContact(self):
- name = self.nameLine.text()
- address = self.addressText.toPlainText()
+ def submit_contact(self):
+ name = self._name_line.text()
+ address = self._address_text.toPlainText()
if name == "" or address == "":
QtWidgets.QMessageBox.information(self, "Empty Field",
@@ -161,41 +161,41 @@ class AddressBook(QtWidgets.QWidget):
return
if not self.contacts:
- self.nameLine.clear()
- self.addressText.clear()
+ self._name_line.clear()
+ self._address_text.clear()
- self.nameLine.setReadOnly(True)
- self.addressText.setReadOnly(True)
- self.addButton.setEnabled(True)
+ self._name_line.setReadOnly(True)
+ self._address_text.setReadOnly(True)
+ self._add_button.setEnabled(True)
number = len(self.contacts)
- self.nextButton.setEnabled(number > 1)
- self.previousButton.setEnabled(number > 1)
+ self._next_button.setEnabled(number > 1)
+ self._previous_button.setEnabled(number > 1)
- self.submitButton.hide()
- self.cancelButton.hide()
+ self._submit_button.hide()
+ self._cancel_button.hide()
def cancel(self):
- self.nameLine.setText(self.oldName)
- self.addressText.setText(self.oldAddress)
+ self._name_line.setText(self._old_name)
+ self._address_text.setText(self._old_address)
if not self.contacts:
- self.nameLine.clear()
- self.addressText.clear()
+ self._name_line.clear()
+ self._address_text.clear()
- self.nameLine.setReadOnly(True)
- self.addressText.setReadOnly(True)
- self.addButton.setEnabled(True)
+ self._name_line.setReadOnly(True)
+ self._address_text.setReadOnly(True)
+ self._add_button.setEnabled(True)
number = len(self.contacts)
- self.nextButton.setEnabled(number > 1)
- self.previousButton.setEnabled(number > 1)
+ self._next_button.setEnabled(number > 1)
+ self._previous_button.setEnabled(number > 1)
- self.submitButton.hide()
- self.cancelButton.hide()
+ self._submit_button.hide()
+ self._cancel_button.hide()
def next(self):
- name = self.nameLine.text()
+ name = self._name_line.text()
it = iter(self.contacts)
try:
@@ -208,11 +208,11 @@ class AddressBook(QtWidgets.QWidget):
except StopIteration:
next_name, next_address = iter(self.contacts).next()
- self.nameLine.setText(next_name)
- self.addressText.setText(next_address)
+ self._name_line.setText(next_name)
+ self._address_text.setText(next_address)
def previous(self):
- name = self.nameLine.text()
+ name = self._name_line.text()
prev_name = prev_address = None
for this_name, this_address in self.contacts:
@@ -222,16 +222,16 @@ class AddressBook(QtWidgets.QWidget):
prev_name = this_name
prev_address = this_address
else:
- self.nameLine.clear()
- self.addressText.clear()
+ self._name_line.clear()
+ self._address_text.clear()
return
if prev_name is None:
for prev_name, prev_address in self.contacts:
pass
- self.nameLine.setText(prev_name)
- self.addressText.setText(prev_address)
+ self._name_line.setText(prev_name)
+ self._address_text.setText(prev_address)
if __name__ == '__main__':
@@ -239,7 +239,7 @@ if __name__ == '__main__':
app = QtWidgets.QApplication(sys.argv)
- addressBook = AddressBook()
- addressBook.show()
+ address_book = AddressBook()
+ address_book.show()
sys.exit(app.exec_())
diff --git a/examples/widgets/tutorials/addressbook/part4.py b/examples/widgets/tutorials/addressbook/part4.py
index dbca3c099..8ae9d6b7b 100644
--- a/examples/widgets/tutorials/addressbook/part4.py
+++ b/examples/widgets/tutorials/addressbook/part4.py
@@ -79,89 +79,89 @@ class AddressBook(QtWidgets.QWidget):
super(AddressBook, self).__init__(parent)
self.contacts = SortedDict()
- self.oldName = ''
- self.oldAddress = ''
- self.currentMode = self.NavigationMode
-
- nameLabel = QtWidgets.QLabel("Name:")
- self.nameLine = QtWidgets.QLineEdit()
- self.nameLine.setReadOnly(True)
-
- addressLabel = QtWidgets.QLabel("Address:")
- self.addressText = QtWidgets.QTextEdit()
- self.addressText.setReadOnly(True)
-
- self.addButton = QtWidgets.QPushButton("&Add")
- self.editButton = QtWidgets.QPushButton("&Edit")
- self.editButton.setEnabled(False)
- self.removeButton = QtWidgets.QPushButton("&Remove")
- self.removeButton.setEnabled(False)
- self.submitButton = QtWidgets.QPushButton("&Submit")
- self.submitButton.hide()
- self.cancelButton = QtWidgets.QPushButton("&Cancel")
- self.cancelButton.hide()
-
- self.nextButton = QtWidgets.QPushButton("&Next")
- self.nextButton.setEnabled(False)
- self.previousButton = QtWidgets.QPushButton("&Previous")
- self.previousButton.setEnabled(False)
-
- self.addButton.clicked.connect(self.addContact)
- self.submitButton.clicked.connect(self.submitContact)
- self.editButton.clicked.connect(self.editContact)
- self.removeButton.clicked.connect(self.removeContact)
- self.cancelButton.clicked.connect(self.cancel)
- self.nextButton.clicked.connect(self.next)
- self.previousButton.clicked.connect(self.previous)
-
- buttonLayout1 = QtWidgets.QVBoxLayout()
- buttonLayout1.addWidget(self.addButton)
- buttonLayout1.addWidget(self.editButton)
- buttonLayout1.addWidget(self.removeButton)
- buttonLayout1.addWidget(self.submitButton)
- buttonLayout1.addWidget(self.cancelButton)
- buttonLayout1.addStretch()
-
- buttonLayout2 = QtWidgets.QHBoxLayout()
- buttonLayout2.addWidget(self.previousButton)
- buttonLayout2.addWidget(self.nextButton)
-
- mainLayout = QtWidgets.QGridLayout()
- mainLayout.addWidget(nameLabel, 0, 0)
- mainLayout.addWidget(self.nameLine, 0, 1)
- mainLayout.addWidget(addressLabel, 1, 0, QtCore.Qt.AlignTop)
- mainLayout.addWidget(self.addressText, 1, 1)
- mainLayout.addLayout(buttonLayout1, 1, 2)
- mainLayout.addLayout(buttonLayout2, 3, 1)
-
- self.setLayout(mainLayout)
+ self._old_name = ''
+ self._old_address = ''
+ self._current_mode = self.NavigationMode
+
+ name_label = QtWidgets.QLabel("Name:")
+ self._name_line = QtWidgets.QLineEdit()
+ self._name_line.setReadOnly(True)
+
+ address_label = QtWidgets.QLabel("Address:")
+ self._address_text = QtWidgets.QTextEdit()
+ self._address_text.setReadOnly(True)
+
+ self._add_button = QtWidgets.QPushButton("&Add")
+ self._edit_button = QtWidgets.QPushButton("&Edit")
+ self._edit_button.setEnabled(False)
+ self._remove_button = QtWidgets.QPushButton("&Remove")
+ self._remove_button.setEnabled(False)
+ self._submit_button = QtWidgets.QPushButton("&Submit")
+ self._submit_button.hide()
+ self._cancel_button = QtWidgets.QPushButton("&Cancel")
+ self._cancel_button.hide()
+
+ self._next_button = QtWidgets.QPushButton("&Next")
+ self._next_button.setEnabled(False)
+ self._previous_button = QtWidgets.QPushButton("&Previous")
+ self._previous_button.setEnabled(False)
+
+ self._add_button.clicked.connect(self.add_contact)
+ self._submit_button.clicked.connect(self.submit_contact)
+ self._edit_button.clicked.connect(self.edit_contact)
+ self._remove_button.clicked.connect(self.remove_contact)
+ self._cancel_button.clicked.connect(self.cancel)
+ self._next_button.clicked.connect(self.next)
+ self._previous_button.clicked.connect(self.previous)
+
+ button_layout_1 = QtWidgets.QVBoxLayout()
+ button_layout_1.addWidget(self._add_button)
+ button_layout_1.addWidget(self._edit_button)
+ button_layout_1.addWidget(self._remove_button)
+ button_layout_1.addWidget(self._submit_button)
+ button_layout_1.addWidget(self._cancel_button)
+ button_layout_1.addStretch()
+
+ button_layout_2 = QtWidgets.QHBoxLayout()
+ button_layout_2.addWidget(self._previous_button)
+ button_layout_2.addWidget(self._next_button)
+
+ main_layout = QtWidgets.QGridLayout()
+ main_layout.addWidget(name_label, 0, 0)
+ main_layout.addWidget(self._name_line, 0, 1)
+ main_layout.addWidget(address_label, 1, 0, QtCore.Qt.AlignTop)
+ main_layout.addWidget(self._address_text, 1, 1)
+ main_layout.addLayout(button_layout_1, 1, 2)
+ main_layout.addLayout(button_layout_2, 3, 1)
+
+ self.setLayout(main_layout)
self.setWindowTitle("Simple Address Book")
- def addContact(self):
- self.oldName = self.nameLine.text()
- self.oldAddress = self.addressText.toPlainText()
+ def add_contact(self):
+ self._old_name = self._name_line.text()
+ self._old_address = self._address_text.toPlainText()
- self.nameLine.clear()
- self.addressText.clear()
+ self._name_line.clear()
+ self._address_text.clear()
- self.updateInterface(self.AddingMode)
+ self.update_interface(self.AddingMode)
- def editContact(self):
- self.oldName = self.nameLine.text()
- self.oldAddress = self.addressText.toPlainText()
+ def edit_contact(self):
+ self._old_name = self._name_line.text()
+ self._old_address = self._address_text.toPlainText()
- self.updateInterface(self.EditingMode)
+ self.update_interface(self.EditingMode)
- def submitContact(self):
- name = self.nameLine.text()
- address = self.addressText.toPlainText()
+ def submit_contact(self):
+ name = self._name_line.text()
+ address = self._address_text.toPlainText()
if name == "" or address == "":
QtWidgets.QMessageBox.information(self, "Empty Field",
"Please enter a name and address.")
return
- if self.currentMode == self.AddingMode:
+ if self._current_mode == self.AddingMode:
if name not in self.contacts:
self.contacts[name] = address
QtWidgets.QMessageBox.information(self, "Add Successful",
@@ -171,32 +171,32 @@ class AddressBook(QtWidgets.QWidget):
f'Sorry, "{name}" is already in your address book.')
return
- elif self.currentMode == self.EditingMode:
- if self.oldName != name:
+ elif self._current_mode == self.EditingMode:
+ if self._old_name != name:
if name not in self.contacts:
QtWidgets.QMessageBox.information(self, "Edit Successful",
f'"{self.oldName}" has been edited in your address book.')
- del self.contacts[self.oldName]
+ del self.contacts[self._old_name]
self.contacts[name] = address
else:
QtWidgets.QMessageBox.information(self, "Edit Unsuccessful",
f'Sorry, "{name}" is already in your address book.')
return
- elif self.oldAddress != address:
+ elif self._old_address != address:
QtWidgets.QMessageBox.information(self, "Edit Successful",
f'"{name}" has been edited in your address book.')
self.contacts[name] = address
- self.updateInterface(self.NavigationMode)
+ self.update_interface(self.NavigationMode)
def cancel(self):
- self.nameLine.setText(self.oldName)
- self.addressText.setText(self.oldAddress)
- self.updateInterface(self.NavigationMode)
+ self._name_line.setText(self._old_name)
+ self._address_text.setText(self._old_address)
+ self.update_interface(self.NavigationMode)
- def removeContact(self):
- name = self.nameLine.text()
- address = self.addressText.toPlainText()
+ def remove_contact(self):
+ name = self._name_line.text()
+ address = self._address_text.toPlainText()
if name in self.contacts:
button = QtWidgets.QMessageBox.question(self, "Confirm Remove",
@@ -210,10 +210,10 @@ class AddressBook(QtWidgets.QWidget):
QtWidgets.QMessageBox.information(self, "Remove Successful",
f'"{name}" has been removed from your address book.')
- self.updateInterface(self.NavigationMode)
+ self.update_interface(self.NavigationMode)
def next(self):
- name = self.nameLine.text()
+ name = self._name_line.text()
it = iter(self.contacts)
try:
@@ -226,11 +226,11 @@ class AddressBook(QtWidgets.QWidget):
except StopIteration:
next_name, next_address = iter(self.contacts).next()
- self.nameLine.setText(next_name)
- self.addressText.setText(next_address)
+ self._name_line.setText(next_name)
+ self._address_text.setText(next_address)
def previous(self):
- name = self.nameLine.text()
+ name = self._name_line.text()
prev_name = prev_address = None
for this_name, this_address in self.contacts:
@@ -240,52 +240,52 @@ class AddressBook(QtWidgets.QWidget):
prev_name = this_name
prev_address = this_address
else:
- self.nameLine.clear()
- self.addressText.clear()
+ self._name_line.clear()
+ self._address_text.clear()
return
if prev_name is None:
for prev_name, prev_address in self.contacts:
pass
- self.nameLine.setText(prev_name)
- self.addressText.setText(prev_address)
+ self._name_line.setText(prev_name)
+ self._address_text.setText(prev_address)
- def updateInterface(self, mode):
- self.currentMode = mode
+ def update_interface(self, mode):
+ self._current_mode = mode
- if self.currentMode in (self.AddingMode, self.EditingMode):
- self.nameLine.setReadOnly(False)
- self.nameLine.setFocus(QtCore.Qt.OtherFocusReason)
- self.addressText.setReadOnly(False)
+ if self._current_mode in (self.AddingMode, self.EditingMode):
+ self._name_line.setReadOnly(False)
+ self._name_line.setFocus(QtCore.Qt.OtherFocusReason)
+ self._address_text.setReadOnly(False)
- self.addButton.setEnabled(False)
- self.editButton.setEnabled(False)
- self.removeButton.setEnabled(False)
+ self._add_button.setEnabled(False)
+ self._edit_button.setEnabled(False)
+ self._remove_button.setEnabled(False)
- self.nextButton.setEnabled(False)
- self.previousButton.setEnabled(False)
+ self._next_button.setEnabled(False)
+ self._previous_button.setEnabled(False)
- self.submitButton.show()
- self.cancelButton.show()
+ self._submit_button.show()
+ self._cancel_button.show()
- elif self.currentMode == self.NavigationMode:
+ elif self._current_mode == self.NavigationMode:
if not self.contacts:
- self.nameLine.clear()
- self.addressText.clear()
+ self._name_line.clear()
+ self._address_text.clear()
- self.nameLine.setReadOnly(True)
- self.addressText.setReadOnly(True)
- self.addButton.setEnabled(True)
+ self._name_line.setReadOnly(True)
+ self._address_text.setReadOnly(True)
+ self._add_button.setEnabled(True)
number = len(self.contacts)
- self.editButton.setEnabled(number >= 1)
- self.removeButton.setEnabled(number >= 1)
- self.nextButton.setEnabled(number > 1)
- self.previousButton.setEnabled(number >1 )
+ self._edit_button.setEnabled(number >= 1)
+ self._remove_button.setEnabled(number >= 1)
+ self._next_button.setEnabled(number > 1)
+ self._previous_button.setEnabled(number >1 )
- self.submitButton.hide()
- self.cancelButton.hide()
+ self._submit_button.hide()
+ self._cancel_button.hide()
if __name__ == '__main__':
@@ -293,7 +293,7 @@ if __name__ == '__main__':
app = QtWidgets.QApplication(sys.argv)
- addressBook = AddressBook()
- addressBook.show()
+ address_book = AddressBook()
+ address_book.show()
sys.exit(app.exec_())
diff --git a/examples/widgets/tutorials/addressbook/part5.py b/examples/widgets/tutorials/addressbook/part5.py
index a513889ec..297cf97d2 100644
--- a/examples/widgets/tutorials/addressbook/part5.py
+++ b/examples/widgets/tutorials/addressbook/part5.py
@@ -79,95 +79,95 @@ class AddressBook(QtWidgets.QWidget):
super(AddressBook, self).__init__(parent)
self.contacts = SortedDict()
- self.oldName = ''
- self.oldAddress = ''
- self.currentMode = self.NavigationMode
-
- nameLabel = QtWidgets.QLabel("Name:")
- self.nameLine = QtWidgets.QLineEdit()
- self.nameLine.setReadOnly(True)
-
- addressLabel = QtWidgets.QLabel("Address:")
- self.addressText = QtWidgets.QTextEdit()
- self.addressText.setReadOnly(True)
-
- self.addButton = QtWidgets.QPushButton("&Add")
- self.editButton = QtWidgets.QPushButton("&Edit")
- self.editButton.setEnabled(False)
- self.removeButton = QtWidgets.QPushButton("&Remove")
- self.removeButton.setEnabled(False)
- self.findButton = QtWidgets.QPushButton("&Find")
- self.findButton.setEnabled(False)
- self.submitButton = QtWidgets.QPushButton("&Submit")
- self.submitButton.hide()
- self.cancelButton = QtWidgets.QPushButton("&Cancel")
- self.cancelButton.hide()
-
- self.nextButton = QtWidgets.QPushButton("&Next")
- self.nextButton.setEnabled(False)
- self.previousButton = QtWidgets.QPushButton("&Previous")
- self.previousButton.setEnabled(False)
+ self._old_name = ''
+ self._old_address = ''
+ self._current_mode = self.NavigationMode
+
+ name_label = QtWidgets.QLabel("Name:")
+ self._name_line = QtWidgets.QLineEdit()
+ self._name_line.setReadOnly(True)
+
+ address_label = QtWidgets.QLabel("Address:")
+ self._address_text = QtWidgets.QTextEdit()
+ self._address_text.setReadOnly(True)
+
+ self._add_button = QtWidgets.QPushButton("&Add")
+ self._edit_button = QtWidgets.QPushButton("&Edit")
+ self._edit_button.setEnabled(False)
+ self._remove_button = QtWidgets.QPushButton("&Remove")
+ self._remove_button.setEnabled(False)
+ self._find_button = QtWidgets.QPushButton("&Find")
+ self._find_button.setEnabled(False)
+ self._submit_button = QtWidgets.QPushButton("&Submit")
+ self._submit_button.hide()
+ self._cancel_button = QtWidgets.QPushButton("&Cancel")
+ self._cancel_button.hide()
+
+ self._next_button = QtWidgets.QPushButton("&Next")
+ self._next_button.setEnabled(False)
+ self._previous_button = QtWidgets.QPushButton("&Previous")
+ self._previous_button.setEnabled(False)
self.dialog = FindDialog()
- self.addButton.clicked.connect(self.addContact)
- self.submitButton.clicked.connect(self.submitContact)
- self.editButton.clicked.connect(self.editContact)
- self.removeButton.clicked.connect(self.removeContact)
- self.findButton.clicked.connect(self.findContact)
- self.cancelButton.clicked.connect(self.cancel)
- self.nextButton.clicked.connect(self.next)
- self.previousButton.clicked.connect(self.previous)
-
- buttonLayout1 = QtWidgets.QVBoxLayout()
- buttonLayout1.addWidget(self.addButton)
- buttonLayout1.addWidget(self.editButton)
- buttonLayout1.addWidget(self.removeButton)
- buttonLayout1.addWidget(self.findButton)
- buttonLayout1.addWidget(self.submitButton)
- buttonLayout1.addWidget(self.cancelButton)
- buttonLayout1.addStretch()
-
- buttonLayout2 = QtWidgets.QHBoxLayout()
- buttonLayout2.addWidget(self.previousButton)
- buttonLayout2.addWidget(self.nextButton)
-
- mainLayout = QtWidgets.QGridLayout()
- mainLayout.addWidget(nameLabel, 0, 0)
- mainLayout.addWidget(self.nameLine, 0, 1)
- mainLayout.addWidget(addressLabel, 1, 0, QtCore.Qt.AlignTop)
- mainLayout.addWidget(self.addressText, 1, 1)
- mainLayout.addLayout(buttonLayout1, 1, 2)
- mainLayout.addLayout(buttonLayout2, 2, 1)
-
- self.setLayout(mainLayout)
+ self._add_button.clicked.connect(self.add_contact)
+ self._submit_button.clicked.connect(self.submit_contact)
+ self._edit_button.clicked.connect(self.edit_contact)
+ self._remove_button.clicked.connect(self.remove_contact)
+ self._find_button.clicked.connect(self.find_contact)
+ self._cancel_button.clicked.connect(self.cancel)
+ self._next_button.clicked.connect(self.next)
+ self._previous_button.clicked.connect(self.previous)
+
+ button_layout_1 = QtWidgets.QVBoxLayout()
+ button_layout_1.addWidget(self._add_button)
+ button_layout_1.addWidget(self._edit_button)
+ button_layout_1.addWidget(self._remove_button)
+ button_layout_1.addWidget(self._find_button)
+ button_layout_1.addWidget(self._submit_button)
+ button_layout_1.addWidget(self._cancel_button)
+ button_layout_1.addStretch()
+
+ button_layout_2 = QtWidgets.QHBoxLayout()
+ button_layout_2.addWidget(self._previous_button)
+ button_layout_2.addWidget(self._next_button)
+
+ main_layout = QtWidgets.QGridLayout()
+ main_layout.addWidget(name_label, 0, 0)
+ main_layout.addWidget(self._name_line, 0, 1)
+ main_layout.addWidget(address_label, 1, 0, QtCore.Qt.AlignTop)
+ main_layout.addWidget(self._address_text, 1, 1)
+ main_layout.addLayout(button_layout_1, 1, 2)
+ main_layout.addLayout(button_layout_2, 2, 1)
+
+ self.setLayout(main_layout)
self.setWindowTitle("Simple Address Book")
- def addContact(self):
- self.oldName = self.nameLine.text()
- self.oldAddress = self.addressText.toPlainText()
+ def add_contact(self):
+ self._old_name = self._name_line.text()
+ self._old_address = self._address_text.toPlainText()
- self.nameLine.clear()
- self.addressText.clear()
+ self._name_line.clear()
+ self._address_text.clear()
- self.updateInterface(self.AddingMode)
+ self.update_interface(self.AddingMode)
- def editContact(self):
- self.oldName = self.nameLine.text()
- self.oldAddress = self.addressText.toPlainText()
+ def edit_contact(self):
+ self._old_name = self._name_line.text()
+ self._old_address = self._address_text.toPlainText()
- self.updateInterface(self.EditingMode)
+ self.update_interface(self.EditingMode)
- def submitContact(self):
- name = self.nameLine.text()
- address = self.addressText.toPlainText()
+ def submit_contact(self):
+ name = self._name_line.text()
+ address = self._address_text.toPlainText()
if name == "" or address == "":
QtWidgets.QMessageBox.information(self, "Empty Field",
"Please enter a name and address.")
return
- if self.currentMode == self.AddingMode:
+ if self._current_mode == self.AddingMode:
if name not in self.contacts:
self.contacts[name] = address
QtWidgets.QMessageBox.information(self, "Add Successful",
@@ -177,32 +177,32 @@ class AddressBook(QtWidgets.QWidget):
f'Sorry, "{name}" is already in your address book.')
return
- elif self.currentMode == self.EditingMode:
- if self.oldName != name:
+ elif self._current_mode == self.EditingMode:
+ if self._old_name != name:
if name not in self.contacts:
QtWidgets.QMessageBox.information(self, "Edit Successful",
f'"{self.oldName}" has been edited in your address book.')
- del self.contacts[self.oldName]
+ del self.contacts[self._old_name]
self.contacts[name] = address
else:
QtWidgets.QMessageBox.information(self, "Edit Unsuccessful",
f'Sorry, "{name}" is already in your address book.')
return
- elif self.oldAddress != address:
+ elif self._old_address != address:
QtWidgets.QMessageBox.information(self, "Edit Successful",
f'"{name}" has been edited in your address book.')
self.contacts[name] = address
- self.updateInterface(self.NavigationMode)
+ self.update_interface(self.NavigationMode)
def cancel(self):
- self.nameLine.setText(self.oldName)
- self.addressText.setText(self.oldAddress)
- self.updateInterface(self.NavigationMode)
+ self._name_line.setText(self._old_name)
+ self._address_text.setText(self._old_address)
+ self.update_interface(self.NavigationMode)
- def removeContact(self):
- name = self.nameLine.text()
- address = self.addressText.toPlainText()
+ def remove_contact(self):
+ name = self._name_line.text()
+ address = self._address_text.toPlainText()
if name in self.contacts:
button = QtWidgets.QMessageBox.question(self, "Confirm Remove",
@@ -216,10 +216,10 @@ class AddressBook(QtWidgets.QWidget):
QtWidgets.QMessageBox.information(self, "Remove Successful",
f'"{name}" has been removed from your address book.')
- self.updateInterface(self.NavigationMode)
+ self.update_interface(self.NavigationMode)
def next(self):
- name = self.nameLine.text()
+ name = self._name_line.text()
it = iter(self.contacts)
try:
@@ -232,11 +232,11 @@ class AddressBook(QtWidgets.QWidget):
except StopIteration:
next_name, next_address = iter(self.contacts).next()
- self.nameLine.setText(next_name)
- self.addressText.setText(next_address)
+ self._name_line.setText(next_name)
+ self._address_text.setText(next_address)
def previous(self):
- name = self.nameLine.text()
+ name = self._name_line.text()
prev_name = prev_address = None
for this_name, this_address in self.contacts:
@@ -246,106 +246,106 @@ class AddressBook(QtWidgets.QWidget):
prev_name = this_name
prev_address = this_address
else:
- self.nameLine.clear()
- self.addressText.clear()
+ self._name_line.clear()
+ self._address_text.clear()
return
if prev_name is None:
for prev_name, prev_address in self.contacts:
pass
- self.nameLine.setText(prev_name)
- self.addressText.setText(prev_address)
+ self._name_line.setText(prev_name)
+ self._address_text.setText(prev_address)
- def findContact(self):
+ def find_contact(self):
self.dialog.show()
if self.dialog.exec_() == QtWidgets.QDialog.Accepted:
- contactName = self.dialog.getFindText()
+ contact_name = self.dialog.get_find_text()
- if contactName in self.contacts:
- self.nameLine.setText(contactName)
- self.addressText.setText(self.contacts[contactName])
+ if contact_name in self.contacts:
+ self._name_line.setText(contact_name)
+ self._address_text.setText(self.contacts[contact_name])
else:
QtWidgets.QMessageBox.information(self, "Contact Not Found",
- f'Sorry, "{contactName}" is not in your address book.')
+ f'Sorry, "{ccontact_nameontactName}" is not in your address book.')
return
- self.updateInterface(self.NavigationMode)
+ self.update_interface(self.NavigationMode)
- def updateInterface(self, mode):
- self.currentMode = mode
+ def update_interface(self, mode):
+ self._current_mode = mode
- if self.currentMode in (self.AddingMode, self.EditingMode):
- self.nameLine.setReadOnly(False)
- self.nameLine.setFocus(QtCore.Qt.OtherFocusReason)
- self.addressText.setReadOnly(False)
+ if self._current_mode in (self.AddingMode, self.EditingMode):
+ self._name_line.setReadOnly(False)
+ self._name_line.setFocus(QtCore.Qt.OtherFocusReason)
+ self._address_text.setReadOnly(False)
- self.addButton.setEnabled(False)
- self.editButton.setEnabled(False)
- self.removeButton.setEnabled(False)
+ self._add_button.setEnabled(False)
+ self._edit_button.setEnabled(False)
+ self._remove_button.setEnabled(False)
- self.nextButton.setEnabled(False)
- self.previousButton.setEnabled(False)
+ self._next_button.setEnabled(False)
+ self._previous_button.setEnabled(False)
- self.submitButton.show()
- self.cancelButton.show()
+ self._submit_button.show()
+ self._cancel_button.show()
- elif self.currentMode == self.NavigationMode:
+ elif self._current_mode == self.NavigationMode:
if not self.contacts:
- self.nameLine.clear()
- self.addressText.clear()
+ self._name_line.clear()
+ self._address_text.clear()
- self.nameLine.setReadOnly(True)
- self.addressText.setReadOnly(True)
- self.addButton.setEnabled(True)
+ self._name_line.setReadOnly(True)
+ self._address_text.setReadOnly(True)
+ self._add_button.setEnabled(True)
number = len(self.contacts)
- self.editButton.setEnabled(number >= 1)
- self.removeButton.setEnabled(number >= 1)
- self.findButton.setEnabled(number > 2)
- self.nextButton.setEnabled(number > 1)
- self.previousButton.setEnabled(number >1 )
+ self._edit_button.setEnabled(number >= 1)
+ self._remove_button.setEnabled(number >= 1)
+ self._find_button.setEnabled(number > 2)
+ self._next_button.setEnabled(number > 1)
+ self._previous_button.setEnabled(number >1 )
- self.submitButton.hide()
- self.cancelButton.hide()
+ self._submit_button.hide()
+ self._cancel_button.hide()
class FindDialog(QtWidgets.QDialog):
def __init__(self, parent=None):
super(FindDialog, self).__init__(parent)
- findLabel = QtWidgets.QLabel("Enter the name of a contact:")
- self.lineEdit = QtWidgets.QLineEdit()
+ find_label = QtWidgets.QLabel("Enter the name of a contact:")
+ self._line_edit = QtWidgets.QLineEdit()
- self.findButton = QtWidgets.QPushButton("&Find")
- self.findText = ''
+ self._find_button = QtWidgets.QPushButton("&Find")
+ self._find_text = ''
layout = QtWidgets.QHBoxLayout()
- layout.addWidget(findLabel)
- layout.addWidget(self.lineEdit)
- layout.addWidget(self.findButton)
+ layout.addWidget(find_label)
+ layout.addWidget(self._line_edit)
+ layout.addWidget(self._find_button)
self.setLayout(layout)
self.setWindowTitle("Find a Contact")
- self.findButton.clicked.connect(self.findClicked)
- self.findButton.clicked.connect(self.accept)
+ self._find_button.clicked.connect(self.find_clicked)
+ self._find_button.clicked.connect(self.accept)
- def findClicked(self):
- text = self.lineEdit.text()
+ def find_clicked(self):
+ text = self._line_edit.text()
if not text:
QtWidgets.QMessageBox.information(self, "Empty Field",
"Please enter a name.")
return
else:
- self.findText = text
- self.lineEdit.clear()
+ self._find_text = text
+ self._line_edit.clear()
self.hide()
- def getFindText(self):
- return self.findText
+ def get_find_text(self):
+ return self._find_text
if __name__ == '__main__':
@@ -353,7 +353,7 @@ if __name__ == '__main__':
app = QtWidgets.QApplication(sys.argv)
- addressBook = AddressBook()
- addressBook.show()
+ address_book = AddressBook()
+ address_book.show()
sys.exit(app.exec_())
diff --git a/examples/widgets/tutorials/addressbook/part6.py b/examples/widgets/tutorials/addressbook/part6.py
index 370c1ba9c..f77bd2136 100644
--- a/examples/widgets/tutorials/addressbook/part6.py
+++ b/examples/widgets/tutorials/addressbook/part6.py
@@ -81,105 +81,105 @@ class AddressBook(QtWidgets.QWidget):
super(AddressBook, self).__init__(parent)
self.contacts = SortedDict()
- self.oldName = ''
- self.oldAddress = ''
- self.currentMode = self.NavigationMode
-
- nameLabel = QtWidgets.QLabel("Name:")
- self.nameLine = QtWidgets.QLineEdit()
- self.nameLine.setReadOnly(True)
-
- addressLabel = QtWidgets.QLabel("Address:")
- self.addressText = QtWidgets.QTextEdit()
- self.addressText.setReadOnly(True)
-
- self.addButton = QtWidgets.QPushButton("&Add")
- self.editButton = QtWidgets.QPushButton("&Edit")
- self.editButton.setEnabled(False)
- self.removeButton = QtWidgets.QPushButton("&Remove")
- self.removeButton.setEnabled(False)
- self.findButton = QtWidgets.QPushButton("&Find")
- self.findButton.setEnabled(False)
- self.submitButton = QtWidgets.QPushButton("&Submit")
- self.submitButton.hide()
- self.cancelButton = QtWidgets.QPushButton("&Cancel")
- self.cancelButton.hide()
-
- self.nextButton = QtWidgets.QPushButton("&Next")
- self.nextButton.setEnabled(False)
- self.previousButton = QtWidgets.QPushButton("&Previous")
- self.previousButton.setEnabled(False)
-
- self.loadButton = QtWidgets.QPushButton("&Load...")
- self.loadButton.setToolTip("Load contacts from a file")
- self.saveButton = QtWidgets.QPushButton("Sa&ve...")
- self.saveButton.setToolTip("Save contacts to a file")
- self.saveButton.setEnabled(False)
+ self._old_name = ''
+ self._old_address = ''
+ self._current_mode = self.NavigationMode
+
+ name_label = QtWidgets.QLabel("Name:")
+ self._name_line = QtWidgets.QLineEdit()
+ self._name_line.setReadOnly(True)
+
+ address_label = QtWidgets.QLabel("Address:")
+ self._address_text = QtWidgets.QTextEdit()
+ self._address_text.setReadOnly(True)
+
+ self._add_button = QtWidgets.QPushButton("&Add")
+ self._edit_button = QtWidgets.QPushButton("&Edit")
+ self._edit_button.setEnabled(False)
+ self._remove_button = QtWidgets.QPushButton("&Remove")
+ self._remove_button.setEnabled(False)
+ self._find_button = QtWidgets.QPushButton("&Find")
+ self._find_button.setEnabled(False)
+ self._submit_button = QtWidgets.QPushButton("&Submit")
+ self._submit_button.hide()
+ self._cancel_button = QtWidgets.QPushButton("&Cancel")
+ self._cancel_button.hide()
+
+ self._next_button = QtWidgets.QPushButton("&Next")
+ self._next_button.setEnabled(False)
+ self._previous_button = QtWidgets.QPushButton("&Previous")
+ self._previous_button.setEnabled(False)
+
+ self._load_button = QtWidgets.QPushButton("&Load...")
+ self._load_button.setToolTip("Load contacts from a file")
+ self._save_button = QtWidgets.QPushButton("Sa&ve...")
+ self._save_button.setToolTip("Save contacts to a file")
+ self._save_button.setEnabled(False)
self.dialog = FindDialog()
- self.addButton.clicked.connect(self.addContact)
- self.submitButton.clicked.connect(self.submitContact)
- self.editButton.clicked.connect(self.editContact)
- self.removeButton.clicked.connect(self.removeContact)
- self.findButton.clicked.connect(self.findContact)
- self.cancelButton.clicked.connect(self.cancel)
- self.nextButton.clicked.connect(self.next)
- self.previousButton.clicked.connect(self.previous)
- self.loadButton.clicked.connect(self.loadFromFile)
- self.saveButton.clicked.connect(self.saveToFile)
-
- buttonLayout1 = QtWidgets.QVBoxLayout()
- buttonLayout1.addWidget(self.addButton)
- buttonLayout1.addWidget(self.editButton)
- buttonLayout1.addWidget(self.removeButton)
- buttonLayout1.addWidget(self.findButton)
- buttonLayout1.addWidget(self.submitButton)
- buttonLayout1.addWidget(self.cancelButton)
- buttonLayout1.addWidget(self.loadButton)
- buttonLayout1.addWidget(self.saveButton)
- buttonLayout1.addStretch()
-
- buttonLayout2 = QtWidgets.QHBoxLayout()
- buttonLayout2.addWidget(self.previousButton)
- buttonLayout2.addWidget(self.nextButton)
-
- mainLayout = QtWidgets.QGridLayout()
- mainLayout.addWidget(nameLabel, 0, 0)
- mainLayout.addWidget(self.nameLine, 0, 1)
- mainLayout.addWidget(addressLabel, 1, 0, QtCore.Qt.AlignTop)
- mainLayout.addWidget(self.addressText, 1, 1)
- mainLayout.addLayout(buttonLayout1, 1, 2)
- mainLayout.addLayout(buttonLayout2, 2, 1)
-
- self.setLayout(mainLayout)
+ self._add_button.clicked.connect(self.add_contact)
+ self._submit_button.clicked.connect(self.submit_contact)
+ self._edit_button.clicked.connect(self.edit_contact)
+ self._remove_button.clicked.connect(self.remove_contact)
+ self._find_button.clicked.connect(self.find_contact)
+ self._cancel_button.clicked.connect(self.cancel)
+ self._next_button.clicked.connect(self.next)
+ self._previous_button.clicked.connect(self.previous)
+ self._load_button.clicked.connect(self.load_from_file)
+ self._save_button.clicked.connect(self.save_to_file)
+
+ button_layout_1 = QtWidgets.QVBoxLayout()
+ button_layout_1.addWidget(self._add_button)
+ button_layout_1.addWidget(self._edit_button)
+ button_layout_1.addWidget(self._remove_button)
+ button_layout_1.addWidget(self._find_button)
+ button_layout_1.addWidget(self._submit_button)
+ button_layout_1.addWidget(self._cancel_button)
+ button_layout_1.addWidget(self._load_button)
+ button_layout_1.addWidget(self._save_button)
+ button_layout_1.addStretch()
+
+ button_layout_2 = QtWidgets.QHBoxLayout()
+ button_layout_2.addWidget(self._previous_button)
+ button_layout_2.addWidget(self._next_button)
+
+ main_layout = QtWidgets.QGridLayout()
+ main_layout.addWidget(name_label, 0, 0)
+ main_layout.addWidget(self._name_line, 0, 1)
+ main_layout.addWidget(address_label, 1, 0, QtCore.Qt.AlignTop)
+ main_layout.addWidget(self._address_text, 1, 1)
+ main_layout.addLayout(button_layout_1, 1, 2)
+ main_layout.addLayout(button_layout_2, 2, 1)
+
+ self.setLayout(main_layout)
self.setWindowTitle("Simple Address Book")
- def addContact(self):
- self.oldName = self.nameLine.text()
- self.oldAddress = self.addressText.toPlainText()
+ def add_contact(self):
+ self._old_name = self._name_line.text()
+ self._old_address = self._address_text.toPlainText()
- self.nameLine.clear()
- self.addressText.clear()
+ self._name_line.clear()
+ self._address_text.clear()
- self.updateInterface(self.AddingMode)
+ self.update_interface(self.AddingMode)
- def editContact(self):
- self.oldName = self.nameLine.text()
- self.oldAddress = self.addressText.toPlainText()
+ def edit_contact(self):
+ self._old_name = self._name_line.text()
+ self._old_address = self._address_text.toPlainText()
- self.updateInterface(self.EditingMode)
+ self.update_interface(self.EditingMode)
- def submitContact(self):
- name = self.nameLine.text()
- address = self.addressText.toPlainText()
+ def submit_contact(self):
+ name = self._name_line.text()
+ address = self._address_text.toPlainText()
if name == "" or address == "":
QtWidgets.QMessageBox.information(self, "Empty Field",
"Please enter a name and address.")
return
- if self.currentMode == self.AddingMode:
+ if self._current_mode == self.AddingMode:
if name not in self.contacts:
self.contacts[name] = address
QtWidgets.QMessageBox.information(self, "Add Successful",
@@ -189,32 +189,32 @@ class AddressBook(QtWidgets.QWidget):
f'Sorry, "{name}" is already in your address book.')
return
- elif self.currentMode == self.EditingMode:
- if self.oldName != name:
+ elif self._current_mode == self.EditingMode:
+ if self._old_name != name:
if name not in self.contacts:
QtWidgets.QMessageBox.information(self, "Edit Successful",
f'"{self.oldName}" has been edited in your address book.')
- del self.contacts[self.oldName]
+ del self.contacts[self._old_name]
self.contacts[name] = address
else:
QtWidgets.QMessageBox.information(self, "Edit Unsuccessful",
f'Sorry, "{name}" is already in your address book.')
return
- elif self.oldAddress != address:
+ elif self._old_address != address:
QtWidgets.QMessageBox.information(self, "Edit Successful",
f'"{name}" has been edited in your address book.')
self.contacts[name] = address
- self.updateInterface(self.NavigationMode)
+ self.update_interface(self.NavigationMode)
def cancel(self):
- self.nameLine.setText(self.oldName)
- self.addressText.setText(self.oldAddress)
- self.updateInterface(self.NavigationMode)
+ self._name_line.setText(self._old_name)
+ self._address_text.setText(self._old_address)
+ self.update_interface(self.NavigationMode)
- def removeContact(self):
- name = self.nameLine.text()
- address = self.addressText.toPlainText()
+ def remove_contact(self):
+ name = self._name_line.text()
+ address = self._address_text.toPlainText()
if name in self.contacts:
button = QtWidgets.QMessageBox.question(self, "Confirm Remove",
@@ -228,10 +228,10 @@ class AddressBook(QtWidgets.QWidget):
QtWidgets.QMessageBox.information(self, "Remove Successful",
f'"{name}" has been removed from your address book.')
- self.updateInterface(self.NavigationMode)
+ self.update_interface(self.NavigationMode)
def next(self):
- name = self.nameLine.text()
+ name = self._name_line.text()
it = iter(self.contacts)
try:
@@ -244,11 +244,11 @@ class AddressBook(QtWidgets.QWidget):
except StopIteration:
next_name, next_address = iter(self.contacts).next()
- self.nameLine.setText(next_name)
- self.addressText.setText(next_address)
+ self._name_line.setText(next_name)
+ self._address_text.setText(next_address)
def previous(self):
- name = self.nameLine.text()
+ name = self._name_line.text()
prev_name = prev_address = None
for this_name, this_address in self.contacts:
@@ -258,77 +258,77 @@ class AddressBook(QtWidgets.QWidget):
prev_name = this_name
prev_address = this_address
else:
- self.nameLine.clear()
- self.addressText.clear()
+ self._name_line.clear()
+ self._address_text.clear()
return
if prev_name is None:
for prev_name, prev_address in self.contacts:
pass
- self.nameLine.setText(prev_name)
- self.addressText.setText(prev_address)
+ self._name_line.setText(prev_name)
+ self._address_text.setText(prev_address)
- def findContact(self):
+ def find_contact(self):
self.dialog.show()
if self.dialog.exec_() == QtWidgets.QDialog.Accepted:
- contactName = self.dialog.getFindText()
+ contact_name = self.dialog.get_find_text()
- if contactName in self.contacts:
- self.nameLine.setText(contactName)
- self.addressText.setText(self.contacts[contactName])
+ if contact_name in self.contacts:
+ self._name_line.setText(contact_name)
+ self._address_text.setText(self.contacts[contact_name])
else:
QtWidgets.QMessageBox.information(self, "Contact Not Found",
- f'Sorry, "{contactName}" is not in your address book.')
+ f'Sorry, "{ccontact_nameontactName}" is not in your address book.')
return
- self.updateInterface(self.NavigationMode)
+ self.update_interface(self.NavigationMode)
- def updateInterface(self, mode):
- self.currentMode = mode
+ def update_interface(self, mode):
+ self._current_mode = mode
- if self.currentMode in (self.AddingMode, self.EditingMode):
- self.nameLine.setReadOnly(False)
- self.nameLine.setFocus(QtCore.Qt.OtherFocusReason)
- self.addressText.setReadOnly(False)
+ if self._current_mode in (self.AddingMode, self.EditingMode):
+ self._name_line.setReadOnly(False)
+ self._name_line.setFocus(QtCore.Qt.OtherFocusReason)
+ self._address_text.setReadOnly(False)
- self.addButton.setEnabled(False)
- self.editButton.setEnabled(False)
- self.removeButton.setEnabled(False)
+ self._add_button.setEnabled(False)
+ self._edit_button.setEnabled(False)
+ self._remove_button.setEnabled(False)
- self.nextButton.setEnabled(False)
- self.previousButton.setEnabled(False)
+ self._next_button.setEnabled(False)
+ self._previous_button.setEnabled(False)
- self.submitButton.show()
- self.cancelButton.show()
+ self._submit_button.show()
+ self._cancel_button.show()
- self.loadButton.setEnabled(False)
- self.saveButton.setEnabled(False)
+ self._load_button.setEnabled(False)
+ self._save_button.setEnabled(False)
- elif self.currentMode == self.NavigationMode:
+ elif self._current_mode == self.NavigationMode:
if not self.contacts:
- self.nameLine.clear()
- self.addressText.clear()
+ self._name_line.clear()
+ self._address_text.clear()
- self.nameLine.setReadOnly(True)
- self.addressText.setReadOnly(True)
- self.addButton.setEnabled(True)
+ self._name_line.setReadOnly(True)
+ self._address_text.setReadOnly(True)
+ self._add_button.setEnabled(True)
number = len(self.contacts)
- self.editButton.setEnabled(number >= 1)
- self.removeButton.setEnabled(number >= 1)
- self.findButton.setEnabled(number > 2)
- self.nextButton.setEnabled(number > 1)
- self.previousButton.setEnabled(number >1 )
+ self._edit_button.setEnabled(number >= 1)
+ self._remove_button.setEnabled(number >= 1)
+ self._find_button.setEnabled(number > 2)
+ self._next_button.setEnabled(number > 1)
+ self._previous_button.setEnabled(number >1 )
- self.submitButton.hide()
- self.cancelButton.hide()
+ self._submit_button.hide()
+ self._cancel_button.hide()
- self.loadButton.setEnabled(True)
- self.saveButton.setEnabled(number >= 1)
+ self._load_button.setEnabled(True)
+ self._save_button.setEnabled(number >= 1)
- def saveToFile(self):
+ def save_to_file(self):
fileName,_ = QtWidgets.QFileDialog.getSaveFileName(self,
"Save Address Book", '',
"Address Book (*.abk);;All Files (*)")
@@ -346,7 +346,7 @@ class AddressBook(QtWidgets.QWidget):
pickle.dump(self.contacts, out_file)
out_file.close()
- def loadFromFile(self):
+ def load_from_file(self):
fileName,_ = QtWidgets.QFileDialog.getOpenFileName(self,
"Open Address Book", '',
"Address Book (*.abk);;All Files (*)")
@@ -370,47 +370,47 @@ class AddressBook(QtWidgets.QWidget):
"contacts.")
else:
for name, address in self.contacts:
- self.nameLine.setText(name)
- self.addressText.setText(address)
+ self._name_line.setText(name)
+ self._address_text.setText(address)
- self.updateInterface(self.NavigationMode)
+ self.update_interface(self.NavigationMode)
class FindDialog(QtWidgets.QDialog):
def __init__(self, parent=None):
super(FindDialog, self).__init__(parent)
- findLabel = QtWidgets.QLabel("Enter the name of a contact:")
- self.lineEdit = QtWidgets.QLineEdit()
+ find_label = QtWidgets.QLabel("Enter the name of a contact:")
+ self._line_edit = QtWidgets.QLineEdit()
- self.findButton = QtWidgets.QPushButton("&Find")
- self.findText = ''
+ self._find_button = QtWidgets.QPushButton("&Find")
+ self._find_text = ''
layout = QtWidgets.QHBoxLayout()
- layout.addWidget(findLabel)
- layout.addWidget(self.lineEdit)
- layout.addWidget(self.findButton)
+ layout.addWidget(find_label)
+ layout.addWidget(self._line_edit)
+ layout.addWidget(self._find_button)
self.setLayout(layout)
self.setWindowTitle("Find a Contact")
- self.findButton.clicked.connect(self.findClicked)
- self.findButton.clicked.connect(self.accept)
+ self._find_button.clicked.connect(self.find_clicked)
+ self._find_button.clicked.connect(self.accept)
- def findClicked(self):
- text = self.lineEdit.text()
+ def find_clicked(self):
+ text = self._line_edit.text()
if not text:
QtWidgets.QMessageBox.information(self, "Empty Field",
"Please enter a name.")
return
- self.findText = text
- self.lineEdit.clear()
+ self._find_text = text
+ self._line_edit.clear()
self.hide()
- def getFindText(self):
- return self.findText
+ def get_find_text(self):
+ return self._find_text
if __name__ == '__main__':
@@ -418,7 +418,7 @@ if __name__ == '__main__':
app = QtWidgets.QApplication(sys.argv)
- addressBook = AddressBook()
- addressBook.show()
+ address_book = AddressBook()
+ address_book.show()
sys.exit(app.exec_())
diff --git a/examples/widgets/tutorials/addressbook/part7.py b/examples/widgets/tutorials/addressbook/part7.py
index d2c70d41a..f494837a6 100644
--- a/examples/widgets/tutorials/addressbook/part7.py
+++ b/examples/widgets/tutorials/addressbook/part7.py
@@ -81,111 +81,111 @@ class AddressBook(QtWidgets.QWidget):
super(AddressBook, self).__init__(parent)
self.contacts = SortedDict()
- self.oldName = ''
- self.oldAddress = ''
- self.currentMode = self.NavigationMode
-
- nameLabel = QtWidgets.QLabel("Name:")
- self.nameLine = QtWidgets.QLineEdit()
- self.nameLine.setReadOnly(True)
-
- addressLabel = QtWidgets.QLabel("Address:")
- self.addressText = QtWidgets.QTextEdit()
- self.addressText.setReadOnly(True)
-
- self.addButton = QtWidgets.QPushButton("&Add")
- self.editButton = QtWidgets.QPushButton("&Edit")
- self.editButton.setEnabled(False)
- self.removeButton = QtWidgets.QPushButton("&Remove")
- self.removeButton.setEnabled(False)
- self.findButton = QtWidgets.QPushButton("&Find")
- self.findButton.setEnabled(False)
- self.submitButton = QtWidgets.QPushButton("&Submit")
- self.submitButton.hide()
- self.cancelButton = QtWidgets.QPushButton("&Cancel")
- self.cancelButton.hide()
-
- self.nextButton = QtWidgets.QPushButton("&Next")
- self.nextButton.setEnabled(False)
- self.previousButton = QtWidgets.QPushButton("&Previous")
- self.previousButton.setEnabled(False)
-
- self.loadButton = QtWidgets.QPushButton("&Load...")
- self.loadButton.setToolTip("Load contacts from a file")
- self.saveButton = QtWidgets.QPushButton("Sa&ve...")
- self.saveButton.setToolTip("Save contacts to a file")
- self.saveButton.setEnabled(False)
-
- self.exportButton = QtWidgets.QPushButton("Ex&port")
- self.exportButton.setToolTip("Export as vCard")
- self.exportButton.setEnabled(False)
+ self._old_name = ''
+ self._old_address = ''
+ self._current_mode = self.NavigationMode
+
+ name_label = QtWidgets.QLabel("Name:")
+ self._name_line = QtWidgets.QLineEdit()
+ self._name_line.setReadOnly(True)
+
+ address_label = QtWidgets.QLabel("Address:")
+ self._address_text = QtWidgets.QTextEdit()
+ self._address_text.setReadOnly(True)
+
+ self._add_button = QtWidgets.QPushButton("&Add")
+ self._edit_button = QtWidgets.QPushButton("&Edit")
+ self._edit_button.setEnabled(False)
+ self._remove_button = QtWidgets.QPushButton("&Remove")
+ self._remove_button.setEnabled(False)
+ self._find_button = QtWidgets.QPushButton("&Find")
+ self._find_button.setEnabled(False)
+ self._submit_button = QtWidgets.QPushButton("&Submit")
+ self._submit_button.hide()
+ self._cancel_button = QtWidgets.QPushButton("&Cancel")
+ self._cancel_button.hide()
+
+ self._next_button = QtWidgets.QPushButton("&Next")
+ self._next_button.setEnabled(False)
+ self._previous_button = QtWidgets.QPushButton("&Previous")
+ self._previous_button.setEnabled(False)
+
+ self._load_button = QtWidgets.QPushButton("&Load...")
+ self._load_button.setToolTip("Load contacts from a file")
+ self._save_button = QtWidgets.QPushButton("Sa&ve...")
+ self._save_button.setToolTip("Save contacts to a file")
+ self._save_button.setEnabled(False)
+
+ self._export_button = QtWidgets.QPushButton("Ex&port")
+ self._export_button.setToolTip("Export as vCard")
+ self._export_button.setEnabled(False)
self.dialog = FindDialog()
- self.addButton.clicked.connect(self.addContact)
- self.submitButton.clicked.connect(self.submitContact)
- self.editButton.clicked.connect(self.editContact)
- self.removeButton.clicked.connect(self.removeContact)
- self.findButton.clicked.connect(self.findContact)
- self.cancelButton.clicked.connect(self.cancel)
- self.nextButton.clicked.connect(self.next)
- self.previousButton.clicked.connect(self.previous)
- self.loadButton.clicked.connect(self.loadFromFile)
- self.saveButton.clicked.connect(self.saveToFile)
- self.exportButton.clicked.connect(self.exportAsVCard)
-
- buttonLayout1 = QtWidgets.QVBoxLayout()
- buttonLayout1.addWidget(self.addButton)
- buttonLayout1.addWidget(self.editButton)
- buttonLayout1.addWidget(self.removeButton)
- buttonLayout1.addWidget(self.findButton)
- buttonLayout1.addWidget(self.submitButton)
- buttonLayout1.addWidget(self.cancelButton)
- buttonLayout1.addWidget(self.loadButton)
- buttonLayout1.addWidget(self.saveButton)
- buttonLayout1.addWidget(self.exportButton)
- buttonLayout1.addStretch()
-
- buttonLayout2 = QtWidgets.QHBoxLayout()
- buttonLayout2.addWidget(self.previousButton)
- buttonLayout2.addWidget(self.nextButton)
-
- mainLayout = QtWidgets.QGridLayout()
- mainLayout.addWidget(nameLabel, 0, 0)
- mainLayout.addWidget(self.nameLine, 0, 1)
- mainLayout.addWidget(addressLabel, 1, 0, QtCore.Qt.AlignTop)
- mainLayout.addWidget(self.addressText, 1, 1)
- mainLayout.addLayout(buttonLayout1, 1, 2)
- mainLayout.addLayout(buttonLayout2, 2, 1)
-
- self.setLayout(mainLayout)
+ self._add_button.clicked.connect(self.add_contact)
+ self._submit_button.clicked.connect(self.submit_contact)
+ self._edit_button.clicked.connect(self.edit_contact)
+ self._remove_button.clicked.connect(self.remove_contact)
+ self._find_button.clicked.connect(self.find_contact)
+ self._cancel_button.clicked.connect(self.cancel)
+ self._next_button.clicked.connect(self.next)
+ self._previous_button.clicked.connect(self.previous)
+ self._load_button.clicked.connect(self.load_from_file)
+ self._save_button.clicked.connect(self.save_to_file)
+ self._export_button.clicked.connect(self.export_as_vcard)
+
+ button_layout_1 = QtWidgets.QVBoxLayout()
+ button_layout_1.addWidget(self._add_button)
+ button_layout_1.addWidget(self._edit_button)
+ button_layout_1.addWidget(self._remove_button)
+ button_layout_1.addWidget(self._find_button)
+ button_layout_1.addWidget(self._submit_button)
+ button_layout_1.addWidget(self._cancel_button)
+ button_layout_1.addWidget(self._load_button)
+ button_layout_1.addWidget(self._save_button)
+ button_layout_1.addWidget(self._export_button)
+ button_layout_1.addStretch()
+
+ button_layout_2 = QtWidgets.QHBoxLayout()
+ button_layout_2.addWidget(self._previous_button)
+ button_layout_2.addWidget(self._next_button)
+
+ main_layout = QtWidgets.QGridLayout()
+ main_layout.addWidget(name_label, 0, 0)
+ main_layout.addWidget(self._name_line, 0, 1)
+ main_layout.addWidget(address_label, 1, 0, QtCore.Qt.AlignTop)
+ main_layout.addWidget(self._address_text, 1, 1)
+ main_layout.addLayout(button_layout_1, 1, 2)
+ main_layout.addLayout(button_layout_2, 2, 1)
+
+ self.setLayout(main_layout)
self.setWindowTitle("Simple Address Book")
- def addContact(self):
- self.oldName = self.nameLine.text()
- self.oldAddress = self.addressText.toPlainText()
+ def add_contact(self):
+ self._old_name = self._name_line.text()
+ self._old_address = self._address_text.toPlainText()
- self.nameLine.clear()
- self.addressText.clear()
+ self._name_line.clear()
+ self._address_text.clear()
- self.updateInterface(self.AddingMode)
+ self.update_interface(self.AddingMode)
- def editContact(self):
- self.oldName = self.nameLine.text()
- self.oldAddress = self.addressText.toPlainText()
+ def edit_contact(self):
+ self._old_name = self._name_line.text()
+ self._old_address = self._address_text.toPlainText()
- self.updateInterface(self.EditingMode)
+ self.update_interface(self.EditingMode)
- def submitContact(self):
- name = self.nameLine.text()
- address = self.addressText.toPlainText()
+ def submit_contact(self):
+ name = self._name_line.text()
+ address = self._address_text.toPlainText()
if name == "" or address == "":
QtWidgets.QMessageBox.information(self, "Empty Field",
"Please enter a name and address.")
return
- if self.currentMode == self.AddingMode:
+ if self._current_mode == self.AddingMode:
if name not in self.contacts:
self.contacts[name] = address
QtWidgets.QMessageBox.information(self, "Add Successful",
@@ -195,32 +195,32 @@ class AddressBook(QtWidgets.QWidget):
f'Sorry, "{name}" is already in your address book.')
return
- elif self.currentMode == self.EditingMode:
- if self.oldName != name:
+ elif self._current_mode == self.EditingMode:
+ if self._old_name != name:
if name not in self.contacts:
QtWidgets.QMessageBox.information(self, "Edit Successful",
f'"{self.oldName}" has been edited in your address book.')
- del self.contacts[self.oldName]
+ del self.contacts[self._old_name]
self.contacts[name] = address
else:
QtWidgets.QMessageBox.information(self, "Edit Unsuccessful",
f'Sorry, "{name}" is already in your address book.')
return
- elif self.oldAddress != address:
+ elif self._old_address != address:
QtWidgets.QMessageBox.information(self, "Edit Successful",
f'"{name}" has been edited in your address book.')
self.contacts[name] = address
- self.updateInterface(self.NavigationMode)
+ self.update_interface(self.NavigationMode)
def cancel(self):
- self.nameLine.setText(self.oldName)
- self.addressText.setText(self.oldAddress)
- self.updateInterface(self.NavigationMode)
+ self._name_line.setText(self._old_name)
+ self._address_text.setText(self._old_address)
+ self.update_interface(self.NavigationMode)
- def removeContact(self):
- name = self.nameLine.text()
- address = self.addressText.toPlainText()
+ def remove_contact(self):
+ name = self._name_line.text()
+ address = self._address_text.toPlainText()
if name in self.contacts:
button = QtWidgets.QMessageBox.question(self, "Confirm Remove",
@@ -234,10 +234,10 @@ class AddressBook(QtWidgets.QWidget):
QtWidgets.QMessageBox.information(self, "Remove Successful",
f'"{name}" has been removed from your address book.')
- self.updateInterface(self.NavigationMode)
+ self.update_interface(self.NavigationMode)
def next(self):
- name = self.nameLine.text()
+ name = self._name_line.text()
it = iter(self.contacts)
try:
@@ -250,11 +250,11 @@ class AddressBook(QtWidgets.QWidget):
except StopIteration:
next_name, next_address = iter(self.contacts).next()
- self.nameLine.setText(next_name)
- self.addressText.setText(next_address)
+ self._name_line.setText(next_name)
+ self._address_text.setText(next_address)
def previous(self):
- name = self.nameLine.text()
+ name = self._name_line.text()
prev_name = prev_address = None
for this_name, this_address in self.contacts:
@@ -264,80 +264,80 @@ class AddressBook(QtWidgets.QWidget):
prev_name = this_name
prev_address = this_address
else:
- self.nameLine.clear()
- self.addressText.clear()
+ self._name_line.clear()
+ self._address_text.clear()
return
if prev_name is None:
for prev_name, prev_address in self.contacts:
pass
- self.nameLine.setText(prev_name)
- self.addressText.setText(prev_address)
+ self._name_line.setText(prev_name)
+ self._address_text.setText(prev_address)
- def findContact(self):
+ def find_contact(self):
self.dialog.show()
if self.dialog.exec_() == QtWidgets.QDialog.Accepted:
- contactName = self.dialog.getFindText()
+ contact_name = self.dialog.get_find_text()
- if contactName in self.contacts:
- self.nameLine.setText(contactName)
- self.addressText.setText(self.contacts[contactName])
+ if contact_name in self.contacts:
+ self._name_line.setText(contact_name)
+ self._address_text.setText(self.contacts[contact_name])
else:
QtWidgets.QMessageBox.information(self, "Contact Not Found",
- f'Sorry, "{contactName}" is not in your address book.')
+ f'Sorry, "{ccontact_nameontactName}" is not in your address book.')
return
- self.updateInterface(self.NavigationMode)
+ self.update_interface(self.NavigationMode)
- def updateInterface(self, mode):
- self.currentMode = mode
+ def update_interface(self, mode):
+ self._current_mode = mode
- if self.currentMode in (self.AddingMode, self.EditingMode):
- self.nameLine.setReadOnly(False)
- self.nameLine.setFocus(QtCore.Qt.OtherFocusReason)
- self.addressText.setReadOnly(False)
+ if self._current_mode in (self.AddingMode, self.EditingMode):
+ self._name_line.setReadOnly(False)
+ self._name_line.setFocus(QtCore.Qt.OtherFocusReason)
+ self._address_text.setReadOnly(False)
- self.addButton.setEnabled(False)
- self.editButton.setEnabled(False)
- self.removeButton.setEnabled(False)
+ self._add_button.setEnabled(False)
+ self._edit_button.setEnabled(False)
+ self._remove_button.setEnabled(False)
- self.nextButton.setEnabled(False)
- self.previousButton.setEnabled(False)
+ self._next_button.setEnabled(False)
+ self._previous_button.setEnabled(False)
- self.submitButton.show()
- self.cancelButton.show()
+ self._submit_button.show()
+ self._cancel_button.show()
- self.loadButton.setEnabled(False)
- self.saveButton.setEnabled(False)
- self.exportButton.setEnabled(False)
+ self._load_button.setEnabled(False)
+ self._save_button.setEnabled(False)
+ self._export_button.setEnabled(False)
- elif self.currentMode == self.NavigationMode:
+ elif self._current_mode == self.NavigationMode:
if not self.contacts:
- self.nameLine.clear()
- self.addressText.clear()
+ self._name_line.clear()
+ self._address_text.clear()
- self.nameLine.setReadOnly(True)
- self.addressText.setReadOnly(True)
- self.addButton.setEnabled(True)
+ self._name_line.setReadOnly(True)
+ self._address_text.setReadOnly(True)
+ self._add_button.setEnabled(True)
number = len(self.contacts)
- self.editButton.setEnabled(number >= 1)
- self.removeButton.setEnabled(number >= 1)
- self.findButton.setEnabled(number > 2)
- self.nextButton.setEnabled(number > 1)
- self.previousButton.setEnabled(number >1 )
+ self._edit_button.setEnabled(number >= 1)
+ self._remove_button.setEnabled(number >= 1)
+ self._find_button.setEnabled(number > 2)
+ self._next_button.setEnabled(number > 1)
+ self._previous_button.setEnabled(number >1 )
- self.submitButton.hide()
- self.cancelButton.hide()
+ self._submit_button.hide()
+ self._cancel_button.hide()
- self.exportButton.setEnabled(number >= 1)
+ self._export_button.setEnabled(number >= 1)
- self.loadButton.setEnabled(True)
- self.saveButton.setEnabled(number >= 1)
+ self._load_button.setEnabled(True)
+ self._save_button.setEnabled(number >= 1)
- def saveToFile(self):
+ def save_to_file(self):
fileName,_ = QtWidgets.QFileDialog.getSaveFileName(self,
"Save Address Book", '',
"Address Book (*.abk);;All Files (*)")
@@ -355,7 +355,7 @@ class AddressBook(QtWidgets.QWidget):
pickle.dump(self.contacts, out_file)
out_file.close()
- def loadFromFile(self):
+ def load_from_file(self):
fileName,_ = QtWidgets.QFileDialog.getOpenFileName(self,
"Open Address Book", '',
"Address Book (*.abk);;All Files (*)")
@@ -379,31 +379,31 @@ class AddressBook(QtWidgets.QWidget):
"contacts.")
else:
for name, address in self.contacts:
- self.nameLine.setText(name)
- self.addressText.setText(address)
+ self._name_line.setText(name)
+ self._address_text.setText(address)
- self.updateInterface(self.NavigationMode)
+ self.update_interface(self.NavigationMode)
- def exportAsVCard(self):
- name = str(self.nameLine.text())
- address = self.addressText.toPlainText()
+ def export_as_vcard(self):
+ name = str(self._name_line.text())
+ address = self._address_text.toPlainText()
- nameList = name.split()
+ name_list = name.split()
- if len(nameList) > 1:
- firstName = nameList[0]
- lastName = nameList[-1]
+ if len(name_list) > 1:
+ first_name = name_list[0]
+ last_name = name_list[-1]
else:
- firstName = name
- lastName = ''
+ first_name = name
+ last_name = ''
- fileName = QtWidgets.QFileDialog.getSaveFileName(self, "Export Contact",
+ file_name = QtWidgets.QFileDialog.getSaveFileName(self, "Export Contact",
'', "vCard Files (*.vcf);;All Files (*)")[0]
- if not fileName:
+ if not file_name:
return
- out_file = QtCore.QFile(fileName)
+ out_file = QtCore.QFile(file_name)
if not out_file.open(QtCore.QIODevice.WriteOnly):
QtWidgets.QMessageBox.information(self, "Unable to open file",
@@ -414,8 +414,8 @@ class AddressBook(QtWidgets.QWidget):
out_s << 'BEGIN:VCARD' << '\n'
out_s << 'VERSION:2.1' << '\n'
- out_s << 'N:' << lastName << ';' << firstName << '\n'
- out_s << 'FN:' << ' '.join(nameList) << '\n'
+ out_s << 'N:' << last_name << ';' << first_name << '\n'
+ out_s << 'FN:' << ' '.join(name_list) << '\n'
address.replace(';', '\\;')
address.replace('\n', ';')
@@ -432,37 +432,37 @@ class FindDialog(QtWidgets.QDialog):
def __init__(self, parent=None):
super(FindDialog, self).__init__(parent)
- findLabel = QtWidgets.QLabel("Enter the name of a contact:")
- self.lineEdit = QtWidgets.QLineEdit()
+ find_label = QtWidgets.QLabel("Enter the name of a contact:")
+ self._line_edit = QtWidgets.QLineEdit()
- self.findButton = QtWidgets.QPushButton("&Find")
- self.findText = ''
+ self._find_button = QtWidgets.QPushButton("&Find")
+ self._find_text = ''
layout = QtWidgets.QHBoxLayout()
- layout.addWidget(findLabel)
- layout.addWidget(self.lineEdit)
- layout.addWidget(self.findButton)
+ layout.addWidget(find_label)
+ layout.addWidget(self._line_edit)
+ layout.addWidget(self._find_button)
self.setLayout(layout)
self.setWindowTitle("Find a Contact")
- self.findButton.clicked.connect(self.findClicked)
- self.findButton.clicked.connect(self.accept)
+ self._find_button.clicked.connect(self.find_clicked)
+ self._find_button.clicked.connect(self.accept)
- def findClicked(self):
- text = self.lineEdit.text()
+ def find_clicked(self):
+ text = self._line_edit.text()
if not text:
QtWidgets.QMessageBox.information(self, "Empty Field",
"Please enter a name.")
return
- self.findText = text
- self.lineEdit.clear()
+ self._find_text = text
+ self._line_edit.clear()
self.hide()
- def getFindText(self):
- return self.findText
+ def get_find_text(self):
+ return self._find_text
if __name__ == '__main__':
@@ -470,7 +470,7 @@ if __name__ == '__main__':
app = QtWidgets.QApplication(sys.argv)
- addressBook = AddressBook()
- addressBook.show()
+ address_book = AddressBook()
+ address_book.show()
sys.exit(app.exec_())
diff --git a/examples/widgets/tutorials/cannon/t10.py b/examples/widgets/tutorials/cannon/t10.py
index 1cfed53aa..6665eccbb 100644
--- a/examples/widgets/tutorials/cannon/t10.py
+++ b/examples/widgets/tutorials/cannon/t10.py
@@ -47,7 +47,7 @@ from PySide6 import QtCore, QtGui, QtWidgets
class LCDRange(QtWidgets.QWidget):
- valueChanged = QtCore.Signal(int)
+ value_changed = QtCore.Signal(int)
def __init__(self, parent=None):
QtWidgets.QWidget.__init__(self, parent)
@@ -72,10 +72,10 @@ class LCDRange(QtWidgets.QWidget):
return self.slider.value()
@QtCore.Slot(int)
- def setValue(self, value):
+ def set_value(self, value):
self.slider.setValue(value)
- def setRange(self, minValue, maxValue):
+ def set_range(self, minValue, maxValue):
if minValue < 0 or maxValue > 99 or minValue > maxValue:
QtCore.qWarning(f"LCDRange::setRange({minValue}, {maxValue})\n"
"\tRange must be 0..99\n"
@@ -86,42 +86,42 @@ class LCDRange(QtWidgets.QWidget):
class CannonField(QtWidgets.QWidget):
- angleChanged = QtCore.Signal(int)
- forceChanged = QtCore.Signal(int)
+ angle_changed = QtCore.Signal(int)
+ force_changed = QtCore.Signal(int)
def __init__(self, parent=None):
QtWidgets.QWidget.__init__(self, parent)
- self.currentAngle = 45
- self.currentForce = 0
+ self._current_angle = 45
+ self._current_force = 0
self.setPalette(QtGui.QPalette(QtGui.QColor(250, 250, 200)))
self.setAutoFillBackground(True)
def angle(self):
- return self.currentAngle
+ return self._current_angle
@QtCore.Slot(int)
- def setAngle(self, angle):
+ def set_angle(self, angle):
if angle < 5:
angle = 5
if angle > 70:
angle = 70
- if self.currentAngle == angle:
+ if self._current_angle == angle:
return
- self.currentAngle = angle
+ self._current_angle = angle
self.update()
- self.emit(QtCore.SIGNAL("angleChanged(int)"), self.currentAngle)
+ self.emit(QtCore.SIGNAL("angleChanged(int)"), self._current_angle)
def force(self):
- return self.currentForce
+ return self._current_force
@QtCore.Slot(int)
- def setForce(self, force):
+ def set_force(self, force):
if force < 0:
force = 0
- if self.currentForce == force:
+ if self._current_force == force:
return
- self.currentForce = force
- self.emit(QtCore.SIGNAL("forceChanged(int)"), self.currentForce)
+ self._current_force = force
+ self.emit(QtCore.SIGNAL("forceChanged(int)"), self._current_force)
def paintEvent(self, event):
painter = QtGui.QPainter(self)
@@ -131,10 +131,10 @@ class CannonField(QtWidgets.QWidget):
painter.translate(0, self.height())
painter.drawPie(QtCore.QRect(-35, -35, 70, 70), 0, 90 * 16)
- painter.rotate(-self.currentAngle)
+ painter.rotate(-self._current_angle)
painter.drawRect(QtCore.QRect(33, -4, 15, 8))
- def cannonRect(self):
+ def cannon_rect(self):
result = QtCore.QRect(0, 0, 50, 50)
result.moveBottomLeft(self.rect().bottomLect())
return result
@@ -151,36 +151,36 @@ class MyWidget(QtWidgets.QWidget):
qApp, QtCore.SLOT("quit()"))
angle = LCDRange()
- angle.setRange(5, 70)
+ angle.set_range(5, 70)
force = LCDRange()
- force.setRange(10, 50)
+ force.set_range(10, 50)
- cannonField = CannonField()
+ cannon_field = CannonField()
self.connect(angle, QtCore.SIGNAL("valueChanged(int)"),
- cannonField.setAngle)
- self.connect(cannonField, QtCore.SIGNAL("angleChanged(int)"),
- angle.setValue)
+ cannon_field.set_angle)
+ self.connect(cannon_field, QtCore.SIGNAL("angleChanged(int)"),
+ angle.set_value)
self.connect(force, QtCore.SIGNAL("valueChanged(int)"),
- cannonField.setForce)
- self.connect(cannonField, QtCore.SIGNAL("forceChanged(int)"),
- force.setValue)
-
- leftLayout = QtWidgets.QVBoxLayout()
- leftLayout.addWidget(angle)
- leftLayout.addWidget(force)
-
- gridLayout = QtWidgets.QGridLayout()
- gridLayout.addWidget(quit, 0, 0)
- gridLayout.addLayout(leftLayout, 1, 0)
- gridLayout.addWidget(cannonField, 1, 1, 2, 1)
- gridLayout.setColumnStretch(1, 10)
- self.setLayout(gridLayout)
-
- angle.setValue(60)
- force.setValue(25)
+ cannon_field.set_force)
+ self.connect(cannon_field, QtCore.SIGNAL("forceChanged(int)"),
+ force.set_value)
+
+ left_layout = QtWidgets.QVBoxLayout()
+ left_layout.addWidget(angle)
+ left_layout.addWidget(force)
+
+ grid_layout = QtWidgets.QGridLayout()
+ grid_layout.addWidget(quit, 0, 0)
+ grid_layout.addLayout(left_layout, 1, 0)
+ grid_layout.addWidget(cannon_field, 1, 1, 2, 1)
+ grid_layout.setColumnStretch(1, 10)
+ self.setLayout(grid_layout)
+
+ angle.set_value(60)
+ force.set_value(25)
angle.setFocus()
diff --git a/examples/widgets/tutorials/cannon/t11.py b/examples/widgets/tutorials/cannon/t11.py
index dfc206d51..5257cbf98 100644
--- a/examples/widgets/tutorials/cannon/t11.py
+++ b/examples/widgets/tutorials/cannon/t11.py
@@ -48,7 +48,7 @@ from PySide6 import QtCore, QtGui, QtWidgets
class LCDRange(QtWidgets.QWidget):
- valueChanged = QtCore.Signal(int)
+ value_changed = QtCore.Signal(int)
def __init__(self, parent=None):
QtWidgets.QWidget.__init__(self, parent)
@@ -73,10 +73,10 @@ class LCDRange(QtWidgets.QWidget):
return self.slider.value()
@QtCore.Slot(int)
- def setValue(self, value):
+ def set_value(self, value):
self.slider.setValue(value)
- def setRange(self, minValue, maxValue):
+ def set_range(self, minValue, maxValue):
if minValue < 0 or maxValue > 99 or minValue > maxValue:
QtCore.qWarning(f"LCDRange::setRange({minValue}, {maxValue})\n"
"\tRange must be 0..99\n"
@@ -87,113 +87,113 @@ class LCDRange(QtWidgets.QWidget):
class CannonField(QtWidgets.QWidget):
- angleChanged = QtCore.Signal(int)
- forceChanged = QtCore.Signal(int)
+ angle_changed = QtCore.Signal(int)
+ force_changed = QtCore.Signal(int)
def __init__(self, parent=None):
QtWidgets.QWidget.__init__(self, parent)
- self.currentAngle = 45
- self.currentForce = 0
- self.timerCount = 0
- self.autoShootTimer = QtCore.QTimer(self)
- self.connect(self.autoShootTimer, QtCore.SIGNAL("timeout()"),
- self.moveShot)
- self.shootAngle = 0
- self.shootForce = 0
+ self._current_angle = 45
+ self._current_force = 0
+ self._timer_count = 0
+ self._auto_shoot_timer = QtCore.QTimer(self)
+ self.connect(self._auto_shoot_timer, QtCore.SIGNAL("timeout()"),
+ self.move_shot)
+ self._shoot_angle = 0
+ self._shoot_force = 0
self.setPalette(QtGui.QPalette(QtGui.QColor(250, 250, 200)))
self.setAutoFillBackground(True)
def angle(self):
- return self.currentAngle
+ return self._current_angle
@QtCore.Slot(int)
- def setAngle(self, angle):
+ def set_angle(self, angle):
if angle < 5:
angle = 5
if angle > 70:
angle = 70
- if self.currentAngle == angle:
+ if self._current_angle == angle:
return
- self.currentAngle = angle
+ self._current_angle = angle
self.update()
- self.emit(QtCore.SIGNAL("angleChanged(int)"), self.currentAngle)
+ self.emit(QtCore.SIGNAL("angleChanged(int)"), self._current_angle)
def force(self):
- return self.currentForce
+ return self._current_force
@QtCore.Slot(int)
- def setForce(self, force):
+ def set_force(self, force):
if force < 0:
force = 0
- if self.currentForce == force:
+ if self._current_force == force:
return
- self.currentForce = force
- self.emit(QtCore.SIGNAL("forceChanged(int)"), self.currentForce)
+ self._current_force = force
+ self.emit(QtCore.SIGNAL("forceChanged(int)"), self._current_force)
@QtCore.Slot()
def shoot(self):
- if self.autoShootTimer.isActive():
+ if self._auto_shoot_timer.isActive():
return
- self.timerCount = 0
- self.shootAngle = self.currentAngle
- self.shootForce = self.currentForce
- self.autoShootTimer.start(5)
+ self._timer_count = 0
+ self._shoot_angle = self._current_angle
+ self._shoot_force = self._current_force
+ self._auto_shoot_timer.start(5)
@QtCore.Slot()
- def moveShot(self):
- region = QtGui.QRegion(self.shotRect())
- self.timerCount += 1
+ def move_shot(self):
+ region = QtGui.QRegion(self.shot_rect())
+ self._timer_count += 1
- shotR = self.shotRect()
+ shot_r = self.shot_rect()
- if shotR.x() > self.width() or shotR.y() > self.height():
- self.autoShootTimer.stop()
+ if shot_r.x() > self.width() or shot_r.y() > self.height():
+ self._auto_shoot_timer.stop()
else:
- region = region.united(QtGui.QRegion(shotR))
+ region = region.united(QtGui.QRegion(shot_r))
self.update(region)
def paintEvent(self, event):
painter = QtGui.QPainter(self)
- self.paintCannon(painter)
- if self.autoShootTimer.isActive():
- self.paintShot(painter)
+ self.paint_cannon(painter)
+ if self._auto_shoot_timer.isActive():
+ self.paint_shot(painter)
- def paintShot(self, painter):
+ def paint_shot(self, painter):
painter.setPen(QtCore.Qt.NoPen)
painter.setBrush(QtCore.Qt.black)
- painter.drawRect(self.shotRect())
+ painter.drawRect(self.shot_rect())
- barrelRect = QtCore.QRect(33, -4, 15, 8)
+ barrel_rect = QtCore.QRect(33, -4, 15, 8)
- def paintCannon(self, painter):
+ def paint_cannon(self, painter):
painter.setPen(QtCore.Qt.NoPen)
painter.setBrush(QtCore.Qt.blue)
painter.save()
painter.translate(0, self.height())
painter.drawPie(QtCore.QRect(-35, -35, 70, 70), 0, 90 * 16)
- painter.rotate(-self.currentAngle)
- painter.drawRect(CannonField.barrelRect)
+ painter.rotate(-self._current_angle)
+ painter.drawRect(CannonField.barrel_rect)
painter.restore()
- def cannonRect(self):
+ def cannon_rect(self):
result = QtCore.QRect(0, 0, 50, 50)
result.moveBottomLeft(self.rect().bottomLect())
return result
- def shotRect(self):
+ def shot_rect(self):
gravity = 4.0
- time = self.timerCount / 40.0
- velocity = self.shootForce
- radians = self.shootAngle * 3.14159265 / 180
+ time = self._timer_count / 40.0
+ velocity = self._shoot_force
+ radians = self._shoot_angle * 3.14159265 / 180
velx = velocity * math.cos(radians)
vely = velocity * math.sin(radians)
- x0 = (CannonField.barrelRect.right() + 5) * math.cos(radians)
- y0 = (CannonField.barrelRect.right() + 5) * math.sin(radians)
+ x0 = (CannonField.barrel_rect.right() + 5) * math.cos(radians)
+ y0 = (CannonField.barrel_rect.right() + 5) * math.sin(radians)
x = x0 + velx * time
y = y0 + vely * time - 0.5 * gravity * time * time
@@ -213,46 +213,46 @@ class MyWidget(QtWidgets.QWidget):
qApp, QtCore.SLOT("quit()"))
angle = LCDRange()
- angle.setRange(5, 70)
+ angle.set_range(5, 70)
force = LCDRange()
- force.setRange(10, 50)
+ force.set_range(10, 50)
- cannonField = CannonField()
+ cannon_field = CannonField()
self.connect(angle, QtCore.SIGNAL("valueChanged(int)"),
- cannonField.setAngle)
- self.connect(cannonField, QtCore.SIGNAL("angleChanged(int)"),
- angle.setValue)
+ cannon_field.set_angle)
+ self.connect(cannon_field, QtCore.SIGNAL("angleChanged(int)"),
+ angle.set_value)
self.connect(force, QtCore.SIGNAL("valueChanged(int)"),
- cannonField.setForce)
- self.connect(cannonField, QtCore.SIGNAL("forceChanged(int)"),
- force.setValue)
+ cannon_field.set_force)
+ self.connect(cannon_field, QtCore.SIGNAL("forceChanged(int)"),
+ force.set_value)
shoot = QtWidgets.QPushButton("&Shoot")
shoot.setFont(QtGui.QFont("Times", 18, QtGui.QFont.Bold))
- self.connect(shoot, QtCore.SIGNAL("clicked()"), cannonField.shoot)
+ self.connect(shoot, QtCore.SIGNAL("clicked()"), cannon_field.shoot)
- topLayout = QtWidgets.QHBoxLayout()
- topLayout.addWidget(shoot)
- topLayout.addStretch(1)
+ top_layout = QtWidgets.QHBoxLayout()
+ top_layout.addWidget(shoot)
+ top_layout.addStretch(1)
- leftLayout = QtWidgets.QVBoxLayout()
- leftLayout.addWidget(angle)
- leftLayout.addWidget(force)
+ left_layout = QtWidgets.QVBoxLayout()
+ left_layout.addWidget(angle)
+ left_layout.addWidget(force)
- gridLayout = QtWidgets.QGridLayout()
- gridLayout.addWidget(quit, 0, 0)
- gridLayout.addLayout(topLayout, 0, 1)
- gridLayout.addLayout(leftLayout, 1, 0)
- gridLayout.addWidget(cannonField, 1, 1, 2, 1)
- gridLayout.setColumnStretch(1, 10)
- self.setLayout(gridLayout)
+ grid_layout = QtWidgets.QGridLayout()
+ grid_layout.addWidget(quit, 0, 0)
+ grid_layout.addLayout(top_layout, 0, 1)
+ grid_layout.addLayout(left_layout, 1, 0)
+ grid_layout.addWidget(cannon_field, 1, 1, 2, 1)
+ grid_layout.setColumnStretch(1, 10)
+ self.setLayout(grid_layout)
- angle.setValue(60)
- force.setValue(25)
+ angle.set_value(60)
+ force.set_value(25)
angle.setFocus()
diff --git a/examples/widgets/tutorials/cannon/t12.py b/examples/widgets/tutorials/cannon/t12.py
index b94a28688..411cbba41 100644
--- a/examples/widgets/tutorials/cannon/t12.py
+++ b/examples/widgets/tutorials/cannon/t12.py
@@ -49,7 +49,7 @@ from PySide6 import QtCore, QtGui, QtWidgets
class LCDRange(QtWidgets.QWidget):
- valueChanged = QtCore.Signal(int)
+ value_changed = QtCore.Signal(int)
def __init__(self, text=None, parent=None):
if isinstance(text, QtWidgets.QWidget):
parent = text
@@ -60,7 +60,7 @@ class LCDRange(QtWidgets.QWidget):
self.init()
if text:
- self.setText(text)
+ self.set_text(text)
def init(self):
lcd = QtWidgets.QLCDNumber(2)
@@ -87,13 +87,13 @@ class LCDRange(QtWidgets.QWidget):
return self.slider.value()
@QtCore.Slot(int)
- def setValue(self, value):
+ def set_value(self, value):
self.slider.setValue(value)
def text(self):
return self.label.text()
- def setRange(self, minValue, maxValue):
+ def set_range(self, minValue, maxValue):
if minValue < 0 or maxValue > 99 or minValue > maxValue:
QtCore.qWarning(f"LCDRange::setRange({minValue}, {maxValue})\n"
"\tRange must be 0..99\n"
@@ -102,70 +102,70 @@ class LCDRange(QtWidgets.QWidget):
self.slider.setRange(minValue, maxValue)
- def setText(self, text):
+ def set_text(self, text):
self.label.setText(text)
class CannonField(QtWidgets.QWidget):
- angleChanged = QtCore.Signal(int)
- forceChanged = QtCore.Signal(int)
+ angle_changed = QtCore.Signal(int)
+ force_changed = QtCore.Signal(int)
def __init__(self, parent=None):
QtWidgets.QWidget.__init__(self, parent)
- self.currentAngle = 45
- self.currentForce = 0
- self.timerCount = 0
- self.autoShootTimer = QtCore.QTimer(self)
- self.connect(self.autoShootTimer, QtCore.SIGNAL("timeout()"),
- self.moveShot)
- self.shootAngle = 0
- self.shootForce = 0
+ self._current_angle = 45
+ self._current_force = 0
+ self._timer_count = 0
+ self._auto_shoot_timer = QtCore.QTimer(self)
+ self.connect(self._auto_shoot_timer, QtCore.SIGNAL("timeout()"),
+ self.move_shot)
+ self._shoot_angle = 0
+ self._shoot_force = 0
self.target = QtCore.QPoint(0, 0)
self.setPalette(QtGui.QPalette(QtGui.QColor(250, 250, 200)))
self.setAutoFillBackground(True)
- self.newTarget()
+ self.new_target()
def angle(self):
- return self.currentAngle
+ return self._current_angle
@QtCore.Slot(int)
- def setAngle(self, angle):
+ def set_angle(self, angle):
if angle < 5:
angle = 5
if angle > 70:
angle = 70
- if self.currentAngle == angle:
+ if self._current_angle == angle:
return
- self.currentAngle = angle
+ self._current_angle = angle
self.update()
- self.emit(QtCore.SIGNAL("angleChanged(int)"), self.currentAngle)
+ self.emit(QtCore.SIGNAL("angleChanged(int)"), self._current_angle)
def force(self):
- return self.currentForce
+ return self._current_force
@QtCore.Slot(int)
- def setForce(self, force):
+ def set_force(self, force):
if force < 0:
force = 0
- if self.currentForce == force:
+ if self._current_force == force:
return
- self.currentForce = force
- self.emit(QtCore.SIGNAL("forceChanged(int)"), self.currentForce)
+ self._current_force = force
+ self.emit(QtCore.SIGNAL("forceChanged(int)"), self._current_force)
@QtCore.Slot()
def shoot(self):
- if self.autoShootTimer.isActive():
+ if self._auto_shoot_timer.isActive():
return
- self.timerCount = 0
- self.shootAngle = self.currentAngle
- self.shootForce = self.currentForce
- self.autoShootTimer.start(5)
+ self._timer_count = 0
+ self._shoot_angle = self._current_angle
+ self._shoot_force = self._current_force
+ self._auto_shoot_timer.start(5)
- firstTime = True
+ first_time = True
- def newTarget(self):
- if CannonField.firstTime:
- CannonField.firstTime = False
+ def new_target(self):
+ if CannonField.first_time:
+ CannonField.first_time = False
midnight = QtCore.QTime(0, 0, 0)
random.seed(midnight.secsTo(QtCore.QTime.currentTime()))
@@ -173,71 +173,71 @@ class CannonField(QtWidgets.QWidget):
self.update()
@QtCore.Slot()
- def moveShot(self):
- region = QtGui.QRegion(self.shotRect())
- self.timerCount += 1
+ def move_shot(self):
+ region = QtGui.QRegion(self.shot_rect())
+ self._timer_count += 1
- shotR = self.shotRect()
+ shot_r = self.shot_rect()
- if shotR.intersects(self.targetRect()):
- self.autoShootTimer.stop()
+ if shot_r.intersects(self.target_rect()):
+ self._auto_shoot_timer.stop()
self.emit(QtCore.SIGNAL("hit()"))
- elif shotR.x() > self.width() or shotR.y() > self.height():
- self.autoShootTimer.stop()
+ elif shot_r.x() > self.width() or shot_r.y() > self.height():
+ self._auto_shoot_timer.stop()
self.emit(QtCore.SIGNAL("missed()"))
else:
- region = region.united(QtGui.QRegion(shotR))
+ region = region.united(QtGui.QRegion(shot_r))
self.update(region)
def paintEvent(self, event):
painter = QtGui.QPainter(self)
- self.paintCannon(painter)
- if self.autoShootTimer.isActive():
- self.paintShot(painter)
+ self.paint_cannon(painter)
+ if self._auto_shoot_timer.isActive():
+ self.paint_shot(painter)
- self.paintTarget(painter)
+ self.paint_target(painter)
- def paintShot(self, painter):
+ def paint_shot(self, painter):
painter.setPen(QtCore.Qt.NoPen)
painter.setBrush(QtCore.Qt.black)
- painter.drawRect(self.shotRect())
+ painter.drawRect(self.shot_rect())
- def paintTarget(self, painter):
+ def paint_target(self, painter):
painter.setPen(QtCore.Qt.black)
painter.setBrush(QtCore.Qt.red)
- painter.drawRect(self.targetRect())
+ painter.drawRect(self.target_rect())
- barrelRect = QtCore.QRect(33, -4, 15, 8)
+ barrel_rect = QtCore.QRect(33, -4, 15, 8)
- def paintCannon(self, painter):
+ def paint_cannon(self, painter):
painter.setPen(QtCore.Qt.NoPen)
painter.setBrush(QtCore.Qt.blue)
painter.save()
painter.translate(0, self.height())
painter.drawPie(QtCore.QRect(-35, -35, 70, 70), 0, 90 * 16)
- painter.rotate(-self.currentAngle)
- painter.drawRect(CannonField.barrelRect)
+ painter.rotate(-self._current_angle)
+ painter.drawRect(CannonField.barrel_rect)
painter.restore()
- def cannonRect(self):
+ def cannon_rect(self):
result = QtCore.QRect(0, 0, 50, 50)
result.moveBottomLeft(self.rect().bottomLect())
return result
- def shotRect(self):
+ def shot_rect(self):
gravity = 4.0
- time = self.timerCount / 40.0
- velocity = self.shootForce
- radians = self.shootAngle * 3.14159265 / 180
+ time = self._timer_count / 40.0
+ velocity = self._shoot_force
+ radians = self._shoot_angle * 3.14159265 / 180
velx = velocity * math.cos(radians)
vely = velocity * math.sin(radians)
- x0 = (CannonField.barrelRect.right() + 5) * math.cos(radians)
- y0 = (CannonField.barrelRect.right() + 5) * math.sin(radians)
+ x0 = (CannonField.barrel_rect.right() + 5) * math.cos(radians)
+ y0 = (CannonField.barrel_rect.right() + 5) * math.sin(radians)
x = x0 + velx * time
y = y0 + vely * time - 0.5 * gravity * time * time
@@ -245,7 +245,7 @@ class CannonField(QtWidgets.QWidget):
result.moveCenter(QtCore.QPoint(round(x), self.height() - 1 - round(y)))
return result
- def targetRect(self):
+ def target_rect(self):
result = QtCore.QRect(0, 0, 20, 10)
result.moveCenter(QtCore.QPoint(self.target.x(), self.height() - 1 - self.target.y()))
return result
@@ -262,46 +262,46 @@ class MyWidget(QtWidgets.QWidget):
qApp, QtCore.SLOT("quit()"))
angle = LCDRange("ANGLE")
- angle.setRange(5, 70)
+ angle.set_range(5, 70)
force = LCDRange("FORCE")
- force.setRange(10, 50)
+ force.set_range(10, 50)
- cannonField = CannonField()
+ cannon_field = CannonField()
self.connect(angle, QtCore.SIGNAL("valueChanged(int)"),
- cannonField.setAngle)
- self.connect(cannonField, QtCore.SIGNAL("angleChanged(int)"),
- angle.setValue)
+ cannon_field.set_angle)
+ self.connect(cannon_field, QtCore.SIGNAL("angleChanged(int)"),
+ angle.set_value)
self.connect(force, QtCore.SIGNAL("valueChanged(int)"),
- cannonField.setForce)
- self.connect(cannonField, QtCore.SIGNAL("forceChanged(int)"),
- force.setValue)
+ cannon_field.set_force)
+ self.connect(cannon_field, QtCore.SIGNAL("forceChanged(int)"),
+ force.set_value)
shoot = QtWidgets.QPushButton("&Shoot")
shoot.setFont(QtGui.QFont("Times", 18, QtGui.QFont.Bold))
- self.connect(shoot, QtCore.SIGNAL("clicked()"), cannonField.shoot)
+ self.connect(shoot, QtCore.SIGNAL("clicked()"), cannon_field.shoot)
- topLayout = QtWidgets.QHBoxLayout()
- topLayout.addWidget(shoot)
- topLayout.addStretch(1)
+ top_layout = QtWidgets.QHBoxLayout()
+ top_layout.addWidget(shoot)
+ top_layout.addStretch(1)
- leftLayout = QtWidgets.QVBoxLayout()
- leftLayout.addWidget(angle)
- leftLayout.addWidget(force)
+ left_layout = QtWidgets.QVBoxLayout()
+ left_layout.addWidget(angle)
+ left_layout.addWidget(force)
- gridLayout = QtWidgets.QGridLayout()
- gridLayout.addWidget(quit, 0, 0)
- gridLayout.addLayout(topLayout, 0, 1)
- gridLayout.addLayout(leftLayout, 1, 0)
- gridLayout.addWidget(cannonField, 1, 1, 2, 1)
- gridLayout.setColumnStretch(1, 10)
- self.setLayout(gridLayout)
+ grid_layout = QtWidgets.QGridLayout()
+ grid_layout.addWidget(quit, 0, 0)
+ grid_layout.addLayout(top_layout, 0, 1)
+ grid_layout.addLayout(left_layout, 1, 0)
+ grid_layout.addWidget(cannon_field, 1, 1, 2, 1)
+ grid_layout.setColumnStretch(1, 10)
+ self.setLayout(grid_layout)
- angle.setValue(60)
- force.setValue(25)
+ angle.set_value(60)
+ force.set_value(25)
angle.setFocus()
diff --git a/examples/widgets/tutorials/cannon/t13.py b/examples/widgets/tutorials/cannon/t13.py
index 467346c2c..b0d56c166 100644
--- a/examples/widgets/tutorials/cannon/t13.py
+++ b/examples/widgets/tutorials/cannon/t13.py
@@ -49,7 +49,7 @@ from PySide6 import QtCore, QtGui, QtWidgets
class LCDRange(QtWidgets.QWidget):
- valueChanged = QtCore.Signal(int)
+ value_changed = QtCore.Signal(int)
def __init__(self, text=None, parent=None):
if isinstance(text, QtWidgets.QWidget):
parent = text
@@ -60,7 +60,7 @@ class LCDRange(QtWidgets.QWidget):
self.init()
if text:
- self.setText(text)
+ self.set_text(text)
def init(self):
lcd = QtWidgets.QLCDNumber(2)
@@ -88,13 +88,13 @@ class LCDRange(QtWidgets.QWidget):
return self.slider.value()
@QtCore.Slot(int)
- def setValue(self, value):
+ def set_value(self, value):
self.slider.setValue(value)
def text(self):
return self.label.text()
- def setRange(self, minValue, maxValue):
+ def set_range(self, minValue, maxValue):
if minValue < 0 or maxValue > 99 or minValue > maxValue:
QtCore.qWarning(f"LCDRange::setRange({minValue}, {maxValue})\n"
"\tRange must be 0..99\n"
@@ -103,169 +103,169 @@ class LCDRange(QtWidgets.QWidget):
self.slider.setRange(minValue, maxValue)
- def setText(self, text):
+ def set_text(self, text):
self.label.setText(text)
class CannonField(QtWidgets.QWidget):
- angleChanged = QtCore.Signal(int)
- forceChanged = QtCore.Signal(int)
+ angle_changed = QtCore.Signal(int)
+ force_changed = QtCore.Signal(int)
hit = QtCore.Signal()
missed = QtCore.Signal()
- canShoot = QtCore.Signal(bool)
+ can_shoot = QtCore.Signal(bool)
def __init__(self, parent=None):
QtWidgets.QWidget.__init__(self, parent)
- self.currentAngle = 45
- self.currentForce = 0
- self.timerCount = 0
- self.autoShootTimer = QtCore.QTimer(self)
- self.connect(self.autoShootTimer, QtCore.SIGNAL("timeout()"),
- self.moveShot)
- self.shootAngle = 0
- self.shootForce = 0
+ self._current_angle = 45
+ self._current_force = 0
+ self._timer_count = 0
+ self._auto_shoot_timer = QtCore.QTimer(self)
+ self.connect(self._auto_shoot_timer, QtCore.SIGNAL("timeout()"),
+ self.move_shot)
+ self._shoot_angle = 0
+ self._shoot_force = 0
self.target = QtCore.QPoint(0, 0)
- self.gameEnded = False
+ self._game_ended = False
self.setPalette(QtGui.QPalette(QtGui.QColor(250, 250, 200)))
self.setAutoFillBackground(True)
- self.newTarget()
+ self.new_target()
def angle(self):
- return self.currentAngle
+ return self._current_angle
@QtCore.Slot(int)
- def setAngle(self, angle):
+ def set_angle(self, angle):
if angle < 5:
angle = 5
if angle > 70:
angle = 70
- if self.currentAngle == angle:
+ if self._current_angle == angle:
return
- self.currentAngle = angle
+ self._current_angle = angle
self.update()
- self.emit(QtCore.SIGNAL("angleChanged(int)"), self.currentAngle)
+ self.emit(QtCore.SIGNAL("angleChanged(int)"), self._current_angle)
def force(self):
- return self.currentForce
+ return self._current_force
@QtCore.Slot(int)
- def setForce(self, force):
+ def set_force(self, force):
if force < 0:
force = 0
- if self.currentForce == force:
+ if self._current_force == force:
return
- self.currentForce = force
- self.emit(QtCore.SIGNAL("forceChanged(int)"), self.currentForce)
+ self._current_force = force
+ self.emit(QtCore.SIGNAL("forceChanged(int)"), self._current_force)
@QtCore.Slot()
def shoot(self):
- if self.isShooting():
+ if self.is_shooting():
return
- self.timerCount = 0
- self.shootAngle = self.currentAngle
- self.shootForce = self.currentForce
- self.autoShootTimer.start(5)
+ self._timer_count = 0
+ self._shoot_angle = self._current_angle
+ self._shoot_force = self._current_force
+ self._auto_shoot_timer.start(5)
self.emit(QtCore.SIGNAL("canShoot(bool)"), False)
- firstTime = True
+ first_time = True
- def newTarget(self):
- if CannonField.firstTime:
- CannonField.firstTime = False
+ def new_target(self):
+ if CannonField.first_time:
+ CannonField.first_time = False
midnight = QtCore.QTime(0, 0, 0)
random.seed(midnight.secsTo(QtCore.QTime.currentTime()))
self.target = QtCore.QPoint(200 + random.randint(0, 190 - 1), 10 + random.randint(0, 255 - 1))
self.update()
- def setGameOver(self):
- if self.gameEnded:
+ def set_game_over(self):
+ if self._game_ended:
return
- if self.isShooting():
- self.autoShootTimer.stop()
- self.gameEnded = True
+ if self.is_shooting():
+ self._auto_shoot_timer.stop()
+ self._game_ended = True
self.update()
- def restartGame(self):
- if self.isShooting():
- self.autoShootTimer.stop()
- self.gameEnded = False
+ def restart_game(self):
+ if self.is_shooting():
+ self._auto_shoot_timer.stop()
+ self._game_ended = False
self.update()
self.emit(QtCore.SIGNAL("canShoot(bool)"), True)
@QtCore.Slot()
- def moveShot(self):
- region = QtGui.QRegion(self.shotRect())
- self.timerCount += 1
+ def move_shot(self):
+ region = QtGui.QRegion(self.shot_rect())
+ self._timer_count += 1
- shotR = self.shotRect()
+ shot_r = self.shot_rect()
- if shotR.intersects(self.targetRect()):
- self.autoShootTimer.stop()
+ if shot_r.intersects(self.target_rect()):
+ self._auto_shoot_timer.stop()
self.emit(QtCore.SIGNAL("hit()"))
self.emit(QtCore.SIGNAL("canShoot(bool)"), True)
- elif shotR.x() > self.width() or shotR.y() > self.height():
- self.autoShootTimer.stop()
+ elif shot_r.x() > self.width() or shot_r.y() > self.height():
+ self._auto_shoot_timer.stop()
self.emit(QtCore.SIGNAL("missed()"))
self.emit(QtCore.SIGNAL("canShoot(bool)"), True)
else:
- region = region.united(QtGui.QRegion(shotR))
+ region = region.united(QtGui.QRegion(shot_r))
self.update(region)
def paintEvent(self, event):
painter = QtGui.QPainter(self)
- if self.gameEnded:
+ if self._game_ended:
painter.setPen(QtCore.Qt.black)
painter.setFont(QtGui.QFont("Courier", 48, QtGui.QFont.Bold))
painter.drawText(self.rect(), QtCore.Qt.AlignCenter, "Game Over")
- self.paintCannon(painter)
- if self.isShooting():
- self.paintShot(painter)
- if not self.gameEnded:
- self.paintTarget(painter)
+ self.paint_cannon(painter)
+ if self.is_shooting():
+ self.paint_shot(painter)
+ if not self._game_ended:
+ self.paint_target(painter)
- def paintShot(self, painter):
+ def paint_shot(self, painter):
painter.setPen(QtCore.Qt.NoPen)
painter.setBrush(QtCore.Qt.black)
- painter.drawRect(self.shotRect())
+ painter.drawRect(self.shot_rect())
- def paintTarget(self, painter):
+ def paint_target(self, painter):
painter.setPen(QtCore.Qt.black)
painter.setBrush(QtCore.Qt.red)
- painter.drawRect(self.targetRect())
+ painter.drawRect(self.target_rect())
- barrelRect = QtCore.QRect(33, -4, 15, 8)
+ barrel_rect = QtCore.QRect(33, -4, 15, 8)
- def paintCannon(self, painter):
+ def paint_cannon(self, painter):
painter.setPen(QtCore.Qt.NoPen)
painter.setBrush(QtCore.Qt.blue)
painter.save()
painter.translate(0, self.height())
painter.drawPie(QtCore.QRect(-35, -35, 70, 70), 0, 90 * 16)
- painter.rotate(-self.currentAngle)
- painter.drawRect(CannonField.barrelRect)
+ painter.rotate(-self._current_angle)
+ painter.drawRect(CannonField.barrel_rect)
painter.restore()
- def cannonRect(self):
+ def cannon_rect(self):
result = QtCore.QRect(0, 0, 50, 50)
result.moveBottomLeft(self.rect().bottomLect())
return result
- def shotRect(self):
+ def shot_rect(self):
gravity = 4.0
- time = self.timerCount / 40.0
- velocity = self.shootForce
- radians = self.shootAngle * 3.14159265 / 180
+ time = self._timer_count / 40.0
+ velocity = self._shoot_force
+ radians = self._shoot_angle * 3.14159265 / 180
velx = velocity * math.cos(radians)
vely = velocity * math.sin(radians)
- x0 = (CannonField.barrelRect.right() + 5) * math.cos(radians)
- y0 = (CannonField.barrelRect.right() + 5) * math.sin(radians)
+ x0 = (CannonField.barrel_rect.right() + 5) * math.cos(radians)
+ y0 = (CannonField.barrel_rect.right() + 5) * math.sin(radians)
x = x0 + velx * time
y = y0 + vely * time - 0.5 * gravity * time * time
@@ -273,16 +273,16 @@ class CannonField(QtWidgets.QWidget):
result.moveCenter(QtCore.QPoint(round(x), self.height() - 1 - round(y)))
return result
- def targetRect(self):
+ def target_rect(self):
result = QtCore.QRect(0, 0, 20, 10)
result.moveCenter(QtCore.QPoint(self.target.x(), self.height() - 1 - self.target.y()))
return result
- def gameOver(self):
- return self.gameEnded
+ def game_over(self):
+ return self._game_ended
- def isShooting(self):
- return self.autoShootTimer.isActive()
+ def is_shooting(self):
+ return self._auto_shoot_timer.isActive()
class GameBoard(QtWidgets.QWidget):
@@ -296,96 +296,96 @@ class GameBoard(QtWidgets.QWidget):
qApp, QtCore.SLOT("quit()"))
angle = LCDRange("ANGLE")
- angle.setRange(5, 70)
+ angle.set_range(5, 70)
force = LCDRange("FORCE")
- force.setRange(10, 50)
+ force.set_range(10, 50)
- self.cannonField = CannonField()
+ self._cannon_field = CannonField()
self.connect(angle, QtCore.SIGNAL("valueChanged(int)"),
- self.cannonField.setAngle)
- self.connect(self.cannonField, QtCore.SIGNAL("angleChanged(int)"),
- angle.setValue)
+ self._cannon_field.set_angle)
+ self.connect(self._cannon_field, QtCore.SIGNAL("angleChanged(int)"),
+ angle.set_value)
self.connect(force, QtCore.SIGNAL("valueChanged(int)"),
- self.cannonField.setForce)
- self.connect(self.cannonField, QtCore.SIGNAL("forceChanged(int)"),
- force.setValue)
+ self._cannon_field.set_force)
+ self.connect(self._cannon_field, QtCore.SIGNAL("forceChanged(int)"),
+ force.set_value)
- self.connect(self.cannonField, QtCore.SIGNAL("hit()"), self.hit)
- self.connect(self.cannonField, QtCore.SIGNAL("missed()"), self.missed)
+ self.connect(self._cannon_field, QtCore.SIGNAL("hit()"), self.hit)
+ self.connect(self._cannon_field, QtCore.SIGNAL("missed()"), self.missed)
shoot = QtWidgets.QPushButton("&Shoot")
shoot.setFont(QtGui.QFont("Times", 18, QtGui.QFont.Bold))
self.connect(shoot, QtCore.SIGNAL("clicked()"), self.fire)
- self.connect(self.cannonField, QtCore.SIGNAL("canShoot(bool)"),
+ self.connect(self._cannon_field, QtCore.SIGNAL("canShoot(bool)"),
shoot, QtCore.SLOT("setEnabled(bool)"))
restart = QtWidgets.QPushButton("&New Game")
restart.setFont(QtGui.QFont("Times", 18, QtGui.QFont.Bold))
- self.connect(restart, QtCore.SIGNAL("clicked()"), self.newGame)
+ self.connect(restart, QtCore.SIGNAL("clicked()"), self.new_game)
self.hits = QtWidgets.QLCDNumber(2)
- self.shotsLeft = QtWidgets.QLCDNumber(2)
- hitsLabel = QtWidgets.QLabel("HITS")
- shotsLeftLabel = QtWidgets.QLabel("SHOTS LEFT")
-
- topLayout = QtWidgets.QHBoxLayout()
- topLayout.addWidget(shoot)
- topLayout.addWidget(self.hits)
- topLayout.addWidget(hitsLabel)
- topLayout.addWidget(self.shotsLeft)
- topLayout.addWidget(shotsLeftLabel)
- topLayout.addStretch(1)
- topLayout.addWidget(restart)
-
- leftLayout = QtWidgets.QVBoxLayout()
- leftLayout.addWidget(angle)
- leftLayout.addWidget(force)
-
- gridLayout = QtWidgets.QGridLayout()
- gridLayout.addWidget(quit, 0, 0)
- gridLayout.addLayout(topLayout, 0, 1)
- gridLayout.addLayout(leftLayout, 1, 0)
- gridLayout.addWidget(self.cannonField, 1, 1, 2, 1)
- gridLayout.setColumnStretch(1, 10)
- self.setLayout(gridLayout)
-
- angle.setValue(60)
- force.setValue(25)
+ self._shots_left = QtWidgets.QLCDNumber(2)
+ hits_label = QtWidgets.QLabel("HITS")
+ shots_left_label = QtWidgets.QLabel("SHOTS LEFT")
+
+ top_layout = QtWidgets.QHBoxLayout()
+ top_layout.addWidget(shoot)
+ top_layout.addWidget(self.hits)
+ top_layout.addWidget(hits_label)
+ top_layout.addWidget(self._shots_left)
+ top_layout.addWidget(shots_left_label)
+ top_layout.addStretch(1)
+ top_layout.addWidget(restart)
+
+ left_layout = QtWidgets.QVBoxLayout()
+ left_layout.addWidget(angle)
+ left_layout.addWidget(force)
+
+ grid_layout = QtWidgets.QGridLayout()
+ grid_layout.addWidget(quit, 0, 0)
+ grid_layout.addLayout(top_layout, 0, 1)
+ grid_layout.addLayout(left_layout, 1, 0)
+ grid_layout.addWidget(self._cannon_field, 1, 1, 2, 1)
+ grid_layout.setColumnStretch(1, 10)
+ self.setLayout(grid_layout)
+
+ angle.set_value(60)
+ force.set_value(25)
angle.setFocus()
- self.newGame()
+ self.new_game()
@QtCore.Slot()
def fire(self):
- if self.cannonField.gameOver() or self.cannonField.isShooting():
+ if self._cannon_field.game_over() or self._cannon_field.is_shooting():
return
- self.shotsLeft.display(self.shotsLeft.intValue() - 1)
- self.cannonField.shoot()
+ self._shots_left.display(self._shots_left.intValue() - 1)
+ self._cannon_field.shoot()
@QtCore.Slot()
def hit(self):
self.hits.display(self.hits.intValue() + 1)
- if self.shotsLeft.intValue() == 0:
- self.cannonField.setGameOver()
+ if self._shots_left.intValue() == 0:
+ self._cannon_field.set_game_over()
else:
- self.cannonField.newTarget()
+ self._cannon_field.new_target()
@QtCore.Slot()
def missed(self):
- if self.shotsLeft.intValue() == 0:
- self.cannonField.setGameOver()
+ if self._shots_left.intValue() == 0:
+ self._cannon_field.set_game_over()
@QtCore.Slot()
- def newGame(self):
- self.shotsLeft.display(15)
+ def new_game(self):
+ self._shots_left.display(15)
self.hits.display(0)
- self.cannonField.restartGame()
- self.cannonField.newTarget()
+ self._cannon_field.restart_game()
+ self._cannon_field.new_target()
app = QtWidgets.QApplication(sys.argv)
diff --git a/examples/widgets/tutorials/cannon/t14.py b/examples/widgets/tutorials/cannon/t14.py
index 420eeaa08..f0f5698d6 100644
--- a/examples/widgets/tutorials/cannon/t14.py
+++ b/examples/widgets/tutorials/cannon/t14.py
@@ -49,7 +49,7 @@ from PySide6 import QtCore, QtGui, QtWidgets
class LCDRange(QtWidgets.QWidget):
- valueChanged = QtCore.Signal(int)
+ value_changed = QtCore.Signal(int)
def __init__(self, text=None, parent=None):
if isinstance(text, QtWidgets.QWidget):
parent = text
@@ -60,7 +60,7 @@ class LCDRange(QtWidgets.QWidget):
self.init()
if text:
- self.setText(text)
+ self.set_text(text)
def init(self):
lcd = QtWidgets.QLCDNumber(2)
@@ -88,13 +88,13 @@ class LCDRange(QtWidgets.QWidget):
return self.slider.value()
@QtCore.Slot(int)
- def setValue(self, value):
+ def set_value(self, value):
self.slider.setValue(value)
def text(self):
return self.label.text()
- def setRange(self, minValue, maxValue):
+ def set_range(self, minValue, maxValue):
if minValue < 0 or maxValue > 99 or minValue > maxValue:
QtCore.qWarning(f"LCDRange::setRange({minValue}, {maxValue})\n"
"\tRange must be 0..99\n"
@@ -103,125 +103,125 @@ class LCDRange(QtWidgets.QWidget):
self.slider.setRange(minValue, maxValue)
- def setText(self, text):
+ def set_text(self, text):
self.label.setText(text)
class CannonField(QtWidgets.QWidget):
- angleChanged = QtCore.Signal(int)
- forceChanged = QtCore.Signal(int)
+ angle_changed = QtCore.Signal(int)
+ force_changed = QtCore.Signal(int)
hit = QtCore.Signal()
missed = QtCore.Signal()
- canShoot = QtCore.Signal(bool)
+ can_shoot = QtCore.Signal(bool)
def __init__(self, parent=None):
QtWidgets.QWidget.__init__(self, parent)
- self.currentAngle = 45
- self.currentForce = 0
- self.timerCount = 0
- self.autoShootTimer = QtCore.QTimer(self)
- self.connect(self.autoShootTimer, QtCore.SIGNAL("timeout()"),
- self.moveShot)
- self.shootAngle = 0
- self.shootForce = 0
+ self._current_angle = 45
+ self._current_force = 0
+ self._timer_count = 0
+ self._auto_shoot_timer = QtCore.QTimer(self)
+ self.connect(self._auto_shoot_timer, QtCore.SIGNAL("timeout()"),
+ self.move_shot)
+ self._shoot_angle = 0
+ self._shoot_force = 0
self.target = QtCore.QPoint(0, 0)
- self.gameEnded = False
- self.barrelPressed = False
+ self._game_ended = False
+ self._barrel_pressed = False
self.setPalette(QtGui.QPalette(QtGui.QColor(250, 250, 200)))
self.setAutoFillBackground(True)
- self.newTarget()
+ self.new_target()
def angle(self):
- return self.currentAngle
+ return self._current_angle
@QtCore.Slot(int)
- def setAngle(self, angle):
+ def set_angle(self, angle):
if angle < 5:
angle = 5
if angle > 70:
angle = 70
- if self.currentAngle == angle:
+ if self._current_angle == angle:
return
- self.currentAngle = angle
+ self._current_angle = angle
self.update()
- self.emit(QtCore.SIGNAL("angleChanged(int)"), self.currentAngle)
+ self.emit(QtCore.SIGNAL("angleChanged(int)"), self._current_angle)
def force(self):
- return self.currentForce
+ return self._current_force
@QtCore.Slot(int)
- def setForce(self, force):
+ def set_force(self, force):
if force < 0:
force = 0
- if self.currentForce == force:
+ if self._current_force == force:
return
- self.currentForce = force
- self.emit(QtCore.SIGNAL("forceChanged(int)"), self.currentForce)
+ self._current_force = force
+ self.emit(QtCore.SIGNAL("forceChanged(int)"), self._current_force)
@QtCore.Slot()
def shoot(self):
- if self.isShooting():
+ if self.is_shooting():
return
- self.timerCount = 0
- self.shootAngle = self.currentAngle
- self.shootForce = self.currentForce
- self.autoShootTimer.start(5)
+ self._timer_count = 0
+ self._shoot_angle = self._current_angle
+ self._shoot_force = self._current_force
+ self._auto_shoot_timer.start(5)
self.emit(QtCore.SIGNAL("canShoot(bool)"), False)
- firstTime = True
+ first_time = True
- def newTarget(self):
- if CannonField.firstTime:
- CannonField.firstTime = False
+ def new_target(self):
+ if CannonField.first_time:
+ CannonField.first_time = False
midnight = QtCore.QTime(0, 0, 0)
random.seed(midnight.secsTo(QtCore.QTime.currentTime()))
self.target = QtCore.QPoint(200 + random.randint(0, 190 - 1), 10 + random.randint(0, 255 - 1))
self.update()
- def setGameOver(self):
- if self.gameEnded:
+ def set_game_over(self):
+ if self._game_ended:
return
- if self.isShooting():
- self.autoShootTimer.stop()
- self.gameEnded = True
+ if self.is_shooting():
+ self._auto_shoot_timer.stop()
+ self._game_ended = True
self.update()
- def restartGame(self):
- if self.isShooting():
- self.autoShootTimer.stop()
- self.gameEnded = False
+ def restart_game(self):
+ if self.is_shooting():
+ self._auto_shoot_timer.stop()
+ self._game_ended = False
self.update()
self.emit(QtCore.SIGNAL("canShoot(bool)"), True)
@QtCore.Slot()
- def moveShot(self):
- region = QtGui.QRegion(self.shotRect())
- self.timerCount += 1
+ def move_shot(self):
+ region = QtGui.QRegion(self.shot_rect())
+ self._timer_count += 1
- shotR = self.shotRect()
+ shot_r = self.shot_rect()
- if shotR.intersects(self.targetRect()):
- self.autoShootTimer.stop()
+ if shot_r.intersects(self.target_rect()):
+ self._auto_shoot_timer.stop()
self.emit(QtCore.SIGNAL("hit()"))
self.emit(QtCore.SIGNAL("canShoot(bool)"), True)
- elif shotR.x() > self.width() or shotR.y() > self.height() or shotR.intersects(self.barrierRect()):
- self.autoShootTimer.stop()
+ elif shot_r.x() > self.width() or shot_r.y() > self.height() or shot_r.intersects(self.barrier_rect()):
+ self._auto_shoot_timer.stop()
self.emit(QtCore.SIGNAL("missed()"))
self.emit(QtCore.SIGNAL("canShoot(bool)"), True)
else:
- region = region.united(QtGui.QRegion(shotR))
+ region = region.united(QtGui.QRegion(shot_r))
self.update(region)
def mousePressEvent(self, event):
if event.button() != QtCore.Qt.LeftButton:
return
- if self.barrelHit(event.position().toPoint()):
- self.barrelPressed = True
+ if self.barrel_hit(event.position().toPoint()):
+ self._barrel_pressed = True
def mouseMoveEvent(self, event):
- if not self.barrelPressed:
+ if not self._barrel_pressed:
return
pos = event.position().toPoint()
if pos.x() <= 0:
@@ -229,71 +229,71 @@ class CannonField(QtWidgets.QWidget):
if pos.y() >= self.height():
pos.setY(self.height() - 1)
rad = math.atan((float(self.rect().bottom()) - pos.y()) / pos.x())
- self.setAngle(round(rad * 180 / 3.14159265))
+ self.set_angle(round(rad * 180 / 3.14159265))
def mouseReleaseEvent(self, event):
if event.button() == QtCore.Qt.LeftButton:
- self.barrelPressed = False
+ self._barrel_pressed = False
def paintEvent(self, event):
painter = QtGui.QPainter(self)
- if self.gameEnded:
+ if self._game_ended:
painter.setPen(QtCore.Qt.black)
painter.setFont(QtGui.QFont("Courier", 48, QtGui.QFont.Bold))
painter.drawText(self.rect(), QtCore.Qt.AlignCenter, "Game Over")
- self.paintCannon(painter)
- self.paintBarrier(painter)
- if self.isShooting():
- self.paintShot(painter)
- if not self.gameEnded:
- self.paintTarget(painter)
+ self.paint_cannon(painter)
+ self.paint_barrier(painter)
+ if self.is_shooting():
+ self.paint_shot(painter)
+ if not self._game_ended:
+ self.paint_target(painter)
- def paintShot(self, painter):
+ def paint_shot(self, painter):
painter.setPen(QtCore.Qt.NoPen)
painter.setBrush(QtCore.Qt.black)
- painter.drawRect(self.shotRect())
+ painter.drawRect(self.shot_rect())
- def paintTarget(self, painter):
+ def paint_target(self, painter):
painter.setPen(QtCore.Qt.black)
painter.setBrush(QtCore.Qt.red)
- painter.drawRect(self.targetRect())
+ painter.drawRect(self.target_rect())
- def paintBarrier(self, painter):
+ def paint_barrier(self, painter):
painter.setPen(QtCore.Qt.black)
painter.setBrush(QtCore.Qt.yellow)
- painter.drawRect(self.barrierRect())
+ painter.drawRect(self.barrier_rect())
- barrelRect = QtCore.QRect(33, -4, 15, 8)
+ barrel_rect = QtCore.QRect(33, -4, 15, 8)
- def paintCannon(self, painter):
+ def paint_cannon(self, painter):
painter.setPen(QtCore.Qt.NoPen)
painter.setBrush(QtCore.Qt.blue)
painter.save()
painter.translate(0, self.height())
painter.drawPie(QtCore.QRect(-35, -35, 70, 70), 0, 90 * 16)
- painter.rotate(-self.currentAngle)
- painter.drawRect(CannonField.barrelRect)
+ painter.rotate(-self._current_angle)
+ painter.drawRect(CannonField.barrel_rect)
painter.restore()
- def cannonRect(self):
+ def cannon_rect(self):
result = QtCore.QRect(0, 0, 50, 50)
result.moveBottomLeft(self.rect().bottomLect())
return result
- def shotRect(self):
+ def shot_rect(self):
gravity = 4.0
- time = self.timerCount / 40.0
- velocity = self.shootForce
- radians = self.shootAngle * 3.14159265 / 180
+ time = self._timer_count / 40.0
+ velocity = self._shoot_force
+ radians = self._shoot_angle * 3.14159265 / 180
velx = velocity * math.cos(radians)
vely = velocity * math.sin(radians)
- x0 = (CannonField.barrelRect.right() + 5) * math.cos(radians)
- y0 = (CannonField.barrelRect.right() + 5) * math.sin(radians)
+ x0 = (CannonField.barrel_rect.right() + 5) * math.cos(radians)
+ y0 = (CannonField.barrel_rect.right() + 5) * math.sin(radians)
x = x0 + velx * time
y = y0 + vely * time - 0.5 * gravity * time * time
@@ -301,26 +301,26 @@ class CannonField(QtWidgets.QWidget):
result.moveCenter(QtCore.QPoint(round(x), self.height() - 1 - round(y)))
return result
- def targetRect(self):
+ def target_rect(self):
result = QtCore.QRect(0, 0, 20, 10)
result.moveCenter(QtCore.QPoint(self.target.x(), self.height() - 1 - self.target.y()))
return result
- def barrierRect(self):
+ def barrier_rect(self):
return QtCore.QRect(145, self.height() - 100, 15, 99)
- def barrelHit(self, pos):
+ def barrel_hit(self, pos):
matrix = QtGui.QTransform()
matrix.translate(0, self.height())
- matrix.rotate(-self.currentAngle)
+ matrix.rotate(-self._current_angle)
matrix, invertible = matrix.inverted()
- return self.barrelRect.contains(matrix.map(pos))
+ return self.barrel_rect.contains(matrix.map(pos))
- def gameOver(self):
- return self.gameEnded
+ def game_over(self):
+ return self._game_ended
- def isShooting(self):
- return self.autoShootTimer.isActive()
+ def is_shooting(self):
+ return self._auto_shoot_timer.isActive()
def sizeHint(self):
return QtCore.QSize(400, 300)
@@ -337,45 +337,45 @@ class GameBoard(QtWidgets.QWidget):
qApp, QtCore.SLOT("quit()"))
angle = LCDRange("ANGLE")
- angle.setRange(5, 70)
+ angle.set_range(5, 70)
force = LCDRange("FORCE")
- force.setRange(10, 50)
+ force.set_range(10, 50)
- cannonBox = QtWidgets.QFrame()
- cannonBox.setFrameStyle(QtWidgets.QFrame.WinPanel | QtWidgets.QFrame.Sunken)
+ cannon_box = QtWidgets.QFrame()
+ cannon_box.setFrameStyle(QtWidgets.QFrame.WinPanel | QtWidgets.QFrame.Sunken)
- self.cannonField = CannonField()
+ self._cannon_field = CannonField()
self.connect(angle, QtCore.SIGNAL("valueChanged(int)"),
- self.cannonField.setAngle)
- self.connect(self.cannonField, QtCore.SIGNAL("angleChanged(int)"),
- angle.setValue)
+ self._cannon_field.set_angle)
+ self.connect(self._cannon_field, QtCore.SIGNAL("angleChanged(int)"),
+ angle.set_value)
self.connect(force, QtCore.SIGNAL("valueChanged(int)"),
- self.cannonField.setForce)
- self.connect(self.cannonField, QtCore.SIGNAL("forceChanged(int)"),
- force.setValue)
+ self._cannon_field.set_force)
+ self.connect(self._cannon_field, QtCore.SIGNAL("forceChanged(int)"),
+ force.set_value)
- self.connect(self.cannonField, QtCore.SIGNAL("hit()"), self.hit)
- self.connect(self.cannonField, QtCore.SIGNAL("missed()"), self.missed)
+ self.connect(self._cannon_field, QtCore.SIGNAL("hit()"), self.hit)
+ self.connect(self._cannon_field, QtCore.SIGNAL("missed()"), self.missed)
shoot = QtWidgets.QPushButton("&Shoot")
shoot.setFont(QtGui.QFont("Times", 18, QtGui.QFont.Bold))
self.connect(shoot, QtCore.SIGNAL("clicked()"), self.fire)
- self.connect(self.cannonField, QtCore.SIGNAL("canShoot(bool)"),
+ self.connect(self._cannon_field, QtCore.SIGNAL("canShoot(bool)"),
shoot, QtCore.SLOT("setEnabled(bool)"))
restart = QtWidgets.QPushButton("&New Game")
restart.setFont(QtGui.QFont("Times", 18, QtGui.QFont.Bold))
- self.connect(restart, QtCore.SIGNAL("clicked()"), self.newGame)
+ self.connect(restart, QtCore.SIGNAL("clicked()"), self.new_game)
self.hits = QtWidgets.QLCDNumber(2)
- self.shotsLeft = QtWidgets.QLCDNumber(2)
- hitsLabel = QtWidgets.QLabel("HITS")
- shotsLeftLabel = QtWidgets.QLabel("SHOTS LEFT")
+ self._shots_left = QtWidgets.QLCDNumber(2)
+ hits_label = QtWidgets.QLabel("HITS")
+ shots_left_label = QtWidgets.QLabel("SHOTS LEFT")
QtGui.QShortcut(QtGui.QKeySequence(QtCore.Qt.Key_Enter),
self, self.fire)
@@ -384,63 +384,63 @@ class GameBoard(QtWidgets.QWidget):
QtGui.QShortcut(QtGui.QKeySequence(QtCore.Qt.CTRL + QtCore.Qt.Key_Q),
self, QtCore.SLOT("close()"))
- topLayout = QtWidgets.QHBoxLayout()
- topLayout.addWidget(shoot)
- topLayout.addWidget(self.hits)
- topLayout.addWidget(hitsLabel)
- topLayout.addWidget(self.shotsLeft)
- topLayout.addWidget(shotsLeftLabel)
- topLayout.addStretch(1)
- topLayout.addWidget(restart)
-
- leftLayout = QtWidgets.QVBoxLayout()
- leftLayout.addWidget(angle)
- leftLayout.addWidget(force)
-
- cannonLayout = QtWidgets.QVBoxLayout()
- cannonLayout.addWidget(self.cannonField)
- cannonBox.setLayout(cannonLayout)
-
- gridLayout = QtWidgets.QGridLayout()
- gridLayout.addWidget(quit, 0, 0)
- gridLayout.addLayout(topLayout, 0, 1)
- gridLayout.addLayout(leftLayout, 1, 0)
- gridLayout.addWidget(cannonBox, 1, 1, 2, 1)
- gridLayout.setColumnStretch(1, 10)
- self.setLayout(gridLayout)
-
- angle.setValue(60)
- force.setValue(25)
+ top_layout = QtWidgets.QHBoxLayout()
+ top_layout.addWidget(shoot)
+ top_layout.addWidget(self.hits)
+ top_layout.addWidget(hits_label)
+ top_layout.addWidget(self._shots_left)
+ top_layout.addWidget(shots_left_label)
+ top_layout.addStretch(1)
+ top_layout.addWidget(restart)
+
+ left_layout = QtWidgets.QVBoxLayout()
+ left_layout.addWidget(angle)
+ left_layout.addWidget(force)
+
+ cannon_layout = QtWidgets.QVBoxLayout()
+ cannon_layout.addWidget(self._cannon_field)
+ cannon_box.setLayout(cannon_layout)
+
+ grid_layout = QtWidgets.QGridLayout()
+ grid_layout.addWidget(quit, 0, 0)
+ grid_layout.addLayout(top_layout, 0, 1)
+ grid_layout.addLayout(left_layout, 1, 0)
+ grid_layout.addWidget(cannon_box, 1, 1, 2, 1)
+ grid_layout.setColumnStretch(1, 10)
+ self.setLayout(grid_layout)
+
+ angle.set_value(60)
+ force.set_value(25)
angle.setFocus()
- self.newGame()
+ self.new_game()
@QtCore.Slot()
def fire(self):
- if self.cannonField.gameOver() or self.cannonField.isShooting():
+ if self._cannon_field.game_over() or self._cannon_field.is_shooting():
return
- self.shotsLeft.display(self.shotsLeft.intValue() - 1)
- self.cannonField.shoot()
+ self._shots_left.display(self._shots_left.intValue() - 1)
+ self._cannon_field.shoot()
@QtCore.Slot()
def hit(self):
self.hits.display(self.hits.intValue() + 1)
- if self.shotsLeft.intValue() == 0:
- self.cannonField.setGameOver()
+ if self._shots_left.intValue() == 0:
+ self._cannon_field.set_game_over()
else:
- self.cannonField.newTarget()
+ self._cannon_field.new_target()
@QtCore.Slot()
def missed(self):
- if self.shotsLeft.intValue() == 0:
- self.cannonField.setGameOver()
+ if self._shots_left.intValue() == 0:
+ self._cannon_field.set_game_over()
@QtCore.Slot()
- def newGame(self):
- self.shotsLeft.display(15)
+ def new_game(self):
+ self._shots_left.display(15)
self.hits.display(0)
- self.cannonField.restartGame()
- self.cannonField.newTarget()
+ self._cannon_field.restart_game()
+ self._cannon_field.new_target()
app = QtWidgets.QApplication(sys.argv)
diff --git a/examples/widgets/tutorials/cannon/t7.py b/examples/widgets/tutorials/cannon/t7.py
index 590bd516c..6d6bdab8e 100644
--- a/examples/widgets/tutorials/cannon/t7.py
+++ b/examples/widgets/tutorials/cannon/t7.py
@@ -47,7 +47,7 @@ from PySide6 import QtCore, QtGui, QtWidgets
class LCDRange(QtWidgets.QWidget):
- valueChanged = QtCore.Signal(int)
+ value_changed = QtCore.Signal(int)
def __init__(self, parent=None):
QtWidgets.QWidget.__init__(self, parent)
@@ -71,7 +71,7 @@ class LCDRange(QtWidgets.QWidget):
return self.slider.value()
@QtCore.Slot(int)
- def setValue(self, value):
+ def set_value(self, value):
self.slider.setValue(value)
@@ -86,7 +86,7 @@ class MyWidget(QtWidgets.QWidget):
qApp, QtCore.SLOT("quit()"))
grid = QtWidgets.QGridLayout()
- previousRange = None
+ previous_range = None
layout = QtWidgets.QVBoxLayout()
@@ -96,14 +96,14 @@ class MyWidget(QtWidgets.QWidget):
for row in range(3):
for column in range(3):
- lcdRange = LCDRange()
- grid.addWidget(lcdRange, row, column)
+ lcd_range = LCDRange()
+ grid.addWidget(lcd_range, row, column)
- if previousRange:
- self.connect(lcdRange, QtCore.SIGNAL("valueChanged(int)"),
- previousRange.setValue)
+ if previous_range:
+ self.connect(lcd_range, QtCore.SIGNAL("valueChanged(int)"),
+ previous_range.set_value)
- previousRange = lcdRange
+ previous_range = lcd_range
diff --git a/examples/widgets/tutorials/cannon/t8.py b/examples/widgets/tutorials/cannon/t8.py
index e2d013eca..32aaaddbe 100644
--- a/examples/widgets/tutorials/cannon/t8.py
+++ b/examples/widgets/tutorials/cannon/t8.py
@@ -47,7 +47,7 @@ from PySide6 import QtCore, QtGui, QtWidgets
class LCDRange(QtWidgets.QWidget):
- valueChanged = QtCore.Signal(int)
+ value_changed = QtCore.Signal(int)
def __init__(self, parent=None):
QtWidgets.QWidget.__init__(self, parent)
@@ -72,10 +72,10 @@ class LCDRange(QtWidgets.QWidget):
return self.slider.value()
@QtCore.Slot(int)
- def setValue(self, value):
+ def set_value(self, value):
self.slider.setValue(value)
- def setRange(self, minValue, maxValue):
+ def set_range(self, minValue, maxValue):
if minValue < 0 or maxValue > 99 or minValue > maxValue:
QtCore.qWarning("LCDRange.setRange({minValue}, {maxValue})\n"
"\tRange must be 0..99\n"
@@ -86,32 +86,32 @@ class LCDRange(QtWidgets.QWidget):
class CannonField(QtWidgets.QWidget):
- angleChanged = QtCore.Signal(int)
+ angle_changed = QtCore.Signal(int)
def __init__(self, parent=None):
QtWidgets.QWidget.__init__(self, parent)
- self.currentAngle = 45
+ self._current_angle = 45
self.setPalette(QtGui.QPalette(QtGui.QColor(250, 250, 200)))
self.setAutoFillBackground(True)
def angle(self):
- return self.currentAngle
+ return self._current_angle
@QtCore.Slot(int)
- def setAngle(self, angle):
+ def set_angle(self, angle):
if angle < 5:
angle = 5
if angle > 70:
angle = 70
- if self.currentAngle == angle:
+ if self._current_angle == angle:
return
- self.currentAngle = angle
+ self._current_angle = angle
self.update()
- self.emit(QtCore.SIGNAL("angleChanged(int)"), self.currentAngle)
+ self.emit(QtCore.SIGNAL("angleChanged(int)"), self._current_angle)
def paintEvent(self, event):
painter = QtGui.QPainter(self)
- painter.drawText(200, 200, f"Angle = {self.currentAngle}")
+ painter.drawText(200, 200, f"Angle = {self._current_angle}")
class MyWidget(QtWidgets.QWidget):
@@ -125,23 +125,23 @@ class MyWidget(QtWidgets.QWidget):
qApp, QtCore.SLOT("quit()"))
angle = LCDRange()
- angle.setRange(5, 70)
+ angle.set_range(5, 70)
- cannonField = CannonField()
+ cannon_field = CannonField()
self.connect(angle, QtCore.SIGNAL("valueChanged(int)"),
- cannonField.setAngle)
- self.connect(cannonField, QtCore.SIGNAL("angleChanged(int)"),
- angle.setValue)
-
- gridLayout = QtWidgets.QGridLayout()
- gridLayout.addWidget(quit, 0, 0)
- gridLayout.addWidget(angle, 1, 0)
- gridLayout.addWidget(cannonField, 1, 1, 2, 1)
- gridLayout.setColumnStretch(1, 10)
- self.setLayout(gridLayout)
-
- angle.setValue(60)
+ cannon_field.set_angle)
+ self.connect(cannon_field, QtCore.SIGNAL("angleChanged(int)"),
+ angle.set_value)
+
+ grid_layout = QtWidgets.QGridLayout()
+ grid_layout.addWidget(quit, 0, 0)
+ grid_layout.addWidget(angle, 1, 0)
+ grid_layout.addWidget(cannon_field, 1, 1, 2, 1)
+ grid_layout.setColumnStretch(1, 10)
+ self.setLayout(grid_layout)
+
+ angle.set_value(60)
angle.setFocus()
diff --git a/examples/widgets/tutorials/cannon/t9.py b/examples/widgets/tutorials/cannon/t9.py
index 6d743357d..d88e78c6f 100644
--- a/examples/widgets/tutorials/cannon/t9.py
+++ b/examples/widgets/tutorials/cannon/t9.py
@@ -47,7 +47,7 @@ from PySide6 import QtCore, QtGui, QtWidgets
class LCDRange(QtWidgets.QWidget):
- valueChanged = QtCore.Signal(int)
+ value_changed = QtCore.Signal(int)
def __init__(self, parent=None):
QtWidgets.QWidget.__init__(self, parent)
@@ -72,10 +72,10 @@ class LCDRange(QtWidgets.QWidget):
return self.slider.value()
@QtCore.Slot(int)
- def setValue(self, value):
+ def set_value(self, value):
self.slider.setValue(value)
- def setRange(self, minValue, maxValue):
+ def set_range(self, minValue, maxValue):
if minValue < 0 or maxValue > 99 or minValue > maxValue:
QtCore.qWarning(f"LCDRange::setRange({minValue}, {maxValue})\n"
"\tRange must be 0..99\n"
@@ -86,28 +86,28 @@ class LCDRange(QtWidgets.QWidget):
class CannonField(QtWidgets.QWidget):
- angleChanged = QtCore.Signal(int)
+ angle_changed = QtCore.Signal(int)
def __init__(self, parent=None):
QtWidgets.QWidget.__init__(self, parent)
- self.currentAngle = 45
+ self._current_angle = 45
self.setPalette(QtGui.QPalette(QtGui.QColor(250, 250, 200)))
self.setAutoFillBackground(True)
def angle(self):
- return self.currentAngle
+ return self._current_angle
@QtCore.Slot(int)
- def setAngle(self, angle):
+ def set_angle(self, angle):
if angle < 5:
angle = 5
if angle > 70:
angle = 70
- if self.currentAngle == angle:
+ if self._current_angle == angle:
return
- self.currentAngle = angle
+ self._current_angle = angle
self.update()
- self.emit(QtCore.SIGNAL("angleChanged(int)"), self.currentAngle)
+ self.emit(QtCore.SIGNAL("angleChanged(int)"), self._current_angle)
def paintEvent(self, event):
painter = QtGui.QPainter(self)
@@ -117,7 +117,7 @@ class CannonField(QtWidgets.QWidget):
painter.translate(0, self.rect().height())
painter.drawPie(QtCore.QRect(-35, -35, 70, 70), 0, 90 * 16)
- painter.rotate(-self.currentAngle)
+ painter.rotate(-self._current_angle)
painter.drawRect(QtCore.QRect(33, -4, 15, 8))
@@ -132,23 +132,23 @@ class MyWidget(QtWidgets.QWidget):
qApp, QtCore.SLOT("quit()"))
angle = LCDRange()
- angle.setRange(5, 70)
+ angle.set_range(5, 70)
- cannonField = CannonField()
+ cannon_field = CannonField()
self.connect(angle, QtCore.SIGNAL("valueChanged(int)"),
- cannonField.setAngle)
- self.connect(cannonField, QtCore.SIGNAL("angleChanged(int)"),
- angle.setValue)
-
- gridLayout = QtWidgets.QGridLayout()
- gridLayout.addWidget(quit, 0, 0)
- gridLayout.addWidget(angle, 1, 0)
- gridLayout.addWidget(cannonField, 1, 1, 2, 1)
- gridLayout.setColumnStretch(1, 10)
- self.setLayout(gridLayout)
-
- angle.setValue(60)
+ cannon_field.set_angle)
+ self.connect(cannon_field, QtCore.SIGNAL("angleChanged(int)"),
+ angle.set_value)
+
+ grid_layout = QtWidgets.QGridLayout()
+ grid_layout.addWidget(quit, 0, 0)
+ grid_layout.addWidget(angle, 1, 0)
+ grid_layout.addWidget(cannon_field, 1, 1, 2, 1)
+ grid_layout.setColumnStretch(1, 10)
+ self.setLayout(grid_layout)
+
+ angle.set_value(60)
angle.setFocus()
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 14:06:14 +0000