Mercurial > bmsapp / changeset

--- a/src/InventoryEquipments.cpp	Mon Mar 21 11:44:51 2022 +0100
+++ b/src/InventoryEquipments.cpp	Mon Mar 21 12:08:41 2022 +0100
@@ -87,6 +87,7 @@
     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();
 }
 
@@ -139,6 +140,7 @@
 	this->tableEquipments->setCellWidget(ridx, 4, pWidget);
 	query.next();
     }
+    emit setStatus(QString(tr("Total items: %1")).arg(query.size()));
 }
 
 

--- a/src/InventoryEquipments.h	Mon Mar 21 11:44:51 2022 +0100
+++ b/src/InventoryEquipments.h	Mon Mar 21 12:08:41 2022 +0100
@@ -21,6 +21,9 @@
     explicit InventoryEquipments(QWidget *parent = nullptr);
     ~InventoryEquipments();
 
+signals:
+    void setStatus(QString);
+
 private slots:
     void on_insertButton_clicked();
     void on_editButton_clicked();

--- a/src/InventoryFermentables.cpp	Mon Mar 21 11:44:51 2022 +0100
+++ b/src/InventoryFermentables.cpp	Mon Mar 21 12:08:41 2022 +0100
@@ -162,7 +162,7 @@
 	this->tableFermentables->setCellWidget(ridx, 8, pWidget);
 	query.next();
     }
-    emit setStatus(QString("Records: %1").arg(query.size()));
+    emit setStatus(QString(tr("Total items: %1")).arg(query.size()));
 }
 
 

--- a/src/InventoryHops.cpp	Mon Mar 21 11:44:51 2022 +0100
+++ b/src/InventoryHops.cpp	Mon Mar 21 12:08:41 2022 +0100
@@ -88,6 +88,7 @@
     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();
 }
 
@@ -178,6 +179,7 @@
 	this->tableHops->setCellWidget(ridx, 10, pWidget);
 	query.next();
     }
+    emit setStatus(QString(tr("Total items: %1")).arg(query.size()));
 }
 
 

--- a/src/InventoryHops.h	Mon Mar 21 11:44:51 2022 +0100
+++ b/src/InventoryHops.h	Mon Mar 21 12:08:41 2022 +0100
@@ -21,6 +21,9 @@
     explicit InventoryHops(QWidget *parent = nullptr);
     ~InventoryHops();
 
+signals:
+    void setStatus(QString);
+
 private slots:
     void on_insertButton_clicked();
     void on_editButton_clicked();

--- a/src/InventoryMiscs.cpp	Mon Mar 21 11:44:51 2022 +0100
+++ b/src/InventoryMiscs.cpp	Mon Mar 21 12:08:41 2022 +0100
@@ -87,6 +87,7 @@
     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();
 }
 
@@ -165,8 +166,7 @@
 	this->tableMiscs->setCellWidget(ridx, 5, pWidget);
 	query.next();
     }
-
-    setWindowTitle( QString("BMSapp - %1 - Inventory Miscs").arg(VERSIONSTRING) );
+    emit setStatus(QString(tr("Total items: %1")).arg(query.size()));
 }
 
 

--- a/src/InventoryMiscs.h	Mon Mar 21 11:44:51 2022 +0100
+++ b/src/InventoryMiscs.h	Mon Mar 21 12:08:41 2022 +0100
@@ -21,6 +21,9 @@
     explicit InventoryMiscs(QWidget *parent = nullptr);
     ~InventoryMiscs();
 
+signals:
+    void setStatus(QString);
+
 private slots:
     void on_insertButton_clicked();
     void on_editButton_clicked();

--- a/src/InventorySuppliers.cpp	Mon Mar 21 11:44:51 2022 +0100
+++ b/src/InventorySuppliers.cpp	Mon Mar 21 12:08:41 2022 +0100
@@ -72,6 +72,7 @@
 
     connect(quitButton, SIGNAL(clicked()), parent, SLOT(fromInventorySuppliers()));
     connect(insertButton, SIGNAL(clicked()), this, SLOT(on_insertButton_clicked()));
+    connect(this, SIGNAL(setStatus(QString)), parent, SLOT(statusMsg(QString)));
     emit refreshTable();
 }
 
@@ -116,6 +117,7 @@
 	this->tableSuppliers->setCellWidget(ridx, 5, pWidget);
 	query.next();
     }
+    emit setStatus(QString(tr("Total items: %1")).arg(query.size()));
 }
 
 

--- a/src/InventorySuppliers.h	Mon Mar 21 11:44:51 2022 +0100
+++ b/src/InventorySuppliers.h	Mon Mar 21 12:08:41 2022 +0100
@@ -21,6 +21,9 @@
     explicit InventorySuppliers(QWidget *parent = nullptr);
     ~InventorySuppliers();
 
