# HG changeset patch
# User Michiel Broek <mbroek@mbse.eu>
# Date 1652905276 -7200
# Node ID 7792a410a277c9911e83d81c5727077770bf628a
# Parent  fa7cad488e271f0814c529a541abf2dc96c63c8f
Added first part of the package tab.

diff -r fa7cad488e27 -r 7792a410a277 src/EditProduct.cpp
--- a/src/EditProduct.cpp	Wed May 18 17:03:05 2022 +0200
+++ b/src/EditProduct.cpp	Wed May 18 22:21:16 2022 +0200
@@ -984,10 +984,11 @@
     ui->tert_abvShow->setValue(Utils::abvol(product->brew_fermenter_sg, product->fg));
 
     // Tab packaging.
-    ui->pack_dateEdit->setText(product->package_date.toString("dd MMM yyyy"));
+    ui->pack_dateEdit->setDate(product->package_date);
     ui->pack_carbloShow->setValue(product->st_carb_min);
     ui->pack_carbhiShow->setValue(product->st_carb_max);
     ui->pack_volumeEdit->setValue(product->package_volume);
+    ui->pack_volumeEdit->setMaximum(product->brew_fermenter_volume);
     ui->pack_addvolEdit->setValue(product->package_infuse_amount);
     ui->pack_addabvEdit->setValue(product->package_infuse_abv);
     ui->pack_notesEdit->setText(product->package_infuse_notes);
@@ -1138,6 +1139,20 @@
     connect(ui->ferm_log1Button, SIGNAL(clicked()), this, SLOT(ferm_log1_button()));
     connect(ui->ferm_log2Button, SIGNAL(clicked()), this, SLOT(ferm_log2_button()));
 
+    /* All signals from tab Package */
+    calcPack();
+    connect(ui->pack_dateEdit, &QDateEdit::dateChanged, this, &EditProduct::pack_date_changed);
+    connect(ui->pack_dateButton, SIGNAL(clicked()), this, SLOT(pack_date_button()));
+    connect(ui->pack_ackButton, SIGNAL(clicked()), this, SLOT(pack_date_ack()));
+    connect(ui->pack_volumeEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::pack_volume_changed);
+    connect(ui->pack_phEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::pack_ph_changed);
+    connect(ui->pack_addvolEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::pack_infusion_vol_changed);
+    connect(ui->pack_addabvEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::pack_infusion_abv_changed);
+    connect(ui->pack_notesEdit, &QLineEdit::textChanged, this, &EditProduct::pack_infusion_txt_changed);
+    connect(ui->pack_abvShow, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::pack_abv_changed);
+
+    /* All signals from tab Tasting */
+
     setStage();
 
     ui->saveButton->setEnabled(false);
@@ -1453,7 +1468,7 @@
 	query.bindValue(":tertiary_temp", round(product->tertiary_temp * 10) / 10);
 	query.bindValue(":package_date", product->package_date);
 	query.bindValue(":package_volume", round(product->package_volume * 10) / 10);
-	query.bindValue(":package_infuse_amount", round(product->package_infuse_amount * 10) / 10);
+	query.bindValue(":package_infuse_amount", round(product->package_infuse_amount * 1000) / 1000);
 	query.bindValue(":package_infuse_abv", round(product->package_infuse_abv * 100) / 100);
 	query.bindValue(":package_infuse_notes", product->package_infuse_notes);
 	query.bindValue(":package_abv", round(product->package_abv * 100) / 100);
diff -r fa7cad488e27 -r 7792a410a277 src/EditProduct.h
--- a/src/EditProduct.h	Wed May 18 17:03:05 2022 +0200
+++ b/src/EditProduct.h	Wed May 18 22:21:16 2022 +0200
@@ -194,6 +194,26 @@
     void tertiary_sg_button();
     void ferm_log1_button();
     void ferm_log2_button();
+    void pack_date_changed(QDate val);
+    void pack_date_button();
+    void pack_date_ack();
+    void pack_volume_changed(double val);
+    void pack_ph_changed(double val);
+    void pack_infusion_vol_changed(double val);
+    void pack_infusion_abv_changed(double val);
+    void pack_infusion_txt_changed(QString val);
+    void pack_abv_changed(double val);
+    void bottle_volume_changed(double val);
+    void bottle_co2_changed(double val);
+    void bottle_sugar_changed(int val);
+    void bottle_water_changed(double val);
+    void bottle_temp_changed(double val);
+    void kegs_volume_changed(double val);
+    void kegs_co2_changed(double val);
+    void kegs_sugar_changed(int val);
+    void kegs_water_changed(double val);
+    void kegs_forced_changed(bool val);
+    void kegs_temp_changed(double val);
 
     /* Modified progress bars */
     void ferment_perc_mash_valueChanged(int value);
