diff --git a/src/logic/__init__.py b/src/logic/__init__.py index e69de29..9d68c83 100644 --- a/src/logic/__init__.py +++ b/src/logic/__init__.py @@ -0,0 +1,3 @@ +from .thread_bookgrabber import BookGrabber +from .threads_autoadder import AutoAdder +from .threads_availchecker import AvailChecker diff --git a/src/ui/Ui_plotdata.py b/src/ui/Ui_plotdata.py index 3d8667e..e0ee261 100644 --- a/src/ui/Ui_plotdata.py +++ b/src/ui/Ui_plotdata.py @@ -1,12 +1,12 @@ # Form implementation generated from reading ui file 'c:\Users\aky547\GitHub\Semesterapparate\ui\plotdata.ui' # -# Created by: PySide6 UI code generator 6.3.1 +# Created by: PyQt6 UI code generator 6.3.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 PySide6 import QtCore, QtWidgets +from PyQt6 import QtCore, QtWidgets class Ui_MainWindow(object): diff --git a/src/ui/Ui_semesterapparat_ui.py b/src/ui/Ui_semesterapparat_ui.py index e511d74..1943e09 100644 --- a/src/ui/Ui_semesterapparat_ui.py +++ b/src/ui/Ui_semesterapparat_ui.py @@ -1,45 +1,37 @@ -# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file '/home/alexander/GitHub/SemesterapparatsManager/src/ui/semesterapparat_ui.ui' +# Form implementation generated from reading ui file 'c:\Users\aky547\GitHub\SemesterapparatsManager\src\ui\semesterapparat_ui.ui' # -# Created by: PySide6 UI code generator 5.15.10 +# Created by: PyQt6 UI code generator 6.6.1 # -# WARNING: Any manual changes made to this file will be lost when pyuic5 is +# 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 PySide6 import QtCore, QtGui, QtWidgets +from PyQt6 import QtCore, QtGui, QtWidgets class Ui_MainWindow(object): def setupUi(self, MainWindow): MainWindow.setObjectName("MainWindow") - MainWindow.setWindowModality(QtCore.Qt.WindowModal) + MainWindow.setWindowModality(QtCore.Qt.WindowModality.WindowModal) MainWindow.setEnabled(True) MainWindow.resize(1601, 800) - sizePolicy = QtWidgets.QSizePolicy( - QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed - ) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(MainWindow.sizePolicy().hasHeightForWidth()) MainWindow.setSizePolicy(sizePolicy) MainWindow.setMinimumSize(QtCore.QSize(1278, 800)) MainWindow.setMaximumSize(QtCore.QSize(1920, 800)) - MainWindow.setContextMenuPolicy(QtCore.Qt.NoContextMenu) + MainWindow.setContextMenuPolicy(QtCore.Qt.ContextMenuPolicy.NoContextMenu) MainWindow.setStatusTip("") - self.centralwidget = QtWidgets.QWidget(MainWindow) - sizePolicy = QtWidgets.QSizePolicy( - QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed - ) + self.centralwidget = QtWidgets.QWidget(parent=MainWindow) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth( - self.centralwidget.sizePolicy().hasHeightForWidth() - ) + sizePolicy.setHeightForWidth(self.centralwidget.sizePolicy().hasHeightForWidth()) self.centralwidget.setSizePolicy(sizePolicy) self.centralwidget.setObjectName("centralwidget") - self.verticalLayoutWidget = QtWidgets.QWidget(self.centralwidget) + self.verticalLayoutWidget = QtWidgets.QWidget(parent=self.centralwidget) self.verticalLayoutWidget.setGeometry(QtCore.QRect(0, 0, 1271, 761)) self.verticalLayoutWidget.setObjectName("verticalLayoutWidget") self.verticalLayout = QtWidgets.QVBoxLayout(self.verticalLayoutWidget) @@ -49,19 +41,17 @@ class Ui_MainWindow(object): self.horizontalLayout.setObjectName("horizontalLayout") self.gridLayout = QtWidgets.QGridLayout() self.gridLayout.setObjectName("gridLayout") - self.tabWidget = QtWidgets.QTabWidget(self.verticalLayoutWidget) - self.tabWidget.setFocusPolicy(QtCore.Qt.NoFocus) + self.tabWidget = QtWidgets.QTabWidget(parent=self.verticalLayoutWidget) + self.tabWidget.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) self.tabWidget.setObjectName("tabWidget") self.tab = QtWidgets.QWidget() - sizePolicy = QtWidgets.QSizePolicy( - QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred - ) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.tab.sizePolicy().hasHeightForWidth()) self.tab.setSizePolicy(sizePolicy) self.tab.setObjectName("tab") - self.horizontalLayoutWidget_2 = QtWidgets.QWidget(self.tab) + self.horizontalLayoutWidget_2 = QtWidgets.QWidget(parent=self.tab) self.horizontalLayoutWidget_2.setGeometry(QtCore.QRect(0, 0, 1261, 163)) self.horizontalLayoutWidget_2.setObjectName("horizontalLayoutWidget_2") self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.horizontalLayoutWidget_2) @@ -71,43 +61,29 @@ class Ui_MainWindow(object): self.formLayout.setObjectName("formLayout") self.verticalLayout_2 = QtWidgets.QVBoxLayout() self.verticalLayout_2.setObjectName("verticalLayout_2") - spacerItem = QtWidgets.QSpacerItem( - 20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding - ) + spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) self.verticalLayout_2.addItem(spacerItem) - self.load_app = QtWidgets.QPushButton(self.horizontalLayoutWidget_2) - self.load_app.setFocusPolicy(QtCore.Qt.NoFocus) + self.load_app = QtWidgets.QPushButton(parent=self.horizontalLayoutWidget_2) + self.load_app.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) self.load_app.setObjectName("load_app") self.verticalLayout_2.addWidget(self.load_app) - self.create_new_app = QtWidgets.QPushButton(self.horizontalLayoutWidget_2) - self.create_new_app.setFocusPolicy(QtCore.Qt.NoFocus) + self.create_new_app = QtWidgets.QPushButton(parent=self.horizontalLayoutWidget_2) + self.create_new_app.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) self.create_new_app.setObjectName("create_new_app") self.verticalLayout_2.addWidget(self.create_new_app) - self.cancel_active_selection = QtWidgets.QPushButton( - self.horizontalLayoutWidget_2 - ) - self.cancel_active_selection.setFocusPolicy(QtCore.Qt.NoFocus) + self.cancel_active_selection = QtWidgets.QPushButton(parent=self.horizontalLayoutWidget_2) + self.cancel_active_selection.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) self.cancel_active_selection.setObjectName("cancel_active_selection") self.verticalLayout_2.addWidget(self.cancel_active_selection) - spacerItem1 = QtWidgets.QSpacerItem( - 20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding - ) + spacerItem1 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) self.verticalLayout_2.addItem(spacerItem1) - self.formLayout.setLayout( - 1, QtWidgets.QFormLayout.LabelRole, self.verticalLayout_2 - ) - self.tableWidget_apparate = QtWidgets.QTableWidget( - self.horizontalLayoutWidget_2 - ) - self.tableWidget_apparate.setFocusPolicy(QtCore.Qt.NoFocus) - self.tableWidget_apparate.setSizeAdjustPolicy( - QtWidgets.QAbstractScrollArea.AdjustToContents - ) - self.tableWidget_apparate.setEditTriggers( - QtWidgets.QAbstractItemView.SelectedClicked - ) + self.formLayout.setLayout(1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.verticalLayout_2) + self.tableWidget_apparate = QtWidgets.QTableWidget(parent=self.horizontalLayoutWidget_2) + self.tableWidget_apparate.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) + self.tableWidget_apparate.setSizeAdjustPolicy(QtWidgets.QAbstractScrollArea.SizeAdjustPolicy.AdjustToContents) + self.tableWidget_apparate.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.SelectedClicked) self.tableWidget_apparate.setAlternatingRowColors(True) - self.tableWidget_apparate.setTextElideMode(QtCore.Qt.ElideMiddle) + self.tableWidget_apparate.setTextElideMode(QtCore.Qt.TextElideMode.ElideMiddle) self.tableWidget_apparate.setObjectName("tableWidget_apparate") self.tableWidget_apparate.setColumnCount(6) self.tableWidget_apparate.setRowCount(0) @@ -124,70 +100,56 @@ class Ui_MainWindow(object): item = QtWidgets.QTableWidgetItem() self.tableWidget_apparate.setHorizontalHeaderItem(5, item) self.tableWidget_apparate.horizontalHeader().setCascadingSectionResizes(True) - self.formLayout.setWidget( - 1, QtWidgets.QFormLayout.FieldRole, self.tableWidget_apparate - ) + self.formLayout.setWidget(1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.tableWidget_apparate) self.horizontalLayout_4 = QtWidgets.QHBoxLayout() self.horizontalLayout_4.setObjectName("horizontalLayout_4") - self.formLayout.setLayout( - 2, QtWidgets.QFormLayout.FieldRole, self.horizontalLayout_4 - ) + self.formLayout.setLayout(2, QtWidgets.QFormLayout.ItemRole.FieldRole, self.horizontalLayout_4) self.horizontalLayout_3 = QtWidgets.QHBoxLayout() self.horizontalLayout_3.setObjectName("horizontalLayout_3") - self.formLayout.setLayout( - 3, QtWidgets.QFormLayout.LabelRole, self.horizontalLayout_3 - ) + self.formLayout.setLayout(3, QtWidgets.QFormLayout.ItemRole.LabelRole, self.horizontalLayout_3) self.horizontalLayout_2.addLayout(self.formLayout) - self.line = QtWidgets.QFrame(self.tab) + self.line = QtWidgets.QFrame(parent=self.tab) self.line.setGeometry(QtCore.QRect(0, 160, 1261, 21)) - self.line.setFrameShape(QtWidgets.QFrame.HLine) - self.line.setFrameShadow(QtWidgets.QFrame.Sunken) + self.line.setFrameShape(QtWidgets.QFrame.Shape.HLine) + self.line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken) self.line.setObjectName("line") - self.gridLayoutWidget_2 = QtWidgets.QWidget(self.tab) + self.gridLayoutWidget_2 = QtWidgets.QWidget(parent=self.tab) self.gridLayoutWidget_2.setEnabled(True) self.gridLayoutWidget_2.setGeometry(QtCore.QRect(0, 180, 1261, 511)) self.gridLayoutWidget_2.setObjectName("gridLayoutWidget_2") self.gridLayout_2 = QtWidgets.QGridLayout(self.gridLayoutWidget_2) self.gridLayout_2.setContentsMargins(0, 0, 0, 0) self.gridLayout_2.setObjectName("gridLayout_2") - self.app_group_box = QtWidgets.QGroupBox(self.gridLayoutWidget_2) - sizePolicy = QtWidgets.QSizePolicy( - QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed - ) + self.app_group_box = QtWidgets.QGroupBox(parent=self.gridLayoutWidget_2) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth( - self.app_group_box.sizePolicy().hasHeightForWidth() - ) + sizePolicy.setHeightForWidth(self.app_group_box.sizePolicy().hasHeightForWidth()) self.app_group_box.setSizePolicy(sizePolicy) self.app_group_box.setMinimumSize(QtCore.QSize(0, 210)) font = QtGui.QFont() font.setPointSize(12) font.setBold(True) - font.setWeight(QtGui.QFont.Weight(75)) + font.setWeight(75) self.app_group_box.setFont(font) - self.app_group_box.setAlignment( - QtCore.Qt.AlignLeading | QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter - ) + self.app_group_box.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft|QtCore.Qt.AlignmentFlag.AlignVCenter) self.app_group_box.setCheckable(False) self.app_group_box.setObjectName("app_group_box") - self.dokument_list = QtWidgets.QTableWidget(self.app_group_box) + self.dokument_list = QtWidgets.QTableWidget(parent=self.app_group_box) self.dokument_list.setGeometry(QtCore.QRect(765, 20, 321, 181)) font = QtGui.QFont() font.setPointSize(10) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) font.setKerning(False) self.dokument_list.setFont(font) - self.dokument_list.setFocusPolicy(QtCore.Qt.NoFocus) + self.dokument_list.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) self.dokument_list.setAcceptDrops(True) - self.dokument_list.setSizeAdjustPolicy( - QtWidgets.QAbstractScrollArea.AdjustToContents - ) + self.dokument_list.setSizeAdjustPolicy(QtWidgets.QAbstractScrollArea.SizeAdjustPolicy.AdjustToContents) self.dokument_list.setDragEnabled(True) - self.dokument_list.setDragDropMode(QtWidgets.QAbstractItemView.DropOnly) - self.dokument_list.setDefaultDropAction(QtCore.Qt.LinkAction) - self.dokument_list.setSelectionMode(QtWidgets.QAbstractItemView.SingleSelection) + self.dokument_list.setDragDropMode(QtWidgets.QAbstractItemView.DragDropMode.DropOnly) + self.dokument_list.setDefaultDropAction(QtCore.Qt.DropAction.LinkAction) + self.dokument_list.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.SingleSelection) self.dokument_list.setObjectName("dokument_list") self.dokument_list.setColumnCount(4) self.dokument_list.setRowCount(0) @@ -211,338 +173,330 @@ class Ui_MainWindow(object): self.dokument_list.setHorizontalHeaderItem(2, item) item = QtWidgets.QTableWidgetItem() self.dokument_list.setHorizontalHeaderItem(3, item) - self.frame = QtWidgets.QFrame(self.app_group_box) + self.frame = QtWidgets.QFrame(parent=self.app_group_box) self.frame.setEnabled(True) self.frame.setGeometry(QtCore.QRect(10, 30, 1241, 151)) - sizePolicy = QtWidgets.QSizePolicy( - QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed - ) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.frame.sizePolicy().hasHeightForWidth()) self.frame.setSizePolicy(sizePolicy) - self.frame.setFrameShape(QtWidgets.QFrame.StyledPanel) - self.frame.setFrameShadow(QtWidgets.QFrame.Raised) + self.frame.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) + self.frame.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) self.frame.setObjectName("frame") - self.label_5 = QtWidgets.QLabel(self.frame) + self.label_5 = QtWidgets.QLabel(parent=self.frame) self.label_5.setGeometry(QtCore.QRect(250, 20, 91, 21)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.label_5.setFont(font) self.label_5.setObjectName("label_5") - self.sem_winter = QtWidgets.QRadioButton(self.frame) + self.sem_winter = QtWidgets.QRadioButton(parent=self.frame) self.sem_winter.setGeometry(QtCore.QRect(340, 50, 82, 17)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.sem_winter.setFont(font) - self.sem_winter.setFocusPolicy(QtCore.Qt.NoFocus) + self.sem_winter.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) self.sem_winter.setObjectName("sem_winter") - self.label_4 = QtWidgets.QLabel(self.frame) + self.label_4 = QtWidgets.QLabel(parent=self.frame) self.label_4.setGeometry(QtCore.QRect(10, 80, 71, 21)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.label_4.setFont(font) self.label_4.setObjectName("label_4") - self.drpdwn_app_nr = QtWidgets.QComboBox(self.frame) + self.drpdwn_app_nr = QtWidgets.QComboBox(parent=self.frame) self.drpdwn_app_nr.setGeometry(QtCore.QRect(110, 20, 69, 22)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.drpdwn_app_nr.setFont(font) - self.drpdwn_app_nr.setInputMethodHints(QtCore.Qt.ImhDigitsOnly) + self.drpdwn_app_nr.setInputMethodHints(QtCore.Qt.InputMethodHint.ImhDigitsOnly) self.drpdwn_app_nr.setEditable(True) self.drpdwn_app_nr.setObjectName("drpdwn_app_nr") - self.app_name = QtWidgets.QLineEdit(self.frame) + self.app_name = QtWidgets.QLineEdit(parent=self.frame) self.app_name.setGeometry(QtCore.QRect(340, 20, 113, 20)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.app_name.setFont(font) - self.app_name.setFocusPolicy(QtCore.Qt.StrongFocus) + self.app_name.setFocusPolicy(QtCore.Qt.FocusPolicy.StrongFocus) self.app_name.setObjectName("app_name") - self.sem_sommer = QtWidgets.QRadioButton(self.frame) + self.sem_sommer = QtWidgets.QRadioButton(parent=self.frame) self.sem_sommer.setGeometry(QtCore.QRect(340, 70, 82, 17)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.sem_sommer.setFont(font) - self.sem_sommer.setFocusPolicy(QtCore.Qt.NoFocus) + self.sem_sommer.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) self.sem_sommer.setObjectName("sem_sommer") - self.label_3 = QtWidgets.QLabel(self.frame) + self.label_3 = QtWidgets.QLabel(parent=self.frame) self.label_3.setGeometry(QtCore.QRect(10, 50, 61, 20)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.label_3.setFont(font) self.label_3.setObjectName("label_3") - self.label_6 = QtWidgets.QLabel(self.frame) + self.label_6 = QtWidgets.QLabel(parent=self.frame) self.label_6.setGeometry(QtCore.QRect(270, 60, 61, 21)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.label_6.setFont(font) self.label_6.setObjectName("label_6") - self.sem_year = QtWidgets.QLineEdit(self.frame) + self.sem_year = QtWidgets.QLineEdit(parent=self.frame) self.sem_year.setGeometry(QtCore.QRect(410, 60, 113, 20)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.sem_year.setFont(font) - self.sem_year.setFocusPolicy(QtCore.Qt.StrongFocus) + self.sem_year.setFocusPolicy(QtCore.Qt.FocusPolicy.StrongFocus) self.sem_year.setMaxLength(4) self.sem_year.setObjectName("sem_year") - self.label_2 = QtWidgets.QLabel(self.frame) + self.label_2 = QtWidgets.QLabel(parent=self.frame) self.label_2.setGeometry(QtCore.QRect(10, 20, 101, 21)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.label_2.setFont(font) self.label_2.setObjectName("label_2") - self.btn_apparat_save = QtWidgets.QPushButton(self.frame) + self.btn_apparat_save = QtWidgets.QPushButton(parent=self.frame) self.btn_apparat_save.setGeometry(QtCore.QRect(260, 120, 75, 23)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.btn_apparat_save.setFont(font) self.btn_apparat_save.setObjectName("btn_apparat_save") - self.btn_apparat_apply = QtWidgets.QPushButton(self.frame) + self.btn_apparat_apply = QtWidgets.QPushButton(parent=self.frame) self.btn_apparat_apply.setGeometry(QtCore.QRect(350, 120, 75, 23)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.btn_apparat_apply.setFont(font) self.btn_apparat_apply.setObjectName("btn_apparat_apply") - self.check_eternal_app = QtWidgets.QCheckBox(self.frame) + self.check_eternal_app = QtWidgets.QCheckBox(parent=self.frame) self.check_eternal_app.setGeometry(QtCore.QRect(340, 90, 101, 17)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.check_eternal_app.setFont(font) self.check_eternal_app.setObjectName("check_eternal_app") - self.label_8 = QtWidgets.QLabel(self.frame) + self.label_8 = QtWidgets.QLabel(parent=self.frame) self.label_8.setGeometry(QtCore.QRect(10, 110, 71, 21)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.label_8.setFont(font) self.label_8.setObjectName("label_8") - self.prof_mail = QtWidgets.QLineEdit(self.frame) + self.prof_mail = QtWidgets.QLineEdit(parent=self.frame) self.prof_mail.setGeometry(QtCore.QRect(110, 110, 121, 20)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.prof_mail.setFont(font) - self.prof_mail.setInputMethodHints(QtCore.Qt.ImhEmailCharactersOnly) + self.prof_mail.setInputMethodHints(QtCore.Qt.InputMethodHint.ImhEmailCharactersOnly) self.prof_mail.setMaxLength(200) self.prof_mail.setPlaceholderText("") self.prof_mail.setObjectName("prof_mail") - self.label_9 = QtWidgets.QLabel(self.frame) + self.label_9 = QtWidgets.QLabel(parent=self.frame) self.label_9.setGeometry(QtCore.QRect(10, 130, 71, 21)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.label_9.setFont(font) self.label_9.setObjectName("label_9") - self.prof_tel_nr = QtWidgets.QLineEdit(self.frame) + self.prof_tel_nr = QtWidgets.QLineEdit(parent=self.frame) self.prof_tel_nr.setGeometry(QtCore.QRect(110, 130, 121, 20)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.prof_tel_nr.setFont(font) - self.prof_tel_nr.setInputMethodHints(QtCore.Qt.ImhDigitsOnly) + self.prof_tel_nr.setInputMethodHints(QtCore.Qt.InputMethodHint.ImhDigitsOnly) self.prof_tel_nr.setPlaceholderText("") self.prof_tel_nr.setObjectName("prof_tel_nr") - self.label_10 = QtWidgets.QLabel(self.frame) + self.label_10 = QtWidgets.QLabel(parent=self.frame) self.label_10.setGeometry(QtCore.QRect(470, 20, 51, 21)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.label_10.setFont(font) self.label_10.setObjectName("label_10") - self.drpdwn_prof_name = QtWidgets.QComboBox(self.frame) + self.drpdwn_prof_name = QtWidgets.QComboBox(parent=self.frame) self.drpdwn_prof_name.setGeometry(QtCore.QRect(110, 80, 121, 22)) font = QtGui.QFont() font.setPointSize(8) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.drpdwn_prof_name.setFont(font) - self.drpdwn_prof_name.setFocusPolicy(QtCore.Qt.StrongFocus) + self.drpdwn_prof_name.setFocusPolicy(QtCore.Qt.FocusPolicy.StrongFocus) self.drpdwn_prof_name.setEditable(True) self.drpdwn_prof_name.setCurrentText("") - self.drpdwn_prof_name.setInsertPolicy(QtWidgets.QComboBox.InsertAlphabetically) + self.drpdwn_prof_name.setInsertPolicy(QtWidgets.QComboBox.InsertPolicy.InsertAlphabetically) self.drpdwn_prof_name.setFrame(True) self.drpdwn_prof_name.setObjectName("drpdwn_prof_name") - self.mail_mand = QtWidgets.QLabel(self.frame) + self.mail_mand = QtWidgets.QLabel(parent=self.frame) self.mail_mand.setGeometry(QtCore.QRect(100, 110, 47, 21)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.mail_mand.setFont(font) self.mail_mand.setObjectName("mail_mand") - self.telnr_mand = QtWidgets.QLabel(self.frame) + self.telnr_mand = QtWidgets.QLabel(parent=self.frame) self.telnr_mand.setGeometry(QtCore.QRect(100, 130, 47, 21)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.telnr_mand.setFont(font) self.telnr_mand.setObjectName("telnr_mand") - self.profname_mand = QtWidgets.QLabel(self.frame) + self.profname_mand = QtWidgets.QLabel(parent=self.frame) self.profname_mand.setGeometry(QtCore.QRect(100, 80, 47, 21)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.profname_mand.setFont(font) self.profname_mand.setObjectName("profname_mand") - self.appname_mand = QtWidgets.QLabel(self.frame) + self.appname_mand = QtWidgets.QLabel(parent=self.frame) self.appname_mand.setGeometry(QtCore.QRect(330, 20, 16, 21)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.appname_mand.setFont(font) self.appname_mand.setObjectName("appname_mand") - self.fach_mand = QtWidgets.QLabel(self.frame) + self.fach_mand = QtWidgets.QLabel(parent=self.frame) self.fach_mand.setGeometry(QtCore.QRect(500, 20, 47, 21)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.fach_mand.setFont(font) - self.fach_mand.setFocusPolicy(QtCore.Qt.NoFocus) + self.fach_mand.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) self.fach_mand.setObjectName("fach_mand") - self._mand = QtWidgets.QLabel(self.frame) + self._mand = QtWidgets.QLabel(parent=self.frame) self._mand.setGeometry(QtCore.QRect(330, 60, 16, 21)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self._mand.setFont(font) self._mand.setObjectName("_mand") - self.btn_add_document = QtWidgets.QPushButton(self.frame) + self.btn_add_document = QtWidgets.QPushButton(parent=self.frame) self.btn_add_document.setGeometry(QtCore.QRect(1090, 20, 131, 25)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.btn_add_document.setFont(font) self.btn_add_document.setObjectName("btn_add_document") - self.btn_open_document = QtWidgets.QPushButton(self.frame) + self.btn_open_document = QtWidgets.QPushButton(parent=self.frame) self.btn_open_document.setGeometry(QtCore.QRect(1090, 60, 131, 25)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.btn_open_document.setFont(font) self.btn_open_document.setObjectName("btn_open_document") - self.check_file = QtWidgets.QPushButton(self.frame) + self.check_file = QtWidgets.QPushButton(parent=self.frame) self.check_file.setGeometry(QtCore.QRect(1090, 100, 131, 51)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.check_file.setFont(font) self.check_file.setObjectName("check_file") - self.formLayoutWidget_2 = QtWidgets.QWidget(self.frame) + self.formLayoutWidget_2 = QtWidgets.QWidget(parent=self.frame) self.formLayoutWidget_2.setGeometry(QtCore.QRect(550, 70, 202, 80)) self.formLayoutWidget_2.setObjectName("formLayoutWidget_2") self.formLayout_3 = QtWidgets.QFormLayout(self.formLayoutWidget_2) self.formLayout_3.setContentsMargins(0, 0, 0, 0) self.formLayout_3.setObjectName("formLayout_3") - self.label_12 = QtWidgets.QLabel(self.formLayoutWidget_2) + self.label_12 = QtWidgets.QLabel(parent=self.formLayoutWidget_2) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.label_12.setFont(font) self.label_12.setObjectName("label_12") - self.formLayout_3.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_12) - self.prof_id_adis = QtWidgets.QLineEdit(self.formLayoutWidget_2) + self.formLayout_3.setWidget(0, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_12) + self.prof_id_adis = QtWidgets.QLineEdit(parent=self.formLayoutWidget_2) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.prof_id_adis.setFont(font) self.prof_id_adis.setObjectName("prof_id_adis") - self.formLayout_3.setWidget( - 0, QtWidgets.QFormLayout.FieldRole, self.prof_id_adis - ) - self.label_13 = QtWidgets.QLabel(self.formLayoutWidget_2) + self.formLayout_3.setWidget(0, QtWidgets.QFormLayout.ItemRole.FieldRole, self.prof_id_adis) + self.label_13 = QtWidgets.QLabel(parent=self.formLayoutWidget_2) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.label_13.setFont(font) self.label_13.setObjectName("label_13") - self.formLayout_3.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label_13) - self.apparat_id_adis = QtWidgets.QLineEdit(self.formLayoutWidget_2) + self.formLayout_3.setWidget(1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_13) + self.apparat_id_adis = QtWidgets.QLineEdit(parent=self.formLayoutWidget_2) self.apparat_id_adis.setObjectName("apparat_id_adis") - self.formLayout_3.setWidget( - 1, QtWidgets.QFormLayout.FieldRole, self.apparat_id_adis - ) - self.check_send_mail = QtWidgets.QCheckBox(self.frame) + self.formLayout_3.setWidget(1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.apparat_id_adis) + self.check_send_mail = QtWidgets.QCheckBox(parent=self.frame) self.check_send_mail.setGeometry(QtCore.QRect(450, 120, 91, 17)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.check_send_mail.setFont(font) self.check_send_mail.setObjectName("check_send_mail") - self.frame_3 = QtWidgets.QFrame(self.frame) + self.frame_3 = QtWidgets.QFrame(parent=self.frame) self.frame_3.setGeometry(QtCore.QRect(510, 0, 241, 61)) - self.frame_3.setFrameShape(QtWidgets.QFrame.StyledPanel) - self.frame_3.setFrameShadow(QtWidgets.QFrame.Raised) + self.frame_3.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) + self.frame_3.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) self.frame_3.setObjectName("frame_3") - self.gridLayoutWidget_5 = QtWidgets.QWidget(self.frame_3) + self.gridLayoutWidget_5 = QtWidgets.QWidget(parent=self.frame_3) self.gridLayoutWidget_5.setGeometry(QtCore.QRect(0, 0, 241, 61)) self.gridLayoutWidget_5.setObjectName("gridLayoutWidget_5") self.gridLayout_6 = QtWidgets.QGridLayout(self.gridLayoutWidget_5) self.gridLayout_6.setContentsMargins(0, 0, 0, 0) self.gridLayout_6.setObjectName("gridLayout_6") - self.app_fach = QtWidgets.QComboBox(self.gridLayoutWidget_5) + self.app_fach = QtWidgets.QComboBox(parent=self.gridLayoutWidget_5) self.app_fach.setMaximumSize(QtCore.QSize(16777215, 20)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.app_fach.setFont(font) self.app_fach.setObjectName("app_fach") self.gridLayout_6.addWidget(self.app_fach, 0, 0, 1, 1) - spacerItem2 = QtWidgets.QSpacerItem( - 40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum - ) + spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.gridLayout_6.addItem(spacerItem2, 0, 1, 1, 1) - self.prof_title = QtWidgets.QLineEdit(self.frame) + self.prof_title = QtWidgets.QLineEdit(parent=self.frame) self.prof_title.setGeometry(QtCore.QRect(110, 50, 71, 20)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.prof_title.setFont(font) - self.prof_title.setFocusPolicy(QtCore.Qt.StrongFocus) + self.prof_title.setFocusPolicy(QtCore.Qt.FocusPolicy.StrongFocus) self.prof_title.setObjectName("prof_title") self.mail_mand.raise_() self._mand.raise_() @@ -579,29 +533,19 @@ class Ui_MainWindow(object): self.frame.raise_() self.dokument_list.raise_() self.gridLayout_2.addWidget(self.app_group_box, 1, 0, 1, 1) - self.tableWidget_apparat_media = QtWidgets.QTableWidget(self.gridLayoutWidget_2) - sizePolicy = QtWidgets.QSizePolicy( - QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Expanding - ) + self.tableWidget_apparat_media = QtWidgets.QTableWidget(parent=self.gridLayoutWidget_2) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth( - self.tableWidget_apparat_media.sizePolicy().hasHeightForWidth() - ) + sizePolicy.setHeightForWidth(self.tableWidget_apparat_media.sizePolicy().hasHeightForWidth()) self.tableWidget_apparat_media.setSizePolicy(sizePolicy) self.tableWidget_apparat_media.setMinimumSize(QtCore.QSize(1259, 0)) - self.tableWidget_apparat_media.setFocusPolicy(QtCore.Qt.NoFocus) - self.tableWidget_apparat_media.setContextMenuPolicy(QtCore.Qt.CustomContextMenu) - self.tableWidget_apparat_media.setSizeAdjustPolicy( - QtWidgets.QAbstractScrollArea.AdjustToContents - ) - self.tableWidget_apparat_media.setEditTriggers( - QtWidgets.QAbstractItemView.NoEditTriggers - ) + self.tableWidget_apparat_media.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) + self.tableWidget_apparat_media.setContextMenuPolicy(QtCore.Qt.ContextMenuPolicy.CustomContextMenu) + self.tableWidget_apparat_media.setSizeAdjustPolicy(QtWidgets.QAbstractScrollArea.SizeAdjustPolicy.AdjustToContents) + self.tableWidget_apparat_media.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) self.tableWidget_apparat_media.setAlternatingRowColors(True) - self.tableWidget_apparat_media.setSelectionBehavior( - QtWidgets.QAbstractItemView.SelectRows - ) + self.tableWidget_apparat_media.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows) self.tableWidget_apparat_media.setObjectName("tableWidget_apparat_media") self.tableWidget_apparat_media.setColumnCount(7) self.tableWidget_apparat_media.setRowCount(0) @@ -619,225 +563,199 @@ class Ui_MainWindow(object): self.tableWidget_apparat_media.setHorizontalHeaderItem(5, item) item = QtWidgets.QTableWidgetItem() self.tableWidget_apparat_media.setHorizontalHeaderItem(6, item) - self.tableWidget_apparat_media.horizontalHeader().setCascadingSectionResizes( - True - ) + self.tableWidget_apparat_media.horizontalHeader().setCascadingSectionResizes(True) self.gridLayout_2.addWidget(self.tableWidget_apparat_media, 9, 0, 1, 1) - self.label = QtWidgets.QLabel(self.gridLayoutWidget_2) + self.label = QtWidgets.QLabel(parent=self.gridLayoutWidget_2) font = QtGui.QFont() font.setPointSize(11) font.setBold(True) - font.setWeight(QtGui.QFont.Weight(75)) + font.setWeight(75) self.label.setFont(font) self.label.setObjectName("label") self.gridLayout_2.addWidget(self.label, 2, 0, 1, 1) self.horizontalLayout_5 = QtWidgets.QHBoxLayout() self.horizontalLayout_5.setObjectName("horizontalLayout_5") - spacerItem3 = QtWidgets.QSpacerItem( - 20, 20, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Minimum - ) + spacerItem3 = QtWidgets.QSpacerItem(20, 20, QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_5.addItem(spacerItem3) - self.chkbx_show_del_media = QtWidgets.QCheckBox(self.gridLayoutWidget_2) + self.chkbx_show_del_media = QtWidgets.QCheckBox(parent=self.gridLayoutWidget_2) self.chkbx_show_del_media.setObjectName("chkbx_show_del_media") self.horizontalLayout_5.addWidget(self.chkbx_show_del_media) - spacerItem4 = QtWidgets.QSpacerItem( - 40, 20, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Minimum - ) + spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_5.addItem(spacerItem4) - self.btn_reserve = QtWidgets.QPushButton(self.gridLayoutWidget_2) + self.btn_reserve = QtWidgets.QPushButton(parent=self.gridLayoutWidget_2) self.btn_reserve.setObjectName("btn_reserve") self.horizontalLayout_5.addWidget(self.btn_reserve) self.add_layout = QtWidgets.QHBoxLayout() self.add_layout.setObjectName("add_layout") - self.label_info = QtWidgets.QLabel(self.gridLayoutWidget_2) + self.label_info = QtWidgets.QLabel(parent=self.gridLayoutWidget_2) self.label_info.setObjectName("label_info") self.add_layout.addWidget(self.label_info) - self.line_2 = QtWidgets.QFrame(self.gridLayoutWidget_2) - self.line_2.setFrameShape(QtWidgets.QFrame.VLine) - self.line_2.setFrameShadow(QtWidgets.QFrame.Sunken) + self.line_2 = QtWidgets.QFrame(parent=self.gridLayoutWidget_2) + self.line_2.setFrameShape(QtWidgets.QFrame.Shape.VLine) + self.line_2.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken) self.line_2.setObjectName("line_2") self.add_layout.addWidget(self.line_2) - self.progress_label = QtWidgets.QLabel(self.gridLayoutWidget_2) + self.progress_label = QtWidgets.QLabel(parent=self.gridLayoutWidget_2) self.progress_label.setObjectName("progress_label") self.add_layout.addWidget(self.progress_label) self.horizontalLayout_5.addLayout(self.add_layout) - spacerItem5 = QtWidgets.QSpacerItem( - 40, 20, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Minimum - ) + spacerItem5 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_5.addItem(spacerItem5) self.avail_layout = QtWidgets.QHBoxLayout() self.avail_layout.setObjectName("avail_layout") self.horizontalLayout_5.addLayout(self.avail_layout) - self.label_20 = QtWidgets.QLabel(self.gridLayoutWidget_2) + self.label_20 = QtWidgets.QLabel(parent=self.gridLayoutWidget_2) self.label_20.setObjectName("label_20") self.horizontalLayout_5.addWidget(self.label_20) - self.line_3 = QtWidgets.QFrame(self.gridLayoutWidget_2) - self.line_3.setFrameShape(QtWidgets.QFrame.VLine) - self.line_3.setFrameShadow(QtWidgets.QFrame.Sunken) + self.line_3 = QtWidgets.QFrame(parent=self.gridLayoutWidget_2) + self.line_3.setFrameShape(QtWidgets.QFrame.Shape.VLine) + self.line_3.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken) self.line_3.setObjectName("line_3") self.horizontalLayout_5.addWidget(self.line_3) - self.avail_status = QtWidgets.QLabel(self.gridLayoutWidget_2) + self.avail_status = QtWidgets.QLabel(parent=self.gridLayoutWidget_2) self.avail_status.setObjectName("avail_status") self.horizontalLayout_5.addWidget(self.avail_status) - spacerItem6 = QtWidgets.QSpacerItem( - 40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum - ) + spacerItem6 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_5.addItem(spacerItem6) self.gridLayout_2.addLayout(self.horizontalLayout_5, 4, 0, 1, 1) - self.add_medium = QtWidgets.QPushButton(self.tab) + self.add_medium = QtWidgets.QPushButton(parent=self.tab) self.add_medium.setGeometry(QtCore.QRect(0, 700, 121, 20)) - self.add_medium.setFocusPolicy(QtCore.Qt.NoFocus) + self.add_medium.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) self.add_medium.setObjectName("add_medium") self.tabWidget.addTab(self.tab, "") self.tab_2 = QtWidgets.QWidget() self.tab_2.setObjectName("tab_2") - self.verticalLayoutWidget_2 = QtWidgets.QWidget(self.tab_2) + self.verticalLayoutWidget_2 = QtWidgets.QWidget(parent=self.tab_2) self.verticalLayoutWidget_2.setGeometry(QtCore.QRect(0, 0, 1251, 721)) self.verticalLayoutWidget_2.setObjectName("verticalLayoutWidget_2") self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.verticalLayoutWidget_2) self.verticalLayout_3.setContentsMargins(0, 0, 0, 0) self.verticalLayout_3.setObjectName("verticalLayout_3") - self.tabWidget_2 = QtWidgets.QTabWidget(self.verticalLayoutWidget_2) + self.tabWidget_2 = QtWidgets.QTabWidget(parent=self.verticalLayoutWidget_2) self.tabWidget_2.setMaximumSize(QtCore.QSize(16777215, 250)) self.tabWidget_2.setObjectName("tabWidget_2") self.tab_3 = QtWidgets.QWidget() self.tab_3.setObjectName("tab_3") - self.btn_search = QtWidgets.QPushButton(self.tab_3) + self.btn_search = QtWidgets.QPushButton(parent=self.tab_3) self.btn_search.setGeometry(QtCore.QRect(10, 180, 75, 23)) self.btn_search.setObjectName("btn_search") - self.gridLayoutWidget = QtWidgets.QWidget(self.tab_3) + self.gridLayoutWidget = QtWidgets.QWidget(parent=self.tab_3) self.gridLayoutWidget.setGeometry(QtCore.QRect(10, 10, 491, 161)) self.gridLayoutWidget.setObjectName("gridLayoutWidget") self.gridLayout_3 = QtWidgets.QGridLayout(self.gridLayoutWidget) self.gridLayout_3.setContentsMargins(0, 0, 0, 0) self.gridLayout_3.setObjectName("gridLayout_3") - self.label_7 = QtWidgets.QLabel(self.gridLayoutWidget) + self.label_7 = QtWidgets.QLabel(parent=self.gridLayoutWidget) self.label_7.setObjectName("label_7") self.gridLayout_3.addWidget(self.label_7, 0, 0, 1, 1) - self.box_erstellsemester = QtWidgets.QComboBox(self.gridLayoutWidget) + self.box_erstellsemester = QtWidgets.QComboBox(parent=self.gridLayoutWidget) self.box_erstellsemester.setEditable(True) self.box_erstellsemester.setObjectName("box_erstellsemester") self.gridLayout_3.addWidget(self.box_erstellsemester, 1, 3, 1, 1) - self.label_18 = QtWidgets.QLabel(self.gridLayoutWidget) + self.label_18 = QtWidgets.QLabel(parent=self.gridLayoutWidget) self.label_18.setObjectName("label_18") self.gridLayout_3.addWidget(self.label_18, 2, 2, 1, 1) - self.label_17 = QtWidgets.QLabel(self.gridLayoutWidget) + self.label_17 = QtWidgets.QLabel(parent=self.gridLayoutWidget) self.label_17.setObjectName("label_17") self.gridLayout_3.addWidget(self.label_17, 0, 2, 1, 1) - self.label_19 = QtWidgets.QLabel(self.gridLayoutWidget) + self.label_19 = QtWidgets.QLabel(parent=self.gridLayoutWidget) self.label_19.setObjectName("label_19") self.gridLayout_3.addWidget(self.label_19, 1, 2, 1, 1) - self.box_dauerapp = QtWidgets.QComboBox(self.gridLayoutWidget) + self.box_dauerapp = QtWidgets.QComboBox(parent=self.gridLayoutWidget) self.box_dauerapp.setObjectName("box_dauerapp") self.gridLayout_3.addWidget(self.box_dauerapp, 2, 3, 1, 1) - self.label_11 = QtWidgets.QLabel(self.gridLayoutWidget) + self.label_11 = QtWidgets.QLabel(parent=self.gridLayoutWidget) self.label_11.setObjectName("label_11") self.gridLayout_3.addWidget(self.label_11, 1, 0, 1, 1) - self.label_16 = QtWidgets.QLabel(self.gridLayoutWidget) + self.label_16 = QtWidgets.QLabel(parent=self.gridLayoutWidget) self.label_16.setObjectName("label_16") self.gridLayout_3.addWidget(self.label_16, 2, 0, 1, 1) - self.box_semester = QtWidgets.QComboBox(self.gridLayoutWidget) + self.box_semester = QtWidgets.QComboBox(parent=self.gridLayoutWidget) self.box_semester.setEditable(True) self.box_semester.setObjectName("box_semester") self.gridLayout_3.addWidget(self.box_semester, 0, 3, 1, 1) - self.box_appnrs = QtWidgets.QComboBox(self.gridLayoutWidget) + self.box_appnrs = QtWidgets.QComboBox(parent=self.gridLayoutWidget) self.box_appnrs.setEditable(True) self.box_appnrs.setObjectName("box_appnrs") self.gridLayout_3.addWidget(self.box_appnrs, 0, 1, 1, 1) - self.box_fach = QtWidgets.QComboBox(self.gridLayoutWidget) + self.box_fach = QtWidgets.QComboBox(parent=self.gridLayoutWidget) self.box_fach.setEditable(True) self.box_fach.setObjectName("box_fach") self.gridLayout_3.addWidget(self.box_fach, 2, 1, 1, 1) - self.box_person = QtWidgets.QComboBox(self.gridLayoutWidget) + self.box_person = QtWidgets.QComboBox(parent=self.gridLayoutWidget) self.box_person.setEditable(True) self.box_person.setObjectName("box_person") self.gridLayout_3.addWidget(self.box_person, 1, 1, 1, 1) - spacerItem7 = QtWidgets.QSpacerItem( - 20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding - ) + spacerItem7 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) self.gridLayout_3.addItem(spacerItem7, 4, 0, 1, 1) - self.label_15 = QtWidgets.QLabel(self.gridLayoutWidget) + self.label_15 = QtWidgets.QLabel(parent=self.gridLayoutWidget) self.label_15.setObjectName("label_15") self.gridLayout_3.addWidget(self.label_15, 3, 0, 1, 1) - self.check_deletable = QtWidgets.QCheckBox(self.gridLayoutWidget) - self.check_deletable.setFocusPolicy(QtCore.Qt.StrongFocus) + self.check_deletable = QtWidgets.QCheckBox(parent=self.gridLayoutWidget) + self.check_deletable.setFocusPolicy(QtCore.Qt.FocusPolicy.StrongFocus) self.check_deletable.setText("") self.check_deletable.setObjectName("check_deletable") self.gridLayout_3.addWidget(self.check_deletable, 3, 1, 1, 1) - self.db_err_message = QtWidgets.QLabel(self.tab_3) + self.db_err_message = QtWidgets.QLabel(parent=self.tab_3) self.db_err_message.setGeometry(QtCore.QRect(100, 180, 401, 23)) self.db_err_message.setText("") self.db_err_message.setObjectName("db_err_message") self.tabWidget_2.addTab(self.tab_3, "") self.tab_4 = QtWidgets.QWidget() self.tab_4.setObjectName("tab_4") - self.formLayoutWidget = QtWidgets.QWidget(self.tab_4) + self.formLayoutWidget = QtWidgets.QWidget(parent=self.tab_4) self.formLayoutWidget.setGeometry(QtCore.QRect(10, 10, 451, 151)) self.formLayoutWidget.setObjectName("formLayoutWidget") self.formLayout_6 = QtWidgets.QFormLayout(self.formLayoutWidget) self.formLayout_6.setContentsMargins(0, 0, 0, 0) self.formLayout_6.setObjectName("formLayout_6") - self.label_25 = QtWidgets.QLabel(self.formLayoutWidget) + self.label_25 = QtWidgets.QLabel(parent=self.formLayoutWidget) self.label_25.setObjectName("label_25") - self.formLayout_6.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_25) - self.book_search = QtWidgets.QPushButton(self.formLayoutWidget) + self.formLayout_6.setWidget(0, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_25) + self.book_search = QtWidgets.QPushButton(parent=self.formLayoutWidget) self.book_search.setObjectName("book_search") - self.formLayout_6.setWidget( - 3, QtWidgets.QFormLayout.LabelRole, self.book_search - ) - self.seach_by_signature = QtWidgets.QLineEdit(self.formLayoutWidget) + self.formLayout_6.setWidget(3, QtWidgets.QFormLayout.ItemRole.LabelRole, self.book_search) + self.seach_by_signature = QtWidgets.QLineEdit(parent=self.formLayoutWidget) self.seach_by_signature.setClearButtonEnabled(True) self.seach_by_signature.setObjectName("seach_by_signature") - self.formLayout_6.setWidget( - 0, QtWidgets.QFormLayout.FieldRole, self.seach_by_signature - ) - self.label_26 = QtWidgets.QLabel(self.formLayoutWidget) + self.formLayout_6.setWidget(0, QtWidgets.QFormLayout.ItemRole.FieldRole, self.seach_by_signature) + self.label_26 = QtWidgets.QLabel(parent=self.formLayoutWidget) self.label_26.setObjectName("label_26") - self.formLayout_6.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label_26) - self.search_by_title = QtWidgets.QLineEdit(self.formLayoutWidget) + self.formLayout_6.setWidget(1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_26) + self.search_by_title = QtWidgets.QLineEdit(parent=self.formLayoutWidget) self.search_by_title.setClearButtonEnabled(True) self.search_by_title.setObjectName("search_by_title") - self.formLayout_6.setWidget( - 1, QtWidgets.QFormLayout.FieldRole, self.search_by_title - ) - spacerItem8 = QtWidgets.QSpacerItem( - 20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding - ) - self.formLayout_6.setItem(2, QtWidgets.QFormLayout.LabelRole, spacerItem8) + self.formLayout_6.setWidget(1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.search_by_title) + spacerItem8 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) + self.formLayout_6.setItem(2, QtWidgets.QFormLayout.ItemRole.LabelRole, spacerItem8) self.tabWidget_2.addTab(self.tab_4, "") self.verticalLayout_3.addWidget(self.tabWidget_2) - self.stackedWidget_4 = QtWidgets.QStackedWidget(self.verticalLayoutWidget_2) - self.stackedWidget_4.setFrameShape(QtWidgets.QFrame.StyledPanel) - self.stackedWidget_4.setFrameShadow(QtWidgets.QFrame.Raised) + self.stackedWidget_4 = QtWidgets.QStackedWidget(parent=self.verticalLayoutWidget_2) + self.stackedWidget_4.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) + self.stackedWidget_4.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) self.stackedWidget_4.setObjectName("stackedWidget_4") self.stackedWidget_4Page1 = QtWidgets.QWidget() self.stackedWidget_4Page1.setObjectName("stackedWidget_4Page1") - self.tabWidget_3 = QtWidgets.QTabWidget(self.stackedWidget_4Page1) + self.tabWidget_3 = QtWidgets.QTabWidget(parent=self.stackedWidget_4Page1) self.tabWidget_3.setGeometry(QtCore.QRect(780, 10, 441, 441)) self.tabWidget_3.setObjectName("tabWidget_3") self.tab_6 = QtWidgets.QWidget() self.tab_6.setObjectName("tab_6") - self.gridLayoutWidget_3 = QtWidgets.QWidget(self.tab_6) + self.gridLayoutWidget_3 = QtWidgets.QWidget(parent=self.tab_6) self.gridLayoutWidget_3.setGeometry(QtCore.QRect(0, 0, 431, 411)) self.gridLayoutWidget_3.setObjectName("gridLayoutWidget_3") self.gridLayout_4 = QtWidgets.QGridLayout(self.gridLayoutWidget_3) self.gridLayout_4.setContentsMargins(0, 0, 0, 0) self.gridLayout_4.setObjectName("gridLayout_4") - self.statistics_table = QtWidgets.QTableWidget(self.gridLayoutWidget_3) - sizePolicy = QtWidgets.QSizePolicy( - QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding - ) + self.statistics_table = QtWidgets.QTableWidget(parent=self.gridLayoutWidget_3) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth( - self.statistics_table.sizePolicy().hasHeightForWidth() - ) + sizePolicy.setHeightForWidth(self.statistics_table.sizePolicy().hasHeightForWidth()) self.statistics_table.setSizePolicy(sizePolicy) self.statistics_table.setMaximumSize(QtCore.QSize(16777215, 16777215)) - self.statistics_table.setFocusPolicy(QtCore.Qt.NoFocus) - self.statistics_table.setEditTriggers( - QtWidgets.QAbstractItemView.NoEditTriggers - ) + self.statistics_table.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) + self.statistics_table.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) self.statistics_table.setAlternatingRowColors(True) self.statistics_table.setObjectName("statistics_table") self.statistics_table.setColumnCount(3) @@ -858,32 +776,28 @@ class Ui_MainWindow(object): self.tab_7 = QtWidgets.QWidget() self.tab_7.setObjectName("tab_7") self.tabWidget_3.addTab(self.tab_7, "") - self.widget = QtWidgets.QWidget(self.stackedWidget_4Page1) + self.widget = QtWidgets.QWidget(parent=self.stackedWidget_4Page1) self.widget.setGeometry(QtCore.QRect(10, 10, 761, 441)) self.widget.setObjectName("widget") - self.horizontalLayoutWidget_3 = QtWidgets.QWidget(self.widget) + self.horizontalLayoutWidget_3 = QtWidgets.QWidget(parent=self.widget) self.horizontalLayoutWidget_3.setGeometry(QtCore.QRect(0, 0, 761, 51)) self.horizontalLayoutWidget_3.setObjectName("horizontalLayoutWidget_3") self.horizontalLayout_7 = QtWidgets.QHBoxLayout(self.horizontalLayoutWidget_3) self.horizontalLayout_7.setContentsMargins(0, 0, 0, 0) self.horizontalLayout_7.setObjectName("horizontalLayout_7") - self.btn_del_select_apparats = QtWidgets.QPushButton( - self.horizontalLayoutWidget_3 - ) - self.btn_del_select_apparats.setFocusPolicy(QtCore.Qt.StrongFocus) + self.btn_del_select_apparats = QtWidgets.QPushButton(parent=self.horizontalLayoutWidget_3) + self.btn_del_select_apparats.setFocusPolicy(QtCore.Qt.FocusPolicy.StrongFocus) self.btn_del_select_apparats.setObjectName("btn_del_select_apparats") self.horizontalLayout_7.addWidget(self.btn_del_select_apparats) - spacerItem9 = QtWidgets.QSpacerItem( - 40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum - ) + spacerItem9 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_7.addItem(spacerItem9) - self.table = QtWidgets.QWidget(self.widget) + self.table = QtWidgets.QWidget(parent=self.widget) self.table.setGeometry(QtCore.QRect(0, 50, 761, 391)) self.table.setObjectName("table") - self.tableWidget = QtWidgets.QTableWidget(self.table) + self.tableWidget = QtWidgets.QTableWidget(parent=self.table) self.tableWidget.setGeometry(QtCore.QRect(0, 0, 761, 391)) - self.tableWidget.setFocusPolicy(QtCore.Qt.NoFocus) - self.tableWidget.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers) + self.tableWidget.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) + self.tableWidget.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) self.tableWidget.setObjectName("tableWidget") self.tableWidget.setColumnCount(5) self.tableWidget.setRowCount(0) @@ -900,12 +814,10 @@ class Ui_MainWindow(object): self.stackedWidget_4.addWidget(self.stackedWidget_4Page1) self.page = QtWidgets.QWidget() self.page.setObjectName("page") - self.book_search_result = QtWidgets.QTableWidget(self.page) + self.book_search_result = QtWidgets.QTableWidget(parent=self.page) self.book_search_result.setGeometry(QtCore.QRect(10, 20, 1081, 421)) - self.book_search_result.setFrameShadow(QtWidgets.QFrame.Plain) - self.book_search_result.setEditTriggers( - QtWidgets.QAbstractItemView.NoEditTriggers - ) + self.book_search_result.setFrameShadow(QtWidgets.QFrame.Shadow.Plain) + self.book_search_result.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) self.book_search_result.setAlternatingRowColors(True) self.book_search_result.setObjectName("book_search_result") self.book_search_result.setColumnCount(3) @@ -923,64 +835,62 @@ class Ui_MainWindow(object): self.tabWidget.addTab(self.tab_2, "") self.tab_5 = QtWidgets.QWidget() self.tab_5.setObjectName("tab_5") - self.label_21 = QtWidgets.QLabel(self.tab_5) + self.label_21 = QtWidgets.QLabel(parent=self.tab_5) self.label_21.setGeometry(QtCore.QRect(10, 30, 47, 22)) self.label_21.setObjectName("label_21") - self.select_action_box = QtWidgets.QComboBox(self.tab_5) + self.select_action_box = QtWidgets.QComboBox(parent=self.tab_5) self.select_action_box.setGeometry(QtCore.QRect(70, 30, 181, 22)) self.select_action_box.setObjectName("select_action_box") self.select_action_box.addItem("") self.select_action_box.addItem("") self.select_action_box.addItem("") self.select_action_box.addItem("") - self.user_create_frame = QtWidgets.QFrame(self.tab_5) + self.user_create_frame = QtWidgets.QFrame(parent=self.tab_5) self.user_create_frame.setGeometry(QtCore.QRect(10, 60, 591, 141)) - self.user_create_frame.setFrameShape(QtWidgets.QFrame.StyledPanel) - self.user_create_frame.setFrameShadow(QtWidgets.QFrame.Raised) + self.user_create_frame.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) + self.user_create_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) self.user_create_frame.setObjectName("user_create_frame") - self.gridLayoutWidget_4 = QtWidgets.QWidget(self.user_create_frame) + self.gridLayoutWidget_4 = QtWidgets.QWidget(parent=self.user_create_frame) self.gridLayoutWidget_4.setGeometry(QtCore.QRect(0, 0, 581, 141)) self.gridLayoutWidget_4.setObjectName("gridLayoutWidget_4") self.gridLayout_5 = QtWidgets.QGridLayout(self.gridLayoutWidget_4) self.gridLayout_5.setContentsMargins(0, 0, 0, 0) self.gridLayout_5.setObjectName("gridLayout_5") - self.label_22 = QtWidgets.QLabel(self.gridLayoutWidget_4) + self.label_22 = QtWidgets.QLabel(parent=self.gridLayoutWidget_4) self.label_22.setObjectName("label_22") self.gridLayout_5.addWidget(self.label_22, 0, 0, 1, 1) - self.user_create_frame_username = QtWidgets.QLineEdit(self.gridLayoutWidget_4) + self.user_create_frame_username = QtWidgets.QLineEdit(parent=self.gridLayoutWidget_4) self.user_create_frame_username.setMaximumSize(QtCore.QSize(150, 16777215)) self.user_create_frame_username.setObjectName("user_create_frame_username") self.gridLayout_5.addWidget(self.user_create_frame_username, 0, 1, 1, 1) - self.label_24 = QtWidgets.QLabel(self.gridLayoutWidget_4) + self.label_24 = QtWidgets.QLabel(parent=self.gridLayoutWidget_4) self.label_24.setObjectName("label_24") self.gridLayout_5.addWidget(self.label_24, 0, 2, 1, 1) - self.label_23 = QtWidgets.QLabel(self.gridLayoutWidget_4) + self.label_23 = QtWidgets.QLabel(parent=self.gridLayoutWidget_4) self.label_23.setObjectName("label_23") self.gridLayout_5.addWidget(self.label_23, 1, 0, 1, 1) - spacerItem10 = QtWidgets.QSpacerItem( - 40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum - ) + spacerItem10 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.gridLayout_5.addItem(spacerItem10, 0, 4, 1, 1) - self.user_frame_userrole = QtWidgets.QComboBox(self.gridLayoutWidget_4) + self.user_frame_userrole = QtWidgets.QComboBox(parent=self.gridLayoutWidget_4) self.user_frame_userrole.setObjectName("user_frame_userrole") self.gridLayout_5.addWidget(self.user_frame_userrole, 0, 3, 1, 1) - self.user_create_frame_password = QtWidgets.QLineEdit(self.gridLayoutWidget_4) + self.user_create_frame_password = QtWidgets.QLineEdit(parent=self.gridLayoutWidget_4) self.user_create_frame_password.setMaximumSize(QtCore.QSize(150, 16777215)) self.user_create_frame_password.setObjectName("user_create_frame_password") self.gridLayout_5.addWidget(self.user_create_frame_password, 1, 1, 1, 1) - self.user_frame_addUser = QtWidgets.QPushButton(self.gridLayoutWidget_4) + self.user_frame_addUser = QtWidgets.QPushButton(parent=self.gridLayoutWidget_4) self.user_frame_addUser.setObjectName("user_frame_addUser") self.gridLayout_5.addWidget(self.user_frame_addUser, 1, 3, 1, 1) - self.user_frame_err_message = QtWidgets.QLabel(self.gridLayoutWidget_4) + self.user_frame_err_message = QtWidgets.QLabel(parent=self.gridLayoutWidget_4) self.user_frame_err_message.setText("") self.user_frame_err_message.setObjectName("user_frame_err_message") self.gridLayout_5.addWidget(self.user_frame_err_message, 1, 4, 1, 1) - self.user_delete_frame = QtWidgets.QFrame(self.tab_5) + self.user_delete_frame = QtWidgets.QFrame(parent=self.tab_5) self.user_delete_frame.setGeometry(QtCore.QRect(10, 60, 591, 141)) - self.user_delete_frame.setFrameShape(QtWidgets.QFrame.StyledPanel) - self.user_delete_frame.setFrameShadow(QtWidgets.QFrame.Raised) + self.user_delete_frame.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) + self.user_delete_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) self.user_delete_frame.setObjectName("user_delete_frame") - self.gridLayoutWidget_7 = QtWidgets.QWidget(self.user_delete_frame) + self.gridLayoutWidget_7 = QtWidgets.QWidget(parent=self.user_delete_frame) self.gridLayoutWidget_7.setGeometry(QtCore.QRect(0, 0, 581, 141)) self.gridLayoutWidget_7.setObjectName("gridLayoutWidget_7") self.gridLayout_8 = QtWidgets.QGridLayout(self.gridLayoutWidget_7) @@ -988,86 +898,72 @@ class Ui_MainWindow(object): self.gridLayout_8.setObjectName("gridLayout_8") self.horizontalLayout_8 = QtWidgets.QHBoxLayout() self.horizontalLayout_8.setObjectName("horizontalLayout_8") - spacerItem11 = QtWidgets.QSpacerItem( - 40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum - ) + spacerItem11 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_8.addItem(spacerItem11) - self.pushButton = QtWidgets.QPushButton(self.gridLayoutWidget_7) + self.pushButton = QtWidgets.QPushButton(parent=self.gridLayoutWidget_7) self.pushButton.setObjectName("pushButton") self.horizontalLayout_8.addWidget(self.pushButton) - spacerItem12 = QtWidgets.QSpacerItem( - 40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum - ) + spacerItem12 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_8.addItem(spacerItem12) self.gridLayout_8.addLayout(self.horizontalLayout_8, 1, 1, 1, 1) - self.label_34 = QtWidgets.QLabel(self.gridLayoutWidget_7) + self.label_34 = QtWidgets.QLabel(parent=self.gridLayoutWidget_7) self.label_34.setObjectName("label_34") self.gridLayout_8.addWidget(self.label_34, 0, 0, 1, 1) - self.user_delete_frame_user_select = QtWidgets.QComboBox( - self.gridLayoutWidget_7 - ) - self.user_delete_frame_user_select.setObjectName( - "user_delete_frame_user_select" - ) + self.user_delete_frame_user_select = QtWidgets.QComboBox(parent=self.gridLayoutWidget_7) + self.user_delete_frame_user_select.setObjectName("user_delete_frame_user_select") self.gridLayout_8.addWidget(self.user_delete_frame_user_select, 0, 1, 1, 1) - self.user_delete_confirm = QtWidgets.QRadioButton(self.gridLayoutWidget_7) - self.user_delete_confirm.setLayoutDirection(QtCore.Qt.RightToLeft) + self.user_delete_confirm = QtWidgets.QRadioButton(parent=self.gridLayoutWidget_7) + self.user_delete_confirm.setLayoutDirection(QtCore.Qt.LayoutDirection.RightToLeft) self.user_delete_confirm.setObjectName("user_delete_confirm") self.gridLayout_8.addWidget(self.user_delete_confirm, 1, 0, 1, 1) - spacerItem13 = QtWidgets.QSpacerItem( - 40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum - ) + spacerItem13 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.gridLayout_8.addItem(spacerItem13, 0, 2, 1, 1) - self.user_delete_err_message = QtWidgets.QLabel(self.gridLayoutWidget_7) + self.user_delete_err_message = QtWidgets.QLabel(parent=self.gridLayoutWidget_7) self.user_delete_err_message.setText("") self.user_delete_err_message.setObjectName("user_delete_err_message") self.gridLayout_8.addWidget(self.user_delete_err_message, 1, 2, 1, 1) - self.user_edit_frame = QtWidgets.QFrame(self.tab_5) + self.user_edit_frame = QtWidgets.QFrame(parent=self.tab_5) self.user_edit_frame.setGeometry(QtCore.QRect(10, 60, 591, 141)) - self.user_edit_frame.setFrameShape(QtWidgets.QFrame.StyledPanel) - self.user_edit_frame.setFrameShadow(QtWidgets.QFrame.Raised) + self.user_edit_frame.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) + self.user_edit_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) self.user_edit_frame.setObjectName("user_edit_frame") - self.gridLayoutWidget_10 = QtWidgets.QWidget(self.user_edit_frame) + self.gridLayoutWidget_10 = QtWidgets.QWidget(parent=self.user_edit_frame) self.gridLayoutWidget_10.setGeometry(QtCore.QRect(0, 0, 581, 141)) self.gridLayoutWidget_10.setObjectName("gridLayoutWidget_10") self.gridLayout_11 = QtWidgets.QGridLayout(self.gridLayoutWidget_10) self.gridLayout_11.setContentsMargins(0, 0, 0, 0) self.gridLayout_11.setObjectName("gridLayout_11") - self.user_edit_frame_role_select = QtWidgets.QComboBox(self.gridLayoutWidget_10) + self.user_edit_frame_role_select = QtWidgets.QComboBox(parent=self.gridLayoutWidget_10) self.user_edit_frame_role_select.setObjectName("user_edit_frame_role_select") self.gridLayout_11.addWidget(self.user_edit_frame_role_select, 0, 3, 1, 1) - self.label_38 = QtWidgets.QLabel(self.gridLayoutWidget_10) + self.label_38 = QtWidgets.QLabel(parent=self.gridLayoutWidget_10) self.label_38.setObjectName("label_38") self.gridLayout_11.addWidget(self.label_38, 0, 0, 1, 1) - self.user_edit_frame_user_select = QtWidgets.QComboBox(self.gridLayoutWidget_10) + self.user_edit_frame_user_select = QtWidgets.QComboBox(parent=self.gridLayoutWidget_10) self.user_edit_frame_user_select.setMaximumSize(QtCore.QSize(150, 16777215)) self.user_edit_frame_user_select.setObjectName("user_edit_frame_user_select") self.gridLayout_11.addWidget(self.user_edit_frame_user_select, 0, 1, 1, 1) - self.update_user = QtWidgets.QPushButton(self.gridLayoutWidget_10) + self.update_user = QtWidgets.QPushButton(parent=self.gridLayoutWidget_10) self.update_user.setObjectName("update_user") self.gridLayout_11.addWidget(self.update_user, 1, 3, 1, 1) - self.label_40 = QtWidgets.QLabel(self.gridLayoutWidget_10) + self.label_40 = QtWidgets.QLabel(parent=self.gridLayoutWidget_10) self.label_40.setObjectName("label_40") self.gridLayout_11.addWidget(self.label_40, 0, 2, 1, 1) - self.label_39 = QtWidgets.QLabel(self.gridLayoutWidget_10) + self.label_39 = QtWidgets.QLabel(parent=self.gridLayoutWidget_10) self.label_39.setObjectName("label_39") self.gridLayout_11.addWidget(self.label_39, 1, 0, 1, 1) - self.user_edit_frame_new_password = QtWidgets.QLineEdit( - self.gridLayoutWidget_10 - ) + self.user_edit_frame_new_password = QtWidgets.QLineEdit(parent=self.gridLayoutWidget_10) self.user_edit_frame_new_password.setMaximumSize(QtCore.QSize(150, 16777215)) self.user_edit_frame_new_password.setObjectName("user_edit_frame_new_password") self.gridLayout_11.addWidget(self.user_edit_frame_new_password, 1, 1, 1, 1) - spacerItem14 = QtWidgets.QSpacerItem( - 40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum - ) + spacerItem14 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.gridLayout_11.addItem(spacerItem14, 0, 4, 1, 1) - self.edit_faculty_member = QtWidgets.QFrame(self.tab_5) + self.edit_faculty_member = QtWidgets.QFrame(parent=self.tab_5) self.edit_faculty_member.setGeometry(QtCore.QRect(10, 60, 1051, 241)) - self.edit_faculty_member.setFrameShape(QtWidgets.QFrame.StyledPanel) - self.edit_faculty_member.setFrameShadow(QtWidgets.QFrame.Raised) + self.edit_faculty_member.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) + self.edit_faculty_member.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) self.edit_faculty_member.setObjectName("edit_faculty_member") - self.gridLayoutWidget_11 = QtWidgets.QWidget(self.edit_faculty_member) + self.gridLayoutWidget_11 = QtWidgets.QWidget(parent=self.edit_faculty_member) self.gridLayoutWidget_11.setGeometry(QtCore.QRect(0, 0, 751, 223)) self.gridLayoutWidget_11.setObjectName("gridLayoutWidget_11") self.gridLayout_12 = QtWidgets.QGridLayout(self.gridLayoutWidget_11) @@ -1075,240 +971,192 @@ class Ui_MainWindow(object): self.gridLayout_12.setObjectName("gridLayout_12") self.formLayout_2 = QtWidgets.QFormLayout() self.formLayout_2.setObjectName("formLayout_2") - self.label_43 = QtWidgets.QLabel(self.gridLayoutWidget_11) + self.label_43 = QtWidgets.QLabel(parent=self.gridLayoutWidget_11) self.label_43.setObjectName("label_43") - self.formLayout_2.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_43) - self.edit_faculty_member_new_title = QtWidgets.QComboBox( - self.gridLayoutWidget_11 - ) + self.formLayout_2.setWidget(0, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_43) + self.edit_faculty_member_new_title = QtWidgets.QComboBox(parent=self.gridLayoutWidget_11) self.edit_faculty_member_new_title.setEditable(True) - self.edit_faculty_member_new_title.setObjectName( - "edit_faculty_member_new_title" - ) - self.formLayout_2.setWidget( - 0, QtWidgets.QFormLayout.FieldRole, self.edit_faculty_member_new_title - ) - self.label_44 = QtWidgets.QLabel(self.gridLayoutWidget_11) + self.edit_faculty_member_new_title.setObjectName("edit_faculty_member_new_title") + self.formLayout_2.setWidget(0, QtWidgets.QFormLayout.ItemRole.FieldRole, self.edit_faculty_member_new_title) + self.label_44 = QtWidgets.QLabel(parent=self.gridLayoutWidget_11) self.label_44.setObjectName("label_44") - self.formLayout_2.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label_44) - self.edit_faculty_member_new_surname = QtWidgets.QLineEdit( - self.gridLayoutWidget_11 - ) - self.edit_faculty_member_new_surname.setObjectName( - "edit_faculty_member_new_surname" - ) - self.formLayout_2.setWidget( - 1, QtWidgets.QFormLayout.FieldRole, self.edit_faculty_member_new_surname - ) - self.label_45 = QtWidgets.QLabel(self.gridLayoutWidget_11) + self.formLayout_2.setWidget(1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_44) + self.edit_faculty_member_new_surname = QtWidgets.QLineEdit(parent=self.gridLayoutWidget_11) + self.edit_faculty_member_new_surname.setObjectName("edit_faculty_member_new_surname") + self.formLayout_2.setWidget(1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.edit_faculty_member_new_surname) + self.label_45 = QtWidgets.QLabel(parent=self.gridLayoutWidget_11) self.label_45.setObjectName("label_45") - self.formLayout_2.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_45) - self.user_faculty_member_new_name = QtWidgets.QLineEdit( - self.gridLayoutWidget_11 - ) + self.formLayout_2.setWidget(2, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_45) + self.user_faculty_member_new_name = QtWidgets.QLineEdit(parent=self.gridLayoutWidget_11) self.user_faculty_member_new_name.setObjectName("user_faculty_member_new_name") - self.formLayout_2.setWidget( - 2, QtWidgets.QFormLayout.FieldRole, self.user_faculty_member_new_name - ) + self.formLayout_2.setWidget(2, QtWidgets.QFormLayout.ItemRole.FieldRole, self.user_faculty_member_new_name) self.gridLayout_12.addLayout(self.formLayout_2, 2, 2, 1, 1) self.formLayout_4 = QtWidgets.QFormLayout() self.formLayout_4.setObjectName("formLayout_4") - self.edit_faculty_member_title = QtWidgets.QLineEdit(self.gridLayoutWidget_11) - self.edit_faculty_member_title.setFocusPolicy(QtCore.Qt.TabFocus) + self.edit_faculty_member_title = QtWidgets.QLineEdit(parent=self.gridLayoutWidget_11) + self.edit_faculty_member_title.setFocusPolicy(QtCore.Qt.FocusPolicy.TabFocus) self.edit_faculty_member_title.setReadOnly(True) self.edit_faculty_member_title.setObjectName("edit_faculty_member_title") - self.formLayout_4.setWidget( - 0, QtWidgets.QFormLayout.LabelRole, self.edit_faculty_member_title - ) - self.edit_faculty_member_select_member = QtWidgets.QComboBox( - self.gridLayoutWidget_11 - ) - self.edit_faculty_member_select_member.setObjectName( - "edit_faculty_member_select_member" - ) - self.formLayout_4.setWidget( - 0, QtWidgets.QFormLayout.FieldRole, self.edit_faculty_member_select_member - ) - self.label_46 = QtWidgets.QLabel(self.gridLayoutWidget_11) + self.formLayout_4.setWidget(0, QtWidgets.QFormLayout.ItemRole.LabelRole, self.edit_faculty_member_title) + self.edit_faculty_member_select_member = QtWidgets.QComboBox(parent=self.gridLayoutWidget_11) + self.edit_faculty_member_select_member.setObjectName("edit_faculty_member_select_member") + self.formLayout_4.setWidget(0, QtWidgets.QFormLayout.ItemRole.FieldRole, self.edit_faculty_member_select_member) + self.label_46 = QtWidgets.QLabel(parent=self.gridLayoutWidget_11) self.label_46.setObjectName("label_46") - self.formLayout_4.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label_46) - self.faculty_member_old_telnr = QtWidgets.QLineEdit(self.gridLayoutWidget_11) - self.faculty_member_old_telnr.setFocusPolicy(QtCore.Qt.ClickFocus) + self.formLayout_4.setWidget(1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_46) + self.faculty_member_old_telnr = QtWidgets.QLineEdit(parent=self.gridLayoutWidget_11) + self.faculty_member_old_telnr.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus) self.faculty_member_old_telnr.setReadOnly(True) self.faculty_member_old_telnr.setObjectName("faculty_member_old_telnr") - self.formLayout_4.setWidget( - 1, QtWidgets.QFormLayout.FieldRole, self.faculty_member_old_telnr - ) - self.label_49 = QtWidgets.QLabel(self.gridLayoutWidget_11) + self.formLayout_4.setWidget(1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.faculty_member_old_telnr) + self.label_49 = QtWidgets.QLabel(parent=self.gridLayoutWidget_11) self.label_49.setObjectName("label_49") - self.formLayout_4.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_49) - self.faculty_member_oldmail = QtWidgets.QLineEdit(self.gridLayoutWidget_11) - self.faculty_member_oldmail.setFocusPolicy(QtCore.Qt.NoFocus) - self.faculty_member_oldmail.setInputMethodHints(QtCore.Qt.ImhNone) + self.formLayout_4.setWidget(2, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_49) + self.faculty_member_oldmail = QtWidgets.QLineEdit(parent=self.gridLayoutWidget_11) + self.faculty_member_oldmail.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) + self.faculty_member_oldmail.setInputMethodHints(QtCore.Qt.InputMethodHint.ImhNone) self.faculty_member_oldmail.setReadOnly(True) self.faculty_member_oldmail.setObjectName("faculty_member_oldmail") - self.formLayout_4.setWidget( - 2, QtWidgets.QFormLayout.FieldRole, self.faculty_member_oldmail - ) + self.formLayout_4.setWidget(2, QtWidgets.QFormLayout.ItemRole.FieldRole, self.faculty_member_oldmail) self.gridLayout_12.addLayout(self.formLayout_4, 0, 2, 1, 1) self.formLayout_5 = QtWidgets.QFormLayout() self.formLayout_5.setObjectName("formLayout_5") - self.label_47 = QtWidgets.QLabel(self.gridLayoutWidget_11) + self.label_47 = QtWidgets.QLabel(parent=self.gridLayoutWidget_11) self.label_47.setObjectName("label_47") - self.formLayout_5.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_47) - self.label_48 = QtWidgets.QLabel(self.gridLayoutWidget_11) + self.formLayout_5.setWidget(0, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_47) + self.label_48 = QtWidgets.QLabel(parent=self.gridLayoutWidget_11) self.label_48.setObjectName("label_48") - self.formLayout_5.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label_48) - self.user_faculty_member_new_mail = QtWidgets.QLineEdit( - self.gridLayoutWidget_11 - ) + self.formLayout_5.setWidget(1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_48) + self.user_faculty_member_new_mail = QtWidgets.QLineEdit(parent=self.gridLayoutWidget_11) self.user_faculty_member_new_mail.setObjectName("user_faculty_member_new_mail") - self.formLayout_5.setWidget( - 0, QtWidgets.QFormLayout.FieldRole, self.user_faculty_member_new_mail - ) - self.user_faculty_member_new_telnr = QtWidgets.QLineEdit( - self.gridLayoutWidget_11 - ) - self.user_faculty_member_new_telnr.setObjectName( - "user_faculty_member_new_telnr" - ) - self.formLayout_5.setWidget( - 1, QtWidgets.QFormLayout.FieldRole, self.user_faculty_member_new_telnr - ) + self.formLayout_5.setWidget(0, QtWidgets.QFormLayout.ItemRole.FieldRole, self.user_faculty_member_new_mail) + self.user_faculty_member_new_telnr = QtWidgets.QLineEdit(parent=self.gridLayoutWidget_11) + self.user_faculty_member_new_telnr.setObjectName("user_faculty_member_new_telnr") + self.formLayout_5.setWidget(1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.user_faculty_member_new_telnr) self.gridLayout_12.addLayout(self.formLayout_5, 2, 4, 1, 1) - self.label_41 = QtWidgets.QLabel(self.gridLayoutWidget_11) + self.label_41 = QtWidgets.QLabel(parent=self.gridLayoutWidget_11) self.label_41.setObjectName("label_41") self.gridLayout_12.addWidget(self.label_41, 0, 0, 1, 1) - self.update_faculty_member = QtWidgets.QPushButton(self.gridLayoutWidget_11) + self.update_faculty_member = QtWidgets.QPushButton(parent=self.gridLayoutWidget_11) self.update_faculty_member.setObjectName("update_faculty_member") self.gridLayout_12.addWidget(self.update_faculty_member, 3, 4, 1, 1) - self.label_42 = QtWidgets.QLabel(self.gridLayoutWidget_11) + self.label_42 = QtWidgets.QLabel(parent=self.gridLayoutWidget_11) self.label_42.setObjectName("label_42") self.gridLayout_12.addWidget(self.label_42, 2, 0, 1, 1) self.tabWidget.addTab(self.tab_5, "") self.gridLayout.addWidget(self.tabWidget, 0, 0, 1, 1) self.horizontalLayout.addLayout(self.gridLayout) self.verticalLayout.addLayout(self.horizontalLayout) - self.horizontalLayoutWidget = QtWidgets.QWidget(self.centralwidget) + self.horizontalLayoutWidget = QtWidgets.QWidget(parent=self.centralwidget) self.horizontalLayoutWidget.setGeometry(QtCore.QRect(1280, 360, 311, 391)) self.horizontalLayoutWidget.setObjectName("horizontalLayoutWidget") self.horizontalLayout_6 = QtWidgets.QHBoxLayout(self.horizontalLayoutWidget) self.horizontalLayout_6.setContentsMargins(0, 0, 0, 0) self.horizontalLayout_6.setObjectName("horizontalLayout_6") - self.frame_creation_progress = QtWidgets.QFrame(self.horizontalLayoutWidget) + self.frame_creation_progress = QtWidgets.QFrame(parent=self.horizontalLayoutWidget) self.frame_creation_progress.setObjectName("frame_creation_progress") self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.frame_creation_progress) self.verticalLayout_4.setSpacing(6) self.verticalLayout_4.setObjectName("verticalLayout_4") - self.groupBox_2 = QtWidgets.QGroupBox(self.frame_creation_progress) + self.groupBox_2 = QtWidgets.QGroupBox(parent=self.frame_creation_progress) self.groupBox_2.setEnabled(True) - sizePolicy = QtWidgets.QSizePolicy( - QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding - ) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.groupBox_2.sizePolicy().hasHeightForWidth()) self.groupBox_2.setSizePolicy(sizePolicy) self.groupBox_2.setObjectName("groupBox_2") - self.appdata_check = QtWidgets.QCheckBox(self.groupBox_2) + self.appdata_check = QtWidgets.QCheckBox(parent=self.groupBox_2) self.appdata_check.setGeometry(QtCore.QRect(20, 30, 241, 41)) font = QtGui.QFont() font.setPointSize(8) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.appdata_check.setFont(font) - self.appdata_check.setFocusPolicy(QtCore.Qt.NoFocus) + self.appdata_check.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) self.appdata_check.setObjectName("appdata_check") - self.media_check = QtWidgets.QCheckBox(self.groupBox_2) + self.media_check = QtWidgets.QCheckBox(parent=self.groupBox_2) self.media_check.setGeometry(QtCore.QRect(20, 70, 241, 41)) font = QtGui.QFont() font.setPointSize(8) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.media_check.setFont(font) - self.media_check.setFocusPolicy(QtCore.Qt.NoFocus) + self.media_check.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) self.media_check.setObjectName("media_check") - self.ids_check = QtWidgets.QCheckBox(self.groupBox_2) + self.ids_check = QtWidgets.QCheckBox(parent=self.groupBox_2) self.ids_check.setGeometry(QtCore.QRect(20, 140, 241, 41)) font = QtGui.QFont() font.setPointSize(8) font.setBold(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) self.ids_check.setFont(font) - self.ids_check.setFocusPolicy(QtCore.Qt.NoFocus) + self.ids_check.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) self.ids_check.setObjectName("ids_check") self.verticalLayout_4.addWidget(self.groupBox_2) - self.groupBox = QtWidgets.QGroupBox(self.frame_creation_progress) - sizePolicy = QtWidgets.QSizePolicy( - QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding - ) + self.groupBox = QtWidgets.QGroupBox(parent=self.frame_creation_progress) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.groupBox.sizePolicy().hasHeightForWidth()) self.groupBox.setSizePolicy(sizePolicy) self.groupBox.setObjectName("groupBox") - self.media_checked = QtWidgets.QCheckBox(self.groupBox) + self.media_checked = QtWidgets.QCheckBox(parent=self.groupBox) self.media_checked.setGeometry(QtCore.QRect(20, 30, 241, 41)) font = QtGui.QFont() font.setPointSize(8) font.setBold(False) font.setItalic(False) font.setUnderline(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) font.setKerning(True) - font.setStyleStrategy(QtGui.QFont.PreferDefault) + font.setStyleStrategy(QtGui.QFont.StyleStrategy.PreferDefault) self.media_checked.setFont(font) - self.media_checked.setFocusPolicy(QtCore.Qt.NoFocus) + self.media_checked.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) self.media_checked.setObjectName("media_checked") - self.media_edited_check = QtWidgets.QCheckBox(self.groupBox) + self.media_edited_check = QtWidgets.QCheckBox(parent=self.groupBox) self.media_edited_check.setGeometry(QtCore.QRect(20, 70, 241, 41)) font = QtGui.QFont() font.setPointSize(8) font.setBold(False) font.setItalic(False) font.setUnderline(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) font.setKerning(True) - font.setStyleStrategy(QtGui.QFont.PreferDefault) + font.setStyleStrategy(QtGui.QFont.StyleStrategy.PreferDefault) self.media_edited_check.setFont(font) - self.media_edited_check.setFocusPolicy(QtCore.Qt.NoFocus) + self.media_edited_check.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) self.media_edited_check.setObjectName("media_edited_check") - self.app_created = QtWidgets.QCheckBox(self.groupBox) + self.app_created = QtWidgets.QCheckBox(parent=self.groupBox) self.app_created.setGeometry(QtCore.QRect(20, 110, 161, 41)) font = QtGui.QFont() font.setPointSize(8) font.setBold(False) font.setItalic(False) font.setUnderline(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) font.setKerning(True) - font.setStyleStrategy(QtGui.QFont.PreferDefault) + font.setStyleStrategy(QtGui.QFont.StyleStrategy.PreferDefault) self.app_created.setFont(font) - self.app_created.setFocusPolicy(QtCore.Qt.NoFocus) + self.app_created.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) self.app_created.setObjectName("app_created") - self.btn_copy_adis_command = QtWidgets.QPushButton(self.groupBox) + self.btn_copy_adis_command = QtWidgets.QPushButton(parent=self.groupBox) self.btn_copy_adis_command.setGeometry(QtCore.QRect(170, 120, 101, 23)) font = QtGui.QFont() font.setPointSize(8) font.setBold(False) font.setItalic(False) font.setUnderline(False) - font.setWeight(QtGui.QFont.Weight(50)) + font.setWeight(50) font.setKerning(True) - font.setStyleStrategy(QtGui.QFont.PreferDefault) + font.setStyleStrategy(QtGui.QFont.StyleStrategy.PreferDefault) self.btn_copy_adis_command.setFont(font) self.btn_copy_adis_command.setStatusTip("") self.btn_copy_adis_command.setWhatsThis("") self.btn_copy_adis_command.setAccessibleDescription("") self.btn_copy_adis_command.setAutoFillBackground(False) icon = QtGui.QIcon() - icon.addPixmap( - QtGui.QPixmap( - "/home/alexander/GitHub/SemesterapparatsManager/src/ui/../../../.designer/backup/icons/information.png" - ), - QtGui.QIcon.Normal, - QtGui.QIcon.Off, - ) + icon.addPixmap(QtGui.QPixmap("c:\\Users\\aky547\\GitHub\\SemesterapparatsManager\\src\\ui\\../../../.designer/backup/icons/information.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) self.btn_copy_adis_command.setIcon(icon) self.btn_copy_adis_command.setCheckable(False) self.btn_copy_adis_command.setChecked(False) @@ -1316,69 +1164,67 @@ class Ui_MainWindow(object): self.btn_copy_adis_command.setObjectName("btn_copy_adis_command") self.verticalLayout_4.addWidget(self.groupBox) self.horizontalLayout_6.addWidget(self.frame_creation_progress) - self.frame_2 = QtWidgets.QFrame(self.centralwidget) + self.frame_2 = QtWidgets.QFrame(parent=self.centralwidget) self.frame_2.setGeometry(QtCore.QRect(1280, 10, 301, 341)) - self.frame_2.setFrameShape(QtWidgets.QFrame.StyledPanel) - self.frame_2.setFrameShadow(QtWidgets.QFrame.Raised) + self.frame_2.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) + self.frame_2.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) self.frame_2.setObjectName("frame_2") - self.calendarWidget = QtWidgets.QCalendarWidget(self.frame_2) + self.calendarWidget = QtWidgets.QCalendarWidget(parent=self.frame_2) self.calendarWidget.setGeometry(QtCore.QRect(0, 0, 291, 191)) - self.calendarWidget.setFocusPolicy(QtCore.Qt.NoFocus) + self.calendarWidget.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) self.calendarWidget.setGridVisible(True) - self.calendarWidget.setVerticalHeaderFormat( - QtWidgets.QCalendarWidget.NoVerticalHeader - ) + self.calendarWidget.setVerticalHeaderFormat(QtWidgets.QCalendarWidget.VerticalHeaderFormat.NoVerticalHeader) self.calendarWidget.setObjectName("calendarWidget") - self.message_frame = QtWidgets.QFrame(self.frame_2) + self.message_frame = QtWidgets.QFrame(parent=self.frame_2) self.message_frame.setGeometry(QtCore.QRect(0, 210, 301, 121)) - self.message_frame.setFrameShape(QtWidgets.QFrame.StyledPanel) - self.message_frame.setFrameShadow(QtWidgets.QFrame.Raised) + self.message_frame.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) + self.message_frame.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) self.message_frame.setObjectName("message_frame") - self.label_14 = QtWidgets.QLabel(self.message_frame) + self.label_14 = QtWidgets.QLabel(parent=self.message_frame) self.label_14.setGeometry(QtCore.QRect(10, 10, 47, 20)) self.label_14.setObjectName("label_14") - self.line_app_info = QtWidgets.QLineEdit(self.message_frame) + self.line_app_info = QtWidgets.QLineEdit(parent=self.message_frame) self.line_app_info.setEnabled(True) self.line_app_info.setGeometry(QtCore.QRect(60, 10, 31, 20)) - self.line_app_info.setFocusPolicy(QtCore.Qt.NoFocus) + self.line_app_info.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) self.line_app_info.setObjectName("line_app_info") - self.message_box = QtWidgets.QTextEdit(self.message_frame) + self.message_box = QtWidgets.QTextEdit(parent=self.message_frame) self.message_box.setGeometry(QtCore.QRect(10, 40, 281, 71)) - self.message_box.setFocusPolicy(QtCore.Qt.NoFocus) + self.message_box.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) self.message_box.setObjectName("message_box") - self.btn_delete_message = QtWidgets.QPushButton(self.message_frame) + self.btn_delete_message = QtWidgets.QPushButton(parent=self.message_frame) self.btn_delete_message.setGeometry(QtCore.QRect(130, 10, 75, 23)) - self.btn_delete_message.setFocusPolicy(QtCore.Qt.NoFocus) + self.btn_delete_message.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) self.btn_delete_message.setObjectName("btn_delete_message") - self.spin_select_message = QtWidgets.QSpinBox(self.message_frame) + self.spin_select_message = QtWidgets.QSpinBox(parent=self.message_frame) self.spin_select_message.setGeometry(QtCore.QRect(210, 10, 74, 22)) self.spin_select_message.setMinimum(1) self.spin_select_message.setObjectName("spin_select_message") - self.label_total_day_messages = QtWidgets.QLabel(self.message_frame) + self.label_total_day_messages = QtWidgets.QLabel(parent=self.message_frame) self.label_total_day_messages.setGeometry(QtCore.QRect(240, 10, 21, 22)) self.label_total_day_messages.setObjectName("label_total_day_messages") MainWindow.setCentralWidget(self.centralwidget) - self.menubar = QtWidgets.QMenuBar(MainWindow) + self.menubar = QtWidgets.QMenuBar(parent=MainWindow) self.menubar.setGeometry(QtCore.QRect(0, 0, 1601, 30)) self.menubar.setObjectName("menubar") - self.menuDatei = QtWidgets.QMenu(self.menubar) + self.menuDatei = QtWidgets.QMenu(parent=self.menubar) self.menuDatei.setObjectName("menuDatei") - self.menuEinstellungen = QtWidgets.QMenu(self.menubar) + self.menuEinstellungen = QtWidgets.QMenu(parent=self.menubar) self.menuEinstellungen.setObjectName("menuEinstellungen") - self.menuHelp = QtWidgets.QMenu(self.menubar) + self.menuHelp = QtWidgets.QMenu(parent=self.menubar) self.menuHelp.setObjectName("menuHelp") MainWindow.setMenuBar(self.menubar) - self.statusbar = QtWidgets.QStatusBar(MainWindow) + self.statusbar = QtWidgets.QStatusBar(parent=MainWindow) self.statusbar.setObjectName("statusbar") MainWindow.setStatusBar(self.statusbar) - self.actionBeenden = QtWidgets.QWidgetAction(MainWindow) + self.actionBeenden = QtGui.QAction(parent=MainWindow) self.actionBeenden.setShortcutVisibleInContextMenu(True) self.actionBeenden.setObjectName("actionBeenden") - self.actionEinstellungen = QtWidgets.QWidgetAction(MainWindow) + self.actionEinstellungen = QtGui.QAction(parent=MainWindow) self.actionEinstellungen.setShortcutVisibleInContextMenu(True) self.actionEinstellungen.setObjectName("actionEinstellungen") - self.actionDokumentation = QtWidgets.QWidgetAction(MainWindow) - self.actionDokumentation.setShortcutContext(QtCore.Qt.ApplicationShortcut) + self.actionDokumentation = QtGui.QAction(parent=MainWindow) + self.actionDokumentation.setShortcutContext(QtCore.Qt.ShortcutContext.ApplicationShortcut) self.actionDokumentation.setObjectName("actionDokumentation") self.menuDatei.addAction(self.actionBeenden) self.menuEinstellungen.addAction(self.actionEinstellungen) @@ -1414,56 +1260,26 @@ class Ui_MainWindow(object): MainWindow.setTabOrder(self.btn_del_select_apparats, self.tabWidget_3) MainWindow.setTabOrder(self.tabWidget_3, self.select_action_box) MainWindow.setTabOrder(self.select_action_box, self.user_create_frame_username) - MainWindow.setTabOrder( - self.user_create_frame_username, self.user_frame_userrole - ) - MainWindow.setTabOrder( - self.user_frame_userrole, self.user_create_frame_password - ) + MainWindow.setTabOrder(self.user_create_frame_username, self.user_frame_userrole) + MainWindow.setTabOrder(self.user_frame_userrole, self.user_create_frame_password) MainWindow.setTabOrder(self.user_create_frame_password, self.user_frame_addUser) - MainWindow.setTabOrder( - self.user_frame_addUser, self.user_delete_frame_user_select - ) - MainWindow.setTabOrder( - self.user_delete_frame_user_select, self.user_delete_confirm - ) + MainWindow.setTabOrder(self.user_frame_addUser, self.user_delete_frame_user_select) + MainWindow.setTabOrder(self.user_delete_frame_user_select, self.user_delete_confirm) MainWindow.setTabOrder(self.user_delete_confirm, self.pushButton) MainWindow.setTabOrder(self.pushButton, self.user_edit_frame_user_select) - MainWindow.setTabOrder( - self.user_edit_frame_user_select, self.user_edit_frame_role_select - ) - MainWindow.setTabOrder( - self.user_edit_frame_role_select, self.user_edit_frame_new_password - ) + MainWindow.setTabOrder(self.user_edit_frame_user_select, self.user_edit_frame_role_select) + MainWindow.setTabOrder(self.user_edit_frame_role_select, self.user_edit_frame_new_password) MainWindow.setTabOrder(self.user_edit_frame_new_password, self.update_user) MainWindow.setTabOrder(self.update_user, self.edit_faculty_member_title) - MainWindow.setTabOrder( - self.edit_faculty_member_title, self.edit_faculty_member_select_member - ) - MainWindow.setTabOrder( - self.edit_faculty_member_select_member, self.faculty_member_old_telnr - ) - MainWindow.setTabOrder( - self.faculty_member_old_telnr, self.faculty_member_oldmail - ) - MainWindow.setTabOrder( - self.faculty_member_oldmail, self.edit_faculty_member_new_title - ) - MainWindow.setTabOrder( - self.edit_faculty_member_new_title, self.edit_faculty_member_new_surname - ) - MainWindow.setTabOrder( - self.edit_faculty_member_new_surname, self.user_faculty_member_new_name - ) - MainWindow.setTabOrder( - self.user_faculty_member_new_name, self.user_faculty_member_new_mail - ) - MainWindow.setTabOrder( - self.user_faculty_member_new_mail, self.user_faculty_member_new_telnr - ) - MainWindow.setTabOrder( - self.user_faculty_member_new_telnr, self.update_faculty_member - ) + MainWindow.setTabOrder(self.edit_faculty_member_title, self.edit_faculty_member_select_member) + MainWindow.setTabOrder(self.edit_faculty_member_select_member, self.faculty_member_old_telnr) + MainWindow.setTabOrder(self.faculty_member_old_telnr, self.faculty_member_oldmail) + MainWindow.setTabOrder(self.faculty_member_oldmail, self.edit_faculty_member_new_title) + MainWindow.setTabOrder(self.edit_faculty_member_new_title, self.edit_faculty_member_new_surname) + MainWindow.setTabOrder(self.edit_faculty_member_new_surname, self.user_faculty_member_new_name) + MainWindow.setTabOrder(self.user_faculty_member_new_name, self.user_faculty_member_new_mail) + MainWindow.setTabOrder(self.user_faculty_member_new_mail, self.user_faculty_member_new_telnr) + MainWindow.setTabOrder(self.user_faculty_member_new_telnr, self.update_faculty_member) MainWindow.setTabOrder(self.update_faculty_member, self.box_fach) MainWindow.setTabOrder(self.box_fach, self.box_person) MainWindow.setTabOrder(self.box_person, self.btn_search) @@ -1477,17 +1293,11 @@ class Ui_MainWindow(object): def retranslateUi(self, MainWindow): _translate = QtCore.QCoreApplication.translate - MainWindow.setWindowTitle( - _translate("MainWindow", "Semesterapparatsmanagement") - ) - self.load_app.setToolTip( - _translate("MainWindow", "Load the Semesterapparate from the database") - ) + MainWindow.setWindowTitle(_translate("MainWindow", "Semesterapparatsmanagement")) + self.load_app.setToolTip(_translate("MainWindow", "Load the Semesterapparate from the database")) self.load_app.setText(_translate("MainWindow", "App. aufrufen")) self.create_new_app.setText(_translate("MainWindow", "neu. App anlegen")) - self.cancel_active_selection.setText( - _translate("MainWindow", "Auswahl abbrechen") - ) + self.cancel_active_selection.setText(_translate("MainWindow", "Auswahl abbrechen")) self.tableWidget_apparate.setSortingEnabled(True) item = self.tableWidget_apparate.horizontalHeaderItem(0) item.setText(_translate("MainWindow", "AppNr")) @@ -1533,27 +1343,16 @@ class Ui_MainWindow(object): self._mand.setText(_translate("MainWindow", "*")) self.btn_add_document.setText(_translate("MainWindow", "Dokument hinzufügen")) self.btn_open_document.setText(_translate("MainWindow", "Dokument öffnen")) - self.check_file.setToolTip( - _translate( - "MainWindow", - "Abhängig von der Anzahl der Medien kann die Suche sehr lange dauern", - ) - ) - self.check_file.setText( - _translate("MainWindow", "Medien aus Dokument\n" " hinzufügen") - ) + self.check_file.setToolTip(_translate("MainWindow", "Abhängig von der Anzahl der Medien kann die Suche sehr lange dauern")) + self.check_file.setText(_translate("MainWindow", "Medien aus Dokument\n" +" hinzufügen")) self.label_12.setText(_translate("MainWindow", "Prof-ID-aDIS")) self.label_13.setText(_translate("MainWindow", "Apparat-ID-aDIS")) self.check_send_mail.setText(_translate("MainWindow", "Mail senden")) self.tableWidget_apparat_media.setSortingEnabled(True) item = self.tableWidget_apparat_media.horizontalHeaderItem(0) item.setText(_translate("MainWindow", "Buchtitel")) - item.setToolTip( - _translate( - "MainWindow", - "Es kann sein, dass der Buchtitel leer ist, dies kommt vor, wenn der Titel nicht passend formatiert ist", - ) - ) + item.setToolTip(_translate("MainWindow", "Es kann sein, dass der Buchtitel leer ist, dies kommt vor, wenn der Titel nicht passend formatiert ist")) item = self.tableWidget_apparat_media.horizontalHeaderItem(1) item.setText(_translate("MainWindow", "Signatur")) item = self.tableWidget_apparat_media.horizontalHeaderItem(2) @@ -1562,29 +1361,20 @@ class Ui_MainWindow(object): item.setText(_translate("MainWindow", "Autor")) item = self.tableWidget_apparat_media.horizontalHeaderItem(4) item.setText(_translate("MainWindow", "im Apparat?")) - item.setToolTip( - _translate( - "MainWindow", - "Diese Angabe ist nicht zuverlässig. Ist das ❌ vorhanden, kann das Medium im Apparat sein, aber aufgrund eines Bugs nicht gefunden worden", - ) - ) + item.setToolTip(_translate("MainWindow", "Diese Angabe ist nicht zuverlässig. Ist das ❌ vorhanden, kann das Medium im Apparat sein, aber aufgrund eines Bugs nicht gefunden worden")) item = self.tableWidget_apparat_media.horizontalHeaderItem(5) item.setText(_translate("MainWindow", "Vorgemerkt")) item = self.tableWidget_apparat_media.horizontalHeaderItem(6) item.setText(_translate("MainWindow", "Link")) self.label.setText(_translate("MainWindow", " Medienliste")) - self.chkbx_show_del_media.setText( - _translate("MainWindow", "gel. Medien anzeigen") - ) + self.chkbx_show_del_media.setText(_translate("MainWindow", "gel. Medien anzeigen")) self.btn_reserve.setText(_translate("MainWindow", "im Apparat?")) self.label_info.setText(_translate("MainWindow", "Medien werden hinzugefügt")) self.progress_label.setText(_translate("MainWindow", "Medium x/y")) self.label_20.setText(_translate("MainWindow", "Medien werden geprüft")) self.avail_status.setText(_translate("MainWindow", "TextLabel")) self.add_medium.setText(_translate("MainWindow", "Medien hinzufügen")) - self.tabWidget.setTabText( - self.tabWidget.indexOf(self.tab), _translate("MainWindow", "Anlegen") - ) + self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), _translate("MainWindow", "Anlegen")) self.btn_search.setText(_translate("MainWindow", "Suchen")) self.label_7.setText(_translate("MainWindow", "Appnr.:")) self.label_18.setText(_translate("MainWindow", "Dauerapp:")) @@ -1593,31 +1383,20 @@ class Ui_MainWindow(object): self.label_11.setText(_translate("MainWindow", "Person:")) self.label_16.setText(_translate("MainWindow", "Fach:")) self.label_15.setText(_translate("MainWindow", "Löschbar")) - self.tabWidget_2.setTabText( - self.tabWidget_2.indexOf(self.tab_3), _translate("MainWindow", "Statistik") - ) + self.tabWidget_2.setTabText(self.tabWidget_2.indexOf(self.tab_3), _translate("MainWindow", "Statistik")) self.label_25.setText(_translate("MainWindow", "Signatur")) self.book_search.setText(_translate("MainWindow", "Suche")) self.label_26.setText(_translate("MainWindow", "Titel")) - self.tabWidget_2.setTabText( - self.tabWidget_2.indexOf(self.tab_4), _translate("MainWindow", "Suchen") - ) + self.tabWidget_2.setTabText(self.tabWidget_2.indexOf(self.tab_4), _translate("MainWindow", "Suchen")) item = self.statistics_table.horizontalHeaderItem(0) item.setText(_translate("MainWindow", "Semester")) item = self.statistics_table.horizontalHeaderItem(1) item.setText(_translate("MainWindow", "Zugang")) item = self.statistics_table.horizontalHeaderItem(2) item.setText(_translate("MainWindow", "Abgang")) - self.tabWidget_3.setTabText( - self.tabWidget_3.indexOf(self.tab_6), _translate("MainWindow", "Tabelle") - ) - self.tabWidget_3.setTabText( - self.tabWidget_3.indexOf(self.tab_7), - _translate("MainWindow", "Erstellte und gelöschte Semesterapparate"), - ) - self.btn_del_select_apparats.setText( - _translate("MainWindow", "Ausgewählte Löschen") - ) + self.tabWidget_3.setTabText(self.tabWidget_3.indexOf(self.tab_6), _translate("MainWindow", "Tabelle")) + self.tabWidget_3.setTabText(self.tabWidget_3.indexOf(self.tab_7), _translate("MainWindow", "Erstellte und gelöschte Semesterapparate")) + self.btn_del_select_apparats.setText(_translate("MainWindow", "Ausgewählte Löschen")) item = self.tableWidget.horizontalHeaderItem(1) item.setText(_translate("MainWindow", "Apparatsname")) item = self.tableWidget.horizontalHeaderItem(2) @@ -1632,23 +1411,12 @@ class Ui_MainWindow(object): item.setText(_translate("MainWindow", "Signatur")) item = self.book_search_result.horizontalHeaderItem(2) item.setText(_translate("MainWindow", "Apparat")) - self.tabWidget.setTabText( - self.tabWidget.indexOf(self.tab_2), - _translate("MainWindow", "Suchen / Statistik"), - ) + self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), _translate("MainWindow", "Suchen / Statistik")) self.label_21.setText(_translate("MainWindow", "Aktion:")) - self.select_action_box.setItemText( - 0, _translate("MainWindow", "Nutzer anlegen") - ) - self.select_action_box.setItemText( - 1, _translate("MainWindow", "Nutzer löschen") - ) - self.select_action_box.setItemText( - 2, _translate("MainWindow", "Nutzer aktualisieren") - ) - self.select_action_box.setItemText( - 3, _translate("MainWindow", "Lehrperson bearbeiten") - ) + self.select_action_box.setItemText(0, _translate("MainWindow", "Nutzer anlegen")) + self.select_action_box.setItemText(1, _translate("MainWindow", "Nutzer löschen")) + self.select_action_box.setItemText(2, _translate("MainWindow", "Nutzer aktualisieren")) + self.select_action_box.setItemText(3, _translate("MainWindow", "Lehrperson bearbeiten")) self.label_22.setText(_translate("MainWindow", "Nutzername")) self.label_24.setText(_translate("MainWindow", "Rolle")) self.label_23.setText(_translate("MainWindow", "Passwort")) @@ -1670,27 +1438,16 @@ class Ui_MainWindow(object): self.label_41.setText(_translate("MainWindow", "Alte Angaben")) self.update_faculty_member.setText(_translate("MainWindow", "Aktualisieren")) self.label_42.setText(_translate("MainWindow", "Neue Angaben")) - self.tabWidget.setTabText( - self.tabWidget.indexOf(self.tab_5), _translate("MainWindow", "Admin") - ) + self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_5), _translate("MainWindow", "Admin")) self.groupBox_2.setTitle(_translate("MainWindow", "Software")) self.appdata_check.setText(_translate("MainWindow", "Apparatsdaten eingegeben")) - self.media_check.setText( - _translate("MainWindow", "Medien hinzugefügt / importiert") - ) - self.ids_check.setText( - _translate("MainWindow", "Prof-ID und Apparat-ID eingetragen") - ) + self.media_check.setText(_translate("MainWindow", "Medien hinzugefügt / importiert")) + self.ids_check.setText(_translate("MainWindow", "Prof-ID und Apparat-ID eingetragen")) self.groupBox.setTitle(_translate("MainWindow", "aDIS")) self.media_checked.setText(_translate("MainWindow", "Medien geprüft")) self.media_edited_check.setText(_translate("MainWindow", "Medien bearbeitet")) self.app_created.setText(_translate("MainWindow", "Apparat angelegt")) - self.btn_copy_adis_command.setToolTip( - _translate( - "MainWindow", - "Hier klicken, um die aDIS Abfrage in die Zwischenablage zu kopieren", - ) - ) + self.btn_copy_adis_command.setToolTip(_translate("MainWindow", "Hier klicken, um die aDIS Abfrage in die Zwischenablage zu kopieren")) self.btn_copy_adis_command.setText(_translate("MainWindow", " aDIS Abfrage")) self.label_14.setText(_translate("MainWindow", "Apparat")) self.btn_delete_message.setText(_translate("MainWindow", "Löschen")) diff --git a/src/ui/Ui_setupwizard.py b/src/ui/Ui_setupwizard.py index 8acfea1..5da1dbf 100644 --- a/src/ui/Ui_setupwizard.py +++ b/src/ui/Ui_setupwizard.py @@ -1,12 +1,12 @@ # Form implementation generated from reading ui file 'c:\Users\aky547\GitHub\Semesterapparate\ui\setupwizard.ui' # -# Created by: PySide6 UI code generator 6.3.1 +# Created by: PyQt6 UI code generator 6.3.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 PySide6 import QtCore, QtGui, QtWidgets +from PyQt6 import QtCore, QtGui, QtWidgets class Ui_Wizard(object): @@ -54,18 +54,34 @@ class Ui_Wizard(object): def retranslateUi(self, Wizard): _translate = QtCore.QCoreApplication.translate Wizard.setWindowTitle(_translate("Wizard", "Wizard")) - self.textBrowser.setHtml(_translate("Wizard", "\n" -"\n" -"

