Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml =================================================================== diff -u -r44b18327125389577b34655dfc0d95331c4b8f14 -r0fc6d1c6c65ba935d7e5f0bc56130e99deada039 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision 44b18327125389577b34655dfc0d95331c4b8f14) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision 0fc6d1c6c65ba935d7e5f0bc56130e99deada039) @@ -30,6 +30,11 @@ TreatmentAdjustmentBase { id: _root objectName: "_TreatmentAdjustmentPressures" //SquishQt testability + readonly property alias arterialPressureLimitWindow : _arterialWindow.value + readonly property alias venousPressureLimitWindow : _venousWindow.value + readonly property alias venousPressureLimitAsymtrc : _venousAsymmetricWindow.value + readonly property alias tmpPressureLimitWindow : _tmpWindow.value + titleText: qsTr("Pressure Window Limit Settings") contentItem: Item { id: _contentItem @@ -39,7 +44,7 @@ objectName: "_contentArea" anchors { top: parent.top - bottom: _continueButton.top + bottom: _confirmButton.top left: parent.left right: parent.right } @@ -55,7 +60,6 @@ titleFontPixelSize : Fonts.fontPixelContainerTitleSmall unitText : Variables.unitTextPressure unitFontPixelSize : Fonts.fontPixelContainerUnitSmall - valueTextColor : Colors.ufVolumeGoalText minimum : vTreatmentRanges.arterialPressureLimitWindowMin maximum : vTreatmentRanges.arterialPressureLimitWindowMax step : vTreatmentRanges.arterialPressureLimitWindowRes @@ -68,7 +72,6 @@ titleFontPixelSize : _arterialWindow.titleFontPixelSize unitText : Variables.unitTextPressure unitFontPixelSize : _arterialWindow.unitFontPixelSize - valueTextColor : _arterialWindow.valueTextColor minimum : vTreatmentRanges.venousPressureLimitWindowMin maximum : vTreatmentRanges.venousPressureLimitWindowMax step : vTreatmentRanges.venousPressureLimitWindowRes @@ -81,7 +84,6 @@ titleFontPixelSize : _arterialWindow.titleFontPixelSize unitText : Variables.unitTextPressure unitFontPixelSize : _arterialWindow.unitFontPixelSize - valueTextColor : _arterialWindow.valueTextColor minimum : vTreatmentRanges.venousPressureLimitAsymtrcMin maximum : vTreatmentRanges.venousPressureLimitAsymtrcMax step : vTreatmentRanges.venousPressureLimitAsymtrcRes @@ -94,7 +96,6 @@ titleFontPixelSize : _arterialWindow.titleFontPixelSize unitText : Variables.unitTextPressure unitFontPixelSize : _arterialWindow.unitFontPixelSize - valueTextColor : _arterialWindow.valueTextColor minimum : vTreatmentRanges.trancembrncPressureLimitWindowMin maximum : vTreatmentRanges.trancembrncPressureLimitWindowMax step : vTreatmentRanges.trancembrncPressureLimitWindowRes @@ -103,22 +104,22 @@ } } - TouchRect { id: _continueButton - objectName : "_continueButton" + TouchRect { id: _confirmButton + objectName : "_confirmButton" anchors { bottom : parent.bottom horizontalCenter: parent.horizontalCenter } - width : Variables.ultrafiltrationButtonWidth - height : Variables.ultrafiltrationButtonHeight + width : Variables.defaultButtonWidth + height : Variables.defaultButtonHeight text { - text : qsTr("Continue") + text : qsTr("Confirm") font.weight : Font.Medium } isDefault : true onClicked : { - console.log("continue.onClicked") + _root.onConfirmClicked() } } }