From 50dd03aee7d6512a6ef2b028743e514cd3b894db Mon Sep 17 00:00:00 2001 From: WorldTeacher Date: Mon, 7 Apr 2025 07:49:38 +0200 Subject: [PATCH 1/5] extract printer mail to settings file --- src/utils/richtext.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/richtext.py b/src/utils/richtext.py index ccc3a97..9ceb250 100644 --- a/src/utils/richtext.py +++ b/src/utils/richtext.py @@ -167,7 +167,7 @@ class SemesterDocument: port = config.mail.port sender_email = config.mail.sender password = config.mail.password - receiver = "mobileprint@ph-freiburg.de" + receiver = config.mail.printer_mail message = MIMEMultipart() message["From"] = sender_email message["To"] = receiver -- 2.49.1 From dbefd2049fc9bfeda98c2d52cd148c994cfd3cc9 Mon Sep 17 00:00:00 2001 From: WorldTeacher Date: Mon, 7 Apr 2025 07:52:01 +0200 Subject: [PATCH 2/5] add mail to deliver deletion information --- ...ion zur Auflösung des Semesterapparates.eml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 mail_vorlagen/Information zur Auflösung des Semesterapparates.eml diff --git a/mail_vorlagen/Information zur Auflösung des Semesterapparates.eml b/mail_vorlagen/Information zur Auflösung des Semesterapparates.eml new file mode 100644 index 0000000..45ca60f --- /dev/null +++ b/mail_vorlagen/Information zur Auflösung des Semesterapparates.eml @@ -0,0 +1,18 @@ +Subject: Information zur Auflösung des Semesterapparates {AppNr} - {Appname} +MIME-Version: 1.0 +Content-Type: text/html; charset="UTF-8" +Content-Transfer-Encoding: 8bit + + + + + + +

{greeting}

+


+

Ihr Semesterapparat "{Appname} ({AppNr})" wurde wie besprochen aufgelöst.

+

Die Medien sind von nun an wieder in den Regalen zu finden.

+


+

-- 

+
{signature}

+

