Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationConfirm.qml =================================================================== diff -u -rdd02afaf66a118eb50deb9313e6a809dd17b5864 -rb439b3c189b98fbe944c924ef3ff0943b83edc42 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationConfirm.qml (.../TreatmentAdjustmentDurationConfirm.qml) (revision dd02afaf66a118eb50deb9313e6a809dd17b5864) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationConfirm.qml (.../TreatmentAdjustmentDurationConfirm.qml) (revision b439b3c189b98fbe944c924ef3ff0943b83edc42) @@ -90,7 +90,7 @@ horizontalAlignment : Text.AlignLeft color : Colors.ufVolumeGoalText font { - pixelSize : Fonts.fontPixelValueControl + pixelSize : Fonts.fontPixelContainerTitle weight : Font.DemiBold } } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationEdit.qml =================================================================== diff -u -r914308e6f87b8074bff379371379d238e7781ed3 -rb439b3c189b98fbe944c924ef3ff0943b83edc42 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationEdit.qml (.../TreatmentAdjustmentDurationEdit.qml) (revision 914308e6f87b8074bff379371379d238e7781ed3) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationEdit.qml (.../TreatmentAdjustmentDurationEdit.qml) (revision b439b3c189b98fbe944c924ef3ff0943b83edc42) @@ -54,7 +54,7 @@ property alias valueText: _labelUnitContainerText.text - width : 500 + width : (_infoRow.width - (_infoRow.spacing * 2)) / 3 height : Variables.adjustmentLabelUnitContainerHeight titleFontPixelSize : Fonts.fontPixelContainerTitleSmall unitText : Variables.unitTextDialCond @@ -75,46 +75,33 @@ anchors { top: parent.top topMargin: Variables.defaultMargin * 2 + left: parent.left + leftMargin: Variables.defaultMargin * 2 + right: parent.right + rightMargin: anchors.leftMargin horizontalCenter: parent.horizontalCenter } spacing: Variables.defaultMargin - Column { id: _infoLeftColumn - objectName: "_infoLeftColumn" - spacing: Variables.defaultMargin + LabelUnitText { id: _ufVolumeRemoved + objectName : "_ufVolumeRemoved" + text : qsTr("UF Volume Removed") + unitText : Variables.unitVolume + valueText : _private.ufVolumeRemoved + } - LabelUnitText { id: _ufVolumeRemoved - objectName : "_ufVolumeRemoved" - text : qsTr("UF Volume Removed") - unitText : Variables.unitVolume - valueText : _private.ufVolumeRemoved - } - - LabelUnitText { id: _timeElapsed - objectName : "_timeElapsed" - text : qsTr("Time Elapsed") - unitText : Variables.unitTextDuration - valueText : vTreatmentTime.time_Elapsed - } + LabelUnitText { id: _ufVolumeGoal + objectName : "_ufVolumeGoal" + text : qsTr("UF Volume Goal") + unitText : Variables.unitVolume + valueText : _private.ufSetVolume } - Column { id: _infoRightColumn - objectName: "_infoRightColumn" - spacing: Variables.defaultMargin - - LabelUnitText { id: _ufVolumeGoal - objectName : "_ufVolumeGoal" - text : qsTr("UF Volume Goal") - unitText : Variables.unitVolume - valueText : _private.ufSetVolume - } - - LabelUnitText { id: _treatmentDuration - objectName : "_treatmentDuration" - text : qsTr("Treatment Duration") - unitText : Variables.unitTextDuration - valueText : vTreatmentTime.time_Total - } + LabelUnitText { id: _timeElapsed + objectName : "_timeElapsed" + text : qsTr("Treatment Time Elapsed") + unitText : Variables.unitTextDuration + valueText : vTreatmentTime.time_Elapsed } }