Merge pull request #691 from matty0ung/3.0.X

Fix for #688
Brewtarget · Dec 10, 2022 · c5e4354 · c5e4354
2 parents 3a592ec + 6eedc15
commit c5e4354
Show file tree

Hide file tree

Showing 3 changed files with 111 additions and 115 deletions.
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
@@ -382,7 +382,7 @@ void MainWindow::init() {
    this->setupDrops();
 
    // Moved from Database class
-   Recipe::connectSignals();
+   Recipe::connectSignalsForAllRecipes();
    qDebug() << Q_FUNC_INFO << "Recipe signals connected";
    Mash::connectSignals();
    qDebug() << Q_FUNC_INFO << "Mash signals connected";
@@ -896,7 +896,7 @@ void MainWindow::setupTriggers() {
 
    // postgresql cannot backup or restore yet. I would like to find some way
    // around this, but for now just disable
-   if ( Database::instance().dbType() == Database::PGSQL ) {
+   if ( Database::instance().dbType() == Database::DbType::PGSQL ) {
       actionBackup_Database->setEnabled(false);                                                                         // > File > Database > Backup
       actionRestore_Database->setEnabled(false);                                                                        // > File > Database > Restore
    }
@@ -1803,10 +1803,9 @@ void MainWindow::updateRecipeBoilTime() {
    Equipment* kit = recipeObs->equipment();
    double boilTime = Measurement::qStringToSI(lineEdit_boilTime->text(), Measurement::PhysicalQuantity::Time).quantity;
 
-   // Here, we rely on a signal/slot connection to propagate the equipment
-   // changes to recipeObs->boilTime_min and maybe recipeObs->boilSize_l
-   // NOTE: This works because kit is the recipe's equipment, not the generic
-   // equipment in the recipe drop down.
+   // Here, we rely on a signal/slot connection to propagate the equipment changes to recipeObs->boilTime_min and maybe
+   // recipeObs->boilSize_l
+   // NOTE: This works because kit is the recipe's equipment, not the generic equipment in the recipe drop down.
    if (kit) {
       this->doOrRedoUpdate(*kit, PropertyNames::Equipment::boilTime_min, boilTime, tr("Change Boil Time"));
    } else {
@@ -3084,8 +3083,8 @@ void MainWindow::exportSelected() {
    bxml.toXml(equipments,   *outFile);
 
    outFile->close();
-   return;
-}
+      return;
+   }
 
 void MainWindow::redisplayLabel()
 {