\ No newline at end of file -- 2.49.1 From ac32b86b175d3a057e1f9ae64f007472402a3d72 Mon Sep 17 00:00:00 2001 From: WorldTeacher Date: Mon, 7 Apr 2025 07:53:36 +0200 Subject: [PATCH 3/5] fix bug in extend_loan function --- src/backend/database.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/database.py b/src/backend/database.py index de43c0c..16c13a9 100644 --- a/src/backend/database.py +++ b/src/backend/database.py @@ -47,6 +47,7 @@ class Database: if db_path is None: self.db_path = self.database.path + self.database.name self.db_path = self.db_path.replace("~", str(Path.home())) + logger.debug(self.db_path) else: self.db_path = db_path self.checkDatabaseStatus() @@ -54,7 +55,6 @@ class Database: def checkDatabaseStatus(self): path = self.database.path path = path.replace("~", str(Path.home())) - # print(path) path = os.path.abspath(path) if not os.path.exists(path): # create path @@ -181,7 +181,7 @@ class Database: # log_message = f"Querying database with query {query}" if "INTO user" in query: log_message = f"Querying database with query {query}" - logger.debug(log_message) + logger.debug(f"DB Query: {log_message}") try: cursor.execute(query, args) rv = cursor.fetchall() @@ -816,7 +816,7 @@ class Database: ) else: self.query_db( - "UPDATE semesterapparat SET verlängerung_bis=?, verlängerung_am=? WHERE appnr=?", + "UPDATE semesterapparat SET verlängerung_bis=?, verlängert_am=? WHERE appnr=?", (newDate, today, app_id), ) -- 2.49.1 From 6ff7a70d112f26986b9095bfc492e0e61c553214 Mon Sep 17 00:00:00 2001 From: WorldTeacher Date: Mon, 7 Apr 2025 07:53:57 +0200 Subject: [PATCH 4/5] rework logging, fix calculation error --- src/backend/semester.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/backend/semester.py b/src/backend/semester.py index 7fcee86..fadbae6 100644 --- a/src/backend/semester.py +++ b/src/backend/semester.py @@ -11,7 +11,9 @@ class Semester: _semester: str | None = None _month: int | None = datetime.datetime.now().month value: str = None - + logger.debug( + f"Initialized Semester class with values: month: {_month}, semester: {_semester}, year {_year}" + ) def __post_init__(self): if isinstance(self._year, str): self._year = int(self._year) @@ -27,7 +29,7 @@ class Semester: return self.value def generateSemester(self): - if self._month < 4 or self._month < 9: + if self._month <= 3 or self._month > 9: self._semester = "WiSe" else: self._semester = "SoSe" @@ -36,11 +38,12 @@ class Semester: def computeValue(self): # year is only last two digits year = self._year + valueyear = str(year) if self._semester == "WiSe": if self._month < 4: valueyear = str(year - 1) + "/" + str(year) - else: - valueyear = str(year) + else: + valueyear = str(year) + "/" + str(year + 1) self.value = f"{self._semester} {valueyear}" @logger.catch -- 2.49.1 From 921a84304ff3943636691fa29e26f4877cf4d006 Mon Sep 17 00:00:00 2001 From: WorldTeacher Date: Mon, 7 Apr 2025 07:54:34 +0200 Subject: [PATCH 5/5] add printer mail to config --- config/config.py | 1 + src/ui/dialogs/dialog_sources/Ui_settings.py | 211 ++++++------------- src/ui/dialogs/dialog_sources/settings.ui | 94 +++++---- src/ui/dialogs/settings.py | 3 + 4 files changed, 124 insertions(+), 185 deletions(-) diff --git a/config/config.py b/config/config.py index a5d982e..8619b2a 100644 --- a/config/config.py +++ b/config/config.py @@ -37,6 +37,7 @@ class Mail: sender: str password: str use_user_name: bool + printer_mail: str user_name: str signature: str | None = None empty_signature = """ diff --git a/src/ui/dialogs/dialog_sources/Ui_settings.py b/src/ui/dialogs/dialog_sources/Ui_settings.py index 8037f20..8ee3c85 100644 --- a/src/ui/dialogs/dialog_sources/Ui_settings.py +++ b/src/ui/dialogs/dialog_sources/Ui_settings.py @@ -14,10 +14,7 @@ class Ui_Dialog(object): Dialog.setObjectName("Dialog") Dialog.setWindowModality(QtCore.Qt.WindowModality.NonModal) Dialog.resize(651, 679) - sizePolicy = QtWidgets.QSizePolicy( - QtWidgets.QSizePolicy.Policy.MinimumExpanding, - QtWidgets.QSizePolicy.Policy.MinimumExpanding, - ) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.MinimumExpanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(Dialog.sizePolicy().hasHeightForWidth()) @@ -25,10 +22,7 @@ class Ui_Dialog(object): self.verticalLayout = QtWidgets.QVBoxLayout(Dialog) self.verticalLayout.setObjectName("verticalLayout") self.toolBox = QtWidgets.QToolBox(parent=Dialog) - sizePolicy = QtWidgets.QSizePolicy( - QtWidgets.QSizePolicy.Policy.MinimumExpanding, - QtWidgets.QSizePolicy.Policy.MinimumExpanding, - ) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.MinimumExpanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.toolBox.sizePolicy().hasHeightForWidth()) @@ -37,10 +31,7 @@ class Ui_Dialog(object): self.toolBox.setObjectName("toolBox") self.page_1 = QtWidgets.QWidget() self.page_1.setGeometry(QtCore.QRect(0, 0, 633, 511)) - sizePolicy = QtWidgets.QSizePolicy( - QtWidgets.QSizePolicy.Policy.MinimumExpanding, - QtWidgets.QSizePolicy.Policy.MinimumExpanding, - ) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.MinimumExpanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.page_1.sizePolicy().hasHeightForWidth()) @@ -73,12 +64,7 @@ class Ui_Dialog(object): self.save_path = QtWidgets.QLineEdit(parent=self.page_1) self.save_path.setObjectName("save_path") self.gridLayout_3.addWidget(self.save_path, 2, 1, 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_3.addItem(spacerItem, 3, 1, 1, 1) self.toolBox.addItem(self.page_1, "") self.page_2 = QtWidgets.QWidget() @@ -99,10 +85,7 @@ class Ui_Dialog(object): self.label_3.setObjectName("label_3") self.gridLayout.addWidget(self.label_3, 1, 0, 1, 1) self.zotero_api_key = QtWidgets.QLineEdit(parent=self.page_2) - self.zotero_api_key.setInputMethodHints( - QtCore.Qt.InputMethodHint.ImhHiddenText - | QtCore.Qt.InputMethodHint.ImhSensitiveData - ) + self.zotero_api_key.setInputMethodHints(QtCore.Qt.InputMethodHint.ImhHiddenText|QtCore.Qt.InputMethodHint.ImhSensitiveData) self.zotero_api_key.setObjectName("zotero_api_key") self.gridLayout.addWidget(self.zotero_api_key, 0, 2, 1, 1) self.label_2 = QtWidgets.QLabel(parent=self.page_2) @@ -112,12 +95,7 @@ class Ui_Dialog(object): self.toggle_api_visibility.setText("") self.toggle_api_visibility.setObjectName("toggle_api_visibility") self.gridLayout.addWidget(self.toggle_api_visibility, 0, 3, 1, 1) - 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.gridLayout.addItem(spacerItem1, 3, 2, 1, 1) self.toolBox.addItem(self.page_2, "") self.page_3 = QtWidgets.QWidget() @@ -133,67 +111,63 @@ class Ui_Dialog(object): self.horizontalLayout_4.setObjectName("horizontalLayout_4") self.gridLayout_2 = QtWidgets.QGridLayout() self.gridLayout_2.setObjectName("gridLayout_2") - self.smtp_address = QtWidgets.QLineEdit(parent=self.email_settingsPage1_2) - self.smtp_address.setClearButtonEnabled(True) - self.smtp_address.setObjectName("smtp_address") - self.gridLayout_2.addWidget(self.smtp_address, 0, 1, 1, 1) - self.label_8 = QtWidgets.QLabel(parent=self.email_settingsPage1_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.email_settingsPage1_2 - ) + self.use_username_smtp_login = QtWidgets.QCheckBox(parent=self.email_settingsPage1_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) + self.label_6 = QtWidgets.QLabel(parent=self.email_settingsPage1_2) + self.label_6.setObjectName("label_6") + self.gridLayout_2.addWidget(self.label_6, 1, 0, 1, 1) + self.smtp_port = QtWidgets.QLineEdit(parent=self.email_settingsPage1_2) + 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) + self.label_7 = QtWidgets.QLabel(parent=self.email_settingsPage1_2) + self.label_7.setObjectName("label_7") + self.gridLayout_2.addWidget(self.label_7, 2, 0, 1, 1) + self.sender_email = QtWidgets.QLineEdit(parent=self.email_settingsPage1_2) + 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) self.mail_username = QtWidgets.QLineEdit(parent=self.email_settingsPage1_2) self.mail_username.setClearButtonEnabled(True) self.mail_username.setObjectName("mail_username") self.gridLayout_2.addWidget(self.mail_username, 3, 1, 1, 1) - self.smtp_port = QtWidgets.QLineEdit(parent=self.email_settingsPage1_2) - 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) - self.label_10 = QtWidgets.QLabel(parent=self.email_settingsPage1_2) - self.label_10.setObjectName("label_10") - self.gridLayout_2.addWidget(self.label_10, 5, 0, 1, 1) - self.label_7 = QtWidgets.QLabel(parent=self.email_settingsPage1_2) - self.label_7.setObjectName("label_7") - self.gridLayout_2.addWidget(self.label_7, 2, 0, 1, 1) self.label_9 = QtWidgets.QLabel(parent=self.email_settingsPage1_2) self.label_9.setText("") self.label_9.setObjectName("label_9") - self.gridLayout_2.addWidget(self.label_9, 6, 0, 1, 1) - self.sender_email = QtWidgets.QLineEdit(parent=self.email_settingsPage1_2) - 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) - self.label = QtWidgets.QLabel(parent=self.email_settingsPage1_2) - self.label.setObjectName("label") - self.gridLayout_2.addWidget(self.label, 0, 0, 1, 1) + self.gridLayout_2.addWidget(self.label_9, 7, 0, 1, 1) self.password = QtWidgets.QLineEdit(parent=self.email_settingsPage1_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) - self.label_6 = QtWidgets.QLabel(parent=self.email_settingsPage1_2) - self.label_6.setObjectName("label_6") - self.gridLayout_2.addWidget(self.label_6, 1, 0, 1, 1) + self.smtp_address = QtWidgets.QLineEdit(parent=self.email_settingsPage1_2) + self.smtp_address.setClearButtonEnabled(True) + self.smtp_address.setObjectName("smtp_address") + self.gridLayout_2.addWidget(self.smtp_address, 0, 1, 1, 1) + self.label = QtWidgets.QLabel(parent=self.email_settingsPage1_2) + self.label.setObjectName("label") + self.gridLayout_2.addWidget(self.label, 0, 0, 1, 1) + self.label_10 = QtWidgets.QLabel(parent=self.email_settingsPage1_2) + self.label_10.setObjectName("label_10") + self.gridLayout_2.addWidget(self.label_10, 5, 0, 1, 1) self.togglePassword = QtWidgets.QPushButton(parent=self.email_settingsPage1_2) self.togglePassword.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) self.togglePassword.setText("") self.togglePassword.setObjectName("togglePassword") self.gridLayout_2.addWidget(self.togglePassword, 5, 2, 1, 1) + self.label_8 = QtWidgets.QLabel(parent=self.email_settingsPage1_2) + self.label_8.setObjectName("label_8") + self.gridLayout_2.addWidget(self.label_8, 3, 0, 1, 1) + self.label_13 = QtWidgets.QLabel(parent=self.email_settingsPage1_2) + self.label_13.setObjectName("label_13") + self.gridLayout_2.addWidget(self.label_13, 6, 0, 1, 1) + self.printermail = QtWidgets.QLineEdit(parent=self.email_settingsPage1_2) + self.printermail.setObjectName("printermail") + self.gridLayout_2.addWidget(self.printermail, 6, 1, 1, 1) self.horizontalLayout_4.addLayout(self.gridLayout_2) self.email_settings.addTab(self.email_settingsPage1_2, "") self.email_settingsPage2_2 = QtWidgets.QWidget() @@ -204,12 +178,7 @@ class Ui_Dialog(object): self.verticalLayout_2.setObjectName("verticalLayout_2") self.horizontalLayout_3 = QtWidgets.QHBoxLayout() self.horizontalLayout_3.setObjectName("horizontalLayout_3") - 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.bold = QtWidgets.QPushButton(parent=self.email_settingsPage2_2) self.bold.setCheckable(True) @@ -223,12 +192,7 @@ class Ui_Dialog(object): self.underscore.setCheckable(True) self.underscore.setObjectName("underscore") self.horizontalLayout_3.addWidget(self.underscore) - 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_3.addItem(spacerItem3) self.verticalLayout_2.addLayout(self.horizontalLayout_3) self.horizontalLayout = QtWidgets.QHBoxLayout() @@ -254,12 +218,7 @@ class Ui_Dialog(object): self.font_size.addItem("") self.font_size.addItem("") self.horizontalLayout.addWidget(self.font_size) - spacerItem4 = QtWidgets.QSpacerItem( - 40, - 20, - QtWidgets.QSizePolicy.Policy.Expanding, - QtWidgets.QSizePolicy.Policy.Minimum, - ) + spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout.addItem(spacerItem4) self.verticalLayout_2.addLayout(self.horizontalLayout) self.verticalLayout_3.addLayout(self.verticalLayout_2) @@ -316,10 +275,7 @@ class Ui_Dialog(object): self.verticalLayout.addWidget(self.toolBox) self.buttonBox = QtWidgets.QDialogButtonBox(parent=Dialog) 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.verticalLayout.addWidget(self.buttonBox) self.label_5.setBuddy(self.db_name) @@ -327,63 +283,39 @@ class Ui_Dialog(object): self.label_11.setBuddy(self.db_path) self.retranslateUi(Dialog) - self.toolBox.setCurrentIndex(3) + self.toolBox.setCurrentIndex(2) 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) def retranslateUi(self, Dialog): _translate = QtCore.QCoreApplication.translate Dialog.setWindowTitle(_translate("Dialog", "Dialog")) self.db_name.setText(_translate("Dialog", "sap.db")) - self.label_5.setToolTip( - _translate( - "Dialog", - '

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

