diff -r ba26b19572ab -r 2e79e0975e58 src/EditRecipe.h --- a/src/EditRecipe.h Sat Apr 09 13:34:45 2022 +0200 +++ b/src/EditRecipe.h Sat Apr 09 21:50:19 2022 +0200 @@ -233,6 +233,7 @@ int misc_row; int yeasts_row; int mashs_row; + double preboil_sg; }; @@ -280,6 +281,8 @@ void on_perc_sugars_valueChanged(int value); void on_perc_cara_valueChanged(int value); void on_lintner_valueChanged(int value); + void on_Flavour_valueChanged(int value); + void on_Aroma_valueChanged(int value); private: Ui::EditRecipe *ui; @@ -287,9 +290,17 @@ QStringList f_types = { tr("Grain"), tr("Sugar"), tr("Extract"), tr("Dry extract"), tr("Adjunct") }; QStringList f_graintypes = { tr("Base"), tr("Roast"), tr("Crystal"), tr("Kilned"), tr("Sour Malt"), tr("Special"), tr("No malt")}; QStringList f_added = { tr("Mash"), tr("Boil"), tr("Fermentation"), tr("Lagering"), tr("Bottle"), tr("Kegs") }; + QStringList h_types = { tr("Bittering"), tr("Aroma"), tr("Both") }; + QStringList h_forms = { tr("Pellet"), tr("Plug"), tr("Leaf"), tr("Leaf wet"), tr("Cryo") }; + QStringList h_useat = { tr("Mash"), tr("First wort"), tr("Boil"), tr("Aroma"), tr("Whirlpool"), tr("Dry hop") }; QString bar_red = "QProgressBar::chunk {background: #FF0000;}"; QString bar_orange = "QProgressBar::chunk {background: #EB7331;}"; QString bar_green = "QProgressBar::chunk {background: #008C00;}"; + QString bar_20 = "QProgressBar::chunk {background: #004D00;}"; + QString bar_40 = "QProgressBar::chunk {background: #008C00;}"; + QString bar_60 = "QProgressBar::chunk {background: #00BF00;}"; + QString bar_80 = "QProgressBar::chunk {background: #00FF00;}"; + QString bar_100 = "QProgressBar::chunk {background: #80FF80;}"; int recno; bool textIsChanged = false; bool ignoreChanges = false; @@ -304,8 +315,10 @@ void to100Fermentables(int row); static bool ferment_sort_test(const Fermentables &D1, const Fermentables &D2); + static bool hop_sort_test(const Hops &D1, const Hops &D2); void WindowTitle(); void calcFermentables(); + void calcIBUs(); }; #endif