Thu, 12 May 2022 22:41:11 +0200
Further translations work, give some labels more room. Changed the layout of the brewday tab to create more space and a more logical layout.
--- a/src/EditProduct.cpp Thu May 12 17:42:03 2022 +0200 +++ b/src/EditProduct.cpp Thu May 12 22:41:11 2022 +0200 @@ -936,7 +936,6 @@ ui->brew_spargephEdit->setValue(product->brew_sparge_ph); ui->brew_spargephShow->setValue(product->sparge_ph); - ui->brew_boilBox->setTitle(tr("Boiling %1 minutes").arg(product->boil_time)); ui->brew_preboilphEdit->setValue(product->brew_preboil_ph); ui->brew_preboilsgEdit->setValue(product->brew_preboil_sg); ui->brew_preboilvolEdit->setValue(product->brew_preboil_volume);
--- a/src/EditProductTab1.cpp Thu May 12 17:42:03 2022 +0200 +++ b/src/EditProductTab1.cpp Thu May 12 22:41:11 2022 +0200 @@ -132,7 +132,6 @@ double new_evap = (0.1 * product->batch_size) * val / 60.0; product->boil_size = product->batch_size + new_evap; product->boil_time = val; - ui->brew_boilBox->setTitle(tr("Boiling %1 minutes").arg(product->boil_time)); ui->boil_sizeEdit->setValue(product->boil_size); ui->brew_preboilvolShow->setValue(product->boil_size * 1.04); calcFermentables();
--- a/translations/bmsapp_en.ts Thu May 12 17:42:03 2022 +0200 +++ b/translations/bmsapp_en.ts Thu May 12 22:41:11 2022 +0200 @@ -1148,7 +1148,8 @@ <message> <location filename="../ui/EditProduct.ui" line="237"/> <location filename="../ui/EditProduct.ui" line="2137"/> - <location filename="../ui/EditProduct.ui" line="6426"/> + <location filename="../ui/EditProduct.ui" line="6692"/> + <location filename="../ui/EditProduct.ui" line="7668"/> <source>Efficiency:</source> <translation type="unfinished"></translation> </message> @@ -1180,30 +1181,30 @@ <location filename="../ui/EditProduct.ui" line="2908"/> <location filename="../ui/EditProduct.ui" line="3570"/> <location filename="../ui/EditProduct.ui" line="6391"/> - <location filename="../ui/EditProduct.ui" line="6774"/> - <location filename="../ui/EditProduct.ui" line="7031"/> - <location filename="../ui/EditProduct.ui" line="8090"/> - <location filename="../ui/EditProduct.ui" line="8298"/> - <location filename="../ui/EditProduct.ui" line="8474"/> - <location filename="../ui/EditProduct.ui" line="8576"/> - <location filename="../ui/EditProduct.ui" line="8737"/> - <location filename="../ui/EditProduct.ui" line="8790"/> - <location filename="../ui/EditProduct.ui" line="8982"/> - <location filename="../ui/EditProduct.ui" line="9013"/> - <location filename="../ui/EditProduct.ui" line="9393"/> - <location filename="../ui/EditProduct.ui" line="9612"/> + <location filename="../ui/EditProduct.ui" line="6786"/> + <location filename="../ui/EditProduct.ui" line="7784"/> + <location filename="../ui/EditProduct.ui" line="8155"/> + <location filename="../ui/EditProduct.ui" line="8363"/> + <location filename="../ui/EditProduct.ui" line="8539"/> + <location filename="../ui/EditProduct.ui" line="8641"/> + <location filename="../ui/EditProduct.ui" line="8802"/> + <location filename="../ui/EditProduct.ui" line="8855"/> + <location filename="../ui/EditProduct.ui" line="9047"/> + <location filename="../ui/EditProduct.ui" line="9078"/> + <location filename="../ui/EditProduct.ui" line="9458"/> + <location filename="../ui/EditProduct.ui" line="9677"/> <source> %</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ui/EditProduct.ui" line="332"/> <location filename="../ui/EditProduct.ui" line="1965"/> - <location filename="../ui/EditProduct.ui" line="7174"/> - <location filename="../ui/EditProduct.ui" line="7202"/> - <location filename="../ui/EditProduct.ui" line="7230"/> - <location filename="../ui/EditProduct.ui" line="7258"/> - <location filename="../ui/EditProduct.ui" line="7334"/> - <location filename="../ui/EditProduct.ui" line="7742"/> + <location filename="../ui/EditProduct.ui" line="6964"/> + <location filename="../ui/EditProduct.ui" line="6992"/> + <location filename="../ui/EditProduct.ui" line="7020"/> + <location filename="../ui/EditProduct.ui" line="7048"/> + <location filename="../ui/EditProduct.ui" line="7430"/> + <location filename="../ui/EditProduct.ui" line="7579"/> <source> min</source> <translation type="unfinished"></translation> </message> @@ -1222,6 +1223,15 @@ <location filename="../ui/EditProduct.ui" line="2015"/> <location filename="../ui/EditProduct.ui" line="2115"/> <location filename="../ui/EditProduct.ui" line="3770"/> + <location filename="../ui/EditProduct.ui" line="6499"/> + <location filename="../ui/EditProduct.ui" line="6565"/> + <location filename="../ui/EditProduct.ui" line="6811"/> + <location filename="../ui/EditProduct.ui" line="6842"/> + <location filename="../ui/EditProduct.ui" line="7137"/> + <location filename="../ui/EditProduct.ui" line="7165"/> + <location filename="../ui/EditProduct.ui" line="7193"/> + <location filename="../ui/EditProduct.ui" line="7649"/> + <location filename="../ui/EditProduct.ui" line="7734"/> <source> L</source> <translation type="unfinished"></translation> </message> @@ -1424,13 +1434,12 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="1724"/> - <location filename="../ui/EditProduct.ui" line="7436"/> + <location filename="../ui/EditProduct.ui" line="7115"/> <source>Top up water:</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ui/EditProduct.ui" line="1775"/> - <location filename="../ui/EditProduct.ui" line="6623"/> <source>Boiling</source> <translation type="unfinished"></translation> </message> @@ -1559,10 +1568,10 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="3074"/> - <location filename="../ui/EditProduct.ui" line="8129"/> - <location filename="../ui/EditProduct.ui" line="8337"/> - <location filename="../ui/EditProduct.ui" line="8705"/> - <location filename="../ui/EditProduct.ui" line="9871"/> + <location filename="../ui/EditProduct.ui" line="8194"/> + <location filename="../ui/EditProduct.ui" line="8402"/> + <location filename="../ui/EditProduct.ui" line="8770"/> + <location filename="../ui/EditProduct.ui" line="9936"/> <source>Set or clear date</source> <translation type="unfinished"></translation> </message> @@ -1572,18 +1581,18 @@ <location filename="../ui/EditProduct.ui" line="3608"/> <location filename="../ui/EditProduct.ui" line="6232"/> <location filename="../ui/EditProduct.ui" line="6252"/> - <location filename="../ui/EditProduct.ui" line="6846"/> - <location filename="../ui/EditProduct.ui" line="6888"/> - <location filename="../ui/EditProduct.ui" line="7796"/> - <location filename="../ui/EditProduct.ui" line="8112"/> - <location filename="../ui/EditProduct.ui" line="8132"/> - <location filename="../ui/EditProduct.ui" line="8320"/> - <location filename="../ui/EditProduct.ui" line="8340"/> - <location filename="../ui/EditProduct.ui" line="8496"/> - <location filename="../ui/EditProduct.ui" line="8631"/> - <location filename="../ui/EditProduct.ui" line="8651"/> - <location filename="../ui/EditProduct.ui" line="8708"/> - <location filename="../ui/EditProduct.ui" line="9874"/> + <location filename="../ui/EditProduct.ui" line="6864"/> + <location filename="../ui/EditProduct.ui" line="7484"/> + <location filename="../ui/EditProduct.ui" line="7806"/> + <location filename="../ui/EditProduct.ui" line="8177"/> + <location filename="../ui/EditProduct.ui" line="8197"/> + <location filename="../ui/EditProduct.ui" line="8385"/> + <location filename="../ui/EditProduct.ui" line="8405"/> + <location filename="../ui/EditProduct.ui" line="8561"/> + <location filename="../ui/EditProduct.ui" line="8696"/> + <location filename="../ui/EditProduct.ui" line="8716"/> + <location filename="../ui/EditProduct.ui" line="8773"/> + <location filename="../ui/EditProduct.ui" line="9939"/> <source>...</source> <translation type="unfinished"></translation> </message> @@ -2069,6 +2078,11 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../ui/EditProduct.ui" line="6426"/> + <source>Mash efficiency:</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../ui/EditProduct.ui" line="6442"/> <source>Sparge water pH:</source> <translation type="unfinished"></translation> @@ -2084,484 +2098,481 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6515"/> + <location filename="../ui/EditProduct.ui" line="6518"/> <source>Sparge temp °C:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6635"/> - <source>Pre boil pH:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6651"/> - <source>Pre boil SG:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6667"/> - <source>Pre boil vol@100°C:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6683"/> - <source>Pre boil efficiency:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6843"/> - <location filename="../ui/EditProduct.ui" line="6885"/> + <location filename="../ui/EditProduct.ui" line="6861"/> + <location filename="../ui/EditProduct.ui" line="7803"/> <source>Edit volume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="6905"/> - <source>After boil SG:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6946"/> - <source>After boil vol@100°C:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7006"/> - <source>After boil efficiency:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7075"/> - <source>After boil pH:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7092"/> - <source>Chilling and whirlpools</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7104"/> - <source>Hopstand 72..79°C:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7120"/> - <source>Hopstand 60..66°C:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7136"/> + <location filename="../ui/EditProduct.ui" line="6926"/> <source>Whirlpool cold:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7152"/> - <source>Hopstand 85..100°C:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7280"/> - <source>Cooling to °C:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7296"/> + <location filename="../ui/EditProduct.ui" line="7513"/> <source>Cooling method:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7312"/> + <location filename="../ui/EditProduct.ui" line="7611"/> <source>Cooling time:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7392"/> + <location filename="../ui/EditProduct.ui" line="7071"/> <source>Transfer to fermenter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7404"/> + <location filename="../ui/EditProduct.ui" line="6593"/> + <location filename="../ui/EditProduct.ui" line="7551"/> + <source> °C</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6632"/> + <source>Pre boil</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6676"/> + <location filename="../ui/EditProduct.ui" line="7839"/> + <source>Volume @100°C:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6774"/> + <source>Mash, sparge and lauter efficiency.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6882"/> + <source>Whirlpools</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6894"/> + <source>Whirlpool 72..79°C:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6910"/> + <source>Whirlpool 60..66°C:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6942"/> + <source>Whirlpool 85..100°C:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7083"/> <source>Volume to fermenter:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7420"/> + <location filename="../ui/EditProduct.ui" line="7099"/> <source>Trub and chiller loss:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7527"/> + <location filename="../ui/EditProduct.ui" line="7215"/> <source>SG in fermenter:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7543"/> + <location filename="../ui/EditProduct.ui" line="7231"/> <source>EBC color in fermenter:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7559"/> + <location filename="../ui/EditProduct.ui" line="7247"/> <source>IBU in fermenter:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7666"/> + <location filename="../ui/EditProduct.ui" line="7354"/> <source>Aeration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7678"/> + <location filename="../ui/EditProduct.ui" line="7366"/> <source>Aeration with:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7694"/> + <location filename="../ui/EditProduct.ui" line="7382"/> <source>Aeration time:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7710"/> + <location filename="../ui/EditProduct.ui" line="7398"/> <source>Aeration speed:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7770"/> + <location filename="../ui/EditProduct.ui" line="7458"/> <source> L/m</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7793"/> - <location filename="../ui/EditProduct.ui" line="8628"/> - <location filename="../ui/EditProduct.ui" line="8648"/> + <location filename="../ui/EditProduct.ui" line="7481"/> + <location filename="../ui/EditProduct.ui" line="8693"/> + <location filename="../ui/EditProduct.ui" line="8713"/> <source>Brew log chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7810"/> + <location filename="../ui/EditProduct.ui" line="7501"/> + <source>Cooling</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7529"/> + <source>Cooling to:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7628"/> + <source>After boil</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7772"/> + <source>The overall efficiency.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7875"/> <source>Fermenting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7822"/> + <location filename="../ui/EditProduct.ui" line="7887"/> <source>Primary fermentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7834"/> + <location filename="../ui/EditProduct.ui" line="7899"/> <source>Primary start SG:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7850"/> + <location filename="../ui/EditProduct.ui" line="7915"/> <source>Primary start temp °C:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7866"/> + <location filename="../ui/EditProduct.ui" line="7931"/> <source>Primary peak temp °C:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7882"/> + <location filename="../ui/EditProduct.ui" line="7947"/> <source>Primary end temp °C:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7898"/> + <location filename="../ui/EditProduct.ui" line="7963"/> <source>Primary end SG:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7914"/> + <location filename="../ui/EditProduct.ui" line="7979"/> <source>Primary end date:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8049"/> + <location filename="../ui/EditProduct.ui" line="8114"/> <source>End of primary fermentation, start secondary.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8065"/> + <location filename="../ui/EditProduct.ui" line="8130"/> <source>Primary attenuation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8109"/> - <location filename="../ui/EditProduct.ui" line="8317"/> - <location filename="../ui/EditProduct.ui" line="8493"/> + <location filename="../ui/EditProduct.ui" line="8174"/> + <location filename="../ui/EditProduct.ui" line="8382"/> + <location filename="../ui/EditProduct.ui" line="8558"/> <source>Edit SG in Plato, Brix or SG</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8150"/> + <location filename="../ui/EditProduct.ui" line="8215"/> <source>Secondary fermentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8162"/> + <location filename="../ui/EditProduct.ui" line="8227"/> <source>Secondary end temp °C:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8178"/> + <location filename="../ui/EditProduct.ui" line="8243"/> <source>Secondary end SG:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8194"/> + <location filename="../ui/EditProduct.ui" line="8259"/> <source>Secondary end date:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8257"/> - <location filename="../ui/EditProduct.ui" line="8689"/> - <location filename="../ui/EditProduct.ui" line="9855"/> + <location filename="../ui/EditProduct.ui" line="8322"/> + <location filename="../ui/EditProduct.ui" line="8754"/> + <location filename="../ui/EditProduct.ui" line="9920"/> <source>End of fermentation. Optional transfer to lagertank.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8273"/> + <location filename="../ui/EditProduct.ui" line="8338"/> <source>Secondary attenuation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8358"/> + <location filename="../ui/EditProduct.ui" line="8423"/> <source>Tertiary fermentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8370"/> + <location filename="../ui/EditProduct.ui" line="8435"/> <source>Tertiary temperature °C:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8386"/> + <location filename="../ui/EditProduct.ui" line="8451"/> <source>Tertiary end SG:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8449"/> + <location filename="../ui/EditProduct.ui" line="8514"/> <source>Tertiary attenuation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8513"/> + <location filename="../ui/EditProduct.ui" line="8578"/> <source>Expected end SG:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8551"/> + <location filename="../ui/EditProduct.ui" line="8616"/> <source>Alcohol volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8596"/> - <source>Show fermenter unit log:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="8612"/> - <source>Show fermentation log:</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../ui/EditProduct.ui" line="8661"/> + <source>Show fermenter unit log:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="8677"/> + <source>Show fermentation log:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="8726"/> <source>Package</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8673"/> + <location filename="../ui/EditProduct.ui" line="8738"/> <source>Package date:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8762"/> - <source>Carbonation range:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="8815"/> - <source>Infusion or Dilution</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../ui/EditProduct.ui" line="8827"/> + <source>Carbonation range:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="8880"/> + <source>Infusion or Dilution</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="8892"/> <source>Package volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8843"/> + <location filename="../ui/EditProduct.ui" line="8908"/> <source>Package add volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8859"/> + <location filename="../ui/EditProduct.ui" line="8924"/> <source>Package remarks:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8875"/> + <location filename="../ui/EditProduct.ui" line="8940"/> <source>Package ABV %:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8891"/> + <location filename="../ui/EditProduct.ui" line="8956"/> <source>Package add ABV %:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8907"/> + <location filename="../ui/EditProduct.ui" line="8972"/> <source>pH from fermenter:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9068"/> + <location filename="../ui/EditProduct.ui" line="9133"/> <source>Bottles</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9080"/> + <location filename="../ui/EditProduct.ui" line="9145"/> <source>Bottles volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9096"/> - <location filename="../ui/EditProduct.ui" line="9498"/> + <location filename="../ui/EditProduct.ui" line="9161"/> + <location filename="../ui/EditProduct.ui" line="9563"/> <source>Desired volume CO2:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9112"/> - <location filename="../ui/EditProduct.ui" line="9562"/> + <location filename="../ui/EditProduct.ui" line="9177"/> + <location filename="../ui/EditProduct.ui" line="9627"/> <source>Priming sugar:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9128"/> - <location filename="../ui/EditProduct.ui" line="9482"/> + <location filename="../ui/EditProduct.ui" line="9193"/> + <location filename="../ui/EditProduct.ui" line="9547"/> <source>Sugar amount:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9144"/> - <location filename="../ui/EditProduct.ui" line="9530"/> + <location filename="../ui/EditProduct.ui" line="9209"/> + <location filename="../ui/EditProduct.ui" line="9595"/> <source>Priming gr/L:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9160"/> - <location filename="../ui/EditProduct.ui" line="9514"/> + <location filename="../ui/EditProduct.ui" line="9225"/> + <location filename="../ui/EditProduct.ui" line="9579"/> <source>Water amount:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9176"/> + <location filename="../ui/EditProduct.ui" line="9241"/> <source>Bottle fermentation °C:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9327"/> + <location filename="../ui/EditProduct.ui" line="9392"/> <source>Expected pressure in bar:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9343"/> + <location filename="../ui/EditProduct.ui" line="9408"/> <source>Bottles ABV %:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9438"/> + <location filename="../ui/EditProduct.ui" line="9503"/> <source>Kegs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9450"/> + <location filename="../ui/EditProduct.ui" line="9515"/> <source>Kegs ABV %:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9466"/> + <location filename="../ui/EditProduct.ui" line="9531"/> <source>Kegs pressure in bar:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9546"/> + <location filename="../ui/EditProduct.ui" line="9611"/> <source>Kegs temperature °C:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9631"/> + <location filename="../ui/EditProduct.ui" line="9696"/> <source>Kegs volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9807"/> + <location filename="../ui/EditProduct.ui" line="9872"/> <source>Forced carbonation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9827"/> + <location filename="../ui/EditProduct.ui" line="9892"/> <source>Tasting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9839"/> + <location filename="../ui/EditProduct.ui" line="9904"/> <source>Taste date:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9891"/> + <location filename="../ui/EditProduct.ui" line="9956"/> <source>Taste rate:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9932"/> + <location filename="../ui/EditProduct.ui" line="9997"/> <source>Color:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9948"/> + <location filename="../ui/EditProduct.ui" line="10013"/> <source>Transparency:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9964"/> + <location filename="../ui/EditProduct.ui" line="10029"/> <source>Head:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10010"/> + <location filename="../ui/EditProduct.ui" line="10075"/> <source>Aroma:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10036"/> + <location filename="../ui/EditProduct.ui" line="10101"/> <source>Taste:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10062"/> + <location filename="../ui/EditProduct.ui" line="10127"/> <source>Aftertaste:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10088"/> + <location filename="../ui/EditProduct.ui" line="10153"/> <source>Mouthfeel:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10114"/> + <location filename="../ui/EditProduct.ui" line="10179"/> <source>Notes:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10142"/> + <location filename="../ui/EditProduct.ui" line="10207"/> <source>Export</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10159"/> + <location filename="../ui/EditProduct.ui" line="10224"/> <source>Print</source> <translation type="unfinished"></translation> </message> @@ -2632,8 +2643,8 @@ </message> <message> <location filename="../src/EditProduct.cpp" line="117"/> - <location filename="../src/EditProduct.cpp" line="1695"/> - <location filename="../src/EditProduct.cpp" line="1750"/> + <location filename="../src/EditProduct.cpp" line="1694"/> + <location filename="../src/EditProduct.cpp" line="1749"/> <source>Database error</source> <translation type="unfinished"></translation> </message> @@ -2648,57 +2659,51 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="939"/> - <location filename="../src/EditProductTab1.cpp" line="135"/> - <source>Boiling %1 minutes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProduct.cpp" line="1145"/> + <location filename="../src/EditProduct.cpp" line="1144"/> <source>BMSapp - Add new product</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="1147"/> + <location filename="../src/EditProduct.cpp" line="1146"/> <source>BMSapp - Edit product %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="1163"/> - <location filename="../src/EditProduct.cpp" line="1167"/> + <location filename="../src/EditProduct.cpp" line="1162"/> + <location filename="../src/EditProduct.cpp" line="1166"/> <source>Edit Product</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="1163"/> + <location filename="../src/EditProduct.cpp" line="1162"/> <source>Name empty or too short.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="1167"/> + <location filename="../src/EditProduct.cpp" line="1166"/> <source>No beerstyle selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="1696"/> - <location filename="../src/EditProduct.cpp" line="1751"/> + <location filename="../src/EditProduct.cpp" line="1695"/> + <location filename="../src/EditProduct.cpp" line="1750"/> <source>MySQL error: %1 %2 %3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="1740"/> + <location filename="../src/EditProduct.cpp" line="1739"/> <source>Delete product</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="1776"/> + <location filename="../src/EditProduct.cpp" line="1775"/> <source>Product changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="1776"/> + <location filename="../src/EditProduct.cpp" line="1775"/> <source>The product has been modified. Save changes?</source> <translation type="unfinished"></translation> </message> @@ -2796,7 +2801,7 @@ <location filename="../src/EditProductTab5.cpp" line="320"/> <location filename="../src/EditProductTab6.cpp" line="718"/> <location filename="../src/EditProductTab7.cpp" line="303"/> - <location filename="../src/EditProduct.cpp" line="1740"/> + <location filename="../src/EditProduct.cpp" line="1739"/> <source>Delete %1</source> <translation type="unfinished"></translation> </message> @@ -3267,6 +3272,8 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../ui/EditProduct.ui" line="6644"/> + <location filename="../ui/EditProduct.ui" line="7756"/> <location filename="../src/EditProductTab7.cpp" line="623"/> <source>Measured pH:</source> <translation type="unfinished"></translation> @@ -3277,6 +3284,8 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../ui/EditProduct.ui" line="6660"/> + <location filename="../ui/EditProduct.ui" line="7823"/> <location filename="../src/EditProductTab7.cpp" line="655"/> <source>Measured SG:</source> <translation type="unfinished"></translation>
--- a/translations/bmsapp_nl.ts Thu May 12 17:42:03 2022 +0200 +++ b/translations/bmsapp_nl.ts Thu May 12 22:41:11 2022 +0200 @@ -1193,9 +1193,10 @@ <message> <location filename="../ui/EditProduct.ui" line="237"/> <location filename="../ui/EditProduct.ui" line="2137"/> - <location filename="../ui/EditProduct.ui" line="6426"/> + <location filename="../ui/EditProduct.ui" line="6692"/> + <location filename="../ui/EditProduct.ui" line="7668"/> <source>Efficiency:</source> - <translation>Brouwzaal rendement:</translation> + <translation>Rendement:</translation> </message> <message> <location filename="../ui/EditProduct.ui" line="253"/> @@ -1225,30 +1226,30 @@ <location filename="../ui/EditProduct.ui" line="2908"/> <location filename="../ui/EditProduct.ui" line="3570"/> <location filename="../ui/EditProduct.ui" line="6391"/> - <location filename="../ui/EditProduct.ui" line="6774"/> - <location filename="../ui/EditProduct.ui" line="7031"/> - <location filename="../ui/EditProduct.ui" line="8090"/> - <location filename="../ui/EditProduct.ui" line="8298"/> - <location filename="../ui/EditProduct.ui" line="8474"/> - <location filename="../ui/EditProduct.ui" line="8576"/> - <location filename="../ui/EditProduct.ui" line="8737"/> - <location filename="../ui/EditProduct.ui" line="8790"/> - <location filename="../ui/EditProduct.ui" line="8982"/> - <location filename="../ui/EditProduct.ui" line="9013"/> - <location filename="../ui/EditProduct.ui" line="9393"/> - <location filename="../ui/EditProduct.ui" line="9612"/> + <location filename="../ui/EditProduct.ui" line="6786"/> + <location filename="../ui/EditProduct.ui" line="7784"/> + <location filename="../ui/EditProduct.ui" line="8155"/> + <location filename="../ui/EditProduct.ui" line="8363"/> + <location filename="../ui/EditProduct.ui" line="8539"/> + <location filename="../ui/EditProduct.ui" line="8641"/> + <location filename="../ui/EditProduct.ui" line="8802"/> + <location filename="../ui/EditProduct.ui" line="8855"/> + <location filename="../ui/EditProduct.ui" line="9047"/> + <location filename="../ui/EditProduct.ui" line="9078"/> + <location filename="../ui/EditProduct.ui" line="9458"/> + <location filename="../ui/EditProduct.ui" line="9677"/> <source> %</source> <translation> %</translation> </message> <message> <location filename="../ui/EditProduct.ui" line="332"/> <location filename="../ui/EditProduct.ui" line="1965"/> - <location filename="../ui/EditProduct.ui" line="7174"/> - <location filename="../ui/EditProduct.ui" line="7202"/> - <location filename="../ui/EditProduct.ui" line="7230"/> - <location filename="../ui/EditProduct.ui" line="7258"/> - <location filename="../ui/EditProduct.ui" line="7334"/> - <location filename="../ui/EditProduct.ui" line="7742"/> + <location filename="../ui/EditProduct.ui" line="6964"/> + <location filename="../ui/EditProduct.ui" line="6992"/> + <location filename="../ui/EditProduct.ui" line="7020"/> + <location filename="../ui/EditProduct.ui" line="7048"/> + <location filename="../ui/EditProduct.ui" line="7430"/> + <location filename="../ui/EditProduct.ui" line="7579"/> <source> min</source> <translation> min</translation> </message> @@ -1267,6 +1268,15 @@ <location filename="../ui/EditProduct.ui" line="2015"/> <location filename="../ui/EditProduct.ui" line="2115"/> <location filename="../ui/EditProduct.ui" line="3770"/> + <location filename="../ui/EditProduct.ui" line="6499"/> + <location filename="../ui/EditProduct.ui" line="6565"/> + <location filename="../ui/EditProduct.ui" line="6811"/> + <location filename="../ui/EditProduct.ui" line="6842"/> + <location filename="../ui/EditProduct.ui" line="7137"/> + <location filename="../ui/EditProduct.ui" line="7165"/> + <location filename="../ui/EditProduct.ui" line="7193"/> + <location filename="../ui/EditProduct.ui" line="7649"/> + <location filename="../ui/EditProduct.ui" line="7734"/> <source> L</source> <translation> L</translation> </message> @@ -1469,13 +1479,12 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="1724"/> - <location filename="../ui/EditProduct.ui" line="7436"/> + <location filename="../ui/EditProduct.ui" line="7115"/> <source>Top up water:</source> <translation>Extra water in gistvat:</translation> </message> <message> <location filename="../ui/EditProduct.ui" line="1775"/> - <location filename="../ui/EditProduct.ui" line="6623"/> <source>Boiling</source> <translation>Koken</translation> </message> @@ -1604,10 +1613,10 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="3074"/> - <location filename="../ui/EditProduct.ui" line="8129"/> - <location filename="../ui/EditProduct.ui" line="8337"/> - <location filename="../ui/EditProduct.ui" line="8705"/> - <location filename="../ui/EditProduct.ui" line="9871"/> + <location filename="../ui/EditProduct.ui" line="8194"/> + <location filename="../ui/EditProduct.ui" line="8402"/> + <location filename="../ui/EditProduct.ui" line="8770"/> + <location filename="../ui/EditProduct.ui" line="9936"/> <source>Set or clear date</source> <translation>Zet of wis datum</translation> </message> @@ -1617,18 +1626,18 @@ <location filename="../ui/EditProduct.ui" line="3608"/> <location filename="../ui/EditProduct.ui" line="6232"/> <location filename="../ui/EditProduct.ui" line="6252"/> - <location filename="../ui/EditProduct.ui" line="6846"/> - <location filename="../ui/EditProduct.ui" line="6888"/> - <location filename="../ui/EditProduct.ui" line="7796"/> - <location filename="../ui/EditProduct.ui" line="8112"/> - <location filename="../ui/EditProduct.ui" line="8132"/> - <location filename="../ui/EditProduct.ui" line="8320"/> - <location filename="../ui/EditProduct.ui" line="8340"/> - <location filename="../ui/EditProduct.ui" line="8496"/> - <location filename="../ui/EditProduct.ui" line="8631"/> - <location filename="../ui/EditProduct.ui" line="8651"/> - <location filename="../ui/EditProduct.ui" line="8708"/> - <location filename="../ui/EditProduct.ui" line="9874"/> + <location filename="../ui/EditProduct.ui" line="6864"/> + <location filename="../ui/EditProduct.ui" line="7484"/> + <location filename="../ui/EditProduct.ui" line="7806"/> + <location filename="../ui/EditProduct.ui" line="8177"/> + <location filename="../ui/EditProduct.ui" line="8197"/> + <location filename="../ui/EditProduct.ui" line="8385"/> + <location filename="../ui/EditProduct.ui" line="8405"/> + <location filename="../ui/EditProduct.ui" line="8561"/> + <location filename="../ui/EditProduct.ui" line="8696"/> + <location filename="../ui/EditProduct.ui" line="8716"/> + <location filename="../ui/EditProduct.ui" line="8773"/> + <location filename="../ui/EditProduct.ui" line="9939"/> <source>...</source> <translation>...</translation> </message> @@ -2081,17 +2090,17 @@ <message> <location filename="../ui/EditProduct.ui" line="6159"/> <source>Brewday</source> - <translation type="unfinished"></translation> + <translation>Brouwdag</translation> </message> <message> <location filename="../ui/EditProduct.ui" line="6171"/> <source>Brewday start:</source> - <translation type="unfinished"></translation> + <translation>Brouwdag start:</translation> </message> <message> <location filename="../ui/EditProduct.ui" line="6187"/> <source>Brewday end:</source> - <translation type="unfinished"></translation> + <translation>Brouwdag eind:</translation> </message> <message> <location filename="../ui/EditProduct.ui" line="6229"/> @@ -2106,512 +2115,530 @@ <message> <location filename="../ui/EditProduct.ui" line="6269"/> <source>Mashing and Sparge</source> - <translation type="unfinished"></translation> + <translation>Maischen en Spoelen</translation> </message> <message> <location filename="../ui/EditProduct.ui" line="6281"/> <source>Mash pH:</source> - <translation type="unfinished"></translation> + <translation>Maisch pH:</translation> </message> <message> <location filename="../ui/EditProduct.ui" line="6410"/> <source>Mash SG:</source> - <translation type="unfinished"></translation> + <translation>Maisch SG:</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6426"/> + <source>Mash efficiency:</source> + <translation>Maisch rendement:</translation> </message> <message> <location filename="../ui/EditProduct.ui" line="6442"/> <source>Sparge water pH:</source> - <translation type="unfinished"></translation> + <translation>Spoelwater pH:</translation> </message> <message> <location filename="../ui/EditProduct.ui" line="6458"/> <source>Sparge supply L:</source> - <translation type="unfinished"></translation> + <translation>Spoelwater voorraad:</translation> </message> <message> <location filename="../ui/EditProduct.ui" line="6474"/> <source>Sparge estimate L:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6515"/> + <translation>Spoelwater geschat:</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6518"/> <source>Sparge temp °C:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6635"/> + <translation>Spoelwater temp:</translation> + </message> + <message> <source>Pre boil pH:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6651"/> + <translation type="vanished">Voor koken pH:</translation> + </message> + <message> <source>Pre boil SG:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6667"/> + <translation type="vanished">Voor koken SG:</translation> + </message> + <message> <source>Pre boil vol@100°C:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6683"/> + <translation type="vanished">Voor koken vol@100°C:</translation> + </message> + <message> <source>Pre boil efficiency:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6843"/> - <location filename="../ui/EditProduct.ui" line="6885"/> + <translation type="vanished">Voor koken rendement:</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6861"/> + <location filename="../ui/EditProduct.ui" line="7803"/> <source>Edit volume</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6905"/> - <source>After boil SG:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="6946"/> - <source>After boil vol@100°C:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7006"/> - <source>After boil efficiency:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7075"/> - <source>After boil pH:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7092"/> - <source>Chilling and whirlpools</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7104"/> - <source>Hopstand 72..79°C:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7120"/> - <source>Hopstand 60..66°C:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7136"/> + <translation>Wijzig volume</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6926"/> <source>Whirlpool cold:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7152"/> - <source>Hopstand 85..100°C:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7280"/> - <source>Cooling to °C:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7296"/> + <translation>Whirlpool koud:</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7513"/> <source>Cooling method:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7312"/> + <translation>Koelen methode:</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7611"/> <source>Cooling time:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7392"/> + <translation>Koelen tijd:</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7071"/> <source>Transfer to fermenter</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7404"/> + <translation>Naar gistvat</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6593"/> + <location filename="../ui/EditProduct.ui" line="7551"/> + <source> °C</source> + <translation> °C</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6632"/> + <source>Pre boil</source> + <translation>Begin koken</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6676"/> + <location filename="../ui/EditProduct.ui" line="7839"/> + <source>Volume @100°C:</source> + <translation>Volume @100°C:</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6774"/> + <source>Mash, sparge and lauter efficiency.</source> + <translation>Maischen, spoelen en filteren rendement.</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6882"/> + <source>Whirlpools</source> + <translation>Whirlpoolen</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6894"/> + <source>Whirlpool 72..79°C:</source> + <translation>Whirlpool 72..79°C:</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6910"/> + <source>Whirlpool 60..66°C:</source> + <translation>Whirlpool 60..66°C:</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="6942"/> + <source>Whirlpool 85..100°C:</source> + <translation>Whirlpool 85..100°C:</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7083"/> <source>Volume to fermenter:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7420"/> + <translation>Volume naar gistvat:</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7099"/> <source>Trub and chiller loss:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7527"/> + <translation>Trub en koeler verlies:</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7215"/> <source>SG in fermenter:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7543"/> + <translation>SG in gistvat:</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7231"/> <source>EBC color in fermenter:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7559"/> + <translation>EBC kleur in gistvat:</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7247"/> <source>IBU in fermenter:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7666"/> + <translation>IBU in het gistvat:</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7354"/> <source>Aeration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7678"/> + <translation>Beluchten</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7366"/> <source>Aeration with:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7694"/> + <translation>Beluchten met:</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7382"/> <source>Aeration time:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7710"/> + <translation>Beluchting tijd:</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7398"/> <source>Aeration speed:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7770"/> + <translation>Beluchten snelheid:</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7458"/> <source> L/m</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="7793"/> - <location filename="../ui/EditProduct.ui" line="8628"/> - <location filename="../ui/EditProduct.ui" line="8648"/> + <translation> L/m</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7481"/> + <location filename="../ui/EditProduct.ui" line="8693"/> + <location filename="../ui/EditProduct.ui" line="8713"/> <source>Brew log chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7810"/> + <location filename="../ui/EditProduct.ui" line="7501"/> + <source>Cooling</source> + <translation>Koelen</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7529"/> + <source>Cooling to:</source> + <translation>Koelen tot:</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7628"/> + <source>After boil</source> + <translation>Einde koken</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7772"/> + <source>The overall efficiency.</source> + <translation>Het totale brouwzaal rendement.</translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="7875"/> <source>Fermenting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7822"/> + <location filename="../ui/EditProduct.ui" line="7887"/> <source>Primary fermentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7834"/> + <location filename="../ui/EditProduct.ui" line="7899"/> <source>Primary start SG:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7850"/> + <location filename="../ui/EditProduct.ui" line="7915"/> <source>Primary start temp °C:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7866"/> + <location filename="../ui/EditProduct.ui" line="7931"/> <source>Primary peak temp °C:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7882"/> + <location filename="../ui/EditProduct.ui" line="7947"/> <source>Primary end temp °C:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7898"/> + <location filename="../ui/EditProduct.ui" line="7963"/> <source>Primary end SG:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="7914"/> + <location filename="../ui/EditProduct.ui" line="7979"/> <source>Primary end date:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8049"/> + <location filename="../ui/EditProduct.ui" line="8114"/> <source>End of primary fermentation, start secondary.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8065"/> + <location filename="../ui/EditProduct.ui" line="8130"/> <source>Primary attenuation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8109"/> - <location filename="../ui/EditProduct.ui" line="8317"/> - <location filename="../ui/EditProduct.ui" line="8493"/> + <location filename="../ui/EditProduct.ui" line="8174"/> + <location filename="../ui/EditProduct.ui" line="8382"/> + <location filename="../ui/EditProduct.ui" line="8558"/> <source>Edit SG in Plato, Brix or SG</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8150"/> + <location filename="../ui/EditProduct.ui" line="8215"/> <source>Secondary fermentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8162"/> + <location filename="../ui/EditProduct.ui" line="8227"/> <source>Secondary end temp °C:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8178"/> + <location filename="../ui/EditProduct.ui" line="8243"/> <source>Secondary end SG:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8194"/> + <location filename="../ui/EditProduct.ui" line="8259"/> <source>Secondary end date:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8257"/> - <location filename="../ui/EditProduct.ui" line="8689"/> - <location filename="../ui/EditProduct.ui" line="9855"/> + <location filename="../ui/EditProduct.ui" line="8322"/> + <location filename="../ui/EditProduct.ui" line="8754"/> + <location filename="../ui/EditProduct.ui" line="9920"/> <source>End of fermentation. Optional transfer to lagertank.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8273"/> + <location filename="../ui/EditProduct.ui" line="8338"/> <source>Secondary attenuation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8358"/> + <location filename="../ui/EditProduct.ui" line="8423"/> <source>Tertiary fermentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8370"/> + <location filename="../ui/EditProduct.ui" line="8435"/> <source>Tertiary temperature °C:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8386"/> + <location filename="../ui/EditProduct.ui" line="8451"/> <source>Tertiary end SG:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8449"/> + <location filename="../ui/EditProduct.ui" line="8514"/> <source>Tertiary attenuation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8513"/> + <location filename="../ui/EditProduct.ui" line="8578"/> <source>Expected end SG:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8551"/> + <location filename="../ui/EditProduct.ui" line="8616"/> <source>Alcohol volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8596"/> - <source>Show fermenter unit log:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="8612"/> - <source>Show fermentation log:</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../ui/EditProduct.ui" line="8661"/> + <source>Show fermenter unit log:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="8677"/> + <source>Show fermentation log:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="8726"/> <source>Package</source> <translation type="unfinished">Verpakken</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8673"/> + <location filename="../ui/EditProduct.ui" line="8738"/> <source>Package date:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8762"/> - <source>Carbonation range:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditProduct.ui" line="8815"/> - <source>Infusion or Dilution</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../ui/EditProduct.ui" line="8827"/> + <source>Carbonation range:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="8880"/> + <source>Infusion or Dilution</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditProduct.ui" line="8892"/> <source>Package volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8843"/> + <location filename="../ui/EditProduct.ui" line="8908"/> <source>Package add volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8859"/> + <location filename="../ui/EditProduct.ui" line="8924"/> <source>Package remarks:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8875"/> + <location filename="../ui/EditProduct.ui" line="8940"/> <source>Package ABV %:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8891"/> + <location filename="../ui/EditProduct.ui" line="8956"/> <source>Package add ABV %:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="8907"/> + <location filename="../ui/EditProduct.ui" line="8972"/> <source>pH from fermenter:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9068"/> + <location filename="../ui/EditProduct.ui" line="9133"/> <source>Bottles</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9080"/> + <location filename="../ui/EditProduct.ui" line="9145"/> <source>Bottles volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9096"/> - <location filename="../ui/EditProduct.ui" line="9498"/> + <location filename="../ui/EditProduct.ui" line="9161"/> + <location filename="../ui/EditProduct.ui" line="9563"/> <source>Desired volume CO2:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9112"/> - <location filename="../ui/EditProduct.ui" line="9562"/> + <location filename="../ui/EditProduct.ui" line="9177"/> + <location filename="../ui/EditProduct.ui" line="9627"/> <source>Priming sugar:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9128"/> - <location filename="../ui/EditProduct.ui" line="9482"/> + <location filename="../ui/EditProduct.ui" line="9193"/> + <location filename="../ui/EditProduct.ui" line="9547"/> <source>Sugar amount:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9144"/> - <location filename="../ui/EditProduct.ui" line="9530"/> + <location filename="../ui/EditProduct.ui" line="9209"/> + <location filename="../ui/EditProduct.ui" line="9595"/> <source>Priming gr/L:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9160"/> - <location filename="../ui/EditProduct.ui" line="9514"/> + <location filename="../ui/EditProduct.ui" line="9225"/> + <location filename="../ui/EditProduct.ui" line="9579"/> <source>Water amount:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9176"/> + <location filename="../ui/EditProduct.ui" line="9241"/> <source>Bottle fermentation °C:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9327"/> + <location filename="../ui/EditProduct.ui" line="9392"/> <source>Expected pressure in bar:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9343"/> + <location filename="../ui/EditProduct.ui" line="9408"/> <source>Bottles ABV %:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9438"/> + <location filename="../ui/EditProduct.ui" line="9503"/> <source>Kegs</source> <translation type="unfinished">Fusten</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9450"/> + <location filename="../ui/EditProduct.ui" line="9515"/> <source>Kegs ABV %:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9466"/> + <location filename="../ui/EditProduct.ui" line="9531"/> <source>Kegs pressure in bar:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9546"/> + <location filename="../ui/EditProduct.ui" line="9611"/> <source>Kegs temperature °C:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9631"/> + <location filename="../ui/EditProduct.ui" line="9696"/> <source>Kegs volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9807"/> + <location filename="../ui/EditProduct.ui" line="9872"/> <source>Forced carbonation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9827"/> + <location filename="../ui/EditProduct.ui" line="9892"/> <source>Tasting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9839"/> + <location filename="../ui/EditProduct.ui" line="9904"/> <source>Taste date:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9891"/> + <location filename="../ui/EditProduct.ui" line="9956"/> <source>Taste rate:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9932"/> + <location filename="../ui/EditProduct.ui" line="9997"/> <source>Color:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9948"/> + <location filename="../ui/EditProduct.ui" line="10013"/> <source>Transparency:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="9964"/> + <location filename="../ui/EditProduct.ui" line="10029"/> <source>Head:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10010"/> + <location filename="../ui/EditProduct.ui" line="10075"/> <source>Aroma:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10036"/> + <location filename="../ui/EditProduct.ui" line="10101"/> <source>Taste:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10062"/> + <location filename="../ui/EditProduct.ui" line="10127"/> <source>Aftertaste:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10088"/> + <location filename="../ui/EditProduct.ui" line="10153"/> <source>Mouthfeel:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10114"/> + <location filename="../ui/EditProduct.ui" line="10179"/> <source>Notes:</source> <translation>Opmerkingen:</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10142"/> + <location filename="../ui/EditProduct.ui" line="10207"/> <source>Export</source> <translation>Exporteer</translation> </message> <message> - <location filename="../ui/EditProduct.ui" line="10159"/> + <location filename="../ui/EditProduct.ui" line="10224"/> <source>Print</source> <translation>Print</translation> </message> @@ -2682,8 +2709,8 @@ </message> <message> <location filename="../src/EditProduct.cpp" line="117"/> - <location filename="../src/EditProduct.cpp" line="1695"/> - <location filename="../src/EditProduct.cpp" line="1750"/> + <location filename="../src/EditProduct.cpp" line="1694"/> + <location filename="../src/EditProduct.cpp" line="1749"/> <source>Database error</source> <translation>Database fout</translation> </message> @@ -2698,40 +2725,38 @@ <translation>%1, deel %2 van %3</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="939"/> - <location filename="../src/EditProductTab1.cpp" line="135"/> <source>Boiling %1 minutes</source> - <translation>Koken %1 minuten</translation> - </message> - <message> - <location filename="../src/EditProduct.cpp" line="1145"/> + <translation type="vanished">Koken %1 minuten</translation> + </message> + <message> + <location filename="../src/EditProduct.cpp" line="1144"/> <source>BMSapp - Add new product</source> <translation>BMSapp - Nieuw product</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="1147"/> + <location filename="../src/EditProduct.cpp" line="1146"/> <source>BMSapp - Edit product %1</source> <translation>BMSapp - Wijzig product %1</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="1163"/> - <location filename="../src/EditProduct.cpp" line="1167"/> + <location filename="../src/EditProduct.cpp" line="1162"/> + <location filename="../src/EditProduct.cpp" line="1166"/> <source>Edit Product</source> <translation>Wijzig Product</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="1163"/> + <location filename="../src/EditProduct.cpp" line="1162"/> <source>Name empty or too short.</source> <translation>De naam is leeg of te kort.</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="1167"/> + <location filename="../src/EditProduct.cpp" line="1166"/> <source>No beerstyle selected.</source> <translation>Geen bierstijl gekozen.</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="1696"/> - <location filename="../src/EditProduct.cpp" line="1751"/> + <location filename="../src/EditProduct.cpp" line="1695"/> + <location filename="../src/EditProduct.cpp" line="1750"/> <source>MySQL error: %1 %2 %3</source> @@ -2740,17 +2765,17 @@ %3</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="1740"/> + <location filename="../src/EditProduct.cpp" line="1739"/> <source>Delete product</source> <translation>Verwijder product</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="1776"/> + <location filename="../src/EditProduct.cpp" line="1775"/> <source>Product changed</source> <translation>Product gewijzigd</translation> </message> <message> - <location filename="../src/EditProduct.cpp" line="1776"/> + <location filename="../src/EditProduct.cpp" line="1775"/> <source>The product has been modified. Save changes?</source> <translation>Het product is gewijzigd. Wijzigingen opslaan?</translation> </message> @@ -2848,7 +2873,7 @@ <location filename="../src/EditProductTab5.cpp" line="320"/> <location filename="../src/EditProductTab6.cpp" line="718"/> <location filename="../src/EditProductTab7.cpp" line="303"/> - <location filename="../src/EditProduct.cpp" line="1740"/> + <location filename="../src/EditProduct.cpp" line="1739"/> <source>Delete %1</source> <translation>Verwijder %1</translation> </message> @@ -3319,6 +3344,8 @@ <translation>Verwarm tijd:</translation> </message> <message> + <location filename="../ui/EditProduct.ui" line="6644"/> + <location filename="../ui/EditProduct.ui" line="7756"/> <location filename="../src/EditProductTab7.cpp" line="623"/> <source>Measured pH:</source> <translation>Gemeten pH:</translation> @@ -3329,6 +3356,8 @@ <translation>Gemeten Brix:</translation> </message> <message> + <location filename="../ui/EditProduct.ui" line="6660"/> + <location filename="../ui/EditProduct.ui" line="7823"/> <location filename="../src/EditProductTab7.cpp" line="655"/> <source>Measured SG:</source> <translation>Gemeten SG:</translation>
--- a/ui/EditProduct.ui Thu May 12 17:42:03 2022 +0200 +++ b/ui/EditProduct.ui Thu May 12 22:41:11 2022 +0200 @@ -95,7 +95,7 @@ <enum>QTabWidget::Rounded</enum> </property> <property name="currentIndex"> - <number>0</number> + <number>8</number> </property> <property name="elideMode"> <enum>Qt::ElideNone</enum> @@ -227,9 +227,9 @@ <widget class="QLabel" name="efficiencyLabel"> <property name="geometry"> <rect> - <x>370</x> + <x>360</x> <y>180</y> - <width>131</width> + <width>141</width> <height>20</height> </rect> </property> @@ -275,9 +275,9 @@ <widget class="QLabel" name="boil_sizeLabel"> <property name="geometry"> <rect> - <x>740</x> + <x>720</x> <y>150</y> - <width>131</width> + <width>151</width> <height>20</height> </rect> </property> @@ -895,7 +895,7 @@ <rect> <x>130</x> <y>20</y> - <width>226</width> + <width>211</width> <height>23</height> </rect> </property> @@ -921,7 +921,7 @@ <rect> <x>130</x> <y>50</y> - <width>226</width> + <width>211</width> <height>23</height> </rect> </property> @@ -951,9 +951,9 @@ <widget class="QLabel" name="st_groupLabel"> <property name="geometry"> <rect> - <x>730</x> + <x>720</x> <y>50</y> - <width>131</width> + <width>141</width> <height>20</height> </rect> </property> @@ -1001,7 +1001,7 @@ <rect> <x>130</x> <y>80</y> - <width>226</width> + <width>211</width> <height>23</height> </rect> </property> @@ -1047,9 +1047,9 @@ <widget class="QLabel" name="st_catnrLabel"> <property name="geometry"> <rect> - <x>730</x> + <x>720</x> <y>80</y> - <width>131</width> + <width>141</width> <height>20</height> </rect> </property> @@ -1065,7 +1065,7 @@ <rect> <x>500</x> <y>80</y> - <width>226</width> + <width>211</width> <height>23</height> </rect> </property> @@ -1081,7 +1081,7 @@ <rect> <x>500</x> <y>50</y> - <width>226</width> + <width>211</width> <height>23</height> </rect> </property> @@ -1156,7 +1156,7 @@ <rect> <x>140</x> <y>180</y> - <width>226</width> + <width>211</width> <height>23</height> </rect> </property> @@ -1225,9 +1225,9 @@ <widget class="QLabel" name="ok_pmptLabel"> <property name="geometry"> <rect> - <x>740</x> + <x>720</x> <y>180</y> - <width>131</width> + <width>151</width> <height>20</height> </rect> </property> @@ -1266,7 +1266,7 @@ <widget class="QComboBox" name="eq_selectEdit"> <property name="geometry"> <rect> - <x>150</x> + <x>170</x> <y>20</y> <width>181</width> <height>23</height> @@ -1278,7 +1278,7 @@ <rect> <x>10</x> <y>20</y> - <width>131</width> + <width>151</width> <height>20</height> </rect> </property> @@ -1292,7 +1292,7 @@ <widget class="QLineEdit" name="eq_nameEdit"> <property name="geometry"> <rect> - <x>480</x> + <x>570</x> <y>20</y> <width>281</width> <height>23</height> @@ -1305,7 +1305,7 @@ <widget class="QLabel" name="eq_nameLabel"> <property name="geometry"> <rect> - <x>340</x> + <x>430</x> <y>20</y> <width>131</width> <height>20</height> @@ -1323,7 +1323,7 @@ <rect> <x>10</x> <y>50</y> - <width>131</width> + <width>151</width> <height>20</height> </rect> </property> @@ -1337,9 +1337,9 @@ <widget class="QPlainTextEdit" name="eq_notesEdit"> <property name="geometry"> <rect> - <x>150</x> + <x>170</x> <y>50</y> - <width>901</width> + <width>881</width> <height>91</height> </rect> </property> @@ -1349,7 +1349,7 @@ <rect> <x>10</x> <y>160</y> - <width>291</width> + <width>311</width> <height>151</height> </rect> </property> @@ -1361,7 +1361,7 @@ <rect> <x>10</x> <y>80</y> - <width>121</width> + <width>141</width> <height>20</height> </rect> </property> @@ -1375,7 +1375,7 @@ <widget class="QDoubleSpinBox" name="mash_volumeEdit"> <property name="geometry"> <rect> - <x>140</x> + <x>160</x> <y>80</y> <width>87</width> <height>24</height> @@ -1409,7 +1409,7 @@ <widget class="QDoubleSpinBox" name="mash_maxEdit"> <property name="geometry"> <rect> - <x>140</x> + <x>160</x> <y>110</y> <width>87</width> <height>24</height> @@ -1445,7 +1445,7 @@ <rect> <x>10</x> <y>110</y> - <width>121</width> + <width>141</width> <height>20</height> </rect> </property> @@ -1459,7 +1459,7 @@ <widget class="QDoubleSpinBox" name="tun_volumeEdit"> <property name="geometry"> <rect> - <x>140</x> + <x>160</x> <y>20</y> <width>87</width> <height>24</height> @@ -1495,7 +1495,7 @@ <rect> <x>10</x> <y>20</y> - <width>121</width> + <width>141</width> <height>20</height> </rect> </property> @@ -1511,7 +1511,7 @@ <rect> <x>10</x> <y>50</y> - <width>121</width> + <width>141</width> <height>20</height> </rect> </property> @@ -1525,7 +1525,7 @@ <widget class="QLineEdit" name="tun_materialEdit"> <property name="geometry"> <rect> - <x>140</x> + <x>160</x> <y>50</y> <width>141</width> <height>23</height> @@ -1541,7 +1541,7 @@ <rect> <x>10</x> <y>320</y> - <width>291</width> + <width>311</width> <height>91</height> </rect> </property> @@ -1551,7 +1551,7 @@ <widget class="QDoubleSpinBox" name="lauter_deadspaceEdit"> <property name="geometry"> <rect> - <x>140</x> + <x>160</x> <y>50</y> <width>87</width> <height>24</height> @@ -1587,7 +1587,7 @@ <rect> <x>10</x> <y>50</y> - <width>121</width> + <width>141</width> <height>20</height> </rect> </property> @@ -1603,7 +1603,7 @@ <rect> <x>10</x> <y>20</y> - <width>121</width> + <width>141</width> <height>20</height> </rect> </property> @@ -1617,7 +1617,7 @@ <widget class="QDoubleSpinBox" name="lauter_volumeEdit"> <property name="geometry"> <rect> - <x>140</x> + <x>160</x> <y>20</y> <width>87</width> <height>24</height> @@ -1652,9 +1652,9 @@ <widget class="QGroupBox" name="chilleqBox"> <property name="geometry"> <rect> - <x>820</x> + <x>800</x> <y>160</y> - <width>291</width> + <width>311</width> <height>91</height> </rect> </property> @@ -1666,7 +1666,7 @@ <rect> <x>10</x> <y>20</y> - <width>121</width> + <width>141</width> <height>20</height> </rect> </property> @@ -1680,7 +1680,7 @@ <widget class="QDoubleSpinBox" name="trub_chillerlossEdit"> <property name="geometry"> <rect> - <x>140</x> + <x>160</x> <y>20</y> <width>87</width> <height>24</height> @@ -1716,7 +1716,7 @@ <rect> <x>10</x> <y>50</y> - <width>121</width> + <width>141</width> <height>20</height> </rect> </property> @@ -1730,7 +1730,7 @@ <widget class="QDoubleSpinBox" name="topup_waterEdit"> <property name="geometry"> <rect> - <x>140</x> + <x>160</x> <y>50</y> <width>87</width> <height>24</height> @@ -1765,9 +1765,9 @@ <widget class="QGroupBox" name="boilBox"> <property name="geometry"> <rect> - <x>420</x> + <x>410</x> <y>160</y> - <width>291</width> + <width>311</width> <height>271</height> </rect> </property> @@ -1779,7 +1779,7 @@ <rect> <x>10</x> <y>20</y> - <width>121</width> + <width>141</width> <height>20</height> </rect> </property> @@ -1793,7 +1793,7 @@ <widget class="QDoubleSpinBox" name="kettle_volumeEdit"> <property name="geometry"> <rect> - <x>140</x> + <x>160</x> <y>20</y> <width>87</width> <height>24</height> @@ -1829,7 +1829,7 @@ <rect> <x>10</x> <y>50</y> - <width>121</width> + <width>141</width> <height>20</height> </rect> </property> @@ -1843,7 +1843,7 @@ <widget class="QDoubleSpinBox" name="eqboil_sizeEdit"> <property name="geometry"> <rect> - <x>140</x> + <x>160</x> <y>50</y> <width>87</width> <height>24</height> @@ -1879,7 +1879,7 @@ <rect> <x>10</x> <y>80</y> - <width>121</width> + <width>141</width> <height>20</height> </rect> </property> @@ -1893,7 +1893,7 @@ <widget class="QDoubleSpinBox" name="evap_rateEdit"> <property name="geometry"> <rect> - <x>140</x> + <x>160</x> <y>80</y> <width>87</width> <height>24</height> @@ -1929,7 +1929,7 @@ <rect> <x>10</x> <y>110</y> - <width>121</width> + <width>141</width> <height>20</height> </rect> </property> @@ -1943,7 +1943,7 @@ <widget class="QDoubleSpinBox" name="eqboil_timeEdit"> <property name="geometry"> <rect> - <x>140</x> + <x>160</x> <y>110</y> <width>87</width> <height>24</height> @@ -1979,7 +1979,7 @@ <rect> <x>10</x> <y>140</y> - <width>121</width> + <width>141</width> <height>20</height> </rect> </property> @@ -1993,7 +1993,7 @@ <widget class="QDoubleSpinBox" name="topup_kettleEdit"> <property name="geometry"> <rect> - <x>140</x> + <x>160</x> <y>140</y> <width>87</width> <height>24</height> @@ -2029,7 +2029,7 @@ <rect> <x>10</x> <y>170</y> - <width>121</width> + <width>141</width> <height>20</height> </rect> </property> @@ -2043,7 +2043,7 @@ <widget class="QDoubleSpinBox" name="hop_utilizationEdit"> <property name="geometry"> <rect> - <x>140</x> + <x>160</x> <y>170</y> <width>87</width> <height>24</height> @@ -2079,7 +2079,7 @@ <rect> <x>10</x> <y>200</y> - <width>121</width> + <width>141</width> <height>20</height> </rect> </property> @@ -2093,7 +2093,7 @@ <widget class="QDoubleSpinBox" name="eqbatch_sizeEdit"> <property name="geometry"> <rect> - <x>140</x> + <x>160</x> <y>200</y> <width>87</width> <height>24</height> @@ -2129,7 +2129,7 @@ <rect> <x>10</x> <y>230</y> - <width>121</width> + <width>141</width> <height>20</height> </rect> </property> @@ -2143,7 +2143,7 @@ <widget class="QDoubleSpinBox" name="eq_efficiencyEdit"> <property name="geometry"> <rect> - <x>140</x> + <x>160</x> <y>230</y> <width>87</width> <height>24</height> @@ -2284,9 +2284,9 @@ <widget class="QLabel" name="perc_mashLabel"> <property name="geometry"> <rect> - <x>440</x> + <x>420</x> <y>10</y> - <width>131</width> + <width>151</width> <height>20</height> </rect> </property> @@ -2300,9 +2300,9 @@ <widget class="QLabel" name="perc_sugarLabel"> <property name="geometry"> <rect> - <x>440</x> + <x>420</x> <y>40</y> - <width>131</width> + <width>151</width> <height>20</height> </rect> </property> @@ -2316,9 +2316,9 @@ <widget class="QLabel" name="perc_caraLabel"> <property name="geometry"> <rect> - <x>440</x> + <x>420</x> <y>70</y> - <width>131</width> + <width>151</width> <height>20</height> </rect> </property> @@ -2332,9 +2332,9 @@ <widget class="QLabel" name="lintnerLabel"> <property name="geometry"> <rect> - <x>440</x> + <x>420</x> <y>100</y> - <width>131</width> + <width>151</width> <height>20</height> </rect> </property> @@ -3634,7 +3634,7 @@ <widget class="QPushButton" name="addMash"> <property name="geometry"> <rect> - <x>140</x> + <x>170</x> <y>80</y> <width>80</width> <height>23</height> @@ -3651,9 +3651,9 @@ <widget class="QLabel" name="mash_nameLabel"> <property name="geometry"> <rect> - <x>0</x> + <x>10</x> <y>10</y> - <width>131</width> + <width>151</width> <height>20</height> </rect> </property> @@ -3667,7 +3667,7 @@ <widget class="QLabel" name="mash_pickLabel"> <property name="geometry"> <rect> - <x>530</x> + <x>560</x> <y>10</y> <width>171</width> <height>20</height> @@ -3683,7 +3683,7 @@ <widget class="QComboBox" name="mash_pickEdit"> <property name="geometry"> <rect> - <x>710</x> + <x>740</x> <y>10</y> <width>321</width> <height>23</height> @@ -3693,7 +3693,7 @@ <widget class="QLineEdit" name="mash_nameEdit"> <property name="geometry"> <rect> - <x>140</x> + <x>170</x> <y>10</y> <width>321</width> <height>23</height> @@ -3703,7 +3703,7 @@ <widget class="QLabel" name="mash_timeLabel"> <property name="geometry"> <rect> - <x>530</x> + <x>560</x> <y>40</y> <width>171</width> <height>20</height> @@ -3719,7 +3719,7 @@ <widget class="QLineEdit" name="mash_timeEdit"> <property name="geometry"> <rect> - <x>710</x> + <x>740</x> <y>40</y> <width>71</width> <height>23</height> @@ -3732,9 +3732,9 @@ <widget class="QLabel" name="mash_volLabel"> <property name="geometry"> <rect> - <x>0</x> + <x>10</x> <y>40</y> - <width>131</width> + <width>151</width> <height>20</height> </rect> </property> @@ -3748,7 +3748,7 @@ <widget class="QDoubleSpinBox" name="mash_volEdit"> <property name="geometry"> <rect> - <x>140</x> + <x>170</x> <y>40</y> <width>80</width> <height>24</height> @@ -6261,7 +6261,7 @@ <rect> <x>10</x> <y>90</y> - <width>321</width> + <width>341</width> <height>241</height> </rect> </property> @@ -6273,7 +6273,7 @@ <rect> <x>10</x> <y>20</y> - <width>121</width> + <width>141</width> <height>20</height> </rect> </property> @@ -6287,7 +6287,7 @@ <widget class="QDoubleSpinBox" name="brew_mashphEdit"> <property name="geometry"> <rect> - <x>140</x> + <x>160</x> <y>20</y> <width>81</width> <height>24</height> @@ -6309,9 +6309,9 @@ <widget class="QDoubleSpinBox" name="brew_mashphShow"> <property name="geometry"> <rect> - <x>230</x> + <x>250</x> <y>20</y> - <width>71</width> + <width>61</width> <height>24</height> </rect> </property> @@ -6328,7 +6328,7 @@ <widget class="QDoubleSpinBox" name="brew_mashsgEdit"> <property name="geometry"> <rect> - <x>140</x> + <x>160</x> <y>50</y> <width>81</width> <height>24</height> @@ -6350,9 +6350,9 @@ <widget class="QDoubleSpinBox" name="brew_mashsgShow"> <property name="geometry"> <rect> - <x>230</x> + <x>250</x> <y>50</y> - <width>71</width> + <width>61</width> <height>24</height> </rect> </property> @@ -6372,7 +6372,7 @@ <widget class="QDoubleSpinBox" name="brew_masheffShow"> <property name="geometry"> <rect> - <x>140</x> + <x>160</x> <y>80</y> <width>81</width> <height>24</height> @@ -6402,7 +6402,7 @@ <rect> <x>10</x> <y>50</y> - <width>121</width> + <width>141</width> <height>20</height> </rect> </property> @@ -6418,12 +6418,12 @@ <rect> <x>10</x> <y>80</y> - <width>121</width> - <height>20</height> - </rect> - </property> - <property name="text"> - <string>Efficiency:</string> + <width>141</width> + <height>20</height> + </rect> + </property> + <property name="text"> + <string>Mash efficiency:</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -6434,7 +6434,7 @@ <rect> <x>10</x> <y>200</y> - <width>121</width> + <width>141</width> <height>20</height> </rect> </property> @@ -6450,7 +6450,7 @@ <rect> <x>10</x> <y>140</y> - <width>121</width> + <width>141</width> <height>20</height> </rect> </property> @@ -6466,7 +6466,7 @@ <rect> <x>10</x> <y>170</y> - <width>121</width> + <width>141</width> <height>20</height> </rect> </property> @@ -6480,7 +6480,7 @@ <widget class="QDoubleSpinBox" name="brew_spargevolShow"> <property name="geometry"> <rect> - <x>140</x> + <x>160</x> <y>140</y> <width>81</width> <height>24</height> @@ -6495,6 +6495,9 @@ <property name="buttonSymbols"> <enum>QAbstractSpinBox::NoButtons</enum> </property> + <property name="suffix"> + <string> L</string> + </property> <property name="decimals"> <number>1</number> </property> @@ -6507,7 +6510,7 @@ <rect> <x>10</x> <y>110</y> - <width>121</width> + <width>141</width> <height>20</height> </rect> </property> @@ -6521,7 +6524,7 @@ <widget class="QDoubleSpinBox" name="brew_spargephEdit"> <property name="geometry"> <rect> - <x>140</x> + <x>160</x> <y>200</y> <width>81</width> <height>24</height> @@ -6543,7 +6546,7 @@ <widget class="QDoubleSpinBox" name="brew_spargeestShow"> <property name="geometry"> <rect> - <x>140</x> + <x>160</x> <y>170</y> <width>81</width> <height>24</height> @@ -6558,6 +6561,9 @@ <property name="buttonSymbols"> <enum>QAbstractSpinBox::NoButtons</enum> </property> + <property name="suffix"> + <string> L</string> + </property> <property name="decimals"> <number>1</number> </property> @@ -6568,7 +6574,7 @@ <widget class="QDoubleSpinBox" name="brew_spargetempShow"> <property name="geometry"> <rect> - <x>140</x> + <x>160</x> <y>110</y> <width>81</width> <height>24</height> @@ -6583,6 +6589,9 @@ <property name="buttonSymbols"> <enum>QAbstractSpinBox::NoButtons</enum> </property> + <property name="suffix"> + <string> °C</string> + </property> <property name="decimals"> <number>1</number> </property> @@ -6593,9 +6602,9 @@ <widget class="QDoubleSpinBox" name="brew_spargephShow"> <property name="geometry"> <rect> - <x>230</x> + <x>250</x> <y>200</y> - <width>71</width> + <width>61</width> <height>24</height> </rect> </property> @@ -6615,24 +6624,24 @@ <rect> <x>370</x> <y>20</y> - <width>741</width> + <width>361</width> <height>151</height> </rect> </property> <property name="title"> - <string>Boiling</string> + <string>Pre boil</string> </property> <widget class="QLabel" name="brew_preboilphLabel"> <property name="geometry"> <rect> - <x>30</x> + <x>10</x> <y>20</y> <width>131</width> <height>20</height> </rect> </property> <property name="text"> - <string>Pre boil pH:</string> + <string>Measured pH:</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -6641,14 +6650,14 @@ <widget class="QLabel" name="brew_preboilsgLabel"> <property name="geometry"> <rect> - <x>30</x> + <x>10</x> <y>50</y> <width>131</width> <height>20</height> </rect> </property> <property name="text"> - <string>Pre boil SG:</string> + <string>Measured SG:</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -6657,14 +6666,14 @@ <widget class="QLabel" name="brew_preboilvolLabel"> <property name="geometry"> <rect> - <x>30</x> + <x>10</x> <y>80</y> <width>131</width> <height>20</height> </rect> </property> <property name="text"> - <string>Pre boil vol@100°C:</string> + <string>Volume @100°C:</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -6673,14 +6682,14 @@ <widget class="QLabel" name="brew_preboileffLabel"> <property name="geometry"> <rect> - <x>30</x> + <x>10</x> <y>110</y> <width>131</width> <height>20</height> </rect> </property> <property name="text"> - <string>Pre boil efficiency:</string> + <string>Efficiency:</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -6689,7 +6698,7 @@ <widget class="QDoubleSpinBox" name="brew_preboilphEdit"> <property name="geometry"> <rect> - <x>170</x> + <x>150</x> <y>20</y> <width>81</width> <height>24</height> @@ -6711,7 +6720,7 @@ <widget class="QDoubleSpinBox" name="brew_preboilsgEdit"> <property name="geometry"> <rect> - <x>170</x> + <x>150</x> <y>50</y> <width>81</width> <height>24</height> @@ -6733,7 +6742,7 @@ <widget class="QDoubleSpinBox" name="brew_preboilsgShow"> <property name="geometry"> <rect> - <x>260</x> + <x>240</x> <y>50</y> <width>71</width> <height>24</height> @@ -6755,12 +6764,15 @@ <widget class="QDoubleSpinBox" name="brew_preboileffShow"> <property name="geometry"> <rect> - <x>170</x> + <x>150</x> <y>110</y> <width>81</width> <height>24</height> </rect> </property> + <property name="toolTip"> + <string>Mash, sparge and lauter efficiency.</string> + </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> @@ -6783,7 +6795,7 @@ <widget class="QDoubleSpinBox" name="brew_preboilvolEdit"> <property name="geometry"> <rect> - <x>170</x> + <x>150</x> <y>80</y> <width>81</width> <height>24</height> @@ -6795,6 +6807,9 @@ <property name="accelerated"> <bool>true</bool> </property> + <property name="suffix"> + <string> L</string> + </property> <property name="decimals"> <number>1</number> </property> @@ -6808,7 +6823,7 @@ <widget class="QDoubleSpinBox" name="brew_preboilvolShow"> <property name="geometry"> <rect> - <x>260</x> + <x>240</x> <y>80</y> <width>71</width> <height>24</height> @@ -6823,6 +6838,9 @@ <property name="buttonSymbols"> <enum>QAbstractSpinBox::NoButtons</enum> </property> + <property name="suffix"> + <string> L</string> + </property> <property name="decimals"> <number>1</number> </property> @@ -6833,49 +6851,7 @@ <widget class="QToolButton" name="brew_preboilButton"> <property name="geometry"> <rect> - <x>340</x> - <y>80</y> - <width>28</width> - <height>22</height> - </rect> - </property> - <property name="toolTip"> - <string>Edit volume</string> - </property> - <property name="text"> - <string>...</string> - </property> - <property name="icon"> - <iconset resource="../../../../../../home/mbroek/MyProjects/bmsapp/resources/icons.qrc"> - <normaloff>:/icons/silk/pencil.png</normaloff>:/icons/silk/pencil.png</iconset> - </property> - </widget> - <widget class="QDoubleSpinBox" name="brew_aboilsgEdit"> - <property name="geometry"> - <rect> - <x>520</x> - <y>50</y> - <width>81</width> - <height>24</height> - </rect> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - <property name="accelerated"> - <bool>true</bool> - </property> - <property name="decimals"> - <number>3</number> - </property> - <property name="singleStep"> - <double>0.001000000000000</double> - </property> - </widget> - <widget class="QToolButton" name="brew_aboilButton"> - <property name="geometry"> - <rect> - <x>690</x> + <x>320</x> <y>80</y> <width>28</width> <height>22</height> @@ -6892,216 +6868,30 @@ <normaloff>:/icons/silk/pencil.png</normaloff>:/icons/silk/pencil.png</iconset> </property> </widget> - <widget class="QLabel" name="brew_aboilsgLabel"> - <property name="geometry"> - <rect> - <x>380</x> - <y>50</y> - <width>131</width> - <height>20</height> - </rect> - </property> - <property name="text"> - <string>After boil SG:</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - </widget> - <widget class="QDoubleSpinBox" name="brew_aboilvolEdit"> - <property name="geometry"> - <rect> - <x>520</x> - <y>80</y> - <width>81</width> - <height>24</height> - </rect> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - <property name="accelerated"> - <bool>true</bool> - </property> - <property name="decimals"> - <number>1</number> - </property> - <property name="maximum"> - <double>100000.000000000000000</double> - </property> - <property name="singleStep"> - <double>1.000000000000000</double> - </property> - </widget> - <widget class="QLabel" name="brew_aboilvolLabel"> - <property name="geometry"> - <rect> - <x>380</x> - <y>80</y> - <width>131</width> - <height>20</height> - </rect> - </property> - <property name="text"> - <string>After boil vol@100°C:</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - </widget> - <widget class="QDoubleSpinBox" name="brew_aboilphEdit"> - <property name="geometry"> - <rect> - <x>520</x> - <y>20</y> - <width>81</width> - <height>24</height> - </rect> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - <property name="accelerated"> - <bool>true</bool> - </property> - <property name="maximum"> - <double>14.000000000000000</double> - </property> - <property name="singleStep"> - <double>0.100000000000000</double> - </property> - </widget> - <widget class="QDoubleSpinBox" name="brew_aboilsgShow"> - <property name="geometry"> - <rect> - <x>610</x> - <y>50</y> - <width>71</width> - <height>24</height> - </rect> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - <property name="buttonSymbols"> - <enum>QAbstractSpinBox::NoButtons</enum> - </property> - <property name="decimals"> - <number>3</number> - </property> - </widget> - <widget class="QLabel" name="brew_aboileffLabel"> - <property name="geometry"> - <rect> - <x>380</x> - <y>110</y> - <width>131</width> - <height>20</height> - </rect> - </property> - <property name="text"> - <string>After boil efficiency:</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - </widget> - <widget class="QDoubleSpinBox" name="brew_aboileffShow"> - <property name="geometry"> - <rect> - <x>520</x> - <y>110</y> - <width>81</width> - <height>24</height> - </rect> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - <property name="buttonSymbols"> - <enum>QAbstractSpinBox::NoButtons</enum> - </property> - <property name="suffix"> - <string> %</string> - </property> - <property name="decimals"> - <number>1</number> - </property> - <property name="maximum"> - <double>200.000000000000000</double> - </property> - </widget> - <widget class="QDoubleSpinBox" name="brew_aboilvolShow"> - <property name="geometry"> - <rect> - <x>610</x> - <y>80</y> - <width>71</width> - <height>24</height> - </rect> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - <property name="buttonSymbols"> - <enum>QAbstractSpinBox::NoButtons</enum> - </property> - <property name="decimals"> - <number>1</number> - </property> - <property name="maximum"> - <double>100000.000000000000000</double> - </property> - </widget> - <widget class="QLabel" name="brew_aboilphLabel"> - <property name="geometry"> - <rect> - <x>380</x> - <y>20</y> - <width>131</width> - <height>20</height> - </rect> - </property> - <property name="text"> - <string>After boil pH:</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - </widget> - </widget> - <widget class="QGroupBox" name="brew_chillBox"> - <property name="geometry"> - <rect> - <x>370</x> - <y>180</y> - <width>741</width> + </widget> + <widget class="QGroupBox" name="whirlpoolBox"> + <property name="geometry"> + <rect> + <x>750</x> + <y>20</y> + <width>361</width> <height>151</height> </rect> </property> <property name="title"> - <string>Chilling and whirlpools</string> + <string>Whirlpools</string> </property> <widget class="QLabel" name="brew_whirlpool7Label"> <property name="geometry"> <rect> - <x>30</x> + <x>10</x> <y>50</y> - <width>131</width> - <height>20</height> - </rect> - </property> - <property name="text"> - <string>Hopstand 72..79°C:</string> + <width>151</width> + <height>20</height> + </rect> + </property> + <property name="text"> + <string>Whirlpool 72..79°C:</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -7110,14 +6900,14 @@ <widget class="QLabel" name="brew_whirlpool6Label"> <property name="geometry"> <rect> - <x>30</x> + <x>10</x> <y>80</y> - <width>131</width> - <height>20</height> - </rect> - </property> - <property name="text"> - <string>Hopstand 60..66°C:</string> + <width>151</width> + <height>20</height> + </rect> + </property> + <property name="text"> + <string>Whirlpool 60..66°C:</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -7126,9 +6916,9 @@ <widget class="QLabel" name="brew_whirlpool2Label"> <property name="geometry"> <rect> - <x>30</x> + <x>10</x> <y>110</y> - <width>131</width> + <width>151</width> <height>20</height> </rect> </property> @@ -7142,14 +6932,14 @@ <widget class="QLabel" name="brew_whirlpool9Label"> <property name="geometry"> <rect> - <x>30</x> + <x>10</x> <y>20</y> - <width>131</width> - <height>20</height> - </rect> - </property> - <property name="text"> - <string>Hopstand 85..100°C:</string> + <width>151</width> + <height>20</height> + </rect> + </property> + <property name="text"> + <string>Whirlpool 85..100°C:</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -7267,125 +7057,14 @@ <double>1.000000000000000</double> </property> </widget> - <widget class="QLabel" name="brew_cooltoLabel"> - <property name="geometry"> - <rect> - <x>380</x> - <y>20</y> - <width>131</width> - <height>20</height> - </rect> - </property> - <property name="text"> - <string>Cooling to °C:</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - </widget> - <widget class="QLabel" name="brew_coolwithLabel"> - <property name="geometry"> - <rect> - <x>380</x> - <y>50</y> - <width>131</width> - <height>20</height> - </rect> - </property> - <property name="text"> - <string>Cooling method:</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - </widget> - <widget class="QLabel" name="brew_cooltimeLabel"> - <property name="geometry"> - <rect> - <x>380</x> - <y>80</y> - <width>131</width> - <height>20</height> - </rect> - </property> - <property name="text"> - <string>Cooling time:</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - </widget> - <widget class="QDoubleSpinBox" name="brew_cooltimeEdit"> - <property name="geometry"> - <rect> - <x>520</x> - <y>80</y> - <width>81</width> - <height>24</height> - </rect> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - <property name="accelerated"> - <bool>true</bool> - </property> - <property name="suffix"> - <string> min</string> - </property> - <property name="decimals"> - <number>0</number> - </property> - <property name="maximum"> - <double>1000.000000000000000</double> - </property> - <property name="singleStep"> - <double>1.000000000000000</double> - </property> - </widget> - <widget class="QDoubleSpinBox" name="brew_cooltoEdit"> - <property name="geometry"> - <rect> - <x>520</x> - <y>20</y> - <width>81</width> - <height>24</height> - </rect> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - <property name="accelerated"> - <bool>true</bool> - </property> - <property name="decimals"> - <number>1</number> - </property> - <property name="maximum"> - <double>100000.000000000000000</double> - </property> - <property name="singleStep"> - <double>1.000000000000000</double> - </property> - </widget> - <widget class="QComboBox" name="brew_coolwithEdit"> - <property name="geometry"> - <rect> - <x>520</x> - <y>50</y> - <width>161</width> - <height>23</height> - </rect> - </property> - </widget> </widget> <widget class="QGroupBox" name="brew_tofermentBox"> <property name="geometry"> <rect> - <x>370</x> - <y>340</y> - <width>741</width> - <height>121</height> + <x>750</x> + <y>180</y> + <width>361</width> + <height>211</height> </rect> </property> <property name="title"> @@ -7394,9 +7073,9 @@ <widget class="QLabel" name="brew_tofermentLabel"> <property name="geometry"> <rect> - <x>30</x> + <x>10</x> <y>80</y> - <width>131</width> + <width>151</width> <height>20</height> </rect> </property> @@ -7410,9 +7089,9 @@ <widget class="QLabel" name="brew_trublossLabel_2"> <property name="geometry"> <rect> - <x>30</x> + <x>10</x> <y>20</y> - <width>131</width> + <width>151</width> <height>20</height> </rect> </property> @@ -7426,9 +7105,9 @@ <widget class="QLabel" name="brew_topupwaterLabel"> <property name="geometry"> <rect> - <x>30</x> + <x>10</x> <y>50</y> - <width>131</width> + <width>151</width> <height>20</height> </rect> </property> @@ -7454,6 +7133,9 @@ <property name="accelerated"> <bool>true</bool> </property> + <property name="suffix"> + <string> L</string> + </property> <property name="decimals"> <number>1</number> </property> @@ -7479,6 +7161,9 @@ <property name="accelerated"> <bool>true</bool> </property> + <property name="suffix"> + <string> L</string> + </property> <property name="decimals"> <number>1</number> </property> @@ -7504,6 +7189,9 @@ <property name="accelerated"> <bool>true</bool> </property> + <property name="suffix"> + <string> L</string> + </property> <property name="decimals"> <number>1</number> </property> @@ -7517,8 +7205,8 @@ <widget class="QLabel" name="brew_fermentsgLabel"> <property name="geometry"> <rect> - <x>360</x> - <y>20</y> + <x>10</x> + <y>110</y> <width>151</width> <height>20</height> </rect> @@ -7533,8 +7221,8 @@ <widget class="QLabel" name="brew_fermentcolorLabel"> <property name="geometry"> <rect> - <x>360</x> - <y>50</y> + <x>10</x> + <y>140</y> <width>151</width> <height>20</height> </rect> @@ -7549,8 +7237,8 @@ <widget class="QLabel" name="brew_fermentibuLabel"> <property name="geometry"> <rect> - <x>360</x> - <y>80</y> + <x>10</x> + <y>170</y> <width>151</width> <height>20</height> </rect> @@ -7565,8 +7253,8 @@ <widget class="QDoubleSpinBox" name="brew_fermentcolorShow"> <property name="geometry"> <rect> - <x>520</x> - <y>50</y> + <x>170</x> + <y>140</y> <width>71</width> <height>24</height> </rect> @@ -7599,8 +7287,8 @@ <widget class="QDoubleSpinBox" name="brew_fermentibuShow"> <property name="geometry"> <rect> - <x>520</x> - <y>80</y> + <x>170</x> + <y>170</y> <width>71</width> <height>24</height> </rect> @@ -7633,8 +7321,8 @@ <widget class="QDoubleSpinBox" name="brew_fermentsgShow"> <property name="geometry"> <rect> - <x>520</x> - <y>20</y> + <x>170</x> + <y>110</y> <width>71</width> <height>24</height> </rect> @@ -7658,7 +7346,7 @@ <rect> <x>10</x> <y>340</y> - <width>321</width> + <width>341</width> <height>121</height> </rect> </property> @@ -7670,7 +7358,7 @@ <rect> <x>10</x> <y>20</y> - <width>121</width> + <width>141</width> <height>20</height> </rect> </property> @@ -7686,7 +7374,7 @@ <rect> <x>10</x> <y>50</y> - <width>121</width> + <width>141</width> <height>20</height> </rect> </property> @@ -7702,7 +7390,7 @@ <rect> <x>10</x> <y>80</y> - <width>121</width> + <width>141</width> <height>20</height> </rect> </property> @@ -7716,9 +7404,9 @@ <widget class="QComboBox" name="brew_aerwithEdit"> <property name="geometry"> <rect> - <x>140</x> + <x>160</x> <y>20</y> - <width>161</width> + <width>151</width> <height>23</height> </rect> </property> @@ -7726,7 +7414,7 @@ <widget class="QDoubleSpinBox" name="brew_aertimeEdit"> <property name="geometry"> <rect> - <x>140</x> + <x>160</x> <y>50</y> <width>81</width> <height>24</height> @@ -7754,7 +7442,7 @@ <widget class="QDoubleSpinBox" name="brew_aerspeedEdit"> <property name="geometry"> <rect> - <x>140</x> + <x>160</x> <y>80</y> <width>81</width> <height>24</height> @@ -7800,6 +7488,383 @@ <normaloff>:/icons/silk/chart_line.png</normaloff>:/icons/silk/chart_line.png</iconset> </property> </widget> + <widget class="QGroupBox" name="coolingBox"> + <property name="geometry"> + <rect> + <x>370</x> + <y>340</y> + <width>361</width> + <height>121</height> + </rect> + </property> + <property name="title"> + <string>Cooling</string> + </property> + <widget class="QLabel" name="brew_coolwithLabel"> + <property name="geometry"> + <rect> + <x>10</x> + <y>50</y> + <width>131</width> + <height>20</height> + </rect> + </property> + <property name="text"> + <string>Cooling method:</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> + <widget class="QLabel" name="brew_cooltoLabel"> + <property name="geometry"> + <rect> + <x>10</x> + <y>20</y> + <width>131</width> + <height>20</height> + </rect> + </property> + <property name="text"> + <string>Cooling to:</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> + <widget class="QDoubleSpinBox" name="brew_cooltoEdit"> + <property name="geometry"> + <rect> + <x>150</x> + <y>20</y> + <width>81</width> + <height>24</height> + </rect> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="accelerated"> + <bool>true</bool> + </property> + <property name="suffix"> + <string> °C</string> + </property> + <property name="decimals"> + <number>1</number> + </property> + <property name="maximum"> + <double>100000.000000000000000</double> + </property> + <property name="singleStep"> + <double>1.000000000000000</double> + </property> + </widget> + <widget class="QDoubleSpinBox" name="brew_cooltimeEdit"> + <property name="geometry"> + <rect> + <x>150</x> + <y>80</y> + <width>81</width> + <height>24</height> + </rect> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="accelerated"> + <bool>true</bool> + </property> + <property name="suffix"> + <string> min</string> + </property> + <property name="decimals"> + <number>0</number> + </property> + <property name="maximum"> + <double>1000.000000000000000</double> + </property> + <property name="singleStep"> + <double>1.000000000000000</double> + </property> + </widget> + <widget class="QComboBox" name="brew_coolwithEdit"> + <property name="geometry"> + <rect> + <x>150</x> + <y>50</y> + <width>161</width> + <height>23</height> + </rect> + </property> + </widget> + <widget class="QLabel" name="brew_cooltimeLabel"> + <property name="geometry"> + <rect> + <x>10</x> + <y>80</y> + <width>131</width> + <height>20</height> + </rect> + </property> + <property name="text"> + <string>Cooling time:</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> + </widget> + <widget class="QGroupBox" name="afterboilBox"> + <property name="geometry"> + <rect> + <x>370</x> + <y>180</y> + <width>361</width> + <height>151</height> + </rect> + </property> + <property name="title"> + <string>After boil</string> + </property> + <widget class="QDoubleSpinBox" name="brew_aboilvolShow"> + <property name="geometry"> + <rect> + <x>240</x> + <y>80</y> + <width>71</width> + <height>24</height> + </rect> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="suffix"> + <string> L</string> + </property> + <property name="decimals"> + <number>1</number> + </property> + <property name="maximum"> + <double>100000.000000000000000</double> + </property> + </widget> + <widget class="QLabel" name="brew_aboileffLabel"> + <property name="geometry"> + <rect> + <x>10</x> + <y>110</y> + <width>131</width> + <height>20</height> + </rect> + </property> + <property name="text"> + <string>Efficiency:</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> + <widget class="QDoubleSpinBox" name="brew_aboilsgShow"> + <property name="geometry"> + <rect> + <x>240</x> + <y>50</y> + <width>71</width> + <height>24</height> + </rect> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="decimals"> + <number>3</number> + </property> + </widget> + <widget class="QDoubleSpinBox" name="brew_aboilphEdit"> + <property name="geometry"> + <rect> + <x>150</x> + <y>20</y> + <width>81</width> + <height>24</height> + </rect> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="accelerated"> + <bool>true</bool> + </property> + <property name="maximum"> + <double>14.000000000000000</double> + </property> + <property name="singleStep"> + <double>0.100000000000000</double> + </property> + </widget> + <widget class="QDoubleSpinBox" name="brew_aboilvolEdit"> + <property name="geometry"> + <rect> + <x>150</x> + <y>80</y> + <width>81</width> + <height>24</height> + </rect> + </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> + <property name="maximum"> + <double>100000.000000000000000</double> + </property> + <property name="singleStep"> + <double>1.000000000000000</double> + </property> + </widget> + <widget class="QLabel" name="brew_aboilphLabel"> + <property name="geometry"> + <rect> + <x>10</x> + <y>20</y> + <width>131</width> + <height>20</height> + </rect> + </property> + <property name="text"> + <string>Measured pH:</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> + <widget class="QDoubleSpinBox" name="brew_aboileffShow"> + <property name="geometry"> + <rect> + <x>150</x> + <y>110</y> + <width>81</width> + <height>24</height> + </rect> + </property> + <property name="toolTip"> + <string>The overall efficiency.</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="buttonSymbols"> + <enum>QAbstractSpinBox::NoButtons</enum> + </property> + <property name="suffix"> + <string> %</string> + </property> + <property name="decimals"> + <number>1</number> + </property> + <property name="maximum"> + <double>200.000000000000000</double> + </property> + </widget> + <widget class="QToolButton" name="brew_aboilButton"> + <property name="geometry"> + <rect> + <x>320</x> + <y>80</y> + <width>28</width> + <height>22</height> + </rect> + </property> + <property name="toolTip"> + <string>Edit volume</string> + </property> + <property name="text"> + <string>...</string> + </property> + <property name="icon"> + <iconset resource="../../../../../../home/mbroek/MyProjects/bmsapp/resources/icons.qrc"> + <normaloff>:/icons/silk/pencil.png</normaloff>:/icons/silk/pencil.png</iconset> + </property> + </widget> + <widget class="QLabel" name="brew_aboilsgLabel"> + <property name="geometry"> + <rect> + <x>10</x> + <y>50</y> + <width>131</width> + <height>20</height> + </rect> + </property> + <property name="text"> + <string>Measured SG:</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> + <widget class="QLabel" name="brew_aboilvolLabel"> + <property name="geometry"> + <rect> + <x>10</x> + <y>80</y> + <width>131</width> + <height>20</height> + </rect> + </property> + <property name="text"> + <string>Volume @100°C:</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> + <widget class="QDoubleSpinBox" name="brew_aboilsgEdit"> + <property name="geometry"> + <rect> + <x>150</x> + <y>50</y> + <width>81</width> + <height>24</height> + </rect> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="accelerated"> + <bool>true</bool> + </property> + <property name="decimals"> + <number>3</number> + </property> + <property name="singleStep"> + <double>0.001000000000000</double> + </property> + </widget> + </widget> </widget> <widget class="QWidget" name="ferment"> <attribute name="icon">