# HG changeset patch # User Michiel Broek # Date 1673707108 -3600 # Node ID adaf43213d108e0eee6ea9737595cde470f7a929 # Parent fbb250c725bb7bfef8706fc32be6a43389c8f11e Added a refractometer icon diff -r fbb250c725bb -r adaf43213d10 resources/icons.qrc --- a/resources/icons.qrc Sat Jan 14 14:14:59 2023 +0100 +++ b/resources/icons.qrc Sat Jan 14 15:38:28 2023 +0100 @@ -1017,6 +1017,7 @@ icons/bms/peper.png icons/bms/preferences.png icons/bms/printer.png + icons/bms/refractometer.png icons/bms/science.png icons/bms/water.png diff -r fbb250c725bb -r adaf43213d10 resources/icons/bms/refractometer.png Binary file resources/icons/bms/refractometer.png has changed diff -r fbb250c725bb -r adaf43213d10 translations/bmsapp_en.ts --- a/translations/bmsapp_en.ts Sat Jan 14 14:14:59 2023 +0100 +++ b/translations/bmsapp_en.ts Sat Jan 14 15:38:28 2023 +0100 @@ -2333,7 +2333,7 @@ - + Efficiency: @@ -2366,20 +2366,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + % @@ -2387,12 +2387,12 @@ - - - - - - + + + + + + min @@ -2424,17 +2424,17 @@ - - - - - - - - - - - + + + + + + + + + + + L @@ -2676,7 +2676,7 @@ - + Top up water: @@ -2744,6 +2744,7 @@ + Kettle trub loss: @@ -2884,10 +2885,10 @@ - - - - + + + + Set or clear date @@ -2897,26 +2898,28 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + ... @@ -2968,7 +2971,7 @@ - + Set the date to today. @@ -2979,12 +2982,12 @@ - - - - - - + + + + + + dd-MM-yyyy @@ -3124,8 +3127,8 @@ - - + + gr @@ -3457,14 +3460,14 @@ - - - - - - - - + + + + + + + + °C @@ -3475,21 +3478,21 @@ - + Measured pH: - + Measured SG: - + Volume @100°C: @@ -3500,545 +3503,542 @@ - + + + Edit volume - + Whirlpools - + Whirlpool 72..79°C: - + Whirlpool 60..66°C: - + Whirlpool cold: - + Whirlpool 85..100°C: - + Transfer to fermenter - + Volume to fermenter: - - Trub and chiller loss: - - - - + SG in fermenter: - + EBC color in fermenter: - + IBU in fermenter: - + Aeration time & speed: - + L/m - + Aeration with: - - - - - Brew log chart - - - + + + + Brew log chart + + + + Cooling - + Cooling method: - + Cooling to: - + Cooling time: - + After boil - + The overall efficiency. - + Edit the brewdate plan or start. - + Clear planned brewdate - + Edit the brewdate start time. - - + + hh:mm - + Edit the brewdate end. - + Edit the brewdate end time. - + Set the brewdate end date. - + End time: - + Start time: - + Show brewlog: - + Confirm brew done: - - - + + + Confirm the brew dates and times. - - Fermenting - - - - - Primary fermentation - - - - - Start density: - - - + Fermenting + + + + + Primary fermentation + + + + + Start density: + + + + Start temperature: - + Peak temperature: - - + + End temperature: - - + + End density: - - + + End date: - - - + + + Apparent attenuation: - - - - Edit SG in Plato, Brix or SG - - - - - - Set the date to today - - - - Edit the date the primary fermentation was done. + + + Edit SG in Plato, Brix or SG + + + + + + Set the date to today + Edit the date the primary fermentation was done. + + + + Secondary fermentation - - Edit the date the secondary fermentation was done. - - - + Edit the date the secondary fermentation was done. + + + + Tertiary fermentation - + Average temperature: - + Final density: - + Expected end density: - + Alcohol volume: - + Show fermenter unit log: - + Show fermentation log: - + Package - + Package date: - + Carbonation range: - + Infusion or Dilution - + Package volume: - + Extra added volume: - + Extra remarks: - + Estimated final ABV %: - + Estimated final IBU: - + Estimated final EBC: - + Extra added ABV %: - + pH from fermenter: - + Extra dilution or infusion added to this batch. - - + + The ABV including the infusion. - + If there is alcohol in the infusion, give the percentage. - + Could be the description of the infusion. - + Estimated package ABV %: - + Bottles - - + + Volume: - - + + Desired volume CO2: - - + + Priming sugar: - - + + Sugar amount: - - + + Priming: - - + + Water amount: - + Bottle fermentation: - - + + gr/L - + Expected pressure in bar: - + Bottles ABV %: - + Kegs - + Kegs ABV %: - + Kegs pressure in bar: - + Kegs temperature: - + Forced carbonation: - + Edit the package date. - + Show carbonation log: - + Tasting - + Taste date: - + Taste rate: - + Color: - + Transparency: - + Head: - + Aroma: - + Taste: - + Aftertaste: - + Mouthfeel: - + Notes: - + Edit the tasting date. - + Export - + Print diff -r fbb250c725bb -r adaf43213d10 translations/bmsapp_nl.ts --- a/translations/bmsapp_nl.ts Sat Jan 14 14:14:59 2023 +0100 +++ b/translations/bmsapp_nl.ts Sat Jan 14 15:38:28 2023 +0100 @@ -2549,7 +2549,7 @@ - + Efficiency: Rendement: @@ -2582,20 +2582,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + % % @@ -2603,12 +2603,12 @@ - - - - - - + + + + + + min min @@ -2640,17 +2640,17 @@ - - - - - - - - - - - + + + + + + + + + + + L @@ -2845,7 +2845,7 @@ Trub koeler verlies: - + Top up water: Extra water in gistvat: @@ -2979,10 +2979,10 @@ - - - - + + + + Set or clear date Zet of wis datum @@ -2992,26 +2992,28 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + ... ... @@ -3067,7 +3069,7 @@ - + Set the date to today. Zet de datum op vandaag. @@ -3078,12 +3080,12 @@ - - - - - - + + + + + + dd-MM-yyyy dd-MM-yyyy @@ -3395,8 +3397,8 @@ - - + + gr gr @@ -3528,72 +3530,72 @@ Spoelwater temp: - + Start density: Begin densiteit: - + Start temperature: Start temperatuur: - + Peak temperature: Piek temperatuur: - - + + End temperature: Eind temperatuur: - - + + End density: Eind densiteit: - - + + End date: Eind datum: - - - + + + Apparent attenuation: Schijnbare vergisting: - + Edit the date the secondary fermentation was done. Wijzig de datum dat de nagisting gereed was. - + Average temperature: Gemiddelde temperatuur: - + Final density: Finale densiteit: - + Expected end density: Verwachte eind densiteit: - + Extra added volume: Toevoeging volume: - + Extra remarks: Toevoeging opmerking: @@ -3603,45 +3605,45 @@ Finale ABV %: - + Extra added ABV %: Toevoeging extra ABV %: - + Estimated final IBU: Verwacht finale IBU: - + Estimated final EBC: Verwacht finale EBC: - - + + Volume: Volume: - - + + Priming: Carbonatie: - + Bottle fermentation: Flessen hergisting: - - + + gr/L gr/L - + Kegs temperature: Fusten temperatuur: @@ -3709,32 +3711,34 @@ - + + + Edit volume Wijzig volume - + Whirlpool cold: Whirlpool koud: - + Aeration time & speed: Beluchten tijd snelheid: - + Cooling method: Koelen methode: - + Cooling time: Koelen tijd: - + Transfer to fermenter Naar gistvat @@ -3745,14 +3749,14 @@ - - - - - - - - + + + + + + + + °C °C @@ -3763,7 +3767,7 @@ - + Volume @100°C: Volume @100°C: @@ -3773,47 +3777,46 @@ Maischen, spoelen en filteren rendement. - + Whirlpools Whirlpoolen - + Whirlpool 72..79°C: Whirlpool 72..79°C: - + Whirlpool 60..66°C: Whirlpool 60..66°C: - + Whirlpool 85..100°C: Whirlpool 85..100°C: - + Volume to fermenter: Volume naar gistvat: - Trub and chiller loss: - Trub en koeler verlies: - - - + Trub en koeler verlies: + + + SG in fermenter: SG in gistvat: - + EBC color in fermenter: EBC kleur in gistvat: - + IBU in fermenter: IBU in het gistvat: @@ -3822,7 +3825,7 @@ Beluchten - + Aeration with: Beluchten met: @@ -3835,177 +3838,177 @@ Beluchten snelheid: - + L/m L/m - - - - - Brew log chart - Brouw log grafiek - - + + + + Brew log chart + Brouw log grafiek + + + Cooling Koelen - + Cooling to: Koelen tot: - + After boil Einde koken - + The overall efficiency. Het totale brouwzaal rendement. - + Edit the brewdate plan or start. Wijzig de brouwdag plan of start datum. - + Clear planned brewdate Wis geplande brouwdag - + Edit the brewdate start time. Wijzig de brouwdag start tijd. - - + + hh:mm hh:mm - + Edit the brewdate end. Wijzig de brouwdag eind datum. - + Edit the brewdate end time. Wijzig de brouwdag eind tijd. - + Set the brewdate end date. Zet de brouwdag eind datum. - + End time: Eind tijd: - + Start time: Start tijd: - + Show brewlog: Toon brouwlog: - + Confirm brew done: Bevestig brouwdag: - - - + + + Confirm the brew dates and times. Bevestig de brouw datums en tijden. - + Fermenting Vergisten - + Primary fermentation Hoofdvergisting - - - - Edit SG in Plato, Brix or SG - Wijzig SG in Plato, Brix of SG - - - - - Set the date to today - Zet de datum op vandaag - - - Edit the date the primary fermentation was done. - Wijzig de datum dat de hoofdgisting gereed was. + + + Edit SG in Plato, Brix or SG + Wijzig SG in Plato, Brix of SG + + + + + Set the date to today + Zet de datum op vandaag + Edit the date the primary fermentation was done. + Wijzig de datum dat de hoofdgisting gereed was. + + + Secondary fermentation Nagisting - + Tertiary fermentation Lageren - + Alcohol volume: Alcohol vol%: - + Show fermenter unit log: Toon gistkast log: - + Show fermentation log: Toon vergisting log: - + Package Verpakken - + Package date: Verpakken datum: - + Carbonation range: Koolzuur volumes: - + Infusion or Dilution Infusie of verdunnen - + Package volume: Verpakken volume: @@ -4015,7 +4018,7 @@ Verpakken ABV %: - + pH from fermenter: pH vanuit gistvat: @@ -4120,6 +4123,7 @@ + Kettle trub loss: Kookketel trub verlies: @@ -4225,172 +4229,172 @@ Behandeld spoelwater - + Estimated final ABV %: Verwacht finale ABV %: - + Extra dilution or infusion added to this batch. Toegevoegde verdunning of infusie aan deze batch. - - + + The ABV including the infusion. Het ABV inclusief infusie. - + If there is alcohol in the infusion, give the percentage. Als er alcohol in de infusie zit, geef hier het percentage. - + Could be the description of the infusion. Hier kun je de toevoeging beschrijven. - + Estimated package ABV %: Verwacht verpakken ABV %: - + Bottles Flessen - - + + Desired volume CO2: Gewenst volume CO2: - - + + Priming sugar: Carbonatie suiker: - - + + Sugar amount: Suiker gewicht: - - + + Water amount: Water volume: - + Expected pressure in bar: Verwachte druk in bar: - + Bottles ABV %: Flessen ABV %: - + Kegs Fusten - + Kegs ABV %: Fusten ABV %: - + Kegs pressure in bar: Fusten druk in bar: - + Forced carbonation: Geforceerde carbonatie: - + Edit the package date. Wijzig de verpakkings datum. - + Show carbonation log: Toon carbonatie log: - + Tasting Proeven - + Taste date: Proeven datum: - + Taste rate: Beoordeling cijfer: - + Color: Kleur: - + Transparency: Helderheid: - + Head: Schuim: - + Aroma: Geur: - + Taste: Smaak: - + Aftertaste: Nasmaak: - + Mouthfeel: Mondgevoel: - + Notes: Opmerkingen: - + Edit the tasting date. Wijzig de datum van proeven. - + Export Exporteer - + Print Print @@ -5200,7 +5204,7 @@ - + Measured pH: Gemeten pH: @@ -5212,7 +5216,7 @@ - + Measured SG: Gemeten SG: diff -r fbb250c725bb -r adaf43213d10 ui/EditProduct.ui --- a/ui/EditProduct.ui Sat Jan 14 14:14:59 2023 +0100 +++ b/ui/EditProduct.ui Sat Jan 14 15:38:28 2023 +0100 @@ -8104,7 +8104,7 @@ 320 80 28 - 22 + 24 @@ -8137,6 +8137,26 @@ QAbstractSpinBox::NoButtons + + + + 320 + 50 + 28 + 24 + + + + Edit volume + + + ... + + + + :/icons/bms/refractometer.png:/icons/bms/refractometer.png + + @@ -8365,7 +8385,7 @@ - Trub and chiller loss: + Kettle trub loss: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -8448,7 +8468,7 @@ 170 80 - 71 + 81 24 @@ -8530,7 +8550,7 @@ 170 200 - 71 + 81 24 @@ -8564,7 +8584,7 @@ 170 230 - 71 + 81 24 @@ -8598,7 +8618,7 @@ 170 170 - 71 + 81 24 @@ -9045,7 +9065,7 @@ 320 80 28 - 22 + 24 @@ -9113,6 +9133,26 @@ 0.001000000000000 + + + + 320 + 50 + 28 + 24 + + + + Edit volume + + + ... + + + + :/icons/bms/refractometer.png:/icons/bms/refractometer.png + + @@ -9120,7 +9160,7 @@ 270 10 28 - 22 + 24 @@ -9156,10 +9196,10 @@ - 300 + 305 10 28 - 22 + 24 @@ -9230,7 +9270,7 @@ 270 70 28 - 22 + 24 @@ -9626,7 +9666,7 @@ 300 140 28 - 22 + 24 @@ -9637,7 +9677,7 @@ - :/icons/silk/pencil.png:/icons/silk/pencil.png + :/icons/bms/refractometer.png:/icons/bms/refractometer.png @@ -9646,7 +9686,7 @@ 300 170 28 - 22 + 24 @@ -9685,7 +9725,7 @@ 340 170 28 - 22 + 24 @@ -9860,7 +9900,7 @@ 300 50 28 - 22 + 24 @@ -9871,7 +9911,7 @@ - :/icons/silk/pencil.png:/icons/silk/pencil.png + :/icons/bms/refractometer.png:/icons/bms/refractometer.png @@ -9880,7 +9920,7 @@ 300 80 28 - 22 + 24 @@ -9919,7 +9959,7 @@ 340 80 28 - 22 + 24 @@ -10078,7 +10118,7 @@ 290 80 28 - 22 + 24 @@ -10089,7 +10129,7 @@ - :/icons/silk/pencil.png:/icons/silk/pencil.png + :/icons/bms/refractometer.png:/icons/bms/refractometer.png