From 1b8e669fee3125f7e7370bbcfd6c255c13129470 Mon Sep 17 00:00:00 2001
From: WorldTeacher <41587052+WorldTeacher@users.noreply.github.com>
Date: Thu, 11 Jul 2024 15:16:41 +0200
Subject: [PATCH] ui changes
---
.../sources/Ui_dialog_extendLoanDuration.py | 4 ++
src/ui/sources/Ui_dialog_message.py | 34 ++++++++++
src/ui/sources/Ui_main_UserInterface.py | 23 +++++--
src/ui/sources/Ui_main_userData.py | 3 +-
src/ui/sources/dialog_extendLoanDuration.ui | 6 ++
src/ui/sources/dialog_message.ui | 67 +++++++++++++++++++
src/ui/sources/main_UserInterface.ui | 27 +++++++-
src/ui/sources/main_userData.ui | 5 +-
8 files changed, 159 insertions(+), 10 deletions(-)
create mode 100644 src/ui/sources/Ui_dialog_message.py
create mode 100644 src/ui/sources/dialog_message.ui
diff --git a/src/ui/sources/Ui_dialog_extendLoanDuration.py b/src/ui/sources/Ui_dialog_extendLoanDuration.py
index f6e34f8..d542ee7 100644
--- a/src/ui/sources/Ui_dialog_extendLoanDuration.py
+++ b/src/ui/sources/Ui_dialog_extendLoanDuration.py
@@ -24,6 +24,10 @@ class Ui_Dialog(object):
self.buttonBox.setObjectName("buttonBox")
self.gridLayout.addWidget(self.buttonBox, 2, 2, 1, 1)
self.label = QtWidgets.QLabel(parent=Dialog)
+ font = QtGui.QFont()
+ font.setPointSize(11)
+ font.setBold(True)
+ self.label.setFont(font)
self.label.setObjectName("label")
self.gridLayout.addWidget(self.label, 0, 2, 1, 1)
diff --git a/src/ui/sources/Ui_dialog_message.py b/src/ui/sources/Ui_dialog_message.py
new file mode 100644
index 0000000..073605c
--- /dev/null
+++ b/src/ui/sources/Ui_dialog_message.py
@@ -0,0 +1,34 @@
+# Form implementation generated from reading ui file 'c:\Users\aky547\GitHub\LibrarySystem\src\ui\sources\dialog_message.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(400, 89)
+ self.horizontalLayout = QtWidgets.QHBoxLayout(Dialog)
+ self.horizontalLayout.setObjectName("horizontalLayout")
+ self.textEdit = QtWidgets.QTextEdit(parent=Dialog)
+ self.textEdit.setObjectName("textEdit")
+ self.horizontalLayout.addWidget(self.textEdit)
+ self.buttonBox = QtWidgets.QDialogButtonBox(parent=Dialog)
+ self.buttonBox.setOrientation(QtCore.Qt.Orientation.Vertical)
+ self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok)
+ self.buttonBox.setObjectName("buttonBox")
+ self.horizontalLayout.addWidget(self.buttonBox)
+
+ self.retranslateUi(Dialog)
+ 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"))
diff --git a/src/ui/sources/Ui_main_UserInterface.py b/src/ui/sources/Ui_main_UserInterface.py
index ff26f52..e293e36 100644
--- a/src/ui/sources/Ui_main_UserInterface.py
+++ b/src/ui/sources/Ui_main_UserInterface.py
@@ -88,6 +88,13 @@ class Ui_MainWindow(object):
self.label_4.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter)
self.label_4.setObjectName("label_4")
self.gridLayout_2.addWidget(self.label_4, 0, 0, 1, 1)
+ self.label_7 = QtWidgets.QLabel(parent=self.groupBox_2)
+ self.label_7.setObjectName("label_7")
+ self.gridLayout_2.addWidget(self.label_7, 1, 0, 1, 1)
+ self.nextReturnDate = QtWidgets.QLabel(parent=self.groupBox_2)
+ self.nextReturnDate.setText("")
+ self.nextReturnDate.setObjectName("nextReturnDate")
+ self.gridLayout_2.addWidget(self.nextReturnDate, 1, 1, 1, 1)
self.horizontalLayout_2.addWidget(self.groupBox_2)
self.horizontalLayout_2.setStretch(0, 3)
self.horizontalLayout_2.setStretch(1, 1)
@@ -120,11 +127,14 @@ class Ui_MainWindow(object):
self.actionEinstellungen.setObjectName("actionEinstellungen")
self.actionBeenden = QtGui.QAction(parent=MainWindow)
self.actionBeenden.setObjectName("actionBeenden")
- self.actionR_ckgabemodus = QtGui.QAction(parent=MainWindow)
- self.actionR_ckgabemodus.setObjectName("actionR_ckgabemodus")
+ self.actionRueckgabemodus = QtGui.QAction(parent=MainWindow)
+ self.actionRueckgabemodus.setObjectName("actionRueckgabemodus")
+ self.actionNutzer = QtGui.QAction(parent=MainWindow)
+ self.actionNutzer.setObjectName("actionNutzer")
self.menuDatei.addAction(self.actionEinstellungen)
self.menuDatei.addAction(self.actionBeenden)
- self.menuShortkeys.addAction(self.actionR_ckgabemodus)
+ self.menuShortkeys.addAction(self.actionRueckgabemodus)
+ self.menuShortkeys.addAction(self.actionNutzer)
self.menubar.addAction(self.menuDatei.menuAction())
self.menubar.addAction(self.menuShortkeys.menuAction())
@@ -149,6 +159,7 @@ class Ui_MainWindow(object):
self.groupBox.setTitle(_translate("MainWindow", "Nutzerdaten"))
self.groupBox_2.setTitle(_translate("MainWindow", "Ausleihdaten"))
self.label_4.setText(_translate("MainWindow", "Anzahl Ausleihen"))
+ self.label_7.setText(_translate("MainWindow", "Nächstes Rückgabedatum"))
item = self.tableWidget.horizontalHeaderItem(0)
item.setText(_translate("MainWindow", "ISBN"))
item = self.tableWidget.horizontalHeaderItem(1)
@@ -157,5 +168,7 @@ class Ui_MainWindow(object):
self.menuShortkeys.setTitle(_translate("MainWindow", "Shortkeys"))
self.actionEinstellungen.setText(_translate("MainWindow", "Einstellungen"))
self.actionBeenden.setText(_translate("MainWindow", "Beenden"))
- self.actionR_ckgabemodus.setText(_translate("MainWindow", "Rückgabemodus"))
- self.actionR_ckgabemodus.setShortcut(_translate("MainWindow", "F5"))
+ self.actionRueckgabemodus.setText(_translate("MainWindow", "Rückgabemodus"))
+ self.actionRueckgabemodus.setShortcut(_translate("MainWindow", "F5"))
+ self.actionNutzer.setText(_translate("MainWindow", "Nutzer"))
+ self.actionNutzer.setShortcut(_translate("MainWindow", "U"))
diff --git a/src/ui/sources/Ui_main_userData.py b/src/ui/sources/Ui_main_userData.py
index 10c7711..9f058f3 100644
--- a/src/ui/sources/Ui_main_userData.py
+++ b/src/ui/sources/Ui_main_userData.py
@@ -93,6 +93,7 @@ class Ui_MainWindow(object):
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)
+ self.btn_extendSelectedMedia.setEnabled(False)
self.btn_extendSelectedMedia.setObjectName("btn_extendSelectedMedia")
self.horizontalLayout_3.addWidget(self.btn_extendSelectedMedia)
self.verticalLayout.addLayout(self.horizontalLayout_3)
@@ -149,8 +150,6 @@ class Ui_MainWindow(object):
self.radio_overdueLoans.setText(_translate("MainWindow", "Überzogen"))
self.btn_searchTableContent.setText(_translate("MainWindow", "Suchen"))
self.btn_extendSelectedMedia.setText(_translate("MainWindow", "Ausgewählte Verlängern"))
- item = self.UserMediaTable.horizontalHeaderItem(0)
- item.setText(_translate("MainWindow", " "))
item = self.UserMediaTable.horizontalHeaderItem(1)
item.setText(_translate("MainWindow", "ISBN"))
item = self.UserMediaTable.horizontalHeaderItem(2)
diff --git a/src/ui/sources/dialog_extendLoanDuration.ui b/src/ui/sources/dialog_extendLoanDuration.ui
index 786a76d..c4c4c1c 100644
--- a/src/ui/sources/dialog_extendLoanDuration.ui
+++ b/src/ui/sources/dialog_extendLoanDuration.ui
@@ -29,6 +29,12 @@
-
+
+
+ 11
+ true
+
+
Bitte das Verlängerungsdatum auswählen
diff --git a/src/ui/sources/dialog_message.ui b/src/ui/sources/dialog_message.ui
new file mode 100644
index 0000000..695ea67
--- /dev/null
+++ b/src/ui/sources/dialog_message.ui
@@ -0,0 +1,67 @@
+
+
+ Dialog
+
+
+
+ 0
+ 0
+ 400
+ 89
+
+
+
+ Dialog
+
+
+
-
+
+
+ -
+
+
+ Qt::Vertical
+
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+
+
+
+
+
+
+
+
+ buttonBox
+ accepted()
+ Dialog
+ accept()
+
+
+ 248
+ 254
+
+
+ 157
+ 274
+
+
+
+
+ buttonBox
+ rejected()
+ Dialog
+ reject()
+
+
+ 316
+ 260
+
+
+ 286
+ 274
+
+
+
+
+
diff --git a/src/ui/sources/main_UserInterface.ui b/src/ui/sources/main_UserInterface.ui
index 0fd9ef9..a76f286 100644
--- a/src/ui/sources/main_UserInterface.ui
+++ b/src/ui/sources/main_UserInterface.ui
@@ -144,6 +144,20 @@
+ -
+
+
+ Nächstes Rückgabedatum
+
+
+
+ -
+
+
+
+
+
+
@@ -189,7 +203,8 @@
Shortkeys
-
+
+
@@ -205,7 +220,7 @@
Beenden
-
+
Rückgabemodus
@@ -213,6 +228,14 @@
F5
+
+
+ Nutzer
+
+
+ U
+
+
input_userno
diff --git a/src/ui/sources/main_userData.ui b/src/ui/sources/main_userData.ui
index b0d8c16..13e0cb6 100644
--- a/src/ui/sources/main_userData.ui
+++ b/src/ui/sources/main_userData.ui
@@ -191,6 +191,9 @@
-
+
+ false
+
Ausgewählte Verlängern
@@ -229,7 +232,7 @@
-
+