--- a/src/InventoryFermentables.cpp Sun Mar 20 14:08:05 2022 +0100
+++ b/src/InventoryFermentables.cpp Sun Mar 20 15:51:09 2022 +0100
@@ -16,19 +16,79 @@
*/
#include "InventoryFermentables.h"
#include "EditFermentable.h"
-#include "../ui/ui_InventoryFermentables.h"
+#include "MainWindow.h"
#include "config.h"
#include "bmsapp.h"
-InventoryFermentables::InventoryFermentables(QWidget *parent) : QDialog(parent), ui(new Ui::InventoryFermentables)
+InventoryFermentables::InventoryFermentables(QWidget *parent) : QDialog(parent)
{
qDebug() << "InventoryFermentables start";
- ui->setupUi(this);
+ gridLayout = new QGridLayout(this);
+ gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+ tableFermentables = new QTableWidget(this);
+ tableFermentables->setObjectName(QString::fromUtf8("tableFermentables"));
+ tableFermentables->setEnabled(true);
+ QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
+ sizePolicy.setHorizontalStretch(0);
+ sizePolicy.setVerticalStretch(0);
+ //sizePolicy.setHeightForWidth(tableFermentables->sizePolicy().hasHeightForWidth());
+ tableFermentables->setSizePolicy(sizePolicy);
+ tableFermentables->setMinimumSize(QSize(1074, 0));
+ gridLayout->addWidget(tableFermentables, 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(fromInventoryFermentables()));
+ 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 Fermentables").arg(VERSIONSTRING) );
}
@@ -44,39 +104,39 @@
const QStringList graintypes({tr("Base"), tr("Roast"), tr("Crystal"), tr("Kilned"), tr("Sour Malt"), tr("Special"), tr("No malt")});
/* origin supplier name type graintype color yield inventory Edit */
- ui->tableFermentables->setColumnCount(9);
- ui->tableFermentables->setColumnWidth(0, 130); /* Origin */
- ui->tableFermentables->setColumnWidth(1, 170); /* Supplier */
- ui->tableFermentables->setColumnWidth(2, 250); /* Name */
- ui->tableFermentables->setColumnWidth(3, 90); /* Type */
- ui->tableFermentables->setColumnWidth(4, 90); /* Graintype */
- ui->tableFermentables->setColumnWidth(5, 80); /* Color */
- ui->tableFermentables->setColumnWidth(6, 80); /* Yield */
- ui->tableFermentables->setColumnWidth(7, 80); /* Stock */
- ui->tableFermentables->setColumnWidth(8, 80); /* Edit button */
- ui->tableFermentables->setRowCount(query.size());
- ui->tableFermentables->setHorizontalHeaderLabels(labels);
- ui->tableFermentables->verticalHeader()->hide();
- ui->tableFermentables->setFixedSize(1050 + 24, 640); /* Even if this is too large, it works */
+ this->tableFermentables->setColumnCount(9);
+ this->tableFermentables->setColumnWidth(0, 130); /* Origin */
+ this->tableFermentables->setColumnWidth(1, 170); /* Supplier */
+ this->tableFermentables->setColumnWidth(2, 250); /* Name */
+ this->tableFermentables->setColumnWidth(3, 90); /* Type */
+ this->tableFermentables->setColumnWidth(4, 90); /* Graintype */
+ this->tableFermentables->setColumnWidth(5, 80); /* Color */
+ this->tableFermentables->setColumnWidth(6, 80); /* Yield */
+ this->tableFermentables->setColumnWidth(7, 80); /* Stock */
+ this->tableFermentables->setColumnWidth(8, 80); /* Edit button */
+ this->tableFermentables->setRowCount(query.size());
+ this->tableFermentables->setHorizontalHeaderLabels(labels);
+ this->tableFermentables->verticalHeader()->hide();
+ //ui->tableFermentables->setFixedSize(1050 + 24, 640); /* Even if this is too large, it works */
QTableWidgetItem *rightitem = new QTableWidgetItem();
rightitem->setTextAlignment(Qt::AlignRight);
query.first();
for (int ridx = 0 ; ridx < query.size() ; ridx++ ) {
- ui->tableFermentables->setItem(ridx, 0, new QTableWidgetItem(query.value(6).toString()));
- ui->tableFermentables->setItem(ridx, 1, new QTableWidgetItem(query.value(7).toString()));
- ui->tableFermentables->setItem(ridx, 2, new QTableWidgetItem(query.value(1).toString()));
- ui->tableFermentables->setItem(ridx, 3, new QTableWidgetItem(types[query.value(2).toInt()]));
- ui->tableFermentables->setItem(ridx, 4, new QTableWidgetItem(graintypes[query.value(20).toInt()]));
+ this->tableFermentables->setItem(ridx, 0, new QTableWidgetItem(query.value(6).toString()));
+ this->tableFermentables->setItem(ridx, 1, new QTableWidgetItem(query.value(7).toString()));
+ this->tableFermentables->setItem(ridx, 2, new QTableWidgetItem(query.value(1).toString()));
+ this->tableFermentables->setItem(ridx, 3, new QTableWidgetItem(types[query.value(2).toInt()]));
+ this->tableFermentables->setItem(ridx, 4, new QTableWidgetItem(graintypes[query.value(20).toInt()]));
w = QString("%1 EBC").arg(query.value(4).toDouble(), 1, 'f', 0, '0' );
QTableWidgetItem *item = new QTableWidgetItem(w);
item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
- ui->tableFermentables->setItem(ridx, 5, item);
+ this->tableFermentables->setItem(ridx, 5, item);
w = QString("%1 %").arg(query.value(3).toFloat(), 3, 'f', 1, '0' );
item = new QTableWidgetItem(w);
item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
- ui->tableFermentables->setItem(ridx, 6, item);
+ this->tableFermentables->setItem(ridx, 6, item);
w = QString("");
if (query.value(21).toDouble() > 0) {
if (query.value(21).toDouble() < 1.000) {
@@ -87,7 +147,7 @@
}
item = new QTableWidgetItem(w);
item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
- ui->tableFermentables->setItem(ridx, 7, item);
+ this->tableFermentables->setItem(ridx, 7, item);
/* Add the Edit button */
QWidget* pWidget = new QWidget();
@@ -99,7 +159,7 @@
pLayout->addWidget(btn_edit);
pLayout->setContentsMargins(5, 0, 5, 0);
pWidget->setLayout(pLayout);
- ui->tableFermentables->setCellWidget(ridx, 8, pWidget);
+ this->tableFermentables->setCellWidget(ridx, 8, pWidget);
query.next();
}
@@ -110,7 +170,6 @@
InventoryFermentables::~InventoryFermentables()
{
qDebug() << "InventoryFermentables done";
- delete ui;
}
@@ -130,14 +189,12 @@
{
QPushButton *pb = qobject_cast<QPushButton *>(QObject::sender());
int recno = pb->objectName().toInt();
- qDebug() << Q_FUNC_INFO << recno;
edit(recno);
}
void InventoryFermentables::on_insertButton_clicked()
{
- qDebug() << Q_FUNC_INFO;
edit(-1);
}
@@ -208,9 +265,3 @@
file.close();
}
-
-void InventoryFermentables::on_quitButton_clicked()
-{
- emit firstWindow();
-}
-