Index: sources/gui/qml/dialogs/watersample/WaterSamplePage.qml =================================================================== diff -u -ref583f0056a0fb8c66a64e132be159719b2bc2f6 -r6500e0b383e7fd0bb5a2c4e8fe95a2ea5832845e --- sources/gui/qml/dialogs/watersample/WaterSamplePage.qml (.../WaterSamplePage.qml) (revision ef583f0056a0fb8c66a64e132be159719b2bc2f6) +++ sources/gui/qml/dialogs/watersample/WaterSamplePage.qml (.../WaterSamplePage.qml) (revision 6500e0b383e7fd0bb5a2c4e8fe95a2ea5832845e) @@ -11,6 +11,7 @@ anchors.fill: parent property int attempt: 1 + readonly property var instructionsGroup : vSettings.instructions[qsTr("Water Sample")] component WaterSampleRadioButton: RadioButton { id: _waterSampleRadioButton property alias imageSource : _resultImage.source @@ -63,7 +64,7 @@ top : parent.top topMargin : Variables.defaultMargin * 2 // with current resolution this makes the screen look nice } - text : qsTr("Test Primary Carbon Filter") + text : _root.instructionsGroup ? _root.instructionsGroup.title : "" height : Variables.contentHeight color : Colors.backgroundMainMenu font.pixelSize : Fonts.fontPixelInstructionTitle @@ -127,7 +128,7 @@ right : parent.right verticalCenter : parent.verticalCenter } - text : qsTr("Test the primary carbon filter and select the result below") + text : _root.instructionsGroup ? _root.instructionsGroup.keys[0] : "" //qsTr("Test the primary carbon filter and select the result below") font.weight : Font.Medium color : "#18559E" wrapMode : Text.WordWrap @@ -164,11 +165,13 @@ imageSource : "qrc:/images/iWaterSamplePass" } } + } - Image { id: _image - anchors.right : parent.right -// source : "qrc:/images/iRedCrossWCircle" // TODO get actual image - } + Image { id: _image + anchors.right : parent.right + anchors.top : parent.top + anchors.bottom : parent.bottom + source : _root.instructionsGroup ? _root.instructionsGroup.values[0] : "" //"qrc:/images/iRedCrossWCircle" // TODO get actual image } ConfirmButton { id : _confirmButton