Index: sources/view/confirm/VConfirm.cpp =================================================================== diff -u -r6e9dccd1109d9c8d4ee4b6a21260618969a1706b -r51625aec73fca715ee12c3b82c6ea7e824851a64 --- sources/view/confirm/VConfirm.cpp (.../VConfirm.cpp) (revision 6e9dccd1109d9c8d4ee4b6a21260618969a1706b) +++ sources/view/confirm/VConfirm.cpp (.../VConfirm.cpp) (revision 51625aec73fca715ee12c3b82c6ea7e824851a64) @@ -6,8 +6,8 @@ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file VConfirm.cpp - * \author (last) Behrouz NematiPour - * \date (last) 10-Oct-2022 + * \author (last) Dara Navaei + * \date (last) 18-Mar-2025 * \author (original) Behrouz NematiPour * \date (original) 30-Sep-2022 * @@ -17,6 +17,7 @@ // Project #include "GuiController.h" #include "Settings.h" +#include VIEW_DEF_CLASS_ADJUSTMENT(VConfirm) @@ -90,7 +91,24 @@ cancelByID ( /*! isReject()*/ ); // cancel ( tr("CLOSE" ) ); - id ( vData.mId ); + // These need to be set to be used in the messageModifier + if ( vData.mId == GuiConfirmId::GENERIC_CONFIRM_ID_UF_RATE_CHANGE_IN_TX_DURATION_CHANGE ) { + extraParam1 ( qCeil(vData.mExtraParam1 )); + } + else { + extraParam1 ( vData.mExtraParam1 ); + } + + extraParam2 ( vData.mExtraParam2 ); + extraParam3 ( vData.mExtraParam3 ); + extraParam4 ( vData.mExtraParam4 ); + + //id ( vData.mId ); + // FIXME: change this to a TRIGGER + // Qt moc compile issue + + _id = vData.mId; + emit idChanged(_id); } /*! @@ -132,11 +150,15 @@ */ void View::VConfirm::onActionReceive(const DuetConfirmHDiData &vData) { - isPowerOff(false ); - + isPowerOff( false ); setConfirmCommand ( vData ); setConfirmId ( vData ); + extraParam1 ( vData.mExtraParam1 ); + extraParam2 ( vData.mExtraParam2 ); + extraParam3 ( vData.mExtraParam3 ); + extraParam4 ( vData.mExtraParam4 ); + // *** has to be the last to let the information to be set and then emit the signal *** // *** otherwise will use the Previous values before being set. *** adjustment ( true ); @@ -146,7 +168,7 @@ void View::VConfirm::onActionReceive(const PowerOffData &vData) { - isPowerOff(true ); + isPowerOff( true ); setPowerOffCommand ( ); setPowerOffId ( );