Mercurial > bmsapp / file diff

--- a/ui/EditProduct.ui	Thu May 05 20:43:45 2022 +0200
+++ b/ui/EditProduct.ui	Sat May 07 13:55:36 2022 +0200
@@ -2933,9 +2933,9 @@
        <widget class="QStackedWidget" name="yeastProcedure">
         <property name="geometry">
          <rect>
-          <x>320</x>
+          <x>370</x>
           <y>10</y>
-          <width>791</width>
+          <width>741</width>
           <height>261</height>
          </rect>
         </property>
@@ -2947,7 +2947,7 @@
          <widget class="QDoubleSpinBox" name="pitchrateEdit">
           <property name="geometry">
            <rect>
-            <x>610</x>
+            <x>550</x>
             <y>10</y>
             <width>91</width>
             <height>24</height>
@@ -2975,7 +2975,7 @@
          <widget class="QLabel" name="pitchrateLabel">
           <property name="geometry">
            <rect>
-            <x>420</x>
+            <x>360</x>
             <y>10</y>
             <width>181</width>
             <height>20</height>
@@ -2991,7 +2991,7 @@
          <widget class="QComboBox" name="stmethodEdit">
           <property name="geometry">
            <rect>
-            <x>230</x>
+            <x>200</x>
             <y>10</y>
             <width>101</width>
             <height>23</height>
@@ -3001,7 +3001,7 @@
          <widget class="QLabel" name="stmethodLabel">
           <property name="geometry">
            <rect>
-            <x>40</x>
+            <x>10</x>
             <y>10</y>
             <width>181</width>
             <height>20</height>
@@ -3017,7 +3017,7 @@
          <widget class="QLabel" name="startersgLabel">
           <property name="geometry">
            <rect>
-            <x>40</x>
+            <x>10</x>
             <y>40</y>
             <width>181</width>
             <height>20</height>
@@ -3033,7 +3033,7 @@
          <widget class="QDoubleSpinBox" name="startersgEdit">
           <property name="geometry">
            <rect>
-            <x>230</x>
+            <x>200</x>
             <y>40</y>
             <width>71</width>
             <height>24</height>
@@ -3064,7 +3064,7 @@
          <widget class="QToolButton" name="pitchrateButton">
           <property name="geometry">
            <rect>
-            <x>710</x>
+            <x>655</x>
             <y>10</y>
             <width>28</width>
             <height>22</height>
@@ -3084,7 +3084,7 @@
          <widget class="QTableWidget" name="starterTable">
           <property name="geometry">
            <rect>
-            <x>80</x>
+            <x>50</x>
             <y>100</y>
             <width>636</width>
             <height>146</height>
@@ -3431,17 +3431,17 @@
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
-       <widget class="QToolButton" name="productionButton">
-        <property name="geometry">
-         <rect>
-          <x>280</x>
+       <widget class="QToolButton" name="productionButton1">
+        <property name="geometry">
+         <rect>
+          <x>290</x>
           <y>130</y>
           <width>28</width>
           <height>22</height>
          </rect>
         </property>
         <property name="toolTip">
-         <string>Set or clear date</string>
+         <string>Set the date to today.</string>
         </property>
         <property name="text">
          <string>...</string>
@@ -3451,22 +3451,6 @@
           <normaloff>:/icons/silk/date.png</normaloff>:/icons/silk/date.png</iconset>
         </property>
        </widget>
-       <widget class="QLineEdit" name="productionEdit">
-        <property name="geometry">
-         <rect>
-          <x>170</x>
-          <y>130</y>
-          <width>101</width>
-          <height>23</height>
-         </rect>
-        </property>
-        <property name="toolTip">
-         <string>End of primary fermentation, start secondary.</string>
-        </property>
-        <property name="readOnly">
-         <bool>true</bool>
-        </property>
-       </widget>
        <widget class="QSpinBox" name="conditionShow">
         <property name="geometry">
          <rect>
@@ -3491,6 +3475,48 @@
         <property name="suffix">
          <string> %</string>
         </property>
+        <property name="maximum">
+         <number>100</number>
+        </property>
+       </widget>
+       <widget class="NullDateEdit" name="productionEdit">
+        <property name="geometry">
+         <rect>
+          <x>170</x>
+          <y>130</y>
+          <width>111</width>
+          <height>24</height>
+         </rect>
+        </property>
+        <property name="toolTip">
+         <string>Edit the production date.</string>
+        </property>
+        <property name="displayFormat">
+         <string>dd-MM-yyyy</string>
+        </property>
+        <property name="calendarPopup">
+         <bool>true</bool>
+        </property>
+       </widget>
+       <widget class="QToolButton" name="productionButton2">
+        <property name="geometry">
+         <rect>
+          <x>320</x>
+          <y>130</y>
+          <width>28</width>
+          <height>22</height>
+         </rect>
+        </property>
+        <property name="toolTip">
+         <string>Clear the date</string>
+        </property>
+        <property name="text">
+         <string>...</string>
+        </property>
+        <property name="icon">
+         <iconset resource="../../../../../../home/mbroek/MyProjects/bmsapp/resources/icons.qrc">
+          <normaloff>:/icons/silk/delete.png</normaloff>:/icons/silk/delete.png</iconset>
+        </property>
        </widget>
       </widget>
       <widget class="QWidget" name="mash">
@@ -10049,6 +10075,11 @@
  </widget>
  <customwidgets>
   <customwidget>
+   <class>NullDateEdit</class>
+   <extends>QDateEdit</extends>
+   <header>NullDateEdit.h</header>
+  </customwidget>
+  <customwidget>
    <class>RangedSlider</class>
    <extends>QWidget</extends>
    <header>RangedSlider.h</header>