Index: sources/gui/qml/components/TextEntry.qml =================================================================== diff -u -r86df7ff03ea32f9cd8a18bbbc7b2e01de64c783f -rd14136d218b5dbc0734f7949b30541d242bcd350 --- sources/gui/qml/components/TextEntry.qml (.../TextEntry.qml) (revision 86df7ff03ea32f9cd8a18bbbc7b2e01de64c783f) +++ sources/gui/qml/components/TextEntry.qml (.../TextEntry.qml) (revision d14136d218b5dbc0734f7949b30541d242bcd350) @@ -102,11 +102,9 @@ width : TextEntry.InputWidth text : "" font.pixelSize : Fonts.fontPixelTextRectExtra - color : acceptableInput && enabled ? Colors.textMain : - _root.showDisabledColor && - ! enabled ? - Colors.borderDisableButton : - Colors.red + color : _root.showDisabledColor && ! enabled ? Colors.borderDisableButton : + acceptableInput ? Colors.textMain : + Colors.red selectionColor : Colors.borderButtonHalfDarker selectedTextColor : acceptableInput ? Colors.textMain : Colors.red anchors.left : _separator.right Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationConfirm.qml =================================================================== diff -u -rd948f4557217f1f0258e027a81e0b939a72fcae6 -rd14136d218b5dbc0734f7949b30541d242bcd350 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationConfirm.qml (.../TreatmentAdjustmentDurationConfirm.qml) (revision d948f4557217f1f0258e027a81e0b939a72fcae6) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationConfirm.qml (.../TreatmentAdjustmentDurationConfirm.qml) (revision d14136d218b5dbc0734f7949b30541d242bcd350) @@ -36,56 +36,76 @@ signal confirmClicked(int vNewTreatmentDuration) - Item { id: _infoArea - objectName: "_infoArea" + Row { id: _infoRow + objectName: "_infoRow" + + readonly property int cellWidth: _root.width / 3.5 + anchors { - top: parent.top - bottom: _confirmButton.top - left: parent.left - leftMargin: Variables.defaultMargin * 2 - right: parent.right - rightMargin : anchors.leftMargin + top : parent.top + topMargin : Variables.defaultMargin * 2 + horizontalCenter: parent.horizontalCenter } + spacing: Variables.defaultMargin * 2 - Row { id: _infoRow - objectName: "_infoRow" + LabelUnitText { id: _newTreatmentDuration + objectName: "_newTreatmentDuration" + width : _infoRow.cellWidth + label : qsTr("New Treatment Duration") + unit : Variables.unitTextDuration + value : _root.newTreatmentDuration + valueColor : Colors.ufVolumeGoalText + } - readonly property int cellWidth: (_infoRow.width - (_infoRow.spacing * 2)) / 3 + LabelUnitText { id: _ufVolumeGoal + objectName : "_ufVolumeGoal" + width : _infoRow.cellWidth + label : qsTr("UF Volume Goal") + unit : Variables.unitVolume + value : _root.ufVolumeGoal.toFixed(Variables.ultrafiltrationPrecision) + valueColor : Colors.ufVolumeGoalText + } + } - anchors { - left : parent.left - right : parent.right - verticalCenter : parent.verticalCenter - } - spacing: Variables.defaultMargin * 2 + Rectangle { id: _divider + objectName: "_divider" + anchors { + top: _infoRow.bottom + topMargin: Variables.defaultMargin * 3 + left: parent.left + leftMargin: 50 + right: parent.right + rightMargin: anchors.leftMargin + } + height : 2 + color : Colors.panelBorderColor + } - LabelUnitText { id: _ufVolumeGoal - objectName : "_ufVolumeGoal" - width : _infoRow.cellWidth - label : qsTr("UF Volume Goal") - unit : Variables.unitVolume - value : _root.ufVolumeGoal.toFixed(Variables.ultrafiltrationPrecision) - valueColor : Colors.ufVolumeGoalText - } + Text { id: _description + objectName : "_description" + anchors { + top: _divider.bottom + topMargin: _divider.anchors.topMargin + horizontalCenter: parent.horizontalCenter + } +// width : _infoRow.cellWidth + text : qsTr("A new UF rate will be applied to achieve the ultrafiltration volume goal.") + color : Colors.offWhite + font.pixelSize : Fonts.fontPixelContainerTitleSmall + } - LabelUnitText { id: _ufRate - objectName : "_ufRate" - width : _infoRow.cellWidth - label : qsTr("New UF Rate") - unit : Variables.unitTextRate - value : _root.ufRate.toFixed(Variables.ultrafiltrationPrecision) - valueColor : Colors.ufVolumeGoalText - } - - LabelUnitText { id: _newTreatmentDuration - objectName: "_newTreatmentDuration" - width : _infoRow.cellWidth - label : qsTr("New Treatment Duration") - unit : Variables.unitTextDuration - value : _root.newTreatmentDuration - valueColor : Colors.ufVolumeGoalText - } + LabelUnitText { id: _ufRate + objectName : "_ufRate" + anchors { + top: _description.bottom + topMargin: _description.anchors.topMargin + horizontalCenter: parent.horizontalCenter } + width : _infoRow.cellWidth + label : qsTr("New UF Rate") + unit : Variables.unitTextRate + value : _root.ufRate.toFixed(Variables.ultrafiltrationPrecision) + valueColor : Colors.ufVolumeGoalText } TouchRect { id: _confirmButton Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationEdit.qml =================================================================== diff -u -rc9764bd0ad823c5c1725d7c7f556290c2c459d4d -rd14136d218b5dbc0734f7949b30541d242bcd350 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationEdit.qml (.../TreatmentAdjustmentDurationEdit.qml) (revision c9764bd0ad823c5c1725d7c7f556290c2c459d4d) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationEdit.qml (.../TreatmentAdjustmentDurationEdit.qml) (revision d14136d218b5dbc0734f7949b30541d242bcd350) @@ -49,43 +49,39 @@ _newTreatmentDuration.value = _private.treatmentTimeTotal } - Row { id: _infoRow + Item { id: _infoRow objectName: "_infoRow" - readonly property int cellWidth: (_infoRow.width - (_infoRow.spacing * 2)) / 3 + readonly property int cellWidth: _root.width / 3.5 + height: _timeElapsed.height anchors { - top: parent.top - topMargin: Variables.defaultMargin * 2 - left: parent.left - leftMargin: Variables.defaultMargin * 2 - right: parent.right - rightMargin: anchors.leftMargin + top : parent.top + topMargin : Variables.defaultMargin * 2 + left : parent.left + right : parent.right } - spacing: Variables.defaultMargin - LabelUnitText { id: _ufVolumeRemoved - objectName : "_ufVolumeRemoved" - width : _infoRow.cellWidth - label : qsTr("UF Volume Removed") - unit : Variables.unitVolume - value : _private.ufVolumeRemoved - } - - LabelUnitText { id: _ufVolumeGoal - objectName : "_ufVolumeGoal" - width : _infoRow.cellWidth - label : qsTr("UF Volume Goal") - unit : Variables.unitVolume - value : _private.ufSetVolume - } - LabelUnitText { id: _timeElapsed objectName : "_timeElapsed" width : _infoRow.cellWidth - label : qsTr("Treatment Time Elapsed") - unit : Variables.unitTextDuration - value : vTreatmentTime.time_Elapsed + label : qsTr("Treatment Time Elapsed:") + anchors.horizontalCenter: parent.horizontalCenter + + TimeText { id: _timeText + objectName: "timeText" + + anchors { + right : parent.right + rightMargin : Variables.defaultMargin * 2 + verticalCenter : parent.verticalCenter + verticalCenterOffset: -2 + } + seconds : vTreatmentTime.time_Elapsed + textWeight : Font.Normal + textPixelSize : Fonts.fontPixelContainerTitle + secondsLeftMargin : 5 + } } } @@ -99,9 +95,8 @@ right: parent.right rightMargin: anchors.leftMargin } - height: 2 - color: Colors.panelBorderColor - + height : 2 + color : Colors.panelBorderColor } LabelUnitValueAdjuster { id: _newTreatmentDuration Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml =================================================================== diff -u -rc749ecd5dc413ce091250af652ccba4d96f7a582 -rd14136d218b5dbc0734f7949b30541d242bcd350 --- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision c749ecd5dc413ce091250af652ccba4d96f7a582) +++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision d14136d218b5dbc0734f7949b30541d242bcd350) @@ -31,6 +31,7 @@ readonly property real minimum : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Min readonly property real maximum : vTreatmentUltrafiltration.setVolume readonly property real value : vTreatmentUltrafiltration.volumeRemoved + readonly property real paused : vTreatmentUltrafiltration.ufPaused readonly property int topTextFontSize : 25 readonly property int bottomTextFontSize : 60 readonly property bool isUfCompleted : value >= maximum