diff --git a/src/ui/dialogs/app_ext.py b/src/ui/dialogs/app_ext.py index a2c2309..a16dde0 100644 --- a/src/ui/dialogs/app_ext.py +++ b/src/ui/dialogs/app_ext.py @@ -1,100 +1,19 @@ -# Form implementation generated from reading ui file 'ui\dialogs\apparat_extend.ui' -# -# 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 PyQt6 import QtWidgets +from .dialog_sources.Ui_apparat_extend import Ui_Dialog +from src import Icon - -from PyQt6 import QtCore, QtGui, QtWidgets - -from src.backend.semester import generateSemesterByDate - - -class Ui_Dialog(object): - def setupUi(self, Dialog): - Dialog.setObjectName("Dialog") - Dialog.resize(388, 103) - sizePolicy = QtWidgets.QSizePolicy( - QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Fixed - ) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(Dialog.sizePolicy().hasHeightForWidth()) - Dialog.setSizePolicy(sizePolicy) - Dialog.setMinimumSize(QtCore.QSize(388, 103)) - Dialog.setMaximumSize(QtCore.QSize(388, 103)) - self.buttonBox = QtWidgets.QDialogButtonBox(Dialog) - self.buttonBox.setGeometry(QtCore.QRect(290, 30, 81, 241)) - self.buttonBox.setOrientation(QtCore.Qt.Orientation.Vertical) - self.buttonBox.setStandardButtons( - QtWidgets.QDialogButtonBox.StandardButton.Abort - | QtWidgets.QDialogButtonBox.StandardButton.Save - ) - self.buttonBox.setObjectName("buttonBox") - self.label = QtWidgets.QLabel(Dialog) - self.label.setGeometry(QtCore.QRect(10, 0, 281, 31)) - sizePolicy = QtWidgets.QSizePolicy( - QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Fixed - ) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth()) - self.label.setSizePolicy(sizePolicy) - font = QtGui.QFont() - font.setPointSize(10) - self.label.setFont(font) - self.label.setObjectName("label") - self.frame = QtWidgets.QFrame(Dialog) - self.frame.setGeometry(QtCore.QRect(10, 30, 241, 41)) - self.frame.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) - self.frame.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) - self.frame.setObjectName("frame") - self.line = QtWidgets.QFrame(self.frame) - self.line.setGeometry(QtCore.QRect(120, 0, 3, 61)) - self.line.setFrameShape(QtWidgets.QFrame.Shape.VLine) - self.line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken) - self.line.setObjectName("line") - self.rad_sommer = QtWidgets.QRadioButton(self.frame) - self.rad_sommer.setGeometry(QtCore.QRect(10, 10, 82, 21)) - self.rad_sommer.setObjectName("rad_sommer") - self.rad_winter = QtWidgets.QRadioButton(self.frame) - self.rad_winter.setGeometry(QtCore.QRect(140, 10, 82, 21)) - self.rad_winter.setObjectName("rad_winter") - self.sem_year = QtWidgets.QLineEdit(Dialog) - self.sem_year.setGeometry(QtCore.QRect(10, 70, 121, 20)) - self.sem_year.setObjectName("sem_year") - self.dauerapp = QtWidgets.QCheckBox(Dialog) - self.dauerapp.setGeometry(QtCore.QRect(150, 70, 91, 21)) - self.dauerapp.setObjectName("dauerapp") - - self.retranslateUi(Dialog) - self.buttonBox.accepted.connect(Dialog.accept) # type: ignore - self.buttonBox.rejected.connect(Dialog.reject) # type: ignore - QtCore.QMetaObject.connectSlotsByName(Dialog) - - def retranslateUi(self, Dialog): - _translate = QtCore.QCoreApplication.translate - Dialog.setWindowTitle(_translate("Dialog", "Dialog")) - self.label.setText( - _translate("Dialog", "Bis wann soll der Apparat verlängert werden?") - ) - self.rad_sommer.setText(_translate("Dialog", "Sommer")) - self.rad_winter.setText(_translate("Dialog", "Winter")) - self.sem_year.setPlaceholderText(_translate("Dialog", "2023")) - self.dauerapp.setText(_translate("Dialog", "Dauerapparat")) +class ApparatExtendDialog(QtWidgets.QDialog, Ui_Dialog): + def __init__( + self, + ): + super().__init__() + self.setupUi(self) + self.setWindowIcon(Icon("edit").icon) + self.setWindowTitle("Semesterapparat verlängern") + self.buttonBox.accepted.connect(self.accept) + self.buttonBox.rejected.connect(self.reject) def get_data(self): - # def __select_sem_state(): - # curr_month=QtCore.QDate.currentDate().month() - # if curr_month>=4 and curr_month<=9: - # return "SoSe" - # else: - # return "WiSe" - # if __select_sem_state()=="SoSe": - # self.rad_sommer.setChecked(True) - # else: - # self.rad_winter.setChecked(True) return { "semester": ( f"SoSe {int(self.sem_year.text()[-2:])}" diff --git a/src/ui/dialogs/dialog_sources/Ui_apparat_extend.py b/src/ui/dialogs/dialog_sources/Ui_apparat_extend.py new file mode 100644 index 0000000..06217ab --- /dev/null +++ b/src/ui/dialogs/dialog_sources/Ui_apparat_extend.py @@ -0,0 +1,74 @@ +# Form implementation generated from reading ui file 'c:\Users\aky547\GitHub\SemesterapparatsManager\src\ui\dialogs\dialog_sources\apparat_extend.ui' +# +# Created by: PyQt6 UI code generator 6.6.1 +# +# WARNING: Any manual changes made to this file will be lost when pyuic6 is +# run again. Do not edit this file unless you know what you are doing. + + +from PyQt6 import QtCore, QtGui, QtWidgets + + +class Ui_Dialog(object): + def setupUi(self, Dialog): + Dialog.setObjectName("Dialog") + Dialog.resize(388, 103) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(Dialog.sizePolicy().hasHeightForWidth()) + Dialog.setSizePolicy(sizePolicy) + Dialog.setMinimumSize(QtCore.QSize(388, 103)) + Dialog.setMaximumSize(QtCore.QSize(388, 103)) + self.buttonBox = QtWidgets.QDialogButtonBox(parent=Dialog) + self.buttonBox.setGeometry(QtCore.QRect(290, 30, 81, 241)) + self.buttonBox.setOrientation(QtCore.Qt.Orientation.Vertical) + self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Abort|QtWidgets.QDialogButtonBox.StandardButton.Save) + self.buttonBox.setObjectName("buttonBox") + self.label = QtWidgets.QLabel(parent=Dialog) + self.label.setGeometry(QtCore.QRect(10, 0, 281, 31)) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth()) + self.label.setSizePolicy(sizePolicy) + font = QtGui.QFont() + font.setPointSize(10) + self.label.setFont(font) + self.label.setObjectName("label") + self.frame = QtWidgets.QFrame(parent=Dialog) + self.frame.setGeometry(QtCore.QRect(10, 30, 241, 41)) + self.frame.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) + self.frame.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) + self.frame.setObjectName("frame") + self.line = QtWidgets.QFrame(parent=self.frame) + self.line.setGeometry(QtCore.QRect(120, 0, 3, 61)) + self.line.setFrameShape(QtWidgets.QFrame.Shape.VLine) + self.line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken) + self.line.setObjectName("line") + self.rad_sommer = QtWidgets.QRadioButton(parent=self.frame) + self.rad_sommer.setGeometry(QtCore.QRect(10, 10, 82, 21)) + self.rad_sommer.setObjectName("rad_sommer") + self.rad_winter = QtWidgets.QRadioButton(parent=self.frame) + self.rad_winter.setGeometry(QtCore.QRect(140, 10, 82, 21)) + self.rad_winter.setObjectName("rad_winter") + self.sem_year = QtWidgets.QLineEdit(parent=Dialog) + self.sem_year.setGeometry(QtCore.QRect(10, 70, 121, 20)) + self.sem_year.setObjectName("sem_year") + self.dauerapp = QtWidgets.QCheckBox(parent=Dialog) + self.dauerapp.setGeometry(QtCore.QRect(150, 70, 91, 21)) + self.dauerapp.setObjectName("dauerapp") + + self.retranslateUi(Dialog) + self.buttonBox.accepted.connect(Dialog.accept) # type: ignore + self.buttonBox.rejected.connect(Dialog.reject) # type: ignore + QtCore.QMetaObject.connectSlotsByName(Dialog) + + def retranslateUi(self, Dialog): + _translate = QtCore.QCoreApplication.translate + Dialog.setWindowTitle(_translate("Dialog", "Dialog")) + self.label.setText(_translate("Dialog", "Bis wann soll der Apparat verlängert werden?")) + self.rad_sommer.setText(_translate("Dialog", "Sommer")) + self.rad_winter.setText(_translate("Dialog", "Winter")) + self.sem_year.setPlaceholderText(_translate("Dialog", "2023")) + self.dauerapp.setText(_translate("Dialog", "Dauerapparat")) diff --git a/src/ui/dialogs/dialog_sources/Ui_edit_bookdata.py b/src/ui/dialogs/dialog_sources/Ui_edit_bookdata.py index 728cd17..1ed3024 100644 --- a/src/ui/dialogs/dialog_sources/Ui_edit_bookdata.py +++ b/src/ui/dialogs/dialog_sources/Ui_edit_bookdata.py @@ -1,6 +1,6 @@ -# Form implementation generated from reading ui file 'c:\Users\aky547\GitHub\Semesterapparate\ui\dialogs\edit_bookdata.ui' +# Form implementation generated from reading ui file 'c:\Users\aky547\GitHub\SemesterapparatsManager\src\ui\dialogs\dialog_sources\edit_bookdata.ui' # -# Created by: PyQt6 UI code generator 6.3.1 +# Created by: PyQt6 UI code generator 6.6.1 # # WARNING: Any manual changes made to this file will be lost when pyuic6 is # run again. Do not edit this file unless you know what you are doing. @@ -8,109 +8,97 @@ from PyQt6 import QtCore, QtGui, QtWidgets -from src.logic.dataclass import BookData - class Ui_Dialog(object): def setupUi(self, Dialog): - Dialog.setObjectName("Metadaten") + Dialog.setObjectName("Dialog") Dialog.resize(448, 572) - self.buttonBox = QtWidgets.QDialogButtonBox(Dialog) + self.buttonBox = QtWidgets.QDialogButtonBox(parent=Dialog) self.buttonBox.setGeometry(QtCore.QRect(260, 530, 161, 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(Dialog) + self.gridLayoutWidget = QtWidgets.QWidget(parent=Dialog) self.gridLayoutWidget.setGeometry(QtCore.QRect(0, 0, 441, 531)) self.gridLayoutWidget.setObjectName("gridLayoutWidget") self.gridLayout = QtWidgets.QGridLayout(self.gridLayoutWidget) - self.gridLayout.setSizeConstraint( - QtWidgets.QLayout.SizeConstraint.SetDefaultConstraint - ) + self.gridLayout.setSizeConstraint(QtWidgets.QLayout.SizeConstraint.SetDefaultConstraint) self.gridLayout.setContentsMargins(0, 0, 0, 0) self.gridLayout.setObjectName("gridLayout") - self.label_10 = QtWidgets.QLabel(self.gridLayoutWidget) + self.label_10 = QtWidgets.QLabel(parent=self.gridLayoutWidget) self.label_10.setObjectName("label_10") self.gridLayout.addWidget(self.label_10, 10, 1, 1, 1) - self.label = QtWidgets.QLabel(self.gridLayoutWidget) + self.label = QtWidgets.QLabel(parent=self.gridLayoutWidget) self.label.setObjectName("label") self.gridLayout.addWidget(self.label, 0, 1, 1, 1) - self.label_9 = QtWidgets.QLabel(self.gridLayoutWidget) + self.label_9 = QtWidgets.QLabel(parent=self.gridLayoutWidget) self.label_9.setObjectName("label_9") self.gridLayout.addWidget(self.label_9, 9, 1, 1, 1) - self.label_8 = QtWidgets.QLabel(self.gridLayoutWidget) + self.label_8 = QtWidgets.QLabel(parent=self.gridLayoutWidget) self.label_8.setObjectName("label_8") self.gridLayout.addWidget(self.label_8, 8, 1, 1, 1) - self.label_12 = QtWidgets.QLabel(self.gridLayoutWidget) + self.label_12 = QtWidgets.QLabel(parent=self.gridLayoutWidget) self.label_12.setObjectName("label_12") self.gridLayout.addWidget(self.label_12, 6, 1, 1, 1) - self.line_edition = QtWidgets.QLineEdit(self.gridLayoutWidget) + self.line_edition = QtWidgets.QLineEdit(parent=self.gridLayoutWidget) self.line_edition.setObjectName("line_edition") self.gridLayout.addWidget(self.line_edition, 2, 2, 1, 1) - self.label_3 = QtWidgets.QLabel(self.gridLayoutWidget) + self.label_3 = QtWidgets.QLabel(parent=self.gridLayoutWidget) self.label_3.setObjectName("label_3") self.gridLayout.addWidget(self.label_3, 2, 1, 1, 1) - self.label_4 = QtWidgets.QLabel(self.gridLayoutWidget) + self.label_4 = QtWidgets.QLabel(parent=self.gridLayoutWidget) self.label_4.setObjectName("label_4") self.gridLayout.addWidget(self.label_4, 3, 1, 1, 1) - self.line_link = QtWidgets.QLineEdit(self.gridLayoutWidget) + self.line_link = QtWidgets.QLineEdit(parent=self.gridLayoutWidget) self.line_link.setCursor(QtGui.QCursor(QtCore.Qt.CursorShape.ArrowCursor)) self.line_link.setReadOnly(True) self.line_link.setObjectName("line_link") self.gridLayout.addWidget(self.line_link, 6, 2, 1, 1) - self.label_5 = QtWidgets.QLabel(self.gridLayoutWidget) + self.label_5 = QtWidgets.QLabel(parent=self.gridLayoutWidget) self.label_5.setObjectName("label_5") self.gridLayout.addWidget(self.label_5, 4, 1, 1, 1) - self.label_7 = QtWidgets.QLabel(self.gridLayoutWidget) + self.label_7 = QtWidgets.QLabel(parent=self.gridLayoutWidget) self.label_7.setObjectName("label_7") self.gridLayout.addWidget(self.label_7, 7, 1, 1, 1) - self.label_6 = QtWidgets.QLabel(self.gridLayoutWidget) + self.label_6 = QtWidgets.QLabel(parent=self.gridLayoutWidget) self.label_6.setObjectName("label_6") self.gridLayout.addWidget(self.label_6, 5, 1, 1, 1) - self.label_2 = QtWidgets.QLabel(self.gridLayoutWidget) + self.label_2 = QtWidgets.QLabel(parent=self.gridLayoutWidget) self.label_2.setObjectName("label_2") self.gridLayout.addWidget(self.label_2, 1, 1, 1, 1) - spacerItem = QtWidgets.QSpacerItem( - 5, - 20, - QtWidgets.QSizePolicy.Policy.Fixed, - QtWidgets.QSizePolicy.Policy.Minimum, - ) + spacerItem = QtWidgets.QSpacerItem(5, 20, QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Minimum) self.gridLayout.addItem(spacerItem, 8, 0, 1, 1) - self.line_title = QtWidgets.QLineEdit(self.gridLayoutWidget) + self.line_title = QtWidgets.QLineEdit(parent=self.gridLayoutWidget) self.line_title.setObjectName("line_title") self.gridLayout.addWidget(self.line_title, 0, 2, 1, 1) - self.line_signature = QtWidgets.QLineEdit(self.gridLayoutWidget) + self.line_signature = QtWidgets.QLineEdit(parent=self.gridLayoutWidget) self.line_signature.setObjectName("line_signature") self.gridLayout.addWidget(self.line_signature, 1, 2, 1, 1) - self.line_author = QtWidgets.QLineEdit(self.gridLayoutWidget) + self.line_author = QtWidgets.QLineEdit(parent=self.gridLayoutWidget) self.line_author.setObjectName("line_author") self.gridLayout.addWidget(self.line_author, 3, 2, 1, 1) - self.line_lang = QtWidgets.QLineEdit(self.gridLayoutWidget) + self.line_lang = QtWidgets.QLineEdit(parent=self.gridLayoutWidget) self.line_lang.setObjectName("line_lang") self.gridLayout.addWidget(self.line_lang, 8, 2, 1, 1) - self.line_ppn = QtWidgets.QLineEdit(self.gridLayoutWidget) + self.line_ppn = QtWidgets.QLineEdit(parent=self.gridLayoutWidget) self.line_ppn.setObjectName("line_ppn") self.gridLayout.addWidget(self.line_ppn, 5, 2, 1, 1) - self.line_isbn = QtWidgets.QLineEdit(self.gridLayoutWidget) + self.line_isbn = QtWidgets.QLineEdit(parent=self.gridLayoutWidget) self.line_isbn.setObjectName("line_isbn") self.gridLayout.addWidget(self.line_isbn, 7, 2, 1, 1) - self.line_year = QtWidgets.QLineEdit(self.gridLayoutWidget) + self.line_year = QtWidgets.QLineEdit(parent=self.gridLayoutWidget) self.line_year.setObjectName("line_year") self.gridLayout.addWidget(self.line_year, 9, 2, 1, 1) - self.line_pages = QtWidgets.QLineEdit(self.gridLayoutWidget) + self.line_pages = QtWidgets.QLineEdit(parent=self.gridLayoutWidget) self.line_pages.setObjectName("line_pages") self.gridLayout.addWidget(self.line_pages, 10, 2, 1, 1) - self.line_publisher = QtWidgets.QLineEdit(self.gridLayoutWidget) + self.line_publisher = QtWidgets.QLineEdit(parent=self.gridLayoutWidget) self.line_publisher.setObjectName("line_publisher") self.gridLayout.addWidget(self.line_publisher, 4, 2, 1, 1) 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): @@ -127,31 +115,3 @@ class Ui_Dialog(object): self.label_7.setText(_translate("Dialog", "ISBN(s)")) self.label_6.setText(_translate("Dialog", "PPN")) self.label_2.setText(_translate("Dialog", "Signatur")) - - def populate_fields(self, data: BookData): - self.line_author.setText(data.author) - self.line_edition.setText(data.edition) - self.line_isbn.setText(", ".join(data.isbn)) - self.line_lang.setText(data.language) - self.line_link.setText(data.link) - self.line_pages.setText(data.pages) - self.line_ppn.setText(data.ppn) - self.line_publisher.setText(data.publisher) - self.line_signature.setText(data.signature) - self.line_title.setText(data.title) - self.line_year.setText(data.year) - - def get_data(self) -> BookData: - return BookData( - ppn=self.line_ppn.text().strip(), - title=self.line_title.text().strip(), - signature=self.line_signature.text().strip(), - edition=self.line_edition.text().strip(), - link=self.line_link.text().strip(), - isbn=self.line_isbn.text().split(","), - author=self.line_author.text().strip(), - language=self.line_lang.text().strip(), - publisher=self.line_publisher.text().strip(), - year=self.line_year.text().strip(), - pages=self.line_pages.text().strip(), - ) diff --git a/src/ui/dialogs/dialog_sources/Ui_login.py b/src/ui/dialogs/dialog_sources/Ui_login.py index ff7dcd0..397ccd5 100644 --- a/src/ui/dialogs/dialog_sources/Ui_login.py +++ b/src/ui/dialogs/dialog_sources/Ui_login.py @@ -13,13 +13,6 @@ class Ui_Dialog(object): def setupUi(self, Dialog): Dialog.setObjectName("Dialog") Dialog.resize(218, 190) - icon = QtGui.QIcon() - icon.addPixmap( - QtGui.QPixmap(":/icons/resources/1f510.svg"), - QtGui.QIcon.Mode.Normal, - QtGui.QIcon.State.Off, - ) - Dialog.setWindowIcon(icon) self.label = QtWidgets.QLabel(parent=Dialog) self.label.setGeometry(QtCore.QRect(20, 40, 71, 21)) self.label.setObjectName("label") diff --git a/src/ui/dialogs/dialog_sources/Ui_mail_preview.py b/src/ui/dialogs/dialog_sources/Ui_mail_preview.py index b28a790..781a67b 100644 --- a/src/ui/dialogs/dialog_sources/Ui_mail_preview.py +++ b/src/ui/dialogs/dialog_sources/Ui_mail_preview.py @@ -13,15 +13,6 @@ class Ui_eMailPreview(object): def setupUi(self, eMailPreview): eMailPreview.setObjectName("eMailPreview") eMailPreview.resize(700, 668) - icon = QtGui.QIcon() - icon.addPixmap( - QtGui.QPixmap( - "c:\\Users\\aky547\\GitHub\\SemesterapparatsManager\\src\\ui\\dialogs\\dialog_sources\\../../../../../../icons/email.svg" - ), - QtGui.QIcon.Mode.Normal, - QtGui.QIcon.State.Off, - ) - eMailPreview.setWindowIcon(icon) self.gridLayout_2 = QtWidgets.QGridLayout(eMailPreview) self.gridLayout_2.setObjectName("gridLayout_2") self.gridLayout = QtWidgets.QGridLayout() diff --git a/src/ui/dialogs/dialog_sources/Ui_medianadder.py b/src/ui/dialogs/dialog_sources/Ui_medianadder.py index 6cf9522..8d78301 100644 --- a/src/ui/dialogs/dialog_sources/Ui_medianadder.py +++ b/src/ui/dialogs/dialog_sources/Ui_medianadder.py @@ -7,13 +7,12 @@ from PyQt6 import QtCore, QtGui, QtWidgets -from src import Icon + class Ui_Dialog(object): def setupUi(self, Dialog): - # Dialog.setObjectName("Dialog") + Dialog.setObjectName("Dialog") Dialog.resize(620, 481) - self.label = QtWidgets.QLabel(parent=Dialog) self.label.setGeometry(QtCore.QRect(20, 10, 47, 21)) self.label.setObjectName("label") diff --git a/src/ui/dialogs/dialog_sources/Ui_newMailTemplateDesigner.py b/src/ui/dialogs/dialog_sources/Ui_newMailTemplateDesigner.py index b36190c..35b0d71 100644 --- a/src/ui/dialogs/dialog_sources/Ui_newMailTemplateDesigner.py +++ b/src/ui/dialogs/dialog_sources/Ui_newMailTemplateDesigner.py @@ -57,12 +57,7 @@ class Ui_Dialog(object): self.fontSize.addItem("") self.fontSize.addItem("") self.horizontalLayout_2.addWidget(self.fontSize) - 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_2.addItem(spacerItem) self.verticalLayout.addLayout(self.horizontalLayout_2) self.horizontalLayout_4 = QtWidgets.QHBoxLayout() @@ -75,9 +70,7 @@ class Ui_Dialog(object): self.gridLayout.addWidget(self.label, 0, 0, 1, 1) self.placeholder_list = QtWidgets.QComboBox(parent=Dialog) self.placeholder_list.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus) - self.placeholder_list.setSizeAdjustPolicy( - QtWidgets.QComboBox.SizeAdjustPolicy.AdjustToContents - ) + self.placeholder_list.setSizeAdjustPolicy(QtWidgets.QComboBox.SizeAdjustPolicy.AdjustToContents) self.placeholder_list.setObjectName("placeholder_list") self.placeholder_list.addItem("") self.placeholder_list.addItem("") @@ -115,22 +108,13 @@ class Ui_Dialog(object): self.testTemplate = QtWidgets.QPushButton(parent=Dialog) self.testTemplate.setObjectName("testTemplate") self.horizontalLayout_3.addWidget(self.testTemplate) - spacerItem1 = QtWidgets.QSpacerItem( - 40, - 20, - QtWidgets.QSizePolicy.Policy.Expanding, - QtWidgets.QSizePolicy.Policy.Minimum, - ) + spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_3.addItem(spacerItem1) self.verticalLayout.addLayout(self.horizontalLayout_3) self.verticalLayout_2.addLayout(self.verticalLayout) self.buttonBox = QtWidgets.QDialogButtonBox(parent=Dialog) self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal) - self.buttonBox.setStandardButtons( - QtWidgets.QDialogButtonBox.StandardButton.Cancel - | QtWidgets.QDialogButtonBox.StandardButton.Discard - | QtWidgets.QDialogButtonBox.StandardButton.Save - ) + self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Discard|QtWidgets.QDialogButtonBox.StandardButton.Save) self.buttonBox.setObjectName("buttonBox") self.verticalLayout_2.addWidget(self.buttonBox) @@ -174,8 +158,6 @@ class Ui_Dialog(object): self.placeholder_list.setItemText(4, _translate("Dialog", "«DozentName»")) self.placeholder_list.setItemText(5, _translate("Dialog", "«Signatur»")) self.label_2.setText(_translate("Dialog", "Beschreibung")) - self.insertPlaceholder.setText( - _translate("Dialog", "An aktiver Position einfügen") - ) + self.insertPlaceholder.setText(_translate("Dialog", "An aktiver Position einfügen")) self.label_3.setText(_translate("Dialog", "Betreff")) self.testTemplate.setText(_translate("Dialog", "Template testen")) diff --git a/src/ui/dialogs/dialog_sources/Ui_parsed_titles.py b/src/ui/dialogs/dialog_sources/Ui_parsed_titles.py index b18b94a..c76f3bc 100644 --- a/src/ui/dialogs/dialog_sources/Ui_parsed_titles.py +++ b/src/ui/dialogs/dialog_sources/Ui_parsed_titles.py @@ -38,12 +38,7 @@ 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)) @@ -59,9 +54,7 @@ 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) @@ -70,10 +63,7 @@ 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)) diff --git a/src/ui/dialogs/dialog_sources/Ui_reminder.py b/src/ui/dialogs/dialog_sources/Ui_reminder.py index 8eec524..f58a243 100644 --- a/src/ui/dialogs/dialog_sources/Ui_reminder.py +++ b/src/ui/dialogs/dialog_sources/Ui_reminder.py @@ -1,43 +1,39 @@ -# Form implementation generated from reading ui file 'c:\Users\aky547\GitHub\SemesterapparatsManager\src\ui\dialogs\reminder.ui' +# Form implementation generated from reading ui file 'c:\Users\aky547\GitHub\SemesterapparatsManager\src\ui\dialogs\dialog_sources\reminder.ui' # -# Created by: PyQt6 UI code generator 6.3.1 +# Created by: PyQt6 UI code generator 6.6.1 # # WARNING: Any manual changes made to this file will be lost when pyuic6 is # run again. Do not edit this file unless you know what you are doing. from PyQt6 import QtCore, QtGui, QtWidgets -from src import Icon -class Ui_Dialog(object): + +class Ui_Erinnerung(object): def setupUi(self, Erinnerung): Erinnerung.setObjectName("Erinnerung") - Erinnerung.resize(369, 308) - Erinnerung.setWindowIcon(Icon("notification").icon) - self.buttonBox = QtWidgets.QDialogButtonBox(Erinnerung) + Erinnerung.resize(358, 308) + self.buttonBox = QtWidgets.QDialogButtonBox(parent=Erinnerung) self.buttonBox.setGeometry(QtCore.QRect(190, 270, 161, 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.message_box = QtWidgets.QTextEdit(Erinnerung) + self.message_box = QtWidgets.QTextEdit(parent=Erinnerung) self.message_box.setGeometry(QtCore.QRect(10, 60, 341, 201)) self.message_box.setObjectName("message_box") - self.label = QtWidgets.QLabel(Erinnerung) + self.label = QtWidgets.QLabel(parent=Erinnerung) self.label.setGeometry(QtCore.QRect(10, 30, 61, 21)) self.label.setObjectName("label") - self.label_2 = QtWidgets.QLabel(Erinnerung) - self.label_2.setGeometry(QtCore.QRect(150, 30, 81, 21)) + self.label_2 = QtWidgets.QLabel(parent=Erinnerung) + self.label_2.setGeometry(QtCore.QRect(120, 30, 81, 21)) self.label_2.setObjectName("label_2") - self.dateEdit = QtWidgets.QDateEdit(Erinnerung) - self.dateEdit.setGeometry(QtCore.QRect(240, 30, 110, 22)) + self.dateEdit = QtWidgets.QDateEdit(parent=Erinnerung) + self.dateEdit.setGeometry(QtCore.QRect(210, 30, 141, 22)) self.dateEdit.setObjectName("dateEdit") - self.dateEdit.setDate(QtCore.QDate.currentDate()) + self.retranslateUi(Erinnerung) - self.buttonBox.accepted.connect(Erinnerung.accept) # type: ignore - self.buttonBox.rejected.connect(Erinnerung.reject) # type: ignore + self.buttonBox.accepted.connect(Erinnerung.accept) # type: ignore + self.buttonBox.rejected.connect(Erinnerung.reject) # type: ignore QtCore.QMetaObject.connectSlotsByName(Erinnerung) def retranslateUi(self, Erinnerung): @@ -45,9 +41,3 @@ class Ui_Dialog(object): Erinnerung.setWindowTitle(_translate("Erinnerung", "Dialog")) self.label.setText(_translate("Erinnerung", "Nachricht:")) self.label_2.setText(_translate("Erinnerung", "Erinnerung am:")) - - def return_message(self) -> dict: - return { - "message": self.message_box.toPlainText(), - "remind_at": self.dateEdit.date().toString("yyyy-MM-dd"), - } diff --git a/src/ui/dialogs/dialog_sources/Ui_settings.py b/src/ui/dialogs/dialog_sources/Ui_settings.py index 870ac57..948abe5 100644 --- a/src/ui/dialogs/dialog_sources/Ui_settings.py +++ b/src/ui/dialogs/dialog_sources/Ui_settings.py @@ -16,10 +16,7 @@ class Ui_Dialog(object): self.buttonBox = QtWidgets.QDialogButtonBox(parent=Dialog) self.buttonBox.setGeometry(QtCore.QRect(120, 540, 621, 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.frame = QtWidgets.QFrame(parent=Dialog) self.frame.setGeometry(QtCore.QRect(0, 0, 751, 541)) @@ -57,12 +54,7 @@ class Ui_Dialog(object): self.tb_set_save_path = QtWidgets.QToolButton(parent=self.formLayoutWidget) self.tb_set_save_path.setObjectName("tb_set_save_path") self.gridLayout.addWidget(self.tb_set_save_path, 2, 2, 1, 1) - spacerItem = QtWidgets.QSpacerItem( - 20, - 40, - QtWidgets.QSizePolicy.Policy.Minimum, - QtWidgets.QSizePolicy.Policy.Expanding, - ) + spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) self.gridLayout.addItem(spacerItem, 3, 1, 1, 1) self.label_5 = QtWidgets.QLabel(parent=self.formLayoutWidget) self.label_5.setObjectName("label_5") @@ -85,9 +77,7 @@ class Ui_Dialog(object): self.label_8 = QtWidgets.QLabel(parent=self.formLayoutWidget_2) self.label_8.setObjectName("label_8") self.gridLayout_2.addWidget(self.label_8, 3, 0, 1, 1) - self.use_username_smtp_login = QtWidgets.QCheckBox( - parent=self.formLayoutWidget_2 - ) + self.use_username_smtp_login = QtWidgets.QCheckBox(parent=self.formLayoutWidget_2) self.use_username_smtp_login.setTristate(False) self.use_username_smtp_login.setObjectName("use_username_smtp_login") self.gridLayout_2.addWidget(self.use_username_smtp_login, 4, 1, 1, 1) @@ -96,10 +86,7 @@ class Ui_Dialog(object): self.mail_username.setObjectName("mail_username") self.gridLayout_2.addWidget(self.mail_username, 3, 1, 1, 1) self.smtp_port = QtWidgets.QLineEdit(parent=self.formLayoutWidget_2) - self.smtp_port.setInputMethodHints( - QtCore.Qt.InputMethodHint.ImhDigitsOnly - | QtCore.Qt.InputMethodHint.ImhPreferNumbers - ) + self.smtp_port.setInputMethodHints(QtCore.Qt.InputMethodHint.ImhDigitsOnly|QtCore.Qt.InputMethodHint.ImhPreferNumbers) self.smtp_port.setClearButtonEnabled(True) self.smtp_port.setObjectName("smtp_port") self.gridLayout_2.addWidget(self.smtp_port, 1, 1, 1, 1) @@ -114,9 +101,7 @@ class Ui_Dialog(object): self.label_9.setObjectName("label_9") self.gridLayout_2.addWidget(self.label_9, 6, 0, 1, 1) self.sender_email = QtWidgets.QLineEdit(parent=self.formLayoutWidget_2) - self.sender_email.setInputMethodHints( - QtCore.Qt.InputMethodHint.ImhEmailCharactersOnly - ) + self.sender_email.setInputMethodHints(QtCore.Qt.InputMethodHint.ImhEmailCharactersOnly) self.sender_email.setClearButtonEnabled(True) self.sender_email.setObjectName("sender_email") self.gridLayout_2.addWidget(self.sender_email, 2, 1, 1, 1) @@ -124,10 +109,7 @@ class Ui_Dialog(object): self.label.setObjectName("label") self.gridLayout_2.addWidget(self.label, 0, 0, 1, 1) self.password = QtWidgets.QLineEdit(parent=self.formLayoutWidget_2) - self.password.setInputMethodHints( - QtCore.Qt.InputMethodHint.ImhHiddenText - | QtCore.Qt.InputMethodHint.ImhSensitiveData - ) + self.password.setInputMethodHints(QtCore.Qt.InputMethodHint.ImhHiddenText|QtCore.Qt.InputMethodHint.ImhSensitiveData) self.password.setClearButtonEnabled(True) self.password.setObjectName("password") self.gridLayout_2.addWidget(self.password, 5, 1, 1, 1) @@ -150,12 +132,7 @@ class Ui_Dialog(object): self.verticalLayout.setObjectName("verticalLayout") self.horizontalLayout_3 = QtWidgets.QHBoxLayout() self.horizontalLayout_3.setObjectName("horizontalLayout_3") - spacerItem1 = QtWidgets.QSpacerItem( - 40, - 20, - QtWidgets.QSizePolicy.Policy.Expanding, - QtWidgets.QSizePolicy.Policy.Minimum, - ) + spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_3.addItem(spacerItem1) self.bold = QtWidgets.QPushButton(parent=self.verticalLayoutWidget) self.bold.setCheckable(True) @@ -169,12 +146,7 @@ class Ui_Dialog(object): self.underscore.setCheckable(True) self.underscore.setObjectName("underscore") self.horizontalLayout_3.addWidget(self.underscore) - spacerItem2 = QtWidgets.QSpacerItem( - 40, - 20, - QtWidgets.QSizePolicy.Policy.Expanding, - QtWidgets.QSizePolicy.Policy.Minimum, - ) + spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_3.addItem(spacerItem2) self.verticalLayout.addLayout(self.horizontalLayout_3) self.horizontalLayout = QtWidgets.QHBoxLayout() @@ -200,12 +172,7 @@ class Ui_Dialog(object): self.font_size.addItem("") self.font_size.addItem("") self.horizontalLayout.addWidget(self.font_size) - spacerItem3 = QtWidgets.QSpacerItem( - 40, - 20, - QtWidgets.QSizePolicy.Policy.Expanding, - QtWidgets.QSizePolicy.Policy.Minimum, - ) + spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout.addItem(spacerItem3) self.verticalLayout.addLayout(self.horizontalLayout) self.editSignature = QtWidgets.QTextEdit(parent=self.email_settingsPage2_2) @@ -221,8 +188,8 @@ class Ui_Dialog(object): self.retranslateUi(Dialog) self.email_settings.setCurrentIndex(0) - 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) Dialog.setTabOrder(self.db_name, self.db_path) Dialog.setTabOrder(self.db_path, self.save_path) @@ -232,44 +199,23 @@ class Ui_Dialog(object): Dialog.setWindowTitle(_translate("Dialog", "Dialog")) self.label_2.setText(_translate("Dialog", "Allgemeine Einstellungen")) self.tb_select_db.setText(_translate("Dialog", "...")) - self.label_3.setToolTip( - _translate( - "Dialog", - '

