From a56c70a8b44f0704fd4e653df69e4aeac40d649c Mon Sep 17 00:00:00 2001 From: WorldTeacher <41587052+WorldTeacher@users.noreply.github.com> Date: Wed, 5 Jun 2024 15:39:55 +0200 Subject: [PATCH] ui changes, formatting --- src/logic/userInterface.py | 69 +- src/ui/Ui_semesterapparat_ui.py | 784 ++++++++++++++---- src/ui/dialogs/__init__.py | 13 +- src/ui/dialogs/bookdata.py | 12 +- .../dialog_sources/Ui_confirm_extend.py | 35 + src/ui/dialogs/dialog_sources/Ui_login.py | 7 +- .../dialogs/dialog_sources/Ui_mail_preview.py | 36 +- .../dialogs/dialog_sources/Ui_medianadder.py | 57 +- .../Ui_newMailTemplateDesigner.py | 28 +- .../dialog_sources/Ui_parsed_titles.py | 16 +- src/ui/dialogs/dialog_sources/Ui_settings.py | 95 ++- .../newMailTemplateDesigner_ui.py | 28 +- src/ui/dialogs/dialog_sources/settings_ui.py | 95 ++- src/ui/dialogs/fileparser.py | 10 +- src/ui/dialogs/login.py | 15 +- src/ui/dialogs/mail.py | 8 +- src/ui/dialogs/mailTemplate.py | 172 ++-- src/ui/dialogs/parsed_titles.py | 8 +- src/ui/dialogs/popup_confirm.py | 31 +- src/ui/dialogs/reminder.py | 6 +- src/ui/dialogs/settings.py | 7 +- src/ui/semesterapparat_ui.ui | 16 +- src/ui/widgets/Ui_progress_overview_widget.py | 1 - src/ui/widgets/graph.py | 2 +- src/utils/icon.py | 12 +- test/bookgrabbertest.py | 2 +- 26 files changed, 1163 insertions(+), 402 deletions(-) create mode 100644 src/ui/dialogs/dialog_sources/Ui_confirm_extend.py diff --git a/src/logic/userInterface.py b/src/logic/userInterface.py index 67801fa..ef35d3d 100644 --- a/src/logic/userInterface.py +++ b/src/logic/userInterface.py @@ -151,11 +151,12 @@ class Ui(Ui_Semesterapparat): QtWidgets.QHeaderView.ResizeMode.Stretch ) self.tableWidget_apparate.setSortingEnabled(True) - # self.tableWidget_apparate.text - self.actionEinstellungen.triggered.connect(self.open_settings) - # if help>documentation is clicked, open the documentation or shortcut is pressed - self.actionDokumentation.triggered.connect(self.open_documentation) + # Actions + self.actionEinstellungen.triggered.connect(self.open_settings) + self.actionDokumentation.triggered.connect(self.open_documentation) + Icon("offAction", self.actionBeenden) + self.actionBeenden.triggered.connect(self.quit) # set validators self.sem_year.setText(str(QtCore.QDate.currentDate().year())) self.prof_mail.setValidator( @@ -256,7 +257,6 @@ class Ui(Ui_Semesterapparat): # if tab is changed, gather data needed self.tabWidget.currentChanged.connect(self.tab_changed) self.btn_search.clicked.connect(self.statistics) - # self.thread_check() ### Admin interface ### self.select_action_box.addItem("") @@ -293,7 +293,8 @@ class Ui(Ui_Semesterapparat): self.elsa_save.clicked.connect(self.save_elsa) self.elsa_date_today.clicked.connect(self.generateTodayDateElsa) self.active_semester.clicked.connect(self.addSemester) - Icon("semap").set_icon(self.active_semester) + Icon("semester", self.active_semester) + Icon("today", self.elsa_date_today) self.elsa_table.doubleClicked.connect(self.open_elsa) self.btn_add_document_elsa.clicked.connect(self.addDokumentElsa) self.check_file_elsa.clicked.connect(self.parseDokumentElsa) @@ -311,6 +312,11 @@ class Ui(Ui_Semesterapparat): self.mail_thread = None self.autoGrabber = None + def quit(self): + # delete all temporary files + delete_temp_contents() + sys.exit() + def add_new_elsa(self): self.create_frame_elsa.setEnabled(True) self.elsa_cancel_create.setEnabled(True) @@ -918,7 +924,6 @@ class Ui(Ui_Semesterapparat): created_status.setToolTip("Doppelklick um den Semesterapparat zu öffnen") deleted_status.setToolTip("Nur zur Übersicht") # set deleted_status background to slightly gray - deleted_status.setStyleSheet("background-color: #f0f0f0") def open_apparat(self, header: str, apparat: str, parent_depth: int): print(header) @@ -1240,13 +1245,13 @@ class Ui(Ui_Semesterapparat): self.cancel_active_selection.setEnabled(False) def confirm_popup(self, message: str): - dial = QtWidgets.QDialog() popup = popus_confirm() - popup.setupUi(dial) + popup.setupUi() popup.textEdit.setReadOnly(True) popup.textEdit.setText(message) - dial.exec() - return dial.result() + + popup.exec() + return popup.result() def threads(self): while True: @@ -2170,6 +2175,7 @@ class Ui(Ui_Semesterapparat): appnr = message["appnr"] appnr = "/" if appnr is None else str(appnr) self.line_app_info.setText(appnr) + def __delete_message(): message = messages[self.spin_select_message.value() - 1] self.db.deleteMessage(message["id"]) @@ -2341,28 +2347,33 @@ class Ui(Ui_Semesterapparat): return def contact_prof(self, apparat=None, mail=""): + print(apparat) if self.active_apparat == "": - if apparat is None: + if apparat is False: self.confirm_popup("Bitte erst einen Apparat auswählen!") return - if apparat: - active_apparat_id = apparat + else: + # TODO: stuff + pass else: - active_apparat_id = self.drpdwn_app_nr.currentText() - print(active_apparat_id) - profname = self.drpdwn_prof_name.currentText().replace(",", "").split(" ") - profname = f"{profname[1]} {profname[0]}" - prof_id = self.db.getProfId(self.drpdwn_prof_name.currentText()) - pmail = self.db.getSpecificProfData(prof_id, ["mail"]) - # create a new thread to show the mail interface and send the mail - self.mail_thread = Mail_Dialog( - app_id=active_apparat_id, - prof_name=profname, - prof_mail=pmail, - app_name=self.app_name.text(), - app_subject=self.app_fach.currentText(), - ) - self.mail_thread.show() + if apparat: + active_apparat_id = apparat + else: + active_apparat_id = self.drpdwn_app_nr.currentText() + print(active_apparat_id) + profname = self.drpdwn_prof_name.currentText().replace(",", "").split(" ") + profname = f"{profname[1]} {profname[0]}" + prof_id = self.db.getProfId(self.drpdwn_prof_name.currentText()) + pmail = self.db.getSpecificProfData(prof_id, ["mail"]) + # create a new thread to show the mail interface and send the mail + self.mail_thread = Mail_Dialog( + app_id=active_apparat_id, + prof_name=profname, + prof_mail=pmail, + app_name=self.app_name.text(), + app_subject=self.app_fach.currentText(), + ) + self.mail_thread.show() def delete_apparat(self): selected_apparat_id = self.tableWidget_apparate.item( diff --git a/src/ui/Ui_semesterapparat_ui.py b/src/ui/Ui_semesterapparat_ui.py index ce64f7c..501b686 100644 --- a/src/ui/Ui_semesterapparat_ui.py +++ b/src/ui/Ui_semesterapparat_ui.py @@ -15,7 +15,9 @@ class Ui_MainWindow(object): MainWindow.setWindowModality(QtCore.Qt.WindowModality.WindowModal) MainWindow.setEnabled(True) MainWindow.resize(1589, 800) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Fixed) + sizePolicy = QtWidgets.QSizePolicy( + QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Fixed + ) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(MainWindow.sizePolicy().hasHeightForWidth()) @@ -24,14 +26,24 @@ class Ui_MainWindow(object): MainWindow.setMaximumSize(QtCore.QSize(1590, 800)) MainWindow.setContextMenuPolicy(QtCore.Qt.ContextMenuPolicy.NoContextMenu) icon = QtGui.QIcon() - icon.addPixmap(QtGui.QPixmap("c:\\Users\\aky547\\GitHub\\SemesterapparatsManager\\src\\ui\\../../../../icons/logo.ico"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) + icon.addPixmap( + QtGui.QPixmap( + "c:\\Users\\aky547\\GitHub\\SemesterapparatsManager\\src\\ui\\../../../../icons/logo.ico" + ), + QtGui.QIcon.Mode.Normal, + QtGui.QIcon.State.Off, + ) MainWindow.setWindowIcon(icon) MainWindow.setStatusTip("") self.centralwidget = QtWidgets.QWidget(parent=MainWindow) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Fixed) + sizePolicy = QtWidgets.QSizePolicy( + QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Fixed + ) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.centralwidget.sizePolicy().hasHeightForWidth()) + sizePolicy.setHeightForWidth( + self.centralwidget.sizePolicy().hasHeightForWidth() + ) self.centralwidget.setSizePolicy(sizePolicy) self.centralwidget.setObjectName("centralwidget") self.verticalLayoutWidget = QtWidgets.QWidget(parent=self.centralwidget) @@ -48,7 +60,10 @@ class Ui_MainWindow(object): self.tabWidget.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) self.tabWidget.setObjectName("tabWidget") self.tab = QtWidgets.QWidget() - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) + sizePolicy = QtWidgets.QSizePolicy( + QtWidgets.QSizePolicy.Policy.Preferred, + QtWidgets.QSizePolicy.Policy.Preferred, + ) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.tab.sizePolicy().hasHeightForWidth()) @@ -64,28 +79,50 @@ class Ui_MainWindow(object): self.formLayout.setObjectName("formLayout") self.verticalLayout_2 = QtWidgets.QVBoxLayout() self.verticalLayout_2.setObjectName("verticalLayout_2") - spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) + spacerItem = QtWidgets.QSpacerItem( + 20, + 40, + QtWidgets.QSizePolicy.Policy.Minimum, + QtWidgets.QSizePolicy.Policy.Expanding, + ) self.verticalLayout_2.addItem(spacerItem) self.load_app = QtWidgets.QPushButton(parent=self.horizontalLayoutWidget_2) self.load_app.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) self.load_app.setObjectName("load_app") self.verticalLayout_2.addWidget(self.load_app) - self.create_new_app = QtWidgets.QPushButton(parent=self.horizontalLayoutWidget_2) + self.create_new_app = QtWidgets.QPushButton( + parent=self.horizontalLayoutWidget_2 + ) self.create_new_app.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) self.create_new_app.setObjectName("create_new_app") self.verticalLayout_2.addWidget(self.create_new_app) - self.cancel_active_selection = QtWidgets.QPushButton(parent=self.horizontalLayoutWidget_2) + self.cancel_active_selection = QtWidgets.QPushButton( + parent=self.horizontalLayoutWidget_2 + ) self.cancel_active_selection.setEnabled(False) self.cancel_active_selection.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) self.cancel_active_selection.setObjectName("cancel_active_selection") self.verticalLayout_2.addWidget(self.cancel_active_selection) - spacerItem1 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) + spacerItem1 = QtWidgets.QSpacerItem( + 20, + 40, + QtWidgets.QSizePolicy.Policy.Minimum, + QtWidgets.QSizePolicy.Policy.Expanding, + ) self.verticalLayout_2.addItem(spacerItem1) - self.formLayout.setLayout(1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.verticalLayout_2) - self.tableWidget_apparate = QtWidgets.QTableWidget(parent=self.horizontalLayoutWidget_2) + self.formLayout.setLayout( + 1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.verticalLayout_2 + ) + self.tableWidget_apparate = QtWidgets.QTableWidget( + parent=self.horizontalLayoutWidget_2 + ) self.tableWidget_apparate.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) - self.tableWidget_apparate.setSizeAdjustPolicy(QtWidgets.QAbstractScrollArea.SizeAdjustPolicy.AdjustToContents) - self.tableWidget_apparate.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) + self.tableWidget_apparate.setSizeAdjustPolicy( + QtWidgets.QAbstractScrollArea.SizeAdjustPolicy.AdjustToContents + ) + self.tableWidget_apparate.setEditTriggers( + QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers + ) self.tableWidget_apparate.setAlternatingRowColors(True) self.tableWidget_apparate.setTextElideMode(QtCore.Qt.TextElideMode.ElideMiddle) self.tableWidget_apparate.setObjectName("tableWidget_apparate") @@ -104,13 +141,19 @@ class Ui_MainWindow(object): item = QtWidgets.QTableWidgetItem() self.tableWidget_apparate.setHorizontalHeaderItem(5, item) self.tableWidget_apparate.horizontalHeader().setCascadingSectionResizes(True) - self.formLayout.setWidget(1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.tableWidget_apparate) + self.formLayout.setWidget( + 1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.tableWidget_apparate + ) self.horizontalLayout_4 = QtWidgets.QHBoxLayout() self.horizontalLayout_4.setObjectName("horizontalLayout_4") - self.formLayout.setLayout(2, QtWidgets.QFormLayout.ItemRole.FieldRole, self.horizontalLayout_4) + self.formLayout.setLayout( + 2, QtWidgets.QFormLayout.ItemRole.FieldRole, self.horizontalLayout_4 + ) self.horizontalLayout_3 = QtWidgets.QHBoxLayout() self.horizontalLayout_3.setObjectName("horizontalLayout_3") - self.formLayout.setLayout(3, QtWidgets.QFormLayout.ItemRole.LabelRole, self.horizontalLayout_3) + self.formLayout.setLayout( + 3, QtWidgets.QFormLayout.ItemRole.LabelRole, self.horizontalLayout_3 + ) self.horizontalLayout_2.addLayout(self.formLayout) self.line = QtWidgets.QFrame(parent=self.tab) self.line.setGeometry(QtCore.QRect(0, 160, 1261, 21)) @@ -126,12 +169,22 @@ class Ui_MainWindow(object): self.gridLayout_2.setObjectName("gridLayout_2") self.horizontalLayout_5 = QtWidgets.QHBoxLayout() self.horizontalLayout_5.setObjectName("horizontalLayout_5") - spacerItem2 = QtWidgets.QSpacerItem(20, 20, QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Minimum) + spacerItem2 = QtWidgets.QSpacerItem( + 20, + 20, + QtWidgets.QSizePolicy.Policy.Fixed, + QtWidgets.QSizePolicy.Policy.Minimum, + ) self.horizontalLayout_5.addItem(spacerItem2) self.chkbx_show_del_media = QtWidgets.QCheckBox(parent=self.gridLayoutWidget_2) self.chkbx_show_del_media.setObjectName("chkbx_show_del_media") self.horizontalLayout_5.addWidget(self.chkbx_show_del_media) - spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Minimum) + spacerItem3 = QtWidgets.QSpacerItem( + 40, + 20, + QtWidgets.QSizePolicy.Policy.Fixed, + QtWidgets.QSizePolicy.Policy.Minimum, + ) self.horizontalLayout_5.addItem(spacerItem3) self.btn_reserve = QtWidgets.QPushButton(parent=self.gridLayoutWidget_2) self.btn_reserve.setObjectName("btn_reserve") @@ -150,7 +203,12 @@ class Ui_MainWindow(object): self.progress_label.setObjectName("progress_label") self.add_layout.addWidget(self.progress_label) self.horizontalLayout_5.addLayout(self.add_layout) - spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Minimum) + spacerItem4 = QtWidgets.QSpacerItem( + 40, + 20, + QtWidgets.QSizePolicy.Policy.Fixed, + QtWidgets.QSizePolicy.Policy.Minimum, + ) self.horizontalLayout_5.addItem(spacerItem4) self.avail_layout = QtWidgets.QHBoxLayout() self.avail_layout.setObjectName("avail_layout") @@ -166,22 +224,41 @@ class Ui_MainWindow(object): self.avail_status = QtWidgets.QLabel(parent=self.gridLayoutWidget_2) self.avail_status.setObjectName("avail_status") self.horizontalLayout_5.addWidget(self.avail_status) - spacerItem5 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + spacerItem5 = QtWidgets.QSpacerItem( + 40, + 20, + QtWidgets.QSizePolicy.Policy.Expanding, + QtWidgets.QSizePolicy.Policy.Minimum, + ) self.horizontalLayout_5.addItem(spacerItem5) self.gridLayout_2.addLayout(self.horizontalLayout_5, 4, 0, 1, 1) - self.tableWidget_apparat_media = QtWidgets.QTableWidget(parent=self.gridLayoutWidget_2) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Expanding) + self.tableWidget_apparat_media = QtWidgets.QTableWidget( + parent=self.gridLayoutWidget_2 + ) + sizePolicy = QtWidgets.QSizePolicy( + QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Expanding + ) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.tableWidget_apparat_media.sizePolicy().hasHeightForWidth()) + sizePolicy.setHeightForWidth( + self.tableWidget_apparat_media.sizePolicy().hasHeightForWidth() + ) self.tableWidget_apparat_media.setSizePolicy(sizePolicy) self.tableWidget_apparat_media.setMinimumSize(QtCore.QSize(1259, 0)) self.tableWidget_apparat_media.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) - self.tableWidget_apparat_media.setContextMenuPolicy(QtCore.Qt.ContextMenuPolicy.CustomContextMenu) - self.tableWidget_apparat_media.setSizeAdjustPolicy(QtWidgets.QAbstractScrollArea.SizeAdjustPolicy.AdjustToContents) - self.tableWidget_apparat_media.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) + self.tableWidget_apparat_media.setContextMenuPolicy( + QtCore.Qt.ContextMenuPolicy.CustomContextMenu + ) + self.tableWidget_apparat_media.setSizeAdjustPolicy( + QtWidgets.QAbstractScrollArea.SizeAdjustPolicy.AdjustToContents + ) + self.tableWidget_apparat_media.setEditTriggers( + QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers + ) self.tableWidget_apparat_media.setAlternatingRowColors(True) - self.tableWidget_apparat_media.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows) + self.tableWidget_apparat_media.setSelectionBehavior( + QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows + ) self.tableWidget_apparat_media.setObjectName("tableWidget_apparat_media") self.tableWidget_apparat_media.setColumnCount(7) self.tableWidget_apparat_media.setRowCount(0) @@ -199,7 +276,9 @@ class Ui_MainWindow(object): self.tableWidget_apparat_media.setHorizontalHeaderItem(5, item) item = QtWidgets.QTableWidgetItem() self.tableWidget_apparat_media.setHorizontalHeaderItem(6, item) - self.tableWidget_apparat_media.horizontalHeader().setCascadingSectionResizes(True) + self.tableWidget_apparat_media.horizontalHeader().setCascadingSectionResizes( + True + ) self.gridLayout_2.addWidget(self.tableWidget_apparat_media, 9, 0, 1, 1) self.label = QtWidgets.QLabel(parent=self.gridLayoutWidget_2) font = QtGui.QFont() @@ -210,17 +289,25 @@ class Ui_MainWindow(object): self.gridLayout_2.addWidget(self.label, 2, 0, 1, 1) self.app_group_box = QtWidgets.QGroupBox(parent=self.gridLayoutWidget_2) self.app_group_box.setEnabled(True) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed) + sizePolicy = QtWidgets.QSizePolicy( + QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed + ) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.app_group_box.sizePolicy().hasHeightForWidth()) + sizePolicy.setHeightForWidth( + self.app_group_box.sizePolicy().hasHeightForWidth() + ) self.app_group_box.setSizePolicy(sizePolicy) self.app_group_box.setMinimumSize(QtCore.QSize(0, 210)) font = QtGui.QFont() font.setPointSize(12) font.setBold(True) self.app_group_box.setFont(font) - self.app_group_box.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft|QtCore.Qt.AlignmentFlag.AlignVCenter) + self.app_group_box.setAlignment( + QtCore.Qt.AlignmentFlag.AlignLeading + | QtCore.Qt.AlignmentFlag.AlignLeft + | QtCore.Qt.AlignmentFlag.AlignVCenter + ) self.app_group_box.setCheckable(False) self.app_group_box.setObjectName("app_group_box") self.dokument_list = QtWidgets.QTableWidget(parent=self.app_group_box) @@ -232,12 +319,20 @@ class Ui_MainWindow(object): self.dokument_list.setFont(font) self.dokument_list.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) self.dokument_list.setAcceptDrops(True) - self.dokument_list.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarPolicy.ScrollBarAlwaysOff) - self.dokument_list.setSizeAdjustPolicy(QtWidgets.QAbstractScrollArea.SizeAdjustPolicy.AdjustToContents) + self.dokument_list.setHorizontalScrollBarPolicy( + QtCore.Qt.ScrollBarPolicy.ScrollBarAlwaysOff + ) + self.dokument_list.setSizeAdjustPolicy( + QtWidgets.QAbstractScrollArea.SizeAdjustPolicy.AdjustToContents + ) self.dokument_list.setDragEnabled(True) - self.dokument_list.setDragDropMode(QtWidgets.QAbstractItemView.DragDropMode.DropOnly) + self.dokument_list.setDragDropMode( + QtWidgets.QAbstractItemView.DragDropMode.DropOnly + ) self.dokument_list.setDefaultDropAction(QtCore.Qt.DropAction.LinkAction) - self.dokument_list.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.SingleSelection) + self.dokument_list.setSelectionMode( + QtWidgets.QAbstractItemView.SelectionMode.SingleSelection + ) self.dokument_list.setObjectName("dokument_list") self.dokument_list.setColumnCount(4) self.dokument_list.setRowCount(0) @@ -342,7 +437,12 @@ class Ui_MainWindow(object): self.app_fach.setEditable(True) self.app_fach.setObjectName("app_fach") self.gridLayout_6.addWidget(self.app_fach, 0, 0, 1, 1) - spacerItem6 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + spacerItem6 = QtWidgets.QSpacerItem( + 40, + 20, + QtWidgets.QSizePolicy.Policy.Expanding, + QtWidgets.QSizePolicy.Policy.Minimum, + ) self.gridLayout_6.addItem(spacerItem6, 0, 1, 1, 1) self._mand = QtWidgets.QLabel(parent=self.app_group_box) self._mand.setGeometry(QtCore.QRect(340, 90, 16, 21)) @@ -385,7 +485,9 @@ class Ui_MainWindow(object): self.drpdwn_prof_name.setFocusPolicy(QtCore.Qt.FocusPolicy.StrongFocus) self.drpdwn_prof_name.setInputMethodHints(QtCore.Qt.InputMethodHint.ImhNone) self.drpdwn_prof_name.setEditable(True) - self.drpdwn_prof_name.setInsertPolicy(QtWidgets.QComboBox.InsertPolicy.InsertAlphabetically) + self.drpdwn_prof_name.setInsertPolicy( + QtWidgets.QComboBox.InsertPolicy.InsertAlphabetically + ) self.drpdwn_prof_name.setFrame(True) self.drpdwn_prof_name.setObjectName("drpdwn_prof_name") self.mail_mand = QtWidgets.QLabel(parent=self.app_group_box) @@ -429,7 +531,9 @@ class Ui_MainWindow(object): font.setPointSize(9) font.setBold(False) self.prof_mail.setFont(font) - self.prof_mail.setInputMethodHints(QtCore.Qt.InputMethodHint.ImhEmailCharactersOnly) + self.prof_mail.setInputMethodHints( + QtCore.Qt.InputMethodHint.ImhEmailCharactersOnly + ) self.prof_mail.setMaxLength(200) self.prof_mail.setPlaceholderText("") self.prof_mail.setObjectName("prof_mail") @@ -445,31 +549,43 @@ class Ui_MainWindow(object): font.setBold(False) self.label_12.setFont(font) self.label_12.setObjectName("label_12") - self.formLayout_3.setWidget(0, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_12) + self.formLayout_3.setWidget( + 0, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_12 + ) self.prof_id_adis = QtWidgets.QLineEdit(parent=self.formLayoutWidget_2) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) self.prof_id_adis.setFont(font) - self.prof_id_adis.setInputMethodHints(QtCore.Qt.InputMethodHint.ImhPreferNumbers) + self.prof_id_adis.setInputMethodHints( + QtCore.Qt.InputMethodHint.ImhPreferNumbers + ) self.prof_id_adis.setText("") self.prof_id_adis.setObjectName("prof_id_adis") - self.formLayout_3.setWidget(0, QtWidgets.QFormLayout.ItemRole.FieldRole, self.prof_id_adis) + self.formLayout_3.setWidget( + 0, QtWidgets.QFormLayout.ItemRole.FieldRole, self.prof_id_adis + ) self.label_13 = QtWidgets.QLabel(parent=self.formLayoutWidget_2) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) self.label_13.setFont(font) self.label_13.setObjectName("label_13") - self.formLayout_3.setWidget(1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_13) + self.formLayout_3.setWidget( + 1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_13 + ) self.apparat_id_adis = QtWidgets.QLineEdit(parent=self.formLayoutWidget_2) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) self.apparat_id_adis.setFont(font) - self.apparat_id_adis.setInputMethodHints(QtCore.Qt.InputMethodHint.ImhPreferNumbers) + self.apparat_id_adis.setInputMethodHints( + QtCore.Qt.InputMethodHint.ImhPreferNumbers + ) self.apparat_id_adis.setObjectName("apparat_id_adis") - self.formLayout_3.setWidget(1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.apparat_id_adis) + self.formLayout_3.setWidget( + 1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.apparat_id_adis + ) self.sem_year = QtWidgets.QLineEdit(parent=self.app_group_box) self.sem_year.setGeometry(QtCore.QRect(420, 90, 113, 20)) font = QtGui.QFont() @@ -615,7 +731,12 @@ class Ui_MainWindow(object): self.box_person.setEditable(True) self.box_person.setObjectName("box_person") self.gridLayout_3.addWidget(self.box_person, 1, 1, 1, 1) - spacerItem7 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) + spacerItem7 = QtWidgets.QSpacerItem( + 20, + 40, + QtWidgets.QSizePolicy.Policy.Minimum, + QtWidgets.QSizePolicy.Policy.Expanding, + ) self.gridLayout_3.addItem(spacerItem7, 4, 0, 1, 1) self.label_15 = QtWidgets.QLabel(parent=self.gridLayoutWidget) self.label_15.setObjectName("label_15") @@ -640,26 +761,45 @@ class Ui_MainWindow(object): self.formLayout_6.setObjectName("formLayout_6") self.label_25 = QtWidgets.QLabel(parent=self.formLayoutWidget) self.label_25.setObjectName("label_25") - self.formLayout_6.setWidget(0, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_25) + self.formLayout_6.setWidget( + 0, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_25 + ) self.book_search = QtWidgets.QPushButton(parent=self.formLayoutWidget) self.book_search.setObjectName("book_search") - self.formLayout_6.setWidget(3, QtWidgets.QFormLayout.ItemRole.LabelRole, self.book_search) + self.formLayout_6.setWidget( + 3, QtWidgets.QFormLayout.ItemRole.LabelRole, self.book_search + ) self.seach_by_signature = QtWidgets.QLineEdit(parent=self.formLayoutWidget) self.seach_by_signature.setClearButtonEnabled(True) self.seach_by_signature.setObjectName("seach_by_signature") - self.formLayout_6.setWidget(0, QtWidgets.QFormLayout.ItemRole.FieldRole, self.seach_by_signature) + self.formLayout_6.setWidget( + 0, QtWidgets.QFormLayout.ItemRole.FieldRole, self.seach_by_signature + ) self.label_26 = QtWidgets.QLabel(parent=self.formLayoutWidget) self.label_26.setObjectName("label_26") - self.formLayout_6.setWidget(1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_26) + self.formLayout_6.setWidget( + 1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_26 + ) self.search_by_title = QtWidgets.QLineEdit(parent=self.formLayoutWidget) self.search_by_title.setClearButtonEnabled(True) self.search_by_title.setObjectName("search_by_title") - self.formLayout_6.setWidget(1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.search_by_title) - spacerItem8 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) - self.formLayout_6.setItem(2, QtWidgets.QFormLayout.ItemRole.LabelRole, spacerItem8) + self.formLayout_6.setWidget( + 1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.search_by_title + ) + spacerItem8 = QtWidgets.QSpacerItem( + 20, + 40, + QtWidgets.QSizePolicy.Policy.Minimum, + QtWidgets.QSizePolicy.Policy.Expanding, + ) + self.formLayout_6.setItem( + 2, QtWidgets.QFormLayout.ItemRole.LabelRole, spacerItem8 + ) self.tabWidget_2.addTab(self.tab_4, "") self.verticalLayout_3.addWidget(self.tabWidget_2) - self.stackedWidget_4 = QtWidgets.QStackedWidget(parent=self.verticalLayoutWidget_2) + self.stackedWidget_4 = QtWidgets.QStackedWidget( + parent=self.verticalLayoutWidget_2 + ) self.stackedWidget_4.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) self.stackedWidget_4.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) self.stackedWidget_4.setObjectName("stackedWidget_4") @@ -677,15 +817,24 @@ class Ui_MainWindow(object): self.gridLayout_4.setContentsMargins(0, 0, 0, 0) self.gridLayout_4.setObjectName("gridLayout_4") self.statistics_table = QtWidgets.QTableWidget(parent=self.gridLayoutWidget_3) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding) + sizePolicy = QtWidgets.QSizePolicy( + QtWidgets.QSizePolicy.Policy.Expanding, + QtWidgets.QSizePolicy.Policy.Expanding, + ) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.statistics_table.sizePolicy().hasHeightForWidth()) + sizePolicy.setHeightForWidth( + self.statistics_table.sizePolicy().hasHeightForWidth() + ) self.statistics_table.setSizePolicy(sizePolicy) self.statistics_table.setMaximumSize(QtCore.QSize(16777215, 16777215)) self.statistics_table.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) - self.statistics_table.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarPolicy.ScrollBarAlwaysOff) - self.statistics_table.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) + self.statistics_table.setHorizontalScrollBarPolicy( + QtCore.Qt.ScrollBarPolicy.ScrollBarAlwaysOff + ) + self.statistics_table.setEditTriggers( + QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers + ) self.statistics_table.setAlternatingRowColors(True) self.statistics_table.setObjectName("statistics_table") self.statistics_table.setColumnCount(3) @@ -719,14 +868,23 @@ class Ui_MainWindow(object): self.verticalLayout_5 = QtWidgets.QVBoxLayout() self.verticalLayout_5.setObjectName("verticalLayout_5") self.horizontalLayout_7.addLayout(self.verticalLayout_5) - self.btn_del_select_apparats = QtWidgets.QPushButton(parent=self.horizontalLayoutWidget_3) + self.btn_del_select_apparats = QtWidgets.QPushButton( + parent=self.horizontalLayoutWidget_3 + ) self.btn_del_select_apparats.setFocusPolicy(QtCore.Qt.FocusPolicy.StrongFocus) self.btn_del_select_apparats.setObjectName("btn_del_select_apparats") self.horizontalLayout_7.addWidget(self.btn_del_select_apparats) - self.btn_notify_for_deletion = QtWidgets.QPushButton(parent=self.horizontalLayoutWidget_3) + self.btn_notify_for_deletion = QtWidgets.QPushButton( + parent=self.horizontalLayoutWidget_3 + ) self.btn_notify_for_deletion.setObjectName("btn_notify_for_deletion") self.horizontalLayout_7.addWidget(self.btn_notify_for_deletion) - spacerItem9 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + spacerItem9 = QtWidgets.QSpacerItem( + 40, + 20, + QtWidgets.QSizePolicy.Policy.Expanding, + QtWidgets.QSizePolicy.Policy.Minimum, + ) self.horizontalLayout_7.addItem(spacerItem9) self.table = QtWidgets.QWidget(parent=self.widget) self.table.setGeometry(QtCore.QRect(0, 50, 761, 391)) @@ -734,8 +892,12 @@ class Ui_MainWindow(object): self.tableWidget = QtWidgets.QTableWidget(parent=self.table) self.tableWidget.setGeometry(QtCore.QRect(0, 0, 761, 391)) self.tableWidget.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) - self.tableWidget.setContextMenuPolicy(QtCore.Qt.ContextMenuPolicy.CustomContextMenu) - self.tableWidget.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) + self.tableWidget.setContextMenuPolicy( + QtCore.Qt.ContextMenuPolicy.CustomContextMenu + ) + self.tableWidget.setEditTriggers( + QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers + ) self.tableWidget.setObjectName("tableWidget") self.tableWidget.setColumnCount(5) self.tableWidget.setRowCount(0) @@ -755,7 +917,9 @@ class Ui_MainWindow(object): self.book_search_result = QtWidgets.QTableWidget(parent=self.page) self.book_search_result.setGeometry(QtCore.QRect(10, 20, 1081, 421)) self.book_search_result.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) - self.book_search_result.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) + self.book_search_result.setEditTriggers( + QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers + ) self.book_search_result.setAlternatingRowColors(True) self.book_search_result.setObjectName("book_search_result") self.book_search_result.setColumnCount(3) @@ -791,12 +955,20 @@ class Ui_MainWindow(object): self.dokument_list_elsa.setFont(font) self.dokument_list_elsa.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) self.dokument_list_elsa.setAcceptDrops(True) - self.dokument_list_elsa.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarPolicy.ScrollBarAlwaysOff) - self.dokument_list_elsa.setSizeAdjustPolicy(QtWidgets.QAbstractScrollArea.SizeAdjustPolicy.AdjustToContents) + self.dokument_list_elsa.setHorizontalScrollBarPolicy( + QtCore.Qt.ScrollBarPolicy.ScrollBarAlwaysOff + ) + self.dokument_list_elsa.setSizeAdjustPolicy( + QtWidgets.QAbstractScrollArea.SizeAdjustPolicy.AdjustToContents + ) self.dokument_list_elsa.setDragEnabled(True) - self.dokument_list_elsa.setDragDropMode(QtWidgets.QAbstractItemView.DragDropMode.DropOnly) + self.dokument_list_elsa.setDragDropMode( + QtWidgets.QAbstractItemView.DragDropMode.DropOnly + ) self.dokument_list_elsa.setDefaultDropAction(QtCore.Qt.DropAction.LinkAction) - self.dokument_list_elsa.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.SingleSelection) + self.dokument_list_elsa.setSelectionMode( + QtWidgets.QAbstractItemView.SelectionMode.SingleSelection + ) self.dokument_list_elsa.setObjectName("dokument_list_elsa") self.dokument_list_elsa.setColumnCount(4) self.dokument_list_elsa.setRowCount(0) @@ -830,14 +1002,18 @@ class Ui_MainWindow(object): font.setBold(False) self.check_file_elsa.setFont(font) self.check_file_elsa.setObjectName("check_file_elsa") - self.btn_open_document_elsa = QtWidgets.QPushButton(parent=self.create_frame_elsa) + self.btn_open_document_elsa = QtWidgets.QPushButton( + parent=self.create_frame_elsa + ) self.btn_open_document_elsa.setGeometry(QtCore.QRect(1060, 80, 131, 25)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) self.btn_open_document_elsa.setFont(font) self.btn_open_document_elsa.setObjectName("btn_open_document_elsa") - self.btn_add_document_elsa = QtWidgets.QPushButton(parent=self.create_frame_elsa) + self.btn_add_document_elsa = QtWidgets.QPushButton( + parent=self.create_frame_elsa + ) self.btn_add_document_elsa.setGeometry(QtCore.QRect(1060, 40, 131, 25)) font = QtGui.QFont() font.setPointSize(9) @@ -848,17 +1024,25 @@ class Ui_MainWindow(object): self.gridLayoutWidget_6.setGeometry(QtCore.QRect(10, 10, 411, 121)) self.gridLayoutWidget_6.setObjectName("gridLayoutWidget_6") self.gridLayout_7 = QtWidgets.QGridLayout(self.gridLayoutWidget_6) - self.gridLayout_7.setSizeConstraint(QtWidgets.QLayout.SizeConstraint.SetFixedSize) + self.gridLayout_7.setSizeConstraint( + QtWidgets.QLayout.SizeConstraint.SetFixedSize + ) self.gridLayout_7.setContentsMargins(0, 0, 0, 0) self.gridLayout_7.setObjectName("gridLayout_7") self.elsa_date_today = QtWidgets.QPushButton(parent=self.gridLayoutWidget_6) - self.elsa_date_today.setFlat(False) + self.elsa_date_today.setText("") + self.elsa_date_today.setFlat(True) self.elsa_date_today.setObjectName("elsa_date_today") self.gridLayout_7.addWidget(self.elsa_date_today, 1, 2, 1, 1) self.label_29 = QtWidgets.QLabel(parent=self.gridLayoutWidget_6) self.label_29.setObjectName("label_29") self.gridLayout_7.addWidget(self.label_29, 2, 0, 1, 1) - spacerItem10 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) + spacerItem10 = QtWidgets.QSpacerItem( + 20, + 40, + QtWidgets.QSizePolicy.Policy.Minimum, + QtWidgets.QSizePolicy.Policy.Expanding, + ) self.gridLayout_7.addItem(spacerItem10, 3, 0, 1, 1) self.elsa_date = QtWidgets.QLineEdit(parent=self.gridLayoutWidget_6) self.elsa_date.setClearButtonEnabled(True) @@ -889,7 +1073,9 @@ class Ui_MainWindow(object): self.table_elsa_list.setGeometry(QtCore.QRect(20, 410, 771, 271)) self.table_elsa_list.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) self.table_elsa_list.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken) - self.table_elsa_list.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) + self.table_elsa_list.setEditTriggers( + QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers + ) self.table_elsa_list.setObjectName("table_elsa_list") self.table_elsa_list.setColumnCount(4) self.table_elsa_list.setRowCount(0) @@ -912,8 +1098,12 @@ class Ui_MainWindow(object): self.tab_9.setObjectName("tab_9") self.elsa_statistics_table = QtWidgets.QTableWidget(parent=self.tab_9) self.elsa_statistics_table.setGeometry(QtCore.QRect(0, 0, 421, 241)) - self.elsa_statistics_table.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarPolicy.ScrollBarAlwaysOff) - self.elsa_statistics_table.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) + self.elsa_statistics_table.setHorizontalScrollBarPolicy( + QtCore.Qt.ScrollBarPolicy.ScrollBarAlwaysOff + ) + self.elsa_statistics_table.setEditTriggers( + QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers + ) self.elsa_statistics_table.setTextElideMode(QtCore.Qt.TextElideMode.ElideRight) self.elsa_statistics_table.setObjectName("elsa_statistics_table") self.elsa_statistics_table.setColumnCount(2) @@ -934,7 +1124,9 @@ class Ui_MainWindow(object): self.elsa_add_new.setObjectName("elsa_add_new") self.elsa_table = QtWidgets.QTableWidget(parent=self.tab_8) self.elsa_table.setGeometry(QtCore.QRect(140, 10, 1031, 181)) - self.elsa_table.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) + self.elsa_table.setEditTriggers( + QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers + ) self.elsa_table.setObjectName("elsa_table") self.elsa_table.setColumnCount(3) self.elsa_table.setRowCount(0) @@ -973,7 +1165,9 @@ class Ui_MainWindow(object): self.label_22 = QtWidgets.QLabel(parent=self.gridLayoutWidget_4) self.label_22.setObjectName("label_22") self.gridLayout_5.addWidget(self.label_22, 0, 0, 1, 1) - self.user_create_frame_username = QtWidgets.QLineEdit(parent=self.gridLayoutWidget_4) + self.user_create_frame_username = QtWidgets.QLineEdit( + parent=self.gridLayoutWidget_4 + ) self.user_create_frame_username.setMaximumSize(QtCore.QSize(150, 16777215)) self.user_create_frame_username.setObjectName("user_create_frame_username") self.gridLayout_5.addWidget(self.user_create_frame_username, 0, 1, 1, 1) @@ -983,13 +1177,20 @@ class Ui_MainWindow(object): self.label_23 = QtWidgets.QLabel(parent=self.gridLayoutWidget_4) self.label_23.setObjectName("label_23") self.gridLayout_5.addWidget(self.label_23, 1, 0, 1, 1) - spacerItem11 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + spacerItem11 = QtWidgets.QSpacerItem( + 40, + 20, + QtWidgets.QSizePolicy.Policy.Expanding, + QtWidgets.QSizePolicy.Policy.Minimum, + ) self.gridLayout_5.addItem(spacerItem11, 0, 4, 1, 1) self.user_frame_userrole = QtWidgets.QComboBox(parent=self.gridLayoutWidget_4) self.user_frame_userrole.setEditable(True) self.user_frame_userrole.setObjectName("user_frame_userrole") self.gridLayout_5.addWidget(self.user_frame_userrole, 0, 3, 1, 1) - self.user_create_frame_password = QtWidgets.QLineEdit(parent=self.gridLayoutWidget_4) + self.user_create_frame_password = QtWidgets.QLineEdit( + parent=self.gridLayoutWidget_4 + ) self.user_create_frame_password.setMaximumSize(QtCore.QSize(150, 16777215)) self.user_create_frame_password.setObjectName("user_create_frame_password") self.gridLayout_5.addWidget(self.user_create_frame_password, 1, 1, 1, 1) @@ -1013,25 +1214,48 @@ class Ui_MainWindow(object): self.gridLayout_8.setObjectName("gridLayout_8") self.horizontalLayout_8 = QtWidgets.QHBoxLayout() self.horizontalLayout_8.setObjectName("horizontalLayout_8") - spacerItem12 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + spacerItem12 = QtWidgets.QSpacerItem( + 40, + 20, + QtWidgets.QSizePolicy.Policy.Expanding, + QtWidgets.QSizePolicy.Policy.Minimum, + ) self.horizontalLayout_8.addItem(spacerItem12) self.pushButton = QtWidgets.QPushButton(parent=self.gridLayoutWidget_7) self.pushButton.setObjectName("pushButton") self.horizontalLayout_8.addWidget(self.pushButton) - spacerItem13 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + spacerItem13 = QtWidgets.QSpacerItem( + 40, + 20, + QtWidgets.QSizePolicy.Policy.Expanding, + QtWidgets.QSizePolicy.Policy.Minimum, + ) self.horizontalLayout_8.addItem(spacerItem13) self.gridLayout_8.addLayout(self.horizontalLayout_8, 1, 1, 1, 1) self.label_34 = QtWidgets.QLabel(parent=self.gridLayoutWidget_7) self.label_34.setObjectName("label_34") self.gridLayout_8.addWidget(self.label_34, 0, 0, 1, 1) - self.user_delete_frame_user_select = QtWidgets.QComboBox(parent=self.gridLayoutWidget_7) - self.user_delete_frame_user_select.setObjectName("user_delete_frame_user_select") + self.user_delete_frame_user_select = QtWidgets.QComboBox( + parent=self.gridLayoutWidget_7 + ) + self.user_delete_frame_user_select.setObjectName( + "user_delete_frame_user_select" + ) self.gridLayout_8.addWidget(self.user_delete_frame_user_select, 0, 1, 1, 1) - self.user_delete_confirm = QtWidgets.QRadioButton(parent=self.gridLayoutWidget_7) - self.user_delete_confirm.setLayoutDirection(QtCore.Qt.LayoutDirection.RightToLeft) + self.user_delete_confirm = QtWidgets.QRadioButton( + parent=self.gridLayoutWidget_7 + ) + self.user_delete_confirm.setLayoutDirection( + QtCore.Qt.LayoutDirection.RightToLeft + ) self.user_delete_confirm.setObjectName("user_delete_confirm") self.gridLayout_8.addWidget(self.user_delete_confirm, 1, 0, 1, 1) - spacerItem14 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + spacerItem14 = QtWidgets.QSpacerItem( + 40, + 20, + QtWidgets.QSizePolicy.Policy.Expanding, + QtWidgets.QSizePolicy.Policy.Minimum, + ) self.gridLayout_8.addItem(spacerItem14, 0, 2, 1, 1) self.user_delete_err_message = QtWidgets.QLabel(parent=self.gridLayoutWidget_7) self.user_delete_err_message.setText("") @@ -1048,13 +1272,17 @@ class Ui_MainWindow(object): self.gridLayout_11 = QtWidgets.QGridLayout(self.gridLayoutWidget_10) self.gridLayout_11.setContentsMargins(0, 0, 0, 0) self.gridLayout_11.setObjectName("gridLayout_11") - self.user_edit_frame_role_select = QtWidgets.QComboBox(parent=self.gridLayoutWidget_10) + self.user_edit_frame_role_select = QtWidgets.QComboBox( + parent=self.gridLayoutWidget_10 + ) self.user_edit_frame_role_select.setObjectName("user_edit_frame_role_select") self.gridLayout_11.addWidget(self.user_edit_frame_role_select, 0, 3, 1, 1) self.label_38 = QtWidgets.QLabel(parent=self.gridLayoutWidget_10) self.label_38.setObjectName("label_38") self.gridLayout_11.addWidget(self.label_38, 0, 0, 1, 1) - self.user_edit_frame_user_select = QtWidgets.QComboBox(parent=self.gridLayoutWidget_10) + self.user_edit_frame_user_select = QtWidgets.QComboBox( + parent=self.gridLayoutWidget_10 + ) self.user_edit_frame_user_select.setMaximumSize(QtCore.QSize(150, 16777215)) self.user_edit_frame_user_select.setObjectName("user_edit_frame_user_select") self.gridLayout_11.addWidget(self.user_edit_frame_user_select, 0, 1, 1, 1) @@ -1067,11 +1295,18 @@ class Ui_MainWindow(object): self.label_39 = QtWidgets.QLabel(parent=self.gridLayoutWidget_10) self.label_39.setObjectName("label_39") self.gridLayout_11.addWidget(self.label_39, 1, 0, 1, 1) - self.user_edit_frame_new_password = QtWidgets.QLineEdit(parent=self.gridLayoutWidget_10) + self.user_edit_frame_new_password = QtWidgets.QLineEdit( + parent=self.gridLayoutWidget_10 + ) self.user_edit_frame_new_password.setMaximumSize(QtCore.QSize(150, 16777215)) self.user_edit_frame_new_password.setObjectName("user_edit_frame_new_password") self.gridLayout_11.addWidget(self.user_edit_frame_new_password, 1, 1, 1, 1) - spacerItem15 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + spacerItem15 = QtWidgets.QSpacerItem( + 40, + 20, + QtWidgets.QSizePolicy.Policy.Expanding, + QtWidgets.QSizePolicy.Policy.Minimum, + ) self.gridLayout_11.addItem(spacerItem15, 0, 4, 1, 1) self.edit_faculty_member = QtWidgets.QFrame(parent=self.tab_5) self.edit_faculty_member.setGeometry(QtCore.QRect(10, 60, 1051, 241)) @@ -1088,71 +1323,145 @@ class Ui_MainWindow(object): self.formLayout_2.setObjectName("formLayout_2") self.label_43 = QtWidgets.QLabel(parent=self.gridLayoutWidget_11) self.label_43.setObjectName("label_43") - self.formLayout_2.setWidget(0, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_43) - self.edit_faculty_member_new_title = QtWidgets.QComboBox(parent=self.gridLayoutWidget_11) + self.formLayout_2.setWidget( + 0, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_43 + ) + self.edit_faculty_member_new_title = QtWidgets.QComboBox( + parent=self.gridLayoutWidget_11 + ) self.edit_faculty_member_new_title.setEditable(True) - self.edit_faculty_member_new_title.setObjectName("edit_faculty_member_new_title") - self.formLayout_2.setWidget(0, QtWidgets.QFormLayout.ItemRole.FieldRole, self.edit_faculty_member_new_title) + self.edit_faculty_member_new_title.setObjectName( + "edit_faculty_member_new_title" + ) + self.formLayout_2.setWidget( + 0, + QtWidgets.QFormLayout.ItemRole.FieldRole, + self.edit_faculty_member_new_title, + ) self.label_44 = QtWidgets.QLabel(parent=self.gridLayoutWidget_11) self.label_44.setObjectName("label_44") - self.formLayout_2.setWidget(1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_44) - self.edit_faculty_member_new_surname = QtWidgets.QLineEdit(parent=self.gridLayoutWidget_11) - self.edit_faculty_member_new_surname.setObjectName("edit_faculty_member_new_surname") - self.formLayout_2.setWidget(1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.edit_faculty_member_new_surname) + self.formLayout_2.setWidget( + 1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_44 + ) + self.edit_faculty_member_new_surname = QtWidgets.QLineEdit( + parent=self.gridLayoutWidget_11 + ) + self.edit_faculty_member_new_surname.setObjectName( + "edit_faculty_member_new_surname" + ) + self.formLayout_2.setWidget( + 1, + QtWidgets.QFormLayout.ItemRole.FieldRole, + self.edit_faculty_member_new_surname, + ) self.label_45 = QtWidgets.QLabel(parent=self.gridLayoutWidget_11) self.label_45.setObjectName("label_45") - self.formLayout_2.setWidget(2, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_45) - self.user_faculty_member_new_name = QtWidgets.QLineEdit(parent=self.gridLayoutWidget_11) + self.formLayout_2.setWidget( + 2, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_45 + ) + self.user_faculty_member_new_name = QtWidgets.QLineEdit( + parent=self.gridLayoutWidget_11 + ) self.user_faculty_member_new_name.setObjectName("user_faculty_member_new_name") - self.formLayout_2.setWidget(2, QtWidgets.QFormLayout.ItemRole.FieldRole, self.user_faculty_member_new_name) + self.formLayout_2.setWidget( + 2, + QtWidgets.QFormLayout.ItemRole.FieldRole, + self.user_faculty_member_new_name, + ) self.gridLayout_12.addLayout(self.formLayout_2, 2, 2, 1, 1) self.formLayout_4 = QtWidgets.QFormLayout() self.formLayout_4.setObjectName("formLayout_4") - self.edit_faculty_member_title = QtWidgets.QLineEdit(parent=self.gridLayoutWidget_11) + self.edit_faculty_member_title = QtWidgets.QLineEdit( + parent=self.gridLayoutWidget_11 + ) self.edit_faculty_member_title.setFocusPolicy(QtCore.Qt.FocusPolicy.TabFocus) self.edit_faculty_member_title.setReadOnly(True) self.edit_faculty_member_title.setObjectName("edit_faculty_member_title") - self.formLayout_4.setWidget(0, QtWidgets.QFormLayout.ItemRole.LabelRole, self.edit_faculty_member_title) - self.edit_faculty_member_select_member = QtWidgets.QComboBox(parent=self.gridLayoutWidget_11) - self.edit_faculty_member_select_member.setObjectName("edit_faculty_member_select_member") - self.formLayout_4.setWidget(0, QtWidgets.QFormLayout.ItemRole.FieldRole, self.edit_faculty_member_select_member) + self.formLayout_4.setWidget( + 0, QtWidgets.QFormLayout.ItemRole.LabelRole, self.edit_faculty_member_title + ) + self.edit_faculty_member_select_member = QtWidgets.QComboBox( + parent=self.gridLayoutWidget_11 + ) + self.edit_faculty_member_select_member.setObjectName( + "edit_faculty_member_select_member" + ) + self.formLayout_4.setWidget( + 0, + QtWidgets.QFormLayout.ItemRole.FieldRole, + self.edit_faculty_member_select_member, + ) self.label_46 = QtWidgets.QLabel(parent=self.gridLayoutWidget_11) self.label_46.setObjectName("label_46") - self.formLayout_4.setWidget(1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_46) - self.faculty_member_old_telnr = QtWidgets.QLineEdit(parent=self.gridLayoutWidget_11) + self.formLayout_4.setWidget( + 1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_46 + ) + self.faculty_member_old_telnr = QtWidgets.QLineEdit( + parent=self.gridLayoutWidget_11 + ) self.faculty_member_old_telnr.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.faculty_member_old_telnr.setReadOnly(True) self.faculty_member_old_telnr.setObjectName("faculty_member_old_telnr") - self.formLayout_4.setWidget(1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.faculty_member_old_telnr) + self.formLayout_4.setWidget( + 1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.faculty_member_old_telnr + ) self.label_49 = QtWidgets.QLabel(parent=self.gridLayoutWidget_11) self.label_49.setObjectName("label_49") - self.formLayout_4.setWidget(2, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_49) - self.faculty_member_oldmail = QtWidgets.QLineEdit(parent=self.gridLayoutWidget_11) + self.formLayout_4.setWidget( + 2, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_49 + ) + self.faculty_member_oldmail = QtWidgets.QLineEdit( + parent=self.gridLayoutWidget_11 + ) self.faculty_member_oldmail.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) - self.faculty_member_oldmail.setInputMethodHints(QtCore.Qt.InputMethodHint.ImhNone) + self.faculty_member_oldmail.setInputMethodHints( + QtCore.Qt.InputMethodHint.ImhNone + ) self.faculty_member_oldmail.setReadOnly(True) self.faculty_member_oldmail.setObjectName("faculty_member_oldmail") - self.formLayout_4.setWidget(2, QtWidgets.QFormLayout.ItemRole.FieldRole, self.faculty_member_oldmail) + self.formLayout_4.setWidget( + 2, QtWidgets.QFormLayout.ItemRole.FieldRole, self.faculty_member_oldmail + ) self.gridLayout_12.addLayout(self.formLayout_4, 0, 2, 1, 1) self.formLayout_5 = QtWidgets.QFormLayout() self.formLayout_5.setObjectName("formLayout_5") self.label_47 = QtWidgets.QLabel(parent=self.gridLayoutWidget_11) self.label_47.setObjectName("label_47") - self.formLayout_5.setWidget(0, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_47) + self.formLayout_5.setWidget( + 0, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_47 + ) self.label_48 = QtWidgets.QLabel(parent=self.gridLayoutWidget_11) self.label_48.setObjectName("label_48") - self.formLayout_5.setWidget(1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_48) - self.user_faculty_member_new_mail = QtWidgets.QLineEdit(parent=self.gridLayoutWidget_11) + self.formLayout_5.setWidget( + 1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_48 + ) + self.user_faculty_member_new_mail = QtWidgets.QLineEdit( + parent=self.gridLayoutWidget_11 + ) self.user_faculty_member_new_mail.setObjectName("user_faculty_member_new_mail") - self.formLayout_5.setWidget(0, QtWidgets.QFormLayout.ItemRole.FieldRole, self.user_faculty_member_new_mail) - self.user_faculty_member_new_telnr = QtWidgets.QLineEdit(parent=self.gridLayoutWidget_11) - self.user_faculty_member_new_telnr.setObjectName("user_faculty_member_new_telnr") - self.formLayout_5.setWidget(1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.user_faculty_member_new_telnr) + self.formLayout_5.setWidget( + 0, + QtWidgets.QFormLayout.ItemRole.FieldRole, + self.user_faculty_member_new_mail, + ) + self.user_faculty_member_new_telnr = QtWidgets.QLineEdit( + parent=self.gridLayoutWidget_11 + ) + self.user_faculty_member_new_telnr.setObjectName( + "user_faculty_member_new_telnr" + ) + self.formLayout_5.setWidget( + 1, + QtWidgets.QFormLayout.ItemRole.FieldRole, + self.user_faculty_member_new_telnr, + ) self.gridLayout_12.addLayout(self.formLayout_5, 2, 4, 1, 1) self.label_41 = QtWidgets.QLabel(parent=self.gridLayoutWidget_11) self.label_41.setObjectName("label_41") self.gridLayout_12.addWidget(self.label_41, 0, 0, 1, 1) - self.update_faculty_member = QtWidgets.QPushButton(parent=self.gridLayoutWidget_11) + self.update_faculty_member = QtWidgets.QPushButton( + parent=self.gridLayoutWidget_11 + ) self.update_faculty_member.setObjectName("update_faculty_member") self.gridLayout_12.addWidget(self.update_faculty_member, 3, 4, 1, 1) self.label_42 = QtWidgets.QLabel(parent=self.gridLayoutWidget_11) @@ -1168,14 +1477,19 @@ class Ui_MainWindow(object): self.horizontalLayout_6 = QtWidgets.QHBoxLayout(self.horizontalLayoutWidget) self.horizontalLayout_6.setContentsMargins(0, 0, 0, 0) self.horizontalLayout_6.setObjectName("horizontalLayout_6") - self.frame_creation_progress = QtWidgets.QFrame(parent=self.horizontalLayoutWidget) + self.frame_creation_progress = QtWidgets.QFrame( + parent=self.horizontalLayoutWidget + ) self.frame_creation_progress.setObjectName("frame_creation_progress") self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.frame_creation_progress) self.verticalLayout_4.setSpacing(6) self.verticalLayout_4.setObjectName("verticalLayout_4") self.groupBox_2 = QtWidgets.QGroupBox(parent=self.frame_creation_progress) self.groupBox_2.setEnabled(True) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding) + sizePolicy = QtWidgets.QSizePolicy( + QtWidgets.QSizePolicy.Policy.Expanding, + QtWidgets.QSizePolicy.Policy.Expanding, + ) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.groupBox_2.sizePolicy().hasHeightForWidth()) @@ -1207,7 +1521,10 @@ class Ui_MainWindow(object): self.ids_check.setObjectName("ids_check") self.verticalLayout_4.addWidget(self.groupBox_2) self.groupBox = QtWidgets.QGroupBox(parent=self.frame_creation_progress) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding) + sizePolicy = QtWidgets.QSizePolicy( + QtWidgets.QSizePolicy.Policy.Expanding, + QtWidgets.QSizePolicy.Policy.Expanding, + ) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.groupBox.sizePolicy().hasHeightForWidth()) @@ -1264,7 +1581,13 @@ class Ui_MainWindow(object): self.btn_copy_adis_command.setAccessibleDescription("") self.btn_copy_adis_command.setAutoFillBackground(False) icon1 = QtGui.QIcon() - icon1.addPixmap(QtGui.QPixmap("c:\\Users\\aky547\\GitHub\\SemesterapparatsManager\\src\\ui\\../../../../../../.designer/backup/icons/information.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) + icon1.addPixmap( + QtGui.QPixmap( + "c:\\Users\\aky547\\GitHub\\SemesterapparatsManager\\src\\ui\\../../../../../../.designer/backup/icons/information.png" + ), + QtGui.QIcon.Mode.Normal, + QtGui.QIcon.State.Off, + ) self.btn_copy_adis_command.setIcon(icon1) self.btn_copy_adis_command.setCheckable(False) self.btn_copy_adis_command.setChecked(False) @@ -1281,7 +1604,9 @@ class Ui_MainWindow(object): self.calendarWidget.setGeometry(QtCore.QRect(0, 0, 291, 191)) self.calendarWidget.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) self.calendarWidget.setGridVisible(True) - self.calendarWidget.setVerticalHeaderFormat(QtWidgets.QCalendarWidget.VerticalHeaderFormat.NoVerticalHeader) + self.calendarWidget.setVerticalHeaderFormat( + QtWidgets.QCalendarWidget.VerticalHeaderFormat.NoVerticalHeader + ) self.calendarWidget.setObjectName("calendarWidget") self.message_frame = QtWidgets.QFrame(parent=self.frame_2) self.message_frame.setGeometry(QtCore.QRect(0, 210, 301, 121)) @@ -1326,17 +1651,24 @@ class Ui_MainWindow(object): self.statusbar.setObjectName("statusbar") MainWindow.setStatusBar(self.statusbar) self.actionBeenden = QtGui.QAction(parent=MainWindow) + self.actionBeenden.setMenuRole(QtGui.QAction.MenuRole.QuitRole) self.actionBeenden.setShortcutVisibleInContextMenu(True) self.actionBeenden.setObjectName("actionBeenden") self.actionEinstellungen = QtGui.QAction(parent=MainWindow) self.actionEinstellungen.setShortcutVisibleInContextMenu(True) self.actionEinstellungen.setObjectName("actionEinstellungen") self.actionDokumentation = QtGui.QAction(parent=MainWindow) - self.actionDokumentation.setShortcutContext(QtCore.Qt.ShortcutContext.ApplicationShortcut) + self.actionDokumentation.setShortcutContext( + QtCore.Qt.ShortcutContext.ApplicationShortcut + ) self.actionDokumentation.setObjectName("actionDokumentation") + self.actionAbout = QtGui.QAction(parent=MainWindow) + self.actionAbout.setMenuRole(QtGui.QAction.MenuRole.AboutRole) + self.actionAbout.setObjectName("actionAbout") self.menuDatei.addAction(self.actionBeenden) self.menuEinstellungen.addAction(self.actionEinstellungen) self.menuHelp.addAction(self.actionDokumentation) + self.menuHelp.addAction(self.actionAbout) self.menubar.addAction(self.menuDatei.menuAction()) self.menubar.addAction(self.menuEinstellungen.menuAction()) self.menubar.addAction(self.menuHelp.menuAction()) @@ -1346,8 +1678,8 @@ class Ui_MainWindow(object): self.tabWidget_2.setCurrentIndex(0) self.stackedWidget_4.setCurrentIndex(0) self.tabWidget_3.setCurrentIndex(0) - self.elsa_semester.textChanged['QString'].connect(self.active_semester.hide) # type: ignore - self.elsa_semester.textChanged['QString'].connect(self.active_semester.show) # type: ignore + self.elsa_semester.textChanged["QString"].connect(self.active_semester.hide) # type: ignore + self.elsa_semester.textChanged["QString"].connect(self.active_semester.show) # type: ignore QtCore.QMetaObject.connectSlotsByName(MainWindow) MainWindow.setTabOrder(self.btn_add_document, self.btn_open_document) MainWindow.setTabOrder(self.btn_open_document, self.check_file) @@ -1356,24 +1688,50 @@ class Ui_MainWindow(object): MainWindow.setTabOrder(self.seach_by_signature, self.search_by_title) MainWindow.setTabOrder(self.search_by_title, self.select_action_box) MainWindow.setTabOrder(self.select_action_box, self.user_create_frame_username) - MainWindow.setTabOrder(self.user_create_frame_username, self.user_frame_userrole) - MainWindow.setTabOrder(self.user_frame_userrole, self.user_create_frame_password) + MainWindow.setTabOrder( + self.user_create_frame_username, self.user_frame_userrole + ) + MainWindow.setTabOrder( + self.user_frame_userrole, self.user_create_frame_password + ) MainWindow.setTabOrder(self.user_create_frame_password, self.user_frame_addUser) - MainWindow.setTabOrder(self.user_frame_addUser, self.user_delete_frame_user_select) - MainWindow.setTabOrder(self.user_delete_frame_user_select, self.user_delete_confirm) + MainWindow.setTabOrder( + self.user_frame_addUser, self.user_delete_frame_user_select + ) + MainWindow.setTabOrder( + self.user_delete_frame_user_select, self.user_delete_confirm + ) MainWindow.setTabOrder(self.user_delete_confirm, self.pushButton) MainWindow.setTabOrder(self.pushButton, self.user_edit_frame_user_select) - MainWindow.setTabOrder(self.user_edit_frame_user_select, self.user_edit_frame_role_select) - MainWindow.setTabOrder(self.user_edit_frame_role_select, self.user_edit_frame_new_password) + MainWindow.setTabOrder( + self.user_edit_frame_user_select, self.user_edit_frame_role_select + ) + MainWindow.setTabOrder( + self.user_edit_frame_role_select, self.user_edit_frame_new_password + ) MainWindow.setTabOrder(self.user_edit_frame_new_password, self.update_user) MainWindow.setTabOrder(self.update_user, self.edit_faculty_member_title) - MainWindow.setTabOrder(self.edit_faculty_member_title, self.edit_faculty_member_select_member) - MainWindow.setTabOrder(self.edit_faculty_member_select_member, self.edit_faculty_member_new_title) - MainWindow.setTabOrder(self.edit_faculty_member_new_title, self.edit_faculty_member_new_surname) - MainWindow.setTabOrder(self.edit_faculty_member_new_surname, self.user_faculty_member_new_name) - MainWindow.setTabOrder(self.user_faculty_member_new_name, self.user_faculty_member_new_mail) - MainWindow.setTabOrder(self.user_faculty_member_new_mail, self.user_faculty_member_new_telnr) - MainWindow.setTabOrder(self.user_faculty_member_new_telnr, self.update_faculty_member) + MainWindow.setTabOrder( + self.edit_faculty_member_title, self.edit_faculty_member_select_member + ) + MainWindow.setTabOrder( + self.edit_faculty_member_select_member, self.edit_faculty_member_new_title + ) + MainWindow.setTabOrder( + self.edit_faculty_member_new_title, self.edit_faculty_member_new_surname + ) + MainWindow.setTabOrder( + self.edit_faculty_member_new_surname, self.user_faculty_member_new_name + ) + MainWindow.setTabOrder( + self.user_faculty_member_new_name, self.user_faculty_member_new_mail + ) + MainWindow.setTabOrder( + self.user_faculty_member_new_mail, self.user_faculty_member_new_telnr + ) + MainWindow.setTabOrder( + self.user_faculty_member_new_telnr, self.update_faculty_member + ) MainWindow.setTabOrder(self.update_faculty_member, self.box_fach) MainWindow.setTabOrder(self.box_fach, self.box_person) MainWindow.setTabOrder(self.box_person, self.btn_search) @@ -1392,11 +1750,17 @@ class Ui_MainWindow(object): def retranslateUi(self, MainWindow): _translate = QtCore.QCoreApplication.translate - MainWindow.setWindowTitle(_translate("MainWindow", "Semesterapparatsmanagement")) - self.load_app.setToolTip(_translate("MainWindow", "Load the Semesterapparate from the database")) + MainWindow.setWindowTitle( + _translate("MainWindow", "Semesterapparatsmanagement") + ) + self.load_app.setToolTip( + _translate("MainWindow", "Load the Semesterapparate from the database") + ) self.load_app.setText(_translate("MainWindow", "App. aufrufen")) self.create_new_app.setText(_translate("MainWindow", "neu. App anlegen")) - self.cancel_active_selection.setText(_translate("MainWindow", "Auswahl abbrechen")) + self.cancel_active_selection.setText( + _translate("MainWindow", "Auswahl abbrechen") + ) self.tableWidget_apparate.setSortingEnabled(False) item = self.tableWidget_apparate.horizontalHeaderItem(0) item.setText(_translate("MainWindow", "AppNr")) @@ -1410,7 +1774,9 @@ class Ui_MainWindow(object): item.setText(_translate("MainWindow", "Dauerapparat")) item = self.tableWidget_apparate.horizontalHeaderItem(5) item.setText(_translate("MainWindow", "KontoNr")) - self.chkbx_show_del_media.setText(_translate("MainWindow", "gel. Medien anzeigen")) + self.chkbx_show_del_media.setText( + _translate("MainWindow", "gel. Medien anzeigen") + ) self.btn_reserve.setText(_translate("MainWindow", "im Apparat?")) self.label_info.setText(_translate("MainWindow", "Medien werden hinzugefügt")) self.progress_label.setText(_translate("MainWindow", "Medium x/y")) @@ -1419,7 +1785,12 @@ class Ui_MainWindow(object): self.tableWidget_apparat_media.setSortingEnabled(True) item = self.tableWidget_apparat_media.horizontalHeaderItem(0) item.setText(_translate("MainWindow", "Buchtitel")) - item.setToolTip(_translate("MainWindow", "Es kann sein, dass der Buchtitel leer ist, dies kommt vor, wenn der Titel nicht passend formatiert ist")) + item.setToolTip( + _translate( + "MainWindow", + "Es kann sein, dass der Buchtitel leer ist, dies kommt vor, wenn der Titel nicht passend formatiert ist", + ) + ) item = self.tableWidget_apparat_media.horizontalHeaderItem(1) item.setText(_translate("MainWindow", "Signatur")) item = self.tableWidget_apparat_media.horizontalHeaderItem(2) @@ -1428,7 +1799,12 @@ class Ui_MainWindow(object): item.setText(_translate("MainWindow", "Autor")) item = self.tableWidget_apparat_media.horizontalHeaderItem(4) item.setText(_translate("MainWindow", "im Apparat?")) - item.setToolTip(_translate("MainWindow", "Diese Angabe ist nicht zuverlässig. Ist das ❌ vorhanden, kann das Medium im Apparat sein, aber aufgrund eines Bugs nicht gefunden worden")) + item.setToolTip( + _translate( + "MainWindow", + "Diese Angabe ist nicht zuverlässig. Ist das ❌ vorhanden, kann das Medium im Apparat sein, aber aufgrund eines Bugs nicht gefunden worden", + ) + ) item = self.tableWidget_apparat_media.horizontalHeaderItem(5) item.setText(_translate("MainWindow", "Vorgemerkt")) item = self.tableWidget_apparat_media.horizontalHeaderItem(6) @@ -1443,9 +1819,15 @@ class Ui_MainWindow(object): item.setText(_translate("MainWindow", "Neu?")) item = self.dokument_list.horizontalHeaderItem(3) item.setText(_translate("MainWindow", "path")) - self.check_file.setToolTip(_translate("MainWindow", "Abhängig von der Anzahl der Medien kann die Suche sehr lange dauern")) - self.check_file.setText(_translate("MainWindow", "Medien aus Dokument\n" -" hinzufügen")) + self.check_file.setToolTip( + _translate( + "MainWindow", + "Abhängig von der Anzahl der Medien kann die Suche sehr lange dauern", + ) + ) + self.check_file.setText( + _translate("MainWindow", "Medien aus Dokument\n" " hinzufügen") + ) self.btn_open_document.setText(_translate("MainWindow", "Dokument öffnen")) self.btn_add_document.setText(_translate("MainWindow", "Dokument hinzufügen")) self.appname_mand.setText(_translate("MainWindow", "*")) @@ -1473,7 +1855,9 @@ class Ui_MainWindow(object): self.label_5.setText(_translate("MainWindow", "Apparatsname")) self.label_6.setText(_translate("MainWindow", "Semester")) self.add_medium.setText(_translate("MainWindow", "Medien hinzufügen")) - self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), _translate("MainWindow", "Anlegen")) + self.tabWidget.setTabText( + self.tabWidget.indexOf(self.tab), _translate("MainWindow", "Anlegen") + ) self.btn_search.setText(_translate("MainWindow", "Suchen")) self.label_7.setText(_translate("MainWindow", "Appnr.:")) self.label_18.setText(_translate("MainWindow", "Dauerapp:")) @@ -1482,21 +1866,34 @@ class Ui_MainWindow(object): self.label_11.setText(_translate("MainWindow", "Person:")) self.label_16.setText(_translate("MainWindow", "Fach:")) self.label_15.setText(_translate("MainWindow", "Löschbar")) - self.tabWidget_2.setTabText(self.tabWidget_2.indexOf(self.tab_3), _translate("MainWindow", "Statistik")) + self.tabWidget_2.setTabText( + self.tabWidget_2.indexOf(self.tab_3), _translate("MainWindow", "Statistik") + ) self.label_25.setText(_translate("MainWindow", "Signatur")) self.book_search.setText(_translate("MainWindow", "Suche")) self.label_26.setText(_translate("MainWindow", "Titel")) - self.tabWidget_2.setTabText(self.tabWidget_2.indexOf(self.tab_4), _translate("MainWindow", "Suchen")) + self.tabWidget_2.setTabText( + self.tabWidget_2.indexOf(self.tab_4), _translate("MainWindow", "Suchen") + ) item = self.statistics_table.horizontalHeaderItem(0) item.setText(_translate("MainWindow", "Semester")) item = self.statistics_table.horizontalHeaderItem(1) item.setText(_translate("MainWindow", "Zugang")) item = self.statistics_table.horizontalHeaderItem(2) item.setText(_translate("MainWindow", "Abgang")) - self.tabWidget_3.setTabText(self.tabWidget_3.indexOf(self.tab_6), _translate("MainWindow", "Tabelle")) - self.tabWidget_3.setTabText(self.tabWidget_3.indexOf(self.tab_7), _translate("MainWindow", "Erstellte und gelöschte Semesterapparate")) - self.btn_del_select_apparats.setText(_translate("MainWindow", "Ausgewählte Löschen")) - self.btn_notify_for_deletion.setText(_translate("MainWindow", "Ausgewählte Benachrichtigen")) + self.tabWidget_3.setTabText( + self.tabWidget_3.indexOf(self.tab_6), _translate("MainWindow", "Tabelle") + ) + self.tabWidget_3.setTabText( + self.tabWidget_3.indexOf(self.tab_7), + _translate("MainWindow", "Erstellte und gelöschte Semesterapparate"), + ) + self.btn_del_select_apparats.setText( + _translate("MainWindow", "Ausgewählte Löschen") + ) + self.btn_notify_for_deletion.setText( + _translate("MainWindow", "Ausgewählte Benachrichtigen") + ) self.tableWidget.setSortingEnabled(True) item = self.tableWidget.horizontalHeaderItem(1) item.setText(_translate("MainWindow", "Apparatsname")) @@ -1512,7 +1909,10 @@ class Ui_MainWindow(object): item.setText(_translate("MainWindow", "Signatur")) item = self.book_search_result.horizontalHeaderItem(2) item.setText(_translate("MainWindow", "Apparat")) - self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), _translate("MainWindow", "Suchen / Statistik")) + self.tabWidget.setTabText( + self.tabWidget.indexOf(self.tab_2), + _translate("MainWindow", "Suchen / Statistik"), + ) self.elsa_save.setText(_translate("MainWindow", "Speichern")) item = self.dokument_list_elsa.horizontalHeaderItem(0) item.setText(_translate("MainWindow", "Dokumentname")) @@ -1522,15 +1922,24 @@ class Ui_MainWindow(object): item.setText(_translate("MainWindow", "Neu?")) item = self.dokument_list_elsa.horizontalHeaderItem(3) item.setText(_translate("MainWindow", "path")) - self.check_file_elsa.setToolTip(_translate("MainWindow", "Abhängig von der Anzahl der Medien kann die Suche sehr lange dauern")) - self.check_file_elsa.setText(_translate("MainWindow", "Medien aus Dokument\n" -" hinzufügen")) + self.check_file_elsa.setToolTip( + _translate( + "MainWindow", + "Abhängig von der Anzahl der Medien kann die Suche sehr lange dauern", + ) + ) + self.check_file_elsa.setText( + _translate("MainWindow", "Medien aus Dokument\n" " hinzufügen") + ) self.btn_open_document_elsa.setText(_translate("MainWindow", "Dokument öffnen")) - self.btn_add_document_elsa.setText(_translate("MainWindow", "Dokument hinzufügen")) - self.elsa_date_today.setText(_translate("MainWindow", "📆 heute")) + self.btn_add_document_elsa.setText( + _translate("MainWindow", "Dokument hinzufügen") + ) self.label_29.setText(_translate("MainWindow", "Semester")) self.label_27.setText(_translate("MainWindow", "Professor")) - self.elsa_prof.setPlaceholderText(_translate("MainWindow", "Vollständiger Name")) + self.elsa_prof.setPlaceholderText( + _translate("MainWindow", "Vollständiger Name") + ) self.label_28.setText(_translate("MainWindow", "Auftragsdatum")) item = self.table_elsa_list.horizontalHeaderItem(0) item.setText(_translate("MainWindow", "Kapiteltitel")) @@ -1544,7 +1953,10 @@ class Ui_MainWindow(object): item.setText(_translate("MainWindow", "Semester")) item = self.elsa_statistics_table.horizontalHeaderItem(1) item.setText(_translate("MainWindow", "Zugang")) - self.elsa_statistics.setTabText(self.elsa_statistics.indexOf(self.tab_9), _translate("MainWindow", "Tabelle")) + self.elsa_statistics.setTabText( + self.elsa_statistics.indexOf(self.tab_9), + _translate("MainWindow", "Tabelle"), + ) self.elsa_cancel_create.setText(_translate("MainWindow", "Abbrechen")) self.elsa_add_new.setText(_translate("MainWindow", "Neuer Auftrag")) item = self.elsa_table.horizontalHeaderItem(0) @@ -1553,12 +1965,22 @@ class Ui_MainWindow(object): item.setText(_translate("MainWindow", "Datum")) item = self.elsa_table.horizontalHeaderItem(2) item.setText(_translate("MainWindow", "Semester")) - self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_8), _translate("MainWindow", "ELSA")) + self.tabWidget.setTabText( + self.tabWidget.indexOf(self.tab_8), _translate("MainWindow", "ELSA") + ) self.label_21.setText(_translate("MainWindow", "Aktion:")) - self.select_action_box.setItemText(0, _translate("MainWindow", "Nutzer anlegen")) - self.select_action_box.setItemText(1, _translate("MainWindow", "Nutzer löschen")) - self.select_action_box.setItemText(2, _translate("MainWindow", "Nutzer aktualisieren")) - self.select_action_box.setItemText(3, _translate("MainWindow", "Lehrperson bearbeiten")) + self.select_action_box.setItemText( + 0, _translate("MainWindow", "Nutzer anlegen") + ) + self.select_action_box.setItemText( + 1, _translate("MainWindow", "Nutzer löschen") + ) + self.select_action_box.setItemText( + 2, _translate("MainWindow", "Nutzer aktualisieren") + ) + self.select_action_box.setItemText( + 3, _translate("MainWindow", "Lehrperson bearbeiten") + ) self.label_22.setText(_translate("MainWindow", "Nutzername")) self.label_24.setText(_translate("MainWindow", "Rolle")) self.label_23.setText(_translate("MainWindow", "Passwort")) @@ -1580,16 +2002,27 @@ class Ui_MainWindow(object): self.label_41.setText(_translate("MainWindow", "Alte Angaben")) self.update_faculty_member.setText(_translate("MainWindow", "Aktualisieren")) self.label_42.setText(_translate("MainWindow", "Neue Angaben")) - self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_5), _translate("MainWindow", "Admin")) + self.tabWidget.setTabText( + self.tabWidget.indexOf(self.tab_5), _translate("MainWindow", "Admin") + ) self.groupBox_2.setTitle(_translate("MainWindow", "Software")) self.appdata_check.setText(_translate("MainWindow", "Apparatsdaten eingegeben")) - self.media_check.setText(_translate("MainWindow", "Medien hinzugefügt / importiert")) - self.ids_check.setText(_translate("MainWindow", "Prof-ID und Apparat-ID eingetragen")) + self.media_check.setText( + _translate("MainWindow", "Medien hinzugefügt / importiert") + ) + self.ids_check.setText( + _translate("MainWindow", "Prof-ID und Apparat-ID eingetragen") + ) self.groupBox.setTitle(_translate("MainWindow", "aDIS")) self.media_checked.setText(_translate("MainWindow", "Medien geprüft")) self.media_edited_check.setText(_translate("MainWindow", "Medien bearbeitet")) self.app_created.setText(_translate("MainWindow", "Apparat angelegt")) - self.btn_copy_adis_command.setToolTip(_translate("MainWindow", "Hier klicken, um die aDIS Abfrage in die Zwischenablage zu kopieren")) + self.btn_copy_adis_command.setToolTip( + _translate( + "MainWindow", + "Hier klicken, um die aDIS Abfrage in die Zwischenablage zu kopieren", + ) + ) self.btn_copy_adis_command.setText(_translate("MainWindow", " aDIS Abfrage")) self.label_14.setText(_translate("MainWindow", "Apparat")) self.btn_delete_message.setText(_translate("MainWindow", "Löschen")) @@ -1603,3 +2036,4 @@ class Ui_MainWindow(object): self.actionEinstellungen.setShortcut(_translate("MainWindow", "Alt+S")) self.actionDokumentation.setText(_translate("MainWindow", "Dokumentation")) self.actionDokumentation.setShortcut(_translate("MainWindow", "F1")) + self.actionAbout.setText(_translate("MainWindow", "About")) diff --git a/src/ui/dialogs/__init__.py b/src/ui/dialogs/__init__.py index 9d86018..b2a7368 100644 --- a/src/ui/dialogs/__init__.py +++ b/src/ui/dialogs/__init__.py @@ -1,14 +1,19 @@ from .app_ext import Ui_Dialog as App_Ext_Dialog -from .ext_app import Ui_Frame as App_Ext_Window -from .mail import Mail_Dialog -from .popup_confirm import Ui_extend_confirm as popus_confirm -from .settings import Settings from .bookdata import BookDataUI as edit_bookdata_ui +from .dialog_sources.newMailTemplateDesigner_ui import ( + Ui_Dialog as NewMailTemplateDesignerDialog, +) +from .dialog_sources.Ui_mail_preview import Ui_eMailPreview as MailPreviewDialog +from .ext_app import Ui_Frame as App_Ext_Window from .fileparser import FileParserDialog as fileparser_ui from .login import LoginDialog as login_ui +from .mail import Mail_Dialog +from .mailTemplate import MailTemplateDialog from .medienadder import MedienAdder as medienadder_ui from .parsed_titles import ParsedTitles as parsed_titles_ui +from .popup_confirm import Ui_extend_confirm as popus_confirm from .reminder import ReminderDialog as reminder_ui +from .settings import Settings from .settings import Settings as settings_ui __all__ = [ diff --git a/src/ui/dialogs/bookdata.py b/src/ui/dialogs/bookdata.py index 1739071..68ccf95 100644 --- a/src/ui/dialogs/bookdata.py +++ b/src/ui/dialogs/bookdata.py @@ -1,13 +1,15 @@ -from .dialog_sources.Ui_edit_bookdata import Ui_Dialog -from PyQt6 import QtWidgets, QtCore +from PyQt6 import QtCore, QtWidgets + from src.logic.dataclass import BookData +from .dialog_sources.Ui_edit_bookdata import Ui_Dialog + + class BookDataUI(QtWidgets.QDialog, Ui_Dialog): def __init__(self, parent=None): super().__init__(parent) self.setupUi(self) - - + def populate_fields(self, data: BookData): self.line_author.setText(data.author) self.line_edition.setText(data.edition) @@ -34,4 +36,4 @@ class BookDataUI(QtWidgets.QDialog, Ui_Dialog): publisher=self.line_publisher.text().strip(), year=self.line_year.text().strip(), pages=self.line_pages.text().strip(), - ) \ No newline at end of file + ) diff --git a/src/ui/dialogs/dialog_sources/Ui_confirm_extend.py b/src/ui/dialogs/dialog_sources/Ui_confirm_extend.py new file mode 100644 index 0000000..0d4c620 --- /dev/null +++ b/src/ui/dialogs/dialog_sources/Ui_confirm_extend.py @@ -0,0 +1,35 @@ +# Form implementation generated from reading ui file 'c:\Users\aky547\GitHub\SemesterapparatsManager\src\ui\dialogs\dialog_sources\confirm_extend.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_extend_confirm(object): + def setupUi(self, extend_confirm): + extend_confirm.setObjectName("extend_confirm") + extend_confirm.resize(380, 97) + self.buttonBox = QtWidgets.QDialogButtonBox(parent=extend_confirm) + self.buttonBox.setGeometry(QtCore.QRect(290, 20, 81, 241)) + self.buttonBox.setOrientation(QtCore.Qt.Orientation.Vertical) + self.buttonBox.setStandardButtons( + QtWidgets.QDialogButtonBox.StandardButton.Cancel + | QtWidgets.QDialogButtonBox.StandardButton.Ok + ) + self.buttonBox.setObjectName("buttonBox") + self.textEdit = QtWidgets.QTextEdit(parent=extend_confirm) + self.textEdit.setGeometry(QtCore.QRect(10, 10, 271, 81)) + self.textEdit.setObjectName("textEdit") + + self.retranslateUi(extend_confirm) + self.buttonBox.accepted.connect(extend_confirm.accept) # type: ignore + self.buttonBox.rejected.connect(extend_confirm.reject) # type: ignore + QtCore.QMetaObject.connectSlotsByName(extend_confirm) + + def retranslateUi(self, extend_confirm): + _translate = QtCore.QCoreApplication.translate + extend_confirm.setWindowTitle(_translate("extend_confirm", "Dialog")) diff --git a/src/ui/dialogs/dialog_sources/Ui_login.py b/src/ui/dialogs/dialog_sources/Ui_login.py index 53cde13..ff7dcd0 100644 --- a/src/ui/dialogs/dialog_sources/Ui_login.py +++ b/src/ui/dialogs/dialog_sources/Ui_login.py @@ -14,7 +14,11 @@ class Ui_Dialog(object): Dialog.setObjectName("Dialog") Dialog.resize(218, 190) icon = QtGui.QIcon() - icon.addPixmap(QtGui.QPixmap(":/icons/resources/1f510.svg"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) + icon.addPixmap( + QtGui.QPixmap(":/icons/resources/1f510.svg"), + QtGui.QIcon.Mode.Normal, + QtGui.QIcon.State.Off, + ) Dialog.setWindowIcon(icon) self.label = QtWidgets.QLabel(parent=Dialog) self.label.setGeometry(QtCore.QRect(20, 40, 71, 21)) @@ -39,7 +43,6 @@ class Ui_Dialog(object): self.retranslateUi(Dialog) QtCore.QMetaObject.connectSlotsByName(Dialog) - def retranslateUi(self, Dialog): _translate = QtCore.QCoreApplication.translate diff --git a/src/ui/dialogs/dialog_sources/Ui_mail_preview.py b/src/ui/dialogs/dialog_sources/Ui_mail_preview.py index cf6d8f2..b28a790 100644 --- a/src/ui/dialogs/dialog_sources/Ui_mail_preview.py +++ b/src/ui/dialogs/dialog_sources/Ui_mail_preview.py @@ -14,7 +14,13 @@ class Ui_eMailPreview(object): eMailPreview.setObjectName("eMailPreview") eMailPreview.resize(700, 668) icon = QtGui.QIcon() - icon.addPixmap(QtGui.QPixmap("c:\\Users\\aky547\\GitHub\\SemesterapparatsManager\\src\\ui\\dialogs\\dialog_sources\\../../../../../../icons/email.svg"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) + icon.addPixmap( + QtGui.QPixmap( + "c:\\Users\\aky547\\GitHub\\SemesterapparatsManager\\src\\ui\\dialogs\\dialog_sources\\../../../../../../icons/email.svg" + ), + QtGui.QIcon.Mode.Normal, + QtGui.QIcon.State.Off, + ) eMailPreview.setWindowIcon(icon) self.gridLayout_2 = QtWidgets.QGridLayout(eMailPreview) self.gridLayout_2.setObjectName("gridLayout_2") @@ -67,11 +73,20 @@ class Ui_eMailPreview(object): self.gender_non = QtWidgets.QRadioButton(parent=eMailPreview) self.gender_non.setObjectName("gender_non") self.horizontalLayout_3.addWidget(self.gender_non) - spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + spacerItem = QtWidgets.QSpacerItem( + 40, + 20, + QtWidgets.QSizePolicy.Policy.Expanding, + QtWidgets.QSizePolicy.Policy.Minimum, + ) self.horizontalLayout_3.addItem(spacerItem) self.gridLayout.addLayout(self.horizontalLayout_3, 4, 2, 1, 1) self.label_3 = QtWidgets.QLabel(parent=eMailPreview) - self.label_3.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft|QtCore.Qt.AlignmentFlag.AlignTop) + self.label_3.setAlignment( + QtCore.Qt.AlignmentFlag.AlignLeading + | QtCore.Qt.AlignmentFlag.AlignLeft + | QtCore.Qt.AlignmentFlag.AlignTop + ) self.label_3.setObjectName("label_3") self.gridLayout.addWidget(self.label_3, 5, 0, 1, 1) self.label = QtWidgets.QLabel(parent=eMailPreview) @@ -79,7 +94,12 @@ class Ui_eMailPreview(object): self.gridLayout.addWidget(self.label, 1, 0, 1, 1) self.horizontalLayout_2 = QtWidgets.QHBoxLayout() self.horizontalLayout_2.setObjectName("horizontalLayout_2") - spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + spacerItem1 = QtWidgets.QSpacerItem( + 40, + 20, + QtWidgets.QSizePolicy.Policy.Expanding, + QtWidgets.QSizePolicy.Policy.Minimum, + ) self.horizontalLayout_2.addItem(spacerItem1) self.btn_okay = QtWidgets.QPushButton(parent=eMailPreview) self.btn_okay.setStatusTip("") @@ -87,7 +107,9 @@ class Ui_eMailPreview(object): self.horizontalLayout_2.addWidget(self.btn_okay) self.buttonBox = QtWidgets.QDialogButtonBox(parent=eMailPreview) self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal) - self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel) + self.buttonBox.setStandardButtons( + QtWidgets.QDialogButtonBox.StandardButton.Cancel + ) self.buttonBox.setCenterButtons(True) self.buttonBox.setObjectName("buttonBox") self.horizontalLayout_2.addWidget(self.buttonBox) @@ -95,8 +117,8 @@ class Ui_eMailPreview(object): self.gridLayout_2.addLayout(self.gridLayout, 0, 0, 1, 1) self.retranslateUi(eMailPreview) - self.buttonBox.accepted.connect(eMailPreview.accept) # type: ignore - self.buttonBox.rejected.connect(eMailPreview.reject) # type: ignore + self.buttonBox.accepted.connect(eMailPreview.accept) # type: ignore + self.buttonBox.rejected.connect(eMailPreview.reject) # type: ignore QtCore.QMetaObject.connectSlotsByName(eMailPreview) def retranslateUi(self, eMailPreview): diff --git a/src/ui/dialogs/dialog_sources/Ui_medianadder.py b/src/ui/dialogs/dialog_sources/Ui_medianadder.py index c00430f..5b4dbe8 100644 --- a/src/ui/dialogs/dialog_sources/Ui_medianadder.py +++ b/src/ui/dialogs/dialog_sources/Ui_medianadder.py @@ -14,7 +14,13 @@ class Ui_Dialog(object): Dialog.setObjectName("Dialog") Dialog.resize(637, 491) icon = QtGui.QIcon() - icon.addPixmap(QtGui.QPixmap("c:\\Users\\aky547\\GitHub\\SemesterapparatsManager\\src\\ui\\dialogs\\../../../../../Desktop/2795.svg"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) + icon.addPixmap( + QtGui.QPixmap( + "c:\\Users\\aky547\\GitHub\\SemesterapparatsManager\\src\\ui\\dialogs\\../../../../../Desktop/2795.svg" + ), + QtGui.QIcon.Mode.Normal, + QtGui.QIcon.State.Off, + ) Dialog.setWindowIcon(icon) self.label = QtWidgets.QLabel(parent=Dialog) self.label.setGeometry(QtCore.QRect(20, 10, 47, 21)) @@ -45,12 +51,22 @@ class Ui_Dialog(object): self.treeWidget.setAutoFillBackground(False) self.treeWidget.setLineWidth(0) self.treeWidget.setMidLineWidth(0) - self.treeWidget.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarPolicy.ScrollBarAlwaysOff) - self.treeWidget.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarPolicy.ScrollBarAlwaysOff) - self.treeWidget.setSizeAdjustPolicy(QtWidgets.QAbstractScrollArea.SizeAdjustPolicy.AdjustToContents) - self.treeWidget.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) + self.treeWidget.setVerticalScrollBarPolicy( + QtCore.Qt.ScrollBarPolicy.ScrollBarAlwaysOff + ) + self.treeWidget.setHorizontalScrollBarPolicy( + QtCore.Qt.ScrollBarPolicy.ScrollBarAlwaysOff + ) + self.treeWidget.setSizeAdjustPolicy( + QtWidgets.QAbstractScrollArea.SizeAdjustPolicy.AdjustToContents + ) + self.treeWidget.setEditTriggers( + QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers + ) self.treeWidget.setAlternatingRowColors(True) - self.treeWidget.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.NoSelection) + self.treeWidget.setSelectionMode( + QtWidgets.QAbstractItemView.SelectionMode.NoSelection + ) self.treeWidget.setTextElideMode(QtCore.Qt.TextElideMode.ElideMiddle) self.treeWidget.setUniformRowHeights(True) self.treeWidget.setItemsExpandable(False) @@ -83,7 +99,9 @@ class Ui_Dialog(object): self.treeWidget.header().setStretchLastSection(False) self.listWidget = QtWidgets.QListWidget(parent=Dialog) self.listWidget.setGeometry(QtCore.QRect(10, 90, 281, 341)) - self.listWidget.setContextMenuPolicy(QtCore.Qt.ContextMenuPolicy.CustomContextMenu) + self.listWidget.setContextMenuPolicy( + QtCore.Qt.ContextMenuPolicy.CustomContextMenu + ) self.listWidget.setObjectName("listWidget") self.label_4 = QtWidgets.QLabel(parent=Dialog) self.label_4.setGeometry(QtCore.QRect(330, 50, 181, 21)) @@ -97,7 +115,10 @@ class Ui_Dialog(object): self.buttonBox = QtWidgets.QDialogButtonBox(parent=Dialog) self.buttonBox.setGeometry(QtCore.QRect(10, 450, 156, 23)) self.buttonBox.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) - self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok) + self.buttonBox.setStandardButtons( + QtWidgets.QDialogButtonBox.StandardButton.Cancel + | QtWidgets.QDialogButtonBox.StandardButton.Ok + ) self.buttonBox.setCenterButtons(False) self.buttonBox.setObjectName("buttonBox") self.l_add = QtWidgets.QPushButton(parent=Dialog) @@ -105,14 +126,18 @@ class Ui_Dialog(object): self.l_add.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.l_add.setText("") icon1 = QtGui.QIcon() - icon1.addPixmap(QtGui.QPixmap(":/information/icons/information.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) + icon1.addPixmap( + QtGui.QPixmap(":/information/icons/information.png"), + QtGui.QIcon.Mode.Normal, + QtGui.QIcon.State.Off, + ) self.l_add.setIcon(icon1) self.l_add.setAutoDefault(False) self.l_add.setObjectName("l_add") self.retranslateUi(Dialog) - self.buttonBox.accepted.connect(Dialog.accept) # type: ignore - self.buttonBox.rejected.connect(Dialog.reject) # type: ignore + self.buttonBox.accepted.connect(Dialog.accept) # type: ignore + self.buttonBox.rejected.connect(Dialog.reject) # type: ignore QtCore.QMetaObject.connectSlotsByName(Dialog) Dialog.setTabOrder(self.lineEdit, self.comboBox) Dialog.setTabOrder(self.comboBox, self.listWidget) @@ -129,7 +154,9 @@ class Ui_Dialog(object): self.comboBox.setItemText(3, _translate("Dialog", "RIS")) self.lineEdit.setPlaceholderText(_translate("Dialog", "Signatur / ISBN")) self.label_3.setText(_translate("Dialog", "Queue")) - self.treeWidget.headerItem().setText(0, _translate("Dialog", "Datensatz\\Metadata")) + self.treeWidget.headerItem().setText( + 0, _translate("Dialog", "Datensatz\\Metadata") + ) self.treeWidget.headerItem().setText(1, _translate("Dialog", "Array")) self.treeWidget.headerItem().setText(2, _translate("Dialog", "BibTeX")) self.treeWidget.headerItem().setText(3, _translate("Dialog", "COinS")) @@ -195,5 +222,9 @@ class Ui_Dialog(object): self.label_4.setText(_translate("Dialog", "Belegbare Felder per Anbieter")) self.label_5.setText(_translate("Dialog", "Anzahl:")) self.list_amount.setText(_translate("Dialog", "0")) - self.l_add.setToolTip(_translate("Dialog", "Clicken oder Shift Enter drücken um den Eintrag hinzuzufügen")) + self.l_add.setToolTip( + _translate( + "Dialog", "Clicken oder Shift Enter drücken um den Eintrag hinzuzufügen" + ) + ) self.l_add.setShortcut(_translate("Dialog", "Shift+Return")) diff --git a/src/ui/dialogs/dialog_sources/Ui_newMailTemplateDesigner.py b/src/ui/dialogs/dialog_sources/Ui_newMailTemplateDesigner.py index 35b0d71..b36190c 100644 --- a/src/ui/dialogs/dialog_sources/Ui_newMailTemplateDesigner.py +++ b/src/ui/dialogs/dialog_sources/Ui_newMailTemplateDesigner.py @@ -57,7 +57,12 @@ class Ui_Dialog(object): self.fontSize.addItem("") self.fontSize.addItem("") self.horizontalLayout_2.addWidget(self.fontSize) - spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + spacerItem = QtWidgets.QSpacerItem( + 40, + 20, + QtWidgets.QSizePolicy.Policy.Expanding, + QtWidgets.QSizePolicy.Policy.Minimum, + ) self.horizontalLayout_2.addItem(spacerItem) self.verticalLayout.addLayout(self.horizontalLayout_2) self.horizontalLayout_4 = QtWidgets.QHBoxLayout() @@ -70,7 +75,9 @@ class Ui_Dialog(object): self.gridLayout.addWidget(self.label, 0, 0, 1, 1) self.placeholder_list = QtWidgets.QComboBox(parent=Dialog) self.placeholder_list.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) - self.placeholder_list.setSizeAdjustPolicy(QtWidgets.QComboBox.SizeAdjustPolicy.AdjustToContents) + self.placeholder_list.setSizeAdjustPolicy( + QtWidgets.QComboBox.SizeAdjustPolicy.AdjustToContents + ) self.placeholder_list.setObjectName("placeholder_list") self.placeholder_list.addItem("") self.placeholder_list.addItem("") @@ -108,13 +115,22 @@ class Ui_Dialog(object): self.testTemplate = QtWidgets.QPushButton(parent=Dialog) self.testTemplate.setObjectName("testTemplate") self.horizontalLayout_3.addWidget(self.testTemplate) - spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + spacerItem1 = QtWidgets.QSpacerItem( + 40, + 20, + QtWidgets.QSizePolicy.Policy.Expanding, + QtWidgets.QSizePolicy.Policy.Minimum, + ) self.horizontalLayout_3.addItem(spacerItem1) self.verticalLayout.addLayout(self.horizontalLayout_3) self.verticalLayout_2.addLayout(self.verticalLayout) self.buttonBox = QtWidgets.QDialogButtonBox(parent=Dialog) self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal) - self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Discard|QtWidgets.QDialogButtonBox.StandardButton.Save) + self.buttonBox.setStandardButtons( + QtWidgets.QDialogButtonBox.StandardButton.Cancel + | QtWidgets.QDialogButtonBox.StandardButton.Discard + | QtWidgets.QDialogButtonBox.StandardButton.Save + ) self.buttonBox.setObjectName("buttonBox") self.verticalLayout_2.addWidget(self.buttonBox) @@ -158,6 +174,8 @@ class Ui_Dialog(object): self.placeholder_list.setItemText(4, _translate("Dialog", "«DozentName»")) self.placeholder_list.setItemText(5, _translate("Dialog", "«Signatur»")) self.label_2.setText(_translate("Dialog", "Beschreibung")) - self.insertPlaceholder.setText(_translate("Dialog", "An aktiver Position einfügen")) + self.insertPlaceholder.setText( + _translate("Dialog", "An aktiver Position einfügen") + ) self.label_3.setText(_translate("Dialog", "Betreff")) self.testTemplate.setText(_translate("Dialog", "Template testen")) diff --git a/src/ui/dialogs/dialog_sources/Ui_parsed_titles.py b/src/ui/dialogs/dialog_sources/Ui_parsed_titles.py index c76f3bc..b18b94a 100644 --- a/src/ui/dialogs/dialog_sources/Ui_parsed_titles.py +++ b/src/ui/dialogs/dialog_sources/Ui_parsed_titles.py @@ -38,7 +38,12 @@ class Ui_Form(object): self.label_2 = QtWidgets.QLabel(parent=self.horizontalLayoutWidget) self.label_2.setObjectName("label_2") self.horizontalLayout.addWidget(self.label_2) - spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + spacerItem = QtWidgets.QSpacerItem( + 40, + 20, + QtWidgets.QSizePolicy.Policy.Expanding, + QtWidgets.QSizePolicy.Policy.Minimum, + ) self.horizontalLayout.addItem(spacerItem) self.frame_2 = QtWidgets.QFrame(parent=Form) self.frame_2.setGeometry(QtCore.QRect(10, 80, 381, 201)) @@ -54,7 +59,9 @@ class Ui_Form(object): self.listWidget = QtWidgets.QListWidget(parent=self.horizontalLayoutWidget_2) self.listWidget.setObjectName("listWidget") self.horizontalLayout_2.addWidget(self.listWidget) - self.listWidget_done = QtWidgets.QListWidget(parent=self.horizontalLayoutWidget_2) + self.listWidget_done = QtWidgets.QListWidget( + parent=self.horizontalLayoutWidget_2 + ) self.listWidget_done.setObjectName("listWidget_done") self.horizontalLayout_2.addWidget(self.listWidget_done) self.progressBar = QtWidgets.QProgressBar(parent=Form) @@ -63,7 +70,10 @@ class Ui_Form(object): self.progressBar.setObjectName("progressBar") self.buttonBox = QtWidgets.QDialogButtonBox(parent=Form) self.buttonBox.setGeometry(QtCore.QRect(230, 290, 156, 23)) - self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok) + self.buttonBox.setStandardButtons( + QtWidgets.QDialogButtonBox.StandardButton.Cancel + | QtWidgets.QDialogButtonBox.StandardButton.Ok + ) self.buttonBox.setObjectName("buttonBox") self.toolButton = QtWidgets.QToolButton(parent=Form) self.toolButton.setGeometry(QtCore.QRect(20, 290, 25, 19)) diff --git a/src/ui/dialogs/dialog_sources/Ui_settings.py b/src/ui/dialogs/dialog_sources/Ui_settings.py index 948abe5..870ac57 100644 --- a/src/ui/dialogs/dialog_sources/Ui_settings.py +++ b/src/ui/dialogs/dialog_sources/Ui_settings.py @@ -16,7 +16,10 @@ class Ui_Dialog(object): self.buttonBox = QtWidgets.QDialogButtonBox(parent=Dialog) self.buttonBox.setGeometry(QtCore.QRect(120, 540, 621, 32)) self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal) - self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok) + self.buttonBox.setStandardButtons( + QtWidgets.QDialogButtonBox.StandardButton.Cancel + | QtWidgets.QDialogButtonBox.StandardButton.Ok + ) self.buttonBox.setObjectName("buttonBox") self.frame = QtWidgets.QFrame(parent=Dialog) self.frame.setGeometry(QtCore.QRect(0, 0, 751, 541)) @@ -54,7 +57,12 @@ class Ui_Dialog(object): self.tb_set_save_path = QtWidgets.QToolButton(parent=self.formLayoutWidget) self.tb_set_save_path.setObjectName("tb_set_save_path") self.gridLayout.addWidget(self.tb_set_save_path, 2, 2, 1, 1) - spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) + spacerItem = QtWidgets.QSpacerItem( + 20, + 40, + QtWidgets.QSizePolicy.Policy.Minimum, + QtWidgets.QSizePolicy.Policy.Expanding, + ) self.gridLayout.addItem(spacerItem, 3, 1, 1, 1) self.label_5 = QtWidgets.QLabel(parent=self.formLayoutWidget) self.label_5.setObjectName("label_5") @@ -77,7 +85,9 @@ class Ui_Dialog(object): self.label_8 = QtWidgets.QLabel(parent=self.formLayoutWidget_2) self.label_8.setObjectName("label_8") self.gridLayout_2.addWidget(self.label_8, 3, 0, 1, 1) - self.use_username_smtp_login = QtWidgets.QCheckBox(parent=self.formLayoutWidget_2) + self.use_username_smtp_login = QtWidgets.QCheckBox( + parent=self.formLayoutWidget_2 + ) self.use_username_smtp_login.setTristate(False) self.use_username_smtp_login.setObjectName("use_username_smtp_login") self.gridLayout_2.addWidget(self.use_username_smtp_login, 4, 1, 1, 1) @@ -86,7 +96,10 @@ class Ui_Dialog(object): self.mail_username.setObjectName("mail_username") self.gridLayout_2.addWidget(self.mail_username, 3, 1, 1, 1) self.smtp_port = QtWidgets.QLineEdit(parent=self.formLayoutWidget_2) - self.smtp_port.setInputMethodHints(QtCore.Qt.InputMethodHint.ImhDigitsOnly|QtCore.Qt.InputMethodHint.ImhPreferNumbers) + self.smtp_port.setInputMethodHints( + QtCore.Qt.InputMethodHint.ImhDigitsOnly + | QtCore.Qt.InputMethodHint.ImhPreferNumbers + ) self.smtp_port.setClearButtonEnabled(True) self.smtp_port.setObjectName("smtp_port") self.gridLayout_2.addWidget(self.smtp_port, 1, 1, 1, 1) @@ -101,7 +114,9 @@ class Ui_Dialog(object): self.label_9.setObjectName("label_9") self.gridLayout_2.addWidget(self.label_9, 6, 0, 1, 1) self.sender_email = QtWidgets.QLineEdit(parent=self.formLayoutWidget_2) - self.sender_email.setInputMethodHints(QtCore.Qt.InputMethodHint.ImhEmailCharactersOnly) + self.sender_email.setInputMethodHints( + QtCore.Qt.InputMethodHint.ImhEmailCharactersOnly + ) self.sender_email.setClearButtonEnabled(True) self.sender_email.setObjectName("sender_email") self.gridLayout_2.addWidget(self.sender_email, 2, 1, 1, 1) @@ -109,7 +124,10 @@ class Ui_Dialog(object): self.label.setObjectName("label") self.gridLayout_2.addWidget(self.label, 0, 0, 1, 1) self.password = QtWidgets.QLineEdit(parent=self.formLayoutWidget_2) - self.password.setInputMethodHints(QtCore.Qt.InputMethodHint.ImhHiddenText|QtCore.Qt.InputMethodHint.ImhSensitiveData) + self.password.setInputMethodHints( + QtCore.Qt.InputMethodHint.ImhHiddenText + | QtCore.Qt.InputMethodHint.ImhSensitiveData + ) self.password.setClearButtonEnabled(True) self.password.setObjectName("password") self.gridLayout_2.addWidget(self.password, 5, 1, 1, 1) @@ -132,7 +150,12 @@ class Ui_Dialog(object): self.verticalLayout.setObjectName("verticalLayout") self.horizontalLayout_3 = QtWidgets.QHBoxLayout() self.horizontalLayout_3.setObjectName("horizontalLayout_3") - spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + spacerItem1 = QtWidgets.QSpacerItem( + 40, + 20, + QtWidgets.QSizePolicy.Policy.Expanding, + QtWidgets.QSizePolicy.Policy.Minimum, + ) self.horizontalLayout_3.addItem(spacerItem1) self.bold = QtWidgets.QPushButton(parent=self.verticalLayoutWidget) self.bold.setCheckable(True) @@ -146,7 +169,12 @@ class Ui_Dialog(object): self.underscore.setCheckable(True) self.underscore.setObjectName("underscore") self.horizontalLayout_3.addWidget(self.underscore) - spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + spacerItem2 = QtWidgets.QSpacerItem( + 40, + 20, + QtWidgets.QSizePolicy.Policy.Expanding, + QtWidgets.QSizePolicy.Policy.Minimum, + ) self.horizontalLayout_3.addItem(spacerItem2) self.verticalLayout.addLayout(self.horizontalLayout_3) self.horizontalLayout = QtWidgets.QHBoxLayout() @@ -172,7 +200,12 @@ class Ui_Dialog(object): self.font_size.addItem("") self.font_size.addItem("") self.horizontalLayout.addWidget(self.font_size) - spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + spacerItem3 = QtWidgets.QSpacerItem( + 40, + 20, + QtWidgets.QSizePolicy.Policy.Expanding, + QtWidgets.QSizePolicy.Policy.Minimum, + ) self.horizontalLayout.addItem(spacerItem3) self.verticalLayout.addLayout(self.horizontalLayout) self.editSignature = QtWidgets.QTextEdit(parent=self.email_settingsPage2_2) @@ -188,8 +221,8 @@ class Ui_Dialog(object): self.retranslateUi(Dialog) self.email_settings.setCurrentIndex(0) - self.buttonBox.accepted.connect(Dialog.accept) # type: ignore - self.buttonBox.rejected.connect(Dialog.reject) # type: ignore + self.buttonBox.accepted.connect(Dialog.accept) # type: ignore + self.buttonBox.rejected.connect(Dialog.reject) # type: ignore QtCore.QMetaObject.connectSlotsByName(Dialog) Dialog.setTabOrder(self.db_name, self.db_path) Dialog.setTabOrder(self.db_path, self.save_path) @@ -199,23 +232,44 @@ class Ui_Dialog(object): Dialog.setWindowTitle(_translate("Dialog", "Dialog")) self.label_2.setText(_translate("Dialog", "Allgemeine Einstellungen")) self.tb_select_db.setText(_translate("Dialog", "...")) - self.label_3.setToolTip(_translate("Dialog", "

