From 55abe8e8ef80221b1d4a52524f8f09e7725b0381 Mon Sep 17 00:00:00 2001 From: WorldTeacher <41587052+WorldTeacher@users.noreply.github.com> Date: Tue, 30 Jul 2024 09:39:33 +0200 Subject: [PATCH] ui updates --- src/ui/sources/Ui_dialog_generateReport.py | 52 ++++++++---- src/ui/sources/Ui_dialog_settings.py | 2 +- src/ui/sources/Ui_main_Loans.py | 2 +- src/ui/sources/Ui_main_UserInterface.py | 20 ++++- src/ui/sources/Ui_main_userData.py | 14 ++++ src/ui/sources/dialog_generateReport.ui | 98 +++++++++++++++------- src/ui/sources/dialog_settings.ui | 14 ++-- src/ui/sources/main_Loans.ui | 2 +- src/ui/sources/main_UserInterface.ui | 49 ++++++++++- src/ui/sources/main_userData.ui | 26 +++++- 10 files changed, 213 insertions(+), 66 deletions(-) diff --git a/src/ui/sources/Ui_dialog_generateReport.py b/src/ui/sources/Ui_dialog_generateReport.py index 258020d..76022fe 100644 --- a/src/ui/sources/Ui_dialog_generateReport.py +++ b/src/ui/sources/Ui_dialog_generateReport.py @@ -12,7 +12,7 @@ from PyQt6 import QtCore, QtGui, QtWidgets class Ui_Dialog(object): def setupUi(self, Dialog): Dialog.setObjectName("Dialog") - Dialog.resize(375, 206) + Dialog.resize(375, 247) Dialog.setMinimumSize(QtCore.QSize(40, 0)) self.verticalLayout = QtWidgets.QVBoxLayout(Dialog) self.verticalLayout.setObjectName("verticalLayout") @@ -36,20 +36,6 @@ class Ui_Dialog(object): 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) @@ -66,7 +52,38 @@ class Ui_Dialog(object): self.radioButton.setText("") self.radioButton.setCheckable(True) self.radioButton.setObjectName("radioButton") - self.gridLayout.addWidget(self.radioButton, 2, 2, 1, 1) + self.gridLayout.addWidget(self.radioButton, 3, 2, 1, 1) + self.reportlink = QtWidgets.QLabel(parent=Dialog) + self.reportlink.setText("") + self.reportlink.setObjectName("reportlink") + self.gridLayout.addWidget(self.reportlink, 3, 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.frame = QtWidgets.QFrame(parent=Dialog) + self.frame.setFrameShape(QtWidgets.QFrame.Shape.NoFrame) + self.frame.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) + self.frame.setLineWidth(0) + self.frame.setObjectName("frame") + self.gridLayout_2 = QtWidgets.QGridLayout(self.frame) + self.gridLayout_2.setObjectName("gridLayout_2") + self.format_txt = QtWidgets.QRadioButton(parent=self.frame) + self.format_txt.setObjectName("format_txt") + self.gridLayout_2.addWidget(self.format_txt, 0, 0, 1, 1) + self.format_csv = QtWidgets.QRadioButton(parent=self.frame) + self.format_csv.setObjectName("format_csv") + self.gridLayout_2.addWidget(self.format_csv, 0, 1, 1, 1) + self.gridLayout.addWidget(self.frame, 2, 1, 1, 1) + self.label_3 = QtWidgets.QLabel(parent=Dialog) + self.label_3.setObjectName("label_3") + self.gridLayout.addWidget(self.label_3, 2, 0, 1, 1) self.verticalLayout.addLayout(self.gridLayout) self.label_4 = QtWidgets.QLabel(parent=Dialog) self.label_4.setObjectName("label_4") @@ -95,5 +112,8 @@ class Ui_Dialog(object): self.radio_week.setText(_translate("Dialog", "Woche")) self.radio_month.setText(_translate("Dialog", "Monat")) self.radio_year.setText(_translate("Dialog", "Jahr")) + self.format_txt.setText(_translate("Dialog", "Text")) + self.format_csv.setText(_translate("Dialog", "Excel")) + self.label_3.setText(_translate("Dialog", "Dateiformat")) self.label_4.setText(_translate("Dialog", "Fortschritt:")) self.generateReport.setText(_translate("Dialog", " Bericht erstellen")) diff --git a/src/ui/sources/Ui_dialog_settings.py b/src/ui/sources/Ui_dialog_settings.py index aae6c32..1224deb 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(436, 184) + Dialog.resize(422, 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 index 5161cfe..6c1edd2 100644 --- a/src/ui/sources/Ui_main_Loans.py +++ b/src/ui/sources/Ui_main_Loans.py @@ -80,7 +80,7 @@ class Ui_MainWindow(object): 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.radio_overdue.setText(_translate("MainWindow", "Überzogene Medien")) self.searchFields.setItemText(0, _translate("MainWindow", "Titel")) self.searchFields.setItemText(1, _translate("MainWindow", "Signatur")) self.searchFields.setItemText(2, _translate("MainWindow", "Nutzer")) diff --git a/src/ui/sources/Ui_main_UserInterface.py b/src/ui/sources/Ui_main_UserInterface.py index b1374ba..c929a66 100644 --- a/src/ui/sources/Ui_main_UserInterface.py +++ b/src/ui/sources/Ui_main_UserInterface.py @@ -47,9 +47,6 @@ class Ui_MainWindow(object): 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) @@ -67,6 +64,22 @@ class Ui_MainWindow(object): self.btn_createNewUser.setObjectName("btn_createNewUser") self.horizontalLayout_3.addWidget(self.btn_createNewUser) self.gridLayout.addLayout(self.horizontalLayout_3, 0, 1, 1, 1) + self.horizontalLayout_4 = QtWidgets.QHBoxLayout() + self.horizontalLayout_4.setObjectName("horizontalLayout_4") + self.duedate = QtWidgets.QDateEdit(parent=self.centralwidget) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.duedate.sizePolicy().hasHeightForWidth()) + self.duedate.setSizePolicy(sizePolicy) + self.duedate.setMinimumSize(QtCore.QSize(130, 0)) + self.duedate.setMaximumSize(QtCore.QSize(100, 16777215)) + self.duedate.setBaseSize(QtCore.QSize(70, 0)) + self.duedate.setObjectName("duedate") + self.horizontalLayout_4.addWidget(self.duedate) + spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + self.horizontalLayout_4.addItem(spacerItem1) + self.gridLayout.addLayout(self.horizontalLayout_4, 5, 1, 1, 1) self.verticalLayout.addLayout(self.gridLayout) self.groupBox = QtWidgets.QGroupBox(parent=self.centralwidget) self.groupBox.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) @@ -165,7 +178,6 @@ class Ui_MainWindow(object): 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.duedate) def retranslateUi(self, MainWindow): _translate = QtCore.QCoreApplication.translate diff --git a/src/ui/sources/Ui_main_userData.py b/src/ui/sources/Ui_main_userData.py index d517853..e09d822 100644 --- a/src/ui/sources/Ui_main_userData.py +++ b/src/ui/sources/Ui_main_userData.py @@ -36,6 +36,8 @@ class Ui_MainWindow(object): self.label.setObjectName("label") self.gridLayout.addWidget(self.label, 0, 0, 1, 1) self.user_no = QtWidgets.QLineEdit(parent=self.centralwidget) + self.user_no.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) + self.user_no.setReadOnly(True) self.user_no.setObjectName("user_no") self.gridLayout.addWidget(self.user_no, 1, 1, 1, 1) self.frame = QtWidgets.QFrame(parent=self.centralwidget) @@ -103,6 +105,7 @@ class Ui_MainWindow(object): self.verticalLayout.addLayout(self.horizontalLayout_3) self.UserMediaTable = QtWidgets.QTableWidget(parent=self.centralwidget) self.UserMediaTable.setMouseTracking(True) + self.UserMediaTable.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) self.UserMediaTable.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarPolicy.ScrollBarAlwaysOff) self.UserMediaTable.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) self.UserMediaTable.setAlternatingRowColors(True) @@ -140,6 +143,17 @@ class Ui_MainWindow(object): self.retranslateUi(MainWindow) QtCore.QMetaObject.connectSlotsByName(MainWindow) + MainWindow.setTabOrder(self.name, self.mail) + MainWindow.setTabOrder(self.mail, self.btn_userChange_save) + MainWindow.setTabOrder(self.btn_userChange_save, self.btn_userchange_cancel) + MainWindow.setTabOrder(self.btn_userchange_cancel, self.radio_allLoanedMedia) + MainWindow.setTabOrder(self.radio_allLoanedMedia, self.radio_currentlyLoaned) + MainWindow.setTabOrder(self.radio_currentlyLoaned, self.radio_overdueLoans) + MainWindow.setTabOrder(self.radio_overdueLoans, self.searchbox) + MainWindow.setTabOrder(self.searchbox, self.searchfilter) + MainWindow.setTabOrder(self.searchfilter, self.btn_extendSelectedMedia) + MainWindow.setTabOrder(self.btn_extendSelectedMedia, self.UserMediaTable) + MainWindow.setTabOrder(self.UserMediaTable, self.user_no) def retranslateUi(self, MainWindow): _translate = QtCore.QCoreApplication.translate diff --git a/src/ui/sources/dialog_generateReport.ui b/src/ui/sources/dialog_generateReport.ui index 1aa90e1..1700beb 100644 --- a/src/ui/sources/dialog_generateReport.ui +++ b/src/ui/sources/dialog_generateReport.ui @@ -7,7 +7,7 @@ 0 0 375 - 206 + 247 @@ -61,7 +61,45 @@ - + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 40 + 16777215 + + + + Qt::NoFocus + + + true + + + + + + + + + + true + + + + @@ -93,41 +131,39 @@ - - - - - 0 - 0 - + + + + QFrame::NoFrame - - - 0 - 0 - + + QFrame::Plain - - - 40 - 16777215 - - - - Qt::NoFocus - - - true + + 0 + + + + + Text + + + + + + + Excel + + + + - - + + - - - - true + Dateiformat diff --git a/src/ui/sources/dialog_settings.ui b/src/ui/sources/dialog_settings.ui index 7f1806a..201e573 100644 --- a/src/ui/sources/dialog_settings.ui +++ b/src/ui/sources/dialog_settings.ui @@ -6,7 +6,7 @@ 0 0 - 436 + 422 184 @@ -127,12 +127,12 @@ accept() - 248 - 254 + 379 + 174 157 - 274 + 183 @@ -143,12 +143,12 @@ reject() - 316 - 260 + 426 + 174 286 - 274 + 183 diff --git a/src/ui/sources/main_Loans.ui b/src/ui/sources/main_Loans.ui index cc4ec7e..f7d5a23 100644 --- a/src/ui/sources/main_Loans.ui +++ b/src/ui/sources/main_Loans.ui @@ -37,7 +37,7 @@ - Überzgene Medien + Überzogene Medien diff --git a/src/ui/sources/main_UserInterface.ui b/src/ui/sources/main_UserInterface.ui index c8a85ca..32334b0 100644 --- a/src/ui/sources/main_UserInterface.ui +++ b/src/ui/sources/main_UserInterface.ui @@ -74,9 +74,6 @@ - - - @@ -114,6 +111,51 @@ + + + + + + + 0 + 0 + + + + + 130 + 0 + + + + + 100 + 16777215 + + + + + 70 + 0 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + @@ -300,7 +342,6 @@ input_userno input_username input_file_ident - duedate diff --git a/src/ui/sources/main_userData.ui b/src/ui/sources/main_userData.ui index 1ce0cdb..fd6ef9f 100644 --- a/src/ui/sources/main_userData.ui +++ b/src/ui/sources/main_userData.ui @@ -48,7 +48,14 @@ - + + + Qt::NoFocus + + + true + + @@ -219,6 +226,9 @@ true + + Qt::NoFocus + Qt::ScrollBarAlwaysOff @@ -299,6 +309,20 @@ + + name + mail + btn_userChange_save + btn_userchange_cancel + radio_allLoanedMedia + radio_currentlyLoaned + radio_overdueLoans + searchbox + searchfilter + btn_extendSelectedMedia + UserMediaTable + user_no +