Sun, 20 Mar 2022 17:22:27 +0100
Inventory Miscs now on the mainscreen.
CMakeLists.txt | file | annotate | diff | comparison | revisions | |
src/InventoryMiscs.cpp | file | annotate | diff | comparison | revisions | |
src/InventoryMiscs.h | file | annotate | diff | comparison | revisions | |
src/MainWindow.cpp | file | annotate | diff | comparison | revisions | |
ui/InventoryMiscs.ui | file | annotate | diff | comparison | revisions |
--- a/CMakeLists.txt Sun Mar 20 16:49:50 2022 +0100 +++ b/CMakeLists.txt Sun Mar 20 17:22:27 2022 +0100 @@ -169,9 +169,7 @@ ${UIDIR}/EditSupplier.ui ${UIDIR}/EditFermentable.ui ${UIDIR}/EditHop.ui - ${UIDIR}/InventoryYeasts.ui ${UIDIR}/EditYeast.ui - ${UIDIR}/InventoryMiscs.ui ${UIDIR}/EditMisc.ui ${UIDIR}/InventoryWaters.ui ${UIDIR}/EditWater.ui
--- 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<QPushButton *>(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(); -} -
--- a/src/InventoryMiscs.h Sun Mar 20 16:49:50 2022 +0100 +++ b/src/InventoryMiscs.h Sun Mar 20 17:22:27 2022 +0100 @@ -2,6 +2,12 @@ #define _INVENTORYMISCS_H #include <QDialog> +#include <QtWidgets/QGridLayout> +#include <QtWidgets/QGroupBox> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QHeaderView> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QTableWidget> namespace Ui { class InventoryMiscs; @@ -15,18 +21,22 @@ explicit InventoryMiscs(QWidget *parent = nullptr); ~InventoryMiscs(); -signals: - void firstWindow(); - private slots: - void on_quitButton_clicked(); void on_insertButton_clicked(); void on_editButton_clicked(); void on_exportButton_clicked(); void refreshTable(void); private: - Ui::InventoryMiscs *ui; + QGridLayout *gridLayout; + QTableWidget *tableMiscs; + QGroupBox *groupBox; + QHBoxLayout *horizontalLayout; + QPushButton *quitButton; + QPushButton *exportButton; + QPushButton *importButton; + QPushButton *insertButton; + void edit(int recno); };
--- a/src/MainWindow.cpp Sun Mar 20 16:49:50 2022 +0100 +++ b/src/MainWindow.cpp Sun Mar 20 17:22:27 2022 +0100 @@ -162,8 +162,11 @@ void MainWindow::fromInventoryMiscs() { qDebug() << Q_FUNC_INFO; + ui->mainStack->setCurrentIndex(-1); + ui->mainStack->removeWidget(InventoryMiscsWindow); delete InventoryMiscsWindow; - this->show(); + setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) ); + ui->menuBar->setVisible(true); } @@ -171,9 +174,11 @@ { qDebug() << Q_FUNC_INFO; InventoryMiscsWindow = new InventoryMiscs(this); - QObject::connect(InventoryMiscsWindow, SIGNAL(firstWindow()), this, SLOT(fromInventoryMiscs())); - this->hide(); // Close the main window - InventoryMiscsWindow->show(); // Show a second window + int index = ui->mainStack->count(); + ui->mainStack->addWidget(InventoryMiscsWindow); + ui->mainStack->setCurrentIndex(index); + setWindowTitle(QString("BMSapp - %1 - Inventory Yeasts").arg(VERSIONSTRING)); + ui->menuBar->setVisible(false); }
--- a/ui/InventoryMiscs.ui Sun Mar 20 16:49:50 2022 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,149 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>InventoryMiscs</class> - <widget class="QDialog" name="InventoryMiscs"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>1280</width> - <height>640</height> - </rect> - </property> - <property name="windowTitle"> - <string>Dialog</string> - </property> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QTableWidget" name="tableMiscs"> - <property name="enabled"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QGroupBox" name="groupBox"> - <property name="enabled"> - <bool>true</bool> - </property> - <property name="flat"> - <bool>false</bool> - </property> - <layout class="QHBoxLayout" name="horizontalLayout"> - <property name="spacing"> - <number>6</number> - </property> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> - <number>0</number> - </property> - <item alignment="Qt::AlignLeft"> - <widget class="QPushButton" name="quitButton"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>80</width> - <height>24</height> - </size> - </property> - <property name="text"> - <string>Quit</string> - </property> - <property name="icon"> - <iconset> - <normaloff>:icons/silk/door_out.png</normaloff>:icons/silk/door_out.png</iconset> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="exportButton"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>80</width> - <height>24</height> - </size> - </property> - <property name="text"> - <string>Export</string> - </property> - <property name="icon"> - <iconset resource="../../../../../../home/mbroek/MyProjects/bmsapp/resources/icons.qrc"> - <normaloff>:/icons/silk/database_save.png</normaloff>:/icons/silk/database_save.png</iconset> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="importButton"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>80</width> - <height>24</height> - </size> - </property> - <property name="text"> - <string>Import</string> - </property> - <property name="icon"> - <iconset resource="../../../../../../home/mbroek/MyProjects/bmsapp/resources/icons.qrc"> - <normaloff>:/icons/silk/database_add.png</normaloff>:/icons/silk/database_add.png</iconset> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="insertButton"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>80</width> - <height>24</height> - </size> - </property> - <property name="text"> - <string>New</string> - </property> - <property name="icon"> - <iconset> - <normaloff>:icons/silk/table_row_insert.png</normaloff>:icons/silk/table_row_insert.png</iconset> - </property> - </widget> - </item> - </layout> - </widget> - </item> - </layout> - </widget> - <resources> - <include location="../../../../../../home/mbroek/MyProjects/bmsapp/resources/icons.qrc"/> - </resources> - <connections/> -</ui>