From 27a478ce93afb4deff50f54b6f3b4bad40e57ebb Mon Sep 17 00:00:00 2001
From: WorldTeacher <41587052+WorldTeacher@users.noreply.github.com>
Date: Wed, 10 Jul 2024 11:35:25 +0200
Subject: [PATCH] ui changes

---
 src/ui/sources/Ui_dialog_multipleUserfound.py |  2 +
 src/ui/sources/Ui_main_UserInterface.py       | 68 +++++++++------
 src/ui/sources/dialog_multipleUserfound.ui    |  6 ++
 src/ui/sources/main_UserInterface.ui          | 87 ++++++++++---------
 4 files changed, 96 insertions(+), 67 deletions(-)

diff --git a/src/ui/sources/Ui_dialog_multipleUserfound.py b/src/ui/sources/Ui_dialog_multipleUserfound.py
index 074ac2e..9886663 100644
--- a/src/ui/sources/Ui_dialog_multipleUserfound.py
+++ b/src/ui/sources/Ui_dialog_multipleUserfound.py
@@ -19,6 +19,8 @@ class Ui_Dialog(object):
         self.label.setObjectName("label")
         self.verticalLayout.addWidget(self.label)
         self.tableWidget = QtWidgets.QTableWidget(parent=Dialog)
+        self.tableWidget.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers)
+        self.tableWidget.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows)
         self.tableWidget.setObjectName("tableWidget")
         self.tableWidget.setColumnCount(3)
         self.tableWidget.setRowCount(0)
diff --git a/src/ui/sources/Ui_main_UserInterface.py b/src/ui/sources/Ui_main_UserInterface.py
index f569841..ff26f52 100644
--- a/src/ui/sources/Ui_main_UserInterface.py
+++ b/src/ui/sources/Ui_main_UserInterface.py
@@ -12,13 +12,22 @@ from PyQt6 import QtCore, QtGui, QtWidgets
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
         MainWindow.setObjectName("MainWindow")
-        MainWindow.resize(800, 600)
+        MainWindow.resize(800, 602)
         self.centralwidget = QtWidgets.QWidget(parent=MainWindow)
         self.centralwidget.setObjectName("centralwidget")
         self.verticalLayout = QtWidgets.QVBoxLayout(self.centralwidget)
         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.horizontalLayout = QtWidgets.QHBoxLayout()
         self.horizontalLayout.setObjectName("horizontalLayout")
         self.label_5 = QtWidgets.QLabel(parent=self.centralwidget)