@@ -271,6 +291,7 @@
     void calcEfficiencyAfterBoil();
     void brew_volume_calc(double volume, double kettle_volume, double kettle_height, double est_volume, bool aboil);
     double get_fg(double gravity);
+    void calcPack();
 };
 
 #endif
diff -r fa7cad488e27 -r 7792a410a277 src/EditProductTab11.cpp
--- a/src/EditProductTab11.cpp	Wed May 18 17:03:05 2022 +0200
+++ b/src/EditProductTab11.cpp	Wed May 18 22:21:16 2022 +0200
@@ -18,3 +18,143 @@
  */
 
 
+void EditProduct::calcPack()
+{
+//    qDebug() << "calcPack()" << product->package_volume << product->package_abv << "inf" << product->package_infuse_amount << product->package_infuse_abv;
+
+    double bvol = product->package_volume - (product->package_abv * product->package_volume) / 100.0;
+    double balc = product->package_volume - bvol;
+    double mvol = product->package_infuse_amount - (product->package_infuse_abv * product->package_infuse_amount) / 100.0;
+    double malc = product->package_infuse_amount - mvol;
+    double talc = balc + malc;
+    double tvol = bvol + mvol;
+
+    product->final_abv = round(talc / (tvol + talc) * 10000.0) / 100.0;
+    ui->pack_finalabvShow->setValue(product->final_abv);
+}
+
+
+/*
+ * Triggered by writing to ui->pack_abvShow
+ */
+void EditProduct::pack_abv_changed(double val)
+{
+    calcPack();
+}
+
+
+void EditProduct::pack_date_changed(QDate val)
+{
+    qDebug() << "pack_date_changed" << val;
+}
+
+
+void EditProduct::pack_date_button()
+{
+}
+
+
+void EditProduct::pack_date_ack()
+{
+}
+
+
+void EditProduct::pack_volume_changed(double val)
+{
+    product->package_volume = val;
+    calcPack();
+    is_changed();
+}
+
+
+void EditProduct::pack_ph_changed(double val)
+{
+    if (product->package_ph == 0) {
+        product->package_ph = 4.0;
+        const QSignalBlocker blocker1(ui->pack_phEdit);
+        ui->pack_phEdit->setValue(4.0);
+    } else {
+    	product->package_ph = val;
+    }
+    is_changed();
+}
+
+
+void EditProduct::pack_infusion_vol_changed(double val)
+{
+    product->package_infuse_amount = val;
+    calcPack();
+    is_changed();
+}
+
+
+void EditProduct::pack_infusion_abv_changed(double val)
+{
+    product->package_infuse_abv = val;
+    calcPack();
+    is_changed();
+}
+
+
+void EditProduct::pack_infusion_txt_changed(QString val)
+{
+    product->package_infuse_notes = val;
+    is_changed();
+}
+
+
+void EditProduct::bottle_volume_changed(double val)
+{
+}
+
+
+void EditProduct::bottle_co2_changed(double val)
+{
+}
+
+
+void EditProduct::bottle_sugar_changed(int val)
+{
+}
+
+
+void EditProduct::bottle_water_changed(double val)
+{
+}
+
+
+void EditProduct::bottle_temp_changed(double val)
+{
+}
+
+
+void EditProduct::kegs_volume_changed(double val)
+{
+}
+
+
+void EditProduct::kegs_co2_changed(double val)
+{
+}
+
+
+void EditProduct::kegs_sugar_changed(int val)
+{
+}
+
+
+void EditProduct::kegs_water_changed(double val)
+{
+}
+
+
+void EditProduct::kegs_forced_changed(bool val)
+{
+}
+
+
+void EditProduct::kegs_temp_changed(double val)
+{
+}
+
+
diff -r fa7cad488e27 -r 7792a410a277 src/global.h
--- a/src/global.h	Wed May 18 17:03:05 2022 +0200
+++ b/src/global.h	Wed May 18 22:21:16 2022 +0200
@@ -531,6 +531,7 @@
     int		mashs_time;		///< Total mash time.
     double	est_mash_sg;
     double	preboil_sg;
+    double	final_abv;		/// ABV after dilution/infusion.
 };
 
 
diff -r fa7cad488e27 -r 7792a410a277 ui/EditProduct.ui
--- a/ui/EditProduct.ui	Wed May 18 17:03:05 2022 +0200
+++ b/ui/EditProduct.ui	Wed May 18 22:21:16 2022 +0200
@@ -95,7 +95,7 @@
        <enum>QTabWidget::Rounded</enum>
       </property>
       <property name="currentIndex">
