small changes, update icon code

src/ui/dialogs/dialog_sources/Ui_mail_preview.py

@@ -12,99 +12,87 @@ from PyQt6 import QtCore, QtGui, QtWidgets
 class Ui_eMailPreview(object):
     def setupUi(self, eMailPreview):
         eMailPreview.setObjectName("eMailPreview")
-        eMailPreview.resize(676, 676)
+        eMailPreview.resize(700, 668)
         icon = QtGui.QIcon()
-        icon.addPixmap(
+        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)
-            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.buttonBox = QtWidgets.QDialogButtonBox(parent=eMailPreview)
+        self.gridLayout_2 = QtWidgets.QGridLayout(eMailPreview)
-        self.buttonBox.setGeometry(QtCore.QRect(310, 630, 341, 32))
+        self.gridLayout_2.setObjectName("gridLayout_2")
-        self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal)
+        self.gridLayout = QtWidgets.QGridLayout()
-        self.buttonBox.setStandardButtons(
-            QtWidgets.QDialogButtonBox.StandardButton.Cancel
-        )
-        self.buttonBox.setObjectName("buttonBox")
-        self.gridLayoutWidget = QtWidgets.QWidget(parent=eMailPreview)
-        self.gridLayoutWidget.setGeometry(QtCore.QRect(10, 10, 661, 621))
-        self.gridLayoutWidget.setObjectName("gridLayoutWidget")
-        self.gridLayout = QtWidgets.QGridLayout(self.gridLayoutWidget)
-        self.gridLayout.setContentsMargins(0, 0, 0, 0)
         self.gridLayout.setObjectName("gridLayout")
-        self.prof_name = QtWidgets.QLineEdit(parent=self.gridLayoutWidget)
+        self.prof_name = QtWidgets.QLineEdit(parent=eMailPreview)
         self.prof_name.setObjectName("prof_name")
         self.gridLayout.addWidget(self.prof_name, 2, 2, 1, 1)
-        self.label_6 = QtWidgets.QLabel(parent=self.gridLayoutWidget)
+        self.newTemplate = QtWidgets.QPushButton(parent=eMailPreview)
-        self.label_6.setObjectName("label_6")
-        self.gridLayout.addWidget(self.label_6, 4, 0, 1, 1)
-        self.comboBox = QtWidgets.QComboBox(parent=self.gridLayoutWidget)
-        self.comboBox.setObjectName("comboBox")
-        self.gridLayout.addWidget(self.comboBox, 0, 2, 1, 1)
-        self.label_5 = QtWidgets.QLabel(parent=self.gridLayoutWidget)
-        self.label_5.setObjectName("label_5")
-        self.gridLayout.addWidget(self.label_5, 0, 0, 1, 1)
-        self.label_2 = QtWidgets.QLabel(parent=self.gridLayoutWidget)
-        self.label_2.setObjectName("label_2")
-        self.gridLayout.addWidget(self.label_2, 2, 0, 1, 1)
-        self.mail_header = QtWidgets.QLineEdit(parent=self.gridLayoutWidget)
-        self.mail_header.setObjectName("mail_header")
-        self.gridLayout.addWidget(self.mail_header, 3, 2, 1, 1)
-        self.label = QtWidgets.QLabel(parent=self.gridLayoutWidget)
-        self.label.setObjectName("label")
-        self.gridLayout.addWidget(self.label, 1, 0, 1, 1)
-        self.mail_body = QtWidgets.QTextEdit(parent=self.gridLayoutWidget)
-        self.mail_body.setObjectName("mail_body")
-        self.gridLayout.addWidget(self.mail_body, 5, 2, 1, 1)
-        self.label_3 = QtWidgets.QLabel(parent=self.gridLayoutWidget)
-        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(parent=self.gridLayoutWidget)
-        self.mail_name.setObjectName("mail_name")
-        self.gridLayout.addWidget(self.mail_name, 1, 2, 1, 1)
-        self.label_4 = QtWidgets.QLabel(parent=self.gridLayoutWidget)
-        self.label_4.setObjectName("label_4")
-        self.gridLayout.addWidget(self.label_4, 3, 0, 1, 1)
-        self.horizontalLayout_3 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_3.setObjectName("horizontalLayout_3")
-        self.gender_male = QtWidgets.QRadioButton(parent=self.gridLayoutWidget)
-        self.gender_male.setObjectName("gender_male")
-        self.horizontalLayout_3.addWidget(self.gender_male)
-        self.gender_female = QtWidgets.QRadioButton(parent=self.gridLayoutWidget)
-        self.gender_female.setObjectName("gender_female")
-        self.horizontalLayout_3.addWidget(self.gender_female)
-        self.gender_non = QtWidgets.QRadioButton(parent=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,
-        )
-        self.horizontalLayout_3.addItem(spacerItem)
-        self.gridLayout.addLayout(self.horizontalLayout_3, 4, 2, 1, 1)
-        self.newTemplate = QtWidgets.QPushButton(parent=self.gridLayoutWidget)
         self.newTemplate.setAutoFillBackground(False)
         self.newTemplate.setText("")
         self.newTemplate.setIconSize(QtCore.QSize(24, 24))
         self.newTemplate.setAutoDefault(True)
         self.newTemplate.setDefault(False)
