Mercurial > bmsapp / file diff

--- a/src/global.cpp	Sun Jun 19 19:42:29 2022 +0200
+++ b/src/global.cpp	Mon Jun 20 19:55:23 2022 +0200
@@ -22,161 +22,161 @@
 Recipe *recipe;
 Product *product;
 
-const QStringList prod_stages({
-	QObject::tr("Plan"),
-	QObject::tr("Wait"),
-	QObject::tr("Brew"),
-	QObject::tr("Primary"),
-	QObject::tr("Secondary"),
-	QObject::tr("Tertiary"),
-	QObject::tr("Package"),
-	QObject::tr("Carbonation"),
-	QObject::tr("Mature"),
-	QObject::tr("Taste"),
-	QObject::tr("Ready"),
-	QObject::tr("Closed")
-});
+const char * const g_prod_stages[12] = {
+    QT_TRANSLATE_NOOP("ProdStages", "Plan"),
+    QT_TRANSLATE_NOOP("ProdStages", "Wait"),
+    QT_TRANSLATE_NOOP("ProdStages", "Brew"),
+    QT_TRANSLATE_NOOP("ProdStages", "Primary"),
+    QT_TRANSLATE_NOOP("ProdStages", "Secondary"),
+    QT_TRANSLATE_NOOP("ProdStages", "Tertiary"),
+    QT_TRANSLATE_NOOP("ProdStages", "Package"),
+    QT_TRANSLATE_NOOP("ProdStages", "Carbonation"),
+    QT_TRANSLATE_NOOP("ProdStages", "Mature"),
+    QT_TRANSLATE_NOOP("ProdStages", "Taste"),
+    QT_TRANSLATE_NOOP("ProdStages", "Ready"),
+    QT_TRANSLATE_NOOP("ProdStages", "Closed")
+};
 
-const QStringList prod_split({
-	QObject::tr("Not divided"),
-	QObject::tr("After mash"),
-	QObject::tr("After boil"),
-	QObject::tr("After cooling"),
-	QObject::tr("After primary"),
-	QObject::tr("After secondary"),
-	QObject::tr("After tertiary")
-});
+const char * const g_prod_split[7] = {
+    QT_TRANSLATE_NOOP("Splitter", "Not divided"),
+    QT_TRANSLATE_NOOP("Splitter", "After mash"),
+    QT_TRANSLATE_NOOP("Splitter", "After boil"),
+    QT_TRANSLATE_NOOP("Splitter", "After cooling"),
+    QT_TRANSLATE_NOOP("Splitter", "After primary"),
+    QT_TRANSLATE_NOOP("Splitter", "After secondary"),
+    QT_TRANSLATE_NOOP("Splitter", "After tertiary")
+};
 
-const QStringList recipe_types({
-	QObject::tr("Extract"),
-	QObject::tr("Partial Mash"),
-	QObject::tr("All Grain")
-});
+const char * const g_recipe_types[3] = {
+    QT_TRANSLATE_NOOP("RecipeType", "Extract"),
+    QT_TRANSLATE_NOOP("RecipeType", "Partial Mash"),
+    QT_TRANSLATE_NOOP("RecipeType", "All Grain")
+};
 
-const QStringList style_types({
-	QObject::tr("Lager"),
-	QObject::tr("Ale"),
-	QObject::tr("Mead"),
-	QObject::tr("Wheat"),
-	QObject::tr("Mixed"),
-	QObject::tr("Cider")
-});
+const char * const g_style_types[6] = {
+    QT_TRANSLATE_NOOP("BeerType", "Lager"),
+    QT_TRANSLATE_NOOP("BeerType", "Ale"),
+    QT_TRANSLATE_NOOP("BeerType", "Mead"),
+    QT_TRANSLATE_NOOP("BeerType", "Wheat"),
+    QT_TRANSLATE_NOOP("BeerType", "Mixed"),
+    QT_TRANSLATE_NOOP("BeerType", "Cider")
+};
 
