Mercurial > bmsapp / file diff

--- a/ui/EditWater.ui	Tue Jul 12 16:01:49 2022 +0200
+++ b/ui/EditWater.ui	Sat Jul 16 15:06:40 2022 +0200
@@ -292,7 +292,7 @@
        </rect>
       </property>
       <property name="text">
-       <string>Acid pH:</string>
+       <string>pH:</string>
       </property>
       <property name="alignment">
        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -440,7 +440,7 @@
       <property name="geometry">
        <rect>
         <x>510</x>
-        <y>210</y>
+        <y>150</y>
         <width>121</width>
         <height>24</height>
        </rect>
@@ -468,7 +468,7 @@
       <property name="geometry">
        <rect>
         <x>510</x>
-        <y>240</y>
+        <y>180</y>
         <width>121</width>
         <height>24</height>
        </rect>
@@ -495,17 +495,23 @@
      <widget class="QDoubleSpinBox" name="hcoEdit">
       <property name="geometry">
        <rect>
-        <x>510</x>
-        <y>150</y>
-        <width>121</width>
+        <x>850</x>
+        <y>210</y>
+        <width>111</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>
+       <bool>false</bool>
       </property>
       <property name="decimals">
        <number>1</number>
@@ -513,9 +519,6 @@
       <property name="maximum">
        <double>1000.000000000000000</double>
       </property>
-      <property name="singleStep">
-       <double>0.100000000000000</double>
-      </property>
       <property name="stepType">
        <enum>QAbstractSpinBox::DefaultStepType</enum>
       </property>
@@ -523,8 +526,8 @@
      <widget class="QDoubleSpinBox" name="alkalinityEdit">
       <property name="geometry">
        <rect>
-        <x>770</x>
-        <y>150</y>
+        <x>510</x>
+        <y>210</y>
         <width>121</width>
         <height>24</height>
        </rect>
@@ -585,9 +588,9 @@
      <widget class="QLabel" name="so4Label">
       <property name="geometry">
        <rect>
-        <x>320</x>
-        <y>210</y>
-        <width>181</width>
+        <x>300</x>
+        <y>150</y>
+        <width>201</width>
         <height>20</height>
        </rect>
       </property>
@@ -601,9 +604,9 @@
      <widget class="QLabel" name="clLabel">
       <property name="geometry">
        <rect>
-        <x>350</x>
-        <y>240</y>
-        <width>151</width>
+        <x>300</x>
+        <y>180</y>
+        <width>201</width>
         <height>20</height>
        </rect>
       </property>
@@ -617,8 +620,8 @@
      <widget class="QLabel" name="hcoLabel">
       <property name="geometry">
        <rect>
-        <x>310</x>
-        <y>150</y>
+        <x>650</x>
+        <y>210</y>
         <width>191</width>
         <height>20</height>
        </rect>
@@ -633,14 +636,14 @@
      <widget class="QLabel" name="alkalinityLabel">
       <property name="geometry">
        <rect>
-        <x>640</x>
-        <y>150</y>
-        <width>121</width>
+        <x>300</x>
+        <y>210</y>
+        <width>201</width>
         <height>20</height>
        </rect>
       </property>
       <property name="text">
-       <string>or (CaCO3) mg/L:</string>
+       <string>Total Alkalinity (CaCO3) mg/L:</string>
       </property>
       <property name="alignment">
        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -656,7 +659,7 @@
        </rect>
       </property>
       <property name="text">
-       <string>Ion balance meq/L:</string>
+       <string>Ion balance mEq/L:</string>
       </property>
       <property name="alignment">
        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -678,9 +681,9 @@
      <widget class="QLabel" name="noLabel">
       <property name="geometry">
        <rect>
-        <x>350</x>
-        <y>270</y>
-        <width>151</width>
+        <x>300</x>
+        <y>240</y>
+        <width>201</width>
         <height>20</height>
        </rect>
       </property>
@@ -695,7 +698,7 @@
       <property name="geometry">
        <rect>
         <x>510</x>
-        <y>270</y>
+        <y>240</y>
         <width>121</width>
         <height>24</height>
        </rect>
@@ -722,9 +725,9 @@
      <widget class="QLabel" name="co3Label">
       <property name="geometry">
        <rect>
-        <x>320</x>
-        <y>180</y>
-        <width>181</width>
+        <x>650</x>
+        <y>240</y>
+        <width>191</width>
         <height>20</height>
        </rect>
       </property>
@@ -738,9 +741,9 @@
      <widget class="QDoubleSpinBox" name="co3Edit">
       <property name="geometry">
        <rect>
-        <x>510</x>
-        <y>180</y>
-        <width>106</width>
+        <x>850</x>
+        <y>240</y>
+        <width>111</width>
         <height>24</height>
        </rect>
       </property>
@@ -769,6 +772,106 @@
        <enum>QAbstractSpinBox::DefaultStepType</enum>
       </property>
      </widget>
+     <widget class="QLabel" name="hardnessLabel">
+      <property name="geometry">
+       <rect>
+        <x>650</x>
+        <y>150</y>
+        <width>191</width>
+        <height>20</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Hardness as CaCO3:</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+      </property>
+     </widget>
+     <widget class="QLabel" name="raLabel">
+      <property name="geometry">
+       <rect>
+        <x>650</x>
+        <y>180</y>
+        <width>191</width>
+        <height>20</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Residual Alkalinity as CaCO3:</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+      </property>
+     </widget>
+     <widget class="QDoubleSpinBox" name="hardnessEdit">
+      <property name="geometry">
+       <rect>
+        <x>850</x>
+        <y>150</y>
+        <width>111</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>1</number>
+      </property>
+      <property name="maximum">
+       <double>1000.000000000000000</double>
+      </property>
+      <property name="singleStep">
+       <double>0.100000000000000</double>
+      </property>
+      <property name="stepType">
+       <enum>QAbstractSpinBox::DefaultStepType</enum>
+      </property>
+     </widget>
+     <widget class="QDoubleSpinBox" name="raEdit">
+      <property name="geometry">
+       <rect>
+        <x>850</x>
+        <y>180</y>
+        <width>111</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>1000.000000000000000</double>
+      </property>
+      <property name="singleStep">
+       <double>0.100000000000000</double>
+      </property>
+      <property name="stepType">
+       <enum>QAbstractSpinBox::DefaultStepType</enum>
+      </property>
+     </widget>
     </widget>
    </item>
   </layout>