Index: sources/view/settings/VDateTime.cpp =================================================================== diff -u -r41887ec41419f06574e4c83a09ff7f7582aed247 -ra2c7aa348f7759e256b27791c4cbd7682b2c74d5 --- sources/view/settings/VDateTime.cpp (.../VDateTime.cpp) (revision 41887ec41419f06574e4c83a09ff7f7582aed247) +++ sources/view/settings/VDateTime.cpp (.../VDateTime.cpp) (revision a2c7aa348f7759e256b27791c4cbd7682b2c74d5) @@ -30,9 +30,9 @@ ACTION_VIEW_CONNECTION(AdjustHDDateTimeResponseData); ACTION_VIEW_CONNECTION(AdjustDGDateTimeResponseData); + ACTION_VIEW_CONNECTION(HDRTCEpochData); ADJUST_VIEW_CONNECTION( AdjustHDDateTimeRequestData); ADJUST_VIEW_CONNECTION( AdjustDGDateTimeRequestData); - ACTION_VIEW_CONNECTION(HDDateTimeData); connect(&_process, SIGNAL( finished(int)), this, SLOT(onSetDateUIFinished(int))); @@ -82,7 +82,7 @@ _day .toInt()), QTime(_hour .toInt() , _minute .toInt())); - const QString dateTimeLocalStr = currentDateTimeLocal.toString(_UIDateTimeStringFormat); + const QString dateTimeLocalStr = currentDateTimeLocal.toString(_Settings.getDatetimeFormat()); // Get the current UTC datetime QDateTime currentDateTimeUTC(currentDateTimeLocal); @@ -249,7 +249,7 @@ * \details received response model data handler * \param vData - model data */ -void VDateTime::onActionReceive(const HDDateTimeData &vData) +void VDateTime::onActionReceive(const HDRTCEpochData &vData) { // Doing a single update of the HD-UI RTC sync on start-up static bool _hasDoneHDSyncRTC = false; @@ -260,10 +260,10 @@ QDateTime localDateTime = hdRTCTime.toLocalTime(); - QString newDateTimeString = localDateTime.toString(_UIDateTimeStringFormat); + QString newDateTimeString = localDateTime.toString(_Settings.getDatetimeFormat()); dateTimeUI(newDateTimeString); - //DEBUG: qDebug() << "Sync HD-UI RTC | HD Epoch: " << vData.mEpoch << " | HD datetime: " << hdRTCTime.toString(_UIDateTimeStringFormat) <<" | datetime : " << newDateTimeString; + //DEBUG: qDebug() << "Sync HD-UI RTC | HD Epoch: " << vData.mEpoch << " | HD datetime: " << hdRTCTime.toString(_Settings.getDatetimeFormat()) <<" | datetime : " << newDateTimeString; _hasDoneHDSyncRTC = true; // indicate HD-UI RTC sync'd }