Index: sources/gui/qml/pages/treatment/TreatmentPrime.qml =================================================================== diff -u -rf463d5a69bb97d84de2c835984619ac18c574da2 -ra51b1ec80d65c7cf9f7f3b86f45a637a6d42efc1 --- sources/gui/qml/pages/treatment/TreatmentPrime.qml (.../TreatmentPrime.qml) (revision f463d5a69bb97d84de2c835984619ac18c574da2) +++ sources/gui/qml/pages/treatment/TreatmentPrime.qml (.../TreatmentPrime.qml) (revision a51b1ec80d65c7cf9f7f3b86f45a637a6d42efc1) @@ -29,16 +29,16 @@ * which is the default screen in the "Manager" stack */ ScreenItem { id: _root - signal backClicked() - signal continueClicked() + signal clickedBack() + signal clickedContinue() backgroundRect.color: Colors.backgroundMainMenu TopMenuBarCreateTreatment { id: _topMenuBar anchors.top: parent.top anchors.left: parent.left width: parent.width - onBackClicked: { - _root.backClicked(); + onClickedBack: { + _root.clickedBack(); } state: "prime" @@ -58,21 +58,70 @@ Column { id: _column spacing: Variables.cTreatmentSpacing - anchors.horizontalCenter: parent.horizontalCenter; - anchors.fill: parent; + anchors.horizontalCenter: parent.horizontalCenter + anchors.fill: parent Text { id: _titleText - anchors.horizontalCenter: parent.horizontalCenter; + anchors.horizontalCenter: parent.horizontalCenter text: qsTr("Priming") color: Colors.textMain font.pixelSize: Fonts.fontPixelTitle } + ProgressCircle { id: _circle + anchors.horizontalCenter: parent.horizontalCenter + minimum: 0 + maximum: vPriming.secondsTotal + diameter: 100 + + value: vPriming.secondsTotal - vPriming.secondsRemaining + + PrimingTimer { id: _timeText + anchors.centerIn: parent + seconds : vPriming.secondsRemaining + + } + } + + Rectangle { + anchors.horizontalCenter: parent.horizontalCenter + color: "transparent" + height: 400 + + + } + + GridLayout { + id: _grid + rows: vPriming.primingStates.length + columns: 1 + anchors.horizontalCenter: parent.horizontalCenter + + Repeater { + model: vPriming.primingStates + Text { + color: "white" + text: vPriming.primingStates[index]; + } + } + } + TouchRect { id : _continueRect anchors.horizontalCenter: parent.horizontalCenter - text.text: qsTr("CONTINUE TO TREATMENT") + text.text: vPriming.continueBtnText + enabled: vPriming.continueEnabled + onEnabledChanged: { + if (enabled) { + borderColor = Colors.primingReady + textColor = Colors.primingReady + } else { + borderColor = Colors.primingNotReady + textColor = Colors.primingNotReady + } + } + button.onClicked: { - _root.continueClicked() + _root.clickedContinue() } } }