-        self.newTemplate.setFlat(True)
+        self.newTemplate.setFlat(False)
         self.newTemplate.setObjectName("newTemplate")
         self.gridLayout.addWidget(self.newTemplate, 0, 3, 1, 1)
+        self.comboBox = QtWidgets.QComboBox(parent=eMailPreview)
+        self.comboBox.setObjectName("comboBox")
+        self.gridLayout.addWidget(self.comboBox, 0, 2, 1, 1)
+        self.mail_header = QtWidgets.QLineEdit(parent=eMailPreview)
+        self.mail_header.setObjectName("mail_header")
+        self.gridLayout.addWidget(self.mail_header, 3, 2, 1, 1)
+        self.label_6 = QtWidgets.QLabel(parent=eMailPreview)
+        self.label_6.setObjectName("label_6")
+        self.gridLayout.addWidget(self.label_6, 4, 0, 1, 1)
+        self.mail_body = QtWidgets.QTextEdit(parent=eMailPreview)
+        self.mail_body.setObjectName("mail_body")
+        self.gridLayout.addWidget(self.mail_body, 5, 2, 1, 1)
+        self.label_2 = QtWidgets.QLabel(parent=eMailPreview)
+        self.label_2.setObjectName("label_2")
+        self.gridLayout.addWidget(self.label_2, 2, 0, 1, 1)
+        self.mail_name = QtWidgets.QLineEdit(parent=eMailPreview)
+        self.mail_name.setObjectName("mail_name")
+        self.gridLayout.addWidget(self.mail_name, 1, 2, 1, 1)
+        self.label_5 = QtWidgets.QLabel(parent=eMailPreview)
+        self.label_5.setObjectName("label_5")
+        self.gridLayout.addWidget(self.label_5, 0, 0, 1, 1)
+        self.label_4 = QtWidgets.QLabel(parent=eMailPreview)
+        self.label_4.setObjectName("label_4")
+        self.gridLayout.addWidget(self.label_4, 3, 0, 1, 1)
+        self.horizontalLayout_3 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_3.setObjectName("horizontalLayout_3")
+        self.gender_male = QtWidgets.QRadioButton(parent=eMailPreview)
+        self.gender_male.setObjectName("gender_male")
+        self.horizontalLayout_3.addWidget(self.gender_male)
+        self.gender_female = QtWidgets.QRadioButton(parent=eMailPreview)
+        self.gender_female.setObjectName("gender_female")
+        self.horizontalLayout_3.addWidget(self.gender_female)
+        self.gender_non = QtWidgets.QRadioButton(parent=eMailPreview)
+        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)
+        self.horizontalLayout_3.addItem(spacerItem)
+        self.gridLayout.addLayout(self.horizontalLayout_3, 4, 2, 1, 1)
+        self.label_3 = QtWidgets.QLabel(parent=eMailPreview)
+        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.label = QtWidgets.QLabel(parent=eMailPreview)
+        self.label.setObjectName("label")
+        self.gridLayout.addWidget(self.label, 1, 0, 1, 1)
+        self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
+        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        self.horizontalLayout_2.addItem(spacerItem1)
         self.btn_okay = QtWidgets.QPushButton(parent=eMailPreview)
-        self.btn_okay.setGeometry(QtCore.QRect(487, 634, 75, 24))
         self.btn_okay.setStatusTip("")
         self.btn_okay.setObjectName("btn_okay")
+        self.horizontalLayout_2.addWidget(self.btn_okay)
+        self.buttonBox = QtWidgets.QDialogButtonBox(parent=eMailPreview)
+        self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal)
+        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel)
+        self.buttonBox.setCenterButtons(True)
+        self.buttonBox.setObjectName("buttonBox")
+        self.horizontalLayout_2.addWidget(self.buttonBox)
+        self.gridLayout.addLayout(self.horizontalLayout_2, 6, 2, 1, 1)
+        self.gridLayout_2.addLayout(self.gridLayout, 0, 0, 1, 1)
 
         self.retranslateUi(eMailPreview)
         self.buttonBox.accepted.connect(eMailPreview.accept) # type: ignore
@@ -115,13 +103,13 @@ class Ui_eMailPreview(object):
         _translate = QtCore.QCoreApplication.translate
         eMailPreview.setWindowTitle(_translate("eMailPreview", "eMail Voransicht"))
         self.label_6.setText(_translate("eMailPreview", "Geschlecht"))
-        self.label_5.setText(_translate("eMailPreview", "Art"))
         self.label_2.setText(_translate("eMailPreview", "Prof"))
