Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml
===================================================================
diff -u -r73da05e9b761c559cd4d6741e574fc0f40475ebc -r83d2e1a9625c2035214bf6604d1603736877dab8
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml	(.../TreatmentAdjustmentVitalsInterval.qml)	(revision 73da05e9b761c559cd4d6741e574fc0f40475ebc)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml	(.../TreatmentAdjustmentVitalsInterval.qml)	(revision 83d2e1a9625c2035214bf6604d1603736877dab8)
@@ -30,12 +30,12 @@
     width               : 1000
 
     function confirm() {
-        vTreatmentCreate.bloodPressureMeasureInterval = _bpMeasurementIntervalControl.value
+        vTreatmentCreate.bloodPressureMeasureInterval    = vTreatmentRanges.bloodPressureMeasureInterval[_bpMeasurementIntervalControl.currentIndex]
         vTreatmentVitals.doTimerStart()
         _root.close()
     }
 
-    onOpened: { _bpMeasurementIntervalControl.value = vTreatmentCreate.bloodPressureMeasureInterval }
+    onOpened: _bpMeasurementIntervalControl.currentIndex = vTreatmentRanges.bloodPressureMeasureInterval.indexOf(vTreatmentCreate.bloodPressureMeasureInterval.toString())
 
     LabelUnitContainer { id: _bpMeasurementInterval
         anchors {
@@ -44,25 +44,29 @@
             horizontalCenter: _root.contentItem.horizontalCenter
         }
 
-        text        : qsTr("BP Measurement Interval")
+        text        : qsTr("Vitals Interval")
         unitText    : Variables.unitTextDuration
         valid       : ! vTreatmentCreate.bloodPressureMeasureIntervalRejectReason
         width       : Variables.adjustmentLabelUnitContainerWidth
         height      : Variables.adjustmentLabelUnitContainerHeight
+        titlePixelSize  : Fonts.fontPixelContainerTitleSmall
+        unitPixelSize   : Fonts.fontPixelContainerUnitSmall
+        titleLeftMargin : Variables.defaultMargin * 2
 
-        contentItem : ValueAdjuster { id: _bpMeasurementIntervalControl
-            minimum         : vTreatmentRanges.bloodPressureMeasureIntervalMin
-            maximum         : vTreatmentRanges.bloodPressureMeasureIntervalMax
-            step            : vTreatmentRanges.bloodPressureMeasureIntervalRes
-            defaultValue    : vTreatmentRanges.bloodPressureMeasureIntervalDef
-            value           : vTreatmentCreate.bloodPressureMeasureInterval
-            canOff          : true
-            isActive        : vTreatmentCreate.bloodPressureMeasureIntervalSet
+        contentItem : BaseComboBox { id: _bpMeasurementIntervalControl
+            anchors.rightMargin : Variables.defaultMargin * 2
+            anchors.leftMargin  : anchors.rightMargin
+            anchors.topMargin   : Variables.defaultMargin / 2
+            anchors.bottomMargin: anchors.topMargin
+            isActive            : vTreatmentCreate.bloodPressureMeasureIntervalSet
+            currentIndex        : vTreatmentRanges.bloodPressureMeasureInterval.indexOf(vTreatmentCreate.bloodPressureMeasureInterval.toString())
+            model               : vTreatmentRanges.bloodPressureMeasureInterval
+            onClear             : vTreatmentCreate.bloodPressureMeasureIntervalSet = false
+            canOff              : true
 
-            onDidActiveChange       : function(vState) {  vTreatmentCreate.bloodPressureMeasureIntervalSet = vState }
-            onDidChange     : function(vValue) {
+            onActivated         : {
                 if ( ! _bpMeasurementInterval.valid ) { vTreatmentCreate.bloodPressureMeasureIntervalRejectReason = Variables.noRejectReason }
-                value = vValue
+                vTreatmentCreate.bloodPressureMeasureIntervalSet = true
             }
         }
     }