# HG changeset patch # User Michiel Broek # Date 1697204175 -7200 # Node ID ea7cf64c9a6c547e836421fdc79491dd6aea37e7 # Parent 61c114afb0eeadbde5321a8333d3a46d6a23f904 Attempt 1 diff -r 61c114afb0ee -r ea7cf64c9a6c CMakeLists.txt --- 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 diff -r 61c114afb0ee -r ea7cf64c9a6c src/CalibrateiSpindel.cpp --- 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 . */ #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; } diff -r 61c114afb0ee -r ea7cf64c9a6c translations/bmsapp_en.ts --- 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 @@ CalibrateiSpindel - - Dialog - - - - - Quit - - - - + BMSapp - Calibrate iSpindel diff -r 61c114afb0ee -r ea7cf64c9a6c translations/bmsapp_nl.ts --- 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 @@ CalibrateiSpindel - Dialog - Dialog + Dialog Uuid: @@ -97,12 +96,11 @@ iSpindel overzicht - Quit - Terug - - - + Terug + + + BMSapp - Calibrate iSpindel diff -r 61c114afb0ee -r ea7cf64c9a6c ui/CalibrateiSpindel.ui --- 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 @@ - - - CalibrateiSpindel - - - - 0 - 0 - 1024 - 560 - - - - Dialog - - - - - - - - 740 - 370 - 261 - 161 - - - - - - 90 - 120 - 80 - 23 - - - - - 0 - 0 - - - - Quit - - - - :icons/silk/door_out.png:icons/silk/door_out.png - - - - - - - - - quitButton - - - - - -