From b7b1c106eaea6b81c4bbddc163f4518c5da8b2ce Mon Sep 17 00:00:00 2001 From: WorldTeacher <41587052+WorldTeacher@users.noreply.github.com> Date: Thu, 13 Jun 2024 09:35:18 +0200 Subject: [PATCH] fix scaling --- src/ui/Ui_semesterapparat_ui.py | 52 ++++++++++++------ src/ui/semesterapparat_ui.ui | 96 +++++++++++++++++++++++++++------ 2 files changed, 116 insertions(+), 32 deletions(-) diff --git a/src/ui/Ui_semesterapparat_ui.py b/src/ui/Ui_semesterapparat_ui.py index ed64d65..02d8719 100644 --- a/src/ui/Ui_semesterapparat_ui.py +++ b/src/ui/Ui_semesterapparat_ui.py @@ -24,7 +24,7 @@ class Ui_MainWindow(object): MainWindow.setMaximumSize(QtCore.QSize(1590, 800)) MainWindow.setContextMenuPolicy(QtCore.Qt.ContextMenuPolicy.NoContextMenu) icon = QtGui.QIcon() - icon.addPixmap(QtGui.QPixmap("c:\\Users\\aky547\\GitHub\\SemesterapparatsManager\\src\\ui\\../../../../icons/logo.ico"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) + icon.addPixmap(QtGui.QPixmap("c:\\Users\\aky547\\GitHub\\SemesterapparatsManager\\src\\ui\\../../../../../../icons/logo.ico"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) MainWindow.setWindowIcon(icon) MainWindow.setStatusTip("") self.centralwidget = QtWidgets.QWidget(parent=MainWindow) @@ -278,7 +278,7 @@ class Ui_MainWindow(object): self.btn_add_document.setFont(font) self.btn_add_document.setObjectName("btn_add_document") self.appname_mand = QtWidgets.QLabel(parent=self.app_group_box) - self.appname_mand.setGeometry(QtCore.QRect(340, 50, 16, 21)) + self.appname_mand.setGeometry(QtCore.QRect(330, 50, 16, 21)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) @@ -345,7 +345,7 @@ class Ui_MainWindow(object): self.valid_check_app_fach.setObjectName("valid_check_app_fach") self.gridLayout_6.addWidget(self.valid_check_app_fach, 0, 2, 1, 1) self._mand = QtWidgets.QLabel(parent=self.app_group_box) - self._mand.setGeometry(QtCore.QRect(340, 90, 16, 21)) + self._mand.setGeometry(QtCore.QRect(330, 90, 16, 21)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) @@ -362,14 +362,14 @@ class Ui_MainWindow(object): self.prof_tel_nr.setObjectName("prof_tel_nr") self.check_eternal_app = QtWidgets.QCheckBox(parent=self.app_group_box) self.check_eternal_app.setEnabled(False) - self.check_eternal_app.setGeometry(QtCore.QRect(350, 120, 101, 17)) + self.check_eternal_app.setGeometry(QtCore.QRect(340, 120, 101, 17)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) self.check_eternal_app.setFont(font) self.check_eternal_app.setObjectName("check_eternal_app") - self.sem_sommer = QtWidgets.QRadioButton(parent=self.app_group_box) - self.sem_sommer.setGeometry(QtCore.QRect(350, 100, 82, 17)) + self.sem_sommer = QtWidgets.QCheckBox(parent=self.app_group_box) + self.sem_sommer.setGeometry(QtCore.QRect(340, 100, 82, 17)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) @@ -471,13 +471,13 @@ class Ui_MainWindow(object): self.apparat_id_adis.setObjectName("apparat_id_adis") self.formLayout_3.setWidget(1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.apparat_id_adis) self.sem_year = QtWidgets.QLineEdit(parent=self.app_group_box) - self.sem_year.setGeometry(QtCore.QRect(420, 90, 113, 20)) + self.sem_year.setGeometry(QtCore.QRect(410, 90, 113, 20)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) self.sem_year.setFont(font) self.sem_year.setFocusPolicy(QtCore.Qt.FocusPolicy.StrongFocus) - self.sem_year.setMaxLength(4) + self.sem_year.setMaxLength(5) self.sem_year.setObjectName("sem_year") self.check_send_mail = QtWidgets.QCheckBox(parent=self.app_group_box) self.check_send_mail.setGeometry(QtCore.QRect(460, 150, 91, 17)) @@ -486,8 +486,8 @@ class Ui_MainWindow(object): font.setBold(False) self.check_send_mail.setFont(font) self.check_send_mail.setObjectName("check_send_mail") - self.sem_winter = QtWidgets.QRadioButton(parent=self.app_group_box) - self.sem_winter.setGeometry(QtCore.QRect(350, 80, 82, 17)) + self.sem_winter = QtWidgets.QCheckBox(parent=self.app_group_box) + self.sem_winter.setGeometry(QtCore.QRect(340, 80, 82, 17)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) @@ -516,14 +516,14 @@ class Ui_MainWindow(object): self.btn_apparat_save.setFont(font) self.btn_apparat_save.setObjectName("btn_apparat_save") self.label_5 = QtWidgets.QLabel(parent=self.app_group_box) - self.label_5.setGeometry(QtCore.QRect(260, 50, 91, 21)) + self.label_5.setGeometry(QtCore.QRect(250, 50, 91, 21)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) self.label_5.setFont(font) self.label_5.setObjectName("label_5") self.app_name = QtWidgets.QLineEdit(parent=self.app_group_box) - self.app_name.setGeometry(QtCore.QRect(350, 50, 113, 20)) + self.app_name.setGeometry(QtCore.QRect(340, 50, 113, 20)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) @@ -540,7 +540,7 @@ class Ui_MainWindow(object): self.drpdwn_app_nr.setEditable(True) self.drpdwn_app_nr.setObjectName("drpdwn_app_nr") self.label_6 = QtWidgets.QLabel(parent=self.app_group_box) - self.label_6.setGeometry(QtCore.QRect(280, 90, 61, 21)) + self.label_6.setGeometry(QtCore.QRect(270, 90, 61, 21)) font = QtGui.QFont() font.setPointSize(9) font.setBold(False) @@ -552,6 +552,26 @@ class Ui_MainWindow(object): self.valid_check_profname.setAutoRaise(True) self.valid_check_profname.setArrowType(QtCore.Qt.ArrowType.NoArrow) self.valid_check_profname.setObjectName("valid_check_profname") + self.valid_check_appname = QtWidgets.QToolButton(parent=self.app_group_box) + self.valid_check_appname.setGeometry(QtCore.QRect(450, 50, 22, 22)) + self.valid_check_appname.setText("") + self.valid_check_appname.setAutoRaise(True) + self.valid_check_appname.setObjectName("valid_check_appname") + self.valid_check_semester = QtWidgets.QToolButton(parent=self.app_group_box) + self.valid_check_semester.setGeometry(QtCore.QRect(520, 90, 22, 22)) + self.valid_check_semester.setText("") + self.valid_check_semester.setAutoRaise(True) + self.valid_check_semester.setObjectName("valid_check_semester") + self.valid_check_mail = QtWidgets.QToolButton(parent=self.app_group_box) + self.valid_check_mail.setGeometry(QtCore.QRect(240, 140, 22, 22)) + self.valid_check_mail.setText("") + self.valid_check_mail.setAutoRaise(True) + self.valid_check_mail.setObjectName("valid_check_mail") + self.valid_check_telnr = QtWidgets.QToolButton(parent=self.app_group_box) + self.valid_check_telnr.setGeometry(QtCore.QRect(240, 160, 22, 22)) + self.valid_check_telnr.setText("") + self.valid_check_telnr.setAutoRaise(True) + self.valid_check_telnr.setObjectName("valid_check_telnr") self.gridLayout_2.addWidget(self.app_group_box, 1, 0, 1, 1) self.add_medium = QtWidgets.QPushButton(parent=self.createApparat) self.add_medium.setGeometry(QtCore.QRect(3, 695, 121, 20)) @@ -677,7 +697,7 @@ class Ui_MainWindow(object): self.elsa_semester.setObjectName("elsa_semester") self.gridLayout_7.addWidget(self.elsa_semester, 2, 1, 1, 1) self.table_elsa_list = QtWidgets.QTableWidget(parent=self.elsa) - self.table_elsa_list.setGeometry(QtCore.QRect(20, 410, 771, 321)) + self.table_elsa_list.setGeometry(QtCore.QRect(20, 410, 771, 301)) self.table_elsa_list.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) self.table_elsa_list.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken) self.table_elsa_list.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) @@ -697,12 +717,12 @@ class Ui_MainWindow(object): self.elsa_statistic_frame.setGeometry(QtCore.QRect(800, 410, 451, 321)) self.elsa_statistic_frame.setObjectName("elsa_statistic_frame") self.elsa_statistics = QtWidgets.QTabWidget(parent=self.elsa_statistic_frame) - self.elsa_statistics.setGeometry(QtCore.QRect(0, 0, 451, 321)) + self.elsa_statistics.setGeometry(QtCore.QRect(0, 0, 451, 301)) self.elsa_statistics.setObjectName("elsa_statistics") self.tab_9 = QtWidgets.QWidget() self.tab_9.setObjectName("tab_9") self.elsa_statistics_table = QtWidgets.QTableWidget(parent=self.tab_9) - self.elsa_statistics_table.setGeometry(QtCore.QRect(0, 0, 441, 291)) + self.elsa_statistics_table.setGeometry(QtCore.QRect(0, 0, 441, 271)) self.elsa_statistics_table.setFocusPolicy(QtCore.Qt.FocusPolicy.WheelFocus) self.elsa_statistics_table.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarPolicy.ScrollBarAlwaysOff) self.elsa_statistics_table.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) diff --git a/src/ui/semesterapparat_ui.ui b/src/ui/semesterapparat_ui.ui index 662ec9b..6ce7e96 100644 --- a/src/ui/semesterapparat_ui.ui +++ b/src/ui/semesterapparat_ui.ui @@ -42,7 +42,7 @@ - ../../../../icons/logo.ico../../../../icons/logo.ico + ../../../../../../icons/logo.ico../../../../../../icons/logo.ico @@ -649,7 +649,7 @@ - 340 + 330 50 16 21 @@ -826,7 +826,7 @@ - 340 + 330 90 16 21 @@ -870,7 +870,7 @@ - 350 + 340 120 101 17 @@ -886,10 +886,10 @@ Dauerapparat - + - 350 + 340 100 82 17 @@ -1147,7 +1147,7 @@ - 420 + 410 90 113 20 @@ -1163,7 +1163,7 @@ Qt::StrongFocus - 4 + 5 2023 @@ -1188,10 +1188,10 @@ Mail senden - + - 350 + 340 80 82 17 @@ -1276,7 +1276,7 @@ - 260 + 250 50 91 21 @@ -1298,7 +1298,7 @@ - 350 + 340 50 113 20 @@ -1339,7 +1339,7 @@ - 280 + 270 90 61 21 @@ -1377,6 +1377,70 @@ Qt::NoArrow + + + + 450 + 50 + 22 + 22 + + + + + + + true + + + + + + 520 + 90 + 22 + 22 + + + + + + + true + + + + + + 240 + 140 + 22 + 22 + + + + + + + true + + + + + + 240 + 160 + 22 + 22 + + + + + + + true + + @@ -1705,7 +1769,7 @@ 20 410 771 - 321 + 301 @@ -1756,7 +1820,7 @@ 0 0 451 - 321 + 301 @@ -1769,7 +1833,7 @@ 0 0 441 - 291 + 271