From 9054c46f79316809b5d08466003fc82e0247ec55 Mon Sep 17 00:00:00 2001 From: WorldTeacher <41587052+WorldTeacher@users.noreply.github.com> Date: Wed, 11 Sep 2024 14:47:38 +0200 Subject: [PATCH] ui changes --- src/ui/sources/Ui_dialog_settings.py | 93 ++++++++++++++---- src/ui/sources/Ui_dialog_settings.ui.py | 8 ++ src/ui/sources/Ui_main_UserInterface.py | 5 +- src/ui/sources/Ui_main_userData.py | 4 + src/ui/sources/dialog_settings.ui | 119 ++++++++++++++++++++++-- src/ui/sources/main_UserInterface.ui | 7 +- src/ui/sources/main_userData.ui | 7 ++ 7 files changed, 211 insertions(+), 32 deletions(-) create mode 100644 src/ui/sources/Ui_dialog_settings.ui.py diff --git a/src/ui/sources/Ui_dialog_settings.py b/src/ui/sources/Ui_dialog_settings.py index 1224deb..81171d8 100644 --- a/src/ui/sources/Ui_dialog_settings.py +++ b/src/ui/sources/Ui_dialog_settings.py @@ -12,7 +12,7 @@ from PyQt6 import QtCore, QtGui, QtWidgets class Ui_Dialog(object): def setupUi(self, Dialog): Dialog.setObjectName("Dialog") - Dialog.resize(422, 184) + Dialog.resize(492, 306) self.formLayout = QtWidgets.QFormLayout(Dialog) self.formLayout.setObjectName("formLayout") self.label = QtWidgets.QLabel(parent=Dialog) @@ -24,54 +24,95 @@ class Ui_Dialog(object): self.label_2 = QtWidgets.QLabel(parent=Dialog) self.label_2.setObjectName("label_2") self.formLayout.setWidget(1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_2) - self.default_loan_duration = QtWidgets.QLineEdit(parent=Dialog) - self.default_loan_duration.setObjectName("default_loan_duration") - self.formLayout.setWidget(1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.default_loan_duration) self.label_3 = QtWidgets.QLabel(parent=Dialog) self.label_3.setObjectName("label_3") - self.formLayout.setWidget(2, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_3) - self.gridLayout = QtWidgets.QGridLayout() - self.gridLayout.setObjectName("gridLayout") + self.formLayout.setWidget(3, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_3) + self.databasesettings = QtWidgets.QGridLayout() + self.databasesettings.setObjectName("databasesettings") self.database_name = QtWidgets.QLineEdit(parent=Dialog) self.database_name.setObjectName("database_name") - self.gridLayout.addWidget(self.database_name, 1, 1, 1, 1) + self.databasesettings.addWidget(self.database_name, 1, 1, 1, 1) self.label_4 = QtWidgets.QLabel(parent=Dialog) self.label_4.setObjectName("label_4") - self.gridLayout.addWidget(self.label_4, 0, 0, 1, 1) + self.databasesettings.addWidget(self.label_4, 0, 0, 1, 1) self.label_6 = QtWidgets.QLabel(parent=Dialog) self.label_6.setObjectName("label_6") - self.gridLayout.addWidget(self.label_6, 2, 0, 1, 1) + self.databasesettings.addWidget(self.label_6, 2, 0, 1, 1) self.database_path = QtWidgets.QLineEdit(parent=Dialog) self.database_path.setObjectName("database_path") - self.gridLayout.addWidget(self.database_path, 0, 1, 1, 1) + self.databasesettings.addWidget(self.database_path, 0, 1, 1, 1) self.database_backupLocation = QtWidgets.QLineEdit(parent=Dialog) self.database_backupLocation.setObjectName("database_backupLocation") - self.gridLayout.addWidget(self.database_backupLocation, 2, 1, 1, 1) + self.databasesettings.addWidget(self.database_backupLocation, 2, 1, 1, 1) self.label_5 = QtWidgets.QLabel(parent=Dialog) self.label_5.setObjectName("label_5") - self.gridLayout.addWidget(self.label_5, 1, 0, 1, 1) + self.databasesettings.addWidget(self.label_5, 1, 0, 1, 1) self.btn_select_database_path = QtWidgets.QToolButton(parent=Dialog) self.btn_select_database_path.setObjectName("btn_select_database_path") - self.gridLayout.addWidget(self.btn_select_database_path, 0, 2, 1, 1) + self.databasesettings.addWidget(self.btn_select_database_path, 0, 2, 1, 1) self.btn_select_database_name = QtWidgets.QToolButton(parent=Dialog) self.btn_select_database_name.setObjectName("btn_select_database_name") - self.gridLayout.addWidget(self.btn_select_database_name, 1, 2, 1, 1) + self.databasesettings.addWidget(self.btn_select_database_name, 1, 2, 1, 1) self.btn_select_database_backupLocation = QtWidgets.QToolButton(parent=Dialog) self.btn_select_database_backupLocation.setObjectName("btn_select_database_backupLocation") - self.gridLayout.addWidget(self.btn_select_database_backupLocation, 2, 2, 1, 1) - self.formLayout.setLayout(2, QtWidgets.QFormLayout.ItemRole.FieldRole, self.gridLayout) + self.databasesettings.addWidget(self.btn_select_database_backupLocation, 2, 2, 1, 1) + self.formLayout.setLayout(3, QtWidgets.QFormLayout.ItemRole.FieldRole, self.databasesettings) + self.label_7 = QtWidgets.QLabel(parent=Dialog) + self.label_7.setObjectName("label_7") + self.formLayout.setWidget(2, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_7) + self.default_loan_duration = QtWidgets.QSpinBox(parent=Dialog) + self.default_loan_duration.setProperty("value", 7) + self.default_loan_duration.setObjectName("default_loan_duration") + self.formLayout.setWidget(1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.default_loan_duration) + self.delete_inactive_user_duration = QtWidgets.QSpinBox(parent=Dialog) + self.delete_inactive_user_duration.setMaximum(9999) + self.delete_inactive_user_duration.setProperty("value", 365) + self.delete_inactive_user_duration.setObjectName("delete_inactive_user_duration") + self.formLayout.setWidget(2, QtWidgets.QFormLayout.ItemRole.FieldRole, self.delete_inactive_user_duration) 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.Ok) self.buttonBox.setObjectName("buttonBox") - self.formLayout.setWidget(3, QtWidgets.QFormLayout.ItemRole.FieldRole, self.buttonBox) + self.formLayout.setWidget(5, QtWidgets.QFormLayout.ItemRole.FieldRole, self.buttonBox) + self.label_9 = QtWidgets.QLabel(parent=Dialog) + self.label_9.setObjectName("label_9") + self.formLayout.setWidget(4, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_9) + self.gridLayout = QtWidgets.QGridLayout() + self.gridLayout.setObjectName("gridLayout") + self.btn_select_report_path = QtWidgets.QToolButton(parent=Dialog) + self.btn_select_report_path.setObjectName("btn_select_report_path") + self.gridLayout.addWidget(self.btn_select_report_path, 2, 2, 1, 1) + self.label_10 = QtWidgets.QLabel(parent=Dialog) + self.label_10.setText("") + self.label_10.setObjectName("label_10") + self.gridLayout.addWidget(self.label_10, 1, 0, 1, 1) + self.check_generate_report = QtWidgets.QCheckBox(parent=Dialog) + self.check_generate_report.setObjectName("check_generate_report") + self.gridLayout.addWidget(self.check_generate_report, 1, 1, 1, 1) + self.report_path = QtWidgets.QLineEdit(parent=Dialog) + self.report_path.setObjectName("report_path") + self.gridLayout.addWidget(self.report_path, 2, 1, 1, 1) + self.label_8 = QtWidgets.QLabel(parent=Dialog) + self.label_8.setObjectName("label_8") + self.gridLayout.addWidget(self.label_8, 2, 0, 1, 1) + self.label_11 = QtWidgets.QLabel(parent=Dialog) + self.label_11.setObjectName("label_11") + self.gridLayout.addWidget(self.label_11, 0, 0, 1, 1) + self.report_day = QtWidgets.QComboBox(parent=Dialog) + self.report_day.setObjectName("report_day") + self.report_day.addItem("") + self.report_day.addItem("") + self.report_day.addItem("") + self.report_day.addItem("") + self.report_day.addItem("") + self.gridLayout.addWidget(self.report_day, 0, 1, 1, 1) + self.formLayout.setLayout(4, QtWidgets.QFormLayout.ItemRole.FieldRole, self.gridLayout) self.retranslateUi(Dialog) self.buttonBox.accepted.connect(Dialog.accept) # type: ignore self.buttonBox.rejected.connect(Dialog.reject) # type: ignore QtCore.QMetaObject.connectSlotsByName(Dialog) - Dialog.setTabOrder(self.institution_name, self.default_loan_duration) - Dialog.setTabOrder(self.default_loan_duration, self.database_path) + Dialog.setTabOrder(self.institution_name, self.database_path) Dialog.setTabOrder(self.database_path, self.database_name) Dialog.setTabOrder(self.database_name, self.database_backupLocation) Dialog.setTabOrder(self.database_backupLocation, self.btn_select_database_path) @@ -90,3 +131,15 @@ class Ui_Dialog(object): self.btn_select_database_path.setText(_translate("Dialog", "...")) self.btn_select_database_name.setText(_translate("Dialog", "...")) self.btn_select_database_backupLocation.setText(_translate("Dialog", "...")) + self.label_7.setText(_translate("Dialog", "Inaktive Nutzer\n" +"Löschen nach")) + self.label_9.setText(_translate("Dialog", "Bericht")) + self.btn_select_report_path.setText(_translate("Dialog", "...")) + self.check_generate_report.setText(_translate("Dialog", "Bericht erstellen")) + self.label_8.setText(_translate("Dialog", "Speicherpfad")) + self.label_11.setText(_translate("Dialog", "Tag")) + self.report_day.setItemText(0, _translate("Dialog", "Montag")) + self.report_day.setItemText(1, _translate("Dialog", "Dienstag")) + self.report_day.setItemText(2, _translate("Dialog", "Mittwoch")) + self.report_day.setItemText(3, _translate("Dialog", "Donnerstag")) + self.report_day.setItemText(4, _translate("Dialog", "Freitag")) diff --git a/src/ui/sources/Ui_dialog_settings.ui.py b/src/ui/sources/Ui_dialog_settings.ui.py new file mode 100644 index 0000000..4425410 --- /dev/null +++ b/src/ui/sources/Ui_dialog_settings.ui.py @@ -0,0 +1,8 @@ +# Form implementation generated from reading ui file 'c:\Users\aky547\GitHub\LibrarySystem\src\ui\sources\dialog_settings.ui.iRVFlN' +# +# 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. + + diff --git a/src/ui/sources/Ui_main_UserInterface.py b/src/ui/sources/Ui_main_UserInterface.py index af55f8d..aeb26e0 100644 --- a/src/ui/sources/Ui_main_UserInterface.py +++ b/src/ui/sources/Ui_main_UserInterface.py @@ -173,10 +173,12 @@ class Ui_MainWindow(object): self.actionAusleihistorie.setObjectName("actionAusleihistorie") self.actionBericht_erstellen = QtGui.QAction(parent=MainWindow) self.actionBericht_erstellen.setObjectName("actionBericht_erstellen") + self.actionNutzer_3 = QtGui.QAction(parent=MainWindow) + self.actionNutzer_3.setObjectName("actionNutzer_3") self.menuDatei.addAction(self.actionEinstellungen) self.menuDatei.addAction(self.actionBeenden) self.menuHotkeys.addAction(self.actionRueckgabemodus) - self.menuHotkeys.addAction(self.actionNutzer) + self.menuFenster.addAction(self.actionNutzer) self.menuFenster.addAction(self.actionAusleihistorie) self.menuFenster.addAction(self.actionBericht_erstellen) self.menubar.addAction(self.menuDatei.menuAction()) @@ -224,3 +226,4 @@ class Ui_MainWindow(object): self.actionAusleihistorie.setShortcut(_translate("MainWindow", "F8")) self.actionBericht_erstellen.setText(_translate("MainWindow", "Bericht erstellen")) self.actionBericht_erstellen.setShortcut(_translate("MainWindow", "F7")) + self.actionNutzer_3.setText(_translate("MainWindow", "Nutzer")) diff --git a/src/ui/sources/Ui_main_userData.py b/src/ui/sources/Ui_main_userData.py index 529080b..c901d3f 100644 --- a/src/ui/sources/Ui_main_userData.py +++ b/src/ui/sources/Ui_main_userData.py @@ -60,6 +60,9 @@ class Ui_MainWindow(object): self.gridLayout.addWidget(self.mail, 2, 1, 1, 1) self.horizontalLayout_4 = QtWidgets.QHBoxLayout() self.horizontalLayout_4.setObjectName("horizontalLayout_4") + self.label_5 = QtWidgets.QLabel(parent=self.centralwidget) + self.label_5.setObjectName("label_5") + self.horizontalLayout_4.addWidget(self.label_5) self.deleteUser = QtWidgets.QToolButton(parent=self.centralwidget) self.deleteUser.setMinimumSize(QtCore.QSize(30, 30)) self.deleteUser.setText("") @@ -171,6 +174,7 @@ class Ui_MainWindow(object): self.label.setText(_translate("MainWindow", "Name, Vorname")) self.label_3.setText(_translate("MainWindow", "Mail")) self.label_2.setText(_translate("MainWindow", "Matrikelnummer")) + self.label_5.setText(_translate("MainWindow", "Nutzer Löschen")) self.label_4.setText(_translate("MainWindow", "Medien")) self.radio_allLoanedMedia.setText(_translate("MainWindow", "Alle Ausleihen")) self.radio_currentlyLoaned.setText(_translate("MainWindow", "Aktuell entliehen")) diff --git a/src/ui/sources/dialog_settings.ui b/src/ui/sources/dialog_settings.ui index 201e573..c41caff 100644 --- a/src/ui/sources/dialog_settings.ui +++ b/src/ui/sources/dialog_settings.ui @@ -6,8 +6,8 @@ 0 0 - 422 - 184 + 492 + 306 @@ -31,18 +31,15 @@ - - - - + Datenbank - - + + @@ -96,7 +93,32 @@ - + + + + Inaktive Nutzer +Löschen nach + + + + + + + 7 + + + + + + + 9999 + + + 365 + + + + Qt::Horizontal @@ -106,11 +128,88 @@ + + + + Bericht + + + + + + + + + ... + + + + + + + + + + + + + + Bericht erstellen + + + + + + + + + + Speicherpfad + + + + + + + Tag + + + + + + + + Montag + + + + + Dienstag + + + + + Mittwoch + + + + + Donnerstag + + + + + Freitag + + + + + + institution_name - default_loan_duration database_path database_name database_backupLocation diff --git a/src/ui/sources/main_UserInterface.ui b/src/ui/sources/main_UserInterface.ui index fe32f42..7baf478 100644 --- a/src/ui/sources/main_UserInterface.ui +++ b/src/ui/sources/main_UserInterface.ui @@ -308,12 +308,12 @@ Hotkeys - Fenster + @@ -369,6 +369,11 @@ F7 + + + Nutzer + + btn_createNewUser diff --git a/src/ui/sources/main_userData.ui b/src/ui/sources/main_userData.ui index 45817f1..d91d773 100644 --- a/src/ui/sources/main_userData.ui +++ b/src/ui/sources/main_userData.ui @@ -114,6 +114,13 @@ + + + + Nutzer Löschen + + +