Mercurial > bmsapp / changeset

--- a/src/EditRecipe.cpp	Sat Apr 23 08:47:50 2022 +0200
+++ b/src/EditRecipe.cpp	Sat Apr 23 13:18:47 2022 +0200
@@ -491,7 +491,7 @@
     ui->st_guideEdit->setText(recipe->st_guide);
     ui->st_catEdit->setText(recipe->st_category);
     ui->st_catnrEdit->setText(QString("%1").arg(recipe->st_category_number));
-    ui->st_typeEdit->setText(s_types[recipe->st_type]);
+    ui->st_typeEdit->setText(style_types[recipe->st_type]);
     ui->nameEdit->setText(recipe->name);
     ui->notesEdit->setPlainText(recipe->notes);
     ui->typeEdit->setCurrentIndex(recipe->type);

--- a/src/EditRecipe.h	Sat Apr 23 08:47:50 2022 +0200
+++ b/src/EditRecipe.h	Sat Apr 23 13:18:47 2022 +0200
@@ -349,20 +349,6 @@
 
 private:
     Ui::EditRecipe *ui;
-    QStringList s_types = { tr("Lager"), tr("Ale"), tr("Mead"), tr("Wheat"), tr("Mixed"), tr("Cider") };
-    QStringList f_types = { tr("Grain"), tr("Sugar"), tr("Extract"), tr("Dry extract"), tr("Adjunct") };
-    QStringList f_graintypes = { tr("Base"), tr("Roast"), tr("Crystal"), tr("Kilned"), tr("Sour Malt"), tr("Special"), tr("No malt")};
-    QStringList f_added = { tr("Mash"), tr("Boil"), tr("Fermentation"), tr("Lagering"), tr("Bottle"), tr("Kegs") };
-    QStringList h_types = { tr("Bittering"), tr("Aroma"), tr("Both") };
-    QStringList h_forms = { tr("Pellet"), tr("Plug"), tr("Leaf"), tr("Leaf wet"), tr("Cryo") };
-    QStringList h_useat = { tr("Mash"), tr("First wort"), tr("Boil"), tr("Aroma"), tr("Whirlpool"), tr("Dry hop") };
-    QStringList m_types = { tr("Spice"), tr("Herb"), tr("Flavor"), tr("Fining"), tr("Water agent"), tr("Yeast nutrient"), tr("Other") };
-    QStringList m_uses = { tr("Starter"), tr("Mash"), tr("Boil"), tr("Primary"), tr("Secondary"), tr("Bottling") };
-    //QStringList y_types = { tr("Lager"), tr("Ale"), tr("Wheat"), tr("Wine"), tr("Champagne"), tr("Brett"), tr("Kveik"), tr("Hybrid") };
-    QStringList y_forms = { tr("Liquid"), tr("Dry"), tr("Slant"), tr("Culture"), tr("Frozen"), tr("Bottle"), tr("Dried") };
-    QStringList y_use = { tr("Primary"), tr("Secondary"), tr("Tertiary"), tr("Bottle") };
-    QStringList starters = { tr("Stirred"), tr("Shaken"), tr("Simple") };
-    QStringList step_types = { tr("Infusion"), tr("Temperature"), tr("Decoction") };
     QString bar_red = "QProgressBar::chunk {background: #FF0000;}";
     QString bar_orange = "QProgressBar::chunk {background: #EB7331;}";
     QString bar_green = "QProgressBar::chunk {background: #008C00;}";

--- a/src/EditRecipeTab1.cpp	Sat Apr 23 08:47:50 2022 +0200
+++ b/src/EditRecipeTab1.cpp	Sat Apr 23 13:18:47 2022 +0200
@@ -73,7 +73,7 @@
     ui->st_guideEdit->setText(recipe->st_guide);
     ui->st_catEdit->setText(recipe->st_category);
     ui->st_catnrEdit->setText(QString("%1").arg(recipe->st_category_number));
