diff -r e71642121fb6 -r 1af9f7b7f317 src/EditRecipeTab4.cpp --- a/src/EditRecipeTab4.cpp Sat Apr 23 08:47:50 2022 +0200 +++ b/src/EditRecipeTab4.cpp Sat Apr 23 13:18:47 2022 +0200 @@ -70,11 +70,11 @@ ui->miscsTable->setItem(i, 0, new QTableWidgetItem(recipe->miscs.at(i).m_name)); - item = new QTableWidgetItem(m_types[recipe->miscs.at(i).m_type]); + item = new QTableWidgetItem(misc_types[recipe->miscs.at(i).m_type]); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->miscsTable->setItem(i, 1, item); - item = new QTableWidgetItem(m_uses[recipe->miscs.at(i).m_use_use]); + item = new QTableWidgetItem(misc_uses[recipe->miscs.at(i).m_use_use]); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->miscsTable->setItem(i, 2, item); @@ -383,11 +383,11 @@ mnameEdit->setText(recipe->miscs.at(recipe->miscs_row).m_name); ui->miscsTable->setItem(recipe->miscs_row, 0, new QTableWidgetItem(recipe->miscs.at(recipe->miscs_row).m_name)); - item = new QTableWidgetItem(m_types[recipe->miscs.at(recipe->miscs_row).m_type]); + item = new QTableWidgetItem(misc_types[recipe->miscs.at(recipe->miscs_row).m_type]); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->miscsTable->setItem(recipe->miscs_row, 1, item); - item = new QTableWidgetItem(m_uses[recipe->miscs.at(recipe->miscs_row).m_use_use]); + item = new QTableWidgetItem(misc_uses[recipe->miscs.at(recipe->miscs_row).m_use_use]); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->miscsTable->setItem(recipe->miscs_row, 2, item); useatEdit->setCurrentIndex(recipe->miscs.at(recipe->miscs_row).m_use_use); @@ -442,7 +442,7 @@ query.first(); this->mselectEdit->addItem(""); // Start with empty value for (int i = 0; i < query.size(); i++) { - this->mselectEdit->addItem(query.value(0).toString()+ " (" + m_types[query.value(1).toInt()] + ") " + + this->mselectEdit->addItem(query.value(0).toString()+ " (" + misc_types[query.value(1).toInt()] + ") " + QString("%1 %2").arg(query.value(3).toDouble() * 1000.0, 3, 'f', 2, '0').arg(query.value(2).toInt()?"gr":"ml")); query.next(); } @@ -455,7 +455,7 @@ qDebug() << "misc_useat_changed" << val; recipe->miscs[recipe->miscs_row].m_use_use = val; - item = new QTableWidgetItem(m_uses[val]); + item = new QTableWidgetItem(misc_uses[val]); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->miscsTable->setItem(recipe->miscs_row, 2, item);