Index: sources/view/settings/VAdjustmentServiceDates.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r2344b221623f3ce2d18f91a255ec6a0649c9db33 --- sources/view/settings/VAdjustmentServiceDates.cpp (.../VAdjustmentServiceDates.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/view/settings/VAdjustmentServiceDates.cpp (.../VAdjustmentServiceDates.cpp) (revision 2344b221623f3ce2d18f91a255ec6a0649c9db33) @@ -25,6 +25,7 @@ ADJUST_VIEW_CONNECTION( AdjustServiceDatesRequestData) ACTION_VIEW_CONNECTION(AdjustServiceDatesHDResponseData) ACTION_VIEW_CONNECTION(AdjustServiceDatesDGResponseData) + ACTION_VIEW_CONNECTION(SettingsData) } void View::VAdjustmentServiceDates::onActionReceive(const AdjustServiceDatesHDResponseData &vData) @@ -33,8 +34,8 @@ hdLastServiceEpoch (vData.mLastServiceDateEpoch ); hdServiceInterval (vData.mServiceIntervalSeconds ); - hdLastServiceDate (Format::fromEpoch(vData.mLastServiceDateEpoch , _serviceDateFormat)); - hdNextServiceDate (Format::fromEpoch(vData.mLastServiceDateEpoch + vData.mServiceIntervalSeconds , _serviceDateFormat)); + hdLastServiceDate (Format::fromEpoch(vData.mLastServiceDateEpoch , _dateFormat)); + hdNextServiceDate (Format::fromEpoch(vData.mLastServiceDateEpoch + vData.mServiceIntervalSeconds , _dateFormat)); // *** 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. *** @@ -47,11 +48,15 @@ dgLastServiceEpoch (vData.mLastServiceDateEpoch ); dgServiceInterval (vData.mServiceIntervalSeconds ); - dgLastServiceDate (Format::fromEpoch(vData.mLastServiceDateEpoch , _serviceDateFormat)); - dgNextServiceDate (Format::fromEpoch(vData.mLastServiceDateEpoch + vData.mServiceIntervalSeconds , _serviceDateFormat)); + dgLastServiceDate (Format::fromEpoch(vData.mLastServiceDateEpoch , _dateFormat)); + dgNextServiceDate (Format::fromEpoch(vData.mLastServiceDateEpoch + vData.mServiceIntervalSeconds , _dateFormat)); // *** 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. *** adjustmentDG(true); // set here only because adjustment parent needs it, but HD Service does not } +void View::VAdjustmentServiceDates::onActionReceive(const SettingsData &) +{ + _dateFormat = _Settings.dateFormat(); +}