Mercurial > bmsapp / file diff

--- a/ui/EditRecipe.ui	Tue Apr 12 22:33:24 2022 +0200
+++ b/ui/EditRecipe.ui	Thu Apr 14 21:54:37 2022 +0200
@@ -3185,7 +3185,7 @@
           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
          </property>
         </widget>
-        <widget class="QComboBox" name="w1_sourceEdit">
+        <widget class="QComboBox" name="w1_nameEdit">
          <property name="geometry">
           <rect>
            <x>10</x>
@@ -3204,7 +3204,7 @@
           <string>Choose water</string>
          </property>
         </widget>
-        <widget class="QComboBox" name="w2_sourceEdit">
+        <widget class="QComboBox" name="w2_nameEdit">
          <property name="geometry">
           <rect>
            <x>10</x>
@@ -3216,6 +3216,9 @@
          <property name="toolTip">
           <string>Optional dilution water</string>
          </property>
+         <property name="placeholderText">
+          <string>Choose dilution</string>
+         </property>
         </widget>
         <widget class="QComboBox" name="wt_sourceEdit">
          <property name="geometry">
@@ -3265,7 +3268,7 @@
          <rect>
           <x>10</x>
           <y>230</y>
-          <width>291</width>
+          <width>271</width>
           <height>241</height>
          </rect>
         </property>
@@ -3277,12 +3280,15 @@
           <rect>
            <x>10</x>
            <y>20</y>
-           <width>171</width>
+           <width>151</width>
            <height>20</height>
           </rect>
          </property>
+         <property name="toolTip">
+          <string>Calcium Chloride</string>
+         </property>
          <property name="text">
-          <string>Calcium Chloride (CaCl2):</string>
+          <string>CaCl2:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -3293,12 +3299,15 @@
           <rect>
            <x>10</x>
            <y>50</y>
-           <width>171</width>
+           <width>151</width>
            <height>20</height>
           </rect>
          </property>
+         <property name="toolTip">
+          <string>Gypsym</string>
+         </property>
          <property name="text">
-          <string>Gypsym (CaSO4):</string>
+          <string>CaSO4:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -3309,12 +3318,15 @@
           <rect>
            <x>10</x>
            <y>80</y>
-           <width>171</width>
+           <width>151</width>
            <height>20</height>
           </rect>
          </property>
+         <property name="toolTip">
+          <string>Epsom</string>
+         </property>
          <property name="text">
-          <string>Epsom (MgSO4):</string>
+          <string>MgSO4:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -3325,12 +3337,15 @@
           <rect>
            <x>10</x>
            <y>110</y>
-           <width>171</width>
+           <width>151</width>
            <height>20</height>
           </rect>
          </property>
+         <property name="toolTip">
+          <string>Table salt</string>
+         </property>
          <property name="text">
-          <string>Table salt (NaCl):</string>
+          <string>NaCl:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -3341,12 +3356,15 @@
           <rect>
            <x>10</x>
            <y>140</y>
-           <width>171</width>
+           <width>151</width>
            <height>20</height>
           </rect>
          </property>
+         <property name="toolTip">
+          <string>Magnesium Chloride</string>
+         </property>
          <property name="text">
-          <string>Magnesium Chloride (MgCl2):</string>
+          <string>MgCl2:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -3357,12 +3375,15 @@
           <rect>
            <x>10</x>
            <y>170</y>
-           <width>171</width>
+           <width>151</width>
            <height>20</height>
           </rect>
          </property>
+         <property name="toolTip">
+          <string>Baking soda</string>
+         </property>
          <property name="text">
-          <string>Baking soda (NaHCO3):</string>
+          <string>NaHCO3:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -3373,12 +3394,15 @@
           <rect>
            <x>10</x>
            <y>200</y>
-           <width>171</width>
+           <width>151</width>
            <height>20</height>
           </rect>
          </property>
+         <property name="toolTip">
+          <string>Chalk undissolved</string>
+         </property>
          <property name="text">
-          <string>Chalk undissolved (CaCO3):</string>
+          <string>CaCO3:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -3387,12 +3411,15 @@
         <widget class="QDoubleSpinBox" name="bs_cacl2Edit">
          <property name="geometry">
           <rect>
-           <x>190</x>
+           <x>170</x>
            <y>20</y>
            <width>91</width>
            <height>24</height>
           </rect>
          </property>
+         <property name="toolTip">
+          <string>Calcium Chloride</string>
+         </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
@@ -3415,12 +3442,15 @@
         <widget class="QDoubleSpinBox" name="bs_caso4Edit">
          <property name="geometry">
           <rect>
-           <x>190</x>
+           <x>170</x>
            <y>50</y>
            <width>91</width>
            <height>24</height>
           </rect>
          </property>
+         <property name="toolTip">
+          <string>Gypsym</string>
+         </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
@@ -3443,12 +3473,15 @@
         <widget class="QDoubleSpinBox" name="bs_mgso4Edit">
          <property name="geometry">
           <rect>
-           <x>190</x>
+           <x>170</x>
            <y>80</y>
            <width>91</width>
            <height>24</height>
           </rect>
          </property>
+         <property name="toolTip">
+          <string>Epsom</string>
+         </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
@@ -3471,12 +3504,15 @@
         <widget class="QDoubleSpinBox" name="bs_naclEdit">
          <property name="geometry">
           <rect>
-           <x>190</x>
+           <x>170</x>
            <y>110</y>
            <width>91</width>
            <height>24</height>
           </rect>
          </property>
+         <property name="toolTip">
+          <string>Table salt</string>
+         </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
@@ -3499,12 +3535,15 @@
         <widget class="QDoubleSpinBox" name="bs_mgcl2Edit">
          <property name="geometry">
           <rect>
-           <x>190</x>
+           <x>170</x>
            <y>140</y>
            <width>91</width>
            <height>24</height>
           </rect>
          </property>
+         <property name="toolTip">
+          <string>Magnesium Chloride</string>
+         </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
@@ -3527,12 +3566,15 @@
         <widget class="QDoubleSpinBox" name="bs_nahco3Edit">
          <property name="geometry">
           <rect>
-           <x>190</x>
+           <x>170</x>
            <y>170</y>
            <width>91</width>
            <height>24</height>
           </rect>
          </property>
+         <property name="toolTip">
+          <string>Baking soda</string>
+         </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
@@ -3555,12 +3597,15 @@
         <widget class="QDoubleSpinBox" name="bs_caco3Edit">
          <property name="geometry">
           <rect>
-           <x>190</x>
+           <x>170</x>
            <y>200</y>
            <width>91</width>
            <height>24</height>
           </rect>
          </property>
+         <property name="toolTip">
+          <string>Chalk undissolved</string>
+         </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
@@ -3584,7 +3629,7 @@
        <widget class="QGroupBox" name="mashBox">
         <property name="geometry">
          <rect>
-          <x>360</x>
+          <x>350</x>
           <y>230</y>
           <width>421</width>
           <height>91</height>