-const QStringList fermentable_types({
-	QObject::tr("Grain"),
-	QObject::tr("Sugar"),
-	QObject::tr("Extract"),
-	QObject::tr("Dry extract"),
-	QObject::tr("Adjunct")
-});
+const char * const g_fermentable_types[5] = {
+    QT_TRANSLATE_NOOP("FermentableType", "Grain"),
+    QT_TRANSLATE_NOOP("FermentableType", "Sugar"),
+    QT_TRANSLATE_NOOP("FermentableType", "Extract"),
+    QT_TRANSLATE_NOOP("FermentableType", "Dry extract"),
+    QT_TRANSLATE_NOOP("FermentableType", "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 char * const g_fermentable_graintypes[7] = {
+    QT_TRANSLATE_NOOP("FermentableGraintype", "Base"),
+    QT_TRANSLATE_NOOP("FermentableGraintype", "Roast"),
+    QT_TRANSLATE_NOOP("FermentableGraintype", "Crystal"),
+    QT_TRANSLATE_NOOP("FermentableGraintype", "Kilned"),
+    QT_TRANSLATE_NOOP("FermentableGraintype", "Sour Malt"),
+    QT_TRANSLATE_NOOP("FermentableGraintype", "Special"),
+    QT_TRANSLATE_NOOP("FermentableGraintype", "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 char * const g_fermentable_added[6] = {
+    QT_TRANSLATE_NOOP("FermentableAdded", "Mash"),
+    QT_TRANSLATE_NOOP("FermentableAdded", "Boil"),
+    QT_TRANSLATE_NOOP("FermentableAdded", "Fermentation"),
+    QT_TRANSLATE_NOOP("FermentableAdded", "Lagering"),
+    QT_TRANSLATE_NOOP("FermentableAdded", "Bottle"),
+    QT_TRANSLATE_NOOP("FermentableAdded", "Kegs")
+};
 
-const QStringList hop_types({
-	QObject::tr("Bittering"),
-	QObject::tr("Aroma"),
-	QObject::tr("Both")
-});
+const char * const g_hop_types[3] = {
+    QT_TRANSLATE_NOOP("HopTypes", "Bittering"),
+    QT_TRANSLATE_NOOP("HopTypes", "Aroma"),
+    QT_TRANSLATE_NOOP("HopTypes", "Both")
+};
 
-const QStringList hop_forms({
-	QObject::tr("Pellet"),
-	QObject::tr("Plug"),
-	QObject::tr("Leaf"),
-	QObject::tr("Leaf wet"),
-	QObject::tr("Cryo"),
-	QObject::tr("Extract")
-});
+const char * const g_hop_forms[6] = {
+    QT_TRANSLATE_NOOP("HopForm", "Pellet"),
+    QT_TRANSLATE_NOOP("HopForm", "Plug"),
+    QT_TRANSLATE_NOOP("HopForm", "Leaf"),
+    QT_TRANSLATE_NOOP("HopForm", "Leaf wet"),
+    QT_TRANSLATE_NOOP("HopForm", "Cryo"),
+    QT_TRANSLATE_NOOP("HopForm", "Extract")
+};
 
-const QStringList hop_useat({
-	QObject::tr("Mash"),
-	QObject::tr("First wort"),
-	QObject::tr("Boil"),
-	QObject::tr("Aroma"),
-	QObject::tr("Whirlpool"),
-	QObject::tr("Dry hop"),
-	QObject::tr("Bottling")
-});
+const char * const g_hop_useat[7] = {
+    QT_TRANSLATE_NOOP("HopUse", "Mash"),
+    QT_TRANSLATE_NOOP("HopUse", "First wort"),
+    QT_TRANSLATE_NOOP("HopUse", "Boil"),
+    QT_TRANSLATE_NOOP("HopUse", "Aroma"),
+    QT_TRANSLATE_NOOP("HopUse", "Whirlpool"),
+    QT_TRANSLATE_NOOP("HopUse", "Dry hop"),
+    QT_TRANSLATE_NOOP("HopUse", "Bottling")
+};
 
-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 char * const g_misc_types[7] = {
+    QT_TRANSLATE_NOOP("MiscType", "Spice"),
+    QT_TRANSLATE_NOOP("MiscType", "Herb"),
+    QT_TRANSLATE_NOOP("MiscType", "Flavor"),
+    QT_TRANSLATE_NOOP("MiscType", "Fining"),
+    QT_TRANSLATE_NOOP("MiscType", "Water agent"),
+    QT_TRANSLATE_NOOP("MiscType", "Yeast nutrient"),
+    QT_TRANSLATE_NOOP("MiscType", "Other")
+};
 
-const QStringList misc_uses({
-	QObject::tr("Starter"),
-	QObject::tr("Mash"),
-	QObject::tr("Boil"),
-	QObject::tr("Primary"),
-	QObject::tr("Secondary"),
-	QObject::tr("Bottling")
-});
+const char * const g_misc_uses[6] = {
+    QT_TRANSLATE_NOOP("MiscUse", "Starter"),
+    QT_TRANSLATE_NOOP("MiscUse", "Mash"),
+    QT_TRANSLATE_NOOP("MiscUse", "Boil"),
+    QT_TRANSLATE_NOOP("MiscUse", "Primary"),
+    QT_TRANSLATE_NOOP("MiscUse", "Secondary"),
+    QT_TRANSLATE_NOOP("MiscUse", "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 char * const g_yeast_types[8] = {
+    QT_TRANSLATE_NOOP("YeastType", "Lager"),
+    QT_TRANSLATE_NOOP("YeastType", "Ale"),
+    QT_TRANSLATE_NOOP("YeastType", "Wheat"),
+    QT_TRANSLATE_NOOP("YeastType", "Wine"),
+    QT_TRANSLATE_NOOP("YeastType", "Champagne"),
+    QT_TRANSLATE_NOOP("YeastType", "Brett"),
+    QT_TRANSLATE_NOOP("YeastType", "Kveik"),
+    QT_TRANSLATE_NOOP("YeastType", "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 char * const g_yeast_forms[7] = {
+    QT_TRANSLATE_NOOP("YeastForm", "Liquid"),
+    QT_TRANSLATE_NOOP("YeastForm", "Dry"),
+    QT_TRANSLATE_NOOP("YeastForm", "Slant"),
+    QT_TRANSLATE_NOOP("YeastForm", "Culture"),
+    QT_TRANSLATE_NOOP("YeastForm", "Frozen"),
+    QT_TRANSLATE_NOOP("YeastForm", "Bottle"),
+    QT_TRANSLATE_NOOP("YeastForm", "Dried")
+};
 
-const QStringList yeast_use({
-	QObject::tr("Primary"),
-	QObject::tr("Secondary"),
-	QObject::tr("Tertiary"),
-	QObject::tr("Bottle")
-});
+const char * const g_yeast_use[4] = {
+    QT_TRANSLATE_NOOP("YeastUse", "Primary"),
+    QT_TRANSLATE_NOOP("YeastUse", "Secondary"),
+    QT_TRANSLATE_NOOP("YeastUse", "Tertiary"),
+    QT_TRANSLATE_NOOP("YeastUse", "Bottle")
+};
 
-const QStringList starters({
-	QObject::tr("Stirred"),
-	QObject::tr("Shaken"),
-	QObject::tr("Simple")
-});
+const char * const g_yeast_starter[3] = {
+    QT_TRANSLATE_NOOP("YeastStarter", "Stirred"),
+    QT_TRANSLATE_NOOP("YeastStarter", "Shaken"),
+    QT_TRANSLATE_NOOP("YeastStarter", "Simple")
+};
 
-const QStringList step_types({
-	QObject::tr("Infusion"),
-	QObject::tr("Temperature"),
-	QObject::tr("Decoction")
-});
+const char * const g_step_types[3] = {
+    QT_TRANSLATE_NOOP("StepType", "Infusion"),
+    QT_TRANSLATE_NOOP("StepType", "Temperature"),
+    QT_TRANSLATE_NOOP("StepType", "Decoction")
+};
 
-const QStringList tun_materials({
-	QObject::tr("Stainless Steel"),
-	QObject::tr("Aluminium"),
-	QObject::tr("Plastics"),
-	QObject::tr("Copper")
-});
+const char * const g_tun_materials[4] = {
+    QT_TRANSLATE_NOOP("TunMaterial", "Stainless Steel"),
+    QT_TRANSLATE_NOOP("TunMaterial", "Aluminium"),
+    QT_TRANSLATE_NOOP("TunMaterial", "Plastics"),
+    QT_TRANSLATE_NOOP("TunMaterial", "Copper")
+};