Mercurial > bmsapp / file diff

--- a/src/EditRecipeTab3.cpp	Sun Jun 19 19:42:29 2022 +0200
+++ b/src/EditRecipeTab3.cpp	Mon Jun 20 19:55:23 2022 +0200
@@ -69,11 +69,11 @@
 	ui->hopsTable->setItem(i, 0, new QTableWidgetItem(recipe->hops.at(i).origin));
 	ui->hopsTable->setItem(i, 1, new QTableWidgetItem(recipe->hops.at(i).name));
 
-	item = new QTableWidgetItem(hop_types[recipe->hops.at(i).type]);
+    	item = new QTableWidgetItem(QCoreApplication::translate("HopTypes", g_hop_types[recipe->hops.at(i).type]));
         item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
         ui->hopsTable->setItem(i, 2, item);
 
-	item = new QTableWidgetItem(hop_forms[recipe->hops.at(i).form]);
+	item = new QTableWidgetItem(QCoreApplication::translate("HopForm", g_hop_forms[recipe->hops.at(i).form]));
         item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
         ui->hopsTable->setItem(i, 3, item);
 
@@ -81,7 +81,7 @@
         item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
         ui->hopsTable->setItem(i, 4, item);
 
-	item = new QTableWidgetItem(hop_useat[recipe->hops.at(i).useat]);
+	item = new QTableWidgetItem(QCoreApplication::translate("HopUse", g_hop_useat[recipe->hops.at(i).useat]));
         item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
         ui->hopsTable->setItem(i, 5, item);
 
@@ -435,11 +435,13 @@
     ui->hopsTable->setItem(recipe->hops_row, 0, new QTableWidgetItem(recipe->hops.at(recipe->hops_row).origin));
     ui->hopsTable->setItem(recipe->hops_row, 1, new QTableWidgetItem(recipe->hops.at(recipe->hops_row).name));
 
-    item = new QTableWidgetItem(hop_types[recipe->hops.at(recipe->hops_row).type]);
+    QString hoptype = QCoreApplication::translate("HopTypes", g_hop_types[recipe->hops.at(recipe->hops_row).type]);
+    item = new QTableWidgetItem(hoptype);
     item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
     ui->hopsTable->setItem(recipe->hops_row, 2, item);
 
-    item = new QTableWidgetItem(hop_forms[recipe->hops.at(recipe->hops_row).form]);
+    item = new QTableWidgetItem(QCoreApplication::translate("HopForm", g_hop_forms[recipe->hops.at(recipe->hops_row).form]));
+    //item = new QTableWidgetItem(hop_forms[recipe->hops.at(recipe->hops_row).form]);
     item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
     ui->hopsTable->setItem(recipe->hops_row, 3, item);
 
@@ -481,7 +483,7 @@
 void EditRecipe::hop_useat_changed(int val)
 {
     recipe->hops[recipe->hops_row].useat = val;
-    QTableWidgetItem *item = new QTableWidgetItem(hop_useat[val]);
+    QTableWidgetItem *item = new QTableWidgetItem(QCoreApplication::translate("HopUse", g_hop_useat[val]));
     item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
     ui->hopsTable->setItem(recipe->hops_row, 5, item);
 
@@ -507,7 +509,7 @@
 void EditRecipe::hop_form_changed(int val)
 {
     recipe->hops[recipe->hops_row].form = val;
-    QTableWidgetItem *item = new QTableWidgetItem(hop_forms[val]);
+    QTableWidgetItem *item = new QTableWidgetItem(QCoreApplication::translate("HopForm", g_hop_forms[val]));
     item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
     ui->hopsTable->setItem(recipe->hops_row, 3, item);