From 634755452bc54d611d27ddfaf1e058e35d60a4b2 Mon Sep 17 00:00:00 2001 From: WorldTeacher <41587052+WorldTeacher@users.noreply.github.com> Date: Mon, 29 Jul 2024 10:22:25 +0200 Subject: [PATCH] update ui files and generated files --- src/ui/sources/Ui_dialog_addBook.py | 54 ++++++ src/ui/sources/Ui_dialog_addBook.ui.py | 8 + src/ui/sources/Ui_dialog_createUser.py | 3 + src/ui/sources/Ui_dialog_generateReport.py | 99 ++++++++++ src/ui/sources/Ui_dialog_generateReport.ui.py | 8 + src/ui/sources/Ui_dialog_settings.py | 2 +- src/ui/sources/Ui_main_Loans.py | 100 ++++++++++ src/ui/sources/Ui_main_UserInterface.py | 81 +++++--- src/ui/sources/Ui_main_userData.py | 14 +- src/ui/sources/dialog_addBook.ui | 71 +++++++ src/ui/sources/dialog_createUser.ui | 15 +- src/ui/sources/dialog_generateReport.ui | 173 ++++++++++++++++++ src/ui/sources/dialog_settings.ui | 4 +- src/ui/sources/main_Loans.ui | 148 +++++++++++++++ src/ui/sources/main_UserInterface.ui | 114 ++++++++---- src/ui/sources/main_userData.ui | 20 +- 16 files changed, 840 insertions(+), 74 deletions(-) create mode 100644 src/ui/sources/Ui_dialog_addBook.py create mode 100644 src/ui/sources/Ui_dialog_addBook.ui.py create mode 100644 src/ui/sources/Ui_dialog_generateReport.py create mode 100644 src/ui/sources/Ui_dialog_generateReport.ui.py create mode 100644 src/ui/sources/Ui_main_Loans.py create mode 100644 src/ui/sources/dialog_addBook.ui create mode 100644 src/ui/sources/dialog_generateReport.ui create mode 100644 src/ui/sources/main_Loans.ui diff --git a/src/ui/sources/Ui_dialog_addBook.py b/src/ui/sources/Ui_dialog_addBook.py new file mode 100644 index 0000000..01b4004 --- /dev/null +++ b/src/ui/sources/Ui_dialog_addBook.py @@ -0,0 +1,54 @@ +# Form implementation generated from reading ui file 'c:\Users\aky547\GitHub\LibrarySystem\src\ui\sources\dialog_addBook.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_Dialog(object): + def setupUi(self, Dialog): + Dialog.setObjectName("Dialog") + Dialog.resize(262, 100) + self.gridLayout = QtWidgets.QGridLayout(Dialog) + self.gridLayout.setObjectName("gridLayout") + self.book_signature = QtWidgets.QLineEdit(parent=Dialog) + self.book_signature.setObjectName("book_signature") + self.gridLayout.addWidget(self.book_signature, 1, 1, 1, 1) + self.label_2 = QtWidgets.QLabel(parent=Dialog) + self.label_2.setObjectName("label_2") + self.gridLayout.addWidget(self.label_2, 1, 0, 1, 1) + self.label = QtWidgets.QLabel(parent=Dialog) + self.label.setObjectName("label") + self.gridLayout.addWidget(self.label, 0, 0, 1, 1) + self.book_title = QtWidgets.QLineEdit(parent=Dialog) + self.book_title.setObjectName("book_title") + self.gridLayout.addWidget(self.book_title, 0, 1, 1, 1) + self.horizontalLayout = QtWidgets.QHBoxLayout() + self.horizontalLayout.setObjectName("horizontalLayout") + self.btn_save = QtWidgets.QPushButton(parent=Dialog) + self.btn_save.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) + self.btn_save.setObjectName("btn_save") + self.horizontalLayout.addWidget(self.btn_save) + self.btn_cancel = QtWidgets.QPushButton(parent=Dialog) + self.btn_cancel.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) + self.btn_cancel.setObjectName("btn_cancel") + self.horizontalLayout.addWidget(self.btn_cancel) + self.gridLayout.addLayout(self.horizontalLayout, 2, 1, 1, 1) + + self.retranslateUi(Dialog) + QtCore.QMetaObject.connectSlotsByName(Dialog) + Dialog.setTabOrder(self.book_title, self.book_signature) + Dialog.setTabOrder(self.book_signature, self.btn_save) + Dialog.setTabOrder(self.btn_save, self.btn_cancel) + + def retranslateUi(self, Dialog): + _translate = QtCore.QCoreApplication.translate + Dialog.setWindowTitle(_translate("Dialog", "Dialog")) + self.label_2.setText(_translate("Dialog", "Signatur")) + self.label.setText(_translate("Dialog", "Titel")) + self.btn_save.setText(_translate("Dialog", "Speichern")) + self.btn_cancel.setText(_translate("Dialog", "Abbrechen")) diff --git a/src/ui/sources/Ui_dialog_addBook.ui.py b/src/ui/sources/Ui_dialog_addBook.ui.py new file mode 100644 index 0000000..b972dcd --- /dev/null +++ b/src/ui/sources/Ui_dialog_addBook.ui.py @@ -0,0 +1,8 @@ +# Form implementation generated from reading ui file 'c:\Users\aky547\GitHub\LibrarySystem\src\ui\sources\dialog_addBook.ui.VLqeTH' +# +# 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_dialog_createUser.py b/src/ui/sources/Ui_dialog_createUser.py index 039367a..adb164c 100644 --- a/src/ui/sources/Ui_dialog_createUser.py +++ b/src/ui/sources/Ui_dialog_createUser.py @@ -53,6 +53,9 @@ class Ui_Dialog(object): def retranslateUi(self, Dialog): _translate = QtCore.QCoreApplication.translate Dialog.setWindowTitle(_translate("Dialog", "Nutzer anlegen")) + self.userno.setPlaceholderText(_translate("Dialog", "102888557")) self.label_2.setText(_translate("Dialog", "Matrikelnummer")) self.label_3.setText(_translate("Dialog", "Mail")) + self.user_mail.setPlaceholderText(_translate("Dialog", "email@ph-freiburg.de")) self.label.setText(_translate("Dialog", "Name, Vorname")) + self.username.setPlaceholderText(_translate("Dialog", "Nachname, Vorname")) diff --git a/src/ui/sources/Ui_dialog_generateReport.py b/src/ui/sources/Ui_dialog_generateReport.py new file mode 100644 index 0000000..258020d --- /dev/null +++ b/src/ui/sources/Ui_dialog_generateReport.py @@ -0,0 +1,99 @@ +# Form implementation generated from reading ui file 'c:\Users\aky547\GitHub\LibrarySystem\src\ui\sources\dialog_generateReport.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_Dialog(object): + def setupUi(self, Dialog): + Dialog.setObjectName("Dialog") + Dialog.resize(375, 206) + Dialog.setMinimumSize(QtCore.QSize(40, 0)) + self.verticalLayout = QtWidgets.QVBoxLayout(Dialog) + self.verticalLayout.setObjectName("verticalLayout") + self.label = QtWidgets.QLabel(parent=Dialog) + self.label.setObjectName("label") + self.verticalLayout.addWidget(self.label) + self.gridLayout = QtWidgets.QGridLayout() + self.gridLayout.setObjectName("gridLayout") + self.label_2 = QtWidgets.QLabel(parent=Dialog) + self.label_2.setObjectName("label_2") + self.gridLayout.addWidget(self.label_2, 0, 0, 1, 1) + self.horizontalLayout = QtWidgets.QHBoxLayout() + self.horizontalLayout.setObjectName("horizontalLayout") + self.radio_week = QtWidgets.QRadioButton(parent=Dialog) + self.radio_week.setObjectName("radio_week") + self.horizontalLayout.addWidget(self.radio_week) + self.radio_month = QtWidgets.QRadioButton(parent=Dialog) + self.radio_month.setObjectName("radio_month") + self.horizontalLayout.addWidget(self.radio_month) + self.radio_year = QtWidgets.QRadioButton(parent=Dialog) + self.radio_year.setObjectName("radio_year") + self.horizontalLayout.addWidget(self.radio_year) + self.gridLayout.addLayout(self.horizontalLayout, 1, 1, 1, 1) + self.reportlink = QtWidgets.QLabel(parent=Dialog) + self.reportlink.setText("") + self.reportlink.setObjectName("reportlink") + self.gridLayout.addWidget(self.reportlink, 2, 1, 1, 1) + self.dayslider = QtWidgets.QSlider(parent=Dialog) + self.dayslider.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) + self.dayslider.setMinimum(1) + self.dayslider.setMaximum(365) + self.dayslider.setOrientation(QtCore.Qt.Orientation.Horizontal) + self.dayslider.setInvertedControls(True) + self.dayslider.setTickPosition(QtWidgets.QSlider.TickPosition.TicksAbove) + self.dayslider.setTickInterval(10) + self.dayslider.setObjectName("dayslider") + self.gridLayout.addWidget(self.dayslider, 0, 1, 1, 1) + self.dayValue = QtWidgets.QLineEdit(parent=Dialog) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.dayValue.sizePolicy().hasHeightForWidth()) + self.dayValue.setSizePolicy(sizePolicy) + self.dayValue.setMinimumSize(QtCore.QSize(0, 0)) + self.dayValue.setMaximumSize(QtCore.QSize(40, 16777215)) + self.dayValue.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) + self.dayValue.setReadOnly(True) + self.dayValue.setObjectName("dayValue") + self.gridLayout.addWidget(self.dayValue, 0, 2, 1, 1) + self.radioButton = QtWidgets.QRadioButton(parent=Dialog) + self.radioButton.setText("") + self.radioButton.setCheckable(True) + self.radioButton.setObjectName("radioButton") + self.gridLayout.addWidget(self.radioButton, 2, 2, 1, 1) + self.verticalLayout.addLayout(self.gridLayout) + self.label_4 = QtWidgets.QLabel(parent=Dialog) + self.label_4.setObjectName("label_4") + self.verticalLayout.addWidget(self.label_4) + self.reportprogress = QtWidgets.QProgressBar(parent=Dialog) + self.reportprogress.setProperty("value", 24) + self.reportprogress.setTextVisible(True) + self.reportprogress.setInvertedAppearance(False) + self.reportprogress.setObjectName("reportprogress") + self.verticalLayout.addWidget(self.reportprogress) + self.generateReport = QtWidgets.QPushButton(parent=Dialog) + self.generateReport.setObjectName("generateReport") + self.verticalLayout.addWidget(self.generateReport) + + self.retranslateUi(Dialog) + QtCore.QMetaObject.connectSlotsByName(Dialog) + Dialog.setTabOrder(self.radio_week, self.radio_month) + Dialog.setTabOrder(self.radio_month, self.radio_year) + Dialog.setTabOrder(self.radio_year, self.generateReport) + + def retranslateUi(self, Dialog): + _translate = QtCore.QCoreApplication.translate + Dialog.setWindowTitle(_translate("Dialog", "Dialog")) + self.label.setText(_translate("Dialog", "Wieviele Tage sollen im Bericht erfasst werden?")) + self.label_2.setText(_translate("Dialog", "Tage")) + self.radio_week.setText(_translate("Dialog", "Woche")) + self.radio_month.setText(_translate("Dialog", "Monat")) + self.radio_year.setText(_translate("Dialog", "Jahr")) + self.label_4.setText(_translate("Dialog", "Fortschritt:")) + self.generateReport.setText(_translate("Dialog", " Bericht erstellen")) diff --git a/src/ui/sources/Ui_dialog_generateReport.ui.py b/src/ui/sources/Ui_dialog_generateReport.ui.py new file mode 100644 index 0000000..940cd4a --- /dev/null +++ b/src/ui/sources/Ui_dialog_generateReport.ui.py @@ -0,0 +1,8 @@ +# Form implementation generated from reading ui file 'c:\Users\aky547\GitHub\LibrarySystem\src\ui\sources\dialog_generateReport.ui.nKmkjJ' +# +# 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_dialog_settings.py b/src/ui/sources/Ui_dialog_settings.py index c2745db..aae6c32 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(377, 206) + Dialog.resize(436, 184) self.formLayout = QtWidgets.QFormLayout(Dialog) self.formLayout.setObjectName("formLayout") self.label = QtWidgets.QLabel(parent=Dialog) diff --git a/src/ui/sources/Ui_main_Loans.py b/src/ui/sources/Ui_main_Loans.py new file mode 100644 index 0000000..5161cfe --- /dev/null +++ b/src/ui/sources/Ui_main_Loans.py @@ -0,0 +1,100 @@ +# Form implementation generated from reading ui file 'c:\Users\aky547\GitHub\LibrarySystem\src\ui\sources\main_Loans.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_MainWindow(object): + def setupUi(self, MainWindow): + MainWindow.setObjectName("MainWindow") + MainWindow.resize(899, 658) + self.centralwidget = QtWidgets.QWidget(parent=MainWindow) + self.centralwidget.setObjectName("centralwidget") + self.verticalLayout = QtWidgets.QVBoxLayout(self.centralwidget) + self.verticalLayout.setObjectName("verticalLayout") + self.horizontalLayout = QtWidgets.QHBoxLayout() + self.horizontalLayout.setObjectName("horizontalLayout") + self.radio_all = QtWidgets.QRadioButton(parent=self.centralwidget) + self.radio_all.setChecked(True) + self.radio_all.setObjectName("radio_all") + self.horizontalLayout.addWidget(self.radio_all) + self.radio_current = QtWidgets.QRadioButton(parent=self.centralwidget) + self.radio_current.setObjectName("radio_current") + self.horizontalLayout.addWidget(self.radio_current) + self.radio_overdue = QtWidgets.QRadioButton(parent=self.centralwidget) + self.radio_overdue.setObjectName("radio_overdue") + self.horizontalLayout.addWidget(self.radio_overdue) + spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + self.horizontalLayout.addItem(spacerItem) + self.verticalLayout.addLayout(self.horizontalLayout) + self.horizontalLayout_2 = QtWidgets.QHBoxLayout() + self.horizontalLayout_2.setObjectName("horizontalLayout_2") + self.searchbar = QtWidgets.QLineEdit(parent=self.centralwidget) + self.searchbar.setObjectName("searchbar") + self.horizontalLayout_2.addWidget(self.searchbar) + self.searchFields = QtWidgets.QComboBox(parent=self.centralwidget) + self.searchFields.setObjectName("searchFields") + self.searchFields.addItem("") + self.searchFields.addItem("") + self.searchFields.addItem("") + self.horizontalLayout_2.addWidget(self.searchFields) + self.verticalLayout.addLayout(self.horizontalLayout_2) + self.loanTable = QtWidgets.QTableWidget(parent=self.centralwidget) + self.loanTable.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) + self.loanTable.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.SingleSelection) + self.loanTable.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows) + self.loanTable.setObjectName("loanTable") + self.loanTable.setColumnCount(7) + self.loanTable.setRowCount(0) + item = QtWidgets.QTableWidgetItem() + self.loanTable.setHorizontalHeaderItem(0, item) + item = QtWidgets.QTableWidgetItem() + self.loanTable.setHorizontalHeaderItem(1, item) + item = QtWidgets.QTableWidgetItem() + self.loanTable.setHorizontalHeaderItem(2, item) + item = QtWidgets.QTableWidgetItem() + self.loanTable.setHorizontalHeaderItem(3, item) + item = QtWidgets.QTableWidgetItem() + self.loanTable.setHorizontalHeaderItem(4, item) + item = QtWidgets.QTableWidgetItem() + self.loanTable.setHorizontalHeaderItem(5, item) + item = QtWidgets.QTableWidgetItem() + self.loanTable.setHorizontalHeaderItem(6, item) + self.verticalLayout.addWidget(self.loanTable) + MainWindow.setCentralWidget(self.centralwidget) + self.menubar = QtWidgets.QMenuBar(parent=MainWindow) + self.menubar.setGeometry(QtCore.QRect(0, 0, 899, 22)) + self.menubar.setObjectName("menubar") + MainWindow.setMenuBar(self.menubar) + + self.retranslateUi(MainWindow) + QtCore.QMetaObject.connectSlotsByName(MainWindow) + + def retranslateUi(self, MainWindow): + _translate = QtCore.QCoreApplication.translate + MainWindow.setWindowTitle(_translate("MainWindow", "MainWindow")) + self.radio_all.setText(_translate("MainWindow", "Alle Ausleihen")) + self.radio_current.setText(_translate("MainWindow", "Aktuell Entliehene Medien")) + self.radio_overdue.setText(_translate("MainWindow", "Überzgene Medien")) + self.searchFields.setItemText(0, _translate("MainWindow", "Titel")) + self.searchFields.setItemText(1, _translate("MainWindow", "Signatur")) + self.searchFields.setItemText(2, _translate("MainWindow", "Nutzer")) + item = self.loanTable.horizontalHeaderItem(0) + item.setText(_translate("MainWindow", "ISBN")) + item = self.loanTable.horizontalHeaderItem(1) + item.setText(_translate("MainWindow", "Signatur")) + item = self.loanTable.horizontalHeaderItem(2) + item.setText(_translate("MainWindow", "Titel")) + item = self.loanTable.horizontalHeaderItem(3) + item.setText(_translate("MainWindow", "Nutzerkonto")) + item = self.loanTable.horizontalHeaderItem(4) + item.setText(_translate("MainWindow", "entliehen am")) + item = self.loanTable.horizontalHeaderItem(5) + item.setText(_translate("MainWindow", "entliehen bis")) + item = self.loanTable.horizontalHeaderItem(6) + item.setText(_translate("MainWindow", "Zurückgegeben am")) diff --git a/src/ui/sources/Ui_main_UserInterface.py b/src/ui/sources/Ui_main_UserInterface.py index 999aee7..b1374ba 100644 --- a/src/ui/sources/Ui_main_UserInterface.py +++ b/src/ui/sources/Ui_main_UserInterface.py @@ -19,15 +19,13 @@ class Ui_MainWindow(object): self.verticalLayout.setObjectName("verticalLayout") self.gridLayout = QtWidgets.QGridLayout() self.gridLayout.setObjectName("gridLayout") - self.label_2 = QtWidgets.QLabel(parent=self.centralwidget) - self.label_2.setObjectName("label_2") - self.gridLayout.addWidget(self.label_2, 2, 0, 1, 1) - self.input_userno = QtWidgets.QLineEdit(parent=self.centralwidget) - self.input_userno.setObjectName("input_userno") - self.gridLayout.addWidget(self.input_userno, 1, 1, 1, 1) - self.duedate = QtWidgets.QDateEdit(parent=self.centralwidget) - self.duedate.setObjectName("duedate") - self.gridLayout.addWidget(self.duedate, 5, 1, 1, 1) + self.label_3 = QtWidgets.QLabel(parent=self.centralwidget) + self.label_3.setObjectName("label_3") + self.gridLayout.addWidget(self.label_3, 3, 0, 1, 1) + self.label_6 = QtWidgets.QLabel(parent=self.centralwidget) + self.label_6.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft|QtCore.Qt.AlignmentFlag.AlignVCenter) + self.label_6.setObjectName("label_6") + self.gridLayout.addWidget(self.label_6, 5, 0, 1, 1) self.horizontalLayout = QtWidgets.QHBoxLayout() self.horizontalLayout.setObjectName("horizontalLayout") self.label_5 = QtWidgets.QLabel(parent=self.centralwidget) @@ -43,22 +41,32 @@ class Ui_MainWindow(object): self.mode.setObjectName("mode") self.horizontalLayout.addWidget(self.mode) self.gridLayout.addLayout(self.horizontalLayout, 0, 0, 1, 1) - self.label_3 = QtWidgets.QLabel(parent=self.centralwidget) - self.label_3.setObjectName("label_3") - self.gridLayout.addWidget(self.label_3, 3, 0, 1, 1) - self.label_6 = QtWidgets.QLabel(parent=self.centralwidget) - self.label_6.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft|QtCore.Qt.AlignmentFlag.AlignVCenter) - self.label_6.setObjectName("label_6") - self.gridLayout.addWidget(self.label_6, 5, 0, 1, 1) self.label = QtWidgets.QLabel(parent=self.centralwidget) self.label.setObjectName("label") self.gridLayout.addWidget(self.label, 1, 0, 1, 1) self.input_username = QtWidgets.QLineEdit(parent=self.centralwidget) self.input_username.setObjectName("input_username") self.gridLayout.addWidget(self.input_username, 2, 1, 1, 1) + self.duedate = QtWidgets.QDateEdit(parent=self.centralwidget) + self.duedate.setObjectName("duedate") + self.gridLayout.addWidget(self.duedate, 5, 1, 1, 1) self.input_file_ident = QtWidgets.QLineEdit(parent=self.centralwidget) self.input_file_ident.setObjectName("input_file_ident") self.gridLayout.addWidget(self.input_file_ident, 3, 1, 1, 1) + self.label_2 = QtWidgets.QLabel(parent=self.centralwidget) + self.label_2.setObjectName("label_2") + self.gridLayout.addWidget(self.label_2, 2, 0, 1, 1) + self.input_userno = QtWidgets.QLineEdit(parent=self.centralwidget) + self.input_userno.setObjectName("input_userno") + self.gridLayout.addWidget(self.input_userno, 1, 1, 1, 1) + self.horizontalLayout_3 = QtWidgets.QHBoxLayout() + self.horizontalLayout_3.setObjectName("horizontalLayout_3") + spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + self.horizontalLayout_3.addItem(spacerItem) + self.btn_createNewUser = QtWidgets.QPushButton(parent=self.centralwidget) + self.btn_createNewUser.setObjectName("btn_createNewUser") + self.horizontalLayout_3.addWidget(self.btn_createNewUser) + self.gridLayout.addLayout(self.horizontalLayout_3, 0, 1, 1, 1) self.verticalLayout.addLayout(self.gridLayout) self.groupBox = QtWidgets.QGroupBox(parent=self.centralwidget) self.groupBox.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) @@ -119,8 +127,10 @@ class Ui_MainWindow(object): self.menubar.setObjectName("menubar") self.menuDatei = QtWidgets.QMenu(parent=self.menubar) self.menuDatei.setObjectName("menuDatei") - self.menuShortkeys = QtWidgets.QMenu(parent=self.menubar) - self.menuShortkeys.setObjectName("menuShortkeys") + self.menuHotkeys = QtWidgets.QMenu(parent=self.menubar) + self.menuHotkeys.setObjectName("menuHotkeys") + self.menuFenster = QtWidgets.QMenu(parent=self.menubar) + self.menuFenster.setObjectName("menuFenster") MainWindow.setMenuBar(self.menubar) self.statusbar = QtWidgets.QStatusBar(parent=MainWindow) self.statusbar.setObjectName("statusbar") @@ -133,31 +143,40 @@ class Ui_MainWindow(object): self.actionRueckgabemodus.setObjectName("actionRueckgabemodus") self.actionNutzer = QtGui.QAction(parent=MainWindow) self.actionNutzer.setObjectName("actionNutzer") + self.actionNutzer_2 = QtGui.QAction(parent=MainWindow) + self.actionNutzer_2.setObjectName("actionNutzer_2") + self.actionAusleihistorie = QtGui.QAction(parent=MainWindow) + self.actionAusleihistorie.setObjectName("actionAusleihistorie") + self.actionBericht_erstellen = QtGui.QAction(parent=MainWindow) + self.actionBericht_erstellen.setObjectName("actionBericht_erstellen") self.menuDatei.addAction(self.actionEinstellungen) self.menuDatei.addAction(self.actionBeenden) - self.menuShortkeys.addAction(self.actionRueckgabemodus) - self.menuShortkeys.addAction(self.actionNutzer) + self.menuHotkeys.addAction(self.actionRueckgabemodus) + self.menuHotkeys.addAction(self.actionNutzer) + self.menuFenster.addAction(self.actionAusleihistorie) + self.menuFenster.addAction(self.actionBericht_erstellen) self.menubar.addAction(self.menuDatei.menuAction()) - self.menubar.addAction(self.menuShortkeys.menuAction()) + self.menubar.addAction(self.menuHotkeys.menuAction()) + self.menubar.addAction(self.menuFenster.menuAction()) self.retranslateUi(MainWindow) self.actionBeenden.triggered.connect(MainWindow.close) # type: ignore QtCore.QMetaObject.connectSlotsByName(MainWindow) + MainWindow.setTabOrder(self.btn_createNewUser, self.input_userno) MainWindow.setTabOrder(self.input_userno, self.input_username) MainWindow.setTabOrder(self.input_username, self.input_file_ident) - MainWindow.setTabOrder(self.input_file_ident, self.groupBox) - MainWindow.setTabOrder(self.groupBox, self.mediaOverview) - MainWindow.setTabOrder(self.mediaOverview, self.btn_show_lentmedia) + MainWindow.setTabOrder(self.input_file_ident, self.duedate) def retranslateUi(self, MainWindow): _translate = QtCore.QCoreApplication.translate MainWindow.setWindowTitle(_translate("MainWindow", "MainWindow")) - self.label_2.setText(_translate("MainWindow", "Benutzername")) - self.label_5.setText(_translate("MainWindow", "Modus")) - self.mode.setText(_translate("MainWindow", "Rückgabe")) self.label_3.setText(_translate("MainWindow", "Suchbegriff")) self.label_6.setText(_translate("MainWindow", "Ausleihe bis")) + self.label_5.setText(_translate("MainWindow", "Modus")) + self.mode.setText(_translate("MainWindow", "Rückgabe")) self.label.setText(_translate("MainWindow", "Matrikelnummer")) + self.label_2.setText(_translate("MainWindow", "Benutzername")) + self.btn_createNewUser.setText(_translate("MainWindow", "Neuen Nutzer anlegen")) self.groupBox.setTitle(_translate("MainWindow", "Nutzerdaten")) self.groupBox_2.setTitle(_translate("MainWindow", "Ausleihdaten")) self.label_4.setText(_translate("MainWindow", "Anzahl Ausleihen")) @@ -169,10 +188,16 @@ class Ui_MainWindow(object): item = self.mediaOverview.horizontalHeaderItem(2) item.setText(_translate("MainWindow", "Status")) self.menuDatei.setTitle(_translate("MainWindow", "Datei")) - self.menuShortkeys.setTitle(_translate("MainWindow", "Shortkeys")) + self.menuHotkeys.setTitle(_translate("MainWindow", "Hotkeys")) + self.menuFenster.setTitle(_translate("MainWindow", "Fenster")) self.actionEinstellungen.setText(_translate("MainWindow", "Einstellungen")) self.actionBeenden.setText(_translate("MainWindow", "Beenden")) self.actionRueckgabemodus.setText(_translate("MainWindow", "Rückgabemodus")) self.actionRueckgabemodus.setShortcut(_translate("MainWindow", "F5")) self.actionNutzer.setText(_translate("MainWindow", "Nutzer")) self.actionNutzer.setShortcut(_translate("MainWindow", "F6")) + self.actionNutzer_2.setText(_translate("MainWindow", "Nutzer")) + self.actionAusleihistorie.setText(_translate("MainWindow", "Ausleihhistorie")) + self.actionAusleihistorie.setShortcut(_translate("MainWindow", "F8")) + self.actionBericht_erstellen.setText(_translate("MainWindow", "Bericht erstellen")) + self.actionBericht_erstellen.setShortcut(_translate("MainWindow", "F7")) diff --git a/src/ui/sources/Ui_main_userData.py b/src/ui/sources/Ui_main_userData.py index 5b6d55d..d517853 100644 --- a/src/ui/sources/Ui_main_userData.py +++ b/src/ui/sources/Ui_main_userData.py @@ -71,10 +71,11 @@ class Ui_MainWindow(object): self.horizontalLayout_2 = QtWidgets.QHBoxLayout() self.horizontalLayout_2.setObjectName("horizontalLayout_2") self.radio_allLoanedMedia = QtWidgets.QRadioButton(parent=self.centralwidget) - self.radio_allLoanedMedia.setChecked(True) + self.radio_allLoanedMedia.setChecked(False) self.radio_allLoanedMedia.setObjectName("radio_allLoanedMedia") self.horizontalLayout_2.addWidget(self.radio_allLoanedMedia) self.radio_currentlyLoaned = QtWidgets.QRadioButton(parent=self.centralwidget) + self.radio_currentlyLoaned.setChecked(True) self.radio_currentlyLoaned.setObjectName("radio_currentlyLoaned") self.horizontalLayout_2.addWidget(self.radio_currentlyLoaned) self.radio_overdueLoans = QtWidgets.QRadioButton(parent=self.centralwidget) @@ -88,9 +89,11 @@ class Ui_MainWindow(object): self.searchbox = QtWidgets.QLineEdit(parent=self.centralwidget) self.searchbox.setObjectName("searchbox") self.horizontalLayout_3.addWidget(self.searchbox) - self.btn_searchTableContent = QtWidgets.QPushButton(parent=self.centralwidget) - self.btn_searchTableContent.setObjectName("btn_searchTableContent") - self.horizontalLayout_3.addWidget(self.btn_searchTableContent) + self.searchfilter = QtWidgets.QComboBox(parent=self.centralwidget) + self.searchfilter.setObjectName("searchfilter") + self.searchfilter.addItem("") + self.searchfilter.addItem("") + self.horizontalLayout_3.addWidget(self.searchfilter) spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_3.addItem(spacerItem3) self.btn_extendSelectedMedia = QtWidgets.QPushButton(parent=self.centralwidget) @@ -150,7 +153,8 @@ class Ui_MainWindow(object): self.radio_allLoanedMedia.setText(_translate("MainWindow", "Alle Ausleihen")) self.radio_currentlyLoaned.setText(_translate("MainWindow", "Aktuell entliehen")) self.radio_overdueLoans.setText(_translate("MainWindow", "Überzogen")) - self.btn_searchTableContent.setText(_translate("MainWindow", "Suchen")) + self.searchfilter.setItemText(0, _translate("MainWindow", "Titel")) + self.searchfilter.setItemText(1, _translate("MainWindow", "Signatur")) self.btn_extendSelectedMedia.setText(_translate("MainWindow", "Ausgewählte Verlängern")) self.UserMediaTable.setSortingEnabled(True) item = self.UserMediaTable.horizontalHeaderItem(0) diff --git a/src/ui/sources/dialog_addBook.ui b/src/ui/sources/dialog_addBook.ui new file mode 100644 index 0000000..cab6162 --- /dev/null +++ b/src/ui/sources/dialog_addBook.ui @@ -0,0 +1,71 @@ + + + Dialog + + + + 0 + 0 + 262 + 100 + + + + Dialog + + + + + + + + + Signatur + + + + + + + Titel + + + + + + + + + + + + Qt::ClickFocus + + + Speichern + + + + + + + Qt::ClickFocus + + + Abbrechen + + + + + + + + + book_title + book_signature + btn_save + btn_cancel + + + + diff --git a/src/ui/sources/dialog_createUser.ui b/src/ui/sources/dialog_createUser.ui index 60efe56..125ab67 100644 --- a/src/ui/sources/dialog_createUser.ui +++ b/src/ui/sources/dialog_createUser.ui @@ -22,6 +22,9 @@ Qt::ImhDigitsOnly + + 102888557 + @@ -39,7 +42,11 @@ - + + + email@ph-freiburg.de + + @@ -49,7 +56,11 @@ - + + + Nachname, Vorname + + diff --git a/src/ui/sources/dialog_generateReport.ui b/src/ui/sources/dialog_generateReport.ui new file mode 100644 index 0000000..1aa90e1 --- /dev/null +++ b/src/ui/sources/dialog_generateReport.ui @@ -0,0 +1,173 @@ + + + Dialog + + + + 0 + 0 + 375 + 206 + + + + + 40 + 0 + + + + Dialog + + + + + + Wieviele Tage sollen im Bericht erfasst werden? + + + + + + + + + Tage + + + + + + + + + Woche + + + + + + + Monat + + + + + + + Jahr + + + + + + + + + + + + + + + + Qt::ClickFocus + + + 1 + + + 365 + + + Qt::Horizontal + + + true + + + QSlider::TicksAbove + + + 10 + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 40 + 16777215 + + + + Qt::NoFocus + + + true + + + + + + + + + + true + + + + + + + + + Fortschritt: + + + + + + + 24 + + + true + + + false + + + + + + + Bericht erstellen + + + + + + + radio_week + radio_month + radio_year + generateReport + + + + diff --git a/src/ui/sources/dialog_settings.ui b/src/ui/sources/dialog_settings.ui index cf70450..7f1806a 100644 --- a/src/ui/sources/dialog_settings.ui +++ b/src/ui/sources/dialog_settings.ui @@ -6,8 +6,8 @@ 0 0 - 377 - 206 + 436 + 184 diff --git a/src/ui/sources/main_Loans.ui b/src/ui/sources/main_Loans.ui new file mode 100644 index 0000000..cc4ec7e --- /dev/null +++ b/src/ui/sources/main_Loans.ui @@ -0,0 +1,148 @@ + + + MainWindow + + + + 0 + 0 + 899 + 658 + + + + MainWindow + + + + + + + + + Alle Ausleihen + + + true + + + + + + + Aktuell Entliehene Medien + + + + + + + Überzgene Medien + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + + + Titel + + + + + Signatur + + + + + Nutzer + + + + + + + + + + QAbstractItemView::NoEditTriggers + + + QAbstractItemView::SingleSelection + + + QAbstractItemView::SelectRows + + + + ISBN + + + + + Signatur + + + + + Titel + + + + + Nutzerkonto + + + + + entliehen am + + + + + entliehen bis + + + + + Zurückgegeben am + + + + + + + + + + 0 + 0 + 899 + 22 + + + + + + + diff --git a/src/ui/sources/main_UserInterface.ui b/src/ui/sources/main_UserInterface.ui index ec53b9a..c8a85ca 100644 --- a/src/ui/sources/main_UserInterface.ui +++ b/src/ui/sources/main_UserInterface.ui @@ -17,18 +17,22 @@ - - + + - Benutzername + Suchbegriff - - - - - + + + + Ausleihe bis + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + @@ -60,23 +64,6 @@ - - - - Suchbegriff - - - - - - - Ausleihe bis - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - @@ -87,9 +74,46 @@ + + + + + + + Benutzername + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Neuen Nutzer anlegen + + + + + @@ -204,15 +228,23 @@ - + - Shortkeys + Hotkeys + + + Fenster + + + + - + + @@ -241,14 +273,34 @@ F6 + + + Nutzer + + + + + Ausleihhistorie + + + F8 + + + + + Bericht erstellen + + + F7 + + + btn_createNewUser input_userno input_username input_file_ident - groupBox - mediaOverview - btn_show_lentmedia + duedate diff --git a/src/ui/sources/main_userData.ui b/src/ui/sources/main_userData.ui index 97d572c..1ce0cdb 100644 --- a/src/ui/sources/main_userData.ui +++ b/src/ui/sources/main_userData.ui @@ -134,7 +134,7 @@ Alle Ausleihen - true + false @@ -143,6 +143,9 @@ Aktuell entliehen + + true + @@ -173,10 +176,17 @@ - - - Suchen - + + + + Titel + + + + + Signatur + +