Name der Datenbank, welche verwendet werden soll. Muss auf .db enden

")) + self.label_3.setToolTip( + _translate( + "Dialog", + '

Name der Datenbank, welche verwendet werden soll. Muss auf .db enden

', + ) + ) self.label_3.setText(_translate("Dialog", "Datenbankname")) self.db_name.setText(_translate("Dialog", "sap.db")) self.label_4.setText(_translate("Dialog", "Datenbankpfad")) self.tb_set_save_path.setText(_translate("Dialog", "...")) - self.label_5.setToolTip(_translate("Dialog", "Pfad, an dem heruntergeladene Dateien gespeichert werden sollen")) + self.label_5.setToolTip( + _translate( + "Dialog", + "Pfad, an dem heruntergeladene Dateien gespeichert werden sollen", + ) + ) self.label_5.setText(_translate("Dialog", "Temporäre Dateien")) self.label_8.setText(_translate("Dialog", "Nutzername")) - self.use_username_smtp_login.setStatusTip(_translate("Dialog", "Anklicken, wenn Nutzername benötigt wird, um sich beim Server anzumelden")) - self.use_username_smtp_login.setText(_translate("Dialog", "Nutzername zum\n" -" Anmelden verwenden")) - self.mail_username.setStatusTip(_translate("Dialog", "Kürzel, von der Hochschule vergeben, bsp: Aky547")) + self.use_username_smtp_login.setStatusTip( + _translate( + "Dialog", + "Anklicken, wenn Nutzername benötigt wird, um sich beim Server anzumelden", + ) + ) + self.use_username_smtp_login.setText( + _translate("Dialog", "Nutzername zum\n" " Anmelden verwenden") + ) + self.mail_username.setStatusTip( + _translate("Dialog", "Kürzel, von der Hochschule vergeben, bsp: Aky547") + ) self.label_10.setText(_translate("Dialog", "Passwort")) self.label_7.setText(_translate("Dialog", "Sender-eMail")) self.label.setText(_translate("Dialog", "SMTP-Server")) self.label_6.setText(_translate("Dialog", "Port")) - self.email_settings.setTabText(self.email_settings.indexOf(self.email_settingsPage1_2), _translate("Dialog", "Allgemeines")) + self.email_settings.setTabText( + self.email_settings.indexOf(self.email_settingsPage1_2), + _translate("Dialog", "Allgemeines"), + ) self.bold.setText(_translate("Dialog", "Fett")) self.italic.setText(_translate("Dialog", "Kursiv")) self.underscore.setText(_translate("Dialog", "Unterstrichen")) @@ -235,4 +289,7 @@ class Ui_Dialog(object): self.font_size.setItemText(13, _translate("Dialog", "48")) self.font_size.setItemText(14, _translate("Dialog", "72")) self.debug.setText(_translate("Dialog", "Debug")) - self.email_settings.setTabText(self.email_settings.indexOf(self.email_settingsPage2_2), _translate("Dialog", "Signatur")) + self.email_settings.setTabText( + self.email_settings.indexOf(self.email_settingsPage2_2), + _translate("Dialog", "Signatur"), + ) diff --git a/src/ui/dialogs/dialog_sources/newMailTemplateDesigner_ui.py b/src/ui/dialogs/dialog_sources/newMailTemplateDesigner_ui.py index d4f0dc3..065515f 100644 --- a/src/ui/dialogs/dialog_sources/newMailTemplateDesigner_ui.py +++ b/src/ui/dialogs/dialog_sources/newMailTemplateDesigner_ui.py @@ -55,7 +55,12 @@ class Ui_Dialog(object): self.fontSize.addItem("") self.fontSize.addItem("") self.horizontalLayout_2.addWidget(self.fontSize) - spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + spacerItem = QtWidgets.QSpacerItem( + 40, + 20, + QtWidgets.QSizePolicy.Policy.Expanding, + QtWidgets.QSizePolicy.Policy.Minimum, + ) self.horizontalLayout_2.addItem(spacerItem) self.verticalLayout.addLayout(self.horizontalLayout_2) self.horizontalLayout_4 = QtWidgets.QHBoxLayout() @@ -67,7 +72,9 @@ class Ui_Dialog(object): self.label.setObjectName("label") self.gridLayout.addWidget(self.label, 0, 0, 1, 1) self.placeholder_list = QtWidgets.QComboBox(parent=Dialog) - self.placeholder_list.setSizeAdjustPolicy(QtWidgets.QComboBox.SizeAdjustPolicy.AdjustToContents) + self.placeholder_list.setSizeAdjustPolicy( + QtWidgets.QComboBox.SizeAdjustPolicy.AdjustToContents + ) self.placeholder_list.setObjectName("placeholder_list") self.placeholder_list.addItem("") self.placeholder_list.addItem("") @@ -103,13 +110,22 @@ class Ui_Dialog(object): self.testTemplate = QtWidgets.QPushButton(parent=Dialog) self.testTemplate.setObjectName("testTemplate") self.horizontalLayout_3.addWidget(self.testTemplate) - spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + spacerItem1 = QtWidgets.QSpacerItem( + 40, + 20, + QtWidgets.QSizePolicy.Policy.Expanding, + QtWidgets.QSizePolicy.Policy.Minimum, + ) self.horizontalLayout_3.addItem(spacerItem1) self.verticalLayout.addLayout(self.horizontalLayout_3) self.verticalLayout_2.addLayout(self.verticalLayout) self.buttonBox = QtWidgets.QDialogButtonBox(parent=Dialog) self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal) - self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Discard|QtWidgets.QDialogButtonBox.StandardButton.Save) + self.buttonBox.setStandardButtons( + QtWidgets.QDialogButtonBox.StandardButton.Cancel + | QtWidgets.QDialogButtonBox.StandardButton.Discard + | QtWidgets.QDialogButtonBox.StandardButton.Save + ) self.buttonBox.setObjectName("buttonBox") self.verticalLayout_2.addWidget(self.buttonBox) @@ -146,6 +162,8 @@ class Ui_Dialog(object): self.placeholder_list.setItemText(4, _translate("Dialog", "«DozentName»")) self.placeholder_list.setItemText(5, _translate("Dialog", "«Signatur»")) self.label_2.setText(_translate("Dialog", "Beschreibung")) - self.insertPlaceholder.setText(_translate("Dialog", "An aktiver Position einfügen")) + self.insertPlaceholder.setText( + _translate("Dialog", "An aktiver Position einfügen") + ) self.label_3.setText(_translate("Dialog", "Betreff")) self.testTemplate.setText(_translate("Dialog", "Template testen")) diff --git a/src/ui/dialogs/dialog_sources/settings_ui.py b/src/ui/dialogs/dialog_sources/settings_ui.py index 9a5ffe9..23127e7 100644 --- a/src/ui/dialogs/dialog_sources/settings_ui.py +++ b/src/ui/dialogs/dialog_sources/settings_ui.py @@ -16,7 +16,10 @@ class Ui_Dialog(object): self.buttonBox = QtWidgets.QDialogButtonBox(parent=Dialog) self.buttonBox.setGeometry(QtCore.QRect(120, 540, 621, 32)) self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal) - self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok) + self.buttonBox.setStandardButtons( + QtWidgets.QDialogButtonBox.StandardButton.Cancel + | QtWidgets.QDialogButtonBox.StandardButton.Ok + ) self.buttonBox.setObjectName("buttonBox") self.frame = QtWidgets.QFrame(parent=Dialog) self.frame.setGeometry(QtCore.QRect(0, 0, 741, 541)) @@ -54,7 +57,12 @@ class Ui_Dialog(object): self.tb_set_save_path = QtWidgets.QToolButton(parent=self.formLayoutWidget) self.tb_set_save_path.setObjectName("tb_set_save_path") self.gridLayout.addWidget(self.tb_set_save_path, 2, 2, 1, 1) - spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) + spacerItem = QtWidgets.QSpacerItem( + 20, + 40, + QtWidgets.QSizePolicy.Policy.Minimum, + QtWidgets.QSizePolicy.Policy.Expanding, + ) self.gridLayout.addItem(spacerItem, 3, 1, 1, 1) self.label_5 = QtWidgets.QLabel(parent=self.formLayoutWidget) self.label_5.setObjectName("label_5") @@ -77,7 +85,9 @@ class Ui_Dialog(object): self.label_8 = QtWidgets.QLabel(parent=self.formLayoutWidget_2) self.label_8.setObjectName("label_8") self.gridLayout_2.addWidget(self.label_8, 3, 0, 1, 1) - self.use_username_smtp_login = QtWidgets.QCheckBox(parent=self.formLayoutWidget_2) + self.use_username_smtp_login = QtWidgets.QCheckBox( + parent=self.formLayoutWidget_2 + ) self.use_username_smtp_login.setTristate(False) self.use_username_smtp_login.setObjectName("use_username_smtp_login") self.gridLayout_2.addWidget(self.use_username_smtp_login, 4, 1, 1, 1) @@ -86,7 +96,10 @@ class Ui_Dialog(object): self.mail_username.setObjectName("mail_username") self.gridLayout_2.addWidget(self.mail_username, 3, 1, 1, 1) self.smtp_port = QtWidgets.QLineEdit(parent=self.formLayoutWidget_2) - self.smtp_port.setInputMethodHints(QtCore.Qt.InputMethodHint.ImhDigitsOnly|QtCore.Qt.InputMethodHint.ImhPreferNumbers) + self.smtp_port.setInputMethodHints( + QtCore.Qt.InputMethodHint.ImhDigitsOnly + | QtCore.Qt.InputMethodHint.ImhPreferNumbers + ) self.smtp_port.setClearButtonEnabled(True) self.smtp_port.setObjectName("smtp_port") self.gridLayout_2.addWidget(self.smtp_port, 1, 1, 1, 1) @@ -101,7 +114,9 @@ class Ui_Dialog(object): self.label_9.setObjectName("label_9") self.gridLayout_2.addWidget(self.label_9, 6, 0, 1, 1) self.sender_email = QtWidgets.QLineEdit(parent=self.formLayoutWidget_2) - self.sender_email.setInputMethodHints(QtCore.Qt.InputMethodHint.ImhEmailCharactersOnly) + self.sender_email.setInputMethodHints( + QtCore.Qt.InputMethodHint.ImhEmailCharactersOnly + ) self.sender_email.setClearButtonEnabled(True) self.sender_email.setObjectName("sender_email") self.gridLayout_2.addWidget(self.sender_email, 2, 1, 1, 1) @@ -109,7 +124,10 @@ class Ui_Dialog(object): self.label.setObjectName("label") self.gridLayout_2.addWidget(self.label, 0, 0, 1, 1) self.password = QtWidgets.QLineEdit(parent=self.formLayoutWidget_2) - self.password.setInputMethodHints(QtCore.Qt.InputMethodHint.ImhHiddenText|QtCore.Qt.InputMethodHint.ImhSensitiveData) + self.password.setInputMethodHints( + QtCore.Qt.InputMethodHint.ImhHiddenText + | QtCore.Qt.InputMethodHint.ImhSensitiveData + ) self.password.setClearButtonEnabled(True) self.password.setObjectName("password") self.gridLayout_2.addWidget(self.password, 5, 1, 1, 1) @@ -131,7 +149,12 @@ class Ui_Dialog(object): self.verticalLayout.setObjectName("verticalLayout") self.horizontalLayout_3 = QtWidgets.QHBoxLayout() self.horizontalLayout_3.setObjectName("horizontalLayout_3") - spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + spacerItem1 = QtWidgets.QSpacerItem( + 40, + 20, + QtWidgets.QSizePolicy.Policy.Expanding, + QtWidgets.QSizePolicy.Policy.Minimum, + ) self.horizontalLayout_3.addItem(spacerItem1) self.bold = QtWidgets.QPushButton(parent=self.verticalLayoutWidget) self.bold.setCheckable(True) @@ -145,7 +168,12 @@ class Ui_Dialog(object): self.underscore.setCheckable(True) self.underscore.setObjectName("underscore") self.horizontalLayout_3.addWidget(self.underscore) - spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + spacerItem2 = QtWidgets.QSpacerItem( + 40, + 20, + QtWidgets.QSizePolicy.Policy.Expanding, + QtWidgets.QSizePolicy.Policy.Minimum, + ) self.horizontalLayout_3.addItem(spacerItem2) self.verticalLayout.addLayout(self.horizontalLayout_3) self.horizontalLayout = QtWidgets.QHBoxLayout() @@ -171,7 +199,12 @@ class Ui_Dialog(object): self.font_size.addItem("") self.font_size.addItem("") self.horizontalLayout.addWidget(self.font_size) - spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + spacerItem3 = QtWidgets.QSpacerItem( + 40, + 20, + QtWidgets.QSizePolicy.Policy.Expanding, + QtWidgets.QSizePolicy.Policy.Minimum, + ) self.horizontalLayout.addItem(spacerItem3) self.verticalLayout.addLayout(self.horizontalLayout) self.editSignature = QtWidgets.QTextEdit(parent=self.email_settingsPage2_2) @@ -187,8 +220,8 @@ class Ui_Dialog(object): self.retranslateUi(Dialog) self.email_settings.setCurrentIndex(0) - self.buttonBox.accepted.connect(Dialog.accept) # type: ignore - self.buttonBox.rejected.connect(Dialog.reject) # type: ignore + self.buttonBox.accepted.connect(Dialog.accept) # type: ignore + self.buttonBox.rejected.connect(Dialog.reject) # type: ignore QtCore.QMetaObject.connectSlotsByName(Dialog) Dialog.setTabOrder(self.db_name, self.db_path) Dialog.setTabOrder(self.db_path, self.save_path) @@ -198,23 +231,44 @@ class Ui_Dialog(object): Dialog.setWindowTitle(_translate("Dialog", "Dialog")) self.label_2.setText(_translate("Dialog", "Allgemeine Einstellungen")) self.tb_select_db.setText(_translate("Dialog", "...")) - self.label_3.setToolTip(_translate("Dialog", "

