chore: fix layout issues with groupboxes

src/ui/Ui_semesterapparat_ui.py

@@ -585,6 +585,7 @@ class Ui_MainWindow(object):
         self.valid_check_telnr.setAutoRaise(True)
         self.valid_check_telnr.setObjectName("valid_check_telnr")
         self.saveandcreate = QtWidgets.QPushButton(parent=self.app_group_box)
+        self.saveandcreate.setEnabled(False)
         self.saveandcreate.setGeometry(QtCore.QRect(270, 180, 161, 24))
         font = QtGui.QFont()
         font.setPointSize(9)
@@ -627,58 +628,68 @@ class Ui_MainWindow(object):
         self.horizontalLayout.addLayout(self.gridLayout)
         self.mainLayout.addLayout(self.horizontalLayout)
         self.horizontalLayoutWidget = QtWidgets.QWidget(parent=self.centralwidget)
-        self.horizontalLayoutWidget.setGeometry(QtCore.QRect(1280, 360, 311, 391))
+        self.horizontalLayoutWidget.setGeometry(QtCore.QRect(1280, 370, 301, 381))
         self.horizontalLayoutWidget.setObjectName("horizontalLayoutWidget")
-        self.horizontalLayout_6 = QtWidgets.QHBoxLayout(self.horizontalLayoutWidget)
-        self.horizontalLayout_6.setContentsMargins(0, 0, 0, 0)
-        self.horizontalLayout_6.setObjectName("horizontalLayout_6")
-        self.frame_creation_progress = QtWidgets.QFrame(parent=self.horizontalLayoutWidget)
-        self.frame_creation_progress.setObjectName("frame_creation_progress")
-        self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.frame_creation_progress)
-        self.verticalLayout_4.setSpacing(6)
-        self.verticalLayout_4.setObjectName("verticalLayout_4")
-        self.groupBox_2 = QtWidgets.QGroupBox(parent=self.frame_creation_progress)
+        self.verticalLayout_5 = QtWidgets.QVBoxLayout(self.horizontalLayoutWidget)
+        self.verticalLayout_5.setContentsMargins(0, 0, 0, 0)
+        self.verticalLayout_5.setObjectName("verticalLayout_5")
+        self.steps = QtWidgets.QFrame(parent=self.horizontalLayoutWidget)
+        self.steps.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel)
+        self.steps.setFrameShadow(QtWidgets.QFrame.Shadow.Raised)
+        self.steps.setObjectName("steps")
+        self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.steps)
+        self.verticalLayout_3.setObjectName("verticalLayout_3")
+        self.groupBox_2 = QtWidgets.QGroupBox(parent=self.steps)
         self.groupBox_2.setEnabled(True)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.groupBox_2.sizePolicy().hasHeightForWidth())
         self.groupBox_2.setSizePolicy(sizePolicy)
+        font = QtGui.QFont()
+        font.setBold(True)
+        self.groupBox_2.setFont(font)
         self.groupBox_2.setObjectName("groupBox_2")
+        self.verticalLayout_6 = QtWidgets.QVBoxLayout(self.groupBox_2)
+        self.verticalLayout_6.setObjectName("verticalLayout_6")
         self.appdata_check = QtWidgets.QCheckBox(parent=self.groupBox_2)
-        self.appdata_check.setGeometry(QtCore.QRect(20, 30, 241, 41))
         font = QtGui.QFont()
         font.setPointSize(8)
         font.setBold(False)
         self.appdata_check.setFont(font)
         self.appdata_check.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
         self.appdata_check.setObjectName("appdata_check")
+        self.verticalLayout_6.addWidget(self.appdata_check)
         self.media_check = QtWidgets.QCheckBox(parent=self.groupBox_2)
-        self.media_check.setGeometry(QtCore.QRect(20, 70, 241, 41))
         font = QtGui.QFont()
         font.setPointSize(8)
         font.setBold(False)
         self.media_check.setFont(font)
         self.media_check.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
         self.media_check.setObjectName("media_check")
+        self.verticalLayout_6.addWidget(self.media_check)
         self.ids_check = QtWidgets.QCheckBox(parent=self.groupBox_2)
-        self.ids_check.setGeometry(QtCore.QRect(20, 110, 241, 41))
         font = QtGui.QFont()
         font.setPointSize(8)
         font.setBold(False)
         self.ids_check.setFont(font)
         self.ids_check.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
         self.ids_check.setObjectName("ids_check")