-       <number>9</number>
+       <number>10</number>
       </property>
       <property name="elideMode">
        <enum>Qt::ElideNone</enum>
@@ -8040,7 +8040,7 @@
           </rect>
          </property>
          <property name="text">
-          <string>Start temperature °C:</string>
+          <string>Start temperature:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -8056,7 +8056,7 @@
           </rect>
          </property>
          <property name="text">
-          <string>Peak temperature °C:</string>
+          <string>Peak temperature:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -8072,7 +8072,7 @@
           </rect>
          </property>
          <property name="text">
-          <string>End temperature °C:</string>
+          <string>End temperature:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -8147,6 +8147,9 @@
          <property name="accelerated">
           <bool>true</bool>
          </property>
+         <property name="suffix">
+          <string> °C</string>
+         </property>
          <property name="decimals">
           <number>1</number>
          </property>
@@ -8172,6 +8175,9 @@
          <property name="accelerated">
           <bool>true</bool>
          </property>
+         <property name="suffix">
+          <string> °C</string>
+         </property>
          <property name="decimals">
           <number>1</number>
          </property>
@@ -8197,6 +8203,9 @@
          <property name="accelerated">
           <bool>true</bool>
          </property>
+         <property name="suffix">
+          <string> °C</string>
+         </property>
          <property name="decimals">
           <number>1</number>
          </property>
@@ -8375,7 +8384,7 @@
           </rect>
          </property>
          <property name="text">
-          <string>End temperature °C:</string>
+          <string>End temperature:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -8428,6 +8437,9 @@
          <property name="accelerated">
           <bool>true</bool>
          </property>
+         <property name="suffix">
+          <string> °C</string>
+         </property>
          <property name="decimals">
           <number>1</number>
          </property>
@@ -8606,7 +8618,7 @@
           </rect>
          </property>
          <property name="text">
-          <string>Average temperature °C:</string>
+          <string>Average temperature:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -8643,6 +8655,9 @@
          <property name="accelerated">
           <bool>true</bool>
          </property>
+         <property name="suffix">
+          <string> °C</string>
+         </property>
          <property name="decimals">
           <number>1</number>
          </property>
@@ -8902,7 +8917,7 @@
        <widget class="QLabel" name="pack_dateLabel">
         <property name="geometry">
          <rect>
-          <x>30</x>
+          <x>10</x>
           <y>10</y>
           <width>161</width>
           <height>20</height>
@@ -8915,26 +8930,10 @@
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
-       <widget class="QLineEdit" name="pack_dateEdit">
-        <property name="geometry">
-         <rect>
-          <x>200</x>
-          <y>10</y>
-          <width>101</width>
-          <height>23</height>
-         </rect>
-        </property>
-        <property name="toolTip">
-         <string>End of fermentation. Optional transfer to lagertank.</string>
-        </property>
-        <property name="readOnly">
-         <bool>true</bool>
-        </property>
-       </widget>
        <widget class="QToolButton" name="pack_dateButton">
         <property name="geometry">
          <rect>
-          <x>310</x>
+          <x>300</x>
           <y>10</y>
           <width>28</width>
           <height>22</height>
@@ -8954,7 +8953,7 @@
        <widget class="QDoubleSpinBox" name="pack_carbloShow">
         <property name="geometry">
          <rect>
-          <x>690</x>
+          <x>740</x>
           <y>10</y>
           <width>71</width>
           <height>24</height>
@@ -8991,9 +8990,9 @@
        <widget class="QLabel" name="pack_carbLabel">
         <property name="geometry">
          <rect>
-          <x>550</x>
+          <x>570</x>
           <y>10</y>
-          <width>131</width>
+          <width>161</width>
           <height>20</height>
          </rect>
         </property>
@@ -9007,7 +9006,7 @@
        <widget class="QDoubleSpinBox" name="pack_carbhiShow">
         <property name="geometry">
          <rect>
-          <x>770</x>
+          <x>820</x>
           <y>10</y>
           <width>71</width>
           <height>24</height>
@@ -9044,9 +9043,9 @@
        <widget class="QGroupBox" name="packgeneralBox">
         <property name="geometry">
          <rect>
-          <x>40</x>
+          <x>10</x>
           <y>40</y>
-          <width>1041</width>
+          <width>1101</width>
           <height>151</height>
          </rect>
         </property>
@@ -9058,7 +9057,7 @@
           <rect>
            <x>10</x>
            <y>20</y>
