Index: sources/view/settings/VAdjustmentAlarmVolume.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r8c3cf6523e22b063f4f9d7c595d16398e95ef7bc --- sources/view/settings/VAdjustmentAlarmVolume.cpp (.../VAdjustmentAlarmVolume.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/settings/VAdjustmentAlarmVolume.cpp (.../VAdjustmentAlarmVolume.cpp) (revision 8c3cf6523e22b063f4f9d7c595d16398e95ef7bc) @@ -24,34 +24,34 @@ * \details All the class signal/slot connections are defined here. */ void View::VAdjustmentAlarmVolume::initConnections() { - ADJUST_VIEW_CONNECTION(AdjustHDAlarmVolumeRequestData ); - ACTION_VIEW_CONNECTION(AdjustHDAlarmVolumeResponseData ); + ADJUST_VIEW_CONNECTION(AdjustTDAlarmVolumeRequestData ); + ACTION_VIEW_CONNECTION(AdjustTDAlarmVolumeResponseData ); ACTION_VIEW_CONNECTION(SettingsData) connect(&_GuiController, &GuiController::didPOSTPass, this, [=](bool) { //POST// - doAdjustment(_hdAlarmVolume); + doAdjustment(_tdAlarmVolume); }); } -void View::VAdjustmentAlarmVolume::onActionReceive(const AdjustHDAlarmVolumeResponseData &vData) +void View::VAdjustmentAlarmVolume::onActionReceive(const AdjustTDAlarmVolumeResponseData &vData) { adjustment_Accepted ( vData.mAccepted ); adjustment_Reason ( vData.mReason ); // TODO : Value // in the correct/standard design (like all the other MVCs) there should always be the FW preferred (or old value) for the requested value to change. - // a line like : hdAlarmVolume( vData.volume ); // please give attention to the vData(received) instead of _data(private). + // a line like : tdAlarmVolume( vData.volume ); // please give attention to the vData(received) instead of _data(private). // but is has not been provided !!! - // at this moment the only thing that can be done is to use _data.volume(accepted)/_hdAlarmVolume(rejected) to revert back to the old private value the view has. + // at this moment the only thing that can be done is to use _data.volume(accepted)/_tdAlarmVolume(rejected) to revert back to the old private value the view has. // Please notice that it works but we are just predicting what the FW has and the GUI is totally agnostic about the FW current value, // so we get easily out of sync with FW. if (vData.mAccepted) { - hdAlarmVolume( _data.volume() ); + tdAlarmVolume( _data.volume() ); status(""); } else { - hdAlarmVolume(_hdAlarmVolume); + tdAlarmVolume(_tdAlarmVolume); // TODO : Rejection Reason (status) // Same thing which has been done for the alarmMapping has to be done for the Reason returning by each response. status(tr("The alarm volume change request has been rejected [%1]").arg(vData.mReason)); @@ -77,5 +77,5 @@ void View::VAdjustmentAlarmVolume::onActionReceive(const SettingsData &) { QString mCategory = Storage::Settings_Category_SettingsSystem; - FROMVARIANT( hdAlarmVolume, "Alarm", "Volume", UInt ); + FROMVARIANT( tdAlarmVolume, "Alarm", "Volume", UInt ); }