Index: sources/gui/qml/dialogs/ConfirmDialog.qml
===================================================================
diff -u -rbc4b9e027cd54b49a73c3f7d6800a3563fc43b4c -r4da79084388ac25822ab24fb52ec1ca4083b50cc
--- sources/gui/qml/dialogs/ConfirmDialog.qml (.../ConfirmDialog.qml) (revision bc4b9e027cd54b49a73c3f7d6800a3563fc43b4c)
+++ sources/gui/qml/dialogs/ConfirmDialog.qml (.../ConfirmDialog.qml) (revision 4da79084388ac25822ab24fb52ec1ca4083b50cc)
@@ -34,13 +34,13 @@
property bool isConfirmDefault : true
property alias cancelText : _cancelTouch.textString
property alias cancelVisible : _cancelTouch.visible
- property bool additionalVisible: false
- property string additionalText : ""
+ property bool extraVisible : false
+ property string extraText : ""
property bool autoClose : true
property int messageTextVerticalOffset : Variables.defaultMargin * -3 // adjust text up to add more space for bottom buttons
property int footerBottomMargin : Variables.notificationHeight + Variables.minVGap
- signal additionalButtonClicked()
+ signal extraButtonClicked()
height : Variables.smallDialogHeight
width : Variables.smallDialogWidth
@@ -99,10 +99,10 @@
anchors.margins : 0
anchors.top : undefined
anchors.right : undefined
- textString : _root.additionalText
- visible : _root.additionalVisible
+ textString : _root.extraText
+ visible : _root.extraVisible
onClicked: {
- additionalButtonClicked()
+ extraButtonClicked()
if ( autoClose ) close()
}
}
Index: sources/gui/qml/dialogs/RinsebackCompleteDialog.qml
===================================================================
diff -u -rbc4b9e027cd54b49a73c3f7d6800a3563fc43b4c -r4da79084388ac25822ab24fb52ec1ca4083b50cc
--- sources/gui/qml/dialogs/RinsebackCompleteDialog.qml (.../RinsebackCompleteDialog.qml) (revision bc4b9e027cd54b49a73c3f7d6800a3563fc43b4c)
+++ sources/gui/qml/dialogs/RinsebackCompleteDialog.qml (.../RinsebackCompleteDialog.qml) (revision 4da79084388ac25822ab24fb52ec1ca4083b50cc)
@@ -6,8 +6,8 @@
messageText : qsTr("Blood Return Complete!")
confirmText : qsTr("Fluid Bolus")
cancelText : qsTr("End Treatment")
- additionalText : qsTr("Recirculate")
- additionalVisible : true
+ extraText : qsTr("Recirculate")
+ extraVisible : true
isConfirmDefault : false
width : Variables.completeDialogWidth
Index: sources/gui/qml/pages/endtreatment/EndTreatmentBase.qml
===================================================================
diff -u -rcba8451ac737fb0b618173a4bea37411fdaaf824 -r4da79084388ac25822ab24fb52ec1ca4083b50cc
--- sources/gui/qml/pages/endtreatment/EndTreatmentBase.qml (.../EndTreatmentBase.qml) (revision cba8451ac737fb0b618173a4bea37411fdaaf824)
+++ sources/gui/qml/pages/endtreatment/EndTreatmentBase.qml (.../EndTreatmentBase.qml) (revision 4da79084388ac25822ab24fb52ec1ca4083b50cc)
@@ -32,6 +32,7 @@
property alias timeout : _timeoutLoader.item
property int timeoutValue : 0
property string headerTitle : ""
+ property string descriptionText : ""
onVisibleChanged: if ( visible ) { _root.updateModel() }
@@ -61,7 +62,7 @@
anchors.centerIn: parent
width : implicitWidth
height : implicitHeight
- text : qsTr("Blood return will %1 be allowed in:").arg("NOT")
+ text : _root.descriptionText
color : Colors.offWhite
font.pixelSize : Fonts.fontPixelContainerTitle
}
Index: sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml
===================================================================
diff -u -rdfb5f7070961fd2a34c2cb8d897ecc43c4f46598 -r4da79084388ac25822ab24fb52ec1ca4083b50cc
--- sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml (.../EndTreatmentRinsebackStack.qml) (revision dfb5f7070961fd2a34c2cb8d897ecc43c4f46598)
+++ sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml (.../EndTreatmentRinsebackStack.qml) (revision 4da79084388ac25822ab24fb52ec1ca4083b50cc)
@@ -54,8 +54,6 @@
Connections { target: _endTreatmentRinsebackInit
function onRinsebackClicked ( vValue ) { vTreatmentAdjustmentRinseback.doStart ()} //82.0
-// function onTreatmentEndClicked ( vValue ) { vTreatmentAdjustmentRinseback.doTreatmentEnd ()} //82.8
-// function onTreatmentBackClicked ( vValue ) { vTreatmentAdjustmentRinseback.doTreatmentBack ()} //82.9
}
Connections { target: _endTreatmentRinseback
function onAccelerateClicked ( vValue ) { vTreatmentAdjustmentRinseback.doIncrement ()} //82.1
@@ -67,7 +65,7 @@
Connections { target: _rinsebackCompleteDialog
function onAccepted () { vTreatmentAdjustmentRinseback.doAdditional() } // Fluid Blus
function onRejected () { vTreatmentAdjustmentRinseback.doTreatmentEnd() } // End Treatment
- function onAdditionalButtonClicked () { vTreatmentAdjustmentRinseback.doConfirm () } // Recirculate
+ function onExtraButtonClicked () { vTreatmentAdjustmentRinseback.doConfirm () } // Recirculate
}
Connections { target: vTDTreatmentStates
Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml
===================================================================
diff -u -rcba8451ac737fb0b618173a4bea37411fdaaf824 -r4da79084388ac25822ab24fb52ec1ca4083b50cc
--- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml (.../EndTreatmentRinsebackInit.qml) (revision cba8451ac737fb0b618173a4bea37411fdaaf824)
+++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml (.../EndTreatmentRinsebackInit.qml) (revision 4da79084388ac25822ab24fb52ec1ca4083b50cc)
@@ -31,6 +31,7 @@
signal rinsebackClicked ()
headerTitle : qsTr("Blood Return Setup")
+ descriptionText : qsTr("Blood return will %1 be allowed in:").arg("NOT")
instructionBased : true
hasTimeout : vTreatmentRinseback .timeoutTotal