-           <width>141</width>
+           <width>151</width>
            <height>20</height>
           </rect>
          </property>
@@ -9074,12 +9073,12 @@
           <rect>
            <x>10</x>
            <y>50</y>
-           <width>141</width>
-           <height>20</height>
-          </rect>
-         </property>
-         <property name="text">
-          <string>Package add volume:</string>
+           <width>151</width>
+           <height>20</height>
+          </rect>
+         </property>
+         <property name="text">
+          <string>Extra added volume:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -9089,29 +9088,29 @@
          <property name="geometry">
           <rect>
            <x>10</x>
+           <y>110</y>
+           <width>151</width>
+           <height>20</height>
+          </rect>
+         </property>
+         <property name="text">
+          <string>Extra remarks:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+        <widget class="QLabel" name="pack_finalabvLabel">
+         <property name="geometry">
+          <rect>
+           <x>560</x>
            <y>80</y>
-           <width>141</width>
-           <height>20</height>
-          </rect>
-         </property>
-         <property name="text">
-          <string>Package remarks:</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-         </property>
-        </widget>
-        <widget class="QLabel" name="pack_abvLabel">
-         <property name="geometry">
-          <rect>
-           <x>10</x>
-           <y>110</y>
-           <width>141</width>
-           <height>20</height>
-          </rect>
-         </property>
-         <property name="text">
-          <string>Package ABV %:</string>
+           <width>161</width>
+           <height>20</height>
+          </rect>
+         </property>
+         <property name="text">
+          <string>Final ABV %:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -9120,14 +9119,14 @@
         <widget class="QLabel" name="pack_addabvLabel">
          <property name="geometry">
           <rect>
-           <x>500</x>
+           <x>560</x>
            <y>50</y>
-           <width>141</width>
-           <height>20</height>
-          </rect>
-         </property>
-         <property name="text">
-          <string>Package add ABV %:</string>
+           <width>161</width>
+           <height>20</height>
+          </rect>
+         </property>
+         <property name="text">
+          <string>Extra added ABV %:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -9136,9 +9135,9 @@
         <widget class="QLabel" name="pack_phLabel">
          <property name="geometry">
           <rect>
-           <x>500</x>
-           <y>110</y>
-           <width>141</width>
+           <x>270</x>
+           <y>20</y>
+           <width>161</width>
            <height>20</height>
           </rect>
          </property>
@@ -9152,9 +9151,9 @@
         <widget class="QDoubleSpinBox" name="pack_volumeEdit">
          <property name="geometry">
           <rect>
-           <x>160</x>
+           <x>170</x>
            <y>20</y>
-           <width>81</width>
+           <width>91</width>
            <height>24</height>
           </rect>
          </property>
@@ -9164,6 +9163,9 @@
          <property name="accelerated">
           <bool>true</bool>
          </property>
+         <property name="suffix">
+          <string> L</string>
+         </property>
          <property name="decimals">
           <number>1</number>
          </property>
@@ -9171,17 +9173,20 @@
           <double>100000.000000000000000</double>
          </property>
          <property name="singleStep">
-          <double>1.000000000000000</double>
+          <double>0.500000000000000</double>
          </property>
         </widget>
         <widget class="QDoubleSpinBox" name="pack_addvolEdit">
          <property name="geometry">
           <rect>
-           <x>160</x>
+           <x>170</x>
            <y>50</y>
-           <width>81</width>
-           <height>24</height>
-          </rect>
+           <width>91</width>
+           <height>24</height>
+          </rect>
+         </property>
+         <property name="toolTip">
+          <string>Extra dilution or infusion added to this batch.</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -9189,6 +9194,9 @@
          <property name="accelerated">
           <bool>true</bool>
          </property>
+         <property name="suffix">
+          <string> L</string>
+         </property>
          <property name="decimals">
           <number>3</number>
          </property>
@@ -9199,14 +9207,17 @@
           <double>0.010000000000000</double>
          </property>
         </widget>
-        <widget class="QDoubleSpinBox" name="pack_abvShow">
-         <property name="geometry">
-          <rect>
-           <x>160</x>
-           <y>110</y>
-           <width>81</width>
-           <height>24</height>
-          </rect>
+        <widget class="QDoubleSpinBox" name="pack_finalabvShow">
+         <property name="geometry">
+          <rect>
+           <x>730</x>
+           <y>80</y>
+           <width>91</width>
+           <height>24</height>
+          </rect>
+         </property>
+         <property name="toolTip">
+          <string>The ABV including the infusion.</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -9230,11 +9241,14 @@
         <widget class="QDoubleSpinBox" name="pack_addabvEdit">
          <property name="geometry">
           <rect>
