comparison: src/EditRecipeTab3.cpp
src/EditRecipeTab3.cpp
- changeset 301
- fe6346211b5b
- parent 300
- 2a97905cb637
- child 340
- b9af88bfe972
equal
deleted
inserted
replaced
| 300:2a97905cb637 | 301:fe6346211b5b |
|---|---|
| 67 for (int i = 0; i < recipe->hops.size(); i++) { | 67 for (int i = 0; i < recipe->hops.size(); i++) { |
| 68 | 68 |
| 69 ui->hopsTable->setItem(i, 0, new QTableWidgetItem(recipe->hops.at(i).origin)); | 69 ui->hopsTable->setItem(i, 0, new QTableWidgetItem(recipe->hops.at(i).origin)); |
| 70 ui->hopsTable->setItem(i, 1, new QTableWidgetItem(recipe->hops.at(i).name)); | 70 ui->hopsTable->setItem(i, 1, new QTableWidgetItem(recipe->hops.at(i).name)); |
| 71 | 71 |
| 72 item = new QTableWidgetItem(hop_types[recipe->hops.at(i).type]); | 72 item = new QTableWidgetItem(QCoreApplication::translate("HopTypes", g_hop_types[recipe->hops.at(i).type])); |
| 73 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); | 73 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); |
| 74 ui->hopsTable->setItem(i, 2, item); | 74 ui->hopsTable->setItem(i, 2, item); |
| 75 | 75 |
| 76 item = new QTableWidgetItem(hop_forms[recipe->hops.at(i).form]); | 76 item = new QTableWidgetItem(QCoreApplication::translate("HopForm", g_hop_forms[recipe->hops.at(i).form])); |
| 77 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); | 77 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); |
| 78 ui->hopsTable->setItem(i, 3, item); | 78 ui->hopsTable->setItem(i, 3, item); |
| 79 | 79 |
| 80 item = new QTableWidgetItem(QString("%1%").arg(recipe->hops.at(i).alpha, 2, 'f', 1, '0')); | 80 item = new QTableWidgetItem(QString("%1%").arg(recipe->hops.at(i).alpha, 2, 'f', 1, '0')); |
| 81 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); | 81 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); |
| 82 ui->hopsTable->setItem(i, 4, item); | 82 ui->hopsTable->setItem(i, 4, item); |
| 83 | 83 |
| 84 item = new QTableWidgetItem(hop_useat[recipe->hops.at(i).useat]); | 84 item = new QTableWidgetItem(QCoreApplication::translate("HopUse", g_hop_useat[recipe->hops.at(i).useat])); |
| 85 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); | 85 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); |
| 86 ui->hopsTable->setItem(i, 5, item); | 86 ui->hopsTable->setItem(i, 5, item); |
| 87 | 87 |
| 88 if (recipe->hops.at(i).useat == 2 || recipe->hops.at(i).useat == 4) { // Boil or whirlpool | 88 if (recipe->hops.at(i).useat == 2 || recipe->hops.at(i).useat == 4) { // Boil or whirlpool |
| 89 item = new QTableWidgetItem(QString("%1 min.").arg(recipe->hops.at(i).time, 1, 'f', 0, '0')); | 89 item = new QTableWidgetItem(QString("%1 min.").arg(recipe->hops.at(i).time, 1, 'f', 0, '0')); |
| 433 ibuEdit->setValue(ibu); | 433 ibuEdit->setValue(ibu); |
| 434 | 434 |
| 435 ui->hopsTable->setItem(recipe->hops_row, 0, new QTableWidgetItem(recipe->hops.at(recipe->hops_row).origin)); | 435 ui->hopsTable->setItem(recipe->hops_row, 0, new QTableWidgetItem(recipe->hops.at(recipe->hops_row).origin)); |
| 436 ui->hopsTable->setItem(recipe->hops_row, 1, new QTableWidgetItem(recipe->hops.at(recipe->hops_row).name)); | 436 ui->hopsTable->setItem(recipe->hops_row, 1, new QTableWidgetItem(recipe->hops.at(recipe->hops_row).name)); |
| 437 | 437 |
| 438 item = new QTableWidgetItem(hop_types[recipe->hops.at(recipe->hops_row).type]); | 438 QString hoptype = QCoreApplication::translate("HopTypes", g_hop_types[recipe->hops.at(recipe->hops_row).type]); |
| 439 item = new QTableWidgetItem(hoptype); | |
| 439 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); | 440 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); |
| 440 ui->hopsTable->setItem(recipe->hops_row, 2, item); | 441 ui->hopsTable->setItem(recipe->hops_row, 2, item); |
| 441 | 442 |
| 442 item = new QTableWidgetItem(hop_forms[recipe->hops.at(recipe->hops_row).form]); | 443 item = new QTableWidgetItem(QCoreApplication::translate("HopForm", g_hop_forms[recipe->hops.at(recipe->hops_row).form])); |
| 444 //item = new QTableWidgetItem(hop_forms[recipe->hops.at(recipe->hops_row).form]); | |
| 443 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); | 445 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); |
| 444 ui->hopsTable->setItem(recipe->hops_row, 3, item); | 446 ui->hopsTable->setItem(recipe->hops_row, 3, item); |
| 445 | 447 |
| 446 item = new QTableWidgetItem(QString("%1%").arg(recipe->hops.at(recipe->hops_row).alpha, 2, 'f', 1, '0')); | 448 item = new QTableWidgetItem(QString("%1%").arg(recipe->hops.at(recipe->hops_row).alpha, 2, 'f', 1, '0')); |
| 447 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); | 449 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); |
| 479 | 481 |
| 480 | 482 |
| 481 void EditRecipe::hop_useat_changed(int val) | 483 void EditRecipe::hop_useat_changed(int val) |
| 482 { | 484 { |
| 483 recipe->hops[recipe->hops_row].useat = val; | 485 recipe->hops[recipe->hops_row].useat = val; |
| 484 QTableWidgetItem *item = new QTableWidgetItem(hop_useat[val]); | 486 QTableWidgetItem *item = new QTableWidgetItem(QCoreApplication::translate("HopUse", g_hop_useat[val])); |
| 485 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); | 487 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); |
| 486 ui->hopsTable->setItem(recipe->hops_row, 5, item); | 488 ui->hopsTable->setItem(recipe->hops_row, 5, item); |
| 487 | 489 |
| 488 if (val == 2 || val == 4) { // Boil or whirlpool | 490 if (val == 2 || val == 4) { // Boil or whirlpool |
| 489 htimeLabel->setText(tr("Time in minutes:")); | 491 htimeLabel->setText(tr("Time in minutes:")); |
| 505 | 507 |
| 506 | 508 |
| 507 void EditRecipe::hop_form_changed(int val) | 509 void EditRecipe::hop_form_changed(int val) |
| 508 { | 510 { |
| 509 recipe->hops[recipe->hops_row].form = val; | 511 recipe->hops[recipe->hops_row].form = val; |
| 510 QTableWidgetItem *item = new QTableWidgetItem(hop_forms[val]); | 512 QTableWidgetItem *item = new QTableWidgetItem(QCoreApplication::translate("HopForm", g_hop_forms[val])); |
| 511 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); | 513 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); |
| 512 ui->hopsTable->setItem(recipe->hops_row, 3, item); | 514 ui->hopsTable->setItem(recipe->hops_row, 3, item); |
| 513 | 515 |
| 514 double ibu = Utils::toIBU(recipe->hops.at(recipe->hops_row).useat, recipe->hops.at(recipe->hops_row).form, recipe->preboil_sg, | 516 double ibu = Utils::toIBU(recipe->hops.at(recipe->hops_row).useat, recipe->hops.at(recipe->hops_row).form, recipe->preboil_sg, |
| 515 recipe->batch_size, recipe->hops.at(recipe->hops_row).amount, recipe->hops.at(recipe->hops_row).time, | 517 recipe->batch_size, recipe->hops.at(recipe->hops_row).amount, recipe->hops.at(recipe->hops_row).time, |