-        self.verticalLayout_4.addWidget(self.groupBox_2)
-        self.groupBox = QtWidgets.QGroupBox(parent=self.frame_creation_progress)
+        self.verticalLayout_6.addWidget(self.ids_check)
+        self.verticalLayout_3.addWidget(self.groupBox_2)
+        self.groupBox = QtWidgets.QGroupBox(parent=self.steps)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.groupBox.sizePolicy().hasHeightForWidth())
         self.groupBox.setSizePolicy(sizePolicy)
+        font = QtGui.QFont()
+        font.setBold(True)
+        self.groupBox.setFont(font)
         self.groupBox.setObjectName("groupBox")
+        self.verticalLayout = QtWidgets.QVBoxLayout(self.groupBox)
+        self.verticalLayout.setObjectName("verticalLayout")
         self.media_checked = QtWidgets.QCheckBox(parent=self.groupBox)
-        self.media_checked.setGeometry(QtCore.QRect(20, 30, 241, 41))
         font = QtGui.QFont()
         font.setPointSize(8)
         font.setBold(False)
@@ -689,8 +700,8 @@ class Ui_MainWindow(object):
         self.media_checked.setFont(font)
         self.media_checked.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
         self.media_checked.setObjectName("media_checked")
+        self.verticalLayout.addWidget(self.media_checked)
         self.media_edited_check = QtWidgets.QCheckBox(parent=self.groupBox)
-        self.media_edited_check.setGeometry(QtCore.QRect(20, 70, 241, 41))
         font = QtGui.QFont()
         font.setPointSize(8)
         font.setBold(False)
@@ -701,8 +712,8 @@ class Ui_MainWindow(object):
         self.media_edited_check.setFont(font)
         self.media_edited_check.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
         self.media_edited_check.setObjectName("media_edited_check")
+        self.verticalLayout.addWidget(self.media_edited_check)
         self.app_created = QtWidgets.QCheckBox(parent=self.groupBox)
-        self.app_created.setGeometry(QtCore.QRect(20, 110, 161, 41))
         font = QtGui.QFont()
         font.setPointSize(8)
         font.setBold(False)
@@ -713,8 +724,8 @@ class Ui_MainWindow(object):
         self.app_created.setFont(font)
         self.app_created.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
         self.app_created.setObjectName("app_created")
+        self.verticalLayout.addWidget(self.app_created)
         self.btn_copy_adis_command = QtWidgets.QPushButton(parent=self.groupBox)
-        self.btn_copy_adis_command.setGeometry(QtCore.QRect(170, 120, 101, 23))
         font = QtGui.QFont()
         font.setPointSize(8)
         font.setBold(False)
@@ -734,10 +745,11 @@ class Ui_MainWindow(object):
         self.btn_copy_adis_command.setChecked(False)
         self.btn_copy_adis_command.setAutoDefault(False)
         self.btn_copy_adis_command.setObjectName("btn_copy_adis_command")
-        self.verticalLayout_4.addWidget(self.groupBox)
-        self.horizontalLayout_6.addWidget(self.frame_creation_progress)
+        self.verticalLayout.addWidget(self.btn_copy_adis_command)
+        self.verticalLayout_3.addWidget(self.groupBox)
+        self.verticalLayout_5.addWidget(self.steps)
         self.frame_2 = QtWidgets.QFrame(parent=self.centralwidget)
-        self.frame_2.setGeometry(QtCore.QRect(1280, 20, 301, 341))
+        self.frame_2.setGeometry(QtCore.QRect(1280, 20, 301, 331))
         self.frame_2.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel)
         self.frame_2.setFrameShadow(QtWidgets.QFrame.Shadow.Raised)
         self.frame_2.setObjectName("frame_2")
@@ -745,6 +757,12 @@ class Ui_MainWindow(object):
         self.verticalLayout_7.setObjectName("verticalLayout_7")
         self.calendarlayout = QtWidgets.QVBoxLayout()
         self.calendarlayout.setObjectName("calendarlayout")
+        self.frame_creation_progress = QtWidgets.QFrame(parent=self.frame_2)
+        self.frame_creation_progress.setObjectName("frame_creation_progress")
+        self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.frame_creation_progress)
+        self.verticalLayout_4.setSpacing(6)
+        self.verticalLayout_4.setObjectName("verticalLayout_4")
+        self.calendarlayout.addWidget(self.frame_creation_progress)
         self.verticalLayout_7.addLayout(self.calendarlayout)
         MainWindow.setCentralWidget(self.centralwidget)
         self.menubar = QtWidgets.QMenuBar(parent=MainWindow)