-           <x>650</x>
+           <x>730</x>
            <y>50</y>
-           <width>81</width>
-           <height>24</height>
-          </rect>
+           <width>91</width>
+           <height>24</height>
+          </rect>
+         </property>
+         <property name="toolTip">
+          <string>If there is alcohol in the infusion, give the percentage.</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -9264,9 +9278,9 @@
         <widget class="QDoubleSpinBox" name="pack_phEdit">
          <property name="geometry">
           <rect>
-           <x>650</x>
-           <y>110</y>
-           <width>81</width>
+           <x>440</x>
+           <y>20</y>
+           <width>91</width>
            <height>24</height>
           </rect>
          </property>
@@ -9286,20 +9300,70 @@
         <widget class="QLineEdit" name="pack_notesEdit">
          <property name="geometry">
           <rect>
-           <x>160</x>
-           <y>80</y>
+           <x>170</x>
+           <y>110</y>
            <width>821</width>
            <height>23</height>
           </rect>
          </property>
+         <property name="toolTip">
+          <string>Could be the description of the infusion.</string>
+         </property>
+        </widget>
+        <widget class="QLabel" name="pack_abvLabel">
+         <property name="geometry">
+          <rect>
+           <x>560</x>
+           <y>20</y>
+           <width>161</width>
+           <height>20</height>
+          </rect>
+         </property>
+         <property name="text">
+          <string>Package ABV %:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+        <widget class="QDoubleSpinBox" name="pack_abvShow">
+         <property name="geometry">
+          <rect>
+           <x>730</x>
+           <y>20</y>
+           <width>91</width>
+           <height>24</height>
+          </rect>
+         </property>
+         <property name="toolTip">
+          <string>The ABV including the infusion.</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>2</number>
+         </property>
+         <property name="maximum">
+          <double>100.000000000000000</double>
+         </property>
         </widget>
        </widget>
        <widget class="QGroupBox" name="bottleBox">
         <property name="geometry">
          <rect>
-          <x>40</x>
+          <x>10</x>
           <y>200</y>
-          <width>511</width>
+          <width>541</width>
           <height>211</height>
          </rect>
         </property>
@@ -9311,12 +9375,12 @@
           <rect>
            <x>10</x>
            <y>20</y>
-           <width>141</width>
-           <height>20</height>
-          </rect>
-         </property>
-         <property name="text">
-          <string>Bottles volume:</string>
+           <width>151</width>
+           <height>20</height>
+          </rect>
+         </property>
+         <property name="text">
+          <string>Volume:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -9325,9 +9389,9 @@
         <widget class="QLabel" name="bottle_carbLabel">
          <property name="geometry">
           <rect>
-           <x>260</x>
+           <x>270</x>
            <y>20</y>
-           <width>141</width>
+           <width>161</width>
            <height>20</height>
           </rect>
          </property>
@@ -9343,7 +9407,7 @@
           <rect>
            <x>10</x>
            <y>50</y>
-           <width>141</width>
+           <width>151</width>
            <height>20</height>
           </rect>
          </property>
@@ -9359,7 +9423,7 @@
           <rect>
            <x>10</x>
            <y>80</y>
-           <width>141</width>
+           <width>151</width>
            <height>20</height>
           </rect>
          </property>
@@ -9373,14 +9437,14 @@
         <widget class="QLabel" name="bottle_sug_amountLabel">
          <property name="geometry">
           <rect>
-           <x>280</x>
+           <x>310</x>
            <y>50</y>
            <width>121</width>
            <height>20</height>
           </rect>
          </property>
          <property name="text">
-          <string>Priming gr/L:</string>
+          <string>Priming:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -9389,9 +9453,9 @@
         <widget class="QLabel" name="bottle_sug_waterLabel">
          <property name="geometry">
           <rect>
-           <x>260</x>
+           <x>270</x>
            <y>80</y>
-           <width>141</width>
+           <width>161</width>
            <height>20</height>
           </rect>
          </property>
@@ -9407,12 +9471,12 @@
           <rect>
            <x>10</x>
            <y>170</y>
-           <width>141</width>
-           <height>20</height>
-          </rect>
-         </property>
-         <property name="text">
-          <string>Bottle fermentation °C:</string>
+           <width>151</width>
+           <height>20</height>
+          </rect>
+         </property>
+         <property name="text">
+          <string>Bottle fermentation:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -9421,9 +9485,9 @@
         <widget class="QDoubleSpinBox" name="bottle_volumeEdit">
          <property name="geometry">
           <rect>
