Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -r78c6f3baf3fec4a3fac96707ef694a753e7f41e2 -rea9cd1a4f7b40b683b83fd6f7fde58c0e7edb7f8 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 78c6f3baf3fec4a3fac96707ef694a753e7f41e2) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision ea9cd1a4f7b40b683b83fd6f7fde58c0e7edb7f8) @@ -36,17 +36,8 @@ header.confirmText.text : vTreatmentCreate.parametersValidated ? qsTr("CONFIRM") : qsTr("VALIDATE") onConfirmClicked : vTreatmentCreate.parametersValidated ? _preTreatmentCreateContent.confirm() : _preTreatmentCreateContent.validate() + onBackClicked : vTreatmentCreate.parametersValidated ? vTreatmentCreate.doCancel() : vPreTreatmentAdjustmentInitTreatment.doCancel() - onBackClicked : { - if ( vTreatmentCreate.parametersValidated ) { - vTreatmentCreate.doCancel() - } - else { - vPreTreatmentAdjustmentInitTreatment.doCancel() - _preTreatmentCreateContent.enableEditing() - } - } - function clear( vValue ) { if ( ! vValue ) return _preTreatmentCreateContent.clear() Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml =================================================================== diff -u -r10011ab15490b74e2c50d224b2fd1ceeeea75444 -rea9cd1a4f7b40b683b83fd6f7fde58c0e7edb7f8 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision 10011ab15490b74e2c50d224b2fd1ceeeea75444) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision ea9cd1a4f7b40b683b83fd6f7fde58c0e7edb7f8) @@ -35,9 +35,12 @@ readonly property int cellHeight : ( _contentRow.height ) / 7 - ( columnSpacing ) readonly property int rowSpacing : Variables.defaultMargin * 3 readonly property int columnSpacing : 15 + readonly property bool isValidated : vTreatmentCreate.parametersValidated property bool editingEnabled : true + onIsValidatedChanged : if ( ! isValidated ) { enableEditing () } + function enableEditing () { editingEnabled = true } function clear () {