# HG changeset patch # User Michiel Broek # Date 1650185448 -7200 # Node ID 6638609328c2c01ee1f29b2897e0da439c8cf119 # Parent f947c6988e9154a8997ec743d05127313e10abb2 Fixed placing time value in the wrong column. Added misc use changed. Tab 4 layout changed. diff -r f947c6988e91 -r 6638609328c2 src/EditRecipeTab4.cpp --- a/src/EditRecipeTab4.cpp Sat Apr 16 21:54:43 2022 +0200 +++ b/src/EditRecipeTab4.cpp Sun Apr 17 10:50:48 2022 +0200 @@ -338,7 +338,7 @@ item = new QTableWidgetItem(QString("")); } item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); - ui->miscsTable->setItem(recipe->miscs_row, 4, item); + ui->miscsTable->setItem(recipe->miscs_row, 3, item); this->ignoreChanges = false; is_changed(); @@ -459,7 +459,37 @@ void EditRecipe::misc_useat_changed(int val) { + QTableWidgetItem *item; + qDebug() << "misc_useat_changed" << val; + this->ignoreChanges = true; + recipe->miscs[recipe->miscs_row].m_use_use = val; + item = new QTableWidgetItem(m_uses[val]); + item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); + ui->miscsTable->setItem(recipe->miscs_row, 2, item); + + if (val == 3 || val == 4) { // Fermentation stages + recipe->miscs[recipe->miscs_row].m_time = mtimeEdit->value() * 1440; + mtimeEdit->setReadOnly(false); + mtimeLabel->setText(tr("Time in days:")); + item = new QTableWidgetItem(QString("%1 days.").arg(recipe->miscs.at(recipe->miscs_row).m_time / 1440, 1, 'f', 0, '0')); + } else if (val == 2) { // Boil + recipe->miscs[recipe->miscs_row].m_time = mtimeEdit->value(); + mtimeEdit->setReadOnly(false); + mtimeLabel->setText(tr("Time in minutes:")); + item = new QTableWidgetItem(QString("%1 min.").arg(recipe->miscs.at(recipe->miscs_row).m_time, 1, 'f', 0, '0')); + } else { + recipe->miscs[recipe->miscs_row].m_time = 0; + mtimeEdit->setValue(0); + mtimeEdit->setReadOnly(true); + mtimeLabel->setText(""); + item = new QTableWidgetItem(QString("")); + } + item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); + ui->miscsTable->setItem(recipe->miscs_row, 3, item); + + this->ignoreChanges = false; + is_changed(); } diff -r f947c6988e91 -r 6638609328c2 ui/EditRecipe.ui --- a/ui/EditRecipe.ui Sat Apr 16 21:54:43 2022 +0200 +++ b/ui/EditRecipe.ui Sun Apr 17 10:50:48 2022 +0200 @@ -1544,18 +1544,18 @@ - 10 - 70 - 1101 - 391 + 140 + 10 + 849 + 451 - 140 - 30 + 30 + 40 80 23