@@ -34,44 +43,38 @@ class Ui_MainWindow(object):
         self.mode.setObjectName("mode")
         self.horizontalLayout.addWidget(self.mode)
         self.gridLayout.addLayout(self.horizontalLayout, 0, 0, 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.input_username = QtWidgets.QLineEdit(parent=self.centralwidget)
-        self.input_username.setObjectName("input_username")
-        self.gridLayout.addWidget(self.input_username, 2, 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.input_userno = QtWidgets.QLineEdit(parent=self.centralwidget)
-        self.input_userno.setObjectName("input_userno")
-        self.gridLayout.addWidget(self.input_userno, 1, 1, 1, 1)
-        self.label = QtWidgets.QLabel(parent=self.centralwidget)
-        self.label.setObjectName("label")
-        self.gridLayout.addWidget(self.label, 1, 0, 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.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.duedate = QtWidgets.QDateEdit(parent=self.centralwidget)
-        self.duedate.setObjectName("duedate")
-        self.gridLayout.addWidget(self.duedate, 5, 1, 1, 1)
-        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
-        self.gridLayout.addItem(spacerItem, 6, 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.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.verticalLayout.addLayout(self.gridLayout)
         self.groupBox = QtWidgets.QGroupBox(parent=self.centralwidget)
         self.groupBox.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
         self.groupBox.setObjectName("groupBox")
         self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.groupBox)
         self.horizontalLayout_2.setObjectName("horizontalLayout_2")
-        self.textEdit = QtWidgets.QTextEdit(parent=self.groupBox)
-        self.textEdit.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
-        self.textEdit.setReadOnly(True)
-        self.textEdit.setObjectName("textEdit")
-        self.horizontalLayout_2.addWidget(self.textEdit)
+        self.userdata = QtWidgets.QTextEdit(parent=self.groupBox)
+        font = QtGui.QFont()
+        font.setFamily("Arial")
+        font.setPointSize(11)
+        font.setBold(True)
+        self.userdata.setFont(font)
+        self.userdata.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
+        self.userdata.setReadOnly(True)
+        self.userdata.setObjectName("userdata")
+        self.horizontalLayout_2.addWidget(self.userdata)
         self.groupBox_2 = QtWidgets.QGroupBox(parent=self.groupBox)
         self.groupBox_2.setObjectName("groupBox_2")
         self.gridLayout_2 = QtWidgets.QGridLayout(self.groupBox_2)
@@ -107,6 +110,8 @@ 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")
         MainWindow.setMenuBar(self.menubar)
         self.statusbar = QtWidgets.QStatusBar(parent=MainWindow)
         self.statusbar.setObjectName("statusbar")
@@ -115,9 +120,13 @@ 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.menuDatei.addAction(self.actionEinstellungen)
         self.menuDatei.addAction(self.actionBeenden)
+        self.menuShortkeys.addAction(self.actionR_ckgabemodus)
         self.menubar.addAction(self.menuDatei.menuAction())
+        self.menubar.addAction(self.menuShortkeys.menuAction())
 
         self.retranslateUi(MainWindow)
         self.actionBeenden.triggered.connect(MainWindow.close) # type: ignore
@@ -131,12 +140,12 @@ class Ui_MainWindow(object):
     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", "ISBN"))
-        self.label.setText(_translate("MainWindow", "Matrikelnummer"))
-        self.label_2.setText(_translate("MainWindow", "Benutzername"))
         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"))
@@ -145,5 +154,8 @@ class Ui_MainWindow(object):
         item = self.tableWidget.horizontalHeaderItem(1)
         item.setText(_translate("MainWindow", "Status"))
         self.menuDatei.setTitle(_translate("MainWindow", "Datei"))
+        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"))
diff --git a/src/ui/sources/dialog_multipleUserfound.ui b/src/ui/sources/dialog_multipleUserfound.ui
index fd5cd8b..269493a 100644
--- a/src/ui/sources/dialog_multipleUserfound.ui
+++ b/src/ui/sources/dialog_multipleUserfound.ui
@@ -23,6 +23,12 @@
    </item>
    <item>
     <widget class="QTableWidget" name="tableWidget">
+     <property name="editTriggers">
+      <set>QAbstractItemView::NoEditTriggers</set>
+     </property>
+     <property name="selectionBehavior">
+      <enum>QAbstractItemView::SelectRows</enum>
+     </property>
      <column>
       <property name="text">
        <string>Matrikelnr.</string>
diff --git a/src/ui/sources/main_UserInterface.ui b/src/ui/sources/main_UserInterface.ui
index 7497c92..0fd9ef9 100644
--- a/src/ui/sources/main_UserInterface.ui
+++ b/src/ui/sources/main_UserInterface.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>800</width>
-    <height>600</height>
+    <height>602</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,6 +17,19 @@
    <layout class="QVBoxLayout" name="verticalLayout" stretch="0,10,20">
     <item>
      <layout class="QGridLayout" name="gridLayout">
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Benutzername</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="input_userno"/>
+      </item>
+      <item row="5" column="1">
+       <widget class="QDateEdit" name="duedate"/>
+      </item>
       <item row="0" column="0">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
@@ -47,12 +60,6 @@
         </item>
        </layout>
       </item>
-      <item row="3" column="1">
-       <widget class="QLineEdit" name="input_file_ident"/>
-      </item>
-      <item row="2" column="1">
-       <widget class="QLineEdit" name="input_username"/>
-      </item>
       <item row="3" column="0">
        <widget class="QLabel" name="label_3">
         <property name="text">
@@ -60,23 +67,6 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
-       <widget class="QLineEdit" name="input_userno"/>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label">
-        <property name="text">
-         <string>Matrikelnummer</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="label_2">
-        <property name="text">
-         <string>Benutzername</string>
-        </property>
-       </widget>
-      </item>
       <item row="5" column="0">
        <widget class="QLabel" name="label_6">
         <property name="text">
@@ -87,21 +77,18 @@
         </property>
        </widget>
       </item>
-      <item row="5" column="1">
-       <widget class="QDateEdit" name="duedate"/>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>Matrikelnummer</string>
+        </property>
+       </widget>
       </item>
-      <item row="6" column="0">
-       <spacer name="verticalSpacer">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>40</height>
-         </size>
-        </property>
-       </spacer>
+      <item row="2" column="1">
+       <widget class="QLineEdit" name="input_username"/>
+      </item>
+      <item row="3" column="1">
+       <widget class="QLineEdit" name="input_file_ident"/>
       </item>
      </layout>
     </item>
@@ -115,7 +102,14 @@
       </property>
       <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="3,1">
        <item>
-        <widget class="QTextEdit" name="textEdit">
+        <widget class="QTextEdit" name="userdata">
+         <property name="font">
+          <font>
+           <family>Arial</family>
+           <pointsize>11</pointsize>
+           <bold>true</bold>
+          </font>
+         </property>
          <property name="focusPolicy">
           <enum>Qt::NoFocus</enum>
          </property>
@@ -191,7 +185,14 @@
     <addaction name="actionEinstellungen"/>
     <addaction name="actionBeenden"/>
    </widget>
+   <widget class="QMenu" name="menuShortkeys">
+    <property name="title">
+     <string>Shortkeys</string>
+    </property>
+    <addaction name="actionR_ckgabemodus"/>
+   </widget>
    <addaction name="menuDatei"/>
+   <addaction name="menuShortkeys"/>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
   <action name="actionEinstellungen">
@@ -204,6 +205,14 @@
     <string>Beenden</string>
    </property>
   </action>
+  <action name="actionR_ckgabemodus">
+   <property name="text">
+    <string>Rückgabemodus</string>
+   </property>
+   <property name="shortcut">
+    <string>F5</string>
+   </property>
+  </action>
  </widget>
  <tabstops>
   <tabstop>input_userno</tabstop>