Merge branch 'main' of https://gitea.enkelmann.info/torsten/HT-Multi

pyqt5.ui

@@ -1,17 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
+ <author>Torsten Enkelmann</author>
  <class>MainWindow</class>
  <widget class="QMainWindow" name="MainWindow">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>489</width>
-    <height>299</height>
+    <width>570</width>
+    <height>356</height>
    </rect>
   </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>500</width>
+    <height>305</height>
+   </size>
+  </property>
   <property name="windowTitle">
-   <string>TestApp</string>
+   <string>HT-Gui</string>
   </property>
   <widget class="QWidget" name="centralwidget">
    <widget class="QWidget" name="layoutWidget">
@@ -19,16 +32,25 @@
      <rect>
       <x>0</x>
       <y>0</y>
-      <width>361</width>
-      <height>181</height>
+      <width>491</width>
+      <height>261</height>
      </rect>
     </property>
     <layout class="QHBoxLayout" name="horizontalLayout">
+     <property name="sizeConstraint">
+      <enum>QLayout::SetMinAndMaxSize</enum>
+     </property>
      <property name="leftMargin">
       <number>0</number>
      </property>
      <item>
       <layout class="QVBoxLayout" name="verticalLayout">
+       <property name="spacing">
+        <number>4</number>
+       </property>
+       <property name="sizeConstraint">
+        <enum>QLayout::SetMinAndMaxSize</enum>
+       </property>
        <item>
         <widget class="QLabel" name="lbl_eins">
          <property name="text">
@@ -56,18 +78,28 @@
       </layout>
      </item>
      <item>
-      <widget class="QPushButton" name="pBtn_ok">
-       <property name="text">
-        <string>Okay</string>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <property name="sizeConstraint">
+        <enum>QLayout::SetMinAndMaxSize</enum>
        </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="pBtn_abbrechen">
-       <property name="text">
-        <string>Abbrechen</string>
-       </property>
-      </widget>
+       <item>
+        <widget class="QTableView" name="tbl_geraete"/>
+       </item>
+       <item>
+        <widget class="QPushButton" name="pBtn_ok">
+         <property name="text">
+          <string>Okay</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="pBtn_abbrechen">
+         <property name="text">
+          <string>Abbrechen</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
     </layout>
    </widget>
@@ -77,7 +109,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>489</width>
+     <width>570</width>
      <height>22</height>
     </rect>
    </property>

pyqt5_gui.py

@@ -16,27 +16,37 @@ from PySide6.QtGui import (QAction, QBrush, QColor, QConicalGradient,
     QIcon, QImage, QKeySequence, QLinearGradient,
     QPainter, QPalette, QPixmap, QRadialGradient,
     QTransform)
-from PySide6.QtWidgets import (QApplication, QHBoxLayout, QLabel, QMainWindow,
-    QMenu, QMenuBar, QPushButton, QSizePolicy,
-    QStatusBar, QVBoxLayout, QWidget)
+from PySide6.QtWidgets import (QApplication, QHBoxLayout, QHeaderView, QLabel,
+    QLayout, QMainWindow, QMenu, QMenuBar,
+    QPushButton, QSizePolicy, QStatusBar, QTableView,
+    QVBoxLayout, QWidget)
 
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
         if not MainWindow.objectName():
             MainWindow.setObjectName(u"MainWindow")
-        MainWindow.resize(489, 299)
+        MainWindow.resize(570, 356)
+        sizePolicy = QSizePolicy(QSizePolicy.MinimumExpanding, QSizePolicy.MinimumExpanding)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(MainWindow.sizePolicy().hasHeightForWidth())
+        MainWindow.setSizePolicy(sizePolicy)
+        MainWindow.setMinimumSize(QSize(500, 305))
         self.action_oeffnen = QAction(MainWindow)
         self.action_oeffnen.setObjectName(u"action_oeffnen")
         self.centralwidget = QWidget(MainWindow)
         self.centralwidget.setObjectName(u"centralwidget")
         self.layoutWidget = QWidget(self.centralwidget)
         self.layoutWidget.setObjectName(u"layoutWidget")
-        self.layoutWidget.setGeometry(QRect(0, 0, 361, 181))
+        self.layoutWidget.setGeometry(QRect(0, 0, 491, 261))
         self.horizontalLayout = QHBoxLayout(self.layoutWidget)
         self.horizontalLayout.setObjectName(u"horizontalLayout")
+        self.horizontalLayout.setSizeConstraint(QLayout.SetMinAndMaxSize)
         self.horizontalLayout.setContentsMargins(0, 0, 0, 0)
         self.verticalLayout = QVBoxLayout()
