Mercurial > bmsapp / file diff

--- a/src/MainWindow.cpp	Sun Mar 20 17:22:27 2022 +0100
+++ b/src/MainWindow.cpp	Sun Mar 20 17:33:18 2022 +0100
@@ -177,7 +177,7 @@
     int index = ui->mainStack->count();
     ui->mainStack->addWidget(InventoryMiscsWindow);
     ui->mainStack->setCurrentIndex(index);
-    setWindowTitle(QString("BMSapp - %1 - Inventory Yeasts").arg(VERSIONSTRING));
+    setWindowTitle(QString("BMSapp - %1 - Inventory Miscs").arg(VERSIONSTRING));
     ui->menuBar->setVisible(false);
 }
 
@@ -185,8 +185,11 @@
 void MainWindow::fromInventoryWaters()
 {
     qDebug() << Q_FUNC_INFO;
+    ui->mainStack->setCurrentIndex(-1);
+    ui->mainStack->removeWidget(InventoryWatersWindow);
     delete InventoryWatersWindow;
-    this->show();
+    setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) );
+    ui->menuBar->setVisible(true);
 }
 
 
@@ -194,9 +197,11 @@
 {
     qDebug() << Q_FUNC_INFO;
     InventoryWatersWindow = new InventoryWaters(this);
-    QObject::connect(InventoryWatersWindow, SIGNAL(firstWindow()), this, SLOT(fromInventoryWaters()));
-    this->hide();    // Close the main window
-    InventoryWatersWindow->show();  // Show a second window
+    int index = ui->mainStack->count();
+    ui->mainStack->addWidget(InventoryWatersWindow);
+    ui->mainStack->setCurrentIndex(index);
+    setWindowTitle(QString("BMSapp - %1 - Inventory Waters").arg(VERSIONSTRING));
+    ui->menuBar->setVisible(false);
 }