Name der Datenbank, welche verwendet werden soll. Muss auf .db enden

")) + self.label_3.setToolTip( + _translate( + "Dialog", + '

Name der Datenbank, welche verwendet werden soll. Muss auf .db enden

', + ) + ) self.label_3.setText(_translate("Dialog", "Datenbankname")) self.db_name.setText(_translate("Dialog", "sap.db")) self.label_4.setText(_translate("Dialog", "Datenbankpfad")) self.tb_set_save_path.setText(_translate("Dialog", "...")) - self.label_5.setToolTip(_translate("Dialog", "Pfad, an dem heruntergeladene Dateien gespeichert werden sollen")) + self.label_5.setToolTip( + _translate( + "Dialog", + "Pfad, an dem heruntergeladene Dateien gespeichert werden sollen", + ) + ) self.label_5.setText(_translate("Dialog", "Temporäre Dateien")) self.label_8.setText(_translate("Dialog", "Nutzername")) - self.use_username_smtp_login.setStatusTip(_translate("Dialog", "Anklicken, wenn Nutzername benötigt wird, um sich beim Server anzumelden")) - self.use_username_smtp_login.setText(_translate("Dialog", "Nutzername zum\n" -" Anmelden verwenden")) - self.mail_username.setStatusTip(_translate("Dialog", "Kürzel, von der Hochschule vergeben, bsp: Aky547")) + self.use_username_smtp_login.setStatusTip( + _translate( + "Dialog", + "Anklicken, wenn Nutzername benötigt wird, um sich beim Server anzumelden", + ) + ) + self.use_username_smtp_login.setText( + _translate("Dialog", "Nutzername zum\n" " Anmelden verwenden") + ) + self.mail_username.setStatusTip( + _translate("Dialog", "Kürzel, von der Hochschule vergeben, bsp: Aky547") + ) self.label_10.setText(_translate("Dialog", "Passwort")) self.label_7.setText(_translate("Dialog", "Sender-eMail")) self.label.setText(_translate("Dialog", "SMTP-Server")) self.label_6.setText(_translate("Dialog", "Port")) - self.email_settings.setTabText(self.email_settings.indexOf(self.email_settingsPage1_2), _translate("Dialog", "Allgemeines")) + self.email_settings.setTabText( + self.email_settings.indexOf(self.email_settingsPage1_2), + _translate("Dialog", "Allgemeines"), + ) self.bold.setText(_translate("Dialog", "Fett")) self.italic.setText(_translate("Dialog", "Kursiv")) self.underscore.setText(_translate("Dialog", "Unterstrichen")) @@ -234,4 +288,7 @@ class Ui_Dialog(object): self.font_size.setItemText(13, _translate("Dialog", "48")) self.font_size.setItemText(14, _translate("Dialog", "72")) self.debug.setText(_translate("Dialog", "Debug")) - self.email_settings.setTabText(self.email_settings.indexOf(self.email_settingsPage2_2), _translate("Dialog", "Signatur")) + self.email_settings.setTabText( + self.email_settings.indexOf(self.email_settingsPage2_2), + _translate("Dialog", "Signatur"), + ) diff --git a/src/ui/dialogs/fileparser.py b/src/ui/dialogs/fileparser.py index e44a13c..68b12f7 100644 --- a/src/ui/dialogs/fileparser.py +++ b/src/ui/dialogs/fileparser.py @@ -1,14 +1,18 @@ -from PyQt6.QtCore import Qt -from .dialog_sources.Ui_fileparser import Ui_Dialog from PyQt6 import QtWidgets +from PyQt6.QtCore import Qt + from src.logic.webrequest import BibTextTransformer, WebRequest +from .dialog_sources.Ui_fileparser import Ui_Dialog + + class FileParserDialog(QtWidgets.QDialog, Ui_Dialog): def __init__(self, parent: None) -> None: super().__init__(parent) self.setupUi(self) self.signatures = [] self.returned = [] + def moveToThread(self, thread): self.progressBar.moveToThread(thread) self.frame.moveToThread(thread) @@ -43,4 +47,4 @@ class FileParserDialog(QtWidgets.QDialog, Ui_Dialog): self.signatures = [] self.returned = [] self.retranslateUi.deleteLater() - super().deleteLater() \ No newline at end of file + super().deleteLater() diff --git a/src/ui/dialogs/login.py b/src/ui/dialogs/login.py index ac5ad35..c51f7a7 100644 --- a/src/ui/dialogs/login.py +++ b/src/ui/dialogs/login.py @@ -1,9 +1,13 @@ -from .dialog_sources.Ui_login import Ui_Dialog +import hashlib + +from PyQt6 import QtCore, QtGui, QtWidgets + +from src import Icon from src.backend.admin_console import AdminCommands from src.backend.database import Database -import hashlib -from src import Icon -from PyQt6 import QtCore, QtWidgets, QtGui + +from .dialog_sources.Ui_login import Ui_Dialog + class LoginDialog(Ui_Dialog): def setupUi(self, Dialog): @@ -48,6 +52,7 @@ class LoginDialog(Ui_Dialog): self.lusername = "" QtCore.QMetaObject.connectSlotsByName(Dialog) Dialog.setWindowTitle("Login") + def retranslateUi(self, Dialog): _translate = QtCore.QCoreApplication.translate Dialog.setWindowTitle(_translate("Dialog", "Dialog")) @@ -89,4 +94,4 @@ class LoginDialog(Ui_Dialog): warning_dialog.exec() def cancel_buttonfn(self): - self.dialog.reject() \ No newline at end of file + self.dialog.reject() diff --git a/src/ui/dialogs/mail.py b/src/ui/dialogs/mail.py index 2b665b5..5880a00 100644 --- a/src/ui/dialogs/mail.py +++ b/src/ui/dialogs/mail.py @@ -4,10 +4,12 @@ import sys from omegaconf import OmegaConf from PyQt6 import QtCore, QtGui, QtWidgets -from src.logic.log import MyLogger from src import Icon +from src.logic.log import MyLogger + from .dialog_sources.Ui_mail_preview import Ui_eMailPreview as MailPreviewDialog from .mailTemplate import MailTemplateDialog + config = OmegaConf.load("config.yaml") logger = MyLogger("Mail") @@ -32,7 +34,7 @@ class Mail_Dialog(QtWidgets.QDialog, MailPreviewDialog): # app_subject, # prof_name, ) - + self.appid = app_id self.appname = app_name self.subject = app_subject @@ -47,7 +49,7 @@ class Mail_Dialog(QtWidgets.QDialog, MailPreviewDialog): # if none of the radio buttons is checked, disable the accept button of the dialog self.setWindowIcon(Icon("mail").icon) self.btn_okay.setEnabled(False) - Icon("edit_note",self.newTemplate) + Icon("edit_note", self.newTemplate) self.newTemplate.clicked.connect(self.open_new_template) if default_mail is not None: diff --git a/src/ui/dialogs/mailTemplate.py b/src/ui/dialogs/mailTemplate.py index 720f0a8..a3cf2ad 100644 --- a/src/ui/dialogs/mailTemplate.py +++ b/src/ui/dialogs/mailTemplate.py @@ -1,11 +1,15 @@ -from .dialog_sources import NewMailTemplateDesignerDialog -from PyQt6 import QtWidgets, QtCore, QtGui -from PyQt6.QtGui import QFont import os + +from PyQt6 import QtCore, QtGui, QtWidgets +from PyQt6.QtGui import QFont + from src import Icon +from .dialog_sources import NewMailTemplateDesignerDialog + + class MailTemplateDialog(QtWidgets.QDialog, NewMailTemplateDesignerDialog): - def __init__(self,parent = None) -> None: + def __init__(self, parent=None) -> None: super().__init__(parent) self.setupUi(self) self.setWindowIcon(Icon("edit_note").icon) @@ -20,17 +24,23 @@ class MailTemplateDialog(QtWidgets.QDialog, NewMailTemplateDesignerDialog): self.testTemplate.clicked.connect(self.test_template) self.fontBox.currentFontChanged.connect(self.setCurrentFont) self.fontSize.currentTextChanged.connect(self.setFontSize) - #buttonbox - #save button - self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Save).clicked.connect(self.save_template) - #discard button - self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Discard).clicked.connect(self.discard_changes) - #cancel button - self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Cancel).clicked.connect(self.closeNow) - + # buttonbox + # save button + self.buttonBox.button( + QtWidgets.QDialogButtonBox.StandardButton.Save + ).clicked.connect(self.save_template) + # discard button + self.buttonBox.button( + QtWidgets.QDialogButtonBox.StandardButton.Discard + ).clicked.connect(self.discard_changes) + # cancel button + self.buttonBox.button( + QtWidgets.QDialogButtonBox.StandardButton.Cancel + ).clicked.connect(self.closeNow) + def save_template(self): print("save triggered") - #create a dialog to ask for the name of the template + # create a dialog to ask for the name of the template dialog = QtWidgets.QInputDialog() dialog.setInputMode(QtWidgets.QInputDialog.InputMode.TextInput) dialog.setLabelText("Bitte geben Sie den Namen des Templates ein:") @@ -43,79 +53,100 @@ class MailTemplateDialog(QtWidgets.QDialog, NewMailTemplateDesignerDialog): if template_name != "": template = template_name + ".eml" if template in os.listdir("mail_vorlagen"): - #warning dialog + # warning dialog dialog = QtWidgets.QMessageBox() dialog.setIcon(QtWidgets.QMessageBox.Icon.Warning) - Icon("warning",dialog) - dialog.setText("Ein Template mit diesem Namen existiert bereits. Möchten Sie es überschreiben?") + Icon("warning", dialog) + dialog.setText( + "Ein Template mit diesem Namen existiert bereits. Möchten Sie es überschreiben?" + ) dialog.setWindowTitle("Template überschreiben") - dialog.setStandardButtons(QtWidgets.QMessageBox.StandardButton.Yes | QtWidgets.QMessageBox.StandardButton.No) + dialog.setStandardButtons( + QtWidgets.QMessageBox.StandardButton.Yes + | QtWidgets.QMessageBox.StandardButton.No + ) dialog.setDefaultButton(QtWidgets.QMessageBox.StandardButton.No) ret = dialog.exec() if ret == QtWidgets.QMessageBox.StandardButton.No: return - + if save == 1: - + mail = f"""Subject: {self.subject.text()} MIME-Version: 1.0 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: 8bit -{self.templateEdit.toHtml()}""" - html_head = ''' +{self.templateEdit.toHtml()}""" + html_head = """ - ''' + """ mail_base = mail.split("")[0] mail_body = mail.split("")[1] mail = mail_base + html_head + mail_body - mail = mail.replace("<", "<").replace(">", ">").replace(""", '"').replace("&", "&") - with open(f"mail_vorlagen/{template}","w") as f: + mail = ( + mail.replace("<", "<") + .replace(">", ">") + .replace(""", '"') + .replace("&", "&") + ) + with open(f"mail_vorlagen/{template}", "w") as f: f.write(mail) self.close() else: - #warning dialog + # warning dialog dialog = QtWidgets.QMessageBox() dialog.setIcon(QtWidgets.QMessageBox.Icon.Warning) + dialog.setWindowIcon(Icon("warning").icon) + dialog.setText("Bitte geben Sie einen Namen für das Template ein.") dialog.setWindowTitle("Fehler beim Speichern") dialog.exec() - return - + return + def discard_changes(self): self.subject.clear() self.templateEdit.clear() - + def closeNow(self): if self.subject.text() == "" and self.templateEdit.toPlainText() == "": self.close() else: dialog = QtWidgets.QMessageBox() + dialog.setWindowIcon(Icon("warning").icon) dialog.setIcon(QtWidgets.QMessageBox.Icon.Warning) dialog.setText("Möchten Sie die Änderungen wirklich verwerfen?") dialog.setWindowTitle("Änderungen verwerfen") - dialog.setStandardButtons(QtWidgets.QMessageBox.StandardButton.Yes | QtWidgets.QMessageBox.StandardButton.No) + dialog.setStandardButtons( + QtWidgets.QMessageBox.StandardButton.Yes + | QtWidgets.QMessageBox.StandardButton.No + ) dialog.setDefaultButton(QtWidgets.QMessageBox.StandardButton.No) ret = dialog.exec() if ret == QtWidgets.QMessageBox.StandardButton.Yes: self.close() - + def updateDescription(self): print("update triggered") print(self.placeholder_list.currentText()) - placeholders = {"anrede" : "Die Anrede beinhaltet sowohl Person als auch Sehr geehrte/r; dargestellt als: {greeting}", - "apparatsfach" : "Das Fach, in welchem der Apparat angelegt wurde; dargestellt als: {AppSubject}", - "apparatsname": "Der Name des Apparats; dargestellt als: {Appname}", + placeholders = { + "anrede": "Die Anrede beinhaltet sowohl Person als auch Sehr geehrte/r; dargestellt als: {greeting}", + "apparatsfach": "Das Fach, in welchem der Apparat angelegt wurde; dargestellt als: {AppSubject}", + "apparatsname": "Der Name des Apparats; dargestellt als: {Appname}", "apparatsnummer": "Die Nummer des Apparats; dargestellt als: {AppNr}", - "dozentname" : "Der Name des Dozenten / der Dozentin; dargestellt als: {Profname}", - "signatur" : "Die persönliche / allgemeine Signatur am ende der Mail; dargestellt als: {signature}", - "": " "} - for key, item, in placeholders.items(): + "dozentname": "Der Name des Dozenten / der Dozentin; dargestellt als: {Profname}", + "signatur": "Die persönliche / allgemeine Signatur am ende der Mail; dargestellt als: {signature}", + "": " ", + } + for ( + key, + item, + ) in placeholders.items(): if key in self.placeholder_list.currentText().lower(): self.lineEdit.setText(item) break - + def setCurrentFont(self): font = self.fontBox.currentFont() font.setPointSize(int(self.fontSize.currentText())) @@ -124,7 +155,7 @@ Content-Transfer-Encoding: 8bit def setFontSize(self): size = self.fontSize.currentText() self.templateEdit.setFontPointSize(int(size)) - + def setFontBold(self): if self.bold.isChecked(): self.templateEdit.setFontWeight(QtGui.QFont.Weight.Bold) @@ -142,9 +173,16 @@ Content-Transfer-Encoding: 8bit self.templateEdit.setFontUnderline(True) else: self.templateEdit.setFontUnderline(False) - + def test_template(self): - placeholders = ["{greeting}","{AppSubject}","{Appname}","{AppNr}","{Profname}","{signature}"] + placeholders = [ + "{greeting}", + "{AppSubject}", + "{Appname}", + "{AppNr}", + "{Profname}", + "{signature}", + ] mail_subject = self.subject.text() mail_body = self.templateEdit.toHtml() missing_body = [] @@ -153,51 +191,58 @@ Content-Transfer-Encoding: 8bit assert placeholders[2] in mail_subject except AssertionError: missing_subject.append(placeholders[2]) - #check if all placeholders are in the mail body + # check if all placeholders are in the mail body for placeholder in placeholders: try: assert placeholder in mail_body except AssertionError: missing_body.append(placeholder) if missing_body != []: - #warning dialog - self.testTemplate.setText("❗") + # warning dialog + Icon("template_fail", self.testTemplate) dialog = QtWidgets.QMessageBox() - dialog.setIcon(QtWidgets.QMessageBox.Icon.Warning) + dialog.setIcon(Icon("warning").icon) + dialog.setText("Folgende Platzhalter fehlen im Template:") - - missing = "Betreff:\n" +"\n".join(missing_subject) + "\n\n" + "Mailtext:\n"+"\n".join(missing_body) - + + missing = ( + "Betreff:\n" + + "\n".join(missing_subject) + + "\n\n" + + "Mailtext:\n" + + "\n".join(missing_body) + ) + dialog.setInformativeText(f"{missing}") dialog.setWindowTitle("Fehlende Platzhalter") dialog.exec() self.testTemplate.setText("Template testen") else: - self.testTemplate.setText("✔") + self.testTemplate.setText("✔") - def insert_placeholder(self): - placeholder = {"anrede" : "{greeting}", - "apparatsfach" : "{AppSubject}", - "apparatsname": "{Appname}", + placeholder = { + "anrede": "{greeting}", + "apparatsfach": "{AppSubject}", + "apparatsname": "{Appname}", "apparatsnummer": "{AppNr}", - "dozentname" : "{Profname}", - "signatur" : '''
-- 
+            "dozentname": "{Profname}",
+            "signatur": """
-- 
 {signature}
-
'''
-            }
+
""", + } cursor = self.templateEdit.textCursor() - for key, item, in placeholder.items(): + for ( + key, + item, + ) in placeholder.items(): if key in self.placeholder_list.currentText().lower(): cursor.insertText(item) break self.templateEdit.setTextCursor(cursor) self.templateEdit.setFocus() - - - - - + + def launch_gui(): app = QtWidgets.QApplication([]) window = MailTemplateDialog() @@ -207,4 +252,3 @@ def launch_gui(): if __name__ == "__main__": launch_gui() - diff --git a/src/ui/dialogs/parsed_titles.py b/src/ui/dialogs/parsed_titles.py index aff2f96..df542a6 100644 --- a/src/ui/dialogs/parsed_titles.py +++ b/src/ui/dialogs/parsed_titles.py @@ -1,11 +1,13 @@ -from .dialog_sources.Ui_parsed_titles import Ui_Form +from PyQt6 import QtCore, QtWidgets -from PyQt6 import QtWidgets, QtCore from src.logic import AutoAdder from src.logic.log import MyLogger +from .dialog_sources.Ui_parsed_titles import Ui_Form + logger = MyLogger("AutoTitleAdder") + class ParsedTitles(QtWidgets.QWidget, Ui_Form): def __init__(self, parent=None): super().__init__(parent) @@ -15,7 +17,7 @@ class ParsedTitles(QtWidgets.QWidget, Ui_Form): self.prof_id = None self.app_id = None self.worker = None - + def populate_table(self): for i in range(len(self.signatures)): self.listWidget.addItem(QtWidgets.QListWidgetItem()) diff --git a/src/ui/dialogs/popup_confirm.py b/src/ui/dialogs/popup_confirm.py index a27c0bc..17e0324 100644 --- a/src/ui/dialogs/popup_confirm.py +++ b/src/ui/dialogs/popup_confirm.py @@ -8,33 +8,16 @@ from PyQt6 import QtCore, QtGui, QtWidgets +from src import Icon -class Ui_extend_confirm(object): - def setupUi(self, extend_confirm): - extend_confirm.setObjectName("extend_confirm") - extend_confirm.resize(380, 97) - # icon=QtGui.QIcon(f"ui/icons/{icon}.png") - # extend_confirm.setWindowIcon(icon) - self.buttonBox = QtWidgets.QDialogButtonBox(extend_confirm) - self.buttonBox.setGeometry(QtCore.QRect(290, 20, 81, 241)) - self.buttonBox.setOrientation(QtCore.Qt.Orientation.Vertical) - self.buttonBox.setStandardButtons( - QtWidgets.QDialogButtonBox.StandardButton.Cancel - | QtWidgets.QDialogButtonBox.StandardButton.Ok - ) - self.buttonBox.setObjectName("buttonBox") - self.textEdit = QtWidgets.QTextEdit(extend_confirm) - self.textEdit.setGeometry(QtCore.QRect(10, 10, 271, 81)) - self.textEdit.setObjectName("textEdit") +from .dialog_sources.Ui_confirm_extend import Ui_extend_confirm - self.retranslateUi(extend_confirm) - self.buttonBox.accepted.connect(extend_confirm.accept) # type: ignore - self.buttonBox.rejected.connect(extend_confirm.reject) # type: ignore - QtCore.QMetaObject.connectSlotsByName(extend_confirm) - def retranslateUi(self, extend_confirm): - _translate = QtCore.QCoreApplication.translate - extend_confirm.setWindowTitle(_translate("extend_confirm", "Dialog")) +class ConfirmDialog(QtWidgets.QDialog, Ui_extend_confirm): + def __init__(self, parent=None): + super().__init__(parent) + self.setupUi(self) + self.setWindowIcon(Icon("info").icon) if __name__ == "__main__": diff --git a/src/ui/dialogs/reminder.py b/src/ui/dialogs/reminder.py index 928a2d8..e5afe11 100644 --- a/src/ui/dialogs/reminder.py +++ b/src/ui/dialogs/reminder.py @@ -1,9 +1,13 @@ -from .dialog_sources.Ui_reminder import Ui_Dialog from PyQt6 import QtWidgets + +from .dialog_sources.Ui_reminder import Ui_Dialog + + class ReminderDialog(QtWidgets.QDialog, Ui_Dialog): def __init__(self, parent=None): super().__init__(parent) self.setupUi(self) + def return_message(self) -> dict: return { "message": self.message_box.toPlainText(), diff --git a/src/ui/dialogs/settings.py b/src/ui/dialogs/settings.py index 64f2e8b..3ea7f14 100644 --- a/src/ui/dialogs/settings.py +++ b/src/ui/dialogs/settings.py @@ -1,14 +1,15 @@ from omegaconf import OmegaConf from PyQt6 import QtCore, QtGui, QtWidgets + from src import Icon + from .dialog_sources.settings_ui import Ui_Dialog as _settings config = OmegaConf.load("config.yaml") - class Settings(QtWidgets.QDialog, _settings): - def __init__(self,user): + def __init__(self, user): super().__init__() self.setupUi(self) self.setWindowIcon(Icon("settings").icon) @@ -67,7 +68,7 @@ class Settings(QtWidgets.QDialog, _settings): self.togglePassword.setIconSize(QtCore.QSize(16, 16)) on_icon = Icon("hide_password") off_icon = Icon("show_password") - + if self.showPassword is False: self.password.setEchoMode(QtWidgets.QLineEdit.EchoMode.Normal) diff --git a/src/ui/semesterapparat_ui.ui b/src/ui/semesterapparat_ui.ui index 99ddfff..6fb30cf 100644 --- a/src/ui/semesterapparat_ui.ui +++ b/src/ui/semesterapparat_ui.ui @@ -2055,10 +2055,10 @@ - 📆 heute + - false + true @@ -3236,6 +3236,7 @@ Help + @@ -3249,6 +3250,9 @@ Ctrl+Q + + QAction::QuitRole + true @@ -3275,6 +3279,14 @@ Qt::ApplicationShortcut + + + About + + + QAction::AboutRole + + btn_add_document diff --git a/src/ui/widgets/Ui_progress_overview_widget.py b/src/ui/widgets/Ui_progress_overview_widget.py index 9ecffbe..01327b1 100644 --- a/src/ui/widgets/Ui_progress_overview_widget.py +++ b/src/ui/widgets/Ui_progress_overview_widget.py @@ -63,7 +63,6 @@ class Ui_Form(object): font = QtGui.QFont() font.setPointSize(10) font.setBold(True) - font.setItal # ic(False) font.setUnderline(False) font.setWeight(75) font.setKerning(True) diff --git a/src/ui/widgets/graph.py b/src/ui/widgets/graph.py index db32f07..54d29a6 100644 --- a/src/ui/widgets/graph.py +++ b/src/ui/widgets/graph.py @@ -110,7 +110,7 @@ class DataGraph(QtWidgets.QWidget): def generateMissingSemesters(self, data: dict[list]): # join the data into a single dict with x values as key and y values as value - tmp_data = dict(zip(data["x"], data["y"])) + tmp_data = dict(zip(data["x"], data["y"], strict=False)) # split into dicts based on SoSe and WiSe SoSe_data = {k: v for k, v in tmp_data.items() if "SoSe" in k} WiSe_data = {k: v for k, v in tmp_data.items() if "WiSe" in k} diff --git a/src/utils/icon.py b/src/utils/icon.py index 64770a4..3ec662f 100644 --- a/src/utils/icon.py +++ b/src/utils/icon.py @@ -1,7 +1,8 @@ -from PyQt6 import QtCore, QtGui +import darkdetect + # from src import MyLogger from omegaconf import OmegaConf -import darkdetect +from PyQt6 import QtCore, QtGui config = OmegaConf.load("config.yaml") config = OmegaConf.load(f"{config.icon_path}/icons.yaml") @@ -11,14 +12,16 @@ dark = darkdetect.isDark() mode = "dark" if dark else "light" path = f"{path}/{mode}" + # log = MyLogger("Icon") class Icon: def __init__(self, icon_type, widget=None): - + self.icon = QtGui.QIcon() self.add_icon(icon_type) if widget is not None: widget.setIcon(self.icon) + def add_icon(self, icon_type): icon = config[icon_type] print(icon) @@ -28,11 +31,10 @@ class Icon: QtGui.QIcon.State.Off, ) - @staticmethod def icondata(self): return self.icon if __name__ == "__main__": - print("This is a module and can not be executed directly.") \ No newline at end of file + print("This is a module and can not be executed directly.") diff --git a/test/bookgrabbertest.py b/test/bookgrabbertest.py index 08186e3..a744df6 100644 --- a/test/bookgrabbertest.py +++ b/test/bookgrabbertest.py @@ -1,6 +1,6 @@ from src.backend.database import Database from src.logic.webrequest import BibTextTransformer, WebRequest - +import sqlite3 class BookGrabber: