Index: sources/gui/qml/components/TopMenuBarCreateTreatment.qml =================================================================== diff -u -r7a4f59af7287d30e8790e6b580327684d4e02e55 -ra51b1ec80d65c7cf9f7f3b86f45a637a6d42efc1 --- sources/gui/qml/components/TopMenuBarCreateTreatment.qml (.../TopMenuBarCreateTreatment.qml) (revision 7a4f59af7287d30e8790e6b580327684d4e02e55) +++ sources/gui/qml/components/TopMenuBarCreateTreatment.qml (.../TopMenuBarCreateTreatment.qml) (revision a51b1ec80d65c7cf9f7f3b86f45a637a6d42efc1) @@ -26,15 +26,15 @@ color: Colors.backgroundMainMenu property var step: "CREATE"; property int spacing: 5 - signal backClicked() + signal clickedBack() BackButton { id : _backButton width: parent.width / 10 anchors.verticalCenter: parent.verticalCenter anchors.top: parent.top anchors.left: parent.left anchors.margins: _root.height / 4 - onClicked: backClicked() + onClicked: _root.clickedBack() } Rectangle { @@ -49,39 +49,36 @@ } - RowLayout { + Row { anchors.centerIn: parent - Layout.alignment: Qt.AlignVCenter spacing: 5 CircleWithText { id: _create text: "CREATE" state: "active" } - Line { - length: 100 - color: Colors.createTreatmentInactive + ProgressLine { id: _confirm_line + anchors.verticalCenter: _create.verticalCenter + } CircleWithText { id: _confirm text: "CONFIRM" } - Line { - length: 100 - color: Colors.createTreatmentInactive + ProgressLine { id: _priming_line + anchors.verticalCenter: _create.verticalCenter } CircleWithText { id: _prime text: "PRIME" } - Line { - id: _prime_line - length: 100 - color: Colors.createTreatmentInactive + ProgressLine { id: _begin_line + anchors.verticalCenter: _create.verticalCenter + } CircleWithText { id: _begin @@ -95,31 +92,43 @@ states: [ State { name: "create" - PropertyChanges { target: _create; state: "active" } - PropertyChanges { target: _confirm; state: "inactive" } - PropertyChanges { target: _prime; state: "inactive" } - PropertyChanges { target: _begin; state: "inactive" } + PropertyChanges { target: _create; state: "active" } + PropertyChanges { target: _confirm; state: "inactive" } + PropertyChanges { target: _confirm_line; state: "inactive" } + PropertyChanges { target: _prime; state: "inactive" } + PropertyChanges { target: _priming_line; state: "inactive" } + PropertyChanges { target: _begin; state: "inactive" } + PropertyChanges { target: _begin_line; state: "inactive" } }, State { name: "confirm" - PropertyChanges { target: _create; state: "inactive" } - PropertyChanges { target: _confirm; state: "active" } - PropertyChanges { target: _prime; state: "inactive" } - PropertyChanges { target: _begin; state: "inactive" } + PropertyChanges { target: _create; state: "active" } + PropertyChanges { target: _confirm; state: "active" } + PropertyChanges { target: _confirm_line; state: "active" } + PropertyChanges { target: _prime; state: "inactive" } + PropertyChanges { target: _priming_line; state: "inactive" } + PropertyChanges { target: _begin; state: "inactive" } + PropertyChanges { target: _begin_line; state: "inactive" } }, State { name: "prime" - PropertyChanges { target: _create; state: "inactive" } - PropertyChanges { target: _confirm; state: "inactive" } - PropertyChanges { target: _prime; state: "active" } - PropertyChanges { target: _begin; state: "inactive" } + PropertyChanges { target: _create; state: "active" } + PropertyChanges { target: _confirm; state: "active" } + PropertyChanges { target: _confirm_line; state: "active" } + PropertyChanges { target: _prime; state: "active" } + PropertyChanges { target: _priming_line; state: "active" } + PropertyChanges { target: _begin; state: "inactive" } + PropertyChanges { target: _begin_line; state: "inactive" } }, State { name: "begin" - PropertyChanges { target: _create; state: "inactive" } - PropertyChanges { target: _confirm; state: "inactive" } - PropertyChanges { target: _prime; state: "inactive" } - PropertyChanges { target: _begin; state: "active" } + PropertyChanges { target: _create; state: "active" } + PropertyChanges { target: _confirm; state: "active" } + PropertyChanges { target: _confirm_line; state: "active" } + PropertyChanges { target: _prime; state: "active" } + PropertyChanges { target: _priming_line; state: "active" } + PropertyChanges { target: _begin; state: "active" } + PropertyChanges { target: _begin_line; state: "active" } } ]