Index: sources/view/settings/VDateTime.h =================================================================== diff -u -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 -r6e18f1d24b8cc3d84d26f46f36f73deb34e54371 --- sources/view/settings/VDateTime.h (.../VDateTime.h) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) +++ sources/view/settings/VDateTime.h (.../VDateTime.h) (revision 6e18f1d24b8cc3d84d26f46f36f73deb34e54371) @@ -22,8 +22,8 @@ // Project #include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" -#include "MAdjustHDDateTimeResponse.h" -#include "MAdjustDGDateTimeResponse.h" +#include "MAdjustTDDateTimeResponse.h" +#include "MAdjustDDDateTimeResponse.h" #include "MHDRTCEpochData.h" @@ -65,29 +65,29 @@ private: QDateTime _currentDateTime ; - int _timerInterval = 1000; // ms - QProcess _process ; + int _timerInterval = 1000; // ms - DateTimeSetStatus _acceptHD = NOT_SET; - DateTimeSetStatus _acceptDG = NOT_SET; + DateTimeSetStatus _acceptTD = NOT_SET; + DateTimeSetStatus _acceptDD = NOT_SET; DateTimeSetStatus _acceptUI = NOT_SET; - quint8 _reasonHD = 0; - quint8 _reasonDG = 0; + quint8 _reasonTD = 0; + quint8 _reasonDD = 0; quint8 _reasonUI = 0; - void dateTimeHD(quint32 epoch); - void dateTimeDG(quint32 epoch); - void dateTimeUI(const QString &vDateTime); + void dateTimeTD(quint32 epoch); + void dateTimeDD(quint32 epoch); QString status(DateTimeSetStatus vStatus, quint8 vReason); void updateStatus(); + quint32 getEpochUTC(QDateTime vDateTime = QDateTime::currentDateTime()); TRIGGER (QString, year , "0000") TRIGGER (QString, month , "00" ) TRIGGER (QString, day , "00" ) TRIGGER (QString, hour , "00" ) TRIGGER (QString, minute , "00" ) TRIGGER (QString, second , "00" ) + TRIGGER (bool , ntp , false ) PROPERTY(QString, status , "" ) PROPERTY(QString, current , "" ) @@ -97,29 +97,30 @@ PROPERTY(QString, date , "" ) + PROPERTY(QString, timeFormat, "" ) + PROPERTY(QString, dateFormat, "" ) + PROPERTY(QString, timezone , "" ) VIEW_DEC_CLASS(VDateTime) - VIEW_DEC_SLOT (AdjustHDDateTimeResponseData) - VIEW_DEC_SLOT (AdjustDGDateTimeResponseData) + VIEW_DEC_SLOT (AdjustTDDateTimeResponseData) + VIEW_DEC_SLOT (AdjustDDDateTimeResponseData) VIEW_DEC_SLOT (HDRTCEpochData) void greeting(quint16 vMilitaryTime); -private slots: - void onSetDateUIFinished(const int &vExitCode); - public slots: void doInit (); void doConfirm (const QString &vYear , const QString &vMonth , const QString &vDay , const QString &vHour , - const QString &vMinute); + const QString &vMinute, + bool vNTP ); - void onSetDateUIErrored(QProcess::ProcessError error); signals: - void didAdjustment(const AdjustHDDateTimeRequestData); - void didAdjustment(const AdjustDGDateTimeRequestData); + void didAdjustment(const AdjustTDDateTimeRequestData); + void didAdjustment(const AdjustDDDateTimeRequestData); + void didRefreshUIFields(); }; }