# HG changeset patch # User Michiel Broek # Date 1651042457 -7200 # Node ID 6cccd340ea8cc52efbc8c18488e7d84e5b6f7c68 # Parent 19156b8b339f12d04eeee09517951369750ddddd Version 0.1.3. Mash name can be edited manual. Added a remark about EBC calculations. Updated dustch translation. Still items in recipe tables are not shown translated, another qt mistery. Extended some number input ranges for large batches. diff -r 19156b8b339f -r 6cccd340ea8c CMakeLists.txt --- a/CMakeLists.txt Mon Apr 25 15:52:21 2022 +0200 +++ b/CMakeLists.txt Wed Apr 27 08:54:17 2022 +0200 @@ -9,7 +9,7 @@ SET( bmsapp_VERSION_MAJOR 0 ) SET( bmsapp_VERSION_MINOR 1 ) -SET( bmsapp_VERSION_PATCH 2 ) +SET( bmsapp_VERSION_PATCH 3 ) # Compile flags diff -r 19156b8b339f -r 6cccd340ea8c bmsapp.desktop --- a/bmsapp.desktop Mon Apr 25 15:52:21 2022 +0200 +++ b/bmsapp.desktop Wed Apr 27 08:54:17 2022 +0200 @@ -1,5 +1,5 @@ [Desktop Entry] -Categories=Qt;KDE;Education;Utility;Engineering; +Categories=Qt;KDE;Utility;Engineering; Exec=bmsapp -d Name=BMSapp GenericName=Brewery Management System diff -r 19156b8b339f -r 6cccd340ea8c src/EditRecipe.cpp --- a/src/EditRecipe.cpp Mon Apr 25 15:52:21 2022 +0200 +++ b/src/EditRecipe.cpp Wed Apr 27 08:54:17 2022 +0200 @@ -695,6 +695,7 @@ ui->mashsTable->setEditTriggers(QAbstractItemView::NoEditTriggers); connect(ui->addMash, SIGNAL(clicked()), this, SLOT(addMashRow_clicked())); connect(ui->mash_pickEdit, QOverload::of(&QComboBox::currentIndexChanged), this, &EditRecipe::mash_select_changed); + connect(ui->mash_nameEdit, &QLineEdit::textChanged, this, &EditRecipe::mash_name_changed); // All signals from tab "Water" connect(ui->bs_cacl2Edit, QOverload::of(&QDoubleSpinBox::valueChanged), this, &EditRecipe::wb_cacl2_changed); diff -r 19156b8b339f -r 6cccd340ea8c src/EditRecipe.h --- a/src/EditRecipe.h Mon Apr 25 15:52:21 2022 +0200 +++ b/src/EditRecipe.h Wed Apr 27 08:54:17 2022 +0200 @@ -118,6 +118,7 @@ void ramp_time_changed(double val); void infuse_changed(double val); void mash_select_changed(int val); + void mash_name_changed(QString); /* Modified progress bars */ void ferment_perc_mash_valueChanged(int value); diff -r 19156b8b339f -r 6cccd340ea8c src/EditRecipeTab6.cpp --- a/src/EditRecipeTab6.cpp Mon Apr 25 15:52:21 2022 +0200 +++ b/src/EditRecipeTab6.cpp Wed Apr 27 08:54:17 2022 +0200 @@ -531,6 +531,8 @@ stepivolEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); stepivolEdit->setVisible(recipe->mashs.at(recipe->mashs_row).step_type == 0); stepivolEdit->setDecimals(1); + stepivolEdit->setAccelerated(true); + stepivolEdit->setMaximum(100000.0); stepivolEdit->setSingleStep(0.5); stepivolEdit->setValue(recipe->mashs.at(recipe->mashs_row).step_infuse_amount); @@ -590,6 +592,14 @@ } +void EditRecipe::mash_name_changed(QString name) +{ + qDebug() << "mash_name_changed" << name; + recipe->mash_name = name; + is_changed(); +} + + void EditRecipe::mash_select_changed(int val) { QSqlQuery query; @@ -597,6 +607,7 @@ qDebug() << "mash_select_changed" << val; + const QSignalBlocker blocker1(ui->mash_nameEdit); query.prepare("SELECT name,steps FROM profile_mash ORDER BY name"); query.exec(); query.first(); diff -r 19156b8b339f -r 6cccd340ea8c src/Utils.cpp --- a/src/Utils.cpp Mon Apr 25 15:52:21 2022 +0200 +++ b/src/Utils.cpp Wed Apr 27 08:54:17 2022 +0200 @@ -43,6 +43,9 @@ * The only alternative I have seen is "srm = (ebc * 0.375 + 0.46)", and that has * almost the same results as the formulas used in this program. * These formulas come from the Dutch 'brouwhulp' program written by Adrie Otten. + * + * Seems that the 'brouwhulp' version use the old EBC conversion (see below) and + * not the new 1.97 formula. Make it selectable? */ double Utils::ebc_to_srm(double ebc) { diff -r 19156b8b339f -r 6cccd340ea8c translations/bmsapp_en.ts --- a/translations/bmsapp_en.ts Mon Apr 25 15:52:21 2022 +0200 +++ b/translations/bmsapp_en.ts Wed Apr 27 08:54:17 2022 +0200 @@ -470,148 +470,148 @@ - + Grain - - Sugar - - - - Extract + Sugar - Dry extract + Extract + Dry extract + + + + Adjunct - - Base - - - - Roast + Base - Crystal + Roast - Kilned + Crystal - Sour Malt + Kilned - Special + Sour Malt + Special + + + + No malt - - Mash - - - - Boil + Mash - Fermentation + Boil - Lagering + Fermentation - Bottle + Lagering + Bottle + + + + Kegs - + BMSapp - Add new fermentable - + BMSapp - Edit fermentable %1 - - - + + + Edit Fermentable - + Name empty or too short. - + Origin empty or too short. - + Supplier empty or too short. - - - Database error - - - + Database error + + + + + MySQL error: %1 %2 %3 - + Fermentable changed - + This fermentable has been modified. Save changes? @@ -1114,8 +1114,8 @@ - - + + Delete @@ -1156,95 +1156,95 @@ - - - - Beer - - - + Beer + + + + + + Fridge - + Step name - + Start °C - + End °C - + Sensor - + Ramp time - + Rest time - + Button - + BMSapp - Add new fermentation profile - + BMSapp - Edit fermentation profile %1 - + Edit Ferment - + Name empty or too short. - - - Database error - - - + Database error + + + + + MySQL error: %1 %2 %3 - + Fermentation changed - + This fermentation profile has been modified. Save changes? @@ -1756,6 +1756,1337 @@ + EditRecipe + + + Dialog + + + + + Quit + + + + + Save + + + + + + + + + + + + + + + Delete + + + + + Generic + + + + + Recipe name: + + + + + Recipe notes: + + + + + Read only: + + + + + Yes + + + + + Brew type: + + + + + Efficiency: + + + + + Boil time: + + + + + Batch size: + + + + + Boil size: + + + + + + + + + % + + + + + min + + + + + + L + + + + + Overview + + + + + + Alcohol Volume: + + + + + + Estimated FG: + + + + + + + Estimated OG: + + + + + Color method: + + + + + Carbonation: + + + + + + Color EBC: + + + + + IBU method: + + + + + Energy kcal/l: + + + + + + + Bitterness IBU: + + + + + Beerstyle + + + + + Style guide: + + + + + Style group: + + + + + Style name: + + + + + Select style: + + + + + Style type: + + + + + Category: + + + + + Category number: + + + + + Fermentables + + + + + Mash tun %: + + + + + Sugars %: + + + + + Cara/crystal %: + + + + + Lintner: + + + + + %v lintner + + + + + + + + + %v% + + + + + + + + + Add + + + + + Hops + + + + + Hop taste: + + + + + Hop aroma: + + + + + Miscs + + + + + Yeasts + + + + + Appearant Attenuation: + + + + + Liquid yeast advice + + + + + Pitchrate million cells/ml/°P: + + + + + Initial billion cells: + + + + + Target billion cells: + + + + + Starter volume L: + + + + + A very rough starter volume estimate. + + + + + Dry yeast advice + + + + + Low grams/hl: + + + + + High grams/hl: + + + + + + at + + + + + Pitch grams: + + + + + Pitch grams/hl: + + + + + + + + Mash + + + + + Mash name: + + + + + Mash schedule: + + + + + Mash time: + + + + + Water + + + + + Water overview + + + + + Ca + + + + + Mg + + + + + HCO3 + + + + + CaCO3 + + + + + Na + + + + + Cl + + + + + SO4 + + + + + pH + + + + + + Volume + + + + + Water profile + + + + + The main brewing water + + + + + Choose water + + + + + Optional dilution water + + + + + Choose dilution + + + + + If needed, choose a target water profile. + + + + + Mixed water + + + + + Treated water + + + + + Water agents + + + + + + Calcium Chloride + + + + + CaCl2: + + + + + + Gypsym + + + + + CaSO4: + + + + + + Epsom + + + + + MgSO4: + + + + + + Table salt + + + + + NaCl: + + + + + + Magnesium Chloride + + + + + MgCl2: + + + + + + Baking soda + + + + + NaHCO3: + + + + + + Chalk undissolved + + + + + CaCO3: + + + + + + + + + + + gr + + + + + Mash water + + + + + + Desired pH: + + + + + Auto calculate: + + + + + Acid to use: + + + + + + % + + + + + + ml + + + + + Sparge water + + + + + Sparge water supply: + + + + + Sparge temperature: + + + + + Water source: + + + + + Acid type: + + + + + Acid strength: + + + + + Acid needed: + + + + + Bitterness index: + + + + + + N/A + + + + + Preffered SO4:Cl ratio: + + + + + Current SO4:Cl ratio: + + + + + Export + + + + + Print + + + + + Extract + + + + + Partial Mash + + + + + All Grain + + + + + Source 1 + + + + + Source 2 + + + + + Mixed + + + + + + + Database error + + + + + MySQL error: record %1 not found + + + + + BMSapp - Add new recipe + + + + + BMSapp - Edit recipe %1 + + + + + + Edit Recipe + + + + + Name empty or too short. + + + + + No beerstyle selected. + + + + + + MySQL error: %1 +%2 +%3 + + + + + Delete recipe + + + + + Recipe changed + + + + + The recipe has been modified. Save changes? + + + + + Supplier + + + + + Fermentable + + + + + EBC + + + + + + + + + Type + + + + + Graintype + + + + + When + + + + + Yield + + + + + + + + Amount + + + + + Procent + + + + + 100% + + + + + + + + + + + + + + Edit + + + + + Delete fermentable + + + + + + + + + + Delete %1 + + + + + + Current ingredient: + + + + + Supplier: + + + + + Amount in kg: + + + + + Percentage in batch: + + + + + Auto fill to 100%: + + + + + + + Use at: + + + + + + Select ingredient: + + + + + + + + In stock: + + + + + Max in batch: + + + + + + + Boil + + + + + Fermentation + + + + + Lagering + + + + + + Bottle + + + + + Kegs + + + + + Origin + + + + + Hop + + + + + Form + + + + + Alpha + + + + + + Use at + + + + + + Time + + + + + IBU + + + + + + Very low + + + + + + Low + + + + + + Moderate + + + + + + High + + + + + + Very high + + + + + Delete hop + + + + + + + + + Time in minutes: + + + + + + + + + Time in days: + + + + + Current hop: + + + + + Origin: + + + + + + + + + Amount in gr: + + + + + Select hop: + + + + + First wort + + + + + Aroma + + + + + Whirlpool + + + + + Dry hop + + + + + Ingredient + + + + + Delete misc + + + + + + + + Amount in ml: + + + + + Starter + + + + + + Primary + + + + + + Secondary + + + + + Bottling + + + + + Yeast + + + + + Laboratory + + + + + Code + + + + + Use for + + + + + Min. °C + + + + + Max. °C + + + + + Tol. % + + + + + Attn. % + + + + + Delete yeast + + + + + + Total packs: + + + + + Yeast name: + + + + + + Laboratory: + + + + + Select yeast: + + + + + Tertiary + + + + + Step name + + + + + Start + + + + + End + + + + + Rest + + + + + Ramp + + + + + Inf/dec + + + + + W/G ratio + + + + + Delete mash step + + + + + Step name: + + + + + Step type: + + + + + Infusion + + + + + Temperature + + + + + Decoction + + + + + Step start temp: + + + + + Step end temp: + + + + + Step rest time: + + + + + Step ramp time: + + + + + Infusion volume: + + + + + Infusion Temperature: + + + + + Very malty and sweet + + + + + Malty, sweet + + + + + + Balanced + + + + + Hoppy, bitter + + + + + Very hoppy, very bitter + + + + + Too malty + + + + + Very malty + + + + + Malty + + + + + Little bitter + + + + + Bitter + + + + + Very bitter + + + + + Too bitter + + + + + + + Save File + + + + + Files (*.xml) + + + + + No XML file selected. + + + + + XML export ready + + + + EditSupplier @@ -2483,75 +3814,75 @@ InventoryEquipments - + Quit - + Export - + Import - + New - + Name - + Boil volume - + Batch size - + Notes - - + + Edit - + Total items: %1 - - - + + + Save File - + Files (*.xml) - + No XML file selected. - + XML export ready @@ -2559,151 +3890,95 @@ InventoryFermentables - + Quit - + Export - + Import - + New - - Origin - - - - - Supplier - - - - - Name - - - - - Type - - - - - - Grain - - - - - Color - - - - - Yield - - - - - Stock - - - - - - Edit - - - - Sugar + Origin + + + + + Supplier + + + + + Name + + + + + Type - Extract + Grain - Dry extract + Color + + + + + Yield + + + + + Stock - Adjunct - - - - - Base - - - - - Roast - - - - - Crystal - - - - - Kilned - - - - - Sour Malt - - - - - Special - - - - - No malt - - - - + + Edit + + + + Total items: %1 - - - + + + Save File - + Files (*.xml) - + No XML file selected. - + XML export ready @@ -2782,74 +4057,34 @@ - + Edit - - Bittering - - - - - Aroma - - - - - Both - - - - - Pellet - - - - - Plug - - - - - Leaf - - - - - Leaf Wet - - - - - Cryo - - - - + Total items: %1 + + + + Save File + + + + + Files (*.xml) + + + - - - Save File - - - - - Files (*.xml) - - - - No XML file selected. - + XML export ready @@ -2903,99 +4138,34 @@ - + Edit - - Spice - - - - - Herb - - - - - Flavor - - - - - Fining - - - - - Water agent - - - - - Yeast nutrient - - - - - Other - - - - - Starter - - - - - Mash - - - - - Boil - - - - - Primary - - - - - Secondary - - - - - Bottling - - - - + Total items: %1 + + + + Save File + + + + + Files (*.xml) + + + - - - Save File - - - - - Files (*.xml) - - - - No XML file selected. - + XML export ready @@ -3003,48 +4173,48 @@ InventorySuppliers - + Quit - + New - + Name - + Address - + City - + Country - + Phone - - + + Edit - + Total items: %1 @@ -3052,75 +4222,75 @@ InventoryWaters - + Quit - + Export - + Import - + New - + Name - + Notes - + Unlimited - + Stock - - + + Edit - + Total items: %1 - - - + + + Save File - + Files (*.xml) - + No XML file selected. - + XML export ready @@ -3199,109 +4369,34 @@ - + Edit - - Lager - - - - - Ale - - - - - Wheat - - - - - Wine - - - - - Champagne - - - - - Brett - - - - - Kveik - - - - - Hybrid - - - - - Liquid - - - - - Dry - - - - - Slant - - - - - Culture - - - - - Frozen - - - - - Bottle - - - - - Dried - - - - + Total items: %1 + + + + Save File + + + + + Files (*.xml) + + + - - - Save File - - - - - Files (*.xml) - - - - No XML file selected. - + XML export ready @@ -3453,292 +4548,362 @@ PrinterDialog - - Grain - - - - - Sugar - - - - - Extract - - - - - Dry extract - - - - - Adjunct - - - - - Pellet - - - - - Plug - - - - - Leaf - - - - - Leaf Wet - - - - - Cryo - - - - - Spice - - - - - Herb - - - - - Flavor - - - - - Fining - - - - - Water agent - - - - - Yeast nutrient - - - - - Other - - - - + pkg - + gr - + ml - - Lager - - - - - Ale - - - - - Wheat - - - - - Wine - - - - - Champagne - - - - - Brett - - - - - Kveik - - - - - Hybrid - - - - - Liquid - - - - - Dry - - - - - Slant - - - - - Culture - - - - - Frozen - - - - - Bottle - - - - - Dried - - - - - - - Type - - - - - Supplier - - - - - Fermentable - - - - - - - - - Stock - - - - - - - - Price/Kg - - - - - - + + + + + + + Type + + + + + Supplier + + + + + + Fermentable + + + + + + + + + Stock + + + + + + + + Price/Kg + + + + + + + Value - - - - + + + + Total - + Country - + Hop name - - + + Form - + Laboratory - + Product - - + + + Yeast - + Ingredient - + Description - + Date - - Inventory + + Recipe overview + + + + + Brew type + + + + + Efficiency + + + + + Boil time + + + + + Batch size + + + + + Start SG + End SG + + + + + Estimated Alcohol + + + + + Estimated CO2 vol + + + + + Color ( + + + + + IBU ( + + + + + Percent + + + + + Yield + + + + + + + + Use at + + + + + + + + Amount + + + + + + + + Cost + + + + + Hop + + + + + Alpha + + + + + IBU + + + + + Attn + + + + + Misc ingredient + + + + + Mash step + + + + + Step type + + + + + Start °C + + + + + End °C + + + + + Time + + + + + Ramp + + + + + L/kg + + + + + Inf/dec L. + + + + + Inf/dec °C + + + + + Water source + + + + + Volume + + + + + Ca + + + + + Mg + + + + + CaCO3 + + + + + Na + + + + + Cl + + + + + SO4 + + + + + pH + + + + + Mixed water + + + + + Treated water + + + + + Recipe notes + + + + + Inventory + + + + Yeastbank - + Date and time + + + Beer style + + ProfileFerments @@ -3807,38 +4972,38 @@ ProfileMashs - + Quit - + New - + Name - + Notes - + Steps - - + + Edit - + Total items: %1 @@ -3846,68 +5011,68 @@ ProfileStyles - + Quit - + New - + Guide - + Gr - + Name - + OG + + FG + + + - FG - - - - IBU - + EBC - + Co2 - + ABV - - + + Edit - + Total items: %1 @@ -3915,68 +5080,68 @@ ProfileWaters - + Quit - + New - + Name - + Notes - + Ca - + Mg - + Na - + CaCO3 - + Cl - + SO4 - + pH - - + + Edit - + Total items: %1 @@ -3984,12 +5149,12 @@ QApplication - + Application terminates - + The application encountered a fatal error. Error message: %1 @@ -3999,167 +5164,510 @@ QObject - + 1 hour - - + + hours - - 1 day - - - - - - 1 day, - - - - - - hour - - - - days + 1 day + 1 day, + + + + + + hour + + + + + days + + + + + days, + + + + Extract + + + + + Partial Mash + + + + + All Grain + + + + + + Lager + + + + + + Ale + + + + + Mead + + + + + + Wheat + + + + + Mixed + + + + + Cider + + + + + Grain + + + + + Sugar + + + + + Dry extract + + + + + Adjunct + + + + + Base + + + + + Roast + + + + + Crystal + + + + + Kilned + + + + + Sour Malt + + + + + Special + + + + + No malt + + + + + + + Mash + + + + + + + Boil + + + + + Fermentation + + + + + Lagering + + + + + + + Bottle + + + + + Kegs + + + + + Bittering + + + + + + Aroma + + + + + Both + + + + + Pellet + + + + + Plug + + + + + Leaf + + + + + Leaf wet + + + + + Cryo + + + + + First wort + + + + + Whirlpool + + + + + Dry hop + + + + + Spice + + + + + Herb + + + + + Flavor + + + + + Fining + + + + + Water agent + + + + + Yeast nutrient + + + + + Other + + + + + Starter + + + + + + Primary + + + + + + Secondary + + + + + Bottling + + + + + Wine + + + + + Champagne + + + + + Brett + + + + + Kveik + + + + + Hybrid + + + + + Liquid + + + + + Dry + + + + + Slant + + + + + Culture + + + + + Frozen + + + + + Dried + + + + + Tertiary + + + + + Stirred + + + + + Shaken + + + + + Simple + + + + + Infusion + + + + + Temperature + + + + + Decoction + + RecipesTree - + Brew volume: - + Brewhouse efficiency: - + Boil volume: - + Boil time: - + Original gravity: - + Final gravity: - + Alcohol by Volume: - + CO2 Volume: - + Color EBC: - + Color method: - + Bitterness IBU: - + Bitterness method: - + Remarks: - - + + L - - + + % - + min - + Quit - + New - + Open - + Guide - + Group - + Style - + Recipe - + Total items: %1 diff -r 19156b8b339f -r 6cccd340ea8c translations/bmsapp_nl.ts --- a/translations/bmsapp_nl.ts Mon Apr 25 15:52:21 2022 +0200 +++ b/translations/bmsapp_nl.ts Wed Apr 27 08:54:17 2022 +0200 @@ -491,136 +491,136 @@ Verwijder - + Grain Mout - - Sugar - Suiker - - - Extract - Vloeibaar extract + Sugar + Suiker - Dry extract - Droog extract + Extract + Vloeibaar extract + Dry extract + Droog extract + + + Adjunct Ongemout graan - - Base - Basismout - - - Roast - Geroosterde mout + Base + Basismout - Crystal - Cara- of crystalmout + Roast + Geroosterde mout - Kilned - Geëeste mout + Crystal + Cara- of crystalmout - Sour Malt - Zuurmout + Kilned + Geëeste mout - Special - Speciale mout + Sour Malt + Zuurmout + Special + Speciale mout + + + No malt Geen mout - - Mash - Maischen - - - Boil - Koken + Mash + Maischen - Fermentation - Hoofdvergisting + Boil + Koken - Lagering - Nagisting/lagering + Fermentation + Hoofdvergisting - Bottle - Bottelen + Lagering + Nagisting/lagering + Bottle + Bottelen + + + Kegs Fusten - + BMSapp - Add new fermentable BMSapp - Nieuw vergistbaar ingredient - + BMSapp - Edit fermentable %1 BMSapp - Wijzig vergistbaar ingredient %1 - - - + + + Edit Fermentable Wijzig vergistbaar ingredient - + Name empty or too short. De naam is leeg of te kort. - + Origin empty or too short. Herkomst leeg of te kort. - + Supplier empty or too short. Leverancier leeg of te kort. - - - Database error - Database fout - - + Database error + Database fout + + + + MySQL error: %1 %2 %3 @@ -629,12 +629,12 @@ %3 - + Fermentable changed Vergistbaar ingredient gewijzigd - + This fermentable has been modified. Save changes? Dit vergistbaar ingredient is gewijzigd. Wijzigingen opslaan? @@ -1159,8 +1159,8 @@ - - + + Delete Verwijder @@ -1201,83 +1201,83 @@ Sensor: - - - - Beer - Bier - - + Beer + Bier + + + + + Fridge Koelkast - + Step name Stap naam - + Start °C Start °C - + End °C Eind °C - + Sensor Sensor - + Ramp time Verwarm tijd - + Rest time Rust tijd - + Button Toets - + BMSapp - Add new fermentation profile BMSapp - Nieuw vergisting profiel - + BMSapp - Edit fermentation profile %1 BMSadd - Wijzig vergisting profiel %1 - + Edit Ferment Wijzig vergisting - + Name empty or too short. De naam is leeg of te kort. - - - Database error - Database fout - - + Database error + Database fout + + + + MySQL error: %1 %2 %3 @@ -1286,12 +1286,12 @@ %3 - + Fermentation changed Vergisting gewijzigd - + This fermentation profile has been modified. Save changes? Dit vergisting profiel is gewijzigd. Wijzigingen opslaan? @@ -1835,6 +1835,1339 @@ + EditRecipe + + + Dialog + Dialog + + + + Quit + Terug + + + + Save + Bewaar + + + + + + + + + + + + + + Delete + Verwijder + + + + Generic + Algemeen + + + + Recipe name: + Recept naam: + + + + Recipe notes: + Opmerkingen: + + + + Read only: + Alleen lezen: + + + + Yes + Ja + + + + Brew type: + Brouw type: + + + + Efficiency: + Brouwzaal rendement: + + + + Boil time: + Kooktijd: + + + + Batch size: + Brouw volume: + + + + Boil size: + Kook volume: + + + + + + + + % + % + + + + min + min + + + + + L + L + + + + Overview + Overzicht + + + + + Alcohol Volume: + Alcohol vol%: + + + + + Estimated FG: + Verwacht eind SG: + + + + + + Estimated OG: + Verwacht start SG: + + + + Color method: + Kleur berekening: + + + + Carbonation: + Koolzuur volumes: + + + + + Color EBC: + Kleur EBC: + + + + IBU method: + IBU berekening: + + + + Energy kcal/l: + Energie inhoud kcal/l: + + + + + + Bitterness IBU: + Bitterheid IBU: + + + + Beerstyle + Bierstijl + + + + Style guide: + Stijlgids: + + + + Style group: + Stijl groep: + + + + Style name: + Stijl naam: + + + + Select style: + Kies bierstijl: + + + + Style type: + Stijl type: + + + + Category: + Categorie: + + + + Category number: + Categorie nummer: + + + + Fermentables + Vergistbaar + + + + Mash tun %: + Percentage moutstort: + + + + Sugars %: + Percentage suikers: + + + + Cara/crystal %: + Percentage cara: + + + + Lintner: + Lintner totaal: + + + + %v lintner + + + + + + + + + %v% + + + + + + + + + Add + Nieuw + + + + Hops + Hoppen + + + + Hop taste: + Hop smaak: + + + + Hop aroma: + Hop aroma: + + + + Miscs + Diversen + + + + Yeasts + Gisten + + + + Appearant Attenuation: + Schijnbare vergisting: + + + + Liquid yeast advice + Vloeibaar gist advies + + + + Pitchrate million cells/ml/°P: + Ent miljard cellen/ml/°P: + + + + Initial billion cells: + Start miljard cellen: + + + + Target billion cells: + Doel miljard cellen: + + + + Starter volume L: + Starter volume L: + + + + A very rough starter volume estimate. + Een zeer ruw geschat starter volume. + + + + Dry yeast advice + Droge gist advies + + + + Low grams/hl: + Laag grammen/hl: + + + + High grams/hl: + Hoog grammen/hl: + + + + + at + bij + + + + Pitch grams: + Ent gram: + + + + Pitch grams/hl: + Ent gram/hl: + + + + + + + Mash + Maischen + + + + Mash name: + Maisch schema: + + + + Mash schedule: + Kies maisch schema: + + + + Mash time: + Maisch tijd: + + + + Water + Water + + + + Water overview + Water overzicht + + + + Ca + Ca + + + + Mg + Mg + + + + HCO3 + + + + + CaCO3 + CaCO3 + + + + Na + Na + + + + Cl + Cl + + + + SO4 + SO4 + + + + pH + pH + + + + + Volume + Volume + + + + Water profile + Water profiel + + + + The main brewing water + Het hoofd brouwwater + + + + Choose water + Kies water + + + + Optional dilution water + Optioneel meng water + + + + Choose dilution + Kies mengwater + + + + If needed, choose a target water profile. + Indien nodig, kies een doel water profiel. + + + + Mixed water + Gemengd water + + + + Treated water + Behandeld water + + + + Water agents + Brouwzouten + + + + + Calcium Chloride + Calcium Chloride + + + + CaCl2: + CaCl2: + + + + + Gypsym + Gips + + + + CaSO4: + CaSO4: + + + + + Epsom + Magmesium sulfaat + + + + MgSO4: + MgSO4: + + + + + Table salt + Keukenzout + + + + NaCl: + NaCl: + + + + + Magnesium Chloride + Magnesium Chloride + + + + MgCl2: + MgCl2: + + + + + Baking soda + Baksoda + + + + NaHCO3: + NaHCO3: + + + + + Chalk undissolved + Ongebluste kalk + + + + CaCO3: + CaCO3: + + + + + + + + + + gr + gr + + + + Mash water + Maischwater + + + + + Desired pH: + Gewenste pH: + + + + Auto calculate: + Automatisch rekenen: + + + + Acid to use: + Aanzuren met: + + + + + % + % + + + + + ml + ml + + + + Sparge water + Spoelwater + + + + Sparge water supply: + Spoelwater voorraad: + + + + Sparge temperature: + Spoelwater temperatuur: + + + + Water source: + Water bron: + + + + Acid type: + Aanzuren met: + + + + Acid strength: + Sterkte %: + + + + Acid needed: + Benodigd: + + + + Bitterness index: + Bitterheidsindex: + + + + + N/A + N.v.t + + + + Preffered SO4:Cl ratio: + Gewenste SO4:Cl verh: + + + + Current SO4:Cl ratio: + Huidige SO4:Cl verhouding: + + + + Export + Exporteer + + + + Print + Print + + + + Extract + Extract + + + + Partial Mash + Deelmaisch + + + + All Grain + Mout + + + + Source 1 + Bron 1 + + + + Source 2 + Bron 2 + + + + Mixed + Gemengd + + + + + + Database error + Database fout + + + + MySQL error: record %1 not found + MySQL fout: record %1 niet gevonden + + + + BMSapp - Add new recipe + BMSapp - Nieuw recept + + + + BMSapp - Edit recipe %1 + BMSapp - Wijzig recept %1 + + + + + Edit Recipe + Wijzig recept + + + + Name empty or too short. + De naam is leeg of te kort. + + + + No beerstyle selected. + Geen bierstijl gekozen. + + + + + MySQL error: %1 +%2 +%3 + MySQL fout: %1 +%2 +%3 + + + + Delete recipe + Verwijder recept + + + + Recipe changed + Recept gewijzigd + + + + The recipe has been modified. Save changes? + Het recept is gewijzigd. Wijzigingen opslaan? + + + + Supplier + Producent + + + + Fermentable + Vergistbaar ingredient + + + + EBC + EBC + + + + + + + + Type + Soort + + + + Graintype + Graan type + + + + When + Moment + + + + Yield + Opbrengst + + + + + + + Amount + Hoeveel + + + + Procent + Procent + + + + 100% + 100% + + + + + + + + + + + + + Edit + Wijzig + + + + Delete fermentable + Verwijder vergistbaar ingredient + + + + + + + + + Delete %1 + Verwijder %1 + + + + + Current ingredient: + Huidig ingredient: + + + + Supplier: + Leverancier: + + + + Amount in kg: + Gewicht in kg: + + + + Percentage in batch: + Percentage in stort: + + + + Auto fill to 100%: + Aanvullen tot 100%: + + + + + + Use at: + Toevoegen bij: + + + + + Select ingredient: + Kies ingredient: + + + + + + + In stock: + In voorraad: + + + + Max in batch: + Max. in stort: + + + + + + Boil + Koken + + + + Fermentation + Hoofdvergisting + + + + Lagering + Nagisting/lagering + + + + + Bottle + Bottelen + + + + Kegs + Fusten + + + + Origin + Herkomst + + + + Hop + Hop + + + + Form + Vorm + + + + Alpha + Alpha + + + + + Use at + Toepassing + + + + + Time + Tijd + + + + IBU + IBU + + + + + Very low + Zeer laag + + + + + Low + Laag + + + + + Moderate + Gemiddeld + + + + + High + Hoog + + + + + Very high + Zeer hoog + + + + Delete hop + Verwijder hop + + + + + + + + Time in minutes: + Tijd in minuten: + + + + + + + + Time in days: + Tijd in dagen: + + + + Current hop: + Huidige hop: + + + + Origin: + Herkomst: + + + + + + + + Amount in gr: + Gewicht in gr: + + + + Select hop: + Kies hop: + + + + First wort + Maischhop + + + + Aroma + Aromahop + + + + Whirlpool + Whirlpool hop + + + + Dry hop + Koudhop + + + + Ingredient + Ingredient + + + + Delete misc + Verwijder divers ingredient + + + + + + + Amount in ml: + Hoeveelheid in ml: + + + + Starter + Starter + + + + + Primary + Hoofdgisting + + + + + Secondary + Nagisting/lagering + + + + Bottling + Bottelen + + + + Yeast + Gist + + + + Laboratory + Laboratorium + + + + Code + Product code + + + + Use for + Toepassing + + + + Min. °C + Min. °C + + + + Max. °C + Max. °C + + + + Tol. % + Tol. % + + + + Attn. % + SVG % + + + + Delete yeast + Verwijder gist + + + + + Total packs: + Aantal pakken: + + + + Yeast name: + Gist naam: + + + + + Laboratory: + Laboratorium: + + + + Select yeast: + Kies gist: + + + + Tertiary + Lageren + + + + Step name + Stap naam + + + + Start + Start + + + + End + Eind + + + + Rest + Rust + + + + Ramp + Verwarm + + + + Inf/dec + Inf/dec + + + + W/G ratio + L/Kg + + + + Delete mash step + Verwijder maisch stap + + + + Step name: + Stap naam: + + + + Step type: + Stap type: + + + + Infusion + Infusie + + + + Temperature + Verwarmen + + + + Decoction + Decoctie + + + + Step start temp: + Start temperatuur: + + + + Step end temp: + Eind temperatuur: + + + + Step rest time: + Rust tijd: + + + + Step ramp time: + Verwarm tijd: + + + + Infusion volume: + Infusie volume: + + + + Infusion Temperature: + Infusie temperatuur: + + + + Very malty and sweet + Zeer moutig en zoet + + + + Malty, sweet + Moutig, zoet + + + + + Balanced + Gebalanceerd + + + + Hoppy, bitter + Hoppig, bitter + + + + Very hoppy, very bitter + Erg hoppig, erg bitter + + + + Too malty + Te moutig + + + + Very malty + Erg moutig + + + + Malty + Moutig + + + + Little bitter + Iets bitter + + + + Bitter + Bitter + + + + Very bitter + Erg bitter + + + + Too bitter + Veel te bitter + + + + + + Save File + Bestand opslaan + + + + Files (*.xml) + Bestanden (*.xml) + + + + No XML file selected. + Geen XML bestand gekozen. + + + + XML export ready + XML uitvoer gereed + + + EditSupplier @@ -2586,75 +3919,75 @@ InventoryEquipments - + Quit Terug - + Export Exporteer - + Import Importeer - + New Nieuw - + Name Naam - + Boil volume Kook volume - + Batch size Batch volume - + Notes Opmerkingen - - + + Edit Wijzig - + Total items: %1 Totaal items: %1 - - - + + + Save File Bestand opslaan - + Files (*.xml) Bestanden (*.xml) - + No XML file selected. Geen XML bestand gekozen. - + XML export ready XML uitvoer gereed @@ -2662,151 +3995,139 @@ InventoryFermentables - + Quit Terug - + Export Exporteer - + Import Importeer - + New Nieuw - + Origin Herkomst - + Supplier Producent - + Name Naam - + Type Soort - Grain Mout - + Color Kleur - - Yield - Opbrengst - - - - Stock - Voorraad - - - - - Edit - Wijzig - - - Sugar - Suiker + Yield + Opbrengst + + + + Stock + Voorraad + + Edit + Wijzig + + + Sugar + Suiker + + Extract - Vloeibaar extract - - - + Vloeibaar extract + + Dry extract - Droog extract - - - + Droog extract + + Adjunct - Ongemout graan - - - + Ongemout graan + + Base - Basismout - - - + Basismout + + Roast - Geroosterde mout - - - + Geroosterde mout + + Crystal - Cara/crystal mout - - - + Cara/crystal mout + + Kilned - Geëeste mout - - - + Geëeste mout + + Sour Malt - Zuurmout - - - + Zuurmout + + Special - Speciale mout - - - + Speciale mout + + No malt - Geen mout - - - + Geen mout + + + Total items: %1 Totaal items: %1 - - - + + + Save File Bestand opslaan - + Files (*.xml) Files (*.xml) - + No XML file selected. Geen XML bestand gekozen. - + XML export ready XML uitvoer gereed @@ -2885,74 +4206,66 @@ - + Edit Wijzig - Bittering - Bitterhop - - - + Bitterhop + + Aroma - Aromahop - - - + Aromahop + + Both - Beide - - - + Beide + + Pellet - Pellets - - - + Pellets + + Plug - Plugs - - - + Plugs + + Leaf - Bloemen - - - + Bloemen + + Leaf Wet - Nat, vers - - - + Nat, vers + + Cryo - Cryo hop - - - + Cryo hop + + + Total items: %1 Totaal items: %1 + + + + Save File + Bestand opslaan + + + + Files (*.xml) + Bestanden (*.xml) + + - - - Save File - Bestand opslaan - - - - Files (*.xml) - Bestanden (*.xml) - - - No XML file selected. Geen XML bestand gekozen. - + XML export ready XML uitvoer gereed @@ -3006,99 +4319,86 @@ - + Edit Wijzig - Spice - Specerij - - - + Specerij + + Herb - Kruid - - - + Kruid + + Flavor - Smaakstof - - - + Smaakstof + + Fining - Klaringsmiddel - - - + Klaringsmiddel + + Water agent - Brouwzout - - - + Brouwzout + + Yeast nutrient - Gistvoeding - - - + Gistvoeding + + Other - Anders - - - + Anders + + Starter - Starter - - - + Starter + + Mash - Maischen - - - + Maischen + + Boil - Koken - - - + Koken + + Primary - Hoofdgisting - - - + Hoofdgisting + + Secondary - Nagisting/lagering - - - + Nagisting/lagering + + Bottling - Bottelen - - - + Bottelen + + + Total items: %1 Totaal items: %1 + + + + Save File + Bestand opslaan + + + + Files (*.xml) + Bestanden (*.xml) + + - - - Save File - Bestand opslaan - - - - Files (*.xml) - Bestanden (*.xml) - - - No XML file selected. Geen XML bestand gekozen. - + XML export ready XML uitvoer gereed @@ -3106,48 +4406,48 @@ InventorySuppliers - + Quit Terug - + New Nieuw - + Name Naam - + Address Adres - + City Woonplaats - + Country Land - + Phone Telefoon - - + + Edit Wijzig - + Total items: %1 Totaal items: %1 @@ -3155,75 +4455,75 @@ InventoryWaters - + Quit Terug - + Export Exporteer - + Import Importeer - + New Nieuw - + Name Naam - + Notes Opmerkingen - + Unlimited Onbeperkt - + Stock Voorraad - - + + Edit Wijzig - + Total items: %1 Totaal items: %1 - - - + + + Save File Bestand opslaan - + Files (*.xml) Bestanden (*.xml) - + No XML file selected. Geen XML bestand gekozen. - + XML export ready XML uitvoer gereed @@ -3302,109 +4602,94 @@ - + Edit Wijzig - Lager - Ondergist - - - + Ondergist + + Ale - Bovengist - - - + Bovengist + + Wheat - Tarwegist - - - + Tarwegist + + Wine - Wijngist - - - + Wijngist + + Champagne - Champagnegist - - - + Champagnegist + + Brett - Brett - - - + Brett + + Kveik - Kveik - - - + Kveik + + Hybrid - Hybride - - - + Hybride + + Liquid - Vloeibaar - - - + Vloeibaar + + Dry - Droog - - - + Droog + + Slant - Schuine buis - - - + Schuine buis + + Culture - Slurry - - - + Slurry + + Frozen - Ingevroren - - - + Ingevroren + + Bottle - Depot - - - + Depot + + Dried - Gedroogd - - - + Gedroogd + + + Total items: %1 Totaal items: %1 + + + + Save File + Bestand opslaan + + + + Files (*.xml) + Bestanden (*.xml) + + - - - Save File - Bestand opslaan - - - - Files (*.xml) - Bestanden (*.xml) - - - No XML file selected. Geen XML bestand gekozen. - + XML export ready XML uitvoer gereed @@ -3556,292 +4841,490 @@ PrinterDialog - Grain - Mout - - - + Mout + + Sugar - Suiker - - - + Suiker + + Extract - Vloeibaar extract - - - + Vloeibaar extract + + Dry extract - Droog extract - - - + Droog extract + + Adjunct - Ongemout graan - - - + Ongemout graan + + Pellet - Pellets - - - + Pellets + + Plug - Plugs - - - + Plugs + + Leaf - Bloemen - - - + Bloemen + + Leaf Wet - Nat, vers - - - + Nat, vers + + Cryo - Cryo hop - - - + Cryo hop + + Spice - Specerij - - - + Specerij + + Herb - Kruid - - - + Kruid + + Flavor - Smaakstof - - - + Smaakstof + + Fining - Klaringsmiddel - - - + Klaringsmiddel + + Water agent - Brouwzout - - - + Brouwzout + + Yeast nutrient - Gistvoeding - - - + Gistvoeding + + Other - Anders - - - + Anders + + + pkg pak - + gr gr - + ml ml - Lager - Ondergist - - - + Ondergist + + Ale - Bovengist - - - + Bovengist + + Wheat - Tarwegist - - - + Tarwegist + + Wine - Wijngist - - - + Wijngist + + Champagne - Champagnegist - - - + Champagnegist + + Brett - Brett - - - + Brett + + Kveik - Kveik - - - + Kveik + + Hybrid - Hybride - - - + Hybride + + Liquid - Vloeibaar - - - + Vloeibaar + + Dry - Droog - - - + Droog + + Slant - Schuine buis - - - + Schuine buis + + Culture - Slurry - - - + Slurry + + Frozen - Ingevroren - - - + Ingevroren + + Bottle - Depot - - - + Depot + + Dried - Gedroogd - - - - - - Type - Soort - - - - Supplier - Producent - - - - Fermentable - Vergistbaar ingredient - - - - - - - - Stock - Voorraad - - - - - - - Price/Kg - Prijs/Kg + Gedroogd - - - + + + + + + + Type + Soort + + + + Supplier + Producent + + + + + Fermentable + Vergistbaar ingredient + + + + + + + + Stock + Voorraad + + + + + + + Price/Kg + Prijs/Kg + + + + + + Value Waarde - - - - + + + + Total Totaal - + Country Land - + Hop name Hop naam - - + + Form Vorm - + Laboratory Laboratorium - + Product Product - - + + + Yeast Gist - + Ingredient Ingredient - + Description Omschrijving - + Date Datum - - Inventory - Inventaris + + Recipe overview + Recept overzicht + + + + Brew type + Brouw type + + + + Efficiency + Brouwzaal rendement + + + + Boil time + Kooktijd + + + + Batch size + Brouw volume + + + + Start SG + Begin SG + End SG + Eind SG + + + + Estimated Alcohol + Verwacht alcohol + + + + Estimated CO2 vol + Verwacht volumes CO2 + + + + Color ( + Kleur ( + + + + IBU ( + IBU ( + + + + Percent + Procent + + + + Yield + Opbrengst + + + + + + + Use at + Toepassing + + + + + + + Amount + Hoeveel + + + + + + + Cost + Kosten + + + + Hop + Hop + + + + Alpha + Alpha + + + + IBU + IBU + + + + Attn + SVG + + + + Misc ingredient + Divers ingredient + + + + Mash step + Maisch stap + + + + Step type + Stap type + + + + Start °C + Start °C + + + + End °C + Eind °C + + + + Time + Tijd + + + + Ramp + Verwarm + + + + L/kg + L/kg + + + + Inf/dec L. + Inf/dec L. + + + + Inf/dec °C + Inf/dec °C + + + + Water source + Water bron + + + + Volume + Volume + + + + Ca + Ca + + + + Mg + Mg + + + + CaCO3 + CaCO3 + + + + Na + Na + + + + Cl + Cl + + + + SO4 + SO4 + + + + pH + pH + + + + Mixed water + Gemengd water + + + + Treated water + Behandeld water + + + + Recipe notes + Recept opmerkingen + + + + Inventory + Inventaris + + + Yeastbank Gistbank - + Date and time Datum en tijd + + + Beer style + Bierstijl + ProfileFerments @@ -3910,38 +5393,38 @@ ProfileMashs - + Quit Terug - + New Nieuw - + Name Naam - + Notes Opmerkingen - + Steps Stappen - - + + Edit Wijzig - + Total items: %1 Totaal items: %1 @@ -3949,68 +5432,68 @@ ProfileStyles - + Quit Terug - + New Nieuw - + Guide Gids - + Gr Gr - + Name Naam - + OG OG + + FG + FG + + - FG - FG - - - IBU IBU - + EBC EBC - + Co2 Co2 - + ABV ABV - - + + Edit Wijzig - + Total items: %1 Totaal items: %1 @@ -4018,68 +5501,68 @@ ProfileWaters - + Quit Terug - + New Nieuw - + Name Naam - + Notes Opmerkingen - + Ca Ca - + Mg Mg - + Na Na - + CaCO3 CaCO3 - + Cl Cl - + SO4 SO4 - + pH pH - - + + Edit Wijzig - + Total items: %1 Totaal items: %1 @@ -4087,12 +5570,12 @@ QApplication - + Application terminates Applicatie stopt - + The application encountered a fatal error. Error message: %1 @@ -4104,167 +5587,510 @@ QObject - + 1 hour 1 uur - - + + hours uren - - 1 day - 1 dag - - - - - 1 day, - 1 dag, - - - - - hour - uur - - - days - dagen + 1 day + 1 dag + 1 day, + 1 dag, + + + + + hour + uur + + + + days + dagen + + + + days, dagen, + + + + Extract + Extract + + + + Partial Mash + Deelmaisch + + + + All Grain + Mout + + + + + Lager + Ondergist + + + + + Ale + Bovengist + + + + Mead + Mede + + + + + Wheat + Tarwebier + + + + Mixed + Gemengd + + + + Cider + Cider + + + + Grain + Mout + + + + Sugar + Suiker + + + + Dry extract + Droog extract + + + + Adjunct + Ongemout graan + + + + Base + Basismout + + + + Roast + Geroosterde mout + + + + Crystal + Cara- of crystalmout + + + + Kilned + Geëeste mout + + + + Sour Malt + Zuurmout + + + + Special + Speciale mout + + + + No malt + Geen mout + + + + + + Mash + Maischen + + + + + + Boil + Koken + + + + Fermentation + Hoofdvergisting + + + + Lagering + Nagisting/lagering + + + + + + Bottle + Bottelen + + + + Kegs + Fusten + + + + Bittering + Bitterhop + + + + + Aroma + Aromahop + + + + Both + Beide + + + + Pellet + Pellets + + + + Plug + Plugs + + + + Leaf + Bloemen + + + + Leaf wet + Nat, vers + + + + Cryo + Cryo hop + + + + First wort + Maischhop + + + + Whirlpool + Whirlpool + + + + Dry hop + Koudhop + + + + Spice + Specerij + + + + Herb + Kruid + + + + Flavor + Smaakstof + + + + Fining + Klaringsmiddel + + + + Water agent + Brouwzout + + + + Yeast nutrient + Gistvoeding + + + + Other + Anders + + + + Starter + Starter + + + + + Primary + Hoofdgisting + + + + + Secondary + Nagisting/lagering + + + + Bottling + Bottelen + + + + Wine + Wijngist + + + + Champagne + Champagnegist + + + + Brett + Brett + + + + Kveik + Kveik + + + + Hybrid + Hybride + + + + Liquid + Vloeibaar + + + + Dry + Droog + + + + Slant + Schuine buis + + + + Culture + Slurry + + + + Frozen + Ingevroren + + + + Dried + Gedroogd + + + + Tertiary + Nagisten + + + + Stirred + Geroerd + + + + Shaken + Geschud + + + + Simple + Simpel + + + + Infusion + Infusie + + + + Temperature + Verwarmen + + + + Decoction + Decoctie + RecipesTree - + Brew volume: Brouw volume: - + Brewhouse efficiency: Brouwzaal rendement: - + Boil volume: Kook volume: - + Boil time: Kooktijd: - + Original gravity: - + Final gravity: - + Alcohol by Volume: Alcohol volume: - + CO2 Volume: CO2 volume: - + Color EBC: EBC kleur: - + Color method: Kleur berekening: - + Bitterness IBU: Bitterheid IBU: - + Bitterness method: Bitterheid berekening: - + Remarks: Opmerkingen: - - + + L L - - + + % % - + min min - + Quit Terug - + New Nieuw - + Open Open - + Guide Gids - + Group Groep - + Style Stijl - + Recipe Recept - + Total items: %1 Totaal items: %1 diff -r 19156b8b339f -r 6cccd340ea8c ui/EditFermentable.ui --- a/ui/EditFermentable.ui Mon Apr 25 15:52:21 2022 +0200 +++ b/ui/EditFermentable.ui Wed Apr 27 08:54:17 2022 +0200 @@ -584,7 +584,7 @@ true - 1000.000000000000000 + 100000.000000000000000 0.010000000000000 @@ -605,6 +605,9 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + true + 1 @@ -621,9 +624,15 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + true + 1 + + 1500.000000000000000 + @@ -637,6 +646,9 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + true + 1 @@ -653,6 +665,9 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + true + 1 @@ -669,6 +684,9 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + true + 1 @@ -685,6 +703,9 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + true + 1 @@ -723,6 +744,9 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + true + @@ -804,7 +828,7 @@ - + 810 @@ -813,7 +837,7 @@ 24 - + 0 0 @@ -823,14 +847,14 @@ 1 - + yyyy-MM-dd - + true - + 810 @@ -839,10 +863,10 @@ 24 - + yyyy-MM-dd - + true @@ -935,7 +959,7 @@ NullDateEdit - QWidget + QDateEdit