+signals:
+    void setStatus(QString);
+
 private slots:
     void on_insertButton_clicked();
     void on_editButton_clicked();

--- a/src/InventoryWaters.cpp	Mon Mar 21 11:44:51 2022 +0100
+++ b/src/InventoryWaters.cpp	Mon Mar 21 12:08:41 2022 +0100
@@ -87,6 +87,7 @@
     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();
 }
 
@@ -155,6 +156,7 @@
 	this->tableWaters->setCellWidget(ridx, 4, pWidget);
 	query.next();
     }
+    emit setStatus(QString(tr("Total items: %1")).arg(query.size()));
 }
 
 

--- a/src/InventoryWaters.h	Mon Mar 21 11:44:51 2022 +0100
+++ b/src/InventoryWaters.h	Mon Mar 21 12:08:41 2022 +0100
@@ -21,6 +21,9 @@
     explicit InventoryWaters(QWidget *parent = nullptr);
     ~InventoryWaters();
 
+signals:
+    void setStatus(QString);
+
 private slots:
     void on_insertButton_clicked();
     void on_editButton_clicked();

--- a/src/InventoryYeasts.cpp	Mon Mar 21 11:44:51 2022 +0100
+++ b/src/InventoryYeasts.cpp	Mon Mar 21 12:08:41 2022 +0100
@@ -87,6 +87,7 @@
     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();
 }
 
@@ -199,6 +200,7 @@
 	this->tableYeasts->setCellWidget(ridx, 10, pWidget);
 	query.next();
     }
+    emit setStatus(QString(tr("Total items: %1")).arg(query.size()));
 }
 
 

--- a/src/InventoryYeasts.h	Mon Mar 21 11:44:51 2022 +0100
+++ b/src/InventoryYeasts.h	Mon Mar 21 12:08:41 2022 +0100
@@ -21,6 +21,9 @@
     explicit InventoryYeasts(QWidget *parent = nullptr);
     ~InventoryYeasts();
 
+signals:
+    void setStatus(QString);
+
 private slots:
     void on_insertButton_clicked();
     void on_editButton_clicked();

--- a/src/MainWindow.cpp	Mon Mar 21 11:44:51 2022 +0100
+++ b/src/MainWindow.cpp	Mon Mar 21 12:08:41 2022 +0100
@@ -122,6 +122,7 @@
     delete InventoryHopsWindow;
     setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) );
     ui->menuBar->setVisible(true);
+    statusBar()->clearMessage();
 }
 
 
@@ -145,6 +146,7 @@
     delete InventoryYeastsWindow;
     setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) );
     ui->menuBar->setVisible(true);
+    statusBar()->clearMessage();
 }
 
 
@@ -168,6 +170,7 @@
     delete InventoryMiscsWindow;
     setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) );
     ui->menuBar->setVisible(true);
+    statusBar()->clearMessage();
 }
 
 
@@ -191,6 +194,7 @@
     delete InventoryWatersWindow;
     setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) );
     ui->menuBar->setVisible(true);
+    statusBar()->clearMessage();
 }
 
 
@@ -214,6 +218,7 @@
     delete InventoryEquipmentsWindow;
     setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) );
     ui->menuBar->setVisible(true);
+    statusBar()->clearMessage();
 }
 
 
@@ -251,6 +256,7 @@
     delete ProfileWatersWindow;
     setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) );
     ui->menuBar->setVisible(true);
+    statusBar()->clearMessage();
 }
 
 
@@ -274,6 +280,7 @@
     delete ProfileMashsWindow;
     setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) );
     ui->menuBar->setVisible(true);
+    statusBar()->clearMessage();
 }
 
 
@@ -297,6 +304,7 @@
     delete ProfileStylesWindow;
     setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) );
     ui->menuBar->setVisible(true);
+    statusBar()->clearMessage();
 }
 
 
@@ -320,6 +328,7 @@
     delete ProfileFermentsWindow;
     setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) );
     ui->menuBar->setVisible(true);
+    statusBar()->clearMessage();
 }
 
 
@@ -367,14 +376,12 @@
 
 void MainWindow::windowTitle(QString msg)
 {
-    qDebug() << Q_FUNC_INFO << msg;
     setWindowTitle(QString("BMSapp - %1 - %2").arg(VERSIONSTRING).arg(msg));
 }
 
 
 void MainWindow::statusMsg(QString msg)
 {
-    qDebug() << Q_FUNC_INFO << msg;
     statusBar()->showMessage(msg);
 }
 

--- a/src/ProfileFerments.cpp	Mon Mar 21 11:44:51 2022 +0100
+++ b/src/ProfileFerments.cpp	Mon Mar 21 12:08:41 2022 +0100
@@ -67,6 +67,7 @@
 
     connect(quitButton, SIGNAL(clicked()), parent, SLOT(fromProfileFerments()));
     connect(insertButton, SIGNAL(clicked()), this, SLOT(on_insertButton_clicked()));