', - ) - ) + self.label_5.setToolTip(_translate("Dialog", "

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

")) self.label_5.setText(_translate("Dialog", "Datenbankname")) - self.label_12.setToolTip( - _translate( - "Dialog", - "Pfad, an dem heruntergeladene Dateien gespeichert werden sollen", - ) - ) + self.label_12.setToolTip(_translate("Dialog", "Pfad, an dem heruntergeladene Dateien gespeichert werden sollen")) self.label_12.setText(_translate("Dialog", "Temporäre Dateien")) self.label_11.setText(_translate("Dialog", "Datenbankpfad")) self.tb_set_save_path.setText(_translate("Dialog", "...")) self.tb_select_db.setText(_translate("Dialog", "...")) - self.toolBox.setItemText( - self.toolBox.indexOf(self.page_1), _translate("Dialog", "Datenbank") - ) + self.toolBox.setItemText(self.toolBox.indexOf(self.page_1), _translate("Dialog", "Datenbank")) self.label_4.setText(_translate("Dialog", "Bibliothekstyp")) self.label_3.setText(_translate("Dialog", "Bibliotheks-ID")) self.label_2.setText(_translate("Dialog", "API Key")) - self.toolBox.setItemText( - self.toolBox.indexOf(self.page_2), _translate("Dialog", "Zotero") - ) - 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.label_10.setText(_translate("Dialog", "Passwort")) - self.label_7.setText(_translate("Dialog", "Sender-eMail")) - self.label.setText(_translate("Dialog", "SMTP-Server")) + self.toolBox.setItemText(self.toolBox.indexOf(self.page_2), _translate("Dialog", "Zotero")) + 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.label_6.setText(_translate("Dialog", "Port")) - self.email_settings.setTabText( - self.email_settings.indexOf(self.email_settingsPage1_2), - _translate("Dialog", "Allgemeines"), - ) + self.label_7.setText(_translate("Dialog", "Sender-eMail")) + self.mail_username.setStatusTip(_translate("Dialog", "Kürzel, von der Hochschule vergeben, bsp: Aky547")) + self.label.setText(_translate("Dialog", "SMTP-Server")) + self.label_10.setText(_translate("Dialog", "Passwort")) + self.label_8.setText(_translate("Dialog", "Nutzername")) + self.label_13.setText(_translate("Dialog", "Printmail")) + 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")) @@ -403,14 +335,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.toolBox.setItemText( - self.toolBox.indexOf(self.page_3), _translate("Dialog", "e-Mail") - ) + self.email_settings.setTabText(self.email_settings.indexOf(self.email_settingsPage2_2), _translate("Dialog", "Signatur")) + self.toolBox.setItemText(self.toolBox.indexOf(self.page_3), _translate("Dialog", "e-Mail")) self.groupBox.setTitle(_translate("Dialog", "Farben")) - self.toolBox.setItemText( - self.toolBox.indexOf(self.page_4), _translate("Dialog", "Icons") - ) + self.toolBox.setItemText(self.toolBox.indexOf(self.page_4), _translate("Dialog", "Icons")) diff --git a/src/ui/dialogs/dialog_sources/settings.ui b/src/ui/dialogs/dialog_sources/settings.ui index fc357eb..81faa04 100644 --- a/src/ui/dialogs/dialog_sources/settings.ui +++ b/src/ui/dialogs/dialog_sources/settings.ui @@ -35,7 +35,7 @@ Qt::ImhNone - 3 + 2 @@ -232,20 +232,6 @@ - - - - true - - - - - - - Nutzername - - - @@ -260,13 +246,10 @@ - - - - Kürzel, von der Hochschule vergeben, bsp: Aky547 - - - true + + + + Port @@ -280,13 +263,6 @@ - - - - Passwort - - - @@ -294,13 +270,6 @@ - - - - - - - @@ -311,10 +280,20 @@ - - + + + + Kürzel, von der Hochschule vergeben, bsp: Aky547 + + + true + + + + + - SMTP-Server + @@ -328,10 +307,24 @@ - - + + + + true + + + + + - Port + SMTP-Server + + + + + + + Passwort @@ -345,6 +338,23 @@ + + + + Nutzername + + + + + + + Printmail + + + + + + diff --git a/src/ui/dialogs/settings.py b/src/ui/dialogs/settings.py index 6c09c52..364f331 100644 --- a/src/ui/dialogs/settings.py +++ b/src/ui/dialogs/settings.py @@ -78,6 +78,8 @@ class Settings(QtWidgets.QDialog, _settings): self.sender_email.setText(settings.mail.sender) self.mail_username.setText(settings.mail.user_name) self.password.setText(settings.mail.password) + self.printermail.setText(settings.mail.printer_mail) + self.printermail.setPlaceholderText("E-Mail-Adresse des Druckers") self.use_username_smtp_login.setChecked( settings.mail.use_user_name if settings.mail.use_user_name else False ) @@ -200,6 +202,7 @@ class Settings(QtWidgets.QDialog, _settings): settings.set_mail_attr( "use_user_name", self.use_username_smtp_login.isChecked() ) + settings.set_mail_attr("printer_mail", self.printermail.text()) settings.set_mail_attr("signature", signature) settings.set_zotero_attr("api_key", self.zotero_api_key.text()) settings.set_zotero_attr("library_id", self.zotero_library_id.text()) -- 2.49.1