--- a/ui/EditRecipe.ui Fri Apr 01 14:58:57 2022 +0200
+++ b/ui/EditRecipe.ui Fri Apr 01 16:52:25 2022 +0200
@@ -227,7 +227,7 @@
<widget class="QLabel" name="efficiencyLabel">
<property name="geometry">
<rect>
- <x>380</x>
+ <x>370</x>
<y>140</y>
<width>131</width>
<height>20</height>
@@ -243,7 +243,7 @@
<widget class="QLabel" name="boil_timeLabel">
<property name="geometry">
<rect>
- <x>380</x>
+ <x>370</x>
<y>170</y>
<width>131</width>
<height>20</height>
@@ -259,7 +259,7 @@
<widget class="QLabel" name="batch_sizeLabel">
<property name="geometry">
<rect>
- <x>760</x>
+ <x>740</x>
<y>140</y>
<width>131</width>
<height>20</height>
@@ -275,7 +275,7 @@
<widget class="QLabel" name="boil_sizeLabel">
<property name="geometry">
<rect>
- <x>760</x>
+ <x>740</x>
<y>170</y>
<width>131</width>
<height>20</height>
@@ -291,7 +291,7 @@
<widget class="QDoubleSpinBox" name="efficiencyEdit">
<property name="geometry">
<rect>
- <x>520</x>
+ <x>510</x>
<y>140</y>
<width>101</width>
<height>24</height>
@@ -316,7 +316,7 @@
<widget class="QSpinBox" name="boil_timeEdit">
<property name="geometry">
<rect>
- <x>520</x>
+ <x>510</x>
<y>170</y>
<width>101</width>
<height>24</height>
@@ -338,7 +338,7 @@
<widget class="QDoubleSpinBox" name="batch_sizeEdit">
<property name="geometry">
<rect>
- <x>900</x>
+ <x>880</x>
<y>140</y>
<width>101</width>
<height>24</height>
@@ -366,15 +366,21 @@
<widget class="QDoubleSpinBox" name="boil_sizeEdit">
<property name="geometry">
<rect>
- <x>900</x>
+ <x>880</x>
<y>170</y>
- <width>101</width>
+ <width>87</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>true</bool>
</property>
@@ -395,7 +401,7 @@
<property name="geometry">
<rect>
<x>220</x>
- <y>200</y>
+ <y>320</y>
<width>148</width>
<height>24</height>
</rect>
@@ -405,7 +411,7 @@
<property name="geometry">
<rect>
<x>0</x>
- <y>200</y>
+ <y>320</y>
<width>131</width>
<height>20</height>
</rect>
@@ -421,7 +427,7 @@
<property name="geometry">
<rect>
<x>140</x>
- <y>200</y>
+ <y>320</y>
<width>71</width>
<height>24</height>
</rect>
@@ -429,6 +435,9 @@
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
+ <property name="buttonSymbols">
+ <enum>QAbstractSpinBox::UpDownArrows</enum>
+ </property>
<property name="accelerated">
<bool>true</bool>
</property>
@@ -448,8 +457,8 @@
<widget class="QLabel" name="est_fgLabel">
<property name="geometry">
<rect>
- <x>0</x>
- <y>230</y>
+ <x>370</x>
+ <y>320</y>
<width>131</width>
<height>20</height>
</rect>
@@ -464,14 +473,14 @@
<widget class="QLabel" name="est_abvLabel">
<property name="geometry">
<rect>
- <x>0</x>
- <y>260</y>
+ <x>740</x>
+ <y>320</y>
<width>131</width>
<height>20</height>
</rect>
</property>
<property name="text">
- <string>Estimated ABV:</string>
+ <string>Alcohol Volume:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -481,13 +490,13 @@
<property name="geometry">
<rect>
<x>0</x>
- <y>290</y>
+ <y>350</y>
<width>131</width>
<height>20</height>
</rect>
</property>
<property name="text">
- <string>Estimated Color EBC:</string>
+ <string>Color EBC:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -496,8 +505,8 @@
<widget class="QDoubleSpinBox" name="est_fgEdit">
<property name="geometry">
<rect>
- <x>140</x>
- <y>230</y>
+ <x>510</x>
+ <y>320</y>
<width>71</width>
<height>24</height>
</rect>
@@ -505,6 +514,9 @@
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
+ <property name="buttonSymbols">
+ <enum>QAbstractSpinBox::NoButtons</enum>
+ </property>
<property name="accelerated">
<bool>true</bool>
</property>
@@ -524,8 +536,8 @@
<widget class="RangedSlider" name="est_fgShow">
<property name="geometry">
<rect>
- <x>220</x>
- <y>230</y>
+ <x>590</x>
+ <y>320</y>
<width>148</width>
<height>24</height>
</rect>
@@ -534,9 +546,9 @@
<widget class="QDoubleSpinBox" name="est_abvEdit">
<property name="geometry">
<rect>
- <x>140</x>
- <y>260</y>
- <width>57</width>
+ <x>880</x>
+ <y>320</y>
+ <width>71</width>
<height>24</height>
</rect>
</property>
@@ -572,8 +584,8 @@
<property name="geometry">
<rect>
<x>140</x>
- <y>290</y>
- <width>57</width>
+ <y>350</y>
+ <width>71</width>
<height>24</height>
</rect>
</property>
@@ -605,28 +617,18 @@
<widget class="RangedSlider" name="est_abvShow">
<property name="geometry">
<rect>
- <x>220</x>
- <y>260</y>
+ <x>960</x>
+ <y>320</y>
<width>148</width>
<height>24</height>
</rect>
</property>
</widget>
- <widget class="BeerColor" name="est_colorGlass">
- <property name="geometry">
- <rect>
- <x>590</x>
- <y>270</y>
- <width>90</width>
- <height>130</height>
- </rect>
- </property>
- </widget>
<widget class="QComboBox" name="color_methodEdit">
<property name="geometry">
<rect>
- <x>140</x>
- <y>320</y>
+ <x>510</x>
+ <y>350</y>
<width>201</width>
<height>23</height>
</rect>
@@ -636,12 +638,381 @@
<property name="geometry">
<rect>
<x>220</x>
- <y>290</y>
- <width>151</width>
+ <y>350</y>
+ <width>148</width>
<height>24</height>
</rect>
</property>
</widget>
+ <widget class="QComboBox" name="beerstyleEdit">
+ <property name="geometry">
+ <rect>
+ <x>510</x>
+ <y>200</y>
+ <width>201</width>
+ <height>23</height>
+ </rect>
+ </property>
+ </widget>
+ <widget class="QLabel" name="st_typeLabel">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>260</y>
+ <width>131</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Style type:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ <widget class="QLabel" name="st_guideLabel">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>230</y>
+ <width>131</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Style guide:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ <widget class="QLabel" name="st_nameLabel">
+ <property name="geometry">
+ <rect>
+ <x>370</x>
+ <y>230</y>
+ <width>131</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Style name:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ <widget class="QLabel" name="st_catLabel">
+ <property name="geometry">
+ <rect>
+ <x>370</x>
+ <y>260</y>
+ <width>131</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Category:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ <widget class="QLabel" name="st_groupLabel">
+ <property name="geometry">
+ <rect>
+ <x>740</x>
+ <y>230</y>
+ <width>131</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Style group:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ <widget class="QLabel" name="st_catnrLabel">
+ <property name="geometry">
+ <rect>
+ <x>740</x>
+ <y>260</y>
+ <width>131</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Category number:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ <widget class="QLabel" name="stylelableLabel">
+ <property name="geometry">
+ <rect>
+ <x>140</x>
+ <y>200</y>
+ <width>131</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>Beerstyle data</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="color_methodLabel">
+ <property name="geometry">
+ <rect>
+ <x>370</x>
+ <y>350</y>
+ <width>131</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Color method:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ <widget class="QLabel" name="ibu_methodLabel">
+ <property name="geometry">
+ <rect>
+ <x>370</x>
+ <y>380</y>
+ <width>131</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>IBU method:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ <widget class="QComboBox" name="ibu_methodEdit">
+ <property name="geometry">
+ <rect>
+ <x>510</x>
+ <y>380</y>
+ <width>201</width>
+ <height>23</height>
+ </rect>
+ </property>
+ </widget>
+ <widget class="QLineEdit" name="st_guideEdit">
+ <property name="geometry">
+ <rect>
+ <x>140</x>
+ <y>230</y>
+ <width>226</width>
+ <height>23</height>
+ </rect>
+ </property>
+ <property name="dragEnabled">
+ <bool>true</bool>
+ </property>
+ </widget>
+ <widget class="QLineEdit" name="st_typeEdit">
+ <property name="geometry">
+ <rect>
+ <x>140</x>
+ <y>260</y>
+ <width>226</width>
+ <height>23</height>
+ </rect>
+ </property>
+ <property name="dragEnabled">
+ <bool>true</bool>
+ </property>
+ </widget>
+ <widget class="QLineEdit" name="st_nameEdit">
+ <property name="geometry">
+ <rect>
+ <x>510</x>
+ <y>230</y>
+ <width>226</width>
+ <height>23</height>
+ </rect>
+ </property>
+ <property name="dragEnabled">
+ <bool>true</bool>
+ </property>
+ </widget>
+ <widget class="QLineEdit" name="st_catEdit">
+ <property name="geometry">
+ <rect>
+ <x>510</x>
+ <y>260</y>
+ <width>226</width>
+ <height>23</height>
+ </rect>
+ </property>
+ <property name="dragEnabled">
+ <bool>true</bool>
+ </property>
+ </widget>
+ <widget class="QLineEdit" name="st_groupEdit">
+ <property name="geometry">
+ <rect>
+ <x>880</x>
+ <y>230</y>
+ <width>101</width>
+ <height>23</height>
+ </rect>
+ </property>
+ <property name="dragEnabled">
+ <bool>true</bool>
+ </property>
+ </widget>
+ <widget class="QLineEdit" name="st_catnrEdit">
+ <property name="geometry">
+ <rect>
+ <x>880</x>
+ <y>260</y>
+ <width>71</width>
+ <height>23</height>
+ </rect>
+ </property>
+ <property name="dragEnabled">
+ <bool>true</bool>
+ </property>
+ </widget>
+ <widget class="QLabel" name="est_ibuLabel">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>380</y>
+ <width>131</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Bitterness IBU:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ <widget class="QDoubleSpinBox" name="est_ibuEdit">
+ <property name="geometry">
+ <rect>
+ <x>140</x>
+ <y>380</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="minimum">
+ <double>0.000000000000000</double>
+ </property>
+ <property name="maximum">
+ <double>400.000000000000000</double>
+ </property>
+ <property name="singleStep">
+ <double>1.000000000000000</double>
+ </property>
+ </widget>
+ <widget class="RangedSlider" name="est_ibuShow">
+ <property name="geometry">
+ <rect>
+ <x>220</x>
+ <y>380</y>
+ <width>148</width>
+ <height>24</height>
+ </rect>
+ </property>
+ </widget>
+ <widget class="RangedSlider" name="est_carbShow">
+ <property name="geometry">
+ <rect>
+ <x>960</x>
+ <y>350</y>
+ <width>148</width>
+ <height>24</height>
+ </rect>
+ </property>
+ </widget>
+ <widget class="QDoubleSpinBox" name="est_carbEdit">
+ <property name="geometry">
+ <rect>
+ <x>880</x>
+ <y>350</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>
+ <property name="decimals">
+ <number>1</number>
+ </property>
+ <property name="minimum">
+ <double>0.000000000000000</double>
+ </property>
+ <property name="maximum">
+ <double>80.000000000000000</double>
+ </property>
+ <property name="singleStep">
+ <double>0.100000000000000</double>
+ </property>
+ </widget>
+ <widget class="QLabel" name="est_carbLabel">
+ <property name="geometry">
+ <rect>
+ <x>740</x>
+ <y>350</y>
+ <width>131</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Carbonation:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
</widget>
<widget class="QWidget" name="fermentables">
<attribute name="icon">
@@ -738,11 +1109,6 @@
</widget>
<customwidgets>
<customwidget>
- <class>BeerColor</class>
- <extends>QWidget</extends>
- <header>BeerColor.h</header>
- </customwidget>
- <customwidget>
<class>RangedSlider</class>
<extends>QWidget</extends>
<header>RangedSlider.h</header>