Mercurial > bmsapp / changeset

--- a/src/InventoryFermentables.cpp	Sat Apr 23 13:18:47 2022 +0200
+++ b/src/InventoryFermentables.cpp	Sat Apr 23 14:06:41 2022 +0200
@@ -18,6 +18,7 @@
 #include "EditFermentable.h"
 #include "MainWindow.h"
 #include "config.h"
+#include "global.h"
 #include "Utils.h"
 
 
@@ -101,8 +102,6 @@
 
     QSqlQuery query("SELECT * FROM inventory_fermentables ORDER BY supplier,name");
     const QStringList labels({tr("Origin"), tr("Supplier"), tr("Name"), tr("Type"), tr("Grain"), tr("Color"), tr("Yield"), tr("Stock"), tr("Edit")});
-    const QStringList types({tr("Grain"), tr("Sugar"), tr("Extract"), tr("Dry extract"), tr("Adjunct")});
-    const QStringList graintypes({tr("Base"), tr("Roast"), tr("Crystal"), tr("Kilned"), tr("Sour Malt"), tr("Special"), tr("No malt")});
 
     /* origin supplier name type graintype color yield inventory Edit */
     this->tableFermentables->setColumnCount(9);
@@ -127,8 +126,8 @@
 	this->tableFermentables->setItem(ridx, 0, new QTableWidgetItem(query.value(6).toString()));
 	this->tableFermentables->setItem(ridx, 1, new QTableWidgetItem(query.value(7).toString()));
 	this->tableFermentables->setItem(ridx, 2, new QTableWidgetItem(query.value(1).toString()));
-	this->tableFermentables->setItem(ridx, 3, new QTableWidgetItem(types[query.value(2).toInt()]));
-	this->tableFermentables->setItem(ridx, 4, new QTableWidgetItem(graintypes[query.value(20).toInt()]));
+	this->tableFermentables->setItem(ridx, 3, new QTableWidgetItem(fermentable_types[query.value(2).toInt()]));
+	this->tableFermentables->setItem(ridx, 4, new QTableWidgetItem(fermentable_graintypes[query.value(20).toInt()]));
 	w = QString("%1 EBC").arg(query.value(4).toDouble(), 1, 'f', 0, '0' );
 	QTableWidgetItem *item = new QTableWidgetItem(w);
 	item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);

--- a/src/InventoryHops.cpp	Sat Apr 23 13:18:47 2022 +0200
+++ b/src/InventoryHops.cpp	Sat Apr 23 14:06:41 2022 +0200
@@ -18,6 +18,7 @@
 #include "EditHop.h"
 #include "MainWindow.h"
 #include "config.h"
+#include "global.h"
 
 
 InventoryHops::InventoryHops(QWidget *parent) : QDialog(parent)
@@ -100,8 +101,6 @@
 
     QSqlQuery query("SELECT * FROM inventory_hops ORDER BY origin,name");
     const QStringList labels({tr("Origin"), tr("Name"), tr("Type"), tr("Form"), tr("Alpha"), tr("Beta"), tr("Cohumulone"), tr("HSI"), tr("Harvest"), tr("Stock"), tr("Edit")});
-    const QStringList types({tr("Bittering"), tr("Aroma"), tr("Both")});
-    const QStringList form({tr("Pellet"), tr("Plug"), tr("Leaf"), tr("Leaf Wet"), tr("Cryo")});
 
     /* origin supplier name type graintype color yield inventory Edit */
     this->tableHops->setColumnCount(11);
@@ -127,8 +126,8 @@
     for (int ridx = 0 ; ridx < query.size() ; ridx++ ) {
 	this->tableHops->setItem(ridx, 0, new QTableWidgetItem(query.value(12).toString()));	/* Origin */
 	this->tableHops->setItem(ridx, 1, new QTableWidgetItem(query.value(1).toString()));	/* Name	*/
-	this->tableHops->setItem(ridx, 2, new QTableWidgetItem(types[query.value(9).toInt()]));	/* Type */
-	this->tableHops->setItem(ridx, 3, new QTableWidgetItem(form[query.value(10).toInt()]));	/* Form */
+	this->tableHops->setItem(ridx, 2, new QTableWidgetItem(hop_types[query.value(9).toInt()]));	/* Type */
+	this->tableHops->setItem(ridx, 3, new QTableWidgetItem(hop_forms[query.value(10).toInt()]));	/* Form */
 	w = QString("%1 %").arg(query.value(2).toDouble(), 2, 'f', 1, '0' );	/* Alpha% */
 	QTableWidgetItem *item = new QTableWidgetItem(w);
         item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);