-           <x>160</x>
+           <x>170</x>
            <y>20</y>
-           <width>81</width>
+           <width>91</width>
            <height>24</height>
           </rect>
          </property>
@@ -9433,6 +9497,9 @@
          <property name="accelerated">
           <bool>true</bool>
          </property>
+         <property name="suffix">
+          <string> L</string>
+         </property>
          <property name="decimals">
           <number>1</number>
          </property>
@@ -9446,9 +9513,9 @@
         <widget class="QDoubleSpinBox" name="bottle_carbEdit">
          <property name="geometry">
           <rect>
-           <x>410</x>
+           <x>440</x>
            <y>20</y>
-           <width>81</width>
+           <width>91</width>
            <height>24</height>
           </rect>
          </property>
@@ -9458,6 +9525,9 @@
          <property name="accelerated">
           <bool>true</bool>
          </property>
+         <property name="suffix">
+          <string> %</string>
+         </property>
          <property name="decimals">
           <number>2</number>
          </property>
@@ -9471,9 +9541,9 @@
         <widget class="QComboBox" name="bottle_sugarEdit">
          <property name="geometry">
           <rect>
-           <x>160</x>
+           <x>170</x>
            <y>50</y>
-           <width>101</width>
+           <width>131</width>
            <height>23</height>
           </rect>
          </property>
@@ -9481,20 +9551,23 @@
         <widget class="QDoubleSpinBox" name="bottle_sug_weightShow">
          <property name="geometry">
           <rect>
-           <x>160</x>
+           <x>170</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="readOnly">
-          <bool>true</bool>
-         </property>
-         <property name="buttonSymbols">
-          <enum>QAbstractSpinBox::NoButtons</enum>
+           <width>91</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> gr</string>
          </property>
          <property name="decimals">
           <number>1</number>
@@ -9506,20 +9579,23 @@
         <widget class="QDoubleSpinBox" name="bottle_sug_amountShow">
          <property name="geometry">
           <rect>
-           <x>410</x>
+           <x>440</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="readOnly">
-          <bool>true</bool>
-         </property>
-         <property name="buttonSymbols">
-          <enum>QAbstractSpinBox::NoButtons</enum>
+           <width>91</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> gr/L</string>
          </property>
          <property name="decimals">
           <number>1</number>
@@ -9531,9 +9607,9 @@
         <widget class="QDoubleSpinBox" name="bottle_sug_waterEdit">
          <property name="geometry">
           <rect>
-           <x>410</x>
+           <x>440</x>
            <y>80</y>
-           <width>81</width>
+           <width>91</width>
            <height>24</height>
           </rect>
          </property>
@@ -9543,6 +9619,9 @@
          <property name="accelerated">
           <bool>true</bool>
          </property>
+         <property name="suffix">
+          <string> L</string>
+         </property>
          <property name="decimals">
           <number>3</number>
          </property>
@@ -9556,9 +9635,9 @@
         <widget class="QLabel" name="bottle_barLabel">
          <property name="geometry">
           <rect>
-           <x>250</x>
+           <x>270</x>
            <y>140</y>
-           <width>151</width>
+           <width>161</width>
            <height>20</height>
           </rect>
          </property>
@@ -9574,7 +9653,7 @@
           <rect>
            <x>10</x>
            <y>140</y>
-           <width>141</width>
+           <width>151</width>
            <height>20</height>
           </rect>
          </property>
@@ -9588,9 +9667,9 @@
         <widget class="QDoubleSpinBox" name="bottle_tempEdit">
          <property name="geometry">
           <rect>
-           <x>160</x>
+           <x>170</x>
            <y>170</y>
-           <width>81</width>
+           <width>91</width>
            <height>24</height>
           </rect>
          </property>
@@ -9600,6 +9679,9 @@
          <property name="accelerated">
           <bool>true</bool>
          </property>
+         <property name="suffix">
+          <string> °C</string>
+         </property>
          <property name="decimals">
           <number>1</number>
          </property>
@@ -9613,9 +9695,9 @@
         <widget class="QDoubleSpinBox" name="bottle_abvShow">
          <property name="geometry">
           <rect>
-           <x>160</x>
+           <x>170</x>
            <y>140</y>
-           <width>81</width>
+           <width>91</width>
            <height>24</height>
           </rect>
          </property>
@@ -9641,9 +9723,9 @@
         <widget class="QDoubleSpinBox" name="bottle_barShow">
          <property name="geometry">
           <rect>
-           <x>410</x>
+           <x>440</x>
            <y>140</y>
