Index: sources/gui/qml/pages/TreatmentFlowBase.qml =================================================================== diff -u -r41ba9331e6a540df0c8eced0c4d3b8684afa9afa -r4a2b83dcb56555861d2c741a8e8894e5b07e24bf --- sources/gui/qml/pages/TreatmentFlowBase.qml (.../TreatmentFlowBase.qml) (revision 41ba9331e6a540df0c8eced0c4d3b8684afa9afa) +++ sources/gui/qml/pages/TreatmentFlowBase.qml (.../TreatmentFlowBase.qml) (revision 4a2b83dcb56555861d2c741a8e8894e5b07e24bf) @@ -39,6 +39,7 @@ property string instructionTitle : "" property var instructionStepNames : [] property var instructionStepImages : [] + property string subStepName : "" // used for instructions with miltiple sub steps property bool hasTimeCircle : false readonly property alias timeCircle : _timeCircleLoader.item @@ -59,7 +60,7 @@ property bool isComplete : false - readonly property int titleTopMargin: 110 + property int titleTopMargin: 110 readonly property int sideMargins : Variables.defaultMargin * 2 + Variables.headerButtonsMargin // matching header button margins signal backClicked() @@ -138,16 +139,16 @@ maximum : _root.timeCircleMaximum progressValue : _root.timeCircleProgressValue timeTextValue : _root.timeCircleTimeTextValue - thickness : _root.hasCheckList ? 1 : 2 + thickness : 15 diameter : _root.hasCheckList ? Variables.progressCircleDiameterSmall : Variables.progressCircleDiameterNormal timeTextPixelSize : _root.hasCheckList ? Fonts.fontPixelCirclProgressTimeSmall : Fonts.fontPixelCirclProgressTimeNormal } } Loader { id: _checkListLoader active : _root.hasCheckList - anchors.top : _root.hasTimeCircle ? _timeCircleLoader.bottom : undefined - anchors.topMargin : _root.hasTimeCircle ? 25 : 0 + anchors.top : _root.hasTimeCircle ? _timeCircleLoader.bottom : undefined + anchors.topMargin : _root.hasTimeCircle ? Variables.defaultMargin * 2 : 0 anchors.horizontalCenter: _root.horizontalCenter anchors.centerIn : ! _root.hasTimeCircle ? parent : undefined width : Variables.checkListViewItemWidth @@ -175,22 +176,4 @@ } NotificationBarSmall { id: _notification } - - Connections { target: vSettings - function onInstructionsChanged ( vValue ) { - if ( instructionBased ) { - let stepName = header.stepNames[stackStepIndex] - if ( stepName === undefined ) stepName = "" - let group = vSettings.groupFormat.arg(stepName).arg(title.text) - let instructionsGroup = vSettings.instructions[group] - if ( instructionsGroup !== undefined ) { - // DEBUG : - // console.debug(" 00000 ", group, settingsGroup, settingsCategory.groups) - _root.instructionTitle = instructionsGroup.title - _root.instructionStepNames = instructionsGroup.keys - _root.instructionStepImages = instructionsGroup.values - } - } - } - } }