Index: denali.qrc
===================================================================
diff -u -r32bc2f04da62ae95a041945b449d2c40465f9308 -r1d2ab4adce5e88a7e316cad3c75e519704511813
--- denali.qrc (.../denali.qrc) (revision 32bc2f04da62ae95a041945b449d2c40465f9308)
+++ denali.qrc (.../denali.qrc) (revision 1d2ab4adce5e88a7e316cad3c75e519704511813)
@@ -33,6 +33,7 @@
resources/images/Wave-Plus.png
resources/images/microsd.png
resources/images/check.png
+ resources/images/checkCircle.png
sources/gui/qml/components/MainMenu.qml
Index: resources/images/checkCircle.png
===================================================================
diff -u
Binary files differ
Index: sources/gui/qml/components/PrimingTimer.qml
===================================================================
diff -u -r074b32b5cc08f41f2d9ce0d021f2151b76bba5ad -r1d2ab4adce5e88a7e316cad3c75e519704511813
--- sources/gui/qml/components/PrimingTimer.qml (.../PrimingTimer.qml) (revision 074b32b5cc08f41f2d9ce0d021f2151b76bba5ad)
+++ sources/gui/qml/components/PrimingTimer.qml (.../PrimingTimer.qml) (revision 1d2ab4adce5e88a7e316cad3c75e519704511813)
@@ -30,6 +30,7 @@
property color textColor : "white"
property int textPixelSize : 26
property int textWeight : Font.Normal
+ property bool completed : false
readonly property string time : _private.time
color : "transparent"
@@ -55,9 +56,16 @@
font.pixelSize: _root.textPixelSize
font.weight: _root.textWeight
color: _root.textColor
+ visible: !_root.completed
anchors.centerIn: parent
}
+ Image { id: _image
+ source: "qrc:/images/iCheckCircle"
+ anchors.centerIn: parent
+ visible: _root.completed
+ }
+
}
Index: sources/gui/qml/pages/treatment/TreatmentPrime.qml
===================================================================
diff -u -r32bc2f04da62ae95a041945b449d2c40465f9308 -r1d2ab4adce5e88a7e316cad3c75e519704511813
--- sources/gui/qml/pages/treatment/TreatmentPrime.qml (.../TreatmentPrime.qml) (revision 32bc2f04da62ae95a041945b449d2c40465f9308)
+++ sources/gui/qml/pages/treatment/TreatmentPrime.qml (.../TreatmentPrime.qml) (revision 1d2ab4adce5e88a7e316cad3c75e519704511813)
@@ -78,8 +78,10 @@
PrimingTimer { id: _timeText
anchors.centerIn: parent
seconds : vPriming.secondsRemaining
+ completed: vPriming.currentState >= 4
}
}
+
Column { id: _checklist
spacing: 20
anchors.horizontalCenter: parent.horizontalCenter
@@ -110,6 +112,7 @@
anchors.horizontalCenter: parent.horizontalCenter
text: "Priming Complete!"
color: vPriming.currentState >= 4 ? Colors.textMain : "transparent"
+ font.pixelSize: Fonts.primingFontSize
}
TouchRect { id : _continueRect
Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r32bc2f04da62ae95a041945b449d2c40465f9308 -r1d2ab4adce5e88a7e316cad3c75e519704511813
--- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 32bc2f04da62ae95a041945b449d2c40465f9308)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 1d2ab4adce5e88a7e316cad3c75e519704511813)
@@ -60,8 +60,7 @@
TreatmentHome { id: _treatmentHome
onTreatmentStarted : push( _treatmentStart )
-// onTreatmentCreated : vTreatmentCreate.onSelectingParameters()
- onTreatmentCreated : push(_treatmentPrime)
+ onTreatmentCreated : vTreatmentCreate.onSelectingParameters()
}
TreatmentStart { id: _treatmentStart