+        self.verticalLayout.setSpacing(4)
         self.verticalLayout.setObjectName(u"verticalLayout")
+        self.verticalLayout.setSizeConstraint(QLayout.SetMinAndMaxSize)
         self.lbl_eins = QLabel(self.layoutWidget)
         self.lbl_eins.setObjectName(u"lbl_eins")
         self.lbl_eins.setAlignment(Qt.AlignCenter)
@@ -56,20 +66,31 @@ class Ui_MainWindow(object):
 
         self.horizontalLayout.addLayout(self.verticalLayout)
 
+        self.verticalLayout_2 = QVBoxLayout()
+        self.verticalLayout_2.setObjectName(u"verticalLayout_2")
+        self.verticalLayout_2.setSizeConstraint(QLayout.SetMinAndMaxSize)
+        self.tbl_geraete = QTableView(self.layoutWidget)
+        self.tbl_geraete.setObjectName(u"tbl_geraete")
+
+        self.verticalLayout_2.addWidget(self.tbl_geraete)
+
         self.pBtn_ok = QPushButton(self.layoutWidget)
         self.pBtn_ok.setObjectName(u"pBtn_ok")
 
-        self.horizontalLayout.addWidget(self.pBtn_ok)
+        self.verticalLayout_2.addWidget(self.pBtn_ok)
 
         self.pBtn_abbrechen = QPushButton(self.layoutWidget)
         self.pBtn_abbrechen.setObjectName(u"pBtn_abbrechen")
 
-        self.horizontalLayout.addWidget(self.pBtn_abbrechen)
+        self.verticalLayout_2.addWidget(self.pBtn_abbrechen)
+
+
+        self.horizontalLayout.addLayout(self.verticalLayout_2)
 
         MainWindow.setCentralWidget(self.centralwidget)
         self.menubar = QMenuBar(MainWindow)
         self.menubar.setObjectName(u"menubar")
-        self.menubar.setGeometry(QRect(0, 0, 489, 22))
+        self.menubar.setGeometry(QRect(0, 0, 570, 22))
         self.menuDatei = QMenu(self.menubar)
         self.menuDatei.setObjectName(u"menuDatei")
         MainWindow.setMenuBar(self.menubar)
@@ -86,7 +107,7 @@ class Ui_MainWindow(object):
     # setupUi
 
     def retranslateUi(self, MainWindow):
-        MainWindow.setWindowTitle(QCoreApplication.translate("MainWindow", u"TestApp", None))
+        MainWindow.setWindowTitle(QCoreApplication.translate("MainWindow", u"HT-Gui", None))
         self.action_oeffnen.setText(QCoreApplication.translate("MainWindow", u"&\u00f6ffnen", None))
         self.lbl_eins.setText(QCoreApplication.translate("MainWindow", u"Das Label", None))
         self.pBtn_laden.setText(QCoreApplication.translate("MainWindow", u"Laden", None))

pyqt5_ui.py

@@ -0,0 +1,119 @@
+# -*- coding: utf-8 -*-
+
+################################################################################
+## Form generated from reading UI file 'pyqt5.ui'
+##
+## Created by: Qt User Interface Compiler version 6.6.0
+##
+## WARNING! All changes made in this file will be lost when recompiling UI file!
+################################################################################
+
+from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale,
+    QMetaObject, QObject, QPoint, QRect,
+    QSize, QTime, QUrl, Qt)
+from PySide6.QtGui import (QAction, QBrush, QColor, QConicalGradient,
+    QCursor, QFont, QFontDatabase, QGradient,
+    QIcon, QImage, QKeySequence, QLinearGradient,
+    QPainter, QPalette, QPixmap, QRadialGradient,
+    QTransform)
+from PySide6.QtWidgets import (QApplication, QHBoxLayout, QHeaderView, QLabel,
+    QLayout, QMainWindow, QMenu, QMenuBar,
+    QPushButton, QSizePolicy, QStatusBar, QTableView,
+    QVBoxLayout, QWidget)
+
+class Ui_MainWindow(object):
+    def setupUi(self, MainWindow):
+        if not MainWindow.objectName():
+            MainWindow.setObjectName(u"MainWindow")
+        MainWindow.resize(570, 356)
+        sizePolicy = QSizePolicy(QSizePolicy.MinimumExpanding, QSizePolicy.MinimumExpanding)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(MainWindow.sizePolicy().hasHeightForWidth())
+        MainWindow.setSizePolicy(sizePolicy)
+        MainWindow.setMinimumSize(QSize(500, 305))
+        self.action_oeffnen = QAction(MainWindow)
+        self.action_oeffnen.setObjectName(u"action_oeffnen")
+        self.centralwidget = QWidget(MainWindow)
+        self.centralwidget.setObjectName(u"centralwidget")
+        self.layoutWidget = QWidget(self.centralwidget)
+        self.layoutWidget.setObjectName(u"layoutWidget")
+        self.layoutWidget.setGeometry(QRect(0, 0, 491, 261))
+        self.horizontalLayout = QHBoxLayout(self.layoutWidget)
+        self.horizontalLayout.setObjectName(u"horizontalLayout")
+        self.horizontalLayout.setSizeConstraint(QLayout.SetMinAndMaxSize)
+        self.horizontalLayout.setContentsMargins(0, 0, 0, 0)
+        self.verticalLayout = QVBoxLayout()
+        self.verticalLayout.setSpacing(4)
+        self.verticalLayout.setObjectName(u"verticalLayout")
+        self.verticalLayout.setSizeConstraint(QLayout.SetMinAndMaxSize)
+        self.lbl_eins = QLabel(self.layoutWidget)
+        self.lbl_eins.setObjectName(u"lbl_eins")
+        self.lbl_eins.setAlignment(Qt.AlignCenter)
+
+        self.verticalLayout.addWidget(self.lbl_eins)
+
+        self.pBtn_laden = QPushButton(self.layoutWidget)
+        self.pBtn_laden.setObjectName(u"pBtn_laden")
+
+        self.verticalLayout.addWidget(self.pBtn_laden)
+
+        self.pBtn_schliessen = QPushButton(self.layoutWidget)
+        self.pBtn_schliessen.setObjectName(u"pBtn_schliessen")
+
+        self.verticalLayout.addWidget(self.pBtn_schliessen)
+
+
+        self.horizontalLayout.addLayout(self.verticalLayout)
+
+        self.verticalLayout_2 = QVBoxLayout()
+        self.verticalLayout_2.setObjectName(u"verticalLayout_2")
+        self.verticalLayout_2.setSizeConstraint(QLayout.SetMinAndMaxSize)
+        self.tbl_geraete = QTableView(self.layoutWidget)
+        self.tbl_geraete.setObjectName(u"tbl_geraete")
+
+        self.verticalLayout_2.addWidget(self.tbl_geraete)
+
+        self.pBtn_ok = QPushButton(self.layoutWidget)
+        self.pBtn_ok.setObjectName(u"pBtn_ok")
+
+        self.verticalLayout_2.addWidget(self.pBtn_ok)
+
+        self.pBtn_abbrechen = QPushButton(self.layoutWidget)
+        self.pBtn_abbrechen.setObjectName(u"pBtn_abbrechen")
+
+        self.verticalLayout_2.addWidget(self.pBtn_abbrechen)
+
+
+        self.horizontalLayout.addLayout(self.verticalLayout_2)
+
+        MainWindow.setCentralWidget(self.centralwidget)
+        self.menubar = QMenuBar(MainWindow)
+        self.menubar.setObjectName(u"menubar")
+        self.menubar.setGeometry(QRect(0, 0, 570, 22))
+        self.menuDatei = QMenu(self.menubar)
+        self.menuDatei.setObjectName(u"menuDatei")
+        MainWindow.setMenuBar(self.menubar)
+        self.statusbar = QStatusBar(MainWindow)
+        self.statusbar.setObjectName(u"statusbar")
+        MainWindow.setStatusBar(self.statusbar)
+
+        self.menubar.addAction(self.menuDatei.menuAction())
+        self.menuDatei.addAction(self.action_oeffnen)
+
+        self.retranslateUi(MainWindow)
+
+        QMetaObject.connectSlotsByName(MainWindow)
+    # setupUi
+
+    def retranslateUi(self, MainWindow):
+        MainWindow.setWindowTitle(QCoreApplication.translate("MainWindow", u"HT-Gui", None))
+        self.action_oeffnen.setText(QCoreApplication.translate("MainWindow", u"&\u00f6ffnen", None))
+        self.lbl_eins.setText(QCoreApplication.translate("MainWindow", u"Das Label", None))
+        self.pBtn_laden.setText(QCoreApplication.translate("MainWindow", u"Laden", None))
+        self.pBtn_schliessen.setText(QCoreApplication.translate("MainWindow", u"Schlie\u00dfen", None))
+        self.pBtn_ok.setText(QCoreApplication.translate("MainWindow", u"Okay", None))
+        self.pBtn_abbrechen.setText(QCoreApplication.translate("MainWindow", u"Abbrechen", None))
+        self.menuDatei.setTitle(QCoreApplication.translate("MainWindow", u"Datei", None))
+    # retranslateUi
+