comparison: src/EditRecipeTab2.cpp
src/EditRecipeTab2.cpp
- changeset 154
- 1af9f7b7f317
- parent 152
- 58e4ce7dd217
- child 167
- 5093db5665c6
equal
deleted
inserted
replaced
| 153:e71642121fb6 | 154:1af9f7b7f317 |
|---|---|
| 84 w = QString("%1").arg(recipe->fermentables.at(i).f_color, 1, 'f', 0, '0'); | 84 w = QString("%1").arg(recipe->fermentables.at(i).f_color, 1, 'f', 0, '0'); |
| 85 item = new QTableWidgetItem(w); | 85 item = new QTableWidgetItem(w); |
| 86 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); | 86 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); |
| 87 ui->fermentablesTable->setItem(i, 2, item); | 87 ui->fermentablesTable->setItem(i, 2, item); |
| 88 | 88 |
| 89 item = new QTableWidgetItem(f_types[recipe->fermentables.at(i).f_type]); | 89 item = new QTableWidgetItem(fermentable_types[recipe->fermentables.at(i).f_type]); |
| 90 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); | 90 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); |
| 91 ui->fermentablesTable->setItem(i, 3, item); | 91 ui->fermentablesTable->setItem(i, 3, item); |
| 92 | 92 |
| 93 item = new QTableWidgetItem(f_graintypes[recipe->fermentables.at(i).f_graintype]); | 93 item = new QTableWidgetItem(fermentable_graintypes[recipe->fermentables.at(i).f_graintype]); |
| 94 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); | 94 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); |
| 95 ui->fermentablesTable->setItem(i, 4, item); | 95 ui->fermentablesTable->setItem(i, 4, item); |
| 96 | 96 |
| 97 item = new QTableWidgetItem(f_added[recipe->fermentables.at(i).f_added]); | 97 item = new QTableWidgetItem(fermentable_added[recipe->fermentables.at(i).f_added]); |
| 98 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); | 98 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); |
| 99 ui->fermentablesTable->setItem(i, 5, item); | 99 ui->fermentablesTable->setItem(i, 5, item); |
| 100 | 100 |
| 101 item = new QTableWidgetItem(QString("%1%").arg(recipe->fermentables.at(i).f_yield, 2, 'f', 1, '0')); | 101 item = new QTableWidgetItem(QString("%1%").arg(recipe->fermentables.at(i).f_yield, 2, 'f', 1, '0')); |
| 102 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); | 102 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); |
| 708 w = QString("%1").arg(recipe->fermentables.at(recipe->fermentables_row).f_color, 1, 'f', 0, '0'); | 708 w = QString("%1").arg(recipe->fermentables.at(recipe->fermentables_row).f_color, 1, 'f', 0, '0'); |
| 709 item = new QTableWidgetItem(w); | 709 item = new QTableWidgetItem(w); |
| 710 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); | 710 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); |
| 711 ui->fermentablesTable->setItem(recipe->fermentables_row, 2, item); | 711 ui->fermentablesTable->setItem(recipe->fermentables_row, 2, item); |
| 712 | 712 |
| 713 item = new QTableWidgetItem(f_types[recipe->fermentables.at(recipe->fermentables_row).f_type]); | 713 item = new QTableWidgetItem(fermentable_types[recipe->fermentables.at(recipe->fermentables_row).f_type]); |
| 714 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); | 714 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); |
| 715 ui->fermentablesTable->setItem(recipe->fermentables_row, 3, item); | 715 ui->fermentablesTable->setItem(recipe->fermentables_row, 3, item); |
| 716 | 716 |
| 717 item = new QTableWidgetItem(f_graintypes[recipe->fermentables.at(recipe->fermentables_row).f_graintype]); | 717 item = new QTableWidgetItem(fermentable_graintypes[recipe->fermentables.at(recipe->fermentables_row).f_graintype]); |
| 718 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); | 718 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); |
| 719 ui->fermentablesTable->setItem(recipe->fermentables_row, 4, item); | 719 ui->fermentablesTable->setItem(recipe->fermentables_row, 4, item); |
| 720 | 720 |
| 721 item = new QTableWidgetItem(QString("%1%").arg(recipe->fermentables.at(recipe->fermentables_row).f_yield, 2, 'f', 1, '0')); | 721 item = new QTableWidgetItem(QString("%1%").arg(recipe->fermentables.at(recipe->fermentables_row).f_yield, 2, 'f', 1, '0')); |
| 722 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); | 722 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); |
| 754 void EditRecipe::ferment_added_changed(int val) | 754 void EditRecipe::ferment_added_changed(int val) |
| 755 { | 755 { |
| 756 qDebug() << "ferment_added_changed()" << recipe->fermentables_row << val; | 756 qDebug() << "ferment_added_changed()" << recipe->fermentables_row << val; |
| 757 | 757 |
| 758 recipe->fermentables[recipe->fermentables_row].f_added = val; | 758 recipe->fermentables[recipe->fermentables_row].f_added = val; |
| 759 QTableWidgetItem *item = new QTableWidgetItem(f_added[val]); | 759 QTableWidgetItem *item = new QTableWidgetItem(fermentable_added[val]); |
| 760 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); | 760 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); |
| 761 ui->fermentablesTable->setItem(recipe->fermentables_row, 5, item); | 761 ui->fermentablesTable->setItem(recipe->fermentables_row, 5, item); |
| 762 | 762 |
| 763 famountEdit->setReadOnly(recipe->fermentables_use100 && recipe->fermentables.at(recipe->fermentables_row).f_added < 4); | 763 famountEdit->setReadOnly(recipe->fermentables_use100 && recipe->fermentables.at(recipe->fermentables_row).f_added < 4); |
| 764 pctEdit->setReadOnly(! (recipe->fermentables_use100 && recipe->fermentables.at(recipe->fermentables_row).f_added < 4)); | 764 pctEdit->setReadOnly(! (recipe->fermentables_use100 && recipe->fermentables.at(recipe->fermentables_row).f_added < 4)); |