Setup für das Semesterapparatsprogram.

\n" -"


\n" -"

Im Anschluss werden wichtige Einstellungen gesetzt, welche auch im späteren Verlauf verändert werden können.

\n" -"


")) + self.textBrowser.setHtml( + _translate( + "Wizard", + '\n' + '\n" + '

Setup für das Semesterapparatsprogram.

\n' + '


\n' + '

Im Anschluss werden wichtige Einstellungen gesetzt, welche auch im späteren Verlauf verändert werden können.

\n' + '


', + ) + ) self.label.setText(_translate("Wizard", "Grundeinstellungen")) - self.label_2.setToolTip(_translate("Wizard", "Opens the downloaded files with the default applications set in the OS")) + self.label_2.setToolTip( + _translate( + "Wizard", + "Opens the downloaded files with the default applications set in the OS", + ) + ) self.label_2.setText(_translate("Wizard", "Default Apps")) - self.label_3.setToolTip(_translate("Wizard", "Path where the downloaded files are stored. Defaults to ~/Desktop/SemapFiles")) + self.label_3.setToolTip( + _translate( + "Wizard", + "Path where the downloaded files are stored. Defaults to ~/Desktop/SemapFiles", + ) + ) self.label_3.setText(_translate("Wizard", "Save Path")) self.save_path.setPlaceholderText(_translate("Wizard", "~/Desktop/SemapFiles")) self.btn_save_path_select.setText(_translate("Wizard", "...")) + diff --git a/src/ui/dialogs/Ui_edit_bookdata.py b/src/ui/dialogs/Ui_edit_bookdata.py index eba44e0..728cd17 100644 --- a/src/ui/dialogs/Ui_edit_bookdata.py +++ b/src/ui/dialogs/Ui_edit_bookdata.py @@ -1,12 +1,12 @@ # Form implementation generated from reading ui file 'c:\Users\aky547\GitHub\Semesterapparate\ui\dialogs\edit_bookdata.ui' # -# Created by: PySide6 UI code generator 6.3.1 +# Created by: PyQt6 UI code generator 6.3.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 PySide6 import QtCore, QtGui, QtWidgets +from PyQt6 import QtCore, QtGui, QtWidgets from src.logic.dataclass import BookData diff --git a/src/ui/dialogs/Ui_fileparser.py b/src/ui/dialogs/Ui_fileparser.py index da869db..15899aa 100644 --- a/src/ui/dialogs/Ui_fileparser.py +++ b/src/ui/dialogs/Ui_fileparser.py @@ -1,12 +1,12 @@ # Form implementation generated from reading ui file 'c:\Users\aky547\GitHub\Semesterapparate\ui\dialogs\fileparser.ui' # -# Created by: PySide6 UI code generator 6.3.1 +# Created by: PyQt6 UI code generator 6.3.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 PySide6 import QtCore, QtGui, QtWidgets +from PyQt6 import QtCore, QtGui, QtWidgets from src.logic.webrequest import BibTextTransformer, WebRequest diff --git a/src/ui/dialogs/Ui_login.py b/src/ui/dialogs/Ui_login.py index 7e807ac..54f1b2b 100644 --- a/src/ui/dialogs/Ui_login.py +++ b/src/ui/dialogs/Ui_login.py @@ -1,6 +1,6 @@ # Form implementation generated from reading ui file '/home/alexander/GitHub/Semesterapparate/ui/dialogs/login.ui' # -# Created by: PySide6 UI code generator 6.5.3 +# Created by: PyQt6 UI code generator 6.5.3 # # 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. @@ -8,10 +8,11 @@ import hashlib -from PySide6 import QtCore, QtWidgets +from PyQt6 import QtCore, QtWidgets -from src.backend.database import Database from src.backend.admin_console import AdminCommands +from src.backend.database import Database + class Ui_Dialog(object): def setupUi(self, Dialog): @@ -66,11 +67,9 @@ class Ui_Dialog(object): password = self.lineEdit_2.text() print(type(username), password) # Assuming 'Database' is a class to interact with your database - db = Database() + db = Database() - hashed_password = hashlib.sha256( - password.encode() - ).hexdigest() + hashed_password = hashlib.sha256(password.encode()).hexdigest() if len(db.getUsers()) == 0: AdminCommands().create_admin() self.lresult = 1 # Indicate successful login @@ -110,3 +109,5 @@ if __name__ == "__main__": ui.setupUi(Dialog) Dialog.show() sys.exit(app.exec()) + + diff --git a/src/ui/dialogs/Ui_mail_preview.py b/src/ui/dialogs/Ui_mail_preview.py index 32ed57d..dff1a76 100644 --- a/src/ui/dialogs/Ui_mail_preview.py +++ b/src/ui/dialogs/Ui_mail_preview.py @@ -1,37 +1,42 @@ # Form implementation generated from reading ui file 'c:\Users\aky547\GitHub\SemesterapparatsManager\src\ui\dialogs\mail_preview.ui' # -# Created by: PySide6 UI code generator 6.3.1 +# Created by: PyQt6 UI code generator 6.3.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 PySide6 import QtCore, QtGui, QtWidgets -import subprocess -import tempfile import os import re +import subprocess +import tempfile + from omegaconf import OmegaConf +from PyQt6 import QtCore, QtGui, QtWidgets config = OmegaConf.load("config.yaml") + class Ui_eMailPreview(object): def setupUi( self, eMailPreview, - app_id="", - app_name="", - app_subject="", - prof_name="", - data=None, + # app_id, + # app_name, + # app_subject, + # prof_name, + # prof_mail, ): eMailPreview.setObjectName("eMailPreview") eMailPreview.resize(676, 676) self.buttonBox = QtWidgets.QDialogButtonBox(eMailPreview) self.buttonBox.setGeometry(QtCore.QRect(310, 630, 341, 32)) self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal) - self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok) + self.buttonBox.setStandardButtons( + QtWidgets.QDialogButtonBox.StandardButton.Cancel + | QtWidgets.QDialogButtonBox.StandardButton.Ok + ) self.buttonBox.setObjectName("buttonBox") self.gridLayoutWidget = QtWidgets.QWidget(eMailPreview) self.gridLayoutWidget.setGeometry(QtCore.QRect(10, 10, 661, 621)) @@ -46,7 +51,11 @@ class Ui_eMailPreview(object): self.prof_name.setObjectName("prof_name") self.gridLayout.addWidget(self.prof_name, 2, 2, 1, 1) self.label_3 = QtWidgets.QLabel(self.gridLayoutWidget) - self.label_3.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft|QtCore.Qt.AlignmentFlag.AlignTop) + self.label_3.setAlignment( + QtCore.Qt.AlignmentFlag.AlignLeading + | QtCore.Qt.AlignmentFlag.AlignLeft + | QtCore.Qt.AlignmentFlag.AlignTop + ) self.label_3.setObjectName("label_3") self.gridLayout.addWidget(self.label_3, 5, 0, 1, 1) self.mail_name = QtWidgets.QLineEdit(self.gridLayoutWidget) @@ -81,7 +90,12 @@ class Ui_eMailPreview(object): self.gender_non = QtWidgets.QRadioButton(self.gridLayoutWidget) self.gender_non.setObjectName("gender_non") self.horizontalLayout_3.addWidget(self.gender_non) - 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_3.addItem(spacerItem) self.gridLayout.addLayout(self.horizontalLayout_3, 4, 2, 1, 1) self.label_6 = QtWidgets.QLabel(self.gridLayoutWidget) @@ -89,23 +103,23 @@ class Ui_eMailPreview(object): self.gridLayout.addWidget(self.label_6, 4, 0, 1, 1) self.retranslateUi(eMailPreview) - self.buttonBox.accepted.connect(eMailPreview.accept) # type: ignore - self.buttonBox.rejected.connect(eMailPreview.reject) # type: ignore + self.buttonBox.accepted.connect(eMailPreview.accept) # type: ignore + self.buttonBox.rejected.connect(eMailPreview.reject) # type: ignore QtCore.QMetaObject.connectSlotsByName(eMailPreview) - self._appid = app_id - self._appname = app_name - self._subject = app_subject - self.prof_name.setText(prof_name) - self._mail_data = "" - self._data = data - self.load_mail_templates() + # self._appid = app_id + # self._appname = app_name + # self._subject = app_subject + # self.prof_name.setText(prof_name) + # self._mail_data = "" + # self._prof_mail = prof_mail + # self.load_mail_templates() self.comboBox.addItem("") self.comboBox.setCurrentText("") - self.buttonBox.accepted.connect(self.save_mail) - self.comboBox.currentIndexChanged.connect(self.set_mail) - self.gender_female.clicked.connect(self.set_mail) - self.gender_male.clicked.connect(self.set_mail) - self.gender_non.clicked.connect(self.set_mail) + # self.buttonBox.accepted.connect(self.save_mail) + # self.comboBox.currentIndexChanged.connect(self.set_mail) + # self.gender_female.clicked.connect(self.set_mail) + # self.gender_male.clicked.connect(self.set_mail) + # self.gender_non.clicked.connect(self.set_mail) def retranslateUi(self, eMailPreview): _translate = QtCore.QCoreApplication.translate @@ -120,64 +134,69 @@ class Ui_eMailPreview(object): self.gender_non.setText(_translate("eMailPreview", "Divers")) self.label_6.setText(_translate("eMailPreview", "Geschlecht")) - def get_greeting(self): - if self.gender_male.isChecked(): - return "Sehr geehrter Herr" - elif self.gender_female.isChecked(): - return "Sehr geehrte Frau" - elif self.gender_non.isChecked(): - return "Guten Tag" - + # def get_greeting(self): + # if self.gender_male.isChecked(): + # return "Sehr geehrter Herr" + # elif self.gender_female.isChecked(): + # return "Sehr geehrte Frau" + # elif self.gender_non.isChecked(): + # return "Guten Tag" - def set_mail(self): - email_template = self.comboBox.currentText() - if email_template == "": - return - with open(f"mail_vorlagen/{email_template}", "r", encoding="utf-8") as f: - mail_template = f.read() - header = re.findall(r"Subject: (.*)", mail_template) - if header: - email_header = header[0] - else: - email_header = email_template.split(".eml")[0] - self.mail_header.setText(email_header) - self.mail_data = mail_template.split("")[0] - mail_html = mail_template.split("")[1] - mail_html = "" + mail_html - mail_html = mail_html.format( - Profname=self.prof_name.text().split(" ")[1], Appname=self._appname, AppNr=self._appid, AppSubject = self._subject,greeting = self.get_greeting() - ) + # def set_mail(self): + # email_template = self.comboBox.currentText() + # if email_template == "": + # return + # with open(f"mail_vorlagen/{email_template}", "r", encoding="utf-8") as f: + # mail_template = f.read() + # header = re.findall(r"Subject: (.*)", mail_template) + # if header: + # email_header = header[0] + # else: + # email_header = email_template.split(".eml")[0] + # self.mail_header.setText(email_header) + # self.mail_data = mail_template.split("")[0] + # mail_html = mail_template.split("")[1] + # mail_html = "" + mail_html + # mail_html = mail_html.format( + # Profname=self.prof_name.text().split(" ")[1], + # Appname=self._appname, + # AppNr=self._appid, + # AppSubject=self._subject, + # greeting=self.get_greeting(), + # ) - self.mail_body.setHtml(mail_html) - def load_mail_templates(self): - mail_templates = os.listdir("mail_vorlagen") - mail_templates = [f for f in mail_templates if f.endswith(".eml")] - print(mail_templates) - self.comboBox.addItems(mail_templates) + # self.mail_body.setHtml(mail_html) + + # def load_mail_templates(self): + # mail_templates = os.listdir("mail_vorlagen") + # mail_templates = [f for f in mail_templates if f.endswith(".eml")] + # print(mail_templates) + # self.comboBox.addItems(mail_templates) + + # def save_mail(self): + # # create a temporary file + # mail_header = self.mail_header.text() + # mail_body = self.mail_body.toHtml() + # mail = self.mail_data + mail_body + # mail = mail.replace("Subject:", f"Subject: {mail_header}") + # directory = config["database"]["tempdir"] + # directory = directory.replace("~", str(os.path.expanduser("~"))) + # with tempfile.NamedTemporaryFile( + # mode="w", delete=False, suffix=".eml", encoding="utf-8", dir=directory + # ) as f: + # f.write(mail) + # self.mail_path = f.name + # print(self.mail_path) + # # open the file using thunderbird + # subprocess.Popen([f"{self.mail_path}"]) + # # delete the file + # # os.remove(self.mail_path) - def save_mail(self): - # create a temporary file - mail_header = self.mail_header.text() - mail_body = self.mail_body.toHtml() - mail = self.mail_data + mail_body - mail = mail.replace("Subject:", f"Subject: {mail_header}") - directory = config["database"]["tempdir"] - directory = directory.replace("~", str(os.path.expanduser("~"))) - with tempfile.NamedTemporaryFile( - mode="w", delete=False, suffix=".eml", encoding="utf-8", dir=directory - ) as f: - f.write(mail) - self.mail_path = f.name - print(self.mail_path) - # open the file using thunderbird - subprocess.Popen([f"{self.mail_path}"]) - # delete the file - # os.remove(self.mail_path) def launch(): app = QtWidgets.QApplication([]) eMailPreview = QtWidgets.QDialog() ui = Ui_eMailPreview() - ui.setupUi(eMailPreview, "1","Test","Biologie","Kirchner, Alexander") + ui.setupUi(eMailPreview, "1", "Test", "Biologie", "Kirchner, Alexander") eMailPreview.show() - app.exec() \ No newline at end of file + app.exec() diff --git a/src/ui/dialogs/Ui_medianadder.py b/src/ui/dialogs/Ui_medianadder.py index a1c46b0..3578bab 100644 --- a/src/ui/dialogs/Ui_medianadder.py +++ b/src/ui/dialogs/Ui_medianadder.py @@ -1,12 +1,12 @@ # Form implementation generated from reading ui file 'c:\Users\aky547\GitHub\Semesterapparate\ui\dialogs\medianadder.ui' # -# Created by: PySide6 UI code generator 6.3.1 +# Created by: PyQt6 UI code generator 6.3.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 PySide6 import QtCore, QtGui, QtWidgets +from PyQt6 import QtCore, QtGui, QtWidgets class Ui_Dialog(object): diff --git a/src/ui/dialogs/Ui_new_subject.py b/src/ui/dialogs/Ui_new_subject.py index db6ebde..f0ca2e4 100644 --- a/src/ui/dialogs/Ui_new_subject.py +++ b/src/ui/dialogs/Ui_new_subject.py @@ -1,12 +1,12 @@ # Form implementation generated from reading ui file 'c:\Users\aky547\GitHub\Semesterapparate\ui\dialogs\new_subject.ui' # -# Created by: PySide6 UI code generator 6.3.1 +# Created by: PyQt6 UI code generator 6.3.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 PySide6 import QtCore, QtWidgets +from PyQt6 import QtCore, QtWidgets class Ui_Dialog(object): @@ -22,7 +22,12 @@ class Ui_Dialog(object): self.verticalLayout.addWidget(self.label) self.gridLayout = QtWidgets.QGridLayout() self.gridLayout.setObjectName("gridLayout") - 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.gridLayout.addItem(spacerItem, 0, 1, 1, 1) self.checkBox = QtWidgets.QCheckBox(Dialog) self.checkBox.setObjectName("checkBox") @@ -42,22 +47,33 @@ class Ui_Dialog(object): self.verticalLayout_2.addWidget(self.frame) self.buttonBox = QtWidgets.QDialogButtonBox(Dialog) self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal) - self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok) + self.buttonBox.setStandardButtons( + QtWidgets.QDialogButtonBox.StandardButton.Cancel + | QtWidgets.QDialogButtonBox.StandardButton.Ok + ) self.buttonBox.setObjectName("buttonBox") self.verticalLayout_2.addWidget(self.buttonBox) self.frame.setVisible(False) - self.checkBox.stateChanged.connect(lambda: self.frame.setVisible(self.checkBox.isChecked())) + self.checkBox.stateChanged.connect( + lambda: self.frame.setVisible(self.checkBox.isChecked()) + ) self.retranslateUi(Dialog) - self.buttonBox.accepted.connect(Dialog.accept) # type: ignore - self.buttonBox.rejected.connect(Dialog.reject) # type: ignore + 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.label.setText(_translate("Dialog", "Das eingegebene Fach wurde nicht in der Datenbank gefunden. Soll es angelegt werden?")) + self.label.setText( + _translate( + "Dialog", + "Das eingegebene Fach wurde nicht in der Datenbank gefunden. Soll es angelegt werden?", + ) + ) self.checkBox.setText(_translate("Dialog", "Ja")) self.label_2.setText(_translate("Dialog", "Name des Neuen Faches:")) + def return_state(self): - return self.lineEdit.text() \ No newline at end of file + return self.lineEdit.text() diff --git a/src/ui/dialogs/Ui_parsed_titles.py b/src/ui/dialogs/Ui_parsed_titles.py index b05ad32..a0f318d 100644 --- a/src/ui/dialogs/Ui_parsed_titles.py +++ b/src/ui/dialogs/Ui_parsed_titles.py @@ -1,15 +1,15 @@ # Form implementation generated from reading ui file 'c:\Users\aky547\GitHub\Semesterapparate\ui\dialogs\parsed_titles.ui' # -# Created by: PySide6 UI code generator 6.3.1 +# Created by: PyQt6 UI code generator 6.3.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 PySide6 import QtCore, QtGui, QtWidgets +from PyQt6 import QtCore, QtGui, QtWidgets +from src.logic import AutoAdder from src.logic.log import MyLogger -from src.logic.threads import AutoAdder logger = MyLogger("AutoTitleAdder") @@ -156,3 +156,5 @@ class Ui_Form(object): self.listWidget.takeItem(0) # add first entry to listWidget_done self.listWidget_done.addItem(text) + + diff --git a/src/ui/dialogs/Ui_reminder.py b/src/ui/dialogs/Ui_reminder.py index 283e509..f4dbc8f 100644 --- a/src/ui/dialogs/Ui_reminder.py +++ b/src/ui/dialogs/Ui_reminder.py @@ -1,12 +1,12 @@ # Form implementation generated from reading ui file 'c:\Users\aky547\GitHub\SemesterapparatsManager\src\ui\dialogs\reminder.ui' # -# Created by: PySide6 UI code generator 6.3.1 +# Created by: PyQt6 UI code generator 6.3.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 PySide6 import QtCore, QtGui, QtWidgets +from PyQt6 import QtCore, QtGui, QtWidgets class Ui_Dialog(object): diff --git a/src/ui/dialogs/Ui_settings.py b/src/ui/dialogs/Ui_settings.py index 36c39f2..9129069 100644 --- a/src/ui/dialogs/Ui_settings.py +++ b/src/ui/dialogs/Ui_settings.py @@ -1,13 +1,13 @@ # Form implementation generated from reading ui file 'c:\Users\aky547\GitHub\Semesterapparate\ui\dialogs\settings.ui' # -# Created by: PySide6 UI code generator 6.3.1 +# Created by: PyQt6 UI code generator 6.3.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 omegaconf import OmegaConf -from PySide6 import QtCore, QtWidgets +from PyQt6 import QtCore, QtWidgets config = OmegaConf.load("config.yaml") @@ -127,7 +127,7 @@ class Ui_Dialog(object): '\n" - '

