Index: sources/gui/qml/main.qml =================================================================== diff -u -r5605f930ab5cd1a62b96347f4b4300ef30a830ee -r13e65c3d271d503c2e2e2f1f20736652c470f8cc --- sources/gui/qml/main.qml (.../main.qml) (revision 5605f930ab5cd1a62b96347f4b4300ef30a830ee) +++ sources/gui/qml/main.qml (.../main.qml) (revision 13e65c3d271d503c2e2e2f1f20736652c470f8cc) @@ -7,7 +7,7 @@ * * \file main.qml * \author (last) Behrouz NematiPour - * \date (last) 09-Mar-2022 + * \date (last) 05-Apr-2022 * \author (original) Behrouz NematiPour * \date (original) 24-Sep-2019 * @@ -38,7 +38,8 @@ // Settings import VSettings 0.1 import VAdjustmentVersions 0.1 -import VAdjustmentService 0.1 +import VAdjustmentServiceMode 0.1 +import VAdjustmentServiceDates 0.1 import VDateTime 0.1 import VNetworkModel 0.1 import VAdjustmentAlarmVolume 0.1 @@ -133,7 +134,8 @@ VDevice { id: vDevice } VSettings { id: vSettings } VAdjustmentVersions { id: vAdjustmentVersions } - VAdjustmentService { id: vAdjustmentService } + VAdjustmentServiceMode { id: vAdjustmentServiceMode } + VAdjustmentServiceDates { id: vAdjustmentServiceDates } VDateTime { id: vDateTime } VNetworkModel { id: vNetwork } VAdjustmentAlarmVolume { id: vAdjustmentAlarmVolume } @@ -234,6 +236,10 @@ // 3 - Footer MainMenu { id: _mainMenu + function isTreatment () { _mainMenu.itemPressed(0) } + function isManager () { _mainMenu.itemPressed(1) } + function isSettings () { _mainMenu.itemPressed(2) } + hidden: true // it should be hidden by default since the landing screen changed to init and it does not have the main menu untill the POST passes. titles: [ qsTr("Treatment") , qsTr("Manager") , qsTr("Settings") ] Component.onCompleted: { @@ -309,7 +315,7 @@ anchors { top : parent.top left : parent.left - leftMargin : 1100 + leftMargin : 1080 } horizontalAlignment : Text.Alignleft verticalAlignment : Text.AlignBottom @@ -319,7 +325,23 @@ font.pixelSize: 14 } - SDItem { id: _sdItem + Text { // TEST : Current timezone + color : Colors.textMain + anchors { + top : parent.top + left : parent.left + leftMargin : 1220 + } + horizontalAlignment : Text.Alignleft + verticalAlignment : Text.AlignBottom + + height : 15 + text : vDateTime.timezone + font.pixelSize: 14 + } + + + SDCProgressItem { id: _sdcProgressItem // TODO: disable this later. this is only for diagnostic purpose. onDoubleClicked : { _diagnosticsDialog.open()