-        self.label.setText(_translate("eMailPreview", "eMail"))
+        self.label_5.setText(_translate("eMailPreview", "Art"))
-        self.label_3.setText(_translate("eMailPreview", "Mail"))
         self.label_4.setText(_translate("eMailPreview", "Betreff"))
         self.gender_male.setText(_translate("eMailPreview", "M"))
         self.gender_female.setText(_translate("eMailPreview", "W"))
         self.gender_non.setText(_translate("eMailPreview", "Divers"))
+        self.label_3.setText(_translate("eMailPreview", "Mail"))
+        self.label.setText(_translate("eMailPreview", "eMail"))
         self.btn_okay.setWhatsThis(_translate("eMailPreview", "test"))
         self.btn_okay.setText(_translate("eMailPreview", "Senden"))

src/ui/dialogs/dialog_sources/Ui_newMailTemplateDesigner.py

@@ -20,18 +20,26 @@ class Ui_Dialog(object):
         self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_2.setObjectName("horizontalLayout_2")
         self.bold = QtWidgets.QPushButton(parent=Dialog)
+        self.bold.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
+        self.bold.setCheckable(True)
         self.bold.setObjectName("bold")
         self.horizontalLayout_2.addWidget(self.bold)
         self.italic = QtWidgets.QPushButton(parent=Dialog)
+        self.italic.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
+        self.italic.setCheckable(True)
         self.italic.setObjectName("italic")
         self.horizontalLayout_2.addWidget(self.italic)
         self.underlined = QtWidgets.QPushButton(parent=Dialog)
+        self.underlined.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
+        self.underlined.setCheckable(True)
         self.underlined.setObjectName("underlined")
         self.horizontalLayout_2.addWidget(self.underlined)
-        self.font = QtWidgets.QFontComboBox(parent=Dialog)
+        self.fontBox = QtWidgets.QFontComboBox(parent=Dialog)
-        self.font.setObjectName("font")
+        self.fontBox.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
-        self.horizontalLayout_2.addWidget(self.font)
+        self.fontBox.setObjectName("fontBox")
+        self.horizontalLayout_2.addWidget(self.fontBox)
         self.fontSize = QtWidgets.QComboBox(parent=Dialog)
+        self.fontSize.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
         self.fontSize.setObjectName("fontSize")
         self.fontSize.addItem("")
         self.fontSize.addItem("")
@@ -49,12 +57,7 @@ class Ui_Dialog(object):
         self.fontSize.addItem("")
         self.fontSize.addItem("")
         self.horizontalLayout_2.addWidget(self.fontSize)