@@ -809,8 +827,7 @@ class Ui_MainWindow(object):
         MainWindow.setTabOrder(self.check_file, self.check_send_mail)
         MainWindow.setTabOrder(self.check_send_mail, self.btn_apparat_save)
         MainWindow.setTabOrder(self.btn_apparat_save, self.btn_apparat_apply)
-        MainWindow.setTabOrder(self.btn_apparat_apply, self.btn_copy_adis_command)
-        MainWindow.setTabOrder(self.btn_copy_adis_command, self.chkbx_show_del_media)
+        MainWindow.setTabOrder(self.btn_apparat_apply, self.chkbx_show_del_media)
         MainWindow.setTabOrder(self.chkbx_show_del_media, self.btn_reserve)
         MainWindow.setTabOrder(self.btn_reserve, self.select_action_box)
         MainWindow.setTabOrder(self.select_action_box, self.prof_id_adis)
@@ -924,7 +941,7 @@ class Ui_MainWindow(object):
         self.media_edited_check.setText(_translate("MainWindow", "Medien bearbeitet"))
         self.app_created.setText(_translate("MainWindow", "Apparat angelegt"))
         self.btn_copy_adis_command.setToolTip(_translate("MainWindow", "Hier klicken, um die aDIS Abfrage in die Zwischenablage zu kopieren"))
-        self.btn_copy_adis_command.setText(_translate("MainWindow", " aDIS Abfrage"))
+        self.btn_copy_adis_command.setText(_translate("MainWindow", " aDIS Abfrage in Zwischenablage kopieren"))
         self.menuDatei.setTitle(_translate("MainWindow", "Datei"))
         self.menuEinstellungen.setTitle(_translate("MainWindow", "Bearbeiten"))
         self.menuHelp.setTitle(_translate("MainWindow", "Help"))

src/ui/semesterapparat_ui.ui

@@ -1485,6 +1485,9 @@
                  </property>
                 </widget>
                 <widget class="QPushButton" name="saveandcreate">
+                 <property name="enabled">
+                  <bool>false</bool>
+                 </property>
                  <property name="geometry">
                   <rect>
                    <x>270</x>
@@ -1613,18 +1616,21 @@
     <property name="geometry">
      <rect>
       <x>1280</x>
-      <y>360</y>
-      <width>311</width>
-      <height>391</height>
+      <y>370</y>
+      <width>301</width>
+      <height>381</height>
      </rect>
     </property>
-    <layout class="QHBoxLayout" name="horizontalLayout_6">
+    <layout class="QVBoxLayout" name="verticalLayout_5">
      <item>
-      <widget class="QFrame" name="frame_creation_progress">
-       <layout class="QVBoxLayout" name="verticalLayout_4">
-        <property name="spacing">
-         <number>6</number>
+      <widget class="QFrame" name="steps">
+       <property name="frameShape">
+        <enum>QFrame::StyledPanel</enum>
        </property>
+       <property name="frameShadow">
+        <enum>QFrame::Raised</enum>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_3">
         <item>
          <widget class="QGroupBox" name="groupBox_2">
           <property name="enabled">
@@ -1636,18 +1642,17 @@
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
+          <property name="font">
+           <font>
+            <bold>true</bold>
+           </font>
+          </property>
           <property name="title">
            <string>Software</string>
           </property>
+          <layout class="QVBoxLayout" name="verticalLayout_6">
+           <item>
             <widget class="QCheckBox" name="appdata_check">
-           <property name="geometry">
-            <rect>
-             <x>20</x>
-             <y>30</y>
-             <width>241</width>
-             <height>41</height>
-            </rect>
-           </property>
              <property name="font">
               <font>
                <pointsize>8</pointsize>
@@ -1661,15 +1666,9 @@
               <string>Apparatsdaten eingegeben</string>
              </property>
             </widget>
+           </item>
+           <item>
             <widget class="QCheckBox" name="media_check">
-           <property name="geometry">
-            <rect>
-             <x>20</x>
-             <y>70</y>
-             <width>241</width>
-             <height>41</height>
-            </rect>
-           </property>
              <property name="font">
               <font>
                <pointsize>8</pointsize>
