Index: sources/gui/qml/pages/treatment/sections/TreatmentTime.qml =================================================================== diff -u -r56b0b13aa9f9e7ae201bce1843015fe5b4b43d2c -r7b71ec23c53c04a24e3db8ace0ca4825ec57d721 --- sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision 56b0b13aa9f9e7ae201bce1843015fe5b4b43d2c) +++ sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision 7b71ec23c53c04a24e3db8ace0ca4825ec57d721) @@ -37,9 +37,24 @@ property bool isComplete : ( vTreatmentTime.time_Remaining <= 0 && vTreatmentTime.time_Elapsed > 0 ) || vTDTreatmentStates.txEnd - property string notificationText: isComplete ? qsTr("Treatment Complete"): - ! isRunning ? qsTr("Treatment Paused") : - "" + property bool isHDTreatment : vTreatmentCreate.treatmentModality === 0 + property bool isHDFTreatment: vTreatmentCreate.treatmentModality === 1 + property bool isIsoTreatment: vTreatmentCreate.treatmentModality === 2 + + property string notificationText: isComplete ? qsTr("Treatment Complete") : + ! isRunning ? qsTr("Treatment Paused") : + isHDTreatment ? qsTr("HD Time") : + isHDFTreatment ? qsTr("HDF Time") : + isIsoTreatment ? qsTr("Isolated UF Time") : + "" + + property color notificationColor: isComplete ? Colors.statusComplete : + ! isRunning ? Colors.statusTextPaused : + isHDTreatment || + isHDFTreatment || + isIsoTreatment ? Colors.statusTextActive : + "" + property bool editEnabled : ! isTreatmentEnd // LEAHI-PRS-376 color : "transparent" @@ -57,7 +72,7 @@ value : _root.progressValue thickness : 35 circleShadowColor : Colors.mainTreatmentLighterBlue - circleFillColor : Colors.mainTreatmentDarkerBlue + circleFillColor : Colors.transparent runAnimation : ! _root.isRunning MouseArea { id: _mouseArea @@ -77,6 +92,7 @@ textWeight : Font.Normal secsPixelSize : 35 secondsLeftMargin : 10 + textColor : _root.isRunning || _root.isComplete ? Colors.offWhite : Colors.mainTreatmentOrange } Item { id: _timeTitleRect @@ -127,15 +143,14 @@ topMargin : Variables.defaultMargin * 2 } - visible : ! _root.isRunning || _root.isComplete height : 25 color : "transparent" imageDiameter : 25 imageTopMargin : 4 imageSource : "qrc:/images/iPauseOrange" - imageVisible : ! _root.isComplete + imageVisible : ! _root.isRunning && ! _root.isComplete text : _root.notificationText - textColor : _root.isComplete ? Colors.mainTreatmentGreen : Colors.mainTreatmentOrange + textColor : _root.notificationColor textfontSize : 26 textfontWeight : Font.Medium }