Index: sources/gui/qml/pages/settings/SettingsDateTime.qml
===================================================================
diff -u -r840b91f4f72d599bb523050dda2183a6611017b5 -r6c6f1f5d466badd9b4fd67be7c907234c342b2a2
--- sources/gui/qml/pages/settings/SettingsDateTime.qml	(.../SettingsDateTime.qml)	(revision 840b91f4f72d599bb523050dda2183a6611017b5)
+++ sources/gui/qml/pages/settings/SettingsDateTime.qml	(.../SettingsDateTime.qml)	(revision 6c6f1f5d466badd9b4fd67be7c907234c342b2a2)
@@ -1,15 +1,15 @@
 /*!
  *
- * 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 SettingsDateTimeSet.qml
- * \author (last) Peter Lucia
- * \date (last) 14-Mar-2021
- * \author (original) Peter Lucia
- * \date (original) 14-Mar-2021
+ * \file    SettingsDateTime.qml
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      23-May-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  16-Apr-2021
  *
  */
 
@@ -27,27 +27,23 @@
  * \brief   SettingsDateTimeSet is used to adjust the
  * date and time on the device
  */
-SettingsBase { id: _root
+SettingsBase    { id: _root
+    itemIndex       : SettingsStack.SetDateTime
 
-    function setFocus() {
-        _hours.textInput.forceActiveFocus()
-        _keyboard.setVisible(true)
-    }
+    labelWidth  : 275
+    entryWidth  : 100
 
-    property int            labelWidth  : 275
-    property int            entryWidth  : 100
-
     readonly property bool  isValid     :
         _year   .textInput.acceptableInput &&
         _month  .textInput.acceptableInput &&
         _day    .textInput.acceptableInput &&
         _hours  .textInput.acceptableInput &&
         _minutes.textInput.acceptableInput
 
-    confirmEnabled: isValid
-
+    confirmEnabled  : isValid
+    firstFocusInput : _hours
     notificationText: vDateTime.status
-    onConfirmClicked:  {
+    onConfirmClicked: {
         vDateTime.doConfirm(
                     _year   .textInput.text ,
                     _month  .textInput.text ,
@@ -85,7 +81,7 @@
                 width           : entryWidth
                 validator       : IntValidator {
                     bottom      : 0
-                    top         : 24
+                    top         : 23
                 }
             }
 
@@ -152,6 +148,7 @@
                 width           : entryWidth
                 validator       : IntValidator {
                     bottom      : 1970
+                    top         : 2100 // seems date command is not accepting more than 2100
                 }
             }
         }