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