--- a/src/InventoryMiscs.cpp	Sat Apr 23 13:18:47 2022 +0200
+++ b/src/InventoryMiscs.cpp	Sat Apr 23 14:06:41 2022 +0200
@@ -18,6 +18,7 @@
 #include "EditMisc.h"
 #include "MainWindow.h"
 #include "config.h"
+#include "global.h"
 
 
 InventoryMiscs::InventoryMiscs(QWidget *parent) : QDialog(parent)
@@ -99,8 +100,6 @@
 
     QSqlQuery query("SELECT * FROM inventory_miscs ORDER BY name");
     const QStringList labels({tr("Name"), tr("Type"), tr("Use"), tr("Time"), tr("Stock"), tr("Edit")});
-    const QStringList types({tr("Spice"), tr("Herb"), tr("Flavor"), tr("Fining"), tr("Water agent"), tr("Yeast nutrient"), tr("Other")});
-    const QStringList use({tr("Starter"), tr("Mash"), tr("Boil"), tr("Primary"), tr("Secondary"), tr("Bottling")});
 
     /* origin supplier name type graintype color yield inventory Edit */
     this->tableMiscs->setColumnCount(6);
@@ -120,8 +119,8 @@
     query.first();
     for (int ridx = 0 ; ridx < query.size() ; ridx++ ) {
 	this->tableMiscs->setItem(ridx, 0, new QTableWidgetItem(query.value(1).toString()));	/* Name */
-	this->tableMiscs->setItem(ridx, 1, new QTableWidgetItem(types[query.value(2).toInt()]));	/* Type */
-	this->tableMiscs->setItem(ridx, 2, new QTableWidgetItem(use[query.value(3).toInt()]));	/* Use */
+	this->tableMiscs->setItem(ridx, 1, new QTableWidgetItem(misc_types[query.value(2).toInt()]));	/* Type */
+	this->tableMiscs->setItem(ridx, 2, new QTableWidgetItem(misc_uses[query.value(3).toInt()]));	/* Use */
 
 	w = QString("");	/* Use time */
 	if (query.value(4).toInt() > 0) {

--- a/src/InventoryYeasts.cpp	Sat Apr 23 13:18:47 2022 +0200
+++ b/src/InventoryYeasts.cpp	Sat Apr 23 14:06:41 2022 +0200
@@ -18,6 +18,7 @@
 #include "EditYeast.h"
 #include "MainWindow.h"
 #include "config.h"
+#include "global.h"
 
 
 InventoryYeasts::InventoryYeasts(QWidget *parent) : QDialog(parent)
@@ -102,8 +103,6 @@
 
     QSqlQuery query("SELECT * FROM inventory_yeasts ORDER BY laboratory,product_id,name");
     const QStringList labels({tr("Laboratory"), tr("Product id"), tr("Name"), tr("Type"), tr("Form"), tr("SVG %"), tr("Tol %"), tr("POF+"), tr("STA1"), tr("Stock"), tr("Edit")});
-    const QStringList types({tr("Lager"), tr("Ale"), tr("Wheat"), tr("Wine"), tr("Champagne"), tr("Brett"), tr("Kveik"), tr("Hybrid")});
-    const QStringList form({tr("Liquid"), tr("Dry"), tr("Slant"), tr("Culture"), tr("Frozen"), tr("Bottle"), tr("Dried")});
 
     /* origin supplier name type graintype color yield inventory Edit */
     this->tableYeasts->setColumnCount(11);
@@ -130,8 +129,8 @@
 	this->tableYeasts->setItem(ridx, 0, new QTableWidgetItem(query.value(4).toString()));	/* Laboratory */
 	this->tableYeasts->setItem(ridx, 1, new QTableWidgetItem(query.value(5).toString()));	/* Product id */
 	this->tableYeasts->setItem(ridx, 2, new QTableWidgetItem(query.value(1).toString()));	/* Name	*/
-	this->tableYeasts->setItem(ridx, 3, new QTableWidgetItem(types[query.value(2).toInt()]));	/* Type */
-	this->tableYeasts->setItem(ridx, 4, new QTableWidgetItem(form[query.value(3).toInt()]));	/* Form */
+	this->tableYeasts->setItem(ridx, 3, new QTableWidgetItem(yeast_types[query.value(2).toInt()]));	/* Type */
+	this->tableYeasts->setItem(ridx, 4, new QTableWidgetItem(yeast_forms[query.value(3).toInt()]));	/* Form */
 	w = QString("%1 %").arg(query.value(9).toDouble(), 2, 'f', 1, '0' );	/* Attenuation% */
 	QTableWidgetItem *item = new QTableWidgetItem(w);
         item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);

--- 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()]);