Mercurial > bmsapp / file diff

--- a/src/PrinterDialog.cpp	Sat Apr 23 13:18:47 2022 +0200
+++ b/src/PrinterDialog.cpp	Sat Apr 23 14:06:41 2022 +0200
@@ -53,12 +53,7 @@
     const QColor c_header(255, 150, 100, 255);
     const QColor c_line1(210, 245, 255, 255);
     const QColor c_line2(255, 255, 210, 255);
-    const QStringList f_types({tr("Grain"), tr("Sugar"), tr("Extract"), tr("Dry extract"), tr("Adjunct")});
-    const QStringList h_form({tr("Pellet"), tr("Plug"), tr("Leaf"), tr("Leaf Wet"), tr("Cryo")});
-    const QStringList m_types({tr("Spice"), tr("Herb"), tr("Flavor"), tr("Fining"), tr("Water agent"), tr("Yeast nutrient"), tr("Other")});
     const QStringList y_unit({tr("pkg"), tr("gr"), tr("ml"), tr("ml"), tr("ml"), tr("ml"), tr("gr")});
-    const QStringList y_types({tr("Lager"), tr("Ale"), tr("Wheat"), tr("Wine"), tr("Champagne"), tr("Brett"), tr("Kveik"), tr("Hybrid")});
-    const QStringList y_form({tr("Liquid"), tr("Dry"), tr("Slant"), tr("Culture"), tr("Frozen"), tr("Bottle"), tr("Dried")});
 
     painter.begin(printer);
     qreal y = 0;
@@ -92,7 +87,7 @@
                 y = 120;
             }
 	    painter.fillRect(  0, y,   735, 20, (i % 2) ? c_line1:c_line2);
-	    painter.drawText(  0, y+4,  90, 20, Qt::AlignLeft, f_types[query.value(0).toInt()]);
+	    painter.drawText(  0, y+4,  90, 20, Qt::AlignLeft, fermentable_types[query.value(0).toInt()]);
 	    painter.drawText( 90, y+4, 100, 20, Qt::AlignLeft, query.value(2).toString());
 	    painter.drawText(190, y+4, 270, 20, Qt::AlignLeft, query.value(1).toString());
 	    w = QString("%1 kg").arg(query.value(3).toDouble(), 10, 'f', 3);
@@ -141,7 +136,7 @@
 	    painter.fillRect(  0, y,   735, 20, (i % 2) ? c_line1:c_line2);
             painter.drawText(  0, y+4, 120, 20, Qt::AlignLeft, query.value(2).toString());
 	    painter.drawText(120, y+4, 260, 20, Qt::AlignLeft, query.value(0).toString());
-	    painter.drawText(380, y+4,  80, 20, Qt::AlignLeft, h_form[query.value(1).toInt()]);
+	    painter.drawText(380, y+4,  80, 20, Qt::AlignLeft, 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
@@ -238,7 +233,7 @@
                 y = 120;
             }
             painter.fillRect(  0, y,   735, 20, (i % 2) ? c_line1:c_line2);
-            painter.drawText(  0, y+4, 120, 20, Qt::AlignLeft, m_types[query.value(1).toInt()]);
+            painter.drawText(  0, y+4, 120, 20, Qt::AlignLeft, misc_types[query.value(1).toInt()]);
             painter.drawText(120, y+4, 340, 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);
@@ -286,8 +281,8 @@
 	    painter.fillRect(  0, y,   735, 20, (i % 2) ? c_line1:c_line2);
             painter.drawText(  0, y+4, 200, 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, y_types[query.value(1).toInt()]);
-	    painter.drawText(510, y+4,  80, 20, Qt::AlignCenter, y_form[query.value(2).toInt()]);
+	    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()]);
 
 	    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()]);