--- a/ui/EditProduct.ui Tue May 17 21:19:31 2022 +0200 +++ b/ui/EditProduct.ui Wed May 18 08:59:54 2022 +0200 @@ -95,7 +95,7 @@ <enum>QTabWidget::Rounded</enum> </property> <property name="currentIndex"> - <number>0</number> + <number>9</number> </property> <property name="elideMode"> <enum>Qt::ElideNone</enum> @@ -8021,7 +8021,7 @@ </rect> </property> <property name="text"> - <string>Primary start SG:</string> + <string>Start density:</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -8037,7 +8037,7 @@ </rect> </property> <property name="text"> - <string>Primary start temp °C:</string> + <string>Start temperature °C:</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -8053,7 +8053,7 @@ </rect> </property> <property name="text"> - <string>Primary peak temp °C:</string> + <string>Peak temperature °C:</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -8069,7 +8069,7 @@ </rect> </property> <property name="text"> - <string>Primary end temp °C:</string> + <string>End temperature °C:</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -8085,7 +8085,7 @@ </rect> </property> <property name="text"> - <string>Primary end SG:</string> + <string>End density:</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -8101,7 +8101,7 @@ </rect> </property> <property name="text"> - <string>Primary end date:</string> + <string>End date:</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -8226,22 +8226,6 @@ <double>0.001000000000000</double> </property> </widget> - <widget class="QLineEdit" name="prim_enddateEdit"> - <property name="geometry"> - <rect> - <x>180</x> - <y>170</y> - <width>101</width> - <height>23</height> - </rect> - </property> - <property name="toolTip"> - <string>End of primary fermentation, start secondary.</string> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - </widget> <widget class="QLabel" name="prim_attLabel"> <property name="geometry"> <rect> @@ -8252,7 +8236,7 @@ </rect> </property> <property name="text"> - <string>Primary attenuation:</string> + <string>Apparent attenuation:</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -8289,7 +8273,7 @@ <widget class="QToolButton" name="prim_endsgButton"> <property name="geometry"> <rect> - <x>290</x> + <x>300</x> <y>140</y> <width>28</width> <height>22</height> @@ -8309,14 +8293,14 @@ <widget class="QToolButton" name="prim_enddateButton"> <property name="geometry"> <rect> - <x>290</x> + <x>300</x> <y>170</y> <width>28</width> <height>22</height> </rect> </property> <property name="toolTip"> - <string>Set or clear date</string> + <string>Set the date to today</string> </property> <property name="text"> <string>...</string> @@ -8326,6 +8310,25 @@ <normaloff>:/icons/silk/date.png</normaloff>:/icons/silk/date.png</iconset> </property> </widget> + <widget class="NullDateEdit" name="prim_enddateEdit"> + <property name="geometry"> + <rect> + <x>180</x> + <y>170</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> <widget class="QGroupBox" name="secondaryBox"> <property name="geometry"> @@ -8349,7 +8352,7 @@ </rect> </property> <property name="text"> - <string>Secondary end temp °C:</string> + <string>End temperature °C:</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -8365,7 +8368,7 @@ </rect> </property> <property name="text"> - <string>Secondary end SG:</string> + <string>End density:</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -8381,7 +8384,7 @@ </rect> </property> <property name="text"> - <string>Secondary end date:</string> + <string>End date:</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -8434,22 +8437,6 @@ <double>0.001000000000000</double> </property> </widget> - <widget class="QLineEdit" name="sec_enddateEdit"> - <property name="geometry"> - <rect> - <x>180</x> - <y>80</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="QLabel" name="sec_attLabel"> <property name="geometry"> <rect> @@ -8460,7 +8447,7 @@ </rect> </property> <property name="text"> - <string>Secondary attenuation:</string> + <string>Apparent attenuation:</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -8497,7 +8484,7 @@ <widget class="QToolButton" name="sec_sgButton"> <property name="geometry"> <rect> - <x>290</x> + <x>300</x> <y>50</y> <width>28</width> <height>22</height> @@ -8517,14 +8504,14 @@ <widget class="QToolButton" name="sec_enddateButton"> <property name="geometry"> <rect> - <x>290</x> + <x>300</x> <y>80</y> <width>28</width> <height>22</height> </rect> </property> <property name="toolTip"> - <string>Set or clear date</string> + <string>Set the date to today</string> </property> <property name="text"> <string>...</string> @@ -8534,6 +8521,25 @@ <normaloff>:/icons/silk/date.png</normaloff>:/icons/silk/date.png</iconset> </property> </widget> + <widget class="NullDateEdit" name="sec_enddateEdit"> + <property name="geometry"> + <rect> + <x>180</x> + <y>80</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> <widget class="QGroupBox" name="tertiaryBox"> <property name="geometry"> @@ -8557,7 +8563,7 @@ </rect> </property> <property name="text"> - <string>Tertiary temperature °C:</string> + <string>Average temperature °C:</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -8573,7 +8579,7 @@ </rect> </property> <property name="text"> - <string>Tertiary end SG:</string> + <string>Final density:</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -8636,7 +8642,7 @@ </rect> </property> <property name="text"> - <string>Tertiary attenuation:</string> + <string>Apparent attenuation:</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -8700,7 +8706,7 @@ </rect> </property> <property name="text"> - <string>Expected end SG:</string> + <string>Expected end density:</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -8766,7 +8772,7 @@ <string> %</string> </property> <property name="decimals"> - <number>1</number> + <number>2</number> </property> <property name="maximum"> <double>100.000000000000000</double>