Mercurial > bmsapp / file diff

--- a/ui/EditEquipment.ui	Sat Jun 01 21:10:54 2024 +0200
+++ b/ui/EditEquipment.ui	Sat Jun 08 15:54:30 2024 +0200
@@ -146,7 +146,7 @@
         <x>10</x>
         <y>110</y>
         <width>321</width>
-        <height>241</height>
+        <height>331</height>
        </rect>
       </property>
       <property name="title">
@@ -472,27 +472,11 @@
         </rect>
        </property>
       </widget>
-     </widget>
-     <widget class="QGroupBox" name="lauterGroup">
-      <property name="geometry">
-       <rect>
-        <x>10</x>
-        <y>380</y>
-        <width>321</width>
-        <height>91</height>
-       </rect>
-      </property>
-      <property name="title">
-       <string>Lautering</string>
-      </property>
-      <property name="alignment">
-       <set>Qt::AlignCenter</set>
-      </property>
       <widget class="QLabel" name="lauter_deadspaceLabel">
        <property name="geometry">
         <rect>
          <x>10</x>
-         <y>20</y>
+         <y>230</y>
          <width>171</width>
          <height>20</height>
         </rect>
@@ -504,27 +488,11 @@
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
-      <widget class="QLabel" name="efficiencyLabel">
-       <property name="geometry">
-        <rect>
-         <x>10</x>
-         <y>50</y>
-         <width>171</width>
-         <height>20</height>
-        </rect>
-       </property>
-       <property name="text">
-        <string>Brewhouse efficiency:</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
       <widget class="QDoubleSpinBox" name="lauter_deadspaceEdit">
        <property name="geometry">
         <rect>
          <x>190</x>
-         <y>20</y>
+         <y>230</y>
          <width>101</width>
          <height>24</height>
         </rect>
@@ -551,11 +519,43 @@
         <enum>QAbstractSpinBox::DefaultStepType</enum>
        </property>
       </widget>
-      <widget class="QDoubleSpinBox" name="efficiencyEdit">
+      <widget class="QLabel" name="HLT_volumeLabel">
+       <property name="geometry">
+        <rect>
+         <x>10</x>
+         <y>260</y>
+         <width>171</width>
+         <height>20</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string>HLT Volume:</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+      <widget class="QLabel" name="HLT_deadspaceLabel">
+       <property name="geometry">
+        <rect>
+         <x>10</x>
+         <y>290</y>
+         <width>171</width>
+         <height>20</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string>HLT deadspace:</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+      <widget class="QDoubleSpinBox" name="HLT_volumeEdit">
        <property name="geometry">
         <rect>
          <x>190</x>
-         <y>50</y>
+         <y>260</y>
          <width>101</width>
          <height>24</height>
         </rect>
@@ -567,13 +567,13 @@
         <bool>true</bool>
        </property>
        <property name="suffix">
-        <string>%</string>
+        <string> L</string>
        </property>
        <property name="decimals">
         <number>1</number>
        </property>
        <property name="maximum">
-        <double>100.000000000000000</double>
+        <double>100000.000000000000000</double>
        </property>
        <property name="singleStep">
         <double>0.500000000000000</double>
@@ -582,6 +582,37 @@
         <enum>QAbstractSpinBox::DefaultStepType</enum>
        </property>
       </widget>
+      <widget class="QDoubleSpinBox" name="HLT_deadspaceEdit">
+       <property name="geometry">
+        <rect>
+         <x>190</x>
+         <y>290</y>
+         <width>101</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> L</string>
+       </property>
+       <property name="decimals">
+        <number>1</number>
+       </property>
+       <property name="maximum">
+        <double>100000.000000000000000</double>
+       </property>
+       <property name="singleStep">
+        <double>0.100000000000000</double>
+       </property>
+       <property name="stepType">
+        <enum>QAbstractSpinBox::DefaultStepType</enum>
+       </property>
+      </widget>
      </widget>
      <widget class="QGroupBox" name="boilGroup">
       <property name="geometry">
@@ -991,9 +1022,9 @@
       <property name="geometry">
        <rect>
         <x>670</x>
-        <y>380</y>
+        <y>320</y>
         <width>321</width>
-        <height>91</height>
+        <height>121</height>
        </rect>
       </property>
       <property name="title">
@@ -1105,6 +1136,53 @@
         <enum>QAbstractSpinBox::DefaultStepType</enum>
        </property>
       </widget>
+      <widget class="QDoubleSpinBox" name="efficiencyEdit">
+       <property name="geometry">
+        <rect>
+         <x>190</x>
+         <y>80</y>
+         <width>101</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="maximum">
+        <double>100.000000000000000</double>
+       </property>
+       <property name="singleStep">
+        <double>0.500000000000000</double>
+       </property>
+       <property name="stepType">
+        <enum>QAbstractSpinBox::DefaultStepType</enum>
+       </property>
+      </widget>
+      <widget class="QLabel" name="efficiencyLabel">
+       <property name="geometry">
+        <rect>
+         <x>10</x>
+         <y>80</y>
+         <width>171</width>
+         <height>20</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string>Brewhouse efficiency:</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
      </widget>
      <widget class="QPushButton" name="cloneButton">
       <property name="geometry">