Hier können Einstellungen f�r bestehende Dateiformate geändert, oder neue Dateiformate eingefügt werden

\n' + '

Hier können Einstellungen für bestehende Dateiformate geändert, oder neue Dateiformate eingefügt werden

\n' '


', ) ) diff --git a/src/ui/dialogs/app_ext.py b/src/ui/dialogs/app_ext.py index f0a1887..9ff68ce 100644 --- a/src/ui/dialogs/app_ext.py +++ b/src/ui/dialogs/app_ext.py @@ -1,14 +1,16 @@ # Form implementation generated from reading ui file 'ui\dialogs\apparat_extend.ui' # -# Created by: PySide6 UI code generator 6.3.1 +# Created by: PyQt6 UI code generator 6.3.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 PySide6 import QtCore, QtGui, QtWidgets +from PyQt6 import QtCore, QtGui, QtWidgets + from src.backend.semester import generateSemesterByDate + class Ui_Dialog(object): def setupUi(self, Dialog): Dialog.setObjectName("Dialog") @@ -94,12 +96,14 @@ class Ui_Dialog(object): # else: # self.rad_winter.setChecked(True) return { - "semester": f"SoSe {int(self.sem_year.text()[-2:])}" - if self.rad_sommer.isChecked() - else f"WiSe {int(self.sem_year.text()[-2:])}/{int(self.sem_year.text()[-2:])+1}", - "dauerapp": self.dauerapp.isChecked() - if self.dauerapp.isChecked() - else False, + "semester": ( + f"SoSe {int(self.sem_year.text()[-2:])}" + if self.rad_sommer.isChecked() + else f"WiSe {int(self.sem_year.text()[-2:])}/{int(self.sem_year.text()[-2:])+1}" + ), + "dauerapp": ( + self.dauerapp.isChecked() if self.dauerapp.isChecked() else False + ), } @@ -112,3 +116,4 @@ if __name__ == "__main__": ui.setupUi(Dialog) Dialog.show() sys.exit(app.exec()) + diff --git a/src/ui/dialogs/apparat_extend_ui.py b/src/ui/dialogs/apparat_extend_ui.py index edeaf52..56d82db 100644 --- a/src/ui/dialogs/apparat_extend_ui.py +++ b/src/ui/dialogs/apparat_extend_ui.py @@ -8,21 +8,57 @@ ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ -from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale, - QMetaObject, QObject, QPoint, QRect, - QSize, QTime, QUrl, Qt) -from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor, - QFont, QFontDatabase, QGradient, QIcon, - QImage, QKeySequence, QLinearGradient, QPainter, - QPalette, QPixmap, QRadialGradient, QTransform) -from PySide6.QtWidgets import (QAbstractButton, QApplication, QCheckBox, QDialog, - QDialogButtonBox, QFrame, QLabel, QLineEdit, - QRadioButton, QSizePolicy, QWidget) +from PyQt6.QtCore import ( + QCoreApplication, + QDate, + QDateTime, + QLocale, + QMetaObject, + QObject, + QPoint, + QRect, + QSize, + Qt, + QTime, + QUrl, +) +from PyQt6.QtGui import ( + QBrush, + QColor, + QConicalGradient, + QCursor, + QFont, + QFontDatabase, + QGradient, + QIcon, + QImage, + QKeySequence, + QLinearGradient, + QPainter, + QPalette, + QPixmap, + QRadialGradient, + QTransform, +) +from PyQt6.QtWidgets import ( + QAbstractButton, + QApplication, + QCheckBox, + QDialog, + QDialogButtonBox, + QFrame, + QLabel, + QLineEdit, + QRadioButton, + QSizePolicy, + QWidget, +) + class Ui_Dialog(object): def setupUi(self, Dialog): if not Dialog.objectName(): - Dialog.setObjectName(u"Dialog") + Dialog.setObjectName("Dialog") Dialog.resize(388, 103) sizePolicy = QSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) @@ -32,37 +68,39 @@ class Ui_Dialog(object): Dialog.setMinimumSize(QSize(388, 103)) Dialog.setMaximumSize(QSize(388, 103)) self.buttonBox = QDialogButtonBox(Dialog) - self.buttonBox.setObjectName(u"buttonBox") + self.buttonBox.setObjectName("buttonBox") self.buttonBox.setGeometry(QRect(290, 30, 81, 241)) self.buttonBox.setOrientation(Qt.Vertical) - self.buttonBox.setStandardButtons(QDialogButtonBox.Abort|QDialogButtonBox.Save) + self.buttonBox.setStandardButtons( + QDialogButtonBox.Abort | QDialogButtonBox.Save + ) self.label = QLabel(Dialog) - self.label.setObjectName(u"label") + self.label.setObjectName("label") self.label.setGeometry(QRect(10, 0, 281, 31)) font = QFont() font.setPointSize(10) self.label.setFont(font) self.frame = QFrame(Dialog) - self.frame.setObjectName(u"frame") + self.frame.setObjectName("frame") self.frame.setGeometry(QRect(10, 30, 241, 41)) self.frame.setFrameShape(QFrame.StyledPanel) self.frame.setFrameShadow(QFrame.Raised) self.line = QFrame(self.frame) - self.line.setObjectName(u"line") + self.line.setObjectName("line") self.line.setGeometry(QRect(120, 0, 3, 61)) self.line.setFrameShape(QFrame.VLine) self.line.setFrameShadow(QFrame.Sunken) self.rad_sommer = QRadioButton(self.frame) - self.rad_sommer.setObjectName(u"rad_sommer") + self.rad_sommer.setObjectName("rad_sommer") self.rad_sommer.setGeometry(QRect(10, 10, 82, 21)) self.rad_winter = QRadioButton(self.frame) - self.rad_winter.setObjectName(u"rad_winter") + self.rad_winter.setObjectName("rad_winter") self.rad_winter.setGeometry(QRect(140, 10, 82, 21)) self.sem_year = QLineEdit(Dialog) - self.sem_year.setObjectName(u"sem_year") + self.sem_year.setObjectName("sem_year") self.sem_year.setGeometry(QRect(10, 70, 121, 20)) self.checkBox = QCheckBox(Dialog) - self.checkBox.setObjectName(u"checkBox") + self.checkBox.setObjectName("checkBox") self.checkBox.setGeometry(QRect(150, 70, 91, 21)) self.retranslateUi(Dialog) @@ -70,14 +108,25 @@ class Ui_Dialog(object): self.buttonBox.rejected.connect(Dialog.reject) QMetaObject.connectSlotsByName(Dialog) + # setupUi def retranslateUi(self, Dialog): - Dialog.setWindowTitle(QCoreApplication.translate("Dialog", u"Dialog", None)) - self.label.setText(QCoreApplication.translate("Dialog", u"Bis wann soll der Apparat verl\u00e4ngert werden?", None)) - self.rad_sommer.setText(QCoreApplication.translate("Dialog", u"Sommer", None)) - self.rad_winter.setText(QCoreApplication.translate("Dialog", u"Winter", None)) - self.sem_year.setPlaceholderText(QCoreApplication.translate("Dialog", u"2023", None)) - self.checkBox.setText(QCoreApplication.translate("Dialog", u"Dauerapparat", None)) + Dialog.setWindowTitle(QCoreApplication.translate("Dialog", "Dialog", None)) + self.label.setText( + QCoreApplication.translate( + "Dialog", "Bis wann soll der Apparat verl\u00e4ngert werden?", None + ) + ) + self.rad_sommer.setText(QCoreApplication.translate("Dialog", "Sommer", None)) + self.rad_winter.setText(QCoreApplication.translate("Dialog", "Winter", None)) + self.sem_year.setPlaceholderText( + QCoreApplication.translate("Dialog", "2023", None) + ) + self.checkBox.setText( + QCoreApplication.translate("Dialog", "Dauerapparat", None) + ) + # retranslateUi + diff --git a/src/ui/dialogs/confirm_extend_ui.py b/src/ui/dialogs/confirm_extend_ui.py index 8d087f6..9e3b67f 100644 --- a/src/ui/dialogs/confirm_extend_ui.py +++ b/src/ui/dialogs/confirm_extend_ui.py @@ -8,28 +8,61 @@ ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ -from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale, - QMetaObject, QObject, QPoint, QRect, - QSize, QTime, QUrl, Qt) -from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor, - QFont, QFontDatabase, QGradient, QIcon, - QImage, QKeySequence, QLinearGradient, QPainter, - QPalette, QPixmap, QRadialGradient, QTransform) -from PySide6.QtWidgets import (QAbstractButton, QApplication, QDialog, QDialogButtonBox, - QSizePolicy, QTextEdit, QWidget) +from PyQt6.QtCore import ( + QCoreApplication, + QDate, + QDateTime, + QLocale, + QMetaObject, + QObject, + QPoint, + QRect, + QSize, + Qt, + QTime, + QUrl, +) +from PyQt6.QtGui import ( + QBrush, + QColor, + QConicalGradient, + QCursor, + QFont, + QFontDatabase, + QGradient, + QIcon, + QImage, + QKeySequence, + QLinearGradient, + QPainter, + QPalette, + QPixmap, + QRadialGradient, + QTransform, +) +from PyQt6.QtWidgets import ( + QAbstractButton, + QApplication, + QDialog, + QDialogButtonBox, + QSizePolicy, + QTextEdit, + QWidget, +) + class Ui_extend_confirm(object): def setupUi(self, extend_confirm): if not extend_confirm.objectName(): - extend_confirm.setObjectName(u"extend_confirm") + extend_confirm.setObjectName("extend_confirm") extend_confirm.resize(380, 97) self.buttonBox = QDialogButtonBox(extend_confirm) - self.buttonBox.setObjectName(u"buttonBox") + self.buttonBox.setObjectName("buttonBox") self.buttonBox.setGeometry(QRect(290, 20, 81, 241)) self.buttonBox.setOrientation(Qt.Vertical) - self.buttonBox.setStandardButtons(QDialogButtonBox.Cancel|QDialogButtonBox.Ok) + self.buttonBox.setStandardButtons(QDialogButtonBox.Cancel | QDialogButtonBox.Ok) self.textEdit = QTextEdit(extend_confirm) - self.textEdit.setObjectName(u"textEdit") + self.textEdit.setObjectName("textEdit") self.textEdit.setGeometry(QRect(10, 10, 271, 81)) self.retranslateUi(extend_confirm) @@ -37,9 +70,14 @@ class Ui_extend_confirm(object): self.buttonBox.rejected.connect(extend_confirm.reject) QMetaObject.connectSlotsByName(extend_confirm) + # setupUi def retranslateUi(self, extend_confirm): - extend_confirm.setWindowTitle(QCoreApplication.translate("extend_confirm", u"Dialog", None)) + extend_confirm.setWindowTitle( + QCoreApplication.translate("extend_confirm", "Dialog", None) + ) + # retranslateUi + diff --git a/src/ui/dialogs/ext_app.py b/src/ui/dialogs/ext_app.py index 425067e..bedaa6d 100644 --- a/src/ui/dialogs/ext_app.py +++ b/src/ui/dialogs/ext_app.py @@ -1,12 +1,12 @@ # Form implementation generated from reading ui file 'ui/dialogs/extend_apparat.ui' # -# Created by: PySide6 UI code generator 6.3.1 +# Created by: PyQt6 UI code generator 6.3.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 PySide6 import QtCore, QtGui, QtWidgets +from PyQt6 import QtCore, QtGui, QtWidgets class Ui_Frame(object): @@ -18,7 +18,10 @@ class Ui_Frame(object): self.label.setObjectName("label") self.buttonBox = QtWidgets.QDialogButtonBox(Frame) self.buttonBox.setGeometry(QtCore.QRect(90, 90, 156, 23)) - self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok) + self.buttonBox.setStandardButtons( + QtWidgets.QDialogButtonBox.StandardButton.Cancel + | QtWidgets.QDialogButtonBox.StandardButton.Ok + ) self.buttonBox.setObjectName("buttonBox") self.sem_winter = QtWidgets.QRadioButton(Frame) self.sem_winter.setGeometry(QtCore.QRect(60, 40, 82, 17)) @@ -36,16 +39,20 @@ class Ui_Frame(object): def retranslateUi(self, Frame): _translate = QtCore.QCoreApplication.translate Frame.setWindowTitle(_translate("Frame", "Frame")) - self.label.setText(_translate("Frame", "Bis wann soll der Apparat verlängert werden?")) + self.label.setText( + _translate("Frame", "Bis wann soll der Apparat verlängert werden?") + ) self.sem_winter.setText(_translate("Frame", "Winter")) self.sem_sommer.setText(_translate("Frame", "Sommer")) if __name__ == "__main__": import sys + app = QtWidgets.QApplication(sys.argv) Frame = QtWidgets.QFrame() ui = Ui_Frame() ui.setupUi(Frame) Frame.show() sys.exit(app.exec()) + diff --git a/src/ui/dialogs/mail.py b/src/ui/dialogs/mail.py index 41850f5..a62a167 100644 --- a/src/ui/dialogs/mail.py +++ b/src/ui/dialogs/mail.py @@ -2,7 +2,7 @@ import os import sys from omegaconf import OmegaConf -from PySide6 import QtCore, QtGui, QtWidgets +from PyQt6 import QtCore, QtGui, QtWidgets from src.ui.dialogs.Ui_mail_preview import Ui_eMailPreview as Ui_Dialog @@ -38,13 +38,23 @@ class Mail_Dialog(QtWidgets.QDialog, Ui_Dialog): self.prof_name.setText(prof_name) self.mail_name.setText(self.prof_mail) self.load_mail_templates() - # if default_mail is not None: - # # get the nearest match to the default mail - # for i in range(self.comboBox.count()): - # if default_mail in self.comboBox.itemText(i): - # default_mail = self.comboBox.itemText(i) - # break - # self.comboBox.setCurrentText(default_mail) + # if none of the radio buttons is checked, disable the accept button of the dialog + if ( + self.gender_female.isChecked() + or self.gender_male.isChecked() + or self.gender_male.isChecked() + ): + self.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setEnabled(True) + else: + self.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setEnabled(False) + + if default_mail is not None: + # get the nearest match to the default mail + for i in range(self.comboBox.count()): + if default_mail in self.comboBox.itemText(i): + default_mail = self.comboBox.itemText(i) + break + self.comboBox.setCurrentText(default_mail) self.gender_female.clicked.connect(self.set_mail) self.gender_male.clicked.connect(self.set_mail) @@ -66,12 +76,13 @@ class Mail_Dialog(QtWidgets.QDialog, Ui_Dialog): self.comboBox.addItem(template) def get_greeting(self): + prof = self.profname if self.gender_male.isChecked(): - return "Sehr geehrter Herr" + return f"Sehr geehrter Herr {prof.split(' ')[-1]}," elif self.gender_female.isChecked(): - return "Sehr geehrte Frau" + return f"Sehr geehrte Frau {prof.split(' ')[-1]}," elif self.gender_non.isChecked(): - return "Guten Tag" + return f"Guten Tag {prof}," def set_mail(self): email_template = self.comboBox.currentText() @@ -97,6 +108,7 @@ class Mail_Dialog(QtWidgets.QDialog, Ui_Dialog): ) self.mail_body.setHtml(mail_html) + self.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setEnabled(True) def createAndSendMail(self): import smtplib @@ -176,3 +188,10 @@ if __name__ == "__main__": + + + + + + + diff --git a/src/ui/dialogs/mail_preview.py b/src/ui/dialogs/mail_preview.py index 47635ee..c258514 100644 --- a/src/ui/dialogs/mail_preview.py +++ b/src/ui/dialogs/mail_preview.py @@ -1,12 +1,12 @@ # Form implementation generated from reading ui file 'ui\dialogs\mail_preview.ui' # -# Created by: PySide6 UI code generator 6.3.1 +# Created by: PyQt6 UI code generator 6.3.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 PySide6 import QtCore, QtGui, QtWidgets +from PyQt6 import QtCore, QtGui, QtWidgets class Ui_Dialog(object): diff --git a/src/ui/dialogs/medienadder.py b/src/ui/dialogs/medienadder.py index b6aff9f..31f26cc 100644 --- a/src/ui/dialogs/medienadder.py +++ b/src/ui/dialogs/medienadder.py @@ -1,4 +1,4 @@ -from PySide6 import QtCore, QtGui, QtWidgets +from PyQt6 import QtCore, QtGui, QtWidgets from .Ui_medianadder import Ui_Dialog diff --git a/src/ui/dialogs/new_subject_ui.py b/src/ui/dialogs/new_subject_ui.py index 736e8ae..e6b6676 100644 --- a/src/ui/dialogs/new_subject_ui.py +++ b/src/ui/dialogs/new_subject_ui.py @@ -1,12 +1,12 @@ # Form implementation generated from reading ui file '/home/alexander/GitHub/Semesterapparate/ui/dialogs/new_subject.ui' # -# Created by: PySide6 UI code generator 6.5.3 +# Created by: PyQt6 UI code generator 6.5.3 # # 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 PySide6 import QtCore, QtGui, QtWidgets +from PyQt6 import QtCore, QtGui, QtWidgets class Ui_Dialog(object): @@ -22,7 +22,12 @@ class Ui_Dialog(object): self.verticalLayout.addWidget(self.label) self.gridLayout = QtWidgets.QGridLayout() self.gridLayout.setObjectName("gridLayout") - 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.gridLayout.addItem(spacerItem, 0, 1, 1, 1) self.checkBox = QtWidgets.QCheckBox(parent=Dialog) self.checkBox.setObjectName("checkBox") @@ -42,18 +47,27 @@ class Ui_Dialog(object): self.verticalLayout_2.addWidget(self.frame) 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.setStandardButtons( + QtWidgets.QDialogButtonBox.StandardButton.Cancel + | QtWidgets.QDialogButtonBox.StandardButton.Ok + ) self.buttonBox.setObjectName("buttonBox") self.verticalLayout_2.addWidget(self.buttonBox) self.retranslateUi(Dialog) - self.buttonBox.accepted.connect(Dialog.accept) # type: ignore - self.buttonBox.rejected.connect(Dialog.reject) # type: ignore + 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.label.setText(_translate("Dialog", "Das eingegebene Fach wurde nicht in der Datenbank gefunden. Soll es angelegt werden?")) + self.label.setText( + _translate( + "Dialog", + "Das eingegebene Fach wurde nicht in der Datenbank gefunden. Soll es angelegt werden?", + ) + ) self.checkBox.setText(_translate("Dialog", "Ja")) self.label_2.setText(_translate("Dialog", "Name des Neuen Faches:")) + diff --git a/src/ui/dialogs/parsed_titles_ui.py b/src/ui/dialogs/parsed_titles_ui.py index 78f8684..04a499f 100644 --- a/src/ui/dialogs/parsed_titles_ui.py +++ b/src/ui/dialogs/parsed_titles_ui.py @@ -1,12 +1,12 @@ # Form implementation generated from reading ui file '/home/alexander/GitHub/Semesterapparate/ui/dialogs/parsed_titles.ui' # -# Created by: PySide6 UI code generator 6.5.3 +# Created by: PyQt6 UI code generator 6.5.3 # # 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 PySide6 import QtCore, QtGui, QtWidgets +from PyQt6 import QtCore, QtGui, QtWidgets class Ui_Form(object): @@ -38,7 +38,12 @@ class Ui_Form(object): self.label_2 = QtWidgets.QLabel(parent=self.horizontalLayoutWidget) self.label_2.setObjectName("label_2") self.horizontalLayout.addWidget(self.label_2) - 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.frame_2 = QtWidgets.QFrame(parent=Form) self.frame_2.setGeometry(QtCore.QRect(10, 80, 381, 201)) @@ -54,7 +59,9 @@ class Ui_Form(object): self.listWidget = QtWidgets.QListWidget(parent=self.horizontalLayoutWidget_2) self.listWidget.setObjectName("listWidget") self.horizontalLayout_2.addWidget(self.listWidget) - self.listWidget_done = QtWidgets.QListWidget(parent=self.horizontalLayoutWidget_2) + self.listWidget_done = QtWidgets.QListWidget( + parent=self.horizontalLayoutWidget_2 + ) self.listWidget_done.setObjectName("listWidget_done") self.horizontalLayout_2.addWidget(self.listWidget_done) self.progressBar = QtWidgets.QProgressBar(parent=Form) @@ -63,7 +70,10 @@ class Ui_Form(object): self.progressBar.setObjectName("progressBar") self.buttonBox = QtWidgets.QDialogButtonBox(parent=Form) self.buttonBox.setGeometry(QtCore.QRect(230, 290, 156, 23)) - self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok) + self.buttonBox.setStandardButtons( + QtWidgets.QDialogButtonBox.StandardButton.Cancel + | QtWidgets.QDialogButtonBox.StandardButton.Ok + ) self.buttonBox.setObjectName("buttonBox") self.toolButton = QtWidgets.QToolButton(parent=Form) self.toolButton.setGeometry(QtCore.QRect(20, 290, 25, 19)) @@ -79,3 +89,4 @@ class Ui_Form(object): self.count.setText(_translate("Form", "0")) self.label_2.setText(_translate("Form", "Signaturen gefunden.")) self.toolButton.setText(_translate("Form", "...")) + diff --git a/src/ui/dialogs/popup_confirm.py b/src/ui/dialogs/popup_confirm.py index 0e80e84..a27c0bc 100644 --- a/src/ui/dialogs/popup_confirm.py +++ b/src/ui/dialogs/popup_confirm.py @@ -1,12 +1,12 @@ # Form implementation generated from reading ui file 'ui\dialogs\confirm_extend.ui' # -# Created by: PySide6 UI code generator 6.3.1 +# Created by: PyQt6 UI code generator 6.3.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 PySide6 import QtCore, QtGui, QtWidgets +from PyQt6 import QtCore, QtGui, QtWidgets class Ui_extend_confirm(object): diff --git a/src/ui/dialogs/settings.py b/src/ui/dialogs/settings.py index 3a28c94..63d7b62 100644 --- a/src/ui/dialogs/settings.py +++ b/src/ui/dialogs/settings.py @@ -1,5 +1,5 @@ from omegaconf import OmegaConf -from PySide6 import QtWidgets +from PyQt6 import QtWidgets from src.ui.dialogs.Ui_settings import Ui_Dialog as _settings diff --git a/src/ui/plotdata_ui.py b/src/ui/plotdata_ui.py index 14144f9..f0738dc 100644 --- a/src/ui/plotdata_ui.py +++ b/src/ui/plotdata_ui.py @@ -1,12 +1,12 @@ # Form implementation generated from reading ui file '/home/alexander/GitHub/Semesterapparate/ui/plotdata.ui' # -# Created by: PySide6 UI code generator 6.5.3 +# Created by: PyQt6 UI code generator 6.5.3 # # 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 PySide6 import QtCore, QtGui, QtWidgets +from PyQt6 import QtCore, QtGui, QtWidgets class Ui_MainWindow(object): diff --git a/src/ui/semesterapparat_ui.ui b/src/ui/semesterapparat_ui.ui index 4c4a34b..686133c 100644 --- a/src/ui/semesterapparat_ui.ui +++ b/src/ui/semesterapparat_ui.ui @@ -12,7 +12,7 @@ 0 0 - 1601 + 1589 800 @@ -30,7 +30,7 @@ - 1920 + 1590 800 @@ -70,7 +70,7 @@ Qt::NoFocus - 0 + 1 @@ -265,7 +265,6 @@ 12 - 75 true @@ -290,7 +289,6 @@ 10 - 50 false false @@ -391,7 +389,6 @@ 9 - 50 false @@ -411,7 +408,6 @@ 9 - 50 false @@ -434,7 +430,6 @@ 9 - 50 false @@ -454,7 +449,6 @@ 9 - 50 false @@ -477,7 +471,6 @@ 9 - 50 false @@ -497,7 +490,6 @@ 9 - 50 false @@ -520,7 +512,6 @@ 9 - 50 false @@ -540,7 +531,6 @@ 9 - 50 false @@ -560,7 +550,6 @@ 9 - 50 false @@ -586,7 +575,6 @@ 9 - 50 false @@ -606,7 +594,6 @@ 9 - 50 false @@ -629,7 +616,6 @@ 9 - 50 false @@ -649,7 +635,6 @@ 9 - 50 false @@ -669,7 +654,6 @@ 9 - 50 false @@ -689,7 +673,6 @@ 9 - 50 false @@ -715,7 +698,6 @@ 9 - 50 false @@ -735,7 +717,6 @@ 9 - 50 false @@ -758,7 +739,6 @@ 9 - 50 false @@ -778,7 +758,6 @@ 8 - 50 false @@ -810,7 +789,6 @@ 9 - 50 false @@ -830,7 +808,6 @@ 9 - 50 false @@ -850,7 +827,6 @@ 9 - 50 false @@ -870,7 +846,6 @@ 9 - 50 false @@ -890,7 +865,6 @@ 9 - 50 false @@ -913,7 +887,6 @@ 9 - 50 false @@ -933,7 +906,6 @@ 9 - 50 false @@ -953,7 +925,6 @@ 9 - 50 false @@ -973,7 +944,6 @@ 9 - 50 false @@ -1000,7 +970,6 @@ 9 - 50 false @@ -1014,7 +983,6 @@ 9 - 50 false @@ -1025,7 +993,6 @@ 9 - 50 false @@ -1051,7 +1018,6 @@ 9 - 50 false @@ -1095,7 +1061,6 @@ 9 - 50 false @@ -1129,7 +1094,6 @@ 9 - 50 false @@ -1260,7 +1224,6 @@ 11 - 75 true @@ -1670,7 +1633,7 @@ QFrame::Raised - 1 + 0 @@ -2466,7 +2429,6 @@ 8 - 50 false @@ -2489,7 +2451,6 @@ 8 - 50 false @@ -2504,7 +2465,7 @@ 20 - 140 + 110 241 41 @@ -2512,7 +2473,6 @@ 8 - 50 false @@ -2548,7 +2508,6 @@ 8 - 50 false false false @@ -2575,7 +2534,6 @@ 8 - 50 false false false @@ -2602,7 +2560,6 @@ 8 - 50 false false false @@ -2629,7 +2586,6 @@ 8 - 50 false false false @@ -2657,7 +2613,7 @@ - ../../../.designer/backup/icons/information.png../../../.designer/backup/icons/information.png + ../../../../../.designer/backup/icons/information.png../../../../../.designer/backup/icons/information.png false @@ -2817,8 +2773,8 @@ 0 0 - 1601 - 30 + 1589 + 22 @@ -2880,25 +2836,25 @@ drpdwn_app_nr + prof_title drpdwn_prof_name prof_mail prof_tel_nr app_name + app_fach sem_year check_eternal_app btn_add_document btn_open_document check_file + check_send_mail btn_apparat_save btn_apparat_apply - check_send_mail - chkbx_show_del_media - btn_reserve prof_id_adis apparat_id_adis tabWidget_2 - btn_del_select_apparats - tabWidget_3 + seach_by_signature + search_by_title select_action_box user_create_frame_username user_frame_userrole @@ -2913,8 +2869,6 @@ update_user edit_faculty_member_title edit_faculty_member_select_member - faculty_member_old_telnr - faculty_member_oldmail edit_faculty_member_new_title edit_faculty_member_new_surname user_faculty_member_new_name @@ -2931,6 +2885,12 @@ box_appnrs btn_copy_adis_command spin_select_message + chkbx_show_del_media + btn_reserve + book_search + btn_del_select_apparats + tabWidget_3 + book_search_result diff --git a/src/ui/setupwizard_ui.py b/src/ui/setupwizard_ui.py index f99cad1..73792b0 100644 --- a/src/ui/setupwizard_ui.py +++ b/src/ui/setupwizard_ui.py @@ -8,83 +8,146 @@ ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ -from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale, - QMetaObject, QObject, QPoint, QRect, - QSize, QTime, QUrl, Qt) -from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor, - QFont, QFontDatabase, QGradient, QIcon, - QImage, QKeySequence, QLinearGradient, QPainter, - QPalette, QPixmap, QRadialGradient, QTransform) -from PySide6.QtWidgets import (QApplication, QCheckBox, QFrame, QLabel, - QLineEdit, QSizePolicy, QTextBrowser, QToolButton, - QWidget, QWizard, QWizardPage) +from PyQt6.QtCore import ( + QCoreApplication, + QDate, + QDateTime, + QLocale, + QMetaObject, + QObject, + QPoint, + QRect, + QSize, + Qt, + QTime, + QUrl, +) +from PyQt6.QtGui import ( + QBrush, + QColor, + QConicalGradient, + QCursor, + QFont, + QFontDatabase, + QGradient, + QIcon, + QImage, + QKeySequence, + QLinearGradient, + QPainter, + QPalette, + QPixmap, + QRadialGradient, + QTransform, +) +from PyQt6.QtWidgets import ( + QApplication, + QCheckBox, + QFrame, + QLabel, + QLineEdit, + QSizePolicy, + QTextBrowser, + QToolButton, + QWidget, + QWizard, + QWizardPage, +) + class Ui_Wizard(object): def setupUi(self, Wizard): if not Wizard.objectName(): - Wizard.setObjectName(u"Wizard") + Wizard.setObjectName("Wizard") Wizard.resize(640, 480) Wizard.setMaximumSize(QSize(640, 480)) self.wizardPage1 = QWizardPage() - self.wizardPage1.setObjectName(u"wizardPage1") + self.wizardPage1.setObjectName("wizardPage1") self.textBrowser = QTextBrowser(self.wizardPage1) - self.textBrowser.setObjectName(u"textBrowser") + self.textBrowser.setObjectName("textBrowser") self.textBrowser.setGeometry(QRect(200, 10, 256, 192)) Wizard.addPage(self.wizardPage1) self.wizardPage2 = QWizardPage() - self.wizardPage2.setObjectName(u"wizardPage2") + self.wizardPage2.setObjectName("wizardPage2") self.label = QLabel(self.wizardPage2) - self.label.setObjectName(u"label") + self.label.setObjectName("label") self.label.setGeometry(QRect(10, 0, 131, 16)) self.label_2 = QLabel(self.wizardPage2) - self.label_2.setObjectName(u"label_2") + self.label_2.setObjectName("label_2") self.label_2.setGeometry(QRect(10, 40, 71, 16)) self.default_apps = QCheckBox(self.wizardPage2) - self.default_apps.setObjectName(u"default_apps") + self.default_apps.setObjectName("default_apps") self.default_apps.setGeometry(QRect(100, 40, 70, 17)) self.label_3 = QLabel(self.wizardPage2) - self.label_3.setObjectName(u"label_3") + self.label_3.setObjectName("label_3") self.label_3.setGeometry(QRect(10, 70, 61, 16)) self.custom_applications = QFrame(self.wizardPage2) - self.custom_applications.setObjectName(u"custom_applications") + self.custom_applications.setObjectName("custom_applications") self.custom_applications.setGeometry(QRect(280, 10, 331, 361)) self.custom_applications.setFrameShape(QFrame.StyledPanel) self.custom_applications.setFrameShadow(QFrame.Raised) self.save_path = QLineEdit(self.wizardPage2) - self.save_path.setObjectName(u"save_path") + self.save_path.setObjectName("save_path") self.save_path.setGeometry(QRect(80, 70, 113, 20)) self.btn_save_path_select = QToolButton(self.wizardPage2) - self.btn_save_path_select.setObjectName(u"btn_save_path_select") + self.btn_save_path_select.setObjectName("btn_save_path_select") self.btn_save_path_select.setGeometry(QRect(200, 70, 25, 19)) Wizard.addPage(self.wizardPage2) self.retranslateUi(Wizard) QMetaObject.connectSlotsByName(Wizard) + # setupUi def retranslateUi(self, Wizard): - Wizard.setWindowTitle(QCoreApplication.translate("Wizard", u"Wizard", None)) - self.textBrowser.setHtml(QCoreApplication.translate("Wizard", u"\n" -"\n" -"

