Index: sources/view/settings/VDateTime.cpp
===================================================================
diff -u -re2dc7bd9995a3bb410aa472a1f95c1cc9ba3136d -r6c6f1f5d466badd9b4fd67be7c907234c342b2a2
--- sources/view/settings/VDateTime.cpp	(.../VDateTime.cpp)	(revision e2dc7bd9995a3bb410aa472a1f95c1cc9ba3136d)
+++ sources/view/settings/VDateTime.cpp	(.../VDateTime.cpp)	(revision 6c6f1f5d466badd9b4fd67be7c907234c342b2a2)
@@ -1,24 +1,25 @@
 /*!
  *
- * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2021-2023 Diality Inc. - All Rights Reserved.
  * \copyright
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
  * \file    VDateTime.cpp
- * \author  (last)      Peter Lucia
- * \date    (last)      16-Apr-2021
- * \author  (original)  Peter Lucia
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      08-Jun-2022
+ * \author  (original)  Behrouz NematiPour
  * \date    (original)  16-Apr-2021
  *
  */
 #include "VDateTime.h"
 
 // Qt
-#include <QDateTime>
+#include <QTimeZone>
 
 // Project
 #include "GuiController.h"
+#include "ApplicationController.h"
 
 using namespace View;
 
@@ -53,6 +54,8 @@
     month (_currentTime.toString("MM"   ));
     year  (_currentTime.toString("yyyy" ));
 
+    timezone(QTimeZone::systemTimeZone().abbreviation(_currentTime));
+
     status("");
 }
 
@@ -175,7 +178,7 @@
 void VDateTime::dateTimeUI(const QString &vDateTime)
 {
     if ( _process.state() != QProcess::NotRunning ) { return; }
-    QString mScript = Storage::Scripts_Path_Name;
+    QString mScript = Storage::Scripts_Path_Name();
     mScript += Storage::Date_Time_Set_Sh;
     _process.start(mScript, QStringList() << vDateTime);
 }
@@ -195,13 +198,12 @@
     switch (vStatus) {
     case SUCCEED:
         return mSucceed;
-        break;
+
     case FAILED:
         return mFailed.arg(vReason);
-        break;
+
     default:
         return mNotSet;
-        break;
     }
 }
 
@@ -225,10 +227,9 @@
  */
 void VDateTime::greeting(quint16 vMilitaryTime)
 {
-    if (   eMorningMin  <= vMilitaryTime && vMilitaryTime <   eMorningMax   ) { greeting(tr("Good Morning"  )); return; }
-    if ( eAfternoonMin  <= vMilitaryTime && vMilitaryTime < eAfternoonMax   ) { greeting(tr("Good Afternoon")); return; }
-
-    greeting(tr("Good Evening"));
+    if (   eMorningMin /* 05:00 AM */ <= vMilitaryTime && vMilitaryTime <   eMorningMax /* 12:00 PM */ ) { greeting(tr("Good Morning"  )); return; }
+    if ( eAfternoonMin /* 12:00 PM */ <= vMilitaryTime && vMilitaryTime < eAfternoonMax /* 18:00 PM */ ) { greeting(tr("Good Afternoon")); return; }
+                       /* 18:00 PM */                                                   /* 05:00 AM */     greeting(tr("Good Evening"  ));
 }
 
 /*!
@@ -238,8 +239,11 @@
  */
 void VDateTime::timerEvent(QTimerEvent *)
 {
-    QDateTime datetime = QDateTime::currentDateTime();
-    current(datetime.toString("MM/dd/yyyy HH:mm:ss"));
-    quint16 military = datetime.time().hour() * 100 + datetime.time().minute();
+    _currentDateTime = QDateTime::currentDateTime();
+
+    current (_currentDateTime.toString(_Settings.getDatetimeFormat()));
+    timezone(QTimeZone::systemTimeZone().abbreviation(_currentDateTime));
+
+    quint16 military = _currentDateTime.time().hour() * 100 + _currentDateTime.time().minute();
     greeting(military);
 }