-        spacerItem = QtWidgets.QSpacerItem(
+        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
-            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()
@@ -65,30 +68,38 @@ class Ui_Dialog(object):
         self.label = QtWidgets.QLabel(parent=Dialog)
         self.label.setObjectName("label")
         self.gridLayout.addWidget(self.label, 0, 0, 1, 1)
-        self.comboBox_2 = QtWidgets.QComboBox(parent=Dialog)
+        self.placeholder_list = QtWidgets.QComboBox(parent=Dialog)
-        self.comboBox_2.setSizeAdjustPolicy(
+        self.placeholder_list.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
-            QtWidgets.QComboBox.SizeAdjustPolicy.AdjustToContents
+        self.placeholder_list.setSizeAdjustPolicy(QtWidgets.QComboBox.SizeAdjustPolicy.AdjustToContents)
-        )
+        self.placeholder_list.setObjectName("placeholder_list")
-        self.comboBox_2.setObjectName("comboBox_2")
+        self.placeholder_list.addItem("")
-        self.comboBox_2.addItem("")
+        self.placeholder_list.addItem("")
-        self.comboBox_2.addItem("")
+        self.placeholder_list.addItem("")
-        self.comboBox_2.addItem("")
+        self.placeholder_list.addItem("")
-        self.comboBox_2.addItem("")
+        self.placeholder_list.addItem("")
-        self.comboBox_2.addItem("")
+        self.placeholder_list.addItem("")
-        self.comboBox_2.addItem("")
+        self.gridLayout.addWidget(self.placeholder_list, 1, 0, 1, 1)
-        self.gridLayout.addWidget(self.comboBox_2, 1, 0, 1, 1)
         self.label_2 = QtWidgets.QLabel(parent=Dialog)
         self.label_2.setObjectName("label_2")
         self.gridLayout.addWidget(self.label_2, 0, 1, 1, 1)
         self.lineEdit = QtWidgets.QLineEdit(parent=Dialog)
+        self.lineEdit.setEnabled(True)
+        self.lineEdit.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
         self.lineEdit.setFrame(False)
         self.lineEdit.setReadOnly(True)
         self.lineEdit.setObjectName("lineEdit")
         self.gridLayout.addWidget(self.lineEdit, 1, 1, 1, 1)
         self.insertPlaceholder = QtWidgets.QPushButton(parent=Dialog)
+        self.insertPlaceholder.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
         self.insertPlaceholder.setObjectName("insertPlaceholder")
         self.gridLayout.addWidget(self.insertPlaceholder, 1, 2, 1, 1)
         self.verticalLayout.addLayout(self.gridLayout)
+        self.label_3 = QtWidgets.QLabel(parent=Dialog)
+        self.label_3.setObjectName("label_3")
+        self.verticalLayout.addWidget(self.label_3)
+        self.subject = QtWidgets.QLineEdit(parent=Dialog)
+        self.subject.setObjectName("subject")
+        self.verticalLayout.addWidget(self.subject)
         self.templateEdit = QtWidgets.QTextEdit(parent=Dialog)
         self.templateEdit.setObjectName("templateEdit")
         self.verticalLayout.addWidget(self.templateEdit)
@@ -97,28 +108,26 @@ class Ui_Dialog(object):
         self.testTemplate = QtWidgets.QPushButton(parent=Dialog)
         self.testTemplate.setObjectName("testTemplate")
         self.horizontalLayout_3.addWidget(self.testTemplate)
-        spacerItem1 = QtWidgets.QSpacerItem(
+        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
-            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(
+        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Discard|QtWidgets.QDialogButtonBox.StandardButton.Save)
-            QtWidgets.QDialogButtonBox.StandardButton.Cancel
-            | QtWidgets.QDialogButtonBox.StandardButton.Discard
-            | QtWidgets.QDialogButtonBox.StandardButton.Ok
-        )
         self.buttonBox.setObjectName("buttonBox")
         self.verticalLayout_2.addWidget(self.buttonBox)
 
         self.retranslateUi(Dialog)
         self.fontSize.setCurrentIndex(1)
         QtCore.QMetaObject.connectSlotsByName(Dialog)
+        Dialog.setTabOrder(self.subject, self.templateEdit)
+        Dialog.setTabOrder(self.templateEdit, self.testTemplate)
+        Dialog.setTabOrder(self.testTemplate, self.insertPlaceholder)
+        Dialog.setTabOrder(self.insertPlaceholder, self.lineEdit)
+        Dialog.setTabOrder(self.lineEdit, self.fontSize)
+        Dialog.setTabOrder(self.fontSize, self.placeholder_list)
+        Dialog.setTabOrder(self.placeholder_list, self.fontBox)
 
     def retranslateUi(self, Dialog):
         _translate = QtCore.QCoreApplication.translate
@@ -142,14 +151,13 @@ class Ui_Dialog(object):
         self.fontSize.setItemText(13, _translate("Dialog", "48"))
         self.fontSize.setItemText(14, _translate("Dialog", "76"))
         self.label.setText(_translate("Dialog", "Platzhalter"))
-        self.comboBox_2.setItemText(0, _translate("Dialog", "«Anrede»"))
+        self.placeholder_list.setItemText(0, _translate("Dialog", "«Anrede»"))
-        self.comboBox_2.setItemText(1, _translate("Dialog", "«ApparatsName»"))
+        self.placeholder_list.setItemText(1, _translate("Dialog", "«ApparatsName»"))
-        self.comboBox_2.setItemText(2, _translate("Dialog", "«ApparatsFach»"))
+        self.placeholder_list.setItemText(2, _translate("Dialog", "«ApparatsFach»"))
-        self.comboBox_2.setItemText(3, _translate("Dialog", "«ApparatsNummer»"))
+        self.placeholder_list.setItemText(3, _translate("Dialog", "«ApparatsNummer»"))
-        self.comboBox_2.setItemText(4, _translate("Dialog", "«DozentName»"))
+        self.placeholder_list.setItemText(4, _translate("Dialog", "«DozentName»"))
-        self.comboBox_2.setItemText(5, _translate("Dialog", "«Signatur»"))
+        self.placeholder_list.setItemText(5, _translate("Dialog", "«Signatur»"))
         self.label_2.setText(_translate("Dialog", "Beschreibung"))
-        self.insertPlaceholder.setText(
+        self.insertPlaceholder.setText(_translate("Dialog", "An aktiver Position einfügen"))
-            _translate("Dialog", "An aktiver Position einfügen")
+        self.label_3.setText(_translate("Dialog", "Betreff"))
-        )
         self.testTemplate.setText(_translate("Dialog", "Template testen"))

src/ui/dialogs/dialog_sources/Ui_settings.py

@@ -12,17 +12,14 @@ from PyQt6 import QtCore, QtGui, QtWidgets
 class Ui_Dialog(object):
     def setupUi(self, Dialog):
         Dialog.setObjectName("Dialog")
-        Dialog.resize(743, 576)
+        Dialog.resize(750, 580)
         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(
+        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok)
-            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, 741, 541))
+        self.frame.setGeometry(QtCore.QRect(0, 0, 751, 541))
         self.frame.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel)
         self.frame.setFrameShadow(QtWidgets.QFrame.Shadow.Raised)
         self.frame.setObjectName("frame")