@@ -1683,15 +1682,9 @@
               <string>Medien hinzugefügt / importiert</string>
              </property>
             </widget>
+           </item>
+           <item>
             <widget class="QCheckBox" name="ids_check">
-           <property name="geometry">
-            <rect>
-             <x>20</x>
-             <y>110</y>
-             <width>241</width>
-             <height>41</height>
-            </rect>
-           </property>
              <property name="font">
               <font>
                <pointsize>8</pointsize>
@@ -1705,6 +1698,8 @@
               <string>Prof-ID und Apparat-ID eingetragen</string>
              </property>
             </widget>
+           </item>
+          </layout>
          </widget>
         </item>
         <item>
@@ -1715,18 +1710,17 @@
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
+          <property name="font">
+           <font>
+            <bold>true</bold>
+           </font>
+          </property>
           <property name="title">
            <string>aDIS</string>
           </property>
+          <layout class="QVBoxLayout" name="verticalLayout">
+           <item>
             <widget class="QCheckBox" name="media_checked">
-           <property name="geometry">
-            <rect>
-             <x>20</x>
-             <y>30</y>
-             <width>241</width>
-             <height>41</height>
-            </rect>
-           </property>
              <property name="font">
               <font>
                <pointsize>8</pointsize>
@@ -1744,15 +1738,9 @@
               <string>Medien geprüft</string>
              </property>
             </widget>
+           </item>
+           <item>
             <widget class="QCheckBox" name="media_edited_check">
-           <property name="geometry">
-            <rect>
-             <x>20</x>
-             <y>70</y>
-             <width>241</width>
-             <height>41</height>
-            </rect>
-           </property>
              <property name="font">
               <font>
                <pointsize>8</pointsize>
@@ -1770,15 +1758,9 @@
               <string>Medien bearbeitet</string>
              </property>
             </widget>
+           </item>
+           <item>
             <widget class="QCheckBox" name="app_created">
-           <property name="geometry">
-            <rect>
-             <x>20</x>
-             <y>110</y>
-             <width>161</width>
-             <height>41</height>
-            </rect>
-           </property>
              <property name="font">
               <font>
                <pointsize>8</pointsize>
@@ -1796,15 +1778,9 @@
               <string>Apparat angelegt</string>
              </property>
             </widget>
+           </item>
+           <item>
             <widget class="QPushButton" name="btn_copy_adis_command">
-           <property name="geometry">
-            <rect>
-             <x>170</x>
-             <y>120</y>
-             <width>101</width>
-             <height>23</height>
-            </rect>
-           </property>
              <property name="font">
               <font>
                <pointsize>8</pointsize>
@@ -1831,7 +1807,7 @@
               <bool>false</bool>
              </property>
              <property name="text">
-            <string> aDIS Abfrage</string>
+              <string> aDIS Abfrage in Zwischenablage kopieren</string>
              </property>
              <property name="icon">
               <iconset>
@@ -1847,6 +1823,8 @@
               <bool>false</bool>
              </property>
             </widget>
+           </item>
+          </layout>
          </widget>
         </item>
        </layout>
@@ -1860,7 +1838,7 @@
       <x>1280</x>
       <y>20</y>
       <width>301</width>
-      <height>341</height>
+      <height>331</height>
      </rect>
     </property>
     <property name="frameShape">
@@ -1871,7 +1849,17 @@
     </property>
     <layout class="QVBoxLayout" name="verticalLayout_7">
      <item>
-      <layout class="QVBoxLayout" name="calendarlayout"/>
+      <layout class="QVBoxLayout" name="calendarlayout">
+       <item>
+        <widget class="QFrame" name="frame_creation_progress">
+         <layout class="QVBoxLayout" name="verticalLayout_4">
+          <property name="spacing">
+           <number>6</number>
+          </property>
+         </layout>
+        </widget>
+       </item>
+      </layout>
      </item>
     </layout>
    </widget>
@@ -1971,7 +1959,6 @@
   <tabstop>check_send_mail</tabstop>
   <tabstop>btn_apparat_save</tabstop>
   <tabstop>btn_apparat_apply</tabstop>
-  <tabstop>btn_copy_adis_command</tabstop>
   <tabstop>chkbx_show_del_media</tabstop>
   <tabstop>btn_reserve</tabstop>
   <tabstop>select_action_box</tabstop>