Index: sources/gui/qml/pages/treatment/TreatmentPrime.qml =================================================================== diff -u -r4558369178f85e2e421aacd64127facbf0a1788b -r32bc2f04da62ae95a041945b449d2c40465f9308 --- sources/gui/qml/pages/treatment/TreatmentPrime.qml (.../TreatmentPrime.qml) (revision 4558369178f85e2e421aacd64127facbf0a1788b) +++ sources/gui/qml/pages/treatment/TreatmentPrime.qml (.../TreatmentPrime.qml) (revision 32bc2f04da62ae95a041945b449d2c40465f9308) @@ -80,32 +80,42 @@ seconds : vPriming.secondsRemaining } } - - Rectangle { + Column { id: _checklist + spacing: 20 anchors.horizontalCenter: parent.horizontalCenter - color: "transparent" - height: 400 - } - GridLayout { - id: _grid - rows: vPriming.primingStates.length - columns: 1 - anchors.horizontalCenter: parent.horizontalCenter + CheckListItem { id: _checking_installation + anchors.horizontalCenter: parent.horizontalCenter + color: "transparent" + text: "Checking installation" + completed: vPriming.currentState >= 1 + } - Repeater { - model: vPriming.primingStates - Text { - color: "white" - text: vPriming.primingStates[index]; - } + CheckListItem { id: _creating_dialysate + anchors.horizontalCenter: parent.horizontalCenter + color: "transparent" + text: "Creating dialysate" + completed: vPriming.currentState >= 2 } + + CheckListItem { id: _priming_lines + anchors.horizontalCenter: parent.horizontalCenter + color: "transparent" + text: "Priming lines" + completed: vPriming.currentState >= 3 + } } + Text { id: _priming_complete + anchors.horizontalCenter: parent.horizontalCenter + text: "Priming Complete!" + color: vPriming.currentState >= 4 ? Colors.textMain : "transparent" + } + TouchRect { id : _continueRect anchors.horizontalCenter: parent.horizontalCenter text.text: vPriming.continueBtnText - enabled: vPriming.continueEnabled + enabled: vPriming.currentState >= 4 onEnabledChanged: { if (enabled) { borderColor = Colors.primingReady @@ -120,6 +130,13 @@ _root.clickedContinue() } } + + Rectangle { + id: _spacer + height: 75 + width: parent.width + color: "transparent" + } } }