From e6252d5c32abf2b7114a10ba31f40e879c51c3e3 Mon Sep 17 00:00:00 2001 From: WorldTeacher <41587052+WorldTeacher@users.noreply.github.com> Date: Mon, 15 Jul 2024 12:34:40 +0200 Subject: [PATCH] ui changes --- src/ui/sources/Ui_dialog_addNewTitleEntry.py | 61 ++++++++++ src/ui/sources/Ui_main_UserInterface.py | 30 ++--- src/ui/sources/dialog_addNewTitleEntry.ui | 112 +++++++++++++++++++ src/ui/sources/main_UserInterface.ui | 11 +- 4 files changed, 198 insertions(+), 16 deletions(-) create mode 100644 src/ui/sources/Ui_dialog_addNewTitleEntry.py create mode 100644 src/ui/sources/dialog_addNewTitleEntry.ui diff --git a/src/ui/sources/Ui_dialog_addNewTitleEntry.py b/src/ui/sources/Ui_dialog_addNewTitleEntry.py new file mode 100644 index 0000000..4277b24 --- /dev/null +++ b/src/ui/sources/Ui_dialog_addNewTitleEntry.py @@ -0,0 +1,61 @@ +# Form implementation generated from reading ui file 'c:\Users\aky547\GitHub\LibrarySystem\src\ui\sources\dialog_addNewTitleEntry.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, 300) + self.verticalLayout = QtWidgets.QVBoxLayout(Dialog) + self.verticalLayout.setObjectName("verticalLayout") + self.horizontalLayout = QtWidgets.QHBoxLayout() + self.horizontalLayout.setObjectName("horizontalLayout") + spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + self.horizontalLayout.addItem(spacerItem) + self.btn_addNewBook = QtWidgets.QToolButton(parent=Dialog) + self.btn_addNewBook.setObjectName("btn_addNewBook") + self.horizontalLayout.addWidget(self.btn_addNewBook) + self.verticalLayout.addLayout(self.horizontalLayout) + self.tableWidget = QtWidgets.QTableWidget(parent=Dialog) + self.tableWidget.setObjectName("tableWidget") + self.tableWidget.setColumnCount(4) + self.tableWidget.setRowCount(0) + item = QtWidgets.QTableWidgetItem() + self.tableWidget.setHorizontalHeaderItem(0, item) + item = QtWidgets.QTableWidgetItem() + self.tableWidget.setHorizontalHeaderItem(1, item) + item = QtWidgets.QTableWidgetItem() + self.tableWidget.setHorizontalHeaderItem(2, item) + item = QtWidgets.QTableWidgetItem() + self.tableWidget.setHorizontalHeaderItem(3, item) + self.verticalLayout.addWidget(self.tableWidget) + 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.setObjectName("buttonBox") + self.verticalLayout.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")) + self.btn_addNewBook.setText(_translate("Dialog", "+")) + item = self.tableWidget.horizontalHeaderItem(0) + item.setText(_translate("Dialog", "ISBN")) + item = self.tableWidget.horizontalHeaderItem(1) + item.setText(_translate("Dialog", "Titel")) + item = self.tableWidget.horizontalHeaderItem(2) + item.setText(_translate("Dialog", "Signatur")) + item = self.tableWidget.horizontalHeaderItem(3) + item.setText(_translate("Dialog", "PPN")) diff --git a/src/ui/sources/Ui_main_UserInterface.py b/src/ui/sources/Ui_main_UserInterface.py index e293e36..450504c 100644 --- a/src/ui/sources/Ui_main_UserInterface.py +++ b/src/ui/sources/Ui_main_UserInterface.py @@ -99,16 +99,18 @@ class Ui_MainWindow(object): self.horizontalLayout_2.setStretch(0, 3) self.horizontalLayout_2.setStretch(1, 1) self.verticalLayout.addWidget(self.groupBox) - self.tableWidget = QtWidgets.QTableWidget(parent=self.centralwidget) - self.tableWidget.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) - self.tableWidget.setObjectName("tableWidget") - self.tableWidget.setColumnCount(2) - self.tableWidget.setRowCount(0) + self.mediaOverview = QtWidgets.QTableWidget(parent=self.centralwidget) + self.mediaOverview.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) + self.mediaOverview.setObjectName("mediaOverview") + self.mediaOverview.setColumnCount(3) + self.mediaOverview.setRowCount(0) item = QtWidgets.QTableWidgetItem() - self.tableWidget.setHorizontalHeaderItem(0, item) + self.mediaOverview.setHorizontalHeaderItem(0, item) item = QtWidgets.QTableWidgetItem() - self.tableWidget.setHorizontalHeaderItem(1, item) - self.verticalLayout.addWidget(self.tableWidget) + self.mediaOverview.setHorizontalHeaderItem(1, item) + item = QtWidgets.QTableWidgetItem() + self.mediaOverview.setHorizontalHeaderItem(2, item) + self.verticalLayout.addWidget(self.mediaOverview) self.verticalLayout.setStretch(1, 10) self.verticalLayout.setStretch(2, 20) MainWindow.setCentralWidget(self.centralwidget) @@ -144,8 +146,8 @@ class Ui_MainWindow(object): 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.tableWidget) - MainWindow.setTabOrder(self.tableWidget, self.btn_show_lentmedia) + MainWindow.setTabOrder(self.groupBox, self.mediaOverview) + MainWindow.setTabOrder(self.mediaOverview, self.btn_show_lentmedia) def retranslateUi(self, MainWindow): _translate = QtCore.QCoreApplication.translate @@ -153,16 +155,18 @@ class Ui_MainWindow(object): 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", "ISBN")) + self.label_3.setText(_translate("MainWindow", "Suchbegriff")) self.label_6.setText(_translate("MainWindow", "Ausleihe bis")) self.label.setText(_translate("MainWindow", "Matrikelnummer")) 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 = self.mediaOverview.horizontalHeaderItem(0) item.setText(_translate("MainWindow", "ISBN")) - item = self.tableWidget.horizontalHeaderItem(1) + item = self.mediaOverview.horizontalHeaderItem(1) + item.setText(_translate("MainWindow", "Titel")) + item = self.mediaOverview.horizontalHeaderItem(2) item.setText(_translate("MainWindow", "Status")) self.menuDatei.setTitle(_translate("MainWindow", "Datei")) self.menuShortkeys.setTitle(_translate("MainWindow", "Shortkeys")) diff --git a/src/ui/sources/dialog_addNewTitleEntry.ui b/src/ui/sources/dialog_addNewTitleEntry.ui new file mode 100644 index 0000000..f9b7149 --- /dev/null +++ b/src/ui/sources/dialog_addNewTitleEntry.ui @@ -0,0 +1,112 @@ + + + Dialog + + + + 0 + 0 + 400 + 300 + + + + Dialog + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + + + + + + ISBN + + + + + Titel + + + + + Signatur + + + + + PPN + + + + + + + + Qt::Horizontal + + + 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 a76f286..a905129 100644 --- a/src/ui/sources/main_UserInterface.ui +++ b/src/ui/sources/main_UserInterface.ui @@ -63,7 +63,7 @@ - ISBN + Suchbegriff @@ -165,7 +165,7 @@ - + Qt::NoFocus @@ -174,6 +174,11 @@ ISBN + + + Titel + + Status @@ -242,7 +247,7 @@ input_username input_file_ident groupBox - tableWidget + mediaOverview btn_show_lentmedia