-    ui->st_typeEdit->setText(s_types[recipe->st_type]);
+    ui->st_typeEdit->setText(style_types[recipe->st_type]);
 
     ui->est_ogShow->setRange(query.value(7).toDouble(), query.value(8).toDouble());
     ui->est_fgShow->setRange(query.value(9).toDouble(), query.value(10).toDouble());

--- a/src/EditRecipeTab2.cpp	Sat Apr 23 08:47:50 2022 +0200
+++ b/src/EditRecipeTab2.cpp	Sat Apr 23 13:18:47 2022 +0200
@@ -86,15 +86,15 @@
         item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
         ui->fermentablesTable->setItem(i, 2, item);
 
-	item = new QTableWidgetItem(f_types[recipe->fermentables.at(i).f_type]);
+	item = new QTableWidgetItem(fermentable_types[recipe->fermentables.at(i).f_type]);
 	item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
 	ui->fermentablesTable->setItem(i, 3, item);
 
-        item = new QTableWidgetItem(f_graintypes[recipe->fermentables.at(i).f_graintype]);
+        item = new QTableWidgetItem(fermentable_graintypes[recipe->fermentables.at(i).f_graintype]);
         item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
         ui->fermentablesTable->setItem(i, 4, item);
 
-        item = new QTableWidgetItem(f_added[recipe->fermentables.at(i).f_added]);
+        item = new QTableWidgetItem(fermentable_added[recipe->fermentables.at(i).f_added]);
         item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
         ui->fermentablesTable->setItem(i, 5, item);
 
@@ -710,11 +710,11 @@
     item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
     ui->fermentablesTable->setItem(recipe->fermentables_row, 2, item);
 
-    item = new QTableWidgetItem(f_types[recipe->fermentables.at(recipe->fermentables_row).f_type]);
+    item = new QTableWidgetItem(fermentable_types[recipe->fermentables.at(recipe->fermentables_row).f_type]);
     item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
     ui->fermentablesTable->setItem(recipe->fermentables_row, 3, item);
 
-    item = new QTableWidgetItem(f_graintypes[recipe->fermentables.at(recipe->fermentables_row).f_graintype]);
+    item = new QTableWidgetItem(fermentable_graintypes[recipe->fermentables.at(recipe->fermentables_row).f_graintype]);
     item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
     ui->fermentablesTable->setItem(recipe->fermentables_row, 4, item);
 
@@ -756,7 +756,7 @@
     qDebug() << "ferment_added_changed()" << recipe->fermentables_row << val;
 
     recipe->fermentables[recipe->fermentables_row].f_added = val;
-    QTableWidgetItem *item = new QTableWidgetItem(f_added[val]);
+    QTableWidgetItem *item = new QTableWidgetItem(fermentable_added[val]);
     item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
     ui->fermentablesTable->setItem(recipe->fermentables_row, 5, item);
 

--- a/src/EditRecipeTab3.cpp	Sat Apr 23 08:47:50 2022 +0200
+++ b/src/EditRecipeTab3.cpp	Sat Apr 23 13:18:47 2022 +0200
@@ -69,11 +69,11 @@
 	ui->hopsTable->setItem(i, 0, new QTableWidgetItem(recipe->hops.at(i).h_origin));
 	ui->hopsTable->setItem(i, 1, new QTableWidgetItem(recipe->hops.at(i).h_name));
 
-	item = new QTableWidgetItem(h_types[recipe->hops.at(i).h_type]);
+	item = new QTableWidgetItem(hop_types[recipe->hops.at(i).h_type]);
         item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
         ui->hopsTable->setItem(i, 2, item);
 
