Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -rb59827b661a423b2b1ad2ca7b8611c2c0be7bd6a -r41ba9331e6a540df0c8eced0c4d3b8684afa9afa --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision b59827b661a423b2b1ad2ca7b8611c2c0be7bd6a) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 41ba9331e6a540df0c8eced0c4d3b8684afa9afa) @@ -28,18 +28,16 @@ */ PreTreatmentBase { id: _root objectName: "_PreTreatmentCreate" // SquishQt testability - property int stackStepIndex : PreTreatmentStack.CreateRx - header.confirmVisible : true - header.backVisible : ! vTreatmentCreate.parametersValidated - header.confirmEnabled : _preTreatmentCreateContent.confirmReady() - header.confirmText.text : vTreatmentCreate.parametersValidated ? qsTr("CONFIRM") : - qsTr("VALIDATE") - onConfirmClicked : vTreatmentCreate.parametersValidated ? _preTreatmentCreateContent.confirm() : - _preTreatmentCreateContent.validate() - onBackClicked : page ( _pretreatmentInstallation )// TODO FIX ME IN PRE TREATMENT - function clear( vValue ) { if ( ! vValue ) return; _preTreatmentCreateContent.clear() } + onVisibleChanged: { + if (visible) { stackStepIndex = PreTreatmentStack.CreateRx } + } + function clear( vValue ) { if ( ! vValue ) return; _preTreatmentCreateContent.clear() } + function confirmReady() { return _preTreatmentCreateContent.confirmReady() } + function confirmButtonClicked() { if (vTreatmentCreate.parametersValidated) { _preTreatmentCreateContent.confirm() } + else { _preTreatmentCreateContent.validate() }} + PreTreatmentCreateContent { id: _preTreatmentCreateContent anchors { top : _root.header.bottom