Mercurial > bmsapp / file diff

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