Index: sources/gui/qml/dialogs/headerbar/HeaderbarPrescription.qml =================================================================== diff -u -r0c448ff97fb2882b068cf6da24bbed375fc68f44 -r1132f049e169cc87a059261f72fca0ceb7d739f1 --- sources/gui/qml/dialogs/headerbar/HeaderbarPrescription.qml (.../HeaderbarPrescription.qml) (revision 0c448ff97fb2882b068cf6da24bbed375fc68f44) +++ sources/gui/qml/dialogs/headerbar/HeaderbarPrescription.qml (.../HeaderbarPrescription.qml) (revision 1132f049e169cc87a059261f72fca0ceb7d739f1) @@ -23,6 +23,7 @@ ModalDialog { id: _root readonly property bool isConfirmed: vTreatmentCreate.parametersConfirmed + readonly property bool isFirstTab : _headerbarPrescriptionContent.currentIndex === PreTreatmentCreateContent.PatientPrescription padding : Variables.defaultMargin onOpened: _headerbarPrescriptionContent.canEdit( ! ( vTreatmentCreate.parametersValidated || vTreatmentCreate.parametersConfirmed ) ) @@ -59,11 +60,17 @@ bottomMargin : 5 rightMargin : Variables.defaultMargin * 3 } - enabled : _headerbarPrescriptionContent.confirmReady() - text.text : vTreatmentCreate.parametersValidated ? qsTr("CONFIRM") : qsTr("VALIDATE") + enabled : _root.isFirstTab ? true : _headerbarPrescriptionContent.confirmReady() + text.text : _root.isFirstTab ? qsTr("Next") + : vTreatmentCreate.parametersValidated ? qsTr("Confirm") : qsTr("Validate") visible : ! vTDOpMode.inTreatment && ! isConfirmed onClicked : { + if ( _root.isFirstTab ) { + _headerbarPrescriptionContent.currentIndex = PreTreatmentCreateContent.TreatmentSettings + return + } + if ( vTreatmentCreate.parametersValidated ) { _headerbarPrescriptionContent.confirm() _root.close()