--- a/ui/EditProduct.ui Thu May 12 22:41:11 2022 +0200
+++ b/ui/EditProduct.ui Fri May 13 20:51:15 2022 +0200
@@ -6168,7 +6168,7 @@
</rect>
</property>
<property name="text">
- <string>Brewday start:</string>
+ <string>Brewday plan:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -6178,7 +6178,7 @@
<property name="geometry">
<rect>
<x>10</x>
- <y>40</y>
+ <y>70</y>
<width>131</width>
<height>20</height>
</rect>
@@ -6190,77 +6190,11 @@
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
- <widget class="QLineEdit" name="brew_startEdit">
- <property name="geometry">
- <rect>
- <x>150</x>
- <y>10</y>
- <width>141</width>
- <height>23</height>
- </rect>
- </property>
- <property name="readOnly">
- <bool>true</bool>
- </property>
- </widget>
- <widget class="QLineEdit" name="brew_endEdit">
- <property name="geometry">
- <rect>
- <x>150</x>
- <y>40</y>
- <width>141</width>
- <height>23</height>
- </rect>
- </property>
- <property name="readOnly">
- <bool>true</bool>
- </property>
- </widget>
- <widget class="QToolButton" name="brew_startButton">
- <property name="geometry">
- <rect>
- <x>300</x>
- <y>10</y>
- <width>28</width>
- <height>22</height>
- </rect>
- </property>
- <property name="toolTip">
- <string>Edit brew start</string>
- </property>
- <property name="text">
- <string>...</string>
- </property>
- <property name="icon">
- <iconset resource="../../../../../../home/mbroek/MyProjects/bmsapp/resources/icons.qrc">
- <normaloff>:/icons/silk/clock_edit.png</normaloff>:/icons/silk/clock_edit.png</iconset>
- </property>
- </widget>
- <widget class="QToolButton" name="brew_endButton">
- <property name="geometry">
- <rect>
- <x>300</x>
- <y>40</y>
- <width>28</width>
- <height>22</height>
- </rect>
- </property>
- <property name="toolTip">
- <string>Edit brew end</string>
- </property>
- <property name="text">
- <string>...</string>
- </property>
- <property name="icon">
- <iconset resource="../../../../../../home/mbroek/MyProjects/bmsapp/resources/icons.qrc">
- <normaloff>:/icons/silk/clock_edit.png</normaloff>:/icons/silk/clock_edit.png</iconset>
- </property>
- </widget>
<widget class="QGroupBox" name="brew_mashBox">
<property name="geometry">
<rect>
<x>10</x>
- <y>90</y>
+ <y>200</y>
<width>341</width>
<height>241</height>
</rect>
@@ -6623,7 +6557,7 @@
<property name="geometry">
<rect>
<x>370</x>
- <y>20</y>
+ <y>10</y>
<width>361</width>
<height>151</height>
</rect>
@@ -6873,7 +6807,7 @@
<property name="geometry">
<rect>
<x>750</x>
- <y>20</y>
+ <y>10</y>
<width>361</width>
<height>151</height>
</rect>
@@ -7062,9 +6996,9 @@
<property name="geometry">
<rect>
<x>750</x>
- <y>180</y>
+ <y>170</y>
<width>361</width>
- <height>211</height>
+ <height>271</height>
</rect>
</property>
<property name="title">
@@ -7206,7 +7140,7 @@
<property name="geometry">
<rect>
<x>10</x>
- <y>110</y>
+ <y>170</y>
<width>151</width>
<height>20</height>
</rect>
@@ -7222,7 +7156,7 @@
<property name="geometry">
<rect>
<x>10</x>
- <y>140</y>
+ <y>200</y>
<width>151</width>
<height>20</height>
</rect>
@@ -7238,7 +7172,7 @@
<property name="geometry">
<rect>
<x>10</x>
- <y>170</y>
+ <y>230</y>
<width>151</width>
<height>20</height>
</rect>
@@ -7254,7 +7188,7 @@
<property name="geometry">
<rect>
<x>170</x>
- <y>140</y>
+ <y>200</y>
<width>71</width>
<height>24</height>
</rect>
@@ -7288,7 +7222,7 @@
<property name="geometry">
<rect>
<x>170</x>
- <y>170</y>
+ <y>230</y>
<width>71</width>
<height>24</height>
</rect>
@@ -7322,7 +7256,7 @@
<property name="geometry">
<rect>
<x>170</x>
- <y>110</y>
+ <y>170</y>
<width>71</width>
<height>24</height>
</rect>
@@ -7340,25 +7274,66 @@
<number>3</number>
</property>
</widget>
- </widget>
- <widget class="QGroupBox" name="brew_aerationBox">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>340</y>
- <width>341</width>
- <height>121</height>
- </rect>
- </property>
- <property name="title">
- <string>Aeration</string>
- </property>
+ <widget class="QLabel" name="brew_aertimeLabel">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>140</y>
+ <width>151</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Aeration time & speed:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ <widget class="QDoubleSpinBox" name="brew_aerspeedEdit">
+ <property name="geometry">
+ <rect>
+ <x>260</x>
+ <y>140</y>
+ <width>81</width>
+ <height>24</height>
+ </rect>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="accelerated">
+ <bool>true</bool>
+ </property>
+ <property name="suffix">
+ <string> L/m</string>
+ </property>
+ <property name="decimals">
+ <number>0</number>
+ </property>
+ <property name="maximum">
+ <double>1000.000000000000000</double>
+ </property>
+ <property name="singleStep">
+ <double>1.000000000000000</double>
+ </property>
+ </widget>
+ <widget class="QComboBox" name="brew_aerwithEdit">
+ <property name="geometry">
+ <rect>
+ <x>170</x>
+ <y>110</y>
+ <width>151</width>
+ <height>23</height>
+ </rect>
+ </property>
+ </widget>
<widget class="QLabel" name="brew_aerwithLabel">
<property name="geometry">
<rect>
<x>10</x>
- <y>20</y>
- <width>141</width>
+ <y>110</y>
+ <width>151</width>
<height>20</height>
</rect>
</property>
@@ -7369,53 +7344,11 @@
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
- <widget class="QLabel" name="brew_aertimeLabel">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>50</y>
- <width>141</width>
- <height>20</height>
- </rect>
- </property>
- <property name="text">
- <string>Aeration time:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
- <widget class="QLabel" name="brew_aerspeedLabel">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>80</y>
- <width>141</width>
- <height>20</height>
- </rect>
- </property>
- <property name="text">
- <string>Aeration speed:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
- <widget class="QComboBox" name="brew_aerwithEdit">
- <property name="geometry">
- <rect>
- <x>160</x>
- <y>20</y>
- <width>151</width>
- <height>23</height>
- </rect>
- </property>
- </widget>
<widget class="QDoubleSpinBox" name="brew_aertimeEdit">
<property name="geometry">
<rect>
- <x>160</x>
- <y>50</y>
+ <x>170</x>
+ <y>140</y>
<width>81</width>
<height>24</height>
</rect>
@@ -7439,40 +7372,12 @@
<double>1.000000000000000</double>
</property>
</widget>
- <widget class="QDoubleSpinBox" name="brew_aerspeedEdit">
- <property name="geometry">
- <rect>
- <x>160</x>
- <y>80</y>
- <width>81</width>
- <height>24</height>
- </rect>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="accelerated">
- <bool>true</bool>
- </property>
- <property name="suffix">
- <string> L/m</string>
- </property>
- <property name="decimals">
- <number>0</number>
- </property>
- <property name="maximum">
- <double>1000.000000000000000</double>
- </property>
- <property name="singleStep">
- <double>1.000000000000000</double>
- </property>
- </widget>
</widget>
<widget class="QToolButton" name="brew_logButton">
<property name="geometry">
<rect>
- <x>300</x>
- <y>70</y>
+ <x>150</x>
+ <y>160</y>
<width>28</width>
<height>22</height>
</rect>
@@ -7492,7 +7397,7 @@
<property name="geometry">
<rect>
<x>370</x>
- <y>340</y>
+ <y>330</y>
<width>361</width>
<height>121</height>
</rect>
@@ -7619,7 +7524,7 @@
<property name="geometry">
<rect>
<x>370</x>
- <y>180</y>
+ <y>170</y>
<width>361</width>
<height>151</height>
</rect>
@@ -7865,6 +7770,184 @@
</property>
</widget>
</widget>
+ <widget class="QToolButton" name="brew_startButton1">
+ <property name="geometry">
+ <rect>
+ <x>270</x>
+ <y>10</y>
+ <width>28</width>
+ <height>22</height>
+ </rect>
+ </property>
+ <property name="toolTip">
+ <string>Set the date to today.</string>
+ </property>
+ <property name="text">
+ <string>...</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../../../../../../home/mbroek/MyProjects/bmsapp/resources/icons.qrc">
+ <normaloff>:/icons/silk/date.png</normaloff>:/icons/silk/date.png</iconset>
+ </property>
+ </widget>
+ <widget class="NullDateEdit" name="brew_startDate">
+ <property name="geometry">
+ <rect>
+ <x>150</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="brew_startButton2">
+ <property name="geometry">
+ <rect>
+ <x>300</x>
+ <y>10</y>
+ <width>28</width>
+ <height>22</height>
+ </rect>
+ </property>
+ <property name="toolTip">
+ <string>Clear planned brewdate</string>
+ </property>
+ <property name="text">
+ <string>...</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../../../../../../home/mbroek/MyProjects/bmsapp/resources/icons.qrc">
+ <normaloff>:/icons/silk/delete.png</normaloff>:/icons/silk/delete.png</iconset>
+ </property>
+ </widget>
+ <widget class="QTimeEdit" name="brew_startTime">
+ <property name="geometry">
+ <rect>
+ <x>150</x>
+ <y>40</y>
+ <width>111</width>
+ <height>24</height>
+ </rect>
+ </property>
+ <property name="toolTip">
+ <string>Edit the brewdate start time.</string>
+ </property>
+ <property name="displayFormat">
+ <string>hh:mm</string>
+ </property>
+ </widget>
+ <widget class="NullDateEdit" name="brew_endDate">
+ <property name="geometry">
+ <rect>
+ <x>150</x>
+ <y>70</y>
+ <width>111</width>
+ <height>24</height>
+ </rect>
+ </property>
+ <property name="toolTip">
+ <string>Edit the brewdate end.</string>
+ </property>
+ <property name="displayFormat">
+ <string>dd-MM-yyyy</string>
+ </property>
+ <property name="calendarPopup">
+ <bool>true</bool>
+ </property>
+ </widget>
+ <widget class="QTimeEdit" name="brew_endTime">
+ <property name="geometry">
+ <rect>
+ <x>150</x>
+ <y>100</y>
+ <width>111</width>
+ <height>24</height>
+ </rect>
+ </property>
+ <property name="toolTip">
+ <string>Edit the brewdate end time.</string>
+ </property>
+ <property name="displayFormat">
+ <string>hh:mm</string>
+ </property>
+ </widget>
+ <widget class="QToolButton" name="brew_endButton1">
+ <property name="geometry">
+ <rect>
+ <x>270</x>
+ <y>70</y>
+ <width>28</width>
+ <height>22</height>
+ </rect>
+ </property>
+ <property name="toolTip">
+ <string>Set the brewdate end date.</string>
+ </property>
+ <property name="text">
+ <string>...</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../../../../../../home/mbroek/MyProjects/bmsapp/resources/icons.qrc">
+ <normaloff>:/icons/silk/date.png</normaloff>:/icons/silk/date.png</iconset>
+ </property>
+ </widget>
+ <widget class="QLabel" name="brew_endLabel2">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>100</y>
+ <width>131</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>End time:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ <widget class="QLabel" name="brew_startLabel2">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>40</y>
+ <width>131</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Start time:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ <widget class="QLabel" name="brew_logLabel">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>160</y>
+ <width>131</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Brewlog:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
</widget>
<widget class="QWidget" name="ferment">
<attribute name="icon">