clean up

lib/person.py

@@ -17,7 +17,7 @@ from PyQt6.QtSql import QSqlQuery, QSqlQueryModel
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QStyledItemDelegate
 
 from main import query_error
-from ui.PeopleDialog import Ui_PersonDialog
+from ui.PersonDialog import Ui_PersonDialog
 
 
 class blockHandler(HTMLParser):

ui/Makefile

@@ -1,5 +1,7 @@
 depfiles := $(shell awk '/file/{gsub(/<\/?file>/,"");print}' resources.qrc)
-all: resources.rcc *.py
+SRC := $(wildcard *.ui)
+PY := $(patsubst %.ui, %.py, ${SRC})
+all: resources.rcc ${PY}
 %.py: %.ui
 	pyuic6 $< >$@
 resources.rcc: resources.qrc

ui/PersonDialog.py

@@ -0,0 +1,112 @@
+# Form implementation generated from reading ui file 'PersonDialog.ui'
+#
+# Created by: PyQt6 UI code generator 6.6.1
+#
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
+
+
+from PyQt6 import QtCore, QtGui, QtWidgets
+
+
+class Ui_PersonDialog(object):
+    def setupUi(self, PersonDialog):
+        PersonDialog.setObjectName("PersonDialog")
+        PersonDialog.resize(542, 300)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(PersonDialog.sizePolicy().hasHeightForWidth())
+        PersonDialog.setSizePolicy(sizePolicy)
+        self.formLayout = QtWidgets.QFormLayout(PersonDialog)
+        self.formLayout.setObjectName("formLayout")
+        self.label = QtWidgets.QLabel(parent=PersonDialog)
+        self.label.setObjectName("label")
+        self.formLayout.setWidget(0, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label)
+        self.nameEdit = QtWidgets.QLineEdit(parent=PersonDialog)
+        self.nameEdit.setObjectName("nameEdit")
+        self.formLayout.setWidget(0, QtWidgets.QFormLayout.ItemRole.FieldRole, self.nameEdit)
+        self.label_5 = QtWidgets.QLabel(parent=PersonDialog)
+        self.label_5.setObjectName("label_5")
+        self.formLayout.setWidget(1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_5)
+        self.emailEdit = QtWidgets.QLineEdit(parent=PersonDialog)
+        self.emailEdit.setObjectName("emailEdit")
+        self.formLayout.setWidget(1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.emailEdit)
+        self.label_2 = QtWidgets.QLabel(parent=PersonDialog)
+        self.label_2.setObjectName("label_2")
+        self.formLayout.setWidget(2, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_2)
+        self.orgEdit = QtWidgets.QLineEdit(parent=PersonDialog)
+        self.orgEdit.setObjectName("orgEdit")
+        self.formLayout.setWidget(2, QtWidgets.QFormLayout.ItemRole.FieldRole, self.orgEdit)
+        self.label_3 = QtWidgets.QLabel(parent=PersonDialog)
+        self.label_3.setObjectName("label_3")
+        self.formLayout.setWidget(3, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_3)
+        self.bookCombo = QtWidgets.QComboBox(parent=PersonDialog)
+        self.bookCombo.setObjectName("bookCombo")
+        self.formLayout.setWidget(3, QtWidgets.QFormLayout.ItemRole.FieldRole, self.bookCombo)
+        self.label_4 = QtWidgets.QLabel(parent=PersonDialog)
+        self.label_4.setObjectName("label_4")
+        self.formLayout.setWidget(4, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_4)
+        self.sectionCombo = QtWidgets.QComboBox(parent=PersonDialog)
+        self.sectionCombo.setObjectName("sectionCombo")
+        self.formLayout.setWidget(4, QtWidgets.QFormLayout.ItemRole.FieldRole, self.sectionCombo)
+        self.widget = QtWidgets.QWidget(parent=PersonDialog)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Expanding)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.widget.sizePolicy().hasHeightForWidth())
+        self.widget.setSizePolicy(sizePolicy)
+        self.widget.setObjectName("widget")
+        self.horizontalLayout = QtWidgets.QHBoxLayout(self.widget)
+        self.horizontalLayout.setObjectName("horizontalLayout")
+        self.printBtn = QtWidgets.QPushButton(parent=self.widget)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.printBtn.sizePolicy().hasHeightForWidth())
+        self.printBtn.setSizePolicy(sizePolicy)
+        self.printBtn.setObjectName("printBtn")
+        self.horizontalLayout.addWidget(self.printBtn)
+        self.emailBtn = QtWidgets.QPushButton(parent=self.widget)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.emailBtn.sizePolicy().hasHeightForWidth())
+        self.emailBtn.setSizePolicy(sizePolicy)
+        self.emailBtn.setObjectName("emailBtn")
+        self.horizontalLayout.addWidget(self.emailBtn)
+        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout.addItem(spacerItem)
+        self.formLayout.setWidget(7, QtWidgets.QFormLayout.ItemRole.FieldRole, self.widget)
+        self.buttonBox = QtWidgets.QDialogButtonBox(parent=PersonDialog)
+        self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal)
+        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok)
+        self.buttonBox.setObjectName("buttonBox")
+        self.formLayout.setWidget(8, QtWidgets.QFormLayout.ItemRole.SpanningRole, self.buttonBox)
+        self.label_6 = QtWidgets.QLabel(parent=PersonDialog)
+        self.label_6.setObjectName("label_6")
+        self.formLayout.setWidget(6, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_6)
+        self.sessionCombo = QtWidgets.QComboBox(parent=PersonDialog)
+        self.sessionCombo.setObjectName("sessionCombo")
+        self.formLayout.setWidget(6, QtWidgets.QFormLayout.ItemRole.FieldRole, self.sessionCombo)
+
+        self.retranslateUi(PersonDialog)
+        self.buttonBox.accepted.connect(PersonDialog.accept) # type: ignore
+        self.buttonBox.rejected.connect(PersonDialog.reject) # type: ignore
+        QtCore.QMetaObject.connectSlotsByName(PersonDialog)
+        PersonDialog.setTabOrder(self.nameEdit, self.emailEdit)
+        PersonDialog.setTabOrder(self.emailEdit, self.orgEdit)
+        PersonDialog.setTabOrder(self.orgEdit, self.bookCombo)
+        PersonDialog.setTabOrder(self.bookCombo, self.sectionCombo)
+
+    def retranslateUi(self, PersonDialog):
+        _translate = QtCore.QCoreApplication.translate
+        PersonDialog.setWindowTitle(_translate("PersonDialog", "People"))
+        self.label.setText(_translate("PersonDialog", "Name"))
+        self.label_5.setText(_translate("PersonDialog", "Email"))
+        self.label_2.setText(_translate("PersonDialog", "Organization"))
+        self.label_3.setText(_translate("PersonDialog", "Book"))
+        self.label_4.setText(_translate("PersonDialog", "Section"))
+        self.printBtn.setText(_translate("PersonDialog", "Print"))
+        self.emailBtn.setText(_translate("PersonDialog", "EMail"))
+        self.label_6.setText(_translate("PersonDialog", "Session"))