merge main into dev #13

Merged
WorldTeacher merged 41 commits from main into dev 2025-09-03 09:44:13 +01:00
2 changed files with 30 additions and 16 deletions
Showing only changes of commit d8fabdbe11 - Show all commits

View File

@@ -339,14 +339,22 @@
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="avail_layout"/>
</item>
<item>
<widget class="QLabel" name="label_20">
<property name="text">
<string>Medien werden geprüft</string>
</property>
</widget>
<layout class="QHBoxLayout" name="avail_layout">
<item>
<widget class="QLabel" name="label_20">
<property name="text">
<string>Medien werden geprüft</string>
</property>
</widget>
</item>
<item>
<widget class="QProgressBar" name="progressBar">
<property name="value">
<number>24</number>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="Line" name="line_3">

View File

@@ -3,7 +3,7 @@
################################################################################
## Form generated from reading UI file 'semesterapparat_ui.ui'
##
## Created by: Qt User Interface Compiler version 6.9.1
## Created by: Qt User Interface Compiler version 6.9.2
##
## WARNING! All changes made in this file will be lost when recompiling UI file!
################################################################################
@@ -20,9 +20,9 @@ from PySide6.QtWidgets import (QAbstractItemView, QAbstractScrollArea, QApplicat
QComboBox, QFormLayout, QFrame, QGridLayout,
QGroupBox, QHBoxLayout, QHeaderView, QLabel,
QLineEdit, QMainWindow, QMenu, QMenuBar,
QPushButton, QSizePolicy, QSpacerItem, QStatusBar,
QTabWidget, QTableWidget, QTableWidgetItem, QToolButton,
QVBoxLayout, QWidget)
QProgressBar, QPushButton, QSizePolicy, QSpacerItem,
QStatusBar, QTabWidget, QTableWidget, QTableWidgetItem,
QToolButton, QVBoxLayout, QWidget)
class Ui_MainWindow(object):
def setupUi(self, MainWindow):
@@ -207,13 +207,19 @@ class Ui_MainWindow(object):
self.avail_layout = QHBoxLayout()
self.avail_layout.setObjectName(u"avail_layout")
self.horizontalLayout_5.addLayout(self.avail_layout)
self.label_20 = QLabel(self.gridLayoutWidget_2)
self.label_20.setObjectName(u"label_20")
self.horizontalLayout_5.addWidget(self.label_20)
self.avail_layout.addWidget(self.label_20)
self.progressBar = QProgressBar(self.gridLayoutWidget_2)
self.progressBar.setObjectName(u"progressBar")
self.progressBar.setValue(24)
self.avail_layout.addWidget(self.progressBar)
self.horizontalLayout_5.addLayout(self.avail_layout)
self.line_3 = QFrame(self.gridLayoutWidget_2)
self.line_3.setObjectName(u"line_3")