Setup f\u00fcr das Semesterapparatsprogram.

\n" -"


\n" -"

Im Anschluss werden wichtige Einstellungen gesetzt, welche auch im sp\u00e4teren Verlauf ver\u00e4ndert werden k\u00f6nnen.

\n" -"


", None)) - self.label.setText(QCoreApplication.translate("Wizard", u"Grundeinstellungen", None)) -#if QT_CONFIG(tooltip) - self.label_2.setToolTip(QCoreApplication.translate("Wizard", u"Opens the downloaded files with the default applications set in the OS", None)) -#endif // QT_CONFIG(tooltip) - self.label_2.setText(QCoreApplication.translate("Wizard", u"Default Apps", None)) + Wizard.setWindowTitle(QCoreApplication.translate("Wizard", "Wizard", None)) + self.textBrowser.setHtml( + QCoreApplication.translate( + "Wizard", + '\n' + '\n" + '

Setup f\u00fcr das Semesterapparatsprogram.

\n' + '


\n' + '

Im Anschluss werden wichtige Einstellungen gesetzt, welche auch im sp\u00e4teren Verlauf ver\u00e4ndert werden k\u00f6nnen.

\n' + '


', + None, + ) + ) + self.label.setText( + QCoreApplication.translate("Wizard", "Grundeinstellungen", None) + ) + # if QT_CONFIG(tooltip) + self.label_2.setToolTip( + QCoreApplication.translate( + "Wizard", + "Opens the downloaded files with the default applications set in the OS", + None, + ) + ) + # endif // QT_CONFIG(tooltip) + self.label_2.setText(QCoreApplication.translate("Wizard", "Default Apps", None)) self.default_apps.setText("") -#if QT_CONFIG(tooltip) - self.label_3.setToolTip(QCoreApplication.translate("Wizard", u"Path where the downloaded files are stored. Defaults to ~/Desktop/SemapFiles", None)) -#endif // QT_CONFIG(tooltip) - self.label_3.setText(QCoreApplication.translate("Wizard", u"Save Path", None)) - self.save_path.setPlaceholderText(QCoreApplication.translate("Wizard", u"~/Desktop/SemapFiles", None)) - self.btn_save_path_select.setText(QCoreApplication.translate("Wizard", u"...", None)) + # if QT_CONFIG(tooltip) + self.label_3.setToolTip( + QCoreApplication.translate( + "Wizard", + "Path where the downloaded files are stored. Defaults to ~/Desktop/SemapFiles", + None, + ) + ) + # endif // QT_CONFIG(tooltip) + self.label_3.setText(QCoreApplication.translate("Wizard", "Save Path", None)) + self.save_path.setPlaceholderText( + QCoreApplication.translate("Wizard", "~/Desktop/SemapFiles", None) + ) + self.btn_save_path_select.setText( + QCoreApplication.translate("Wizard", "...", None) + ) + # retranslateUi + diff --git a/src/ui/untitled_ui.py b/src/ui/untitled_ui.py index 1fb7a59..51fa1de 100644 --- a/src/ui/untitled_ui.py +++ b/src/ui/untitled_ui.py @@ -8,7 +8,7 @@ # WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ -from PySide6.QtCore import ( +from PyQt6.QtCore import ( QCoreApplication, QDate, QDateTime, @@ -22,8 +22,7 @@ from PySide6.QtCore import ( QTime, QUrl, ) -from PySide6.QtGui import ( - QWidgetAction, +from PyQt6.QtGui import ( QBrush, QColor, QConicalGradient, @@ -40,8 +39,9 @@ from PySide6.QtGui import ( QPixmap, QRadialGradient, QTransform, + QWidgetAction, ) -from PySide6.QtWidgets import ( +from PyQt6.QtWidgets import ( QApplication, QCheckBox, QComboBox, @@ -474,3 +474,4 @@ class Ui_MainWindow(object): ) # retranslateUi + diff --git a/src/ui/widgets/Ui_message_widget.py b/src/ui/widgets/Ui_message_widget.py index 41c7f70..c2e9f60 100644 --- a/src/ui/widgets/Ui_message_widget.py +++ b/src/ui/widgets/Ui_message_widget.py @@ -1,12 +1,12 @@ # Form implementation generated from reading ui file 'c:\Users\aky547\GitHub\Semesterapparate\ui\widgets\message_widget.ui' # -# Created by: PySide6 UI code generator 6.3.1 +# Created by: PyQt6 UI code generator 6.3.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 PySide6 import QtCore, QtGui, QtWidgets +from PyQt6 import QtCore, QtGui, QtWidgets from src.backend.database import Database diff --git a/src/ui/widgets/Ui_progress_overview_widget.py b/src/ui/widgets/Ui_progress_overview_widget.py index 5d3fde1..4d8f937 100644 --- a/src/ui/widgets/Ui_progress_overview_widget.py +++ b/src/ui/widgets/Ui_progress_overview_widget.py @@ -1,12 +1,12 @@ # Form implementation generated from reading ui file 'c:\Users\aky547\GitHub\Semesterapparate\ui\widgets\progress_overview_widget.ui' # -# Created by: PySide6 UI code generator 6.3.1 +# Created by: PyQt6 UI code generator 6.3.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 PySide6 import QtCore, QtGui, QtWidgets +from PyQt6 import QtCore, QtGui, QtWidgets class Ui_Form(object): @@ -63,7 +63,7 @@ class Ui_Form(object): font = QtGui.QFont() font.setPointSize(10) font.setBold(True) - font.setItalic(False) + font.setItal#ic(False) font.setUnderline(False) font.setWeight(75) font.setKerning(True) diff --git a/src/ui/widgets/collapse.py b/src/ui/widgets/collapse.py index c02acef..1dae55b 100644 --- a/src/ui/widgets/collapse.py +++ b/src/ui/widgets/collapse.py @@ -1,6 +1,6 @@ # import pysignal pyslot -from PySide6.QtCore import Signal -from PySide6.QtWidgets import ( +from PyQt6.QtCore import pyqtSignal as Signal +from PyQt6.QtWidgets import ( QApplication, QTreeWidget, QTreeWidgetItem, @@ -10,7 +10,7 @@ from PySide6.QtWidgets import ( class StatusWidget(QWidget): - person_double_clicked = Signal(str,str, int) + person_double_clicked = Signal(str, str, int) def __init__(self, data, header_label: str): super(StatusWidget, self).__init__() @@ -23,6 +23,7 @@ class StatusWidget(QWidget): layout.addWidget(self.tree_widget) self.setLayout(layout) self.tree_widget.itemDoubleClicked.connect(self.on_item_double_clicked) + def on_item_double_clicked(self, item: QTreeWidgetItem, column: int): parent_depth = 0 parent = item.parent() @@ -31,7 +32,7 @@ class StatusWidget(QWidget): parent = parent.parent() print(parent_depth) # Emit the person_double_clicked signal with the name of the person and the parent depth - self.person_double_clicked.emit(self.header,item.text(column), parent_depth) + self.person_double_clicked.emit(self.header, item.text(column), parent_depth) def populate_tree(self, data): if data == {}: @@ -70,7 +71,8 @@ if __name__ == "__main__": widget = StatusWidget(data, "test") widget.show() - #detect emit signal + # detect emit signal widget.person_double_clicked.connect(lambda x: print(x)) sys.exit(app.exec()) + diff --git a/src/ui/widgets/filepicker.py b/src/ui/widgets/filepicker.py index 68e65d4..8b39ba8 100644 --- a/src/ui/widgets/filepicker.py +++ b/src/ui/widgets/filepicker.py @@ -1,29 +1,32 @@ -from PySide6.QtWidgets import QFileDialog, QApplication -from PySide6.QtCore import QSettings import sys +from PyQt6.QtCore import QSettings +from PyQt6.QtWidgets import QApplication, QFileDialog + + class FilePicker: def __init__(self): self.settings = QSettings("PH-Freiburg", "SAP") self.last_path = self.settings.value("last_path", "/") self.multi_select = True - + def pick_files(self): filepicker = QFileDialog() filepicker.setFileMode(QFileDialog.FileMode.ExistingFiles) filepicker.setDirectory(self.last_path) filepicker.setOption(QFileDialog.Option.DontUseNativeDialog, True) - #enable multi select + # enable multi select filepicker.setOption(QFileDialog.Option.DontUseCustomDirectoryIcons, True) - files, _ = filepicker.getOpenFileNames(caption='Open file', directory=self.last_path) + files, _ = filepicker.getOpenFileNames(caption="Open file", dir=self.last_path) if files: self.last_path = files[0] self.settings.setValue("last_path", self.last_path) return files -if __name__ == '__main__': + +if __name__ == "__main__": app = QApplication(sys.argv) picker = FilePicker() files = picker.pick_files() - print(files) \ No newline at end of file + print(files) diff --git a/src/ui/widgets/graph.py b/src/ui/widgets/graph.py index 990bb7a..f3f37a4 100644 --- a/src/ui/widgets/graph.py +++ b/src/ui/widgets/graph.py @@ -5,7 +5,7 @@ matplotlib.use("QtAgg") from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas from matplotlib.backends.backend_qt5agg import NavigationToolbar2QT as NavigationToolbar from matplotlib.figure import Figure -from PySide6 import QtCore, QtWidgets +from PyQt6 import QtCore, QtWidgets class graph(FigureCanvas): @@ -25,7 +25,7 @@ class GraphWidget(QtWidgets.QWidget): self.toolbar = NavigationToolbar(self.graph, self) # set legend self.graph.axes.legend(legend_labels, loc="upper left") - #set x-axis text to be slanted + # set x-axis text to be slanted self.graph.axes.set_xticklabels(data["x"], rotation=45, ha="right") # set the layout layout = QtWidgets.QVBoxLayout() @@ -49,3 +49,4 @@ if __name__ == "__main__": widget = GraphWidget(data=data, legend_labels=["+", "-"]) widget.show() sys.exit(app.exec()) + diff --git a/src/ui/widgets/progress_widget.py b/src/ui/widgets/progress_widget.py index 49b1a7d..df14ab8 100644 --- a/src/ui/widgets/progress_widget.py +++ b/src/ui/widgets/progress_widget.py @@ -1,4 +1,4 @@ -from PySide6 import QtCore, QtGui, QtWidgets +from PyQt6 import QtCore, QtGui, QtWidgets from Ui_progress_overview_widget import Ui_Form