Mercurial > bmsapp / file diff

--- a/ui/DetailCO2meter.ui	Fri Nov 18 16:57:02 2022 +0100
+++ b/ui/DetailCO2meter.ui	Sat Nov 19 13:55:12 2022 +0100
@@ -22,7 +22,7 @@
         <x>740</x>
         <y>0</y>
         <width>261</width>
-        <height>121</height>
+        <height>231</height>
        </rect>
       </property>
       <widget class="QLabel" name="powerLabel">
@@ -409,18 +409,21 @@
         <x>740</x>
         <y>240</y>
         <width>261</width>
-        <height>161</height>
+        <height>181</height>
        </rect>
       </property>
       <widget class="QDoubleSpinBox" name="minBar">
        <property name="geometry">
         <rect>
-         <x>100</x>
-         <y>90</y>
+         <x>180</x>
+         <y>80</y>
          <width>71</width>
          <height>24</height>
         </rect>
        </property>
+       <property name="toolTip">
+        <string>The minimum calculated pressure in Bar for this beerstyle</string>
+       </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
@@ -446,14 +449,14 @@
       <widget class="QLabel" name="st_barLabel">
        <property name="geometry">
         <rect>
-         <x>10</x>
-         <y>90</y>
-         <width>81</width>
+         <x>180</x>
+         <y>60</y>
+         <width>71</width>
          <height>20</height>
         </rect>
        </property>
        <property name="text">
-        <string>Bar:</string>
+        <string>Bar</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -462,12 +465,15 @@
       <widget class="QDoubleSpinBox" name="maxVol">
        <property name="geometry">
         <rect>
-         <x>180</x>
-         <y>60</y>
+         <x>100</x>
+         <y>110</y>
          <width>71</width>
          <height>24</height>
         </rect>
        </property>
+       <property name="toolTip">
+        <string>The maximum volumes CO2 for this beerstyle</string>
+       </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
@@ -493,14 +499,14 @@
       <widget class="QLabel" name="volLabel">
        <property name="geometry">
         <rect>
-         <x>10</x>
+         <x>100</x>
          <y>60</y>
-         <width>81</width>
+         <width>71</width>
          <height>20</height>
         </rect>
        </property>
        <property name="text">
-        <string>Vol CO2:</string>
+        <string>Vol CO2</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -509,14 +515,14 @@
       <widget class="QLabel" name="maxLabel">
        <property name="geometry">
         <rect>
-         <x>180</x>
-         <y>120</y>
-         <width>71</width>
+         <x>10</x>
+         <y>110</y>
+         <width>81</width>
          <height>20</height>
         </rect>
        </property>
        <property name="text">
-        <string>Maximum</string>
+        <string>Maximum:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -526,11 +532,14 @@
        <property name="geometry">
         <rect>
          <x>100</x>
-         <y>60</y>
+         <y>80</y>
          <width>71</width>
          <height>24</height>
         </rect>
        </property>
+       <property name="toolTip">
+        <string>The minimum volumes CO2 for this beerstyle</string>
+       </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
@@ -557,11 +566,14 @@
        <property name="geometry">
         <rect>
          <x>180</x>
-         <y>90</y>
+         <y>110</y>
          <width>71</width>
          <height>24</height>
         </rect>
        </property>
+       <property name="toolTip">
+        <string>The maximum calculated pressure in Bar for this beerstyle</string>
+       </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
@@ -587,14 +599,14 @@
       <widget class="QLabel" name="minLabel">
        <property name="geometry">
         <rect>
-         <x>100</x>
-         <y>120</y>
-         <width>71</width>
+         <x>10</x>
+         <y>80</y>
+         <width>81</width>
          <height>20</height>
         </rect>
        </property>
        <property name="text">
-        <string>Minimum</string>
+        <string>Minimum:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -623,6 +635,90 @@
         <set>Qt::AlignCenter</set>
        </property>
       </widget>
+      <widget class="QDoubleSpinBox" name="thisBar">
+       <property name="geometry">
+        <rect>
+         <x>180</x>
+         <y>140</y>
+         <width>71</width>
+         <height>24</height>
+        </rect>
+       </property>
+       <property name="toolTip">
+        <string>The expected calculated pressure in Bar for this beer</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>2</number>
+       </property>
+       <property name="maximum">
+        <double>45.000000000000000</double>
+       </property>
+       <property name="singleStep">
+        <double>1.000000000000000</double>
+       </property>
+      </widget>
+      <widget class="QLabel" name="thisLabel">
+       <property name="geometry">
+        <rect>
+         <x>10</x>
+         <y>140</y>
+         <width>81</width>
+         <height>20</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string>This beer:</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+      <widget class="QDoubleSpinBox" name="thisVol">
+       <property name="geometry">
+        <rect>
+         <x>100</x>
+         <y>140</y>
+         <width>71</width>
+         <height>24</height>
+        </rect>
+       </property>
+       <property name="toolTip">
+        <string>The desired volumes CO2 for this beer</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>2</number>
+       </property>
+       <property name="maximum">
+        <double>45.000000000000000</double>
+       </property>
+       <property name="singleStep">
+        <double>1.000000000000000</double>
+       </property>
+      </widget>
      </widget>
      <widget class="QGroupBox" name="buttonBox">
       <property name="geometry">