Index: sources/gui/qml/components/BaseComboBox.qml =================================================================== diff -u -r1132f049e169cc87a059261f72fca0ceb7d739f1 -rec53ffe0a1528ace958cfe347875b7bcd25bed57 --- sources/gui/qml/components/BaseComboBox.qml (.../BaseComboBox.qml) (revision 1132f049e169cc87a059261f72fca0ceb7d739f1) +++ sources/gui/qml/components/BaseComboBox.qml (.../BaseComboBox.qml) (revision ec53ffe0a1528ace958cfe347875b7bcd25bed57) @@ -30,6 +30,7 @@ property int delegateHeight : height property bool canOff : false property bool centerHorizontally: false + property var itemsEnabled : Array(_root.count).fill(true) width : 300 displayText : _root.isActive ? currentText : Variables.emptyEntry @@ -61,10 +62,11 @@ width : _root.delegateWidth height : _root.delegateHeight highlighted : _root.highlightedIndex === index + enabled : _root.itemsEnabled[index] contentItem: Text { text : canOff && modelData === "0" ? qsTr("OFF") : modelData - color : Colors.offWhite + color : enabled ? Colors.offWhite : Colors.textDisableButton font : _root.font verticalAlignment : Text.AlignVCenter horizontalAlignment : centerHorizontally ? Text.AlignHCenter : undefined Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml =================================================================== diff -u -r456da384df52c20ce45b2bec4317806ee11af1f6 -rec53ffe0a1528ace958cfe347875b7bcd25bed57 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml (.../PreTreatmentCreatePatientPrescription.qml) (revision 456da384df52c20ce45b2bec4317806ee11af1f6) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml (.../PreTreatmentCreatePatientPrescription.qml) (revision ec53ffe0a1528ace958cfe347875b7bcd25bed57) @@ -12,8 +12,9 @@ readonly property int cellWidth : Variables.createRxLabelUnitContainerWidth readonly property int cellHeight : Variables.createRxLabelUnitContainerHeight readonly property bool heparinFeatured : vSettings.heparinSyringePump - property bool isHDFFeatured : vTreatmentCreate.treatmentModality === HeaderBar.Mode_HDF - property bool isHeparinOn : _heparinRxControl.value === PreTreatmentCreatePatientPrescription.ON + property bool isHDFFeatured : vTreatmentCreate.treatmentModality === HeaderBar.Mode_HDF || + vTreatmentCreate.treatmentModality === HeaderBar.Mode_HD_Online_Fluid + property bool isHeparinOn : _heparinRxControl.value === PreTreatmentCreatePatientPrescription.ON property bool editingEnabled : true property int columnSpacing : 15 @@ -154,6 +155,9 @@ currentIndex : vTreatmentCreate.treatmentModality model : vTreatmentRanges.treatmentModalityOptions centerHorizontally : true + itemsEnabled : [ vTreatmentCreate.treatmentModality === HeaderBar.Mode_HD , // Mode_HD + vTreatmentCreate.treatmentModality !== HeaderBar.Mode_HD , // Mode_HDF + vTreatmentCreate.treatmentModality !== HeaderBar.Mode_HD ] // Mode_HD_Online_Fluid onActivated : { if ( ! _treatmentModality.valid ) { vTreatmentCreate.treatmentModalityRejectReason = Variables.noRejectReason }