Name der Datenbank, welche verwendet werden soll. Muss auf .db enden

', - ) - ) + self.label_3.setToolTip(_translate("Dialog", "

Name der Datenbank, welche verwendet werden soll. Muss auf .db enden

")) self.label_3.setText(_translate("Dialog", "Datenbankname")) self.db_name.setText(_translate("Dialog", "sap.db")) self.label_4.setText(_translate("Dialog", "Datenbankpfad")) self.tb_set_save_path.setText(_translate("Dialog", "...")) - self.label_5.setToolTip( - _translate( - "Dialog", - "Pfad, an dem heruntergeladene Dateien gespeichert werden sollen", - ) - ) + self.label_5.setToolTip(_translate("Dialog", "Pfad, an dem heruntergeladene Dateien gespeichert werden sollen")) self.label_5.setText(_translate("Dialog", "Temporäre Dateien")) self.label_8.setText(_translate("Dialog", "Nutzername")) - self.use_username_smtp_login.setStatusTip( - _translate( - "Dialog", - "Anklicken, wenn Nutzername benötigt wird, um sich beim Server anzumelden", - ) - ) - self.use_username_smtp_login.setText( - _translate("Dialog", "Nutzername zum\n" " Anmelden verwenden") - ) - self.mail_username.setStatusTip( - _translate("Dialog", "Kürzel, von der Hochschule vergeben, bsp: Aky547") - ) + self.use_username_smtp_login.setStatusTip(_translate("Dialog", "Anklicken, wenn Nutzername benötigt wird, um sich beim Server anzumelden")) + self.use_username_smtp_login.setText(_translate("Dialog", "Nutzername zum\n" +" Anmelden verwenden")) + self.mail_username.setStatusTip(_translate("Dialog", "Kürzel, von der Hochschule vergeben, bsp: Aky547")) self.label_10.setText(_translate("Dialog", "Passwort")) self.label_7.setText(_translate("Dialog", "Sender-eMail")) self.label.setText(_translate("Dialog", "SMTP-Server")) self.label_6.setText(_translate("Dialog", "Port")) - self.email_settings.setTabText( - self.email_settings.indexOf(self.email_settingsPage1_2), - _translate("Dialog", "Allgemeines"), - ) + self.email_settings.setTabText(self.email_settings.indexOf(self.email_settingsPage1_2), _translate("Dialog", "Allgemeines")) self.bold.setText(_translate("Dialog", "Fett")) self.italic.setText(_translate("Dialog", "Kursiv")) self.underscore.setText(_translate("Dialog", "Unterstrichen")) @@ -289,7 +235,4 @@ class Ui_Dialog(object): self.font_size.setItemText(13, _translate("Dialog", "48")) self.font_size.setItemText(14, _translate("Dialog", "72")) self.debug.setText(_translate("Dialog", "Debug")) - self.email_settings.setTabText( - self.email_settings.indexOf(self.email_settingsPage2_2), - _translate("Dialog", "Signatur"), - ) + self.email_settings.setTabText(self.email_settings.indexOf(self.email_settingsPage2_2), _translate("Dialog", "Signatur")) diff --git a/src/ui/dialogs/dialog_sources/elsa_add_table_entry.ui b/src/ui/dialogs/dialog_sources/elsa_add_table_entry.ui index 9ee7d46..4b67b33 100644 --- a/src/ui/dialogs/dialog_sources/elsa_add_table_entry.ui +++ b/src/ui/dialogs/dialog_sources/elsa_add_table_entry.ui @@ -113,113 +113,233 @@ 0 - - - - - Ort - - - - - - - Auflage - - - - - - - Signatur - - - - - - - - - - Seiten - - - - - - - - - - - - - Verlag - - - - - - - Autor(en) + + + + 129 + 20 + 133 + 22 + + + + Bei mehreren Autoren mit ; trennen + + + + + + 129 + 195 + 133 + 22 + + + + + + + 9 + 161 + 17 + 16 + + + + Ort + + + + + + 129 + 263 + 133 + 22 + + + + + + + 129 + 93 + 133 + 22 + + + + + + + 9 + 263 + 32 + 16 + + + + Seiten + + + + + + 129 + 127 + 133 + 22 + + + + + + + 9 + 195 + 32 + 16 + + + + Verlag + + + + + + 9 + 229 + 44 + 16 + + + + Signatur + + + + + + 129 + 59 + 133 + 22 + + + + + + + 129 + 161 + 133 + 22 + + + + + + + 9 + 93 + 41 + 16 + + + + Auflage + + + + + + 9 + 15 + 114 + 32 + + + + Autor(en) Nachname, Vorname - - - - - - - - - - ISBN - - - - - - - Bei mehreren Autoren mit ; trennen - - - - - - - - - - - - - - - - Titel - - - - - - - Jahr - - - - - - - - - - - - - true - - - - + + + + + + 9 + 59 + 21 + 16 + + + + Jahr + + + + + + 129 + 229 + 133 + 22 + + + + + + + 9 + 127 + 22 + 16 + + + + Titel + + + + + + 9 + 297 + 25 + 16 + + + + ISBN + + + + + + 129 + 297 + 133 + 22 + + + + + + + 479 + 263 + 23 + 22 + + + + + + + true + + diff --git a/src/ui/dialogs/dialog_sources/reminder.ui b/src/ui/dialogs/dialog_sources/reminder.ui index 0a945c7..88aa810 100644 --- a/src/ui/dialogs/dialog_sources/reminder.ui +++ b/src/ui/dialogs/dialog_sources/reminder.ui @@ -6,7 +6,7 @@ 0 0 - 369 + 358 308 @@ -55,7 +55,7 @@ - 150 + 120 30 81 21 @@ -68,9 +68,9 @@ - 240 + 210 30 - 110 + 141 22 diff --git a/src/ui/dialogs/login.py b/src/ui/dialogs/login.py index 2f2c3d1..21d5147 100644 --- a/src/ui/dialogs/login.py +++ b/src/ui/dialogs/login.py @@ -15,7 +15,7 @@ class LoginDialog(Ui_Dialog): Dialog.setObjectName("Dialog") Dialog.resize(218, 190) self.dialog = Dialog - Dialog.setWindowIcon(Icon("locked").icon) + self.dialog.setWindowIcon(Icon("locked").icon) self.login_button = QtWidgets.QPushButton(parent=Dialog) self.login_button.setGeometry(QtCore.QRect(30, 140, 76, 32)) self.login_button.setObjectName("login_button") diff --git a/src/ui/dialogs/mail.py b/src/ui/dialogs/mail.py index 6ebcc21..ce61f2f 100644 --- a/src/ui/dialogs/mail.py +++ b/src/ui/dialogs/mail.py @@ -99,7 +99,8 @@ Tel.: 0761/682-778""" return f"Sehr geehrte Frau {prof}," elif self.gender_non.isChecked(): self.btn_okay.setEnabled(True) - return f"Guten Tag {prof}," + name = f"{self.profname.split(" ")[1]} {self.profname.split(" ")[0]}" + return f"Guten Tag {name}," def set_mail(self): logger.log_info("Setting mail") diff --git a/src/ui/dialogs/reminder.py b/src/ui/dialogs/reminder.py index 1e5e029..c357f8b 100644 --- a/src/ui/dialogs/reminder.py +++ b/src/ui/dialogs/reminder.py @@ -1,13 +1,14 @@ from PyQt6 import QtWidgets -from .dialog_sources.Ui_reminder import Ui_Dialog +from .dialog_sources.Ui_reminder import Ui_Erinnerung as Ui_Dialog from src import Icon class ReminderDialog(QtWidgets.QDialog, Ui_Dialog): def __init__(self, parent=None): super().__init__(parent) self.setupUi(self) - + self.setWindowIcon(Icon("notification").icon) + self.setWindowTitle("Erinnerung") def return_message(self) -> dict: return { "message": self.message_box.toPlainText(), diff --git a/src/ui/widgets/widget_sources/Ui_calendar_entry.py b/src/ui/widgets/widget_sources/Ui_calendar_entry.py index dfe417d..9ffad15 100644 --- a/src/ui/widgets/widget_sources/Ui_calendar_entry.py +++ b/src/ui/widgets/widget_sources/Ui_calendar_entry.py @@ -1,4 +1,4 @@ -# Form implementation generated from reading ui file 'c:\Users\aky547\GitHub\SemesterapparatsManager\src\ui\dialogs\dialog_sources\calendar_entry.ui' +# Form implementation generated from reading ui file 'c:\Users\aky547\GitHub\SemesterapparatsManager\src\ui\widgets\widget_sources\calendar_entry.ui' # # Created by: PyQt6 UI code generator 6.6.1 #