diff -r 556b4202c5e7 -r 5bd0d7be0167 src/InventoryMiscs.cpp --- a/src/InventoryMiscs.cpp Sun Mar 20 16:49:50 2022 +0100 +++ b/src/InventoryMiscs.cpp Sun Mar 20 17:22:27 2022 +0100 @@ -16,19 +16,78 @@ */ #include "InventoryMiscs.h" #include "EditMisc.h" -#include "../ui/ui_InventoryMiscs.h" +#include "MainWindow.h" #include "config.h" #include "bmsapp.h" -InventoryMiscs::InventoryMiscs(QWidget *parent) : QDialog(parent), ui(new Ui::InventoryMiscs) +InventoryMiscs::InventoryMiscs(QWidget *parent) : QDialog(parent) { qDebug() << "InventoryMiscs start"; - ui->setupUi(this); + gridLayout = new QGridLayout(this); + gridLayout->setObjectName(QString::fromUtf8("gridLayout")); + tableMiscs = new QTableWidget(this); + tableMiscs->setObjectName(QString::fromUtf8("tableMiscs")); + tableMiscs->setEnabled(true); + QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding); + sizePolicy.setHorizontalStretch(0); + sizePolicy.setVerticalStretch(0); + tableMiscs->setSizePolicy(sizePolicy); + tableMiscs->setMinimumSize(QSize(819, 0)); + gridLayout->addWidget(tableMiscs, 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(fromInventoryMiscs())); + 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 Miscs").arg(VERSIONSTRING) ); } @@ -44,26 +103,25 @@ const QStringList use({tr("Starter"), tr("Mash"), tr("Boil"), tr("Primary"), tr("Secondary"), tr("Bottling")}); /* origin supplier name type graintype color yield inventory Edit */ - ui->tableMiscs->setColumnCount(6); - ui->tableMiscs->setColumnWidth(0, 275); /* Name */ - ui->tableMiscs->setColumnWidth(1, 120); /* Type */ - ui->tableMiscs->setColumnWidth(2, 120); /* Use */ - ui->tableMiscs->setColumnWidth(3, 120); /* Time */ - ui->tableMiscs->setColumnWidth(4, 80); /* Stock */ - ui->tableMiscs->setColumnWidth(5, 80); /* Edit button */ - ui->tableMiscs->setRowCount(query.size()); - ui->tableMiscs->setHorizontalHeaderLabels(labels); - ui->tableMiscs->verticalHeader()->hide(); - ui->tableMiscs->setFixedSize(795 + 24, 640); /* Even if this is too large, it works */ + this->tableMiscs->setColumnCount(6); + this->tableMiscs->setColumnWidth(0, 275); /* Name */ + this->tableMiscs->setColumnWidth(1, 120); /* Type */ + this->tableMiscs->setColumnWidth(2, 120); /* Use */ + this->tableMiscs->setColumnWidth(3, 120); /* Time */ + this->tableMiscs->setColumnWidth(4, 80); /* Stock */ + this->tableMiscs->setColumnWidth(5, 80); /* Edit button */ + this->tableMiscs->setRowCount(query.size()); + this->tableMiscs->setHorizontalHeaderLabels(labels); + this->tableMiscs->verticalHeader()->hide(); QTableWidgetItem *rightitem = new QTableWidgetItem(); rightitem->setTextAlignment(Qt::AlignRight); query.first(); for (int ridx = 0 ; ridx < query.size() ; ridx++ ) { - ui->tableMiscs->setItem(ridx, 0, new QTableWidgetItem(query.value(1).toString())); /* Name */ - ui->tableMiscs->setItem(ridx, 1, new QTableWidgetItem(types[query.value(2).toInt()])); /* Type */ - ui->tableMiscs->setItem(ridx, 2, new QTableWidgetItem(use[query.value(3).toInt()])); /* Use */ + this->tableMiscs->setItem(ridx, 0, new QTableWidgetItem(query.value(1).toString())); /* Name */ + this->tableMiscs->setItem(ridx, 1, new QTableWidgetItem(types[query.value(2).toInt()])); /* Type */ + this->tableMiscs->setItem(ridx, 2, new QTableWidgetItem(use[query.value(3).toInt()])); /* Use */ w = QString(""); /* Use time */ if (query.value(4).toInt() > 0) { @@ -80,7 +138,7 @@ } QTableWidgetItem *item = new QTableWidgetItem(w); item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); - ui->tableMiscs->setItem(ridx, 3, item); + this->tableMiscs->setItem(ridx, 3, item); w = QString(""); if (query.value(9).toDouble() > 0) { @@ -92,7 +150,7 @@ } item = new QTableWidgetItem(w); item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); - ui->tableMiscs->setItem(ridx, 4, item); + this->tableMiscs->setItem(ridx, 4, item); /* Add the Edit button */ QWidget* pWidget = new QWidget(); @@ -104,7 +162,7 @@ pLayout->addWidget(btn_edit); pLayout->setContentsMargins(5, 0, 5, 0); pWidget->setLayout(pLayout); - ui->tableMiscs->setCellWidget(ridx, 5, pWidget); + this->tableMiscs->setCellWidget(ridx, 5, pWidget); query.next(); } @@ -112,17 +170,11 @@ } -InventoryMiscs::~InventoryMiscs() -{ - qDebug() << "InventoryMiscs done"; - delete ui; -} +InventoryMiscs::~InventoryMiscs() {} void InventoryMiscs::edit(int recno) { - qDebug() << "InventoryMiscs edit:" << recno; - EditMisc dialog(recno, this); /* Signal from editor if a refresh is needed */ connect(&dialog, SIGNAL(entry_changed()), this, SLOT(refreshTable())); @@ -135,14 +187,12 @@ { QPushButton *pb = qobject_cast(QObject::sender()); int recno = pb->objectName().toInt(); - qDebug() << Q_FUNC_INFO << recno; edit(recno); } void InventoryMiscs::on_insertButton_clicked() { - qDebug() << Q_FUNC_INFO; edit(-1); } @@ -204,9 +254,3 @@ file.close(); } - -void InventoryMiscs::on_quitButton_clicked() -{ - emit firstWindow(); -} -