Mercurial > bmsapp / file diff

--- a/ui/EditRecipe.ui	Wed Mar 30 23:15:08 2022 +0200
+++ b/ui/EditRecipe.ui	Thu Mar 31 16:24:03 2022 +0200
@@ -394,7 +394,7 @@
        <widget class="RangedSlider" name="est_ogShow">
         <property name="geometry">
          <rect>
-          <x>140</x>
+          <x>220</x>
           <y>200</y>
           <width>148</width>
           <height>37</height>
@@ -423,11 +423,115 @@
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
-       <widget class="RangedSlider" name="rangeSliderWidget">
+       <widget class="QDoubleSpinBox" name="est_ogEdit">
+        <property name="geometry">
+         <rect>
+          <x>140</x>
+          <y>200</y>
+          <width>71</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="decimals">
+         <number>3</number>
+        </property>
+        <property name="minimum">
+         <double>0.980000000000000</double>
+        </property>
+        <property name="maximum">
+         <double>2.000000000000000</double>
+        </property>
+        <property name="singleStep">
+         <double>0.001000000000000</double>
+        </property>
+       </widget>
+       <widget class="QLabel" name="est_fgLabel">
+        <property name="geometry">
+         <rect>
+          <x>0</x>
+          <y>260</y>
+          <width>131</width>
+          <height>20</height>
+         </rect>
+        </property>
+        <property name="text">
+         <string>Estimated FG:</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+       <widget class="QLabel" name="est_abvLabel">
         <property name="geometry">
          <rect>
-          <x>90</x>
-          <y>350</y>
+          <x>0</x>
+          <y>320</y>
+          <width>131</width>
+          <height>20</height>
+         </rect>
+        </property>
+        <property name="text">
+         <string>Estimated ABV:</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+       <widget class="QLabel" name="est_colorLabel">
+        <property name="geometry">
+         <rect>
+          <x>0</x>
+          <y>380</y>
+          <width>131</width>
+          <height>20</height>
+         </rect>
+        </property>
+        <property name="text">
+         <string>Estimated Color EBC:</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+       <widget class="QDoubleSpinBox" name="est_fgEdit">
+        <property name="geometry">
+         <rect>
+          <x>140</x>
+          <y>260</y>
+          <width>71</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="decimals">
+         <number>3</number>
+        </property>
+        <property name="minimum">
+         <double>0.980000000000000</double>
+        </property>
+        <property name="maximum">
+         <double>2.000000000000000</double>
+        </property>
+        <property name="singleStep">
+         <double>0.001000000000000</double>
+        </property>
+       </widget>
+       <widget class="RangedSlider" name="est_fgShow">
+        <property name="geometry">
+         <rect>
+          <x>220</x>
+          <y>260</y>
           <width>148</width>
           <height>37</height>
          </rect>
@@ -439,11 +543,70 @@
          <string>Slider that shows if a value is in range.</string>
         </property>
        </widget>
-       <widget class="RangedSlider" name="rangedSliderWidget">
+       <widget class="QDoubleSpinBox" name="est_abvEdit">
         <property name="geometry">
          <rect>
-          <x>350</x>
-          <y>350</y>
+          <x>140</x>
+          <y>320</y>
+          <width>71</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> %</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="QDoubleSpinBox" name="est_colorEdit">
+        <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="accelerated">
+         <bool>true</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_abvShow">
+        <property name="geometry">
+         <rect>
+          <x>220</x>
+          <y>320</y>
           <width>148</width>
           <height>37</height>
          </rect>
@@ -455,21 +618,15 @@
          <string>Slider that shows if a value is in range.</string>
         </property>
        </widget>
-       <widget class="NullDateEdit" name="nullDatEditWidget">
+       <widget class="BeerColor" name="est_colorShow">
         <property name="geometry">
          <rect>
-          <x>660</x>
-          <y>360</y>
-          <width>101</width>
-          <height>24</height>
+          <x>590</x>
+          <y>270</y>
+          <width>90</width>
+          <height>130</height>
          </rect>
         </property>
-        <property name="toolTip">
-         <string>Date editor</string>
-        </property>
-        <property name="whatsThis">
-         <string>Date editor that allows a null date.</string>
-        </property>
        </widget>
       </widget>
       <widget class="QWidget" name="fermentables">
@@ -567,9 +724,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>NullDateEdit</class>
-   <extends>QDateEdit</extends>
-   <header>NullDateEdit.h</header>
+   <class>BeerColor</class>
+   <extends>QWidget</extends>
+   <header>BeerColor.h</header>
   </customwidget>
   <customwidget>
    <class>RangedSlider</class>