diff -r 228cb2a01acf -r 556b4202c5e7 src/InventoryYeasts.cpp --- a/src/InventoryYeasts.cpp Sun Mar 20 16:13:26 2022 +0100 +++ b/src/InventoryYeasts.cpp Sun Mar 20 16:49:50 2022 +0100 @@ -16,19 +16,78 @@ */ #include "InventoryYeasts.h" #include "EditYeast.h" -#include "../ui/ui_InventoryYeasts.h" +#include "MainWindow.h" #include "config.h" #include "bmsapp.h" -InventoryYeasts::InventoryYeasts(QWidget *parent) : QDialog(parent), ui(new Ui::InventoryYeasts) +InventoryYeasts::InventoryYeasts(QWidget *parent) : QDialog(parent) { qDebug() << "InventoryYeasts start"; - ui->setupUi(this); + gridLayout = new QGridLayout(this); + gridLayout->setObjectName(QString::fromUtf8("gridLayout")); + tableYeasts = new QTableWidget(this); + tableYeasts->setObjectName(QString::fromUtf8("tableYeasts")); + tableYeasts->setEnabled(true); + QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding); + sizePolicy.setHorizontalStretch(0); + sizePolicy.setVerticalStretch(0); + tableYeasts->setSizePolicy(sizePolicy); + tableYeasts->setMinimumSize(QSize(1094, 0)); + gridLayout->addWidget(tableYeasts, 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); + + exportButton = new QPushButton(groupBox); + exportButton->setObjectName(QString::fromUtf8("exportButton")); + exportButton->setMinimumSize(QSize(80, 24)); + exportButton->setText(tr("Export")); + QIcon icon1; + icon1.addFile(QString::fromUtf8(":/icons/silk/database_save.png"), QSize(), QIcon::Normal, QIcon::Off); + exportButton->setIcon(icon1); + horizontalLayout->addWidget(exportButton, 0, Qt::AlignRight); + + importButton = new QPushButton(groupBox); + importButton->setObjectName(QString::fromUtf8("importButton")); + importButton->setMinimumSize(QSize(80, 24)); + importButton->setText(tr("Import")); + QIcon icon2; + icon2.addFile(QString::fromUtf8(":/icons/silk/database_add.png"), QSize(), QIcon::Normal, QIcon::Off); + importButton->setIcon(icon2); + horizontalLayout->addWidget(importButton, 0, Qt::AlignRight); + + 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(fromInventoryYeasts())); + connect(insertButton, SIGNAL(clicked()), this, SLOT(on_insertButton_clicked())); + connect(exportButton, SIGNAL(clicked()), this, SLOT(on_exportButton_clicked())); +// connect(importButton, SIGNAL(clicked()), this, SLOT(on_importButton_clicked())); emit refreshTable(); - - setWindowTitle( QString("BMSapp - %1 - Inventory Yeasts").arg(VERSIONSTRING) ); } @@ -47,43 +106,42 @@ const QStringList form({tr("Liquid"), tr("Dry"), tr("Slant"), tr("Culture"), tr("Frozen"), tr("Bottle"), tr("Dried")}); /* origin supplier name type graintype color yield inventory Edit */ - ui->tableYeasts->setColumnCount(11); - ui->tableYeasts->setColumnWidth(0, 120); /* Laboratory */ - ui->tableYeasts->setColumnWidth(1, 120); /* Product ID */ - ui->tableYeasts->setColumnWidth(2, 250); /* Name */ - ui->tableYeasts->setColumnWidth(3, 70); /* Type */ - ui->tableYeasts->setColumnWidth(4, 70); /* Form */ - ui->tableYeasts->setColumnWidth(5, 80); /* SVG */ - ui->tableYeasts->setColumnWidth(6, 80); /* Tolerance */ - ui->tableYeasts->setColumnWidth(7, 60); /* POF+ */ - ui->tableYeasts->setColumnWidth(8, 60); /* STA1 */ - ui->tableYeasts->setColumnWidth(9, 80); /* Stock */ - ui->tableYeasts->setColumnWidth(10, 80); /* Edit button */ - ui->tableYeasts->setRowCount(query.size()); - ui->tableYeasts->setHorizontalHeaderLabels(labels); - ui->tableYeasts->verticalHeader()->hide(); - ui->tableYeasts->setFixedSize(1070 + 24, 640); /* Even if this is too large, it works */ + this->tableYeasts->setColumnCount(11); + this->tableYeasts->setColumnWidth(0, 120); /* Laboratory */ + this->tableYeasts->setColumnWidth(1, 120); /* Product ID */ + this->tableYeasts->setColumnWidth(2, 250); /* Name */ + this->tableYeasts->setColumnWidth(3, 70); /* Type */ + this->tableYeasts->setColumnWidth(4, 70); /* Form */ + this->tableYeasts->setColumnWidth(5, 80); /* SVG */ + this->tableYeasts->setColumnWidth(6, 80); /* Tolerance */ + this->tableYeasts->setColumnWidth(7, 60); /* POF+ */ + this->tableYeasts->setColumnWidth(8, 60); /* STA1 */ + this->tableYeasts->setColumnWidth(9, 80); /* Stock */ + this->tableYeasts->setColumnWidth(10, 80); /* Edit button */ + this->tableYeasts->setRowCount(query.size()); + this->tableYeasts->setHorizontalHeaderLabels(labels); + this->tableYeasts->verticalHeader()->hide(); QTableWidgetItem *rightitem = new QTableWidgetItem(); rightitem->setTextAlignment(Qt::AlignRight); query.first(); for (int ridx = 0 ; ridx < query.size() ; ridx++ ) { - ui->tableYeasts->setItem(ridx, 0, new QTableWidgetItem(query.value(4).toString())); /* Laboratory */ - ui->tableYeasts->setItem(ridx, 1, new QTableWidgetItem(query.value(5).toString())); /* Product id */ - ui->tableYeasts->setItem(ridx, 2, new QTableWidgetItem(query.value(1).toString())); /* Name */ - ui->tableYeasts->setItem(ridx, 3, new QTableWidgetItem(types[query.value(2).toInt()])); /* Type */ - ui->tableYeasts->setItem(ridx, 4, new QTableWidgetItem(form[query.value(3).toInt()])); /* Form */ + this->tableYeasts->setItem(ridx, 0, new QTableWidgetItem(query.value(4).toString())); /* Laboratory */ + this->tableYeasts->setItem(ridx, 1, new QTableWidgetItem(query.value(5).toString())); /* Product id */ + this->tableYeasts->setItem(ridx, 2, new QTableWidgetItem(query.value(1).toString())); /* Name */ + this->tableYeasts->setItem(ridx, 3, new QTableWidgetItem(types[query.value(2).toInt()])); /* Type */ + this->tableYeasts->setItem(ridx, 4, new QTableWidgetItem(form[query.value(3).toInt()])); /* Form */ w = QString("%1 %").arg(query.value(9).toDouble(), 2, 'f', 1, '0' ); /* Attenuation% */ QTableWidgetItem *item = new QTableWidgetItem(w); item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); - ui->tableYeasts->setItem(ridx, 5, item); + this->tableYeasts->setItem(ridx, 5, item); w = QString(""); if (query.value(10).toDouble() > 0) w = QString("%1 %").arg(query.value(10).toDouble(), 2, 'f', 1, '0' ); /* Alcohol% */ item = new QTableWidgetItem(w); item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); - ui->tableYeasts->setItem(ridx, 6, item); + this->tableYeasts->setItem(ridx, 6, item); if (query.value(24).toInt()) { pWidget = new QWidget(); @@ -94,9 +152,9 @@ pLayout->setAlignment(Qt::AlignCenter); pLayout->setContentsMargins(0, 0, 0, 0); pWidget->setLayout(pLayout); - ui->tableYeasts->setCellWidget(ridx, 7, pWidget); + this->tableYeasts->setCellWidget(ridx, 7, pWidget); } else { - ui->tableYeasts->removeCellWidget(ridx, 7); + this->tableYeasts->removeCellWidget(ridx, 7); } if (query.value(19).toInt()) { pWidget = new QWidget(); @@ -107,9 +165,9 @@ pLayout->setAlignment(Qt::AlignCenter); pLayout->setContentsMargins(0, 0, 0, 0); pWidget->setLayout(pLayout); - ui->tableYeasts->setCellWidget(ridx, 8, pWidget); + this->tableYeasts->setCellWidget(ridx, 8, pWidget); } else { - ui->tableYeasts->removeCellWidget(ridx, 8); + this->tableYeasts->removeCellWidget(ridx, 8); } w = QString(""); @@ -126,7 +184,7 @@ } item = new QTableWidgetItem(w); item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); - ui->tableYeasts->setItem(ridx, 9, item); + this->tableYeasts->setItem(ridx, 9, item); /* Add the Edit button */ pWidget = new QWidget(); @@ -138,25 +196,17 @@ pLayout->addWidget(btn_edit); pLayout->setContentsMargins(5, 0, 5, 0); pWidget->setLayout(pLayout); - ui->tableYeasts->setCellWidget(ridx, 10, pWidget); + this->tableYeasts->setCellWidget(ridx, 10, pWidget); query.next(); } - - setWindowTitle( QString("BMSapp - %1 - Inventory Yeasts").arg(VERSIONSTRING) ); } -InventoryYeasts::~InventoryYeasts() -{ - qDebug() << "InventoryYeasts done"; - delete ui; -} +InventoryYeasts::~InventoryYeasts() {} void InventoryYeasts::edit(int recno) { - qDebug() << "InventoryYeasts edit:" << recno; - EditYeast dialog(recno, this); /* Signal from editor if a refresh is needed */ connect(&dialog, SIGNAL(entry_changed()), this, SLOT(refreshTable())); @@ -169,14 +219,12 @@ { QPushButton *pb = qobject_cast(QObject::sender()); int recno = pb->objectName().toInt(); - qDebug() << Q_FUNC_INFO << recno; edit(recno); } void InventoryYeasts::on_insertButton_clicked() { - qDebug() << Q_FUNC_INFO; edit(-1); } @@ -241,9 +289,3 @@ file.close(); } - -void InventoryYeasts::on_quitButton_clicked() -{ - emit firstWindow(); -} -