--- a/ui/EditProduct.ui Wed May 04 13:49:37 2022 +0200 +++ b/ui/EditProduct.ui Thu May 05 17:20:06 2022 +0200 @@ -95,7 +95,7 @@ <enum>QTabWidget::Rounded</enum> </property> <property name="currentIndex"> - <number>0</number> + <number>5</number> </property> <property name="elideMode"> <enum>Qt::ElideNone</enum> @@ -2723,7 +2723,7 @@ <widget class="QLabel" name="est_og4Label"> <property name="geometry"> <rect> - <x>50</x> + <x>30</x> <y>10</y> <width>131</width> <height>20</height> @@ -2739,7 +2739,7 @@ <widget class="QDoubleSpinBox" name="est_og4Edit"> <property name="geometry"> <rect> - <x>190</x> + <x>170</x> <y>10</y> <width>71</width> <height>24</height> @@ -2770,7 +2770,7 @@ <widget class="QLabel" name="est_fg3Label"> <property name="geometry"> <rect> - <x>50</x> + <x>30</x> <y>40</y> <width>131</width> <height>20</height> @@ -2786,7 +2786,7 @@ <widget class="QDoubleSpinBox" name="est_fg3Edit"> <property name="geometry"> <rect> - <x>190</x> + <x>170</x> <y>40</y> <width>71</width> <height>24</height> @@ -2817,7 +2817,7 @@ <widget class="QLabel" name="est_abv2Label"> <property name="geometry"> <rect> - <x>50</x> + <x>30</x> <y>70</y> <width>131</width> <height>20</height> @@ -2833,7 +2833,7 @@ <widget class="QDoubleSpinBox" name="est_abv2Edit"> <property name="geometry"> <rect> - <x>190</x> + <x>170</x> <y>70</y> <width>71</width> <height>24</height> @@ -2870,7 +2870,7 @@ <widget class="QLabel" name="est_svgLabel"> <property name="geometry"> <rect> - <x>30</x> + <x>10</x> <y>100</y> <width>151</width> <height>20</height> @@ -2886,7 +2886,7 @@ <widget class="QDoubleSpinBox" name="est_svgEdit"> <property name="geometry"> <rect> - <x>190</x> + <x>170</x> <y>100</y> <width>71</width> <height>24</height> @@ -2924,19 +2924,19 @@ <property name="geometry"> <rect> <x>10</x> - <y>250</y> + <y>280</y> <width>1101</width> - <height>211</height> + <height>181</height> </rect> </property> </widget> <widget class="QStackedWidget" name="yeastProcedure"> <property name="geometry"> <rect> - <x>290</x> + <x>320</x> <y>10</y> - <width>821</width> - <height>231</height> + <width>791</width> + <height>261</height> </rect> </property> <property name="currentIndex"> @@ -2944,31 +2944,11 @@ </property> <widget class="QWidget" name="yeastNot"/> <widget class="QWidget" name="yeastLiquid"> - <widget class="QLabel" name="label"> - <property name="geometry"> - <rect> - <x>200</x> - <y>20</y> - <width>341</width> - <height>20</height> - </rect> - </property> - <property name="font"> - <font> - <pointsize>11</pointsize> - <weight>75</weight> - <bold>true</bold> - </font> - </property> - <property name="text"> - <string>Liquid yeast advice</string> - </property> - </widget> <widget class="QDoubleSpinBox" name="pitchrateEdit"> <property name="geometry"> <rect> - <x>200</x> - <y>60</y> + <x>610</x> + <y>10</y> <width>91</width> <height>24</height> </rect> @@ -2995,8 +2975,8 @@ <widget class="QLabel" name="pitchrateLabel"> <property name="geometry"> <rect> - <x>10</x> - <y>60</y> + <x>420</x> + <y>10</y> <width>181</width> <height>20</height> </rect> @@ -3008,139 +2988,119 @@ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> </widget> - <widget class="QLabel" name="initcellsLabel"> + <widget class="QComboBox" name="stmethodEdit"> <property name="geometry"> <rect> - <x>10</x> - <y>90</y> + <x>230</x> + <y>10</y> + <width>101</width> + <height>23</height> + </rect> + </property> + </widget> + <widget class="QLabel" name="stmethodLabel"> + <property name="geometry"> + <rect> + <x>40</x> + <y>10</y> <width>181</width> <height>20</height> </rect> </property> <property name="text"> - <string>Initial billion cells:</string> + <string>Starter method:</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> </widget> - <widget class="QLabel" name="targetcellsLabel"> + <widget class="QLabel" name="startersgLabel"> <property name="geometry"> <rect> - <x>10</x> - <y>120</y> + <x>40</x> + <y>40</y> <width>181</width> <height>20</height> </rect> </property> <property name="text"> - <string>Target billion cells:</string> + <string>Starter SG:</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> </widget> - <widget class="QDoubleSpinBox" name="initcellsEdit"> + <widget class="QDoubleSpinBox" name="startersgEdit"> <property name="geometry"> <rect> - <x>200</x> - <y>90</y> - <width>91</width> + <x>230</x> + <y>40</y> + <width>71</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="accelerated"> - <bool>false</bool> - </property> - <property name="decimals"> - <number>0</number> - </property> - <property name="maximum"> - <double>100000.000000000000000</double> - </property> - </widget> - <widget class="QDoubleSpinBox" name="targetcellsEdit"> - <property name="geometry"> - <rect> - <x>200</x> - <y>120</y> - <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> + <enum>QAbstractSpinBox::UpDownArrows</enum> </property> <property name="accelerated"> - <bool>false</bool> - </property> - <property name="decimals"> - <number>0</number> - </property> - <property name="maximum"> - <double>100000.000000000000000</double> - </property> - </widget> - <widget class="QLabel" name="starterLabel"> - <property name="geometry"> - <rect> - <x>10</x> - <y>150</y> - <width>181</width> - <height>20</height> - </rect> - </property> - <property name="text"> - <string>Starter volume L:</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - </widget> - <widget class="QDoubleSpinBox" name="starterEdit"> - <property name="geometry"> - <rect> - <x>200</x> - <y>150</y> - <width>91</width> - <height>24</height> - </rect> - </property> - <property name="toolTip"> - <string>A very rough starter volume estimate.</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="accelerated"> - <bool>false</bool> - </property> <property name="decimals"> <number>3</number> </property> + <property name="minimum"> + <double>0.980000000000000</double> + </property> <property name="maximum"> - <double>100000.000000000000000</double> + <double>2.000000000000000</double> + </property> + <property name="singleStep"> + <double>0.001000000000000</double> + </property> + </widget> + <widget class="QToolButton" name="pitchrateButton"> + <property name="geometry"> + <rect> + <x>710</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/bms/erlenmeyer.png</normaloff>:/icons/bms/erlenmeyer.png</iconset> + </property> + </widget> + <widget class="QTableWidget" name="starterTable"> + <property name="geometry"> + <rect> + <x>80</x> + <y>100</y> + <width>636</width> + <height>146</height> + </rect> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>0</height> + </size> </property> </widget> </widget> @@ -3425,8 +3385,8 @@ <widget class="QPushButton" name="addYeast"> <property name="geometry"> <rect> - <x>180</x> - <y>210</y> + <x>90</x> + <y>240</y> <width>80</width> <height>23</height> </rect> @@ -3439,6 +3399,99 @@ <normaloff>:/icons/bms/erlenmeyer.png</normaloff>:/icons/bms/erlenmeyer.png</iconset> </property> </widget> + <widget class="QLabel" name="productionLabel"> + <property name="geometry"> + <rect> + <x>10</x> + <y>130</y> + <width>151</width> + <height>20</height> + </rect> + </property> + <property name="text"> + <string>Production date:</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> + <widget class="QLabel" name="conditionLabel"> + <property name="geometry"> + <rect> + <x>10</x> + <y>160</y> + <width>151</width> + <height>20</height> + </rect> + </property> + <property name="text"> + <string>Yeast condition:</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> + <widget class="QToolButton" name="productionButton"> + <property name="geometry"> + <rect> + <x>280</x> + <y>130</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/date.png</normaloff>:/icons/silk/date.png</iconset> + </property> + </widget> + <widget class="QLineEdit" name="productionEdit"> + <property name="geometry"> + <rect> + <x>170</x> + <y>130</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="QSpinBox" name="conditionShow"> + <property name="geometry"> + <rect> + <x>170</x> + <y>160</y> + <width>71</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="accelerated"> + <bool>false</bool> + </property> + <property name="suffix"> + <string> %</string> + </property> + </widget> </widget> <widget class="QWidget" name="mash"> <attribute name="icon">