Index: sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml =================================================================== diff -u -r821bf955d0ba7e028bccfee7c04ca77cf80a0bd4 -rc6cfb5043fc9c29cc039e36915368bcd3a63baa6 --- sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml (.../PreTreatmentBase.qml) (revision 821bf955d0ba7e028bccfee7c04ca77cf80a0bd4) +++ sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml (.../PreTreatmentBase.qml) (revision c6cfb5043fc9c29cc039e36915368bcd3a63baa6) @@ -35,6 +35,7 @@ property bool instructionBased : false readonly property alias instruction : _instructionLoader.item + property string instructionlocation : "" property var instructionStepNames : [] property var instructionStepImages : [] @@ -50,6 +51,7 @@ readonly property alias checkList : _checkListLoader.item property var checkListStepNames : [] property int checkListCompleteMargin : 50 + property string completeText : "" property bool isComplete : false @@ -109,6 +111,7 @@ bottomMargin : outerVMargin } sourceComponent : InstructionView { id: _instructionView + location : _root.instructionlocation stepNames : _root.instructionStepNames stepImages : _root.instructionStepImages } @@ -143,6 +146,7 @@ height : Variables.checkListViewItemHeight * _root.checkListStepNames.length sourceComponent : CheckListView { id: _checkListView completeVisible : _root.isComplete + completeText : _root.completeText stepNames : _root.checkListStepNames completeMargin : _root.checkListCompleteMargin } @@ -160,11 +164,11 @@ onSettingsChanged : { if ( instructionBased ) { var group = vSettings.groupFormat.arg(header.stepNames[stackStepIndex]).arg(title.text) + // DEBUG : console.debug(" ----- ", group) if ( vSettings.settings[group] !== undefined ) { - console.debug(" 0 ----- ", group, vSettings.settings[group].keys, vSettings.settings[group].values, vSettings.settings[group].location) - instruction.location = vSettings.settings[group].location - instruction.stepNames = vSettings.settings[group].keys - instruction.stepImages = vSettings.settings[group].values + _root.instructionlocation = vSettings.settings[group].location + _root.instructionStepNames = vSettings.settings[group].keys + _root.instructionStepImages = vSettings.settings[group].values } } }