diff -r 93395c4d6c8d -r 86a3277a7317 src/ProfileFerments.cpp --- a/src/ProfileFerments.cpp Sun Mar 20 21:24:13 2022 +0100 +++ b/src/ProfileFerments.cpp Sun Mar 20 21:39:06 2022 +0100 @@ -16,19 +16,58 @@ */ #include "ProfileFerments.h" #include "EditProfileFerment.h" -#include "../ui/ui_ProfileFerments.h" +#include "MainWindow.h" #include "config.h" #include "bmsapp.h" -ProfileFerments::ProfileFerments(QWidget *parent) : QDialog(parent), ui(new Ui::ProfileFerments) +ProfileFerments::ProfileFerments(QWidget *parent) : QDialog(parent) { qDebug() << "ProfileFerments start"; - ui->setupUi(this); + gridLayout = new QGridLayout(this); + gridLayout->setObjectName(QString::fromUtf8("gridLayout")); + tableFerments = new QTableWidget(this); + tableFerments->setObjectName(QString::fromUtf8("tableFerments")); + tableFerments->setEnabled(true); + QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding); + sizePolicy.setHorizontalStretch(0); + sizePolicy.setVerticalStretch(0); + tableFerments->setSizePolicy(sizePolicy); + tableFerments->setMinimumSize(QSize(1004, 0)); + gridLayout->addWidget(tableFerments, 0, 0, 1, 1); + + groupBox = new QGroupBox(this); + groupBox->setObjectName(QString::fromUtf8("groupBox")); + groupBox->setEnabled(true); + groupBox->setFlat(false); + horizontalLayout = new QHBoxLayout(groupBox); + horizontalLayout->setSpacing(6); + horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout")); + horizontalLayout->setContentsMargins(0, 0, 0, 0); + + quitButton = new QPushButton(groupBox); + quitButton->setObjectName(QString::fromUtf8("quitButton")); + quitButton->setMinimumSize(QSize(80, 24)); + quitButton->setText(tr("Quit")); + QIcon icon; + icon.addFile(QString::fromUtf8(":icons/silk/door_out.png"), QSize(), QIcon::Normal, QIcon::Off); + quitButton->setIcon(icon); + horizontalLayout->addWidget(quitButton, 0, Qt::AlignLeft); + + insertButton = new QPushButton(groupBox); + insertButton->setObjectName(QString::fromUtf8("insertButton")); + insertButton->setMinimumSize(QSize(80, 24)); + insertButton->setText(tr("New")); + QIcon icon3; + icon3.addFile(QString::fromUtf8(":icons/silk/table_row_insert.png"), QSize(), QIcon::Normal, QIcon::Off); + insertButton->setIcon(icon3); + horizontalLayout->addWidget(insertButton, 0, Qt::AlignRight); + gridLayout->addWidget(groupBox, 1, 0, 1, 1); + + connect(quitButton, SIGNAL(clicked()), parent, SLOT(fromProfileFerments())); + connect(insertButton, SIGNAL(clicked()), this, SLOT(on_insertButton_clicked())); emit refreshTable(); - - setWindowTitle( QString("BMSapp - %1 - Profile Fermentation").arg(VERSIONSTRING) ); } @@ -44,50 +83,49 @@ QSqlQuery query("SELECT * FROM profile_fermentation ORDER BY name"); const QStringList labels({tr("Name"), tr("Start low"), tr("Start high"), tr("Sensor"), tr("Steps"), tr("Duration"), tr("Edit")}); - ui->tableFerments->setColumnCount(7); - ui->tableFerments->setColumnWidth(0, 450); /* Name */ - ui->tableFerments->setColumnWidth(1, 90); /* Min temp */ - ui->tableFerments->setColumnWidth(2, 90); /* Max temp */ - ui->tableFerments->setColumnWidth(3, 75); /* Sensor */ - ui->tableFerments->setColumnWidth(4, 75); /* Steps */ - ui->tableFerments->setColumnWidth(5, 120); /* Duration */ - ui->tableFerments->setColumnWidth(6, 80); /* Edit button */ - ui->tableFerments->setRowCount(query.size()); - ui->tableFerments->setHorizontalHeaderLabels(labels); - ui->tableFerments->verticalHeader()->hide(); - ui->tableFerments->setFixedSize(980 + 24, 640); /* Even if this is too large, it works */ + this->tableFerments->setColumnCount(7); + this->tableFerments->setColumnWidth(0, 450); /* Name */ + this->tableFerments->setColumnWidth(1, 90); /* Min temp */ + this->tableFerments->setColumnWidth(2, 90); /* Max temp */ + this->tableFerments->setColumnWidth(3, 75); /* Sensor */ + this->tableFerments->setColumnWidth(4, 75); /* Steps */ + this->tableFerments->setColumnWidth(5, 120); /* Duration */ + this->tableFerments->setColumnWidth(6, 80); /* Edit button */ + this->tableFerments->setRowCount(query.size()); + this->tableFerments->setHorizontalHeaderLabels(labels); + this->tableFerments->verticalHeader()->hide(); QTableWidgetItem *rightitem = new QTableWidgetItem(); rightitem->setTextAlignment(Qt::AlignRight); query.first(); for (int ridx = 0 ; ridx < query.size() ; ridx++ ) { - ui->tableFerments->setItem(ridx, 0, new QTableWidgetItem(query.value(2).toString())); /* Name */ + this->tableFerments->setItem(ridx, 0, new QTableWidgetItem(query.value(2).toString())); /* Name */ w = QString("%1 °C").arg(query.value(3).toDouble(), 2, 'f', 1, '0' ); /* Min start temp */ QTableWidgetItem *item = new QTableWidgetItem(w); item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); - ui->tableFerments->setItem(ridx, 1, item); + this->tableFerments->setItem(ridx, 1, item); w = QString("%1 °C").arg(query.value(4).toDouble(), 2, 'f', 1, '0' ); /* Max start temp */ item = new QTableWidgetItem(w); item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); - ui->tableFerments->setItem(ridx, 2, item); + this->tableFerments->setItem(ridx, 2, item); w = (query.value(5).toInt()) ? tr("Fridge") : tr("Beer"); /* Initial sensor */ item = new QTableWidgetItem(w); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); - ui->tableFerments->setItem(ridx, 3, item); + this->tableFerments->setItem(ridx, 3, item); w = QString("%1").arg(query.value(6).toInt()); /* Number of steps */ item = new QTableWidgetItem(w); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); - ui->tableFerments->setItem(ridx, 4, item); + this->tableFerments->setItem(ridx, 4, item); w = Utils::hours_to_string(query.value(7).toInt()); /* Duration */ item = new QTableWidgetItem(w); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); - ui->tableFerments->setItem(ridx, 5, item); + this->tableFerments->setItem(ridx, 5, item); /* Add the Edit button */ pWidget = new QWidget(); @@ -99,23 +137,17 @@ pLayout->addWidget(btn_edit); pLayout->setContentsMargins(5, 0, 5, 0); pWidget->setLayout(pLayout); - ui->tableFerments->setCellWidget(ridx, 6, pWidget); + this->tableFerments->setCellWidget(ridx, 6, pWidget); query.next(); } } -ProfileFerments::~ProfileFerments() -{ - qDebug() << "ProfileFerments done"; - delete ui; -} +ProfileFerments::~ProfileFerments() {} void ProfileFerments::edit(int recno) { - qDebug() << "ProfileFerments edit:" << recno; - EditProfileFerment dialog(recno, this); /* Signal from editor if a refresh is needed */ connect(&dialog, SIGNAL(entry_changed()), this, SLOT(refreshTable())); @@ -128,20 +160,13 @@ { QPushButton *pb = qobject_cast(QObject::sender()); int recno = pb->objectName().toInt(); - qDebug() << Q_FUNC_INFO << recno; edit(recno); } void ProfileFerments::on_insertButton_clicked() { - qDebug() << Q_FUNC_INFO; edit(-1); } -void ProfileFerments::on_quitButton_clicked() -{ - emit firstWindow(); -} -