Mercurial > bmsapp / changeset

changeset

Removed the last bits of equipent calc_volume setting. Changed to the equipment setup screen using suffixes in the fields. Updated the translations.

Sun, 15 Jan 2023 14:15:49 +0100

author
Michiel Broek <mbroek@mbse.eu>
date
Sun, 15 Jan 2023 14:15:49 +0100
changeset 462
1654ff5446c7
parent 461
add4dbef0c81
child 463
98df69885455

Removed the last bits of equipent calc_volume setting. Changed to the equipment setup screen using suffixes in the fields. Updated the translations.

src/EditEquipment.cpp file | annotate | diff | comparison | revisions
src/ImportXML.cpp file | annotate | diff | comparison | revisions
src/global.h file | annotate | diff | comparison | revisions
translations/bmsapp_en.ts file | annotate | diff | comparison | revisions
translations/bmsapp_nl.ts file | annotate | diff | comparison | revisions
ui/EditEquipment.ui file | annotate | diff | comparison | revisions 
--- a/src/EditEquipment.cpp	Sun Jan 15 12:35:04 2023 +0100
+++ b/src/EditEquipment.cpp	Sun Jan 15 14:15:49 2023 +0100
@@ -54,7 +54,6 @@
 	ui->trub_lossEdit->setValue(query.value("trub_loss").toDouble());
 	ui->evap_rateEdit->setValue(query.value("evap_rate").toDouble());
 	ui->boil_timeEdit->setValue(query.value("boil_time").toDouble());
-	ui->calcboilEdit->setChecked(query.value("calc_boil_volume").toInt() ? true:false);
 	ui->top_up_kettleEdit->setValue(query.value("top_up_kettle").toDouble());
 	ui->notesEdit->setPlainText(query.value("notes").toString());
 	ui->lauter_deadspaceEdit->setValue(query.value("lauter_deadspace").toDouble());
@@ -90,7 +89,6 @@
 	ui->trub_lossEdit->setValue(0.5);
 	ui->evap_rateEdit->setValue(1.8);
 	ui->boil_timeEdit->setValue(90);
-	ui->calcboilEdit->setChecked(true);
 	ui->top_up_kettleEdit->setValue(0);
 	ui->lauter_deadspaceEdit->setValue(0.5);
 	ui->kettle_volumeEdit->setValue(20);
@@ -120,7 +118,6 @@
     connect(ui->trub_lossEdit, &QDoubleSpinBox::textChanged, this, &EditEquipment::is_changed);
     connect(ui->evap_rateEdit, &QDoubleSpinBox::textChanged, this, &EditEquipment::is_changed);
     connect(ui->boil_timeEdit, &QDoubleSpinBox::textChanged, this, &EditEquipment::is_changed);
-    connect(ui->calcboilEdit, &QCheckBox::stateChanged, this, &EditEquipment::is_changed);
     connect(ui->top_up_kettleEdit, &QDoubleSpinBox::textChanged, this, &EditEquipment::is_changed);
     connect(ui->notesEdit, SIGNAL(textChanged()), this, SLOT(is_changed()));
     connect(ui->lauter_deadspaceEdit, &QDoubleSpinBox::textChanged, this, &EditEquipment::is_changed);
@@ -189,7 +186,7 @@
 		"batch_size=:batch_size, tun_volume=:tun_volume, tun_weight=:tun_weight, "
 		"tun_specific_heat=:tun_specific_heat, tun_material=:tun_material, tun_height=:tun_height, "
 		"top_up_water=:top_up_water, trub_loss=:trub_loss, evap_rate=:evap_rate, "
-		"boil_time=:boil_time, calc_boil_volume=:calcboil, top_up_kettle=:top_up_kettle, "
+		"boil_time=:boil_time, top_up_kettle=:top_up_kettle, "
 		"notes=:notes, lauter_deadspace=:lauter_deadspace, kettle_volume=:kettle_volume, "
 		"kettle_height=:kettle_height, mash_volume=:mash_volume, mash_max=:mash_max, "
 		"efficiency=:efficiency, chiller_type=:chiller_type, chiller_to79=:chiller_to79, "
@@ -212,7 +209,6 @@
 	query.bindValue(":trub_loss", QString("%1").arg(ui->trub_lossEdit->value(), 2, 'f', 1, '0'));
 	query.bindValue(":evap_rate", QString("%1").arg(ui->evap_rateEdit->value(), 3, 'f', 2, '0'));
 	query.bindValue(":boil_time", QString("%1").arg(ui->boil_timeEdit->value(), 1, 'f', 0, '0'));
-	query.bindValue(":calcboil", ui->calcboilEdit->isChecked() ? 1:0);
 	query.bindValue(":top_up_kettle", QString("%1").arg(ui->top_up_kettleEdit->value(), 2, 'f', 1, '0'));
 	query.bindValue(":notes", ui->notesEdit->toPlainText());
 	query.bindValue(":lauter_deadspace", QString("%1").arg(ui->lauter_deadspaceEdit->value(), 2, 'f', 1, '0'));
@@ -259,7 +255,7 @@
                 "batch_size=:batch_size, tun_volume=:tun_volume, tun_weight=:tun_weight, "
                 "tun_specific_heat=:tun_specific_heat, tun_material=:tun_material, tun_height=:tun_height, "
                 "top_up_water=:top_up_water, trub_loss=:trub_loss, evap_rate=:evap_rate, "
-                "boil_time=:boil_time, calc_boil_volume=:calcboil, top_up_kettle=:top_up_kettle, "
+                "boil_time=:boil_time, top_up_kettle=:top_up_kettle, "
                 "notes=:notes, lauter_deadspace=:lauter_deadspace, kettle_volume=:kettle_volume, "
                 "kettle_height=:kettle_height, mash_volume=:mash_volume, mash_max=:mash_max, "
                 "efficiency=:efficiency, chiller_type=:chiller_type, chiller_to79=:chiller_to79, "
@@ -277,7 +273,6 @@
     query.bindValue(":trub_loss", QString("%1").arg(ui->trub_lossEdit->value(), 2, 'f', 1, '0'));
     query.bindValue(":evap_rate", QString("%1").arg(ui->evap_rateEdit->value(), 3, 'f', 2, '0'));
     query.bindValue(":boil_time", QString("%1").arg(ui->boil_timeEdit->value(), 1, 'f', 0, '0'));
-    query.bindValue(":calcboil", ui->calcboilEdit->isChecked() ? 1:0);
     query.bindValue(":top_up_kettle", QString("%1").arg(ui->top_up_kettleEdit->value(), 2, 'f', 1, '0'));
     query.bindValue(":notes", ui->notesEdit->toPlainText());
     query.bindValue(":lauter_deadspace", QString("%1").arg(ui->lauter_deadspaceEdit->value(), 2, 'f', 1, '0'));
--- a/src/ImportXML.cpp	Sun Jan 15 12:35:04 2023 +0100
+++ b/src/ImportXML.cpp	Sun Jan 15 14:15:49 2023 +0100
@@ -103,7 +103,7 @@
 					"batch_size=:batch_size, tun_volume=:tun_volume, tun_weight=:tun_weight, "
 					"tun_specific_heat=:tun_specific_heat, tun_material=:tun_material, tun_height=:tun_height, "
 					"top_up_water=:top_up_water, trub_loss=:chiller_loss, evap_rate=:evap_rate, "
-					"boil_time=:boil_time, calc_boil_volume=:calcboil, top_up_kettle=:top_up_kettle, "
+					"boil_time=:boil_time, top_up_kettle=:top_up_kettle, "
 					"hop_utilization=:hopfactor, notes=:notes, lauter_volume=:lauter_volume, "
 					"lauter_height=:lauter_height, lauter_deadspace=:lauter_deadspace, kettle_volume=:kettle_volume, "
 					"kettle_height=:kettle_height, mash_volume=:mash_volume, mash_max=:mash_max, "
@@ -121,7 +121,6 @@
 			    /* The evaporation in beerxml is percentage, but we use the real volume per hour */
 			    query.bindValue(":evap_rate", QString("%1").arg((eq->evap_rate / 100) * eq->boil_size, 3, 'f', 2, '0'));
 			    query.bindValue(":boil_time", QString("%1").arg(eq->boil_time, 1, 'f', 0, '0'));
-			    query.bindValue(":calcboil", eq->calc_boil_volume ? 1:0);
 			    query.bindValue(":top_up_kettle", QString("%1").arg(eq->top_up_kettle, 2, 'f', 1, '0'));
 			    query.bindValue(":hopfactor", QString("%1").arg(eq->hop_utilization, 1, 'f', 0, '0'));
 			    query.bindValue(":notes", eq->notes);
@@ -150,7 +149,7 @@
 			    (xml->name() == "DISPLAY_LAUTERDEADSPACE") || (xml->name() == "TUN_MATERIAL") ||
 			    (xml->name() == "ATTENUATION_FACTOR_YEAST") || (xml->name() == "ATTENUATION_FACTOR_WATER_TO_GRAIN_RATIO") ||
 			    (xml->name() == "ATTENUATION_FACTOR_TOTAL_MASH_TIME") || (xml->name() == "ATTENUATION_FACTOR_PERC_SIMPLE_SUGAR") ||
-			    (xml->name() == "ATTENUATION_FACTOR_CONSTANT"))) {
+			    (xml->name() == "ATTENUATION_FACTOR_CONSTANT") || (xml->name() == "CALC_BOIL_VOLUME"))) {
 			    // Ignore.
 			} else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "NAME")) {
 			    eq->name = xml->readElementText();
@@ -183,8 +182,6 @@
 			    eq->evap_rate = xml->readElementText().toDouble();
 			} else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "BOIL_TIME")) {
 			    eq->boil_time = xml->readElementText().toDouble();
-			} else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "CALC_BOIL_VOLUME")) {
-			    eq->calc_boil_volume = (xml->readElementText() == "TRUE") ? true:false;
 			} else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "TOP_UP_KETTLE")) {
 			    eq->top_up_kettle = xml->readElementText().toDouble();
 			} else if ((xml->tokenType() == QXmlStreamReader::StartElement) && (xml->name() == "HOP_UTILIZATION")) {
--- a/src/global.h	Sun Jan 15 12:35:04 2023 +0100
+++ b/src/global.h	Sun Jan 15 14:15:49 2023 +0100
@@ -251,7 +251,7 @@
     double	trub_loss;
     double	evap_rate;
     double	boil_time;
-    bool	calc_boil_volume;
+    bool	x_calc_boil_volume;
     double	top_up_kettle;
     double	hop_utilization;
     QString	notes;
--- a/translations/bmsapp_en.ts	Sun Jan 15 12:35:04 2023 +0100
+++ b/translations/bmsapp_en.ts	Sun Jan 15 14:15:49 2023 +0100
@@ -1049,245 +1049,299 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../ui/EditEquipment.ui" line="177"/>
+        <location filename="../ui/EditEquipment.ui" line="419"/>
+        <location filename="../ui/EditEquipment.ui" line="539"/>
+        <location filename="../ui/EditEquipment.ui" line="630"/>
+        <location filename="../ui/EditEquipment.ui" line="727"/>
+        <location filename="../ui/EditEquipment.ui" line="887"/>
+        <location filename="../ui/EditEquipment.ui" line="924"/>
+        <location filename="../ui/EditEquipment.ui" line="974"/>
+        <location filename="../ui/EditEquipment.ui" line="1056"/>
+        <location filename="../ui/EditEquipment.ui" line="1093"/>
+        <location filename="../ui/EditEquipment.ui" line="1233"/>
+        <location filename="../ui/EditEquipment.ui" line="1309"/>
+        <source> L</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="202"/>
+        <source>Tun volume:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="218"/>
+        <source>Tun height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="234"/>
+        <source>Tun weight:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="282"/>
+        <source>Mash water:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="298"/>
+        <source>Maximum malts:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="320"/>
+        <location filename="../ui/EditEquipment.ui" line="680"/>
+        <source> cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="351"/>
+        <location filename="../ui/EditEquipment.ui" line="450"/>
+        <source> kg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="501"/>
+        <source>Lauter deadspace:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="517"/>
+        <source>Brewhouse efficiency:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="570"/>
+        <source>%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="608"/>
+        <source>Kettle volume:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="655"/>
+        <source>Kettle height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="705"/>
+        <source>Boil size at 100 °C:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="752"/>
+        <source>Evaporation Liter/hour:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="768"/>
+        <source>Boil time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="784"/>
+        <source>Top up kettle:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="800"/>
+        <source>Batch size at 100 °C:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="822"/>
+        <source> L/h</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="853"/>
+        <location filename="../ui/EditEquipment.ui" line="1183"/>
+        <source> min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="878"/>
+        <source>Added extra water during boil</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="949"/>
+        <source>Kettle trub loss:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="1015"/>
+        <source>Extra water in fermenter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="1031"/>
+        <source>Volume in fermenter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="1047"/>
+        <source>Extra water to add to the fermenter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="1267"/>
+        <source>Transfer loss:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="1283"/>
+        <source>Immersion chiller:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../ui/EditEquipment.ui" line="153"/>
-        <source>Calculate boil volume:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="169"/>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="182"/>
         <source>Mashing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditEquipment.ui" line="228"/>
-        <source>Tun volume L:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="244"/>
-        <source>Tun height cm:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="260"/>
-        <source>Tun weight kg:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="276"/>
+        <location filename="../ui/EditEquipment.ui" line="250"/>
         <source>Tun material:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditEquipment.ui" line="292"/>
+        <location filename="../ui/EditEquipment.ui" line="266"/>
         <source>Tun specific heat:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditEquipment.ui" line="308"/>
-        <source>Mash water L:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="324"/>
-        <source>Maximum malts kg:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="500"/>
+        <location filename="../ui/EditEquipment.ui" line="486"/>
         <source>Lautering</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditEquipment.ui" line="515"/>
-        <source>Lauter deadspace L:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="531"/>
-        <source>Brewhouse efficiency %:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="604"/>
+        <location filename="../ui/EditEquipment.ui" line="596"/>
         <source>Boiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditEquipment.ui" line="616"/>
-        <source>Kettle volume L:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="660"/>
-        <source>Kettle height cm:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="676"/>
+        <location filename="../ui/EditEquipment.ui" line="671"/>
         <source>Measured inside the kettle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditEquipment.ui" line="707"/>
-        <source>Boil size at 100 °C L:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="799"/>
-        <source>Batch size at 100 °C L:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="751"/>
-        <source>Evaporation L/hour:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="767"/>
-        <source>Boil time minutes:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="783"/>
-        <source>Top up kettle L:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="933"/>
-        <source>Kettle trub loss L:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="978"/>
+        <location filename="../ui/EditEquipment.ui" line="965"/>
+        <source>Trub loss to leave behind in the kettle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="1000"/>
         <source>Transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditEquipment.ui" line="993"/>
-        <source>Extra water in fermenter L:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="1009"/>
-        <source>Volume in fermenter L:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="1088"/>
+        <location filename="../ui/EditEquipment.ui" line="1119"/>
         <source>Clone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditEquipment.ui" line="1105"/>
+        <location filename="../ui/EditEquipment.ui" line="1136"/>
         <source>Chilling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditEquipment.ui" line="1117"/>
+        <location filename="../ui/EditEquipment.ui" line="1148"/>
         <source>Wort chiller type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditEquipment.ui" line="1143"/>
-        <source>Minutes elapsed to cool to 79 °C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../ui/EditEquipment.ui" line="1174"/>
+        <source>Minutes elapsed to cool to 79 °C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="1208"/>
         <source>Minutes to cool to 79 °C:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditEquipment.ui" line="1190"/>
+        <location filename="../ui/EditEquipment.ui" line="1224"/>
         <source>Volume lost in hoses, pump ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditEquipment.ui" line="1230"/>
-        <source>Transfer loss L:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="1246"/>
-        <source>Immersion chiller L:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="1262"/>
+        <location filename="../ui/EditEquipment.ui" line="1299"/>
         <source>Temporary extra volume of the immersion chiller in the kettle.
 Used to correct the after boil volume.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditEquipment.ui" line="1294"/>
+        <location filename="../ui/EditEquipment.ui" line="1334"/>
         <source>Liters per minute to pump trough the chiller. 
 Used to calculate the time needed to transfer the wort.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui/EditEquipment.ui" line="1326"/>
+        <location filename="../ui/EditEquipment.ui" line="1344"/>
+        <source> L/m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="1369"/>
         <source>Transfer liters/minute:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditEquipment.cpp" line="159"/>
+        <location filename="../src/EditEquipment.cpp" line="156"/>
         <source>BMSapp - Add new equipment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditEquipment.cpp" line="161"/>
+        <location filename="../src/EditEquipment.cpp" line="158"/>
         <source>BMSapp - Edit equipment %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditEquipment.cpp" line="178"/>
+        <location filename="../src/EditEquipment.cpp" line="175"/>
         <source>Edit Equipment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditEquipment.cpp" line="178"/>
+        <location filename="../src/EditEquipment.cpp" line="175"/>
         <source>Name empty or too short.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditEquipment.cpp" line="238"/>
-        <location filename="../src/EditEquipment.cpp" line="298"/>
-        <location filename="../src/EditEquipment.cpp" line="323"/>
+        <location filename="../src/EditEquipment.cpp" line="234"/>
+        <location filename="../src/EditEquipment.cpp" line="293"/>
+        <location filename="../src/EditEquipment.cpp" line="318"/>
         <source>Database error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditEquipment.cpp" line="239"/>
-        <location filename="../src/EditEquipment.cpp" line="299"/>
-        <location filename="../src/EditEquipment.cpp" line="324"/>
+        <location filename="../src/EditEquipment.cpp" line="235"/>
+        <location filename="../src/EditEquipment.cpp" line="294"/>
+        <location filename="../src/EditEquipment.cpp" line="319"/>
         <source>MySQL error: %1
 %2
 %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditEquipment.cpp" line="313"/>
+        <location filename="../src/EditEquipment.cpp" line="308"/>
         <source>Delete equipment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditEquipment.cpp" line="313"/>
+        <location filename="../src/EditEquipment.cpp" line="308"/>
         <source>Delete %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditEquipment.cpp" line="444"/>
+        <location filename="../src/EditEquipment.cpp" line="439"/>
         <source>Equipment changed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditEquipment.cpp" line="444"/>
+        <location filename="../src/EditEquipment.cpp" line="439"/>
         <source>This equipment has been modified. Save changes?</source>
         <translation type="unfinished"></translation>
     </message>
--- a/translations/bmsapp_nl.ts	Sun Jan 15 12:35:04 2023 +0100
+++ b/translations/bmsapp_nl.ts	Sun Jan 15 14:15:49 2023 +0100
@@ -1126,136 +1126,282 @@
         <translation>Verwijder</translation>
     </message>
     <message>
-        <location filename="../ui/EditEquipment.ui" line="153"/>
+        <location filename="../ui/EditEquipment.ui" line="177"/>
+        <location filename="../ui/EditEquipment.ui" line="419"/>
+        <location filename="../ui/EditEquipment.ui" line="539"/>
+        <location filename="../ui/EditEquipment.ui" line="630"/>
+        <location filename="../ui/EditEquipment.ui" line="727"/>
+        <location filename="../ui/EditEquipment.ui" line="887"/>
+        <location filename="../ui/EditEquipment.ui" line="924"/>
+        <location filename="../ui/EditEquipment.ui" line="974"/>
+        <location filename="../ui/EditEquipment.ui" line="1056"/>
+        <location filename="../ui/EditEquipment.ui" line="1093"/>
+        <location filename="../ui/EditEquipment.ui" line="1233"/>
+        <location filename="../ui/EditEquipment.ui" line="1309"/>
+        <source> L</source>
+        <translation> L</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="202"/>
+        <source>Tun volume:</source>
+        <translation>Maischkuip volume:</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="218"/>
+        <source>Tun height:</source>
+        <translation>Maischkuip hoogte:</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="234"/>
+        <source>Tun weight:</source>
+        <translation>Maischkuip gewicht:</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="282"/>
+        <source>Mash water:</source>
+        <translation>Maisch water:</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="298"/>
+        <source>Maximum malts:</source>
+        <translation>Maximum moutstort:</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="320"/>
+        <location filename="../ui/EditEquipment.ui" line="680"/>
+        <source> cm</source>
+        <translation> cm</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="351"/>
+        <location filename="../ui/EditEquipment.ui" line="450"/>
+        <source> kg</source>
+        <translation> Kg</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="501"/>
+        <source>Lauter deadspace:</source>
+        <translation>Filterkuip dode ruimte:</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="517"/>
+        <source>Brewhouse efficiency:</source>
+        <translation>Brouwzaal rendement:</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="570"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="608"/>
+        <source>Kettle volume:</source>
+        <translation>Kookketel volume:</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="655"/>
+        <source>Kettle height:</source>
+        <translation>Kookketel hoogte:</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="705"/>
+        <source>Boil size at 100 °C:</source>
+        <translation>Kook volume bij 100 °C:</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="752"/>
+        <source>Evaporation Liter/hour:</source>
+        <translation>Verdamping Liter per uur:</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="768"/>
+        <source>Boil time:</source>
+        <translation>Kooktijd:</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="784"/>
+        <source>Top up kettle:</source>
+        <translation>Extra water bij koken:</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="800"/>
+        <source>Batch size at 100 °C:</source>
+        <translation>Eind volume bij 100 °C:</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="822"/>
+        <source> L/h</source>
+        <translation> L/u</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="853"/>
+        <location filename="../ui/EditEquipment.ui" line="1183"/>
+        <source> min</source>
+        <translation> min</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="878"/>
+        <source>Added extra water during boil</source>
+        <translation>Toegevoegd extra water tijdens koken</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="949"/>
+        <source>Kettle trub loss:</source>
+        <translation>Kookketel trub verlies:</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="965"/>
+        <source>Trub loss to leave behind in the kettle</source>
+        <translation>Trub verlies wat achterblijft in de kookketel</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="1267"/>
+        <source>Transfer loss:</source>
+        <translation>Overbrengen verlies:</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="1283"/>
+        <source>Immersion chiller:</source>
+        <translation>Dompelkoeler:</translation>
+    </message>
+    <message>
         <source>Calculate boil volume:</source>
-        <translation>Bereken kook volume:</translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="169"/>
+        <translation type="vanished">Bereken kook volume:</translation>
+    </message>
+    <message>
         <source>Yes</source>
-        <translation>Ja</translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="182"/>
+        <translation type="vanished">Ja</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="153"/>
         <source>Mashing</source>
         <translation>Maischen</translation>
     </message>
     <message>
-        <location filename="../ui/EditEquipment.ui" line="228"/>
         <source>Tun volume L:</source>
-        <translation>Maischkuip volume L:</translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="244"/>
+        <translation type="vanished">Maischkuip volume L:</translation>
+    </message>
+    <message>
         <source>Tun height cm:</source>
-        <translation>Maischkuip hoogte cm:</translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="260"/>
+        <translation type="vanished">Maischkuip hoogte cm:</translation>
+    </message>
+    <message>
         <source>Tun weight kg:</source>
-        <translation>Maischkuip gewicht kg:</translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="276"/>
+        <translation type="vanished">Maischkuip gewicht kg:</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="250"/>
         <source>Tun material:</source>
         <translation>Maischkuip materiaal:</translation>
     </message>
     <message>
-        <location filename="../ui/EditEquipment.ui" line="292"/>
+        <location filename="../ui/EditEquipment.ui" line="266"/>
         <source>Tun specific heat:</source>
         <translation>Maischkuip specific heat:</translation>
     </message>
     <message>
-        <location filename="../ui/EditEquipment.ui" line="308"/>
         <source>Mash water L:</source>
-        <translation>Maischwater L:</translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="324"/>
+        <translation type="vanished">Maischwater L:</translation>
+    </message>
+    <message>
         <source>Maximum malts kg:</source>
-        <translation>Maximum moutstort kg:</translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="500"/>
+        <translation type="vanished">Maximum moutstort kg:</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="486"/>
         <source>Lautering</source>
         <translation>Filteren</translation>
     </message>
     <message>
-        <location filename="../ui/EditEquipment.ui" line="660"/>
         <source>Kettle height cm:</source>
-        <translation>Kookketel hoogte cm:</translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="676"/>
+        <translation type="vanished">Kookketel hoogte cm:</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="671"/>
         <source>Measured inside the kettle</source>
         <translation>Gemeten binnen in de ketel</translation>
     </message>
     <message>
-        <location filename="../ui/EditEquipment.ui" line="707"/>
         <source>Boil size at 100 °C L:</source>
-        <translation>Kook volume bij 100 °C L:</translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="799"/>
+        <translation type="vanished">Kook volume bij 100 °C L:</translation>
+    </message>
+    <message>
         <source>Batch size at 100 °C L:</source>
-        <translation>Eind volume bij 100 °C L:</translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="933"/>
+        <translation type="vanished">Eind volume bij 100 °C L:</translation>
+    </message>
+    <message>
         <source>Kettle trub loss L:</source>
-        <translation>Kookketel trub verlies L:</translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="978"/>
+        <translation type="vanished">Kookketel trub verlies L:</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="1000"/>
         <source>Transfer</source>
         <translation>Overbrengen</translation>
     </message>
     <message>
-        <location filename="../ui/EditEquipment.ui" line="1117"/>
+        <location filename="../ui/EditEquipment.ui" line="1015"/>
+        <source>Extra water in fermenter:</source>
+        <translation>Extra water in gistvat:</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="1031"/>
+        <source>Volume in fermenter:</source>
+        <translation>Volume naar het gistvat:</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="1047"/>
+        <source>Extra water to add to the fermenter</source>
+        <translation>Extra water toevoegen in het gistvat</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="1148"/>
         <source>Wort chiller type:</source>
         <translation>Wort koeler type:</translation>
     </message>
     <message>
-        <location filename="../ui/EditEquipment.ui" line="1143"/>
-        <source>Minutes elapsed to cool to 79 °C</source>
-        <translation>Nodige minuten om tot 79 °C te koelen</translation>
-    </message>
-    <message>
         <location filename="../ui/EditEquipment.ui" line="1174"/>
+        <source>Minutes elapsed to cool to 79 °C</source>
+        <translation>Nodige minuten om tot 79 °C te koelen</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="1208"/>
         <source>Minutes to cool to 79 °C:</source>
         <translation>Minuten koelen tot 79 °C:</translation>
     </message>
     <message>
-        <location filename="../ui/EditEquipment.ui" line="1190"/>
+        <location filename="../ui/EditEquipment.ui" line="1224"/>
         <source>Volume lost in hoses, pump ...</source>
         <translation>Verlies in slangen, pomp ...</translation>
     </message>
     <message>
-        <location filename="../ui/EditEquipment.ui" line="1230"/>
         <source>Transfer loss L:</source>
-        <translation>Overbrengen verlies L:</translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="1246"/>
+        <translation type="vanished">Overbrengen verlies L:</translation>
+    </message>
+    <message>
         <source>Immersion chiller L:</source>
-        <translation>Dompelkoeler L:</translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="1262"/>
+        <translation type="vanished">Dompelkoeler L:</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="1299"/>
         <source>Temporary extra volume of the immersion chiller in the kettle.
 Used to correct the after boil volume.</source>
         <translation>Tijdelijk extra volume in de kookketel.
 Wordt gebruikt als correctie voor na koken volume.</translation>
     </message>
     <message>
-        <location filename="../ui/EditEquipment.ui" line="1294"/>
+        <location filename="../ui/EditEquipment.ui" line="1334"/>
         <source>Liters per minute to pump trough the chiller. 
 Used to calculate the time needed to transfer the wort.</source>
         <translation>Liters per minuut pompen door de koeler.
 Gebruikt om de tijd te berekenen om het wort weg te pompen.</translation>
     </message>
     <message>
-        <location filename="../ui/EditEquipment.ui" line="1326"/>
+        <location filename="../ui/EditEquipment.ui" line="1344"/>
+        <source> L/m</source>
+        <translation> L/m</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="1369"/>
         <source>Transfer liters/minute:</source>
         <translation>Overbrengen liters/minuut:</translation>
     </message>
@@ -1268,24 +1414,21 @@
         <translation type="vanished">Filterkuip hoogte cm:</translation>
     </message>
     <message>
-        <location filename="../ui/EditEquipment.ui" line="515"/>
         <source>Lauter deadspace L:</source>
-        <translation>Filterkuip dode ruimte L:</translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="531"/>
+        <translation type="vanished">Filterkuip dode ruimte L:</translation>
+    </message>
+    <message>
         <source>Brewhouse efficiency %:</source>
-        <translation>Brouwzaal rendement %:</translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="604"/>
+        <translation type="vanished">Brouwzaal rendement %:</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="596"/>
         <source>Boiling</source>
         <translation>Koken</translation>
     </message>
     <message>
-        <location filename="../ui/EditEquipment.ui" line="616"/>
         <source>Kettle volume L:</source>
-        <translation>Kookketel volume L:</translation>
+        <translation type="vanished">Kookketel volume L:</translation>
     </message>
     <message>
         <source>Kettle heigh cmt:</source>
@@ -1296,19 +1439,16 @@
         <translation type="vanished">Kook volume L:</translation>
     </message>
     <message>
-        <location filename="../ui/EditEquipment.ui" line="751"/>
         <source>Evaporation L/hour:</source>
-        <translation>Verdamping per uur L:</translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="767"/>
+        <translation type="vanished">Verdamping per uur L:</translation>
+    </message>
+    <message>
         <source>Boil time minutes:</source>
-        <translation>Kooktijd minuten:</translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="783"/>
+        <translation type="vanished">Kooktijd minuten:</translation>
+    </message>
+    <message>
         <source>Top up kettle L:</source>
-        <translation>Extra water bij koken L:</translation>
+        <translation type="vanished">Extra water bij koken L:</translation>
     </message>
     <message>
         <source>Hop utilization %:</source>
@@ -1323,7 +1463,7 @@
         <translation type="vanished">100% voor kleine brouwerijen, hoger voor grote.</translation>
     </message>
     <message>
-        <location filename="../ui/EditEquipment.ui" line="1105"/>
+        <location filename="../ui/EditEquipment.ui" line="1136"/>
         <source>Chilling</source>
         <translation>Koelen</translation>
     </message>
@@ -1332,17 +1472,15 @@
         <translation type="vanished">Trub en koeler verlies L:</translation>
     </message>
     <message>
-        <location filename="../ui/EditEquipment.ui" line="993"/>
         <source>Extra water in fermenter L:</source>
-        <translation>Extra water in gistvat L:</translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="1009"/>
+        <translation type="vanished">Extra water in gistvat L:</translation>
+    </message>
+    <message>
         <source>Volume in fermenter L:</source>
-        <translation>Volume naar het gistvat L:</translation>
-    </message>
-    <message>
-        <location filename="../ui/EditEquipment.ui" line="1088"/>
+        <translation type="vanished">Volume naar het gistvat L:</translation>
+    </message>
+    <message>
+        <location filename="../ui/EditEquipment.ui" line="1119"/>
         <source>Clone</source>
         <translation>Kloon</translation>
     </message>
@@ -1363,36 +1501,36 @@
         <translation type="vanished">Koper</translation>
     </message>
     <message>
-        <location filename="../src/EditEquipment.cpp" line="159"/>
+        <location filename="../src/EditEquipment.cpp" line="156"/>
         <source>BMSapp - Add new equipment</source>
         <translation>BMSapp - Nieuwe apparatuur</translation>
     </message>
     <message>
-        <location filename="../src/EditEquipment.cpp" line="161"/>
+        <location filename="../src/EditEquipment.cpp" line="158"/>
         <source>BMSapp - Edit equipment %1</source>
         <translation>BMSapp - Wijzig apparatuur %1</translation>
     </message>
     <message>
-        <location filename="../src/EditEquipment.cpp" line="178"/>
+        <location filename="../src/EditEquipment.cpp" line="175"/>
         <source>Edit Equipment</source>
         <translation>Wijzig apparatuur</translation>
     </message>
     <message>
-        <location filename="../src/EditEquipment.cpp" line="178"/>
+        <location filename="../src/EditEquipment.cpp" line="175"/>
         <source>Name empty or too short.</source>
         <translation>De naam is leeg of te kort.</translation>
     </message>
     <message>
-        <location filename="../src/EditEquipment.cpp" line="238"/>
-        <location filename="../src/EditEquipment.cpp" line="298"/>
-        <location filename="../src/EditEquipment.cpp" line="323"/>
+        <location filename="../src/EditEquipment.cpp" line="234"/>
+        <location filename="../src/EditEquipment.cpp" line="293"/>
+        <location filename="../src/EditEquipment.cpp" line="318"/>
         <source>Database error</source>
         <translation>Database fout</translation>
     </message>
     <message>
-        <location filename="../src/EditEquipment.cpp" line="239"/>
-        <location filename="../src/EditEquipment.cpp" line="299"/>
-        <location filename="../src/EditEquipment.cpp" line="324"/>
+        <location filename="../src/EditEquipment.cpp" line="235"/>
+        <location filename="../src/EditEquipment.cpp" line="294"/>
+        <location filename="../src/EditEquipment.cpp" line="319"/>
         <source>MySQL error: %1
 %2
 %3</source>
@@ -1401,22 +1539,22 @@
 %3</translation>
     </message>
     <message>
-        <location filename="../src/EditEquipment.cpp" line="313"/>
+        <location filename="../src/EditEquipment.cpp" line="308"/>
         <source>Delete equipment</source>
         <translation>Verwijder apparatuur</translation>
     </message>
     <message>
-        <location filename="../src/EditEquipment.cpp" line="313"/>
+        <location filename="../src/EditEquipment.cpp" line="308"/>
         <source>Delete %1</source>
         <translation>Verwijder %1</translation>
     </message>
     <message>
-        <location filename="../src/EditEquipment.cpp" line="444"/>
+        <location filename="../src/EditEquipment.cpp" line="439"/>
         <source>Equipment changed</source>
         <translation>Apparatuur gewijzigd</translation>
     </message>
     <message>
-        <location filename="../src/EditEquipment.cpp" line="444"/>
+        <location filename="../src/EditEquipment.cpp" line="439"/>
         <source>This equipment has been modified. Save changes?</source>
         <translation>Deze installatie is gewijzigd. Wijzigingen opslaan?</translation>
     </message>
@@ -5538,7 +5676,7 @@
     <message>
         <location filename="../src/EditProductTab9.cpp" line="262"/>
         <source>Measure with placed immersion chiller.</source>
-        <translation type="unfinished"></translation>
+        <translation>Opmeten met geplaatste spiraalkoeler.</translation>
     </message>
     <message>
         <location filename="../src/EditProductTab9.cpp" line="615"/>
--- a/ui/EditEquipment.ui	Sun Jan 15 12:35:04 2023 +0100
+++ b/ui/EditEquipment.ui	Sun Jan 15 14:15:49 2023 +0100
@@ -140,35 +140,6 @@
         <normaloff>:icons/silk/delete.png</normaloff>:icons/silk/delete.png</iconset>
       </property>
      </widget>
-     <widget class="QLabel" name="calcboilLabel">
-      <property name="geometry">
-       <rect>
-        <x>720</x>
-        <y>10</y>
-        <width>141</width>
-        <height>16</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>Calculate boil volume:</string>
-      </property>
-      <property name="alignment">
-       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-      </property>
-     </widget>
-     <widget class="QCheckBox" name="calcboilEdit">
-      <property name="geometry">
-       <rect>
-        <x>870</x>
-        <y>10</y>
-        <width>85</width>
-        <height>21</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>Yes</string>
-      </property>
-     </widget>
      <widget class="QGroupBox" name="mashGroup">
       <property name="geometry">
        <rect>
@@ -202,6 +173,9 @@
        <property name="accelerated">
         <bool>true</bool>
        </property>
+       <property name="suffix">
+        <string> L</string>
+       </property>
        <property name="decimals">
         <number>1</number>
        </property>
@@ -225,7 +199,7 @@
         </rect>
        </property>
        <property name="text">
-        <string>Tun volume L:</string>
+        <string>Tun volume:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -241,7 +215,7 @@
         </rect>
        </property>
        <property name="text">
-        <string>Tun height cm:</string>
+        <string>Tun height:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -257,7 +231,7 @@
         </rect>
        </property>
        <property name="text">
-        <string>Tun weight kg:</string>
+        <string>Tun weight:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -305,7 +279,7 @@
         </rect>
        </property>
        <property name="text">
-        <string>Mash water L:</string>
+        <string>Mash water:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -321,7 +295,7 @@
         </rect>
        </property>
        <property name="text">
-        <string>Maximum malts kg:</string>
+        <string>Maximum malts:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -342,6 +316,9 @@
        <property name="accelerated">
         <bool>true</bool>
        </property>
+       <property name="suffix">
+        <string> cm</string>
+       </property>
        <property name="decimals">
         <number>1</number>
        </property>
@@ -370,6 +347,9 @@
        <property name="accelerated">
         <bool>true</bool>
        </property>
+       <property name="suffix">
+        <string> kg</string>
+       </property>
        <property name="decimals">
         <number>1</number>
        </property>
@@ -435,6 +415,9 @@
        <property name="accelerated">
         <bool>true</bool>
        </property>
+       <property name="suffix">
+        <string> L</string>
+       </property>
        <property name="decimals">
         <number>1</number>
        </property>
@@ -463,6 +446,9 @@
        <property name="accelerated">
         <bool>true</bool>
        </property>
+       <property name="suffix">
+        <string> kg</string>
+       </property>
        <property name="decimals">
         <number>1</number>
        </property>
@@ -512,7 +498,7 @@
         </rect>
        </property>
        <property name="text">
-        <string>Lauter deadspace L:</string>
+        <string>Lauter deadspace:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -528,7 +514,7 @@
         </rect>
        </property>
        <property name="text">
-        <string>Brewhouse efficiency %:</string>
+        <string>Brewhouse efficiency:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -549,6 +535,9 @@
        <property name="accelerated">
         <bool>true</bool>
        </property>
+       <property name="suffix">
+        <string> L</string>
+       </property>
        <property name="decimals">
         <number>1</number>
        </property>
@@ -577,6 +566,9 @@
        <property name="accelerated">
         <bool>true</bool>
        </property>
+       <property name="suffix">
+        <string>%</string>
+       </property>
        <property name="decimals">
         <number>1</number>
        </property>
@@ -613,7 +605,7 @@
         </rect>
        </property>
        <property name="text">
-        <string>Kettle volume L:</string>
+        <string>Kettle volume:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -634,6 +626,9 @@
        <property name="accelerated">
         <bool>true</bool>
        </property>
+       <property name="suffix">
+        <string> L</string>
+       </property>
        <property name="decimals">
         <number>1</number>
        </property>
@@ -657,7 +652,7 @@
         </rect>
        </property>
        <property name="text">
-        <string>Kettle height cm:</string>
+        <string>Kettle height:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -681,6 +676,9 @@
        <property name="accelerated">
         <bool>true</bool>
        </property>
+       <property name="suffix">
+        <string> cm</string>
+       </property>
        <property name="decimals">
         <number>1</number>
        </property>
@@ -704,7 +702,7 @@
         </rect>
        </property>
        <property name="text">
-        <string>Boil size at 100 °C L:</string>
+        <string>Boil size at 100 °C:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -725,6 +723,9 @@
        <property name="accelerated">
         <bool>true</bool>
        </property>
+       <property name="suffix">
+        <string> L</string>
+       </property>
        <property name="decimals">
         <number>1</number>
        </property>
@@ -748,7 +749,7 @@
         </rect>
        </property>
        <property name="text">
-        <string>Evaporation L/hour:</string>
+        <string>Evaporation Liter/hour:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -764,7 +765,7 @@
         </rect>
        </property>
        <property name="text">
-        <string>Boil time minutes:</string>
+        <string>Boil time:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -780,7 +781,7 @@
         </rect>
        </property>
        <property name="text">
-        <string>Top up kettle L:</string>
+        <string>Top up kettle:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -796,7 +797,7 @@
         </rect>
        </property>
        <property name="text">
-        <string>Batch size at 100 °C L:</string>
+        <string>Batch size at 100 °C:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -817,6 +818,9 @@
        <property name="accelerated">
         <bool>true</bool>
        </property>
+       <property name="suffix">
+        <string> L/h</string>
+       </property>
        <property name="decimals">
         <number>2</number>
        </property>
@@ -845,6 +849,9 @@
        <property name="accelerated">
         <bool>true</bool>
        </property>
+       <property name="suffix">
+        <string> min</string>
+       </property>
        <property name="decimals">
         <number>0</number>
        </property>
@@ -867,12 +874,18 @@
          <height>24</height>
         </rect>
        </property>
+       <property name="toolTip">
+        <string>Added extra water during boil</string>
+       </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
        <property name="accelerated">
         <bool>true</bool>
        </property>
+       <property name="suffix">
+        <string> L</string>
+       </property>
        <property name="decimals">
         <number>1</number>
        </property>
@@ -907,6 +920,9 @@
        <property name="accelerated">
         <bool>true</bool>
        </property>
+       <property name="suffix">
+        <string> L</string>
+       </property>
        <property name="decimals">
         <number>2</number>
        </property>
@@ -930,7 +946,7 @@
         </rect>
        </property>
        <property name="text">
-        <string>Kettle trub loss L:</string>
+        <string>Kettle trub loss:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -945,12 +961,18 @@
          <height>24</height>
         </rect>
        </property>
+       <property name="toolTip">
+        <string>Trub loss to leave behind in the kettle</string>
+       </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
        <property name="accelerated">
         <bool>true</bool>
        </property>
+       <property name="suffix">
+        <string> L</string>
+       </property>
        <property name="decimals">
         <number>1</number>
        </property>
@@ -990,7 +1012,7 @@
         </rect>
        </property>
        <property name="text">
-        <string>Extra water in fermenter L:</string>
+        <string>Extra water in fermenter:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -1006,7 +1028,7 @@
         </rect>
        </property>
        <property name="text">
-        <string>Volume in fermenter L:</string>
+        <string>Volume in fermenter:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -1021,12 +1043,18 @@
          <height>24</height>
         </rect>
        </property>
+       <property name="toolTip">
+        <string>Extra water to add to the fermenter</string>
+       </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
        <property name="accelerated">
         <bool>true</bool>
        </property>
+       <property name="suffix">
+        <string> L</string>
+       </property>
        <property name="decimals">
         <number>1</number>
        </property>
@@ -1061,6 +1089,9 @@
        <property name="accelerated">
         <bool>true</bool>
        </property>
+       <property name="suffix">
+        <string> L</string>
+       </property>
        <property name="decimals">
         <number>2</number>
        </property>
@@ -1148,6 +1179,9 @@
        <property name="accelerated">
         <bool>true</bool>
        </property>
+       <property name="suffix">
+        <string> min</string>
+       </property>
        <property name="decimals">
         <number>0</number>
        </property>
@@ -1195,6 +1229,9 @@
        <property name="accelerated">
         <bool>true</bool>
        </property>
+       <property name="suffix">
+        <string> L</string>
+       </property>
        <property name="decimals">
         <number>2</number>
        </property>
@@ -1227,7 +1264,7 @@
         </font>
        </property>
        <property name="text">
-        <string>Transfer loss L:</string>
+        <string>Transfer loss:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -1243,7 +1280,7 @@
         </rect>
        </property>
        <property name="text">
-        <string>Immersion chiller L:</string>
+        <string>Immersion chiller:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -1268,6 +1305,9 @@
        <property name="accelerated">
         <bool>true</bool>
        </property>
+       <property name="suffix">
+        <string> L</string>
+       </property>
        <property name="decimals">
         <number>2</number>
        </property>
@@ -1300,6 +1340,9 @@
        <property name="accelerated">
         <bool>true</bool>
        </property>
+       <property name="suffix">
+        <string> L/m</string>
+       </property>
        <property name="decimals">
         <number>2</number>
        </property>

Mercurial Repository: bmsapp

mercurial