-           <width>81</width>
+           <width>91</width>
            <height>24</height>
           </rect>
          </property>
@@ -9669,7 +9751,7 @@
          <rect>
           <x>570</x>
           <y>200</y>
-          <width>511</width>
+          <width>541</width>
           <height>211</height>
          </rect>
         </property>
@@ -9681,7 +9763,7 @@
           <rect>
            <x>10</x>
            <y>140</y>
-           <width>141</width>
+           <width>151</width>
            <height>20</height>
           </rect>
          </property>
@@ -9695,9 +9777,9 @@
         <widget class="QLabel" name="keg_barLabel">
          <property name="geometry">
           <rect>
-           <x>250</x>
+           <x>270</x>
            <y>140</y>
-           <width>151</width>
+           <width>161</width>
            <height>20</height>
           </rect>
          </property>
@@ -9713,7 +9795,7 @@
           <rect>
            <x>10</x>
            <y>80</y>
-           <width>141</width>
+           <width>151</width>
            <height>20</height>
           </rect>
          </property>
@@ -9727,9 +9809,9 @@
         <widget class="QLabel" name="keg_carbLabel">
          <property name="geometry">
           <rect>
-           <x>260</x>
+           <x>270</x>
            <y>20</y>
-           <width>141</width>
+           <width>161</width>
            <height>20</height>
           </rect>
          </property>
@@ -9743,9 +9825,9 @@
         <widget class="QLabel" name="keg_sug_waterLabel">
          <property name="geometry">
           <rect>
-           <x>260</x>
+           <x>270</x>
            <y>80</y>
-           <width>141</width>
+           <width>161</width>
            <height>20</height>
           </rect>
          </property>
@@ -9759,14 +9841,14 @@
         <widget class="QLabel" name="keg_sug_amountLabel">
          <property name="geometry">
           <rect>
-           <x>280</x>
+           <x>310</x>
            <y>50</y>
            <width>121</width>
            <height>20</height>
           </rect>
          </property>
          <property name="text">
-          <string>Priming gr/L:</string>
+          <string>Priming:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -9777,12 +9859,12 @@
           <rect>
            <x>10</x>
            <y>170</y>
-           <width>141</width>
-           <height>20</height>
-          </rect>
-         </property>
-         <property name="text">
-          <string>Kegs temperature °C:</string>
+           <width>151</width>
+           <height>20</height>
+          </rect>
+         </property>
+         <property name="text">
+          <string>Kegs temperature:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -9793,7 +9875,7 @@
           <rect>
            <x>10</x>
            <y>50</y>
-           <width>141</width>
+           <width>151</width>
            <height>20</height>
           </rect>
          </property>
@@ -9807,20 +9889,23 @@
         <widget class="QDoubleSpinBox" name="keg_sug_weightShow">
          <property name="geometry">
           <rect>
-           <x>160</x>
+           <x>170</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="readOnly">
-          <bool>true</bool>
-         </property>
-         <property name="buttonSymbols">
-          <enum>QAbstractSpinBox::NoButtons</enum>
+           <width>91</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> gr</string>
          </property>
          <property name="decimals">
           <number>1</number>
@@ -9832,9 +9917,9 @@
         <widget class="QDoubleSpinBox" name="keg_abvShow">
          <property name="geometry">
           <rect>
-           <x>160</x>
+           <x>170</x>
            <y>140</y>
-           <width>81</width>
+           <width>91</width>
            <height>24</height>
           </rect>
          </property>
@@ -9862,12 +9947,12 @@
           <rect>
            <x>10</x>
            <y>20</y>
-           <width>141</width>
-           <height>20</height>
-          </rect>
-         </property>
-         <property name="text">
-          <string>Kegs volume:</string>
+           <width>151</width>
+           <height>20</height>
+          </rect>
+         </property>
+         <property name="text">
+          <string>Volume:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -9876,9 +9961,9 @@
         <widget class="QDoubleSpinBox" name="keg_sug_waterEdit">
          <property name="geometry">
           <rect>
-           <x>410</x>
+           <x>440</x>
            <y>80</y>
-           <width>81</width>
+           <width>91</width>
            <height>24</height>
           </rect>
          </property>
@@ -9888,6 +9973,9 @@
          <property name="accelerated">
           <bool>true</bool>
          </property>
+         <property name="suffix">
+          <string> L</string>
+         </property>
          <property name="decimals">
           <number>3</number>
          </property>
@@ -9901,20 +9989,23 @@
         <widget class="QDoubleSpinBox" name="keg_sug_amountShow">
          <property name="geometry">
           <rect>