-	item = new QTableWidgetItem(h_forms[recipe->hops.at(i).h_form]);
+	item = new QTableWidgetItem(hop_forms[recipe->hops.at(i).h_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(h_useat[recipe->hops.at(i).h_useat]);
+	item = new QTableWidgetItem(hop_useat[recipe->hops.at(i).h_useat]);
         item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
         ui->hopsTable->setItem(i, 5, item);
 
@@ -373,11 +373,11 @@
     ui->hopsTable->setItem(recipe->hops_row, 0, new QTableWidgetItem(recipe->hops.at(recipe->hops_row).h_origin));
     ui->hopsTable->setItem(recipe->hops_row, 1, new QTableWidgetItem(recipe->hops.at(recipe->hops_row).h_name));
 
-    item = new QTableWidgetItem(h_types[recipe->hops.at(recipe->hops_row).h_type]);
+    item = new QTableWidgetItem(hop_types[recipe->hops.at(recipe->hops_row).h_type]);
     item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
     ui->hopsTable->setItem(recipe->hops_row, 2, item);
 
-    item = new QTableWidgetItem(h_forms[recipe->hops.at(recipe->hops_row).h_form]);
+    item = new QTableWidgetItem(hop_forms[recipe->hops.at(recipe->hops_row).h_form]);
     item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
     ui->hopsTable->setItem(recipe->hops_row, 3, item);
 
@@ -423,7 +423,7 @@
     qDebug() << "hop_useat_changed()" << recipe->hops_row << val;
 
     recipe->hops[recipe->hops_row].h_useat = val;
-    QTableWidgetItem *item = new QTableWidgetItem(h_useat[val]);
+    QTableWidgetItem *item = new QTableWidgetItem(hop_useat[val]);
     item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
     ui->hopsTable->setItem(recipe->hops_row, 5, item);
 

--- a/src/EditRecipeTab4.cpp	Sat Apr 23 08:47:50 2022 +0200
+++ b/src/EditRecipeTab4.cpp	Sat Apr 23 13:18:47 2022 +0200
@@ -70,11 +70,11 @@
 
 	ui->miscsTable->setItem(i, 0, new QTableWidgetItem(recipe->miscs.at(i).m_name));
 
-	item = new QTableWidgetItem(m_types[recipe->miscs.at(i).m_type]);
+	item = new QTableWidgetItem(misc_types[recipe->miscs.at(i).m_type]);
         item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
         ui->miscsTable->setItem(i, 1, item);
 
-	item = new QTableWidgetItem(m_uses[recipe->miscs.at(i).m_use_use]);
+	item = new QTableWidgetItem(misc_uses[recipe->miscs.at(i).m_use_use]);
         item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
         ui->miscsTable->setItem(i, 2, item);
 
@@ -383,11 +383,11 @@
     mnameEdit->setText(recipe->miscs.at(recipe->miscs_row).m_name);
     ui->miscsTable->setItem(recipe->miscs_row, 0, new QTableWidgetItem(recipe->miscs.at(recipe->miscs_row).m_name));
 
-    item = new QTableWidgetItem(m_types[recipe->miscs.at(recipe->miscs_row).m_type]);
+    item = new QTableWidgetItem(misc_types[recipe->miscs.at(recipe->miscs_row).m_type]);
     item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
     ui->miscsTable->setItem(recipe->miscs_row, 1, item);
 
-    item = new QTableWidgetItem(m_uses[recipe->miscs.at(recipe->miscs_row).m_use_use]);
+    item = new QTableWidgetItem(misc_uses[recipe->miscs.at(recipe->miscs_row).m_use_use]);
     item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
     ui->miscsTable->setItem(recipe->miscs_row, 2, item);
     useatEdit->setCurrentIndex(recipe->miscs.at(recipe->miscs_row).m_use_use);
@@ -442,7 +442,7 @@
     query.first();
     this->mselectEdit->addItem("");      // Start with empty value
     for (int i = 0; i < query.size(); i++) {
-        this->mselectEdit->addItem(query.value(0).toString()+ " (" + m_types[query.value(1).toInt()] + ") " +
+        this->mselectEdit->addItem(query.value(0).toString()+ " (" + misc_types[query.value(1).toInt()] + ") " +
                         QString("%1 %2").arg(query.value(3).toDouble() * 1000.0, 3, 'f', 2, '0').arg(query.value(2).toInt()?"gr":"ml"));
         query.next();
     }
@@ -455,7 +455,7 @@
 
     qDebug() << "misc_useat_changed" << val;
     recipe->miscs[recipe->miscs_row].m_use_use = val;
-    item = new QTableWidgetItem(m_uses[val]);
+    item = new QTableWidgetItem(misc_uses[val]);
     item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
     ui->miscsTable->setItem(recipe->miscs_row, 2, item);
 

--- a/src/EditRecipeTab5.cpp	Sat Apr 23 08:47:50 2022 +0200
+++ b/src/EditRecipeTab5.cpp	Sat Apr 23 13:18:47 2022 +0200
@@ -64,11 +64,11 @@
 	ui->yeastsTable->setItem(i, 1, new QTableWidgetItem(recipe->yeasts.at(i).y_laboratory));
 	ui->yeastsTable->setItem(i, 2, new QTableWidgetItem(recipe->yeasts.at(i).y_product_id));
 
-	item = new QTableWidgetItem(y_forms[recipe->yeasts.at(i).y_form]);
+	item = new QTableWidgetItem(yeast_forms[recipe->yeasts.at(i).y_form]);
         item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
         ui->yeastsTable->setItem(i, 3, item);
 
-        item = new QTableWidgetItem(y_use[recipe->yeasts.at(i).y_use]);
+        item = new QTableWidgetItem(yeast_use[recipe->yeasts.at(i).y_use]);
         item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
         ui->yeastsTable->setItem(i, 4, item);
 
@@ -373,7 +373,7 @@
     ui->yeastsTable->setItem(recipe->yeasts_row, 1, new QTableWidgetItem(recipe->yeasts.at(recipe->yeasts_row).y_laboratory));
     ui->yeastsTable->setItem(recipe->yeasts_row, 2, new QTableWidgetItem(recipe->yeasts.at(recipe->yeasts_row).y_product_id));
 
-    item = new QTableWidgetItem(y_forms[recipe->yeasts.at(recipe->yeasts_row).y_form]);
+    item = new QTableWidgetItem(yeast_forms[recipe->yeasts.at(recipe->yeasts_row).y_form]);
     item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
     ui->yeastsTable->setItem(recipe->yeasts_row, 3, item);
 
@@ -427,7 +427,7 @@
     qDebug() << "yeast_useat_changed()" << recipe->yeasts_row << val;
 
     recipe->yeasts[recipe->yeasts_row].y_use = val;
-    QTableWidgetItem *item = new QTableWidgetItem(y_use[val]);
+    QTableWidgetItem *item = new QTableWidgetItem(yeast_use[val]);
     item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
     ui->yeastsTable->setItem(recipe->yeasts_row, 5, item);
     is_changed();

--- a/src/global.cpp	Sat Apr 23 08:47:50 2022 +0200
+++ b/src/global.cpp	Sat Apr 23 13:18:47 2022 +0200
@@ -19,3 +19,122 @@
 int my_default_water = -1;
 QString my_yeastlab = "";
 
+
+const QStringList style_types({
+	QObject::tr("Lager"),
+	QObject::tr("Ale"),
+	QObject::tr("Mead"),
+	QObject::tr("Wheat"),
+	QObject::tr("Mixed"),
+	QObject::tr("Cider")
+});
+
+const QStringList fermentable_types({
+	QObject::tr("Grain"),
+	QObject::tr("Sugar"),
+	QObject::tr("Extract"),
+	QObject::tr("Dry extract"),
+	QObject::tr("Adjunct")
+});
+
+const QStringList fermentable_graintypes({
+	QObject::tr("Base"),
+	QObject::tr("Roast"),
+	QObject::tr("Crystal"),
+	QObject::tr("Kilned"),
+	QObject::tr("Sour Malt"),
+	QObject::tr("Special"),
+	QObject::tr("No malt")
+});
+
+const QStringList fermentable_added({
+	QObject::tr("Mash"),
+	QObject::tr("Boil"),
+	QObject::tr("Fermentation"),
+	QObject::tr("Lagering"),
+	QObject::tr("Bottle"),
+	QObject::tr("Kegs")
+});
+
+const QStringList hop_types({
+	QObject::tr("Bittering"),
+	QObject::tr("Aroma"),
+	QObject::tr("Both")
+});
+
+const QStringList hop_forms({
+	QObject::tr("Pellet"),
+	QObject::tr("Plug"),
+	QObject::tr("Leaf"),
+	QObject::tr("Leaf wet"),
+	QObject::tr("Cryo")
+});
+
+const QStringList hop_useat({
+	QObject::tr("Mash"),
+	QObject::tr("First wort"),
+	QObject::tr("Boil"),
+	QObject::tr("Aroma"),
+	QObject::tr("Whirlpool"),
+	QObject::tr("Dry hop")
+});
+
+const QStringList misc_types({
+	QObject::tr("Spice"),
+	QObject::tr("Herb"),
+	QObject::tr("Flavor"),
+	QObject::tr("Fining"),
+	QObject::tr("Water agent"),
+	QObject::tr("Yeast nutrient"),
+	QObject::tr("Other")
+});
+
+const QStringList misc_uses({
+	QObject::tr("Starter"),
+	QObject::tr("Mash"),
+	QObject::tr("Boil"),
+	QObject::tr("Primary"),
+	QObject::tr("Secondary"),
+	QObject::tr("Bottling")
+});
+
+const QStringList yeast_types({
+	QObject::tr("Lager"),
+	QObject::tr("Ale"),
+	QObject::tr("Wheat"),
+	QObject::tr("Wine"),
+	QObject::tr("Champagne"),
+	QObject::tr("Brett"),
+	QObject::tr("Kveik"),
+	QObject::tr("Hybrid")
+});
+
+const QStringList yeast_forms({
+	QObject::tr("Liquid"),
+	QObject::tr("Dry"),
+	QObject::tr("Slant"),
+	QObject::tr("Culture"),
+	QObject::tr("Frozen"),
+	QObject::tr("Bottle"),
+	QObject::tr("Dried")
+});
+
+const QStringList yeast_use({
+	QObject::tr("Primary"),
+	QObject::tr("Secondary"),
+	QObject::tr("Tertiary"),
+	QObject::tr("Bottle")
+});
+
+const QStringList starters({
+	QObject::tr("Stirred"),
+	QObject::tr("Shaken"),
+	QObject::tr("Simple")
+});
+
+const QStringList step_types({
+	QObject::tr("Infusion"),
+	QObject::tr("Temperature"),
+	QObject::tr("Decoction")
+});
+

--- a/src/global.h	Sat Apr 23 08:47:50 2022 +0200
+++ b/src/global.h	Sat Apr 23 13:18:47 2022 +0200
@@ -3,6 +3,7 @@
 
 #include <QList>
 #include <QString>
+#include <QTranslator>
 
 
 #define Ka1		0.0000004445
@@ -61,4 +62,19 @@
 extern int		my_default_water;
 extern QString		my_yeastlab;
 
+extern const QStringList style_types;
+extern const QStringList fermentable_types;
+extern const QStringList fermentable_graintypes;
+extern const QStringList fermentable_added;
+extern const QStringList hop_types;
+extern const QStringList hop_forms;
+extern const QStringList hop_useat;
+extern const QStringList misc_types;
+extern const QStringList misc_uses;
+extern const QStringList yeast_types;
+extern const QStringList yeast_forms;
+extern const QStringList yeast_use;
+extern const QStringList starters;
+extern const QStringList step_types;
+
 #endif