Index: sources/view/confirm/VConfirm.h =================================================================== diff -u -rf502bc55feb08cd037d9caa12086d30034fe715b -r787e08545efa12ddc8383de8b973ab9762de0853 --- sources/view/confirm/VConfirm.h (.../VConfirm.h) (revision f502bc55feb08cd037d9caa12086d30034fe715b) +++ sources/view/confirm/VConfirm.h (.../VConfirm.h) (revision 787e08545efa12ddc8383de8b973ab9762de0853) @@ -21,6 +21,7 @@ #include "VAdjustmentResponseBase.h" #include "MDuetConfirmHDi.h" #include "MAdjustPowerOff.h" +#include "MSettings.h" namespace View { @@ -39,6 +40,18 @@ // // friends // friend class ::tst_views; + struct ConfirmData { + QString title = ""; + QString message = ""; + QString confirm = ""; + QString cancel = ""; + }; + + QMap _confirms; + + // ********** DYNAMIC PROPERTIES: The properties which need to be updated by each confirm message received. ********** // + READONLY( bool , needConfirm , false) + // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI @@ -56,16 +69,24 @@ PROPERTY(bool , isReject , 0) PROPERTY(bool , isAccept , 0) - TRIGGER (bool , visible , 0) - PROPERTY(QString , title ,"") - PROPERTY(QString , message ,"") - PROPERTY(QString , confirm ,tr("CONFIRM")) - PROPERTY(QString , cancel ,tr("CANCEL" )) + IDBASED (QString , title ,tr("Confirm" ), confirms, id) + IDBASED (QString , message ,tr("Are you sure?" ), confirms, id) + IDBASED (QString , confirm ,tr("CONFIRM" ), confirms, id) + IDBASED (QString , cancel ,tr("CANCEL" ), confirms, id) + + void setConfirmCommand (const DuetConfirmHDiData &vData); + void setConfirmId (const DuetConfirmHDiData &vData); + + void setPowerOffCommand (); + void setPowerOffId (); + + VIEW_DEC_CLASS (VConfirm ) VIEW_DEC_SLOT (DuetConfirmHDiData ) VIEW_DEC_SLOT (PowerOffData ) + VIEW_DEC_SLOT (SettingsData ) public slots: void doConfirm(bool vConfirm);