NullDateEdit.h

diff -r 19156b8b339f -r 6cccd340ea8c ui/EditRecipe.ui --- a/ui/EditRecipe.ui Mon Apr 25 15:52:21 2022 +0200 +++ b/ui/EditRecipe.ui Wed Apr 27 08:54:17 2022 +0200 @@ -566,9 +566,9 @@ - 10 + 5 20 - 111 + 116 20 @@ -1800,7 +1800,7 @@ - 0 + 2 @@ -2028,9 +2028,9 @@ - 50 + 40 60 - 111 + 121 20 @@ -2044,9 +2044,9 @@ - 50 + 40 90 - 111 + 121 20 @@ -2195,9 +2195,9 @@ - 50 + 40 120 - 111 + 121 20 @@ -2239,9 +2239,9 @@ - 50 + 40 150 - 111 + 121 20 @@ -2354,9 +2354,9 @@ - 570 + 530 10 - 131 + 171 20 @@ -2390,9 +2390,9 @@ - 570 + 530 40 - 131 + 171 20 @@ -4140,9 +4140,9 @@ - 245 + 235 20 - 131 + 141 20 @@ -4568,9 +4568,9 @@ - 310 + 290 340 - 161 + 181 20 @@ -4636,9 +4636,9 @@ - 310 + 290 370 - 161 + 181 20 @@ -4704,9 +4704,9 @@ - 310 + 290 400 - 161 + 181 20