-           <x>410</x>
+           <x>440</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="readOnly">
-          <bool>true</bool>
-         </property>
-         <property name="buttonSymbols">
-          <enum>QAbstractSpinBox::NoButtons</enum>
+           <width>91</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> gr/L</string>
          </property>
          <property name="decimals">
           <number>1</number>
@@ -9926,9 +10017,9 @@
         <widget class="QDoubleSpinBox" name="keg_barShow">
          <property name="geometry">
           <rect>
-           <x>410</x>
+           <x>440</x>
            <y>140</y>
-           <width>81</width>
+           <width>91</width>
            <height>24</height>
           </rect>
          </property>
@@ -9951,9 +10042,9 @@
         <widget class="QDoubleSpinBox" name="keg_volumeEdit">
          <property name="geometry">
           <rect>
-           <x>160</x>
+           <x>170</x>
            <y>20</y>
-           <width>81</width>
+           <width>91</width>
            <height>24</height>
           </rect>
          </property>
@@ -9963,6 +10054,9 @@
          <property name="accelerated">
           <bool>true</bool>
          </property>
+         <property name="suffix">
+          <string> L</string>
+         </property>
          <property name="decimals">
           <number>1</number>
          </property>
@@ -9976,9 +10070,9 @@
         <widget class="QComboBox" name="keg_sugarEdit">
          <property name="geometry">
           <rect>
-           <x>160</x>
+           <x>170</x>
            <y>50</y>
-           <width>101</width>
+           <width>131</width>
            <height>23</height>
           </rect>
          </property>
@@ -9986,9 +10080,9 @@
         <widget class="QDoubleSpinBox" name="keg_carbEdit">
          <property name="geometry">
           <rect>
-           <x>410</x>
+           <x>440</x>
            <y>20</y>
-           <width>81</width>
+           <width>91</width>
            <height>24</height>
           </rect>
          </property>
@@ -9998,6 +10092,9 @@
          <property name="accelerated">
           <bool>true</bool>
          </property>
+         <property name="suffix">
+          <string> %</string>
+         </property>
          <property name="decimals">
           <number>2</number>
          </property>
@@ -10011,9 +10108,9 @@
         <widget class="QDoubleSpinBox" name="keg_tempEdit">
          <property name="geometry">
           <rect>
-           <x>160</x>
+           <x>170</x>
            <y>170</y>
-           <width>81</width>
+           <width>91</width>
            <height>24</height>
           </rect>
          </property>
@@ -10023,6 +10120,9 @@
          <property name="accelerated">
           <bool>true</bool>
          </property>
+         <property name="suffix">
+          <string> °C</string>
+         </property>
          <property name="decimals">
           <number>1</number>
          </property>
@@ -10038,7 +10138,7 @@
           <rect>
            <x>10</x>
            <y>110</y>
-           <width>141</width>
+           <width>151</width>
            <height>20</height>
           </rect>
          </property>
@@ -10052,7 +10152,7 @@
         <widget class="QCheckBox" name="keg_forcedEdit">
          <property name="geometry">
           <rect>
-           <x>160</x>
+           <x>170</x>
            <y>110</y>
            <width>85</width>
            <height>21</height>
@@ -10060,6 +10160,45 @@
          </property>
         </widget>
        </widget>
+       <widget class="NullDateEdit" name="pack_dateEdit">
+        <property name="geometry">
+         <rect>
+          <x>180</x>
+          <y>10</y>
+          <width>111</width>
+          <height>24</height>
+         </rect>
+        </property>
+        <property name="toolTip">
+         <string>Edit the brewdate plan or start.</string>
+        </property>
+        <property name="displayFormat">
+         <string>dd-MM-yyyy</string>
+        </property>
+        <property name="calendarPopup">
+         <bool>true</bool>
+        </property>
+       </widget>
+       <widget class="QToolButton" name="pack_ackButton">
+        <property name="geometry">
+         <rect>
+          <x>340</x>
+          <y>10</y>
+          <width>28</width>
+          <height>22</height>
+         </rect>
+        </property>
+        <property name="toolTip">
+         <string>Set or clear date</string>
+        </property>
+        <property name="text">
+         <string>...</string>
+        </property>
+        <property name="icon">
+         <iconset resource="../../../../../../home/mbroek/MyProjects/bmsapp/resources/icons.qrc">
+          <normaloff>:/icons/silk/accept.png</normaloff>:/icons/silk/accept.png</iconset>
+        </property>
+       </widget>
       </widget>
       <widget class="QWidget" name="taste">
        <attribute name="title">