From b7d4e231a95605ddcae75f32fdc33c473a5b5b90 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Fri, 23 Apr 2021 09:07:15 +0200
Subject: Remaining examples: Use per-class imports

Task-number: PYSIDE-1112
Change-Id: I8534e911959d6eed2ed6d3f7741e99929ff0125e
Reviewed-by: Christian Tismer <tismer@stackless.com>
---
 examples/widgets/tutorials/addressbook/part3.py | 50 +++++++++++++------------
 1 file changed, 27 insertions(+), 23 deletions(-)

(limited to 'examples/widgets/tutorials/addressbook/part3.py')

diff --git a/examples/widgets/tutorials/addressbook/part3.py b/examples/widgets/tutorials/addressbook/part3.py
index b93e2fe09..80e76f46e 100644
--- a/examples/widgets/tutorials/addressbook/part3.py
+++ b/examples/widgets/tutorials/addressbook/part3.py
@@ -40,7 +40,13 @@
 ##
 #############################################################################
 
-from PySide6 import QtCore, QtWidgets
+import sys
+
+from PySide6.QtCore import Qt, Signal, Slot
+from PySide6.QtWidgets import (QApplication, QDialog, QGridLayout,
+                               QHBoxLayout, QLabel, QLineEdit,
+                               QMessageBox, QPushButton, QTextEdit,
+                               QVBoxLayout, QWidget)
 
 
 class SortedDict(dict):
@@ -72,7 +78,7 @@ class SortedDict(dict):
     iterkeys = __iter__
 
 
-class AddressBook(QtWidgets.QWidget):
+class AddressBook(QWidget):
     def __init__(self, parent=None):
         super(AddressBook, self).__init__(parent)
 
@@ -80,22 +86,22 @@ class AddressBook(QtWidgets.QWidget):
         self._old_name = ''
         self._old_address = ''
 
-        name_label = QtWidgets.QLabel("Name:")
-        self._name_line = QtWidgets.QLineEdit()
+        name_label = QLabel("Name:")
+        self._name_line = QLineEdit()
         self._name_line.setReadOnly(True)
 
-        address_label = QtWidgets.QLabel("Address:")
-        self._address_text = QtWidgets.QTextEdit()
+        address_label = QLabel("Address:")
+        self._address_text = QTextEdit()
         self._address_text.setReadOnly(True)
 
-        self._add_button = QtWidgets.QPushButton("&Add")
-        self._submit_button = QtWidgets.QPushButton("&Submit")
+        self._add_button = QPushButton("&Add")
+        self._submit_button = QPushButton("&Submit")
         self._submit_button.hide()
-        self._cancel_button = QtWidgets.QPushButton("&Cancel")
+        self._cancel_button = QPushButton("&Cancel")
         self._cancel_button.hide()
-        self._next_button = QtWidgets.QPushButton("&Next")
+        self._next_button = QPushButton("&Next")
         self._next_button.setEnabled(False)
-        self._previous_button = QtWidgets.QPushButton("&Previous")
+        self._previous_button = QPushButton("&Previous")
         self._previous_button.setEnabled(False)
 
         self._add_button.clicked.connect(self.add_contact)
@@ -104,20 +110,20 @@ class AddressBook(QtWidgets.QWidget):
         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 = QVBoxLayout()
+        button_layout_1.addWidget(self._add_button, 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 = QHBoxLayout()
         button_layout_2.addWidget(self._previous_button)
         button_layout_2.addWidget(self._next_button)
 
-        main_layout = QtWidgets.QGridLayout()
+        main_layout = 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(address_label, 1, 0, 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)
@@ -133,7 +139,7 @@ class AddressBook(QtWidgets.QWidget):
         self._address_text.clear()
 
         self._name_line.setReadOnly(False)
-        self._name_line.setFocus(QtCore.Qt.OtherFocusReason)
+        self._name_line.setFocus(Qt.OtherFocusReason)
         self._address_text.setReadOnly(False)
 
         self._add_button.setEnabled(False)
@@ -147,16 +153,16 @@ class AddressBook(QtWidgets.QWidget):
         address = self._address_text.toPlainText()
 
         if name == "" or address == "":
-            QtWidgets.QMessageBox.information(self, "Empty Field",
+            QMessageBox.information(self, "Empty Field",
                     "Please enter a name and address.")
             return
 
         if name not in self.contacts:
             self.contacts[name] = address
-            QtWidgets.QMessageBox.information(self, "Add Successful",
+            QMessageBox.information(self, "Add Successful",
                     f'"{name}" has been added to your address book.')
         else:
-            QtWidgets.QMessageBox.information(self, "Add Unsuccessful",
+            QMessageBox.information(self, "Add Unsuccessful",
                     f'Sorry, "{name}" is already in your address book.')
             return
 
@@ -235,9 +241,7 @@ class AddressBook(QtWidgets.QWidget):
 
 
 if __name__ == '__main__':
-    import sys
-
-    app = QtWidgets.QApplication(sys.argv)
+    app = QApplication(sys.argv)
 
     address_book = AddressBook()
     address_book.show()
-- 
cgit v1.2.3