Index: sources/view/settings/VDateTime.cpp =================================================================== diff -u -r3d5bd682a4dc4bd36e26ca17067bafd489fa970b -r3738eb975493a36efae6b1a060624abab72c6871 --- sources/view/settings/VDateTime.cpp (.../VDateTime.cpp) (revision 3d5bd682a4dc4bd36e26ca17067bafd489fa970b) +++ sources/view/settings/VDateTime.cpp (.../VDateTime.cpp) (revision 3738eb975493a36efae6b1a060624abab72c6871) @@ -84,20 +84,22 @@ const QString &vMonth , const QString &vDay , const QString &vHour , - const QString &vMinute ) + const QString &vMinute , + const bool &vNTP ) { year ( vYear ); month ( vMonth ); day ( vDay ); hour ( vHour ); minute ( vMinute ); + ntp ( vNTP ); const QDateTime currentDateTimeLocal ( QDate(_year .toInt() , _month .toInt() , _day .toInt()) , QTime(_hour .toInt() , _minute .toInt())); - const QString dateTimeLocalStr = currentDateTimeLocal.toString(_Settings.getDatetimeFormat()); + const QString dateTimeLocalStr = currentDateTimeLocal.toString("yyyy-MM-dd HH:mm:ss"); // sudo date -s requires this format // Get the current UTC datetime const QDateTime currentDateTimeUTC = currentDateTimeLocal.toUTC(); @@ -106,9 +108,9 @@ LOG_DEBUG(tr("SetDateTime %1").arg(dateTimeLocalStr)); status("Setting date and time ..."); - dateTimeUI(dateTimeLocalStr ); - dateTimeHD(epochUTC_sec ); // ??? TODO - dateTimeDG(epochUTC_sec ); // ??? TODO + dateTimeUI(dateTimeLocalStr, vNTP ); + dateTimeHD(epochUTC_sec ); // ??? TODO + dateTimeDG(epochUTC_sec ); // ??? TODO } /*! @@ -183,12 +185,15 @@ * \brief VDateTime::dateTimeUI * \details starts the shell script in a process defined in Storage::Date_Time_Set_Sh to update the device date/time */ -void VDateTime::dateTimeUI(const QString &vDateTime) +void VDateTime::dateTimeUI(const QString &vDateTime, const bool &vNTP) { if ( _process.state() != QProcess::NotRunning ) { return; } QString mScript = Storage::Scripts_Path_Name(); mScript += Storage::Date_Time_Set_Sh; - _process.start(mScript, QStringList() << vDateTime); + QStringList arguments; + arguments << vDateTime << (vNTP ? "true" : "false"); + + _process.start(mScript, arguments); } /*! @@ -274,7 +279,7 @@ hdRTCTime_localZone.setSecsSinceEpoch(vData.mEpoch); const QString newDateTimeString = hdRTCTime_localZone.toString(_Settings.getDatetimeFormat()); - dateTimeUI(newDateTimeString); + dateTimeUI(newDateTimeString, false); _hasDoneHDSyncRTC = true; // indicate HD-UI RTC sync'd