diff -r 2a97905cb637 -r fe6346211b5b src/PrinterDialog.cpp --- a/src/PrinterDialog.cpp Sun Jun 19 19:42:29 2022 +0200 +++ b/src/PrinterDialog.cpp Mon Jun 20 19:55:23 2022 +0200 @@ -105,7 +105,7 @@ y = 120; } painter.fillRect( 20, y, 715, 20, (i % 2) ? c_line1:c_line2); - painter.drawText( 20, y+4, 80, 20, Qt::AlignLeft, fermentable_types[query.value(0).toInt()]); + painter.drawText( 20, y+4, 80, 20, Qt::AlignLeft, QCoreApplication::translate("FermentableType", g_fermentable_types[query.value(0).toInt()])); painter.drawText(100, y+4, 100, 20, Qt::AlignLeft, query.value(2).toString()); painter.drawText(200, y+4, 260, 20, Qt::AlignLeft, query.value(1).toString()); w = QString("%1 kg").arg(query.value(3).toDouble(), 10, 'f', 3); @@ -154,7 +154,7 @@ painter.fillRect( 20, y, 715, 20, (i % 2) ? c_line1:c_line2); painter.drawText( 20, y+4, 120, 20, Qt::AlignLeft, query.value(2).toString()); painter.drawText(140, y+4, 240, 20, Qt::AlignLeft, query.value(0).toString()); - painter.drawText(380, y+4, 80, 20, Qt::AlignLeft, hop_forms[query.value(1).toInt()]); + painter.drawText(380, y+4, 80, 20, Qt::AlignLeft, QCoreApplication::translate("HopForm", g_hop_forms[query.value(1).toInt()])); if (query.value(3).toDouble() < 0.6) w = QString("%1 gr").arg(query.value(3).toDouble() * 1000.0, 10, 'f', 1); else @@ -251,7 +251,7 @@ y = 120; } painter.fillRect( 20, y, 715, 20, (i % 2) ? c_line1:c_line2); - painter.drawText( 20, y+4, 120, 20, Qt::AlignLeft, misc_types[query.value(1).toInt()]); + painter.drawText( 20, y+4, 120, 20, Qt::AlignLeft, QCoreApplication::translate("MiscType", g_misc_types[query.value(1).toInt()])); painter.drawText(140, y+4, 320, 20, Qt::AlignLeft, query.value(0).toString()); if (query.value(2).toInt()) w = QString("%1 gr").arg(query.value(3).toDouble() * 1000.0, 10, 'f', 1); @@ -301,8 +301,8 @@ painter.fillRect( 20, y, 715, 20, (i % 2) ? c_line1:c_line2); painter.drawText( 20, y+4, 180, 20, Qt::AlignLeft, query.value(0).toString()); painter.drawText(200, y+4, 230, 20, Qt::AlignLeft, query.value(5).toString()); - painter.drawText(430, y+4, 80, 20, Qt::AlignCenter, yeast_types[query.value(1).toInt()]); - painter.drawText(510, y+4, 80, 20, Qt::AlignCenter, yeast_forms[query.value(2).toInt()]); + painter.drawText(430, y+4, 80, 20, Qt::AlignCenter, QCoreApplication::translate("YeastType", g_yeast_types[query.value(1).toInt()])); + painter.drawText(510, y+4, 80, 20, Qt::AlignCenter, QCoreApplication::translate("YeastForm", g_yeast_forms[query.value(2).toInt()])); if (query.value(2).toInt() == 0) w = QString("%1 %2").arg(query.value(3).toDouble(), 10, 'f', 1).arg(y_unit[query.value(2).toInt()]); @@ -328,7 +328,7 @@ painter.setFont(QFont("Helvetica", 9, QFont::Normal)); painter.fillRect( 20, y, 330, 20, c_line1); painter.drawText( 20, y+4, 150, 20, Qt::AlignLeft, tr("Brew type")); - painter.drawText(170, y+4, 180, 20, Qt::AlignLeft, recipe_types[recipe->type]); + painter.drawText(170, y+4, 180, 20, Qt::AlignLeft, QCoreApplication::translate("Recipe_type", g_recipe_types[recipe->type])); painter.fillRect(405, y, 330, 20, c_line1); painter.drawText(405, y+4, 150, 20, Qt::AlignLeft, tr("Efficiency")); painter.drawText(555, y+4, 180, 20, Qt::AlignLeft, QString("%1 %").arg(recipe->efficiency, 1, 'f', 1)); @@ -392,9 +392,9 @@ cost_fermentables += cost; if (recipe->fermentables.at(i).type == 0) - soort = fermentable_graintypes[recipe->fermentables.at(i).graintype]; + soort = QCoreApplication::translate("FermentableGraintype", g_fermentable_graintypes[recipe->fermentables.at(i).graintype]); else - soort = fermentable_types[recipe->fermentables.at(i).type]; + soort = QCoreApplication::translate("FermentableType", g_fermentable_types[recipe->fermentables.at(i).type]); if (recipe->fermentables.at(i).amount > 100) amount = QString("%1 kg").arg(recipe->fermentables.at(i).amount, 1, 'f', 1); @@ -411,7 +411,7 @@ painter.drawText(285, y+4, 70, 20, Qt::AlignRight, QString("%1%").arg(recipe->fermentables.at(i).percentage, 1, 'f', 1)); painter.drawText(360, y+4, 70, 20, Qt::AlignRight, QString("%1%").arg(recipe->fermentables.at(i).yield, 1, 'f', 1)); painter.drawText(435, y+4, 80, 20, Qt::AlignLeft, soort); - painter.drawText(520, y+4, 80, 20, Qt::AlignLeft, fermentable_added[recipe->fermentables.at(i).added]); + painter.drawText(520, y+4, 80, 20, Qt::AlignLeft, QCoreApplication::translate("FermentableAdded", g_fermentable_added[recipe->fermentables.at(i).added])); painter.drawText(605, y+4, 60, 20, Qt::AlignRight, amount); painter.drawText(670, y+4, 60, 20, Qt::AlignRight, QString("%1 €").arg(cost, 1, 'f', 3)); y += 20; @@ -442,11 +442,11 @@ recipe->ibu_method, 0, recipe->hops.at(i).time, 0, recipe->boil_time); if (recipe->hops.at(i).useat == 2 || recipe->hops.at(i).useat == 4) // Boil or Whirlpool - use = hop_useat[recipe->hops.at(i).useat] + QString(" %1 min").arg(recipe->hops.at(i).time); + use = QCoreApplication::translate("HopUse", g_hop_useat[recipe->hops.at(i).useat]) + QString(" %1 min").arg(recipe->hops.at(i).time); else if (recipe->hops.at(i).useat == 5) // Dryhop - use = hop_useat[recipe->hops.at(i).useat] + QString(" %1 days").arg(recipe->hops.at(i).time / 1440); + use = QCoreApplication::translate("HopUse", g_hop_useat[recipe->hops.at(i).useat]) + QString(" %1 days").arg(recipe->hops.at(i).time / 1440); else - use = hop_useat[recipe->hops.at(i).useat]; + use = QCoreApplication::translate("HopUse", g_hop_useat[recipe->hops.at(i).useat]); if (recipe->hops.at(i).amount > 1) amount = QString("%1 kg").arg(recipe->hops.at(i).amount, 1, 'f', 3); @@ -457,7 +457,7 @@ painter.drawText( 20, y+4, 260, 20, Qt::AlignLeft, recipe->hops.at(i).name + " (" + recipe->hops.at(i).origin + ")"); painter.drawText(285, y+4, 70, 20, Qt::AlignRight, QString("%1%").arg(recipe->hops.at(i).alpha, 1, 'f', 1)); painter.drawText(360, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(ibu, 1, 'f', 1)); - painter.drawText(435, y+4, 80, 20, Qt::AlignLeft, hop_forms[recipe->hops.at(i).form]); + painter.drawText(435, y+4, 80, 20, Qt::AlignLeft, QCoreApplication::translate("HopForm", g_hop_forms[recipe->hops.at(i).form])); painter.drawText(520, y+4, 80, 20, Qt::AlignLeft, use); painter.drawText(605, y+4, 60, 20, Qt::AlignRight, amount); painter.drawText(670, y+4, 60, 20, Qt::AlignRight, QString("%1 €").arg(cost, 1, 'f', 3)); @@ -495,8 +495,8 @@ recipe->yeasts.at(i).product_id + " (" + recipe->yeasts.at(i).name + ")"); painter.drawText(360, y+4, 70, 20, Qt::AlignRight, QString("%1%").arg(recipe->yeasts.at(i).attenuation, 1, 'f', 1)); - painter.drawText(435, y+4, 80, 20, Qt::AlignLeft, yeast_forms[recipe->yeasts.at(i).form]); - painter.drawText(520, y+4, 80, 20, Qt::AlignLeft, yeast_use[recipe->yeasts.at(i).use]); + painter.drawText(435, y+4, 80, 20, Qt::AlignLeft, QCoreApplication::translate("YeastForm", g_yeast_forms[recipe->yeasts.at(i).form])); + painter.drawText(520, y+4, 80, 20, Qt::AlignLeft, QCoreApplication::translate("YeastUse", g_yeast_use[recipe->yeasts.at(i).use])); painter.drawText(605, y+4, 60, 20, Qt::AlignRight, amount); painter.drawText(670, y+4, 60, 20, Qt::AlignRight, QString("%1 €").arg(cost, 1, 'f', 3)); y += 20; @@ -528,9 +528,9 @@ cost_miscs += cost; if (recipe->miscs.at(i).use_use == 2) - use = misc_uses[recipe->miscs.at(i).use_use] + QString(" %1 min").arg(recipe->miscs.at(i).time); + use = QCoreApplication::translate("MiscUse", g_misc_uses[recipe->miscs.at(i).use_use]) + QString(" %1 min").arg(recipe->miscs.at(i).time); else - use = misc_uses[recipe->miscs.at(i).use_use]; + use = QCoreApplication::translate("MiscUse", g_misc_uses[recipe->miscs.at(i).use_use]); if (recipe->miscs.at(i).type == 4) // Water agent painter.fillRect( 20, y, 715, 20, mw_line); @@ -541,7 +541,7 @@ else painter.fillRect( 20, y, 715, 20, mo_line); painter.drawText( 20, y+4, 410, 20, Qt::AlignLeft, recipe->miscs.at(i).name); - painter.drawText(435, y+4, 80, 20, Qt::AlignLeft, misc_types[recipe->miscs.at(i).type]); + painter.drawText(435, y+4, 80, 20, Qt::AlignLeft, QCoreApplication::translate("MiscType", g_misc_types[recipe->miscs.at(i).type])); painter.drawText(520, y+4, 80, 20, Qt::AlignLeft, use); painter.drawText(605, y+4, 60, 20, Qt::AlignRight, QString("%1 %2").arg(recipe->miscs.at(i).amount * 1000.0, 1, 'f', 1).arg(recipe->miscs.at(i).amount_is_weight ? "gr":"ml")); @@ -576,7 +576,7 @@ for (int i = 0; i < recipe->mashs.size(); i++) { painter.fillRect( 20, y, 715, 20, line); painter.drawText( 20, y+4, 160, 20, Qt::AlignLeft, recipe->mashs.at(i).step_name); - painter.drawText(180, y+4, 80, 20, Qt::AlignLeft, step_types[recipe->mashs.at(i).step_type]); + painter.drawText(180, y+4, 80, 20, Qt::AlignLeft, QCoreApplication::translate("StepType", g_step_types[recipe->mashs.at(i).step_type])); painter.drawText(260, y+4, 60, 20, Qt::AlignRight, QString("%1").arg(recipe->mashs.at(i).step_temp, 1, 'f', 1)); painter.drawText(325, y+4, 60, 20, Qt::AlignRight, QString("%1").arg(recipe->mashs.at(i).end_temp, 1, 'f', 1)); painter.drawText(390, y+4, 60, 20, Qt::AlignRight, QString("%1").arg(recipe->mashs.at(i).step_time, 1, 'f', 0)); @@ -704,7 +704,7 @@ painter.setFont(QFont("Helvetica", 9, QFont::Normal)); painter.fillRect( 20, y, 330, 20, c_line1); painter.drawText( 20, y+4, 150, 20, Qt::AlignLeft, tr("Brew type")); - painter.drawText(170, y+4, 180, 20, Qt::AlignLeft, recipe_types[product->type]); + painter.drawText(170, y+4, 180, 20, Qt::AlignLeft, QCoreApplication::translate("RecipeType", g_recipe_types[product->type])); painter.fillRect(405, y, 330, 20, c_line1); painter.drawText(405, y+4, 150, 20, Qt::AlignLeft, tr("Efficiency")); painter.drawText(555, y+4, 180, 20, Qt::AlignLeft, QString("%1 %").arg(product->efficiency, 1, 'f', 1)); @@ -757,12 +757,12 @@ painter.drawText(170, y+4, 180, 20, Qt::AlignLeft, product->st_name); painter.fillRect(405, y, 330, 20, c_line1); painter.drawText(405, y+4, 150, 20, Qt::AlignLeft, tr("Stage")); - painter.drawText(555, y+4, 180, 20, Qt::AlignLeft, prod_stages[product->stage]); + painter.drawText(555, y+4, 180, 20, Qt::AlignLeft, QCoreApplication::translate("ProdStages", g_prod_stages[product->stage])); if (product->divide_parts) { y += 20; painter.fillRect( 20, y, 330, 20, c_line1); painter.drawText( 20, y+4, 150, 20, Qt::AlignLeft, tr("Split batch")); - painter.drawText(170, y+4, 180, 20, Qt::AlignLeft, prod_split[product->divide_type]); + painter.drawText(170, y+4, 180, 20, Qt::AlignLeft, QCoreApplication::translate("Splitter", g_prod_split[product->divide_type])); painter.fillRect(405, y, 330, 20, c_line1); painter.drawText(405, y+4, 150, 20, Qt::AlignLeft, tr("Batch number")); painter.drawText(555, y+4, 180, 20, Qt::AlignLeft, QString("%1 of %2").arg(product->divide_part + 1).arg(product->divide_parts + 1)); @@ -789,9 +789,9 @@ cost_fermentables += cost; if (product->fermentables.at(i).type == 0) - soort = fermentable_graintypes[product->fermentables.at(i).graintype]; + soort = QCoreApplication::translate("FermentableGraintype", g_fermentable_graintypes[product->fermentables.at(i).graintype]); else - soort = fermentable_types[product->fermentables.at(i).type]; + soort = QCoreApplication::translate("FermentableType", g_fermentable_types[product->fermentables.at(i).type]); if (product->fermentables.at(i).amount > 100) amount = QString("%1 kg").arg(product->fermentables.at(i).amount, 1, 'f', 1); @@ -811,7 +811,7 @@ painter.drawText(285, y+4, 70, 20, Qt::AlignRight, ""); painter.drawText(360, y+4, 70, 20, Qt::AlignRight, QString("%1%").arg(product->fermentables.at(i).yield, 1, 'f', 1)); painter.drawText(435, y+4, 80, 20, Qt::AlignLeft, soort); - painter.drawText(520, y+4, 80, 20, Qt::AlignLeft, fermentable_added[product->fermentables.at(i).added]); + painter.drawText(520, y+4, 80, 20, Qt::AlignLeft, QCoreApplication::translate("FermentableAdded", g_fermentable_added[product->fermentables.at(i).added])); painter.drawText(605, y+4, 60, 20, Qt::AlignRight, amount); painter.drawText(670, y+4, 60, 20, Qt::AlignRight, QString("%1 €").arg(cost, 1, 'f', 3)); y += 20; @@ -842,11 +842,11 @@ product->ibu_method, product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time); if (product->hops.at(i).useat == 2 || product->hops.at(i).useat == 4) // Boil or Whirlpool - use = hop_useat[product->hops.at(i).useat] + QString(" %1 min").arg(product->hops.at(i).time); + use = QCoreApplication::translate("HopUse", g_hop_useat[product->hops.at(i).useat]) + QString(" %1 min").arg(product->hops.at(i).time); else if (product->hops.at(i).useat == 5) // Dryhop - use = hop_useat[product->hops.at(i).useat] + QString(" %1 days").arg(product->hops.at(i).time / 1440); + use = QCoreApplication::translate("HopUse", g_hop_useat[product->hops.at(i).useat]) + QString(" %1 days").arg(product->hops.at(i).time / 1440); else - use = hop_useat[product->hops.at(i).useat]; + use = QCoreApplication::translate("HopUse", g_hop_useat[product->hops.at(i).useat]); if (product->hops.at(i).amount > 1) amount = QString("%1 kg").arg(product->hops.at(i).amount, 1, 'f', 3); @@ -857,7 +857,7 @@ painter.drawText( 20, y+4, 260, 20, Qt::AlignLeft, product->hops.at(i).name + " (" + product->hops.at(i).origin + ")"); painter.drawText(285, y+4, 70, 20, Qt::AlignRight, QString("%1%").arg(product->hops.at(i).alpha, 1, 'f', 1)); painter.drawText(360, y+4, 70, 20, Qt::AlignRight, QString("%1").arg(ibu, 1, 'f', 1)); - painter.drawText(435, y+4, 80, 20, Qt::AlignLeft, hop_forms[product->hops.at(i).form]); + painter.drawText(435, y+4, 80, 20, Qt::AlignLeft, QCoreApplication::translate("HopForm", g_hop_forms[product->hops.at(i).form])); painter.drawText(520, y+4, 80, 20, Qt::AlignLeft, use); painter.drawText(605, y+4, 60, 20, Qt::AlignRight, amount); painter.drawText(670, y+4, 60, 20, Qt::AlignRight, QString("%1 €").arg(cost, 1, 'f', 3)); @@ -895,8 +895,8 @@ product->yeasts.at(i).product_id + " (" + product->yeasts.at(i).name + ")"); painter.drawText(360, y+4, 70, 20, Qt::AlignRight, QString("%1%").arg(product->yeasts.at(i).attenuation, 1, 'f', 1)); - painter.drawText(435, y+4, 80, 20, Qt::AlignLeft, yeast_forms[product->yeasts.at(i).form]); - painter.drawText(520, y+4, 80, 20, Qt::AlignLeft, yeast_use[product->yeasts.at(i).use]); + painter.drawText(435, y+4, 80, 20, Qt::AlignLeft, QCoreApplication::translate("YeastForm", g_yeast_forms[product->yeasts.at(i).form])); + painter.drawText(520, y+4, 80, 20, Qt::AlignLeft, QCoreApplication::translate("YeastUse", g_yeast_use[product->yeasts.at(i).use])); painter.drawText(605, y+4, 60, 20, Qt::AlignRight, amount); painter.drawText(670, y+4, 60, 20, Qt::AlignRight, QString("%1 €").arg(cost, 1, 'f', 3)); y += 20; @@ -944,9 +944,9 @@ cost_miscs += cost; if (product->miscs.at(i).use_use == 2) - use = misc_uses[product->miscs.at(i).use_use] + QString(" %1 min").arg(product->miscs.at(i).time); + use = QCoreApplication::translate("MiscUse", g_misc_uses[product->miscs.at(i).use_use]) + QString(" %1 min").arg(product->miscs.at(i).time); else - use = misc_uses[product->miscs.at(i).use_use]; + use = QCoreApplication::translate("MiscUse", g_misc_uses[product->miscs.at(i).use_use]); if (product->miscs.at(i).type == 4) // Water agent painter.fillRect( 20, y, 715, 20, mw_line); @@ -957,7 +957,7 @@ else painter.fillRect( 20, y, 715, 20, mo_line); painter.drawText( 20, y+4, 410, 20, Qt::AlignLeft, product->miscs.at(i).name); - painter.drawText(435, y+4, 80, 20, Qt::AlignLeft, misc_types[product->miscs.at(i).type]); + painter.drawText(435, y+4, 80, 20, Qt::AlignLeft, QCoreApplication::translate("MiscType", g_misc_types[product->miscs.at(i).type])); painter.drawText(520, y+4, 80, 20, Qt::AlignLeft, use); painter.drawText(605, y+4, 60, 20, Qt::AlignRight, QString("%1 %2").arg(product->miscs.at(i).amount * 1000.0, 1, 'f', 1).arg(product->miscs.at(i).amount_is_weight ? "gr":"ml")); @@ -992,7 +992,7 @@ for (int i = 0; i < product->mashs.size(); i++) { painter.fillRect( 20, y, 715, 20, line); painter.drawText( 20, y+4, 160, 20, Qt::AlignLeft, product->mashs.at(i).step_name); - painter.drawText(180, y+4, 80, 20, Qt::AlignLeft, step_types[product->mashs.at(i).step_type]); + painter.drawText(180, y+4, 80, 20, Qt::AlignLeft, QCoreApplication::translate("StepType", g_step_types[product->mashs.at(i).step_type])); painter.drawText(260, y+4, 60, 20, Qt::AlignRight, QString("%1").arg(product->mashs.at(i).step_temp, 1, 'f', 1)); painter.drawText(325, y+4, 60, 20, Qt::AlignRight, QString("%1").arg(product->mashs.at(i).end_temp, 1, 'f', 1)); painter.drawText(390, y+4, 60, 20, Qt::AlignRight, QString("%1").arg(product->mashs.at(i).step_time, 1, 'f', 0)); @@ -1149,7 +1149,7 @@ painter.fillRect( 20, y, 715, 20, c_line1); painter.drawText( 20, y+4, 20, 20, Qt::AlignCenter, QString("%1").arg(i + 1)); painter.drawText( 40, y+4, 250, 20, Qt::AlignLeft, product->mashs.at(i).step_name); - painter.drawText(290, y+4, 120, 20, Qt::AlignLeft, step_types[product->mashs.at(i).step_type]); + painter.drawText(290, y+4, 120, 20, Qt::AlignLeft, QCoreApplication::translate("StepType", g_step_types[product->mashs.at(i).step_type])); painter.drawText(400, y+4, 110, 20, Qt::AlignLeft, QString("%1 - %2°C"). arg(product->mashs.at(i).step_temp, 1, 'f', 1).arg(product->mashs.at(i).end_temp, 1, 'f', 1)); painter.drawText(510, y+4, 75, 20, Qt::AlignLeft, QString("%1").arg(product->mashs.at(i).step_time, 1, 'f', 0)); @@ -2132,7 +2132,8 @@ if (product->divide_type && product->divide_type == moment) { *y += 20; painter->setFont(QFont("Helvetica", 14, QFont::Bold)); - painter->drawText(20, *y, 715, 20, Qt::AlignCenter, QString(tr("%1 split the batch here!")).arg(prod_split[product->divide_type])); + painter->drawText(20, *y, 715, 20, Qt::AlignCenter, + QString(tr("%1 split the batch here!")).arg(QCoreApplication::translate("Splitter", g_prod_split[product->divide_type]))); painter->setFont(QFont("Arial", 10, QFont::Normal)); *y += 26; return true;