+    connect(this, SIGNAL(setStatus(QString)), parent, SLOT(statusMsg(QString)));
     emit refreshTable();
 }
 
@@ -140,6 +141,7 @@
 	this->tableFerments->setCellWidget(ridx, 6, pWidget);
 	query.next();
     }
+    emit setStatus(QString(tr("Total items: %1")).arg(query.size()));
 }
 
 

--- a/src/ProfileFerments.h	Mon Mar 21 11:44:51 2022 +0100
+++ b/src/ProfileFerments.h	Mon Mar 21 12:08:41 2022 +0100
@@ -21,6 +21,9 @@
     explicit ProfileFerments(QWidget *parent = nullptr);
     ~ProfileFerments();
 
+signals:
+    void setStatus(QString);
+
 private slots:
     void on_insertButton_clicked();
     void on_editButton_clicked();

--- a/src/ProfileMashs.cpp	Mon Mar 21 11:44:51 2022 +0100
+++ b/src/ProfileMashs.cpp	Mon Mar 21 12:08:41 2022 +0100
@@ -67,6 +67,7 @@
 
     connect(quitButton, SIGNAL(clicked()), parent, SLOT(fromProfileMashs()));
     connect(insertButton, SIGNAL(clicked()), this, SLOT(on_insertButton_clicked()));
+    connect(this, SIGNAL(setStatus(QString)), parent, SLOT(statusMsg(QString)));
     emit refreshTable();
 }
 
@@ -129,6 +130,7 @@
 	this->tableMashs->setCellWidget(ridx, 3, pWidget);
 	query.next();
     }
+    emit setStatus(QString(tr("Total items: %1")).arg(query.size()));
 }
 
 

--- a/src/ProfileMashs.h	Mon Mar 21 11:44:51 2022 +0100
+++ b/src/ProfileMashs.h	Mon Mar 21 12:08:41 2022 +0100
@@ -21,6 +21,9 @@
     explicit ProfileMashs(QWidget *parent = nullptr);
     ~ProfileMashs();
 
+signals:
+    void setStatus(QString);
+
 private slots:
     void on_insertButton_clicked();
     void on_editButton_clicked();

--- a/src/ProfileStyles.cpp	Mon Mar 21 11:44:51 2022 +0100
+++ b/src/ProfileStyles.cpp	Mon Mar 21 12:08:41 2022 +0100
@@ -67,6 +67,7 @@
 
     connect(quitButton, SIGNAL(clicked()), parent, SLOT(fromProfileStyles()));
     connect(insertButton, SIGNAL(clicked()), this, SLOT(on_insertButton_clicked()));
+    connect(this, SIGNAL(setStatus(QString)), parent, SLOT(statusMsg(QString)));
     emit refreshTable();
 }
 
@@ -187,6 +188,7 @@
 	this->tableStyles->setCellWidget(ridx, 15, pWidget);
 	query.next();
     }
+    emit setStatus(QString(tr("Total items: %1")).arg(query.size()));
 }
 
 

--- a/src/ProfileStyles.h	Mon Mar 21 11:44:51 2022 +0100
+++ b/src/ProfileStyles.h	Mon Mar 21 12:08:41 2022 +0100
@@ -21,6 +21,9 @@
     explicit ProfileStyles(QWidget *parent = nullptr);
     ~ProfileStyles();
 
+signals:
+    void setStatus(QString);
+
 private slots:
     void on_insertButton_clicked();
     void on_editButton_clicked();

--- a/src/ProfileWaters.cpp	Mon Mar 21 11:44:51 2022 +0100
+++ b/src/ProfileWaters.cpp	Mon Mar 21 12:08:41 2022 +0100
@@ -67,6 +67,7 @@
 
     connect(quitButton, SIGNAL(clicked()), parent, SLOT(fromProfileWaters()));
     connect(insertButton, SIGNAL(clicked()), this, SLOT(on_insertButton_clicked()));
+    connect(this, SIGNAL(setStatus(QString)), parent, SLOT(statusMsg(QString)));
     emit refreshTable();
 }
 
@@ -154,6 +155,7 @@
 	this->tableWaters->setCellWidget(ridx, 9, pWidget);
 	query.next();
     }
+    emit setStatus(QString(tr("Total items: %1")).arg(query.size()));
 }
 
 

--- a/src/ProfileWaters.h	Mon Mar 21 11:44:51 2022 +0100
+++ b/src/ProfileWaters.h	Mon Mar 21 12:08:41 2022 +0100
@@ -21,6 +21,9 @@
     explicit ProfileWaters(QWidget *parent = nullptr);
     ~ProfileWaters();
 
+signals:
+    void setStatus(QString);
+
 private slots:
     void on_insertButton_clicked();
     void on_editButton_clicked();