Wed, 15 Jun 2022 09:37:52 +0200
Removed unneeded import buttons from the inventory screens.
--- a/src/InventoryFermentables.cpp Wed Jun 15 09:26:22 2022 +0200 +++ b/src/InventoryFermentables.cpp Wed Jun 15 09:37:52 2022 +0200 @@ -34,7 +34,6 @@ 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); @@ -64,16 +63,7 @@ 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); + horizontalLayout->addWidget(exportButton, 0, Qt::AlignCenter); insertButton = new QPushButton(groupBox); insertButton->setObjectName(QString::fromUtf8("insertButton")); @@ -88,7 +78,6 @@ 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())); connect(this, SIGNAL(setStatus(QString)), parent, SLOT(statusMsg(QString))); emit refreshTable(); }
--- a/src/InventoryFermentables.h Wed Jun 15 09:26:22 2022 +0200 +++ b/src/InventoryFermentables.h Wed Jun 15 09:37:52 2022 +0200 @@ -37,7 +37,6 @@ QHBoxLayout *horizontalLayout; QPushButton *quitButton; QPushButton *exportButton; - QPushButton *importButton; QPushButton *insertButton; void edit(int recno);
--- a/src/InventoryHops.cpp Wed Jun 15 09:26:22 2022 +0200 +++ b/src/InventoryHops.cpp Wed Jun 15 09:37:52 2022 +0200 @@ -33,7 +33,6 @@ QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding); sizePolicy.setHorizontalStretch(0); sizePolicy.setVerticalStretch(0); - //sizePolicy.setHeightForWidth(tableHops->sizePolicy().hasHeightForWidth()); tableHops->setSizePolicy(sizePolicy); tableHops->setMinimumSize(QSize(1124, 0)); gridLayout->addWidget(tableHops, 0, 0, 1, 1); @@ -63,16 +62,7 @@ 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); + horizontalLayout->addWidget(exportButton, 0, Qt::AlignCenter); insertButton = new QPushButton(groupBox); insertButton->setObjectName(QString::fromUtf8("insertButton")); @@ -87,7 +77,6 @@ connect(quitButton, SIGNAL(clicked()), parent, SLOT(fromInventoryHops())); 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())); connect(this, SIGNAL(setStatus(QString)), parent, SLOT(statusMsg(QString))); emit refreshTable(); }
--- a/src/InventoryHops.h Wed Jun 15 09:26:22 2022 +0200 +++ b/src/InventoryHops.h Wed Jun 15 09:37:52 2022 +0200 @@ -37,7 +37,6 @@ QHBoxLayout *horizontalLayout; QPushButton *quitButton; QPushButton *exportButton; - QPushButton *importButton; QPushButton *insertButton; void edit(int recno);
--- a/src/InventoryMiscs.cpp Wed Jun 15 09:26:22 2022 +0200 +++ b/src/InventoryMiscs.cpp Wed Jun 15 09:37:52 2022 +0200 @@ -62,16 +62,7 @@ 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); + horizontalLayout->addWidget(exportButton, 0, Qt::AlignCenter); insertButton = new QPushButton(groupBox); insertButton->setObjectName(QString::fromUtf8("insertButton")); @@ -86,7 +77,6 @@ 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())); connect(this, SIGNAL(setStatus(QString)), parent, SLOT(statusMsg(QString))); emit refreshTable(); }
--- a/src/InventoryMiscs.h Wed Jun 15 09:26:22 2022 +0200 +++ b/src/InventoryMiscs.h Wed Jun 15 09:37:52 2022 +0200 @@ -37,7 +37,6 @@ QHBoxLayout *horizontalLayout; QPushButton *quitButton; QPushButton *exportButton; - QPushButton *importButton; QPushButton *insertButton; void edit(int recno);
--- a/src/InventoryWaters.cpp Wed Jun 15 09:26:22 2022 +0200 +++ b/src/InventoryWaters.cpp Wed Jun 15 09:37:52 2022 +0200 @@ -61,16 +61,7 @@ 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); + horizontalLayout->addWidget(exportButton, 0, Qt::AlignCenter); insertButton = new QPushButton(groupBox); insertButton->setObjectName(QString::fromUtf8("insertButton")); @@ -85,7 +76,6 @@ connect(quitButton, SIGNAL(clicked()), parent, SLOT(fromInventoryWaters())); 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())); connect(this, SIGNAL(setStatus(QString)), parent, SLOT(statusMsg(QString))); emit refreshTable(); }
--- a/src/InventoryWaters.h Wed Jun 15 09:26:22 2022 +0200 +++ b/src/InventoryWaters.h Wed Jun 15 09:37:52 2022 +0200 @@ -37,7 +37,6 @@ QHBoxLayout *horizontalLayout; QPushButton *quitButton; QPushButton *exportButton; - QPushButton *importButton; QPushButton *insertButton; void edit(int recno);
--- a/src/InventoryYeasts.cpp Wed Jun 15 09:26:22 2022 +0200 +++ b/src/InventoryYeasts.cpp Wed Jun 15 09:37:52 2022 +0200 @@ -62,16 +62,7 @@ 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); + horizontalLayout->addWidget(exportButton, 0, Qt::AlignCenter); insertButton = new QPushButton(groupBox); insertButton->setObjectName(QString::fromUtf8("insertButton")); @@ -86,7 +77,6 @@ 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())); connect(this, SIGNAL(setStatus(QString)), parent, SLOT(statusMsg(QString))); emit refreshTable(); }