@@ -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(
+        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
-            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(
+        self.use_username_smtp_login = QtWidgets.QCheckBox(parent=self.formLayoutWidget_2)
-            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(
+        self.smtp_port.setInputMethodHints(QtCore.Qt.InputMethodHint.ImhDigitsOnly|QtCore.Qt.InputMethodHint.ImhPreferNumbers)
-            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(
+        self.sender_email.setInputMethodHints(QtCore.Qt.InputMethodHint.ImhEmailCharactersOnly)
-            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(
+        self.password.setInputMethodHints(QtCore.Qt.InputMethodHint.ImhHiddenText|QtCore.Qt.InputMethodHint.ImhSensitiveData)
-            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)
@@ -135,6 +117,7 @@ class Ui_Dialog(object):
         self.label_6.setObjectName("label_6")
         self.gridLayout_2.addWidget(self.label_6, 1, 0, 1, 1)
         self.togglePassword = QtWidgets.QPushButton(parent=self.formLayoutWidget_2)
+        self.togglePassword.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
         self.togglePassword.setText("")
         self.togglePassword.setObjectName("togglePassword")
         self.gridLayout_2.addWidget(self.togglePassword, 5, 2, 1, 1)
@@ -142,19 +125,14 @@ class Ui_Dialog(object):
         self.email_settingsPage2_2 = QtWidgets.QWidget()
         self.email_settingsPage2_2.setObjectName("email_settingsPage2_2")
         self.verticalLayoutWidget = QtWidgets.QWidget(parent=self.email_settingsPage2_2)
-        self.verticalLayoutWidget.setGeometry(QtCore.QRect(0, 0, 333, 71))
+        self.verticalLayoutWidget.setGeometry(QtCore.QRect(10, 0, 321, 71))
         self.verticalLayoutWidget.setObjectName("verticalLayoutWidget")
         self.verticalLayout = QtWidgets.QVBoxLayout(self.verticalLayoutWidget)
         self.verticalLayout.setContentsMargins(0, 0, 0, 0)
         self.verticalLayout.setObjectName("verticalLayout")
         self.horizontalLayout_3 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_3.setObjectName("horizontalLayout_3")
-        spacerItem1 = QtWidgets.QSpacerItem(
+        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
-            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)
@@ -168,12 +146,7 @@ class Ui_Dialog(object):
         self.underscore.setCheckable(True)
         self.underscore.setObjectName("underscore")
         self.horizontalLayout_3.addWidget(self.underscore)
-        spacerItem2 = QtWidgets.QSpacerItem(
+        spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
-            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()
@@ -199,12 +172,7 @@ class Ui_Dialog(object):
         self.font_size.addItem("")
         self.font_size.addItem("")
         self.horizontalLayout.addWidget(self.font_size)
-        spacerItem3 = QtWidgets.QSpacerItem(
+        spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
-            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)
@@ -231,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(
+        self.label_3.setToolTip(_translate("Dialog", "<html><head/><body><p>Name der Datenbank, welche verwendet werden soll. <span style=\" font-weight:600;\">Muss</span> auf .db enden</p></body></html>"))
-            _translate(
-                "Dialog",
-                '<html><head/><body><p>Name der Datenbank, welche verwendet werden soll. <span style=" font-weight:600;">Muss</span> auf .db enden</p></body></html>',
-            )
-        )
         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(
+        self.label_5.setToolTip(_translate("Dialog", "Pfad, an dem heruntergeladene Dateien gespeichert werden sollen"))
-            _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(
+        self.use_username_smtp_login.setStatusTip(_translate("Dialog", "Anklicken, wenn Nutzername benötigt wird, um sich beim Server anzumelden"))
-            _translate(
+        self.use_username_smtp_login.setText(_translate("Dialog", "Nutzername zum\n"
-                "Dialog",
+" Anmelden verwenden"))
-                "Anklicken, wenn Nutzername benötigt wird, um sich beim Server anzumelden",
+        self.mail_username.setStatusTip(_translate("Dialog", "Kürzel, von der Hochschule vergeben, bsp: Aky547"))
-            )
-        )
-        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.setTabText(self.email_settings.indexOf(self.email_settingsPage1_2), _translate("Dialog", "Allgemeines"))
-            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"))
@@ -287,8 +234,5 @@ class Ui_Dialog(object):
         self.font_size.setItemText(12, _translate("Dialog", "36"))
         self.font_size.setItemText(13, _translate("Dialog", "48"))
         self.font_size.setItemText(14, _translate("Dialog", "72"))
-        self.debug.setText(_translate("Dialog", "PushButton"))
+        self.debug.setText(_translate("Dialog", "Debug"))
-        self.email_settings.setTabText(
+        self.email_settings.setTabText(self.email_settings.indexOf(self.email_settingsPage2_2), _translate("Dialog", "Signatur"))
-            self.email_settings.indexOf(self.email_settingsPage2_2),
-            _translate("Dialog", "Signatur"),
-        )

src/ui/dialogs/dialog_sources/mail_preview.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>676</width>
+    <width>700</width>
-    <height>676</height>
+    <height>668</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,35 +17,43 @@
    <iconset>
     <normaloff>../../../../../../icons/email.svg</normaloff>../../../../../../icons/email.svg</iconset>
   </property>
-  <widget class="QDialogButtonBox" name="buttonBox">
+  <layout class="QGridLayout" name="gridLayout_2">
-   <property name="geometry">
+   <item row="0" column="0">
-    <rect>
-     <x>310</x>
-     <y>630</y>
-     <width>341</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-   <property name="standardButtons">
-    <set>QDialogButtonBox::Cancel</set>
-   </property>
-  </widget>
-  <widget class="QWidget" name="gridLayoutWidget">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>10</y>
-     <width>661</width>
-     <height>621</height>
-    </rect>
-   </property>
     <layout class="QGridLayout" name="gridLayout">
      <item row="2" column="2">
       <widget class="QLineEdit" name="prof_name"/>
      </item>
+     <item row="0" column="3">
+      <widget class="QPushButton" name="newTemplate">
+       <property name="autoFillBackground">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="autoDefault">
+        <bool>true</bool>
+       </property>
+       <property name="default">
+        <bool>false</bool>
+       </property>
+       <property name="flat">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="2">
+      <widget class="QComboBox" name="comboBox"/>
+     </item>
+     <item row="3" column="2">
+      <widget class="QLineEdit" name="mail_header"/>
+     </item>
      <item row="4" column="0">
       <widget class="QLabel" name="label_6">
        <property name="text">
@@ -53,15 +61,8 @@
        </property>
       </widget>
      </item>
-    <item row="0" column="2">
+     <item row="5" column="2">
-     <widget class="QComboBox" name="comboBox"/>
+      <widget class="QTextEdit" name="mail_body"/>
-    </item>
-    <item row="0" column="0">
-     <widget class="QLabel" name="label_5">
-      <property name="text">
-       <string>Art</string>
-      </property>
-     </widget>
      </item>
      <item row="2" column="0">
       <widget class="QLabel" name="label_2">
@@ -70,32 +71,16 @@
        </property>
       </widget>
      </item>
-    <item row="3" column="2">
-     <widget class="QLineEdit" name="mail_header"/>
-    </item>
-    <item row="1" column="0">
-     <widget class="QLabel" name="label">
-      <property name="text">
-       <string>eMail</string>
-      </property>
-     </widget>
-    </item>
-    <item row="5" column="2">
-     <widget class="QTextEdit" name="mail_body"/>
-    </item>
-    <item row="5" column="0">
-     <widget class="QLabel" name="label_3">
-      <property name="text">
-       <string>Mail</string>
-      </property>
-      <property name="alignment">
-       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-      </property>
-     </widget>
-    </item>
      <item row="1" column="2">
       <widget class="QLineEdit" name="mail_name"/>
      </item>
+     <item row="0" column="0">
+      <widget class="QLabel" name="label_5">
+       <property name="text">
+        <string>Art</string>
+       </property>
+      </widget>
+     </item>
      <item row="3" column="0">
       <widget class="QLabel" name="label_4">
        <property name="text">
@@ -141,42 +126,40 @@
        </item>
       </layout>
      </item>
-    <item row="0" column="3">
+     <item row="5" column="0">
-     <widget class="QPushButton" name="newTemplate">
+      <widget class="QLabel" name="label_3">
-      <property name="autoFillBackground">
-       <bool>false</bool>
-      </property>
        <property name="text">
-       <string/>
+        <string>Mail</string>
        </property>
-      <property name="iconSize">
+       <property name="alignment">
-       <size>
+        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-        <width>24</width>
-        <height>24</height>
-       </size>
-      </property>
-      <property name="autoDefault">
-       <bool>true</bool>
-      </property>
-      <property name="default">
-       <bool>false</bool>
-      </property>
-      <property name="flat">
-       <bool>false</bool>
        </property>
       </widget>
      </item>
-   </layout>
+     <item row="1" column="0">
-  </widget>
+      <widget class="QLabel" name="label">
-  <widget class="QPushButton" name="btn_okay">
+       <property name="text">
-   <property name="geometry">
+        <string>eMail</string>
-    <rect>
-     <x>487</x>
-     <y>634</y>
-     <width>75</width>
-     <height>24</height>
-    </rect>
        </property>
+      </widget>
+     </item>
+     <item row="6" column="2">
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <item>
+        <spacer name="horizontalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QPushButton" name="btn_okay">
          <property name="statusTip">
           <string/>
          </property>
@@ -187,6 +170,25 @@
           <string>Senden</string>
          </property>
         </widget>
+       </item>
+       <item>
+        <widget class="QDialogButtonBox" name="buttonBox">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="standardButtons">
+          <set>QDialogButtonBox::Cancel</set>
+         </property>
+         <property name="centerButtons">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+  </layout>
  </widget>
  <resources>
   <include location="../../../../resources.qrc"/>

src/ui/dialogs/dialog_sources/newMailTemplateDesigner.ui

@@ -58,10 +58,17 @@
         </widget>
        </item>
        <item>
-        <widget class="QFontComboBox" name="fontBox"/>
+        <widget class="QFontComboBox" name="fontBox">
+         <property name="focusPolicy">
+          <enum>Qt::NoFocus</enum>
+         </property>
+        </widget>
        </item>
        <item>
         <widget class="QComboBox" name="fontSize">
+         <property name="focusPolicy">
+          <enum>Qt::NoFocus</enum>
+         </property>
          <property name="currentIndex">
           <number>1</number>
          </property>
@@ -171,6 +178,9 @@
        </item>
        <item row="1" column="0">
         <widget class="QComboBox" name="placeholder_list">
+         <property name="focusPolicy">
+          <enum>Qt::NoFocus</enum>
+         </property>
          <property name="sizeAdjustPolicy">
           <enum>QComboBox::AdjustToContents</enum>
          </property>
@@ -218,6 +228,9 @@
          <property name="enabled">
           <bool>true</bool>
          </property>
+         <property name="focusPolicy">
+          <enum>Qt::NoFocus</enum>
+         </property>
          <property name="frame">
           <bool>false</bool>
          </property>
@@ -228,6 +241,9 @@
        </item>
        <item row="1" column="2">
         <widget class="QPushButton" name="insertPlaceholder">
+         <property name="focusPolicy">
+          <enum>Qt::NoFocus</enum>
+         </property>
          <property name="text">
           <string>An aktiver Position einfügen</string>
          </property>
@@ -286,6 +302,16 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>subject</tabstop>
+  <tabstop>templateEdit</tabstop>
+  <tabstop>testTemplate</tabstop>
+  <tabstop>insertPlaceholder</tabstop>
+  <tabstop>lineEdit</tabstop>
+  <tabstop>fontSize</tabstop>
+  <tabstop>placeholder_list</tabstop>
+  <tabstop>fontBox</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>

src/ui/dialogs/dialog_sources/settings.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>743</width>
+    <width>750</width>
-    <height>576</height>
+    <height>580</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -34,7 +34,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>741</width>
+     <width>751</width>
      <height>541</height>
     </rect>
    </property>
@@ -280,6 +280,9 @@
        </item>
        <item row="5" column="2">
         <widget class="QPushButton" name="togglePassword">
+         <property name="focusPolicy">
+          <enum>Qt::NoFocus</enum>
+         </property>
          <property name="text">
           <string/>
          </property>
@@ -295,9 +298,9 @@
      <widget class="QWidget" name="verticalLayoutWidget">
       <property name="geometry">
        <rect>
-        <x>0</x>
+        <x>10</x>
         <y>0</y>
-        <width>401</width>
+        <width>321</width>
         <height>71</height>
        </rect>
       </property>

src/ui/dialogs/login.py

@@ -2,6 +2,7 @@ from .dialog_sources.Ui_login import Ui_Dialog
 from src.backend.admin_console import AdminCommands
 from src.backend.database import Database
 import hashlib
+from src import Icon
 from PyQt6 import QtCore, QtWidgets, QtGui
 
 class LoginDialog(Ui_Dialog):
@@ -9,9 +10,7 @@ class LoginDialog(Ui_Dialog):
         Dialog.setObjectName("Dialog")
         Dialog.resize(218, 190)
         self.dialog = Dialog
-        icon = QtGui.QIcon()
+        Dialog.setWindowIcon(Icon("locked").icon)
-        icon.addPixmap(QtGui.QPixmap("icons/locked.svg"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off)
-        Dialog.setWindowIcon(icon)
         self.login_button = QtWidgets.QPushButton(parent=Dialog)
         self.login_button.setGeometry(QtCore.QRect(30, 140, 76, 32))
         self.login_button.setObjectName("login_button")

src/ui/dialogs/mail.py

@@ -4,18 +4,16 @@ import sys
 from omegaconf import OmegaConf
 from PyQt6 import QtCore, QtGui, QtWidgets
 
-from src.logic import log
-
-from .dialog_sources.Ui_mail_preview import Ui_eMailPreview as Ui_Dialog
-
-config = OmegaConf.load("config.yaml")
 from src.logic.log import MyLogger
-from src.utils import Icon
+from src import Icon
+from .dialog_sources.Ui_mail_preview import Ui_eMailPreview as MailPreviewDialog
+from .mailTemplate import MailTemplateDialog
+config = OmegaConf.load("config.yaml")
 
 logger = MyLogger("Mail")
 
 
-class Mail_Dialog(QtWidgets.QDialog, Ui_Dialog):
+class Mail_Dialog(QtWidgets.QDialog, MailPreviewDialog):
     def __init__(
         self,
         app_id,
@@ -34,6 +32,7 @@ class Mail_Dialog(QtWidgets.QDialog, Ui_Dialog):
             # app_subject,
             # prof_name,
         )
+        
         self.appid = app_id
         self.appname = app_name
         self.subject = app_subject
@@ -46,8 +45,9 @@ class Mail_Dialog(QtWidgets.QDialog, Ui_Dialog):
         self.mail_name.setText(self.prof_mail)
         self.load_mail_templates()
         # if none of the radio buttons is checked, disable the accept button of the dialog
+        self.setWindowIcon(Icon("mail").icon)
         self.btn_okay.setEnabled(False)
-        Icon("edit_note").set_icon(self.newTemplate)
+        Icon("edit_note",self.newTemplate)
         self.newTemplate.clicked.connect(self.open_new_template)
 
         if default_mail is not None:
@@ -73,6 +73,8 @@ class Mail_Dialog(QtWidgets.QDialog, Ui_Dialog):
     def open_new_template(self):
         logger.log_info("Opening new template dialog")
         # TODO: implement new mail template dialog
+        dialog = MailTemplateDialog()
+        dialog.exec()
         pass
 
     def determine_signature(self):

src/ui/dialogs/mailTemplate.py

@@ -1,12 +1,15 @@
-from dialog_sources.newMailTemplateDesigner_ui import Ui_Dialog
+from .dialog_sources import NewMailTemplateDesignerDialog
 from PyQt6 import QtWidgets, QtCore, QtGui
 from PyQt6.QtGui import QFont
 import os
+from src import Icon
 
-class MailTemplateDialog(QtWidgets.QDialog, Ui_Dialog):
+class MailTemplateDialog(QtWidgets.QDialog, NewMailTemplateDesignerDialog):
     def __init__(self,parent = None) -> None:
         super().__init__(parent)
         self.setupUi(self)
+        self.setWindowIcon(Icon("edit_note").icon)
+        self.setWindowTitle("Mailvorlage erstellen")
         self.placeholder_list.addItem("")
         self.placeholder_list.setCurrentText("")
         self.insertPlaceholder.clicked.connect(self.insert_placeholder)
@@ -34,7 +37,7 @@ class MailTemplateDialog(QtWidgets.QDialog, Ui_Dialog):
         dialog.setWindowTitle("Template speichern")
         dialog.setOkButtonText("Speichern")
         dialog.setCancelButtonText("Abbrechen")
-        dialog.setWindowIcon(QtGui.QIcon("icons/save.png"))
+        dialog.setWindowIcon(Icon("save").icon)
         save = dialog.exec()
         template_name = dialog.textValue()
         if template_name != "":
@@ -43,6 +46,7 @@ class MailTemplateDialog(QtWidgets.QDialog, Ui_Dialog):
                 #warning dialog
                 dialog = QtWidgets.QMessageBox()
                 dialog.setIcon(QtWidgets.QMessageBox.Icon.Warning)
+                Icon("warning",dialog)
                 dialog.setText("Ein Template mit diesem Namen existiert bereits. Möchten Sie es überschreiben?")
                 dialog.setWindowTitle("Template überschreiben")
                 dialog.setStandardButtons(QtWidgets.QMessageBox.StandardButton.Yes | QtWidgets.QMessageBox.StandardButton.No)

src/ui/dialogs/settings.py

@@ -1,6 +1,6 @@
 from omegaconf import OmegaConf
 from PyQt6 import QtCore, QtGui, QtWidgets
-
+from src import Icon
 from .dialog_sources.settings_ui import Ui_Dialog as _settings
 
 config = OmegaConf.load("config.yaml")
@@ -11,6 +11,7 @@ class Settings(QtWidgets.QDialog, _settings):
     def __init__(self,user):
         super().__init__()
         self.setupUi(self)
+        self.setWindowIcon(Icon("settings").icon)
         self.password.setEchoMode(QtWidgets.QLineEdit.EchoMode.Password)
         self.editSignature.setAcceptRichText(True)
         self.editSignature.setFocusPolicy(QtCore.Qt.FocusPolicy.StrongFocus)
@@ -64,26 +65,17 @@ class Settings(QtWidgets.QDialog, _settings):
 
     def toggle_password(self):
         self.togglePassword.setIconSize(QtCore.QSize(16, 16))
-        on_icon = QtGui.QIcon()
+        on_icon = Icon("hide_password")
-        off_icon = QtGui.QIcon()
+        off_icon = Icon("show_password")
-        on_icon.addPixmap(
+        
-            QtGui.QPixmap("icons/visibility_on.svg"),
-            QtGui.QIcon.Mode.Normal,
-            QtGui.QIcon.State.On,
-        )
-        off_icon.addPixmap(
-            QtGui.QPixmap("icons/visibility_off.svg"),
-            QtGui.QIcon.Mode.Normal,
-            QtGui.QIcon.State.On,
-        )
         if self.showPassword is False:
             self.password.setEchoMode(QtWidgets.QLineEdit.EchoMode.Normal)
 
-            self.togglePassword.setIcon(off_icon)
+            off_icon.set_icon(self.togglePassword)
             self.showPassword = True
         else:
             self.password.setEchoMode(QtWidgets.QLineEdit.EchoMode.Password)
-            self.togglePassword.setIcon(on_icon)
+            on_icon.set_icon(self.togglePassword)
             self.showPassword = False
 
     def setFontBold(self):