--- a/src/InventoryEquipments.cpp Sun Mar 20 17:33:18 2022 +0100
+++ b/src/InventoryEquipments.cpp Sun Mar 20 19:44:32 2022 +0100
@@ -16,19 +16,78 @@
*/
#include "InventoryEquipments.h"
#include "EditEquipment.h"
-#include "../ui/ui_InventoryEquipments.h"
+#include "MainWindow.h"
#include "config.h"
#include "bmsapp.h"
-InventoryEquipments::InventoryEquipments(QWidget *parent) : QDialog(parent), ui(new Ui::InventoryEquipments)
+InventoryEquipments::InventoryEquipments(QWidget *parent) : QDialog(parent)
{
qDebug() << "InventoryEquipments start";
- ui->setupUi(this);
+ gridLayout = new QGridLayout(this);
+ gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+ tableEquipments = new QTableWidget(this);
+ tableEquipments->setObjectName(QString::fromUtf8("tableEquipments"));
+ tableEquipments->setEnabled(true);
+ QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
+ sizePolicy.setHorizontalStretch(0);
+ sizePolicy.setVerticalStretch(0);
+ tableEquipments->setSizePolicy(sizePolicy);
+ tableEquipments->setMinimumSize(QSize(1144, 0));
+ gridLayout->addWidget(tableEquipments, 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(fromInventoryEquipments()));
+ 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 Equipments").arg(VERSIONSTRING) );
}
@@ -41,32 +100,31 @@
QSqlQuery query("SELECT * FROM inventory_equipments ORDER BY name");
const QStringList labels({tr("Name"), tr("Boil volume"), tr("Batch size"), tr("Notes"), tr("Edit")});
- ui->tableEquipments->setColumnCount(5);
- ui->tableEquipments->setColumnWidth(0, 180); /* Name */
- ui->tableEquipments->setColumnWidth(1, 90); /* Boil volume */
- ui->tableEquipments->setColumnWidth(2, 90); /* Batch size */
- ui->tableEquipments->setColumnWidth(3, 680); /* Notes */
- ui->tableEquipments->setColumnWidth(4, 80); /* Edit button */
- ui->tableEquipments->setRowCount(query.size());
- ui->tableEquipments->setHorizontalHeaderLabels(labels);
- ui->tableEquipments->verticalHeader()->hide();
- ui->tableEquipments->setFixedSize(1120 + 24, 640); /* Even if this is too large, it works */
+ this->tableEquipments->setColumnCount(5);
+ this->tableEquipments->setColumnWidth(0, 180); /* Name */
+ this->tableEquipments->setColumnWidth(1, 90); /* Boil volume */
+ this->tableEquipments->setColumnWidth(2, 90); /* Batch size */
+ this->tableEquipments->setColumnWidth(3, 680); /* Notes */
+ this->tableEquipments->setColumnWidth(4, 80); /* Edit button */
+ this->tableEquipments->setRowCount(query.size());
+ this->tableEquipments->setHorizontalHeaderLabels(labels);
+ this->tableEquipments->verticalHeader()->hide();
QTableWidgetItem *rightitem = new QTableWidgetItem();
rightitem->setTextAlignment(Qt::AlignRight);
query.first();
for (int ridx = 0 ; ridx < query.size() ; ridx++ ) {
- ui->tableEquipments->setItem(ridx, 0, new QTableWidgetItem(query.value(1).toString())); /* Name */
+ this->tableEquipments->setItem(ridx, 0, new QTableWidgetItem(query.value(1).toString())); /* Name */
w = QString("%1 L").arg(query.value(2).toDouble(), 2, 'f', 1, '0' ); /* Boil volume */
QTableWidgetItem *item = new QTableWidgetItem(w);
item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
- ui->tableEquipments->setItem(ridx, 1, item);
+ this->tableEquipments->setItem(ridx, 1, item);
w = QString("%1 L").arg(query.value(3).toDouble(), 2, 'f', 1, '0' ); /* Batch size */
item = new QTableWidgetItem(w);
item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
- ui->tableEquipments->setItem(ridx, 2, item);
- ui->tableEquipments->setItem(ridx, 3, new QTableWidgetItem(query.value(16).toString())); /* Notes */
+ this->tableEquipments->setItem(ridx, 2, item);
+ this->tableEquipments->setItem(ridx, 3, new QTableWidgetItem(query.value(16).toString())); /* Notes */
/* Add the Edit button */
QWidget* pWidget = new QWidget();
@@ -78,25 +136,17 @@
pLayout->addWidget(btn_edit);
pLayout->setContentsMargins(5, 0, 5, 0);
pWidget->setLayout(pLayout);
- ui->tableEquipments->setCellWidget(ridx, 4, pWidget);
+ this->tableEquipments->setCellWidget(ridx, 4, pWidget);
query.next();
}
-
- setWindowTitle( QString("BMSapp - %1 - Inventory Equipments").arg(VERSIONSTRING) );
}
-InventoryEquipments::~InventoryEquipments()
-{
- qDebug() << "InventoryEquipments done";
- delete ui;
-}
+InventoryEquipments::~InventoryEquipments() {}
void InventoryEquipments::edit(int recno)
{
- qDebug() << "InventoryEquipments edit:" << recno;
-
EditEquipment dialog(recno, this);
/* Signal from editor if a refresh is needed */
connect(&dialog, SIGNAL(entry_changed()), this, SLOT(refreshTable()));
@@ -109,14 +159,12 @@
{
QPushButton *pb = qobject_cast<QPushButton *>(QObject::sender());
int recno = pb->objectName().toInt();
- qDebug() << Q_FUNC_INFO << recno;
edit(recno);
}
void InventoryEquipments::on_insertButton_clicked()
{
- qDebug() << Q_FUNC_INFO;
edit(-1);
}
@@ -179,8 +227,3 @@
}
-void InventoryEquipments::on_quitButton_clicked()
-{
- emit firstWindow();
-}
-