From 049992f0a75d7b61f416b813a85879699fde1666 Mon Sep 17 00:00:00 2001 From: WorldTeacher Date: Tue, 28 Jan 2025 13:52:03 +0100 Subject: [PATCH] fix some small stuff, add icons to main UI, add shortcuts --- src/logic/database.py | 4 --- src/ui/main_ui.py | 9 ++++++ src/ui/sources/Ui_main_Loans.py | 36 +++++---------------- src/ui/sources/Ui_main_UserInterface.py | 42 ++++++------------------- src/ui/sources/main_Loans.ui | 17 ---------- src/ui/sources/main_UserInterface.ui | 6 ++++ 6 files changed, 32 insertions(+), 82 deletions(-) diff --git a/src/logic/database.py b/src/logic/database.py index 441cf1b..79300a4 100644 --- a/src/logic/database.py +++ b/src/logic/database.py @@ -235,7 +235,6 @@ class Database: if res[0] == user_id: user = User(userid=res[1], username=res[2], email=res[3], id=res[0]) log.debug(f"Returning User {user}") - log.info(f"Returning User {user}") return user else: for res in result: @@ -245,9 +244,6 @@ class Database: log.info(f"Returning User {user}") return user raise ValueError(f"User {user_id} not found") - # return User(userid="gelöscht", username="gelöscht", email="gelöscht", id="gelöscht") - # user = User(userid=result[1], username=result[2], email=result[3],id = result[0]) - # return user def getUserId(self, username) -> User: conn = self.connect() diff --git a/src/ui/main_ui.py b/src/ui/main_ui.py index 8d9bcd3..25c168b 100644 --- a/src/ui/main_ui.py +++ b/src/ui/main_ui.py @@ -100,6 +100,15 @@ class MainUI(QtWidgets.QMainWindow, Ui_MainWindow): log.info("Backup enabled") else: log.warning("Backup disabled") + + # set Action Icons + Icon("settings", self.actionEinstellungen) + Icon("user", self.actionNutzer) + Icon("quit", self.actionBeenden) + Icon("report", self.actionBericht_erstellen) + Icon("history", self.actionAusleihhistorie) + Icon("help", self.actionDokumentation_ffnen) + Icon("support", self.actionProblem_melden) self.show() def shutdown(self, *args): diff --git a/src/ui/sources/Ui_main_Loans.py b/src/ui/sources/Ui_main_Loans.py index 0e255d4..c57b60e 100644 --- a/src/ui/sources/Ui_main_Loans.py +++ b/src/ui/sources/Ui_main_Loans.py @@ -1,6 +1,6 @@ # 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 +# Created by: PyQt6 UI code generator 6.7.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. @@ -29,12 +29,7 @@ class Ui_MainWindow(object): 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, - ) + 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() @@ -50,15 +45,9 @@ class Ui_MainWindow(object): 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.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) @@ -78,28 +67,18 @@ class Ui_MainWindow(object): 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") - self.menuDatei = QtWidgets.QMenu(parent=self.menubar) - self.menuDatei.setObjectName("menuDatei") - MainWindow.setMenuBar(self.menubar) self.actionBeenden = QtGui.QAction(parent=MainWindow) self.actionBeenden.setObjectName("actionBeenden") - self.menuDatei.addAction(self.actionBeenden) - self.menubar.addAction(self.menuDatei.menuAction()) self.retranslateUi(MainWindow) - self.actionBeenden.triggered.connect(MainWindow.close) # type: ignore + self.actionBeenden.triggered.connect(MainWindow.close) # type: ignore 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_current.setText(_translate("MainWindow", "Aktuell Entliehene Medien")) self.radio_overdue.setText(_translate("MainWindow", "Überzogene Medien")) self.searchFields.setItemText(0, _translate("MainWindow", "Titel")) self.searchFields.setItemText(1, _translate("MainWindow", "Signatur")) @@ -118,6 +97,5 @@ class Ui_MainWindow(object): item.setText(_translate("MainWindow", "entliehen bis")) item = self.loanTable.horizontalHeaderItem(6) item.setText(_translate("MainWindow", "Zurückgegeben am")) - self.menuDatei.setTitle(_translate("MainWindow", "Datei")) self.actionBeenden.setText(_translate("MainWindow", "Beenden")) self.actionBeenden.setShortcut(_translate("MainWindow", "Q")) diff --git a/src/ui/sources/Ui_main_UserInterface.py b/src/ui/sources/Ui_main_UserInterface.py index 13e60e0..cc7fe5b 100644 --- a/src/ui/sources/Ui_main_UserInterface.py +++ b/src/ui/sources/Ui_main_UserInterface.py @@ -22,9 +22,7 @@ class Ui_MainWindow(object): 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 = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.duedate.sizePolicy().hasHeightForWidth()) @@ -34,23 +32,14 @@ class Ui_MainWindow(object): self.duedate.setBaseSize(QtCore.QSize(70, 0)) self.duedate.setObjectName("duedate") self.horizontalLayout_4.addWidget(self.duedate) - spacerItem = QtWidgets.QSpacerItem( - 40, - 20, - QtWidgets.QSizePolicy.Policy.Expanding, - QtWidgets.QSizePolicy.Policy.Minimum, - ) + spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_4.addItem(spacerItem) self.gridLayout.addLayout(self.horizontalLayout_4, 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.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() @@ -77,12 +66,7 @@ class Ui_MainWindow(object): self.gridLayout.addWidget(self.input_file_ident, 3, 1, 1, 1) self.horizontalLayout_3 = QtWidgets.QHBoxLayout() self.horizontalLayout_3.setObjectName("horizontalLayout_3") - spacerItem1 = QtWidgets.QSpacerItem( - 40, - 20, - QtWidgets.QSizePolicy.Policy.Expanding, - QtWidgets.QSizePolicy.Policy.Minimum, - ) + spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_3.addItem(spacerItem1) self.btn_createNewUser = QtWidgets.QPushButton(parent=self.centralwidget) self.btn_createNewUser.setObjectName("btn_createNewUser") @@ -120,11 +104,7 @@ class Ui_MainWindow(object): self.btn_show_lentmedia.setObjectName("btn_show_lentmedia") self.gridLayout_2.addWidget(self.btn_show_lentmedia, 0, 1, 1, 1) self.label_4 = QtWidgets.QLabel(parent=self.groupBox_2) - self.label_4.setAlignment( - QtCore.Qt.AlignmentFlag.AlignRight - | QtCore.Qt.AlignmentFlag.AlignTrailing - | QtCore.Qt.AlignmentFlag.AlignVCenter - ) + 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) @@ -199,7 +179,7 @@ class Ui_MainWindow(object): self.menubar.addAction(self.menuHilfe.menuAction()) self.retranslateUi(MainWindow) - self.actionBeenden.triggered.connect(MainWindow.close) # type: ignore + 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) @@ -230,19 +210,17 @@ class Ui_MainWindow(object): self.menuFenster.setTitle(_translate("MainWindow", "Fenster")) self.menuHilfe.setTitle(_translate("MainWindow", "Hilfe")) self.actionEinstellungen.setText(_translate("MainWindow", "Einstellungen")) + self.actionEinstellungen.setShortcut(_translate("MainWindow", "Alt+S")) self.actionBeenden.setText(_translate("MainWindow", "Beenden")) + self.actionBeenden.setShortcut(_translate("MainWindow", "Alt+Q")) 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.actionAusleihhistorie.setText(_translate("MainWindow", "Ausleihhistorie")) self.actionAusleihhistorie.setShortcut(_translate("MainWindow", "F8")) - self.actionBericht_erstellen.setText( - _translate("MainWindow", "Bericht erstellen") - ) + self.actionBericht_erstellen.setText(_translate("MainWindow", "Bericht erstellen")) self.actionBericht_erstellen.setShortcut(_translate("MainWindow", "F7")) - self.actionDokumentation_ffnen.setText( - _translate("MainWindow", "Dokumentation öffnen") - ) + self.actionDokumentation_ffnen.setText(_translate("MainWindow", "Dokumentation öffnen")) self.actionDokumentation_ffnen.setShortcut(_translate("MainWindow", "F1")) self.actionProblem_melden.setText(_translate("MainWindow", "Problem melden")) diff --git a/src/ui/sources/main_Loans.ui b/src/ui/sources/main_Loans.ui index 94aac73..7a64859 100644 --- a/src/ui/sources/main_Loans.ui +++ b/src/ui/sources/main_Loans.ui @@ -132,23 +132,6 @@ - - - - 0 - 0 - 899 - 22 - - - - - Datei - - - - - Beenden diff --git a/src/ui/sources/main_UserInterface.ui b/src/ui/sources/main_UserInterface.ui index 46614e8..a18b884 100644 --- a/src/ui/sources/main_UserInterface.ui +++ b/src/ui/sources/main_UserInterface.ui @@ -303,11 +303,17 @@ Einstellungen + + Alt+S + Beenden + + Alt+Q +