Mercurial > bmsapp / changeset

--- a/CMakeLists.txt	Fri Oct 13 14:47:21 2023 +0200
+++ b/CMakeLists.txt	Fri Oct 13 15:36:15 2023 +0200
@@ -344,7 +344,6 @@
     ${UIDIR}/DetailFermenter.ui
     ${UIDIR}/DetailCO2meter.ui
     ${UIDIR}/DetailiSpindel.ui
-    ${UIDIR}/CalibrateiSpindel.ui
     ${UIDIR}/ImportXML.ui
     ${UIDIR}/ImportBrew.ui
     ${UIDIR}/MainWindow.ui

--- a/src/CalibrateiSpindel.cpp	Fri Oct 13 14:47:21 2023 +0200
+++ b/src/CalibrateiSpindel.cpp	Fri Oct 13 15:36:15 2023 +0200
@@ -15,7 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "CalibrateiSpindel.h"
-#include "../ui/ui_CalibrateiSpindel.h"
 #include "global.h"
 #include "Utils.h"
 #include "MainWindow.h"
@@ -29,13 +28,26 @@
 #ifdef DEBUG_MONITOR
     qDebug() << "CalibrateiSpindel record:" << id;
 #endif
-    ui->setupUi(this);
-    this->recno = id;
-    setWindowFlags(Qt::Window | Qt::WindowTitleHint | Qt::CustomizeWindowHint);
-    setWindowTitle(tr("BMSapp - Calibrate iSpindel"));
 
-    connect(parent, SIGNAL(updateiSpindel(QString)), this, SLOT(refreshiSpindel(QString)));
-    emit refreshTable();
+    gridLayout = new QGridLayout(this);
+    gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+    tableCalData = new QTableWidget(this);
+    tableCalData->setObjectName(QString::fromUtf8("tableCalData"));
+    tableCalData->setEnabled(true);
+    QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
+    sizePolicy.setHorizontalStretch(0);
+    sizePolicy.setVerticalStretch(0);
+    tableCalData->setSizePolicy(sizePolicy);
+    tableCalData->setMinimumSize(QSize(1024, 0));
+    gridLayout->addWidget(tableCalData, 0, 0, 1, 1);
+
+//    ui->setupUi(this);
+//    this->recno = id;
+//    setWindowFlags(Qt::Window | Qt::WindowTitleHint | Qt::CustomizeWindowHint);
+//    setWindowTitle(tr("BMSapp - Calibrate iSpindel"));
+
+//    connect(parent, SIGNAL(updateiSpindel(QString)), this, SLOT(refreshiSpindel(QString)));
+//    emit refreshTable();
 }
 
 
@@ -60,7 +72,7 @@
 
 CalibrateiSpindel::~CalibrateiSpindel()
 {
-    delete ui;
+//    delete ui;
 }
 
 

--- a/translations/bmsapp_en.ts	Fri Oct 13 14:47:21 2023 +0200
+++ b/translations/bmsapp_en.ts	Fri Oct 13 15:36:15 2023 +0200
@@ -50,17 +50,7 @@
 <context>
     <name>CalibrateiSpindel</name>
     <message>
-        <location filename="../ui/CalibrateiSpindel.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/CalibrateiSpindel.ui" line="44"/>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="35"/>
+        <location filename="../src/CalibrateiSpindel.cpp" line="34"/>
         <source>BMSapp - Calibrate iSpindel</source>
         <translation type="unfinished"></translation>
     </message>

--- a/translations/bmsapp_nl.ts	Fri Oct 13 14:47:21 2023 +0200
+++ b/translations/bmsapp_nl.ts	Fri Oct 13 15:36:15 2023 +0200
@@ -80,9 +80,8 @@
 <context>
     <name>CalibrateiSpindel</name>
     <message>
-        <location filename="../ui/CalibrateiSpindel.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished">Dialog</translation>
+        <translation type="obsolete">Dialog</translation>
     </message>
     <message>
         <source>Uuid:</source>
@@ -97,12 +96,11 @@
         <translation type="obsolete">iSpindel overzicht</translation>
     </message>
     <message>
-        <location filename="../ui/CalibrateiSpindel.ui" line="44"/>
         <source>Quit</source>
-        <translation type="unfinished">Terug</translation>
-    </message>
-    <message>
-        <location filename="../src/CalibrateiSpindel.cpp" line="35"/>
+        <translation type="obsolete">Terug</translation>
+    </message>
+    <message>
+        <location filename="../src/CalibrateiSpindel.cpp" line="34"/>
         <source>BMSapp - Calibrate iSpindel</source>
         <translation type="unfinished"></translation>
     </message>

--- a/ui/CalibrateiSpindel.ui	Fri Oct 13 14:47:21 2023 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>CalibrateiSpindel</class>
- <widget class="QDialog" name="CalibrateiSpindel">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>1024</width>
-    <height>560</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Dialog</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
-    <widget class="QWidget" name="topWidget" native="true">
-     <widget class="QGroupBox" name="buttonBox">
-      <property name="geometry">
-       <rect>
-        <x>740</x>
-        <y>370</y>
-        <width>261</width>
-        <height>161</height>
-       </rect>
-      </property>
-      <widget class="QPushButton" name="quitButton">
-       <property name="geometry">
-        <rect>
-         <x>90</x>
-         <y>120</y>
-         <width>80</width>
-         <height>23</height>
-        </rect>
-       </property>
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>Quit</string>
-       </property>
-       <property name="icon">
-        <iconset>
-         <normaloff>:icons/silk/door_out.png</normaloff>:icons/silk/door_out.png</iconset>
-       </property>
-      </widget>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>quitButton</tabstop>
- </tabstops>
- <resources>
-  <include location="../../../../../../home/mbroek/MyProjects/bmsapp/resources/icons.qrc"/>
- </resources>
- <connections/>
-</ui>