Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -r13d6a4fae2f910ab6e289ac9280258a94f734405 -r8f336b528afb37743d4ae3404c810e6a9e4422c4 --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 8f336b528afb37743d4ae3404c810e6a9e4422c4) @@ -1,25 +1,26 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2021-2022 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 SettingsStack.qml * \author (last) Behrouz NematiPour - * \date (last) 01-Mar-2021 + * \date (last) 06-Sep-2021 * \author (original) Behrouz NematiPour - * \date (original) 21-Oct-2019 + * \date (original) 16-Apr-2021 * */ // Qt -import QtQuick 2.12 +import QtQuick 2.12 // Project import Gui.Actions 0.1 // Qml imports +import "qrc:/" import "qrc:/globals" import "qrc:/components" import "qrc:/compounds" @@ -46,6 +47,7 @@ DGSettings , Services , SetDateTime , + ExportLogs , Language , Calibration , SWUpdate , @@ -55,10 +57,11 @@ qsTr("Information" ), // Information qsTr("Volume And Brightness" ), // VolumeBrightness qsTr("Wi-Fi" ), // WiFi - qsTr("Bluetooth" ), // Bluetooth - qsTr("Dialysate Generator Settings" ), // DGSettings - qsTr("Services" ), // Services + qsTr("Bluetooth Cuff" ), // Bluetooth + qsTr("DG Cleaning" ), // DGSettings + qsTr("Service" ), // Service qsTr("Set Date And Time" ), // SetDateTime + qsTr("Export Logs" ), // ExportLogs qsTr("Set Language" ), // Language qsTr("Calibration " ), // Calibration qsTr("Software Update" ), // SWUpdate @@ -68,10 +71,11 @@ true , // Information true , // VolumeBrightness true , // WiFi - false , // Bluetooth + true , // Bluetooth true , // DGSettings true , // Services true , // SetDateTime + true , // ExportLogs false , // Language false , // Calibration false , // SWUpdate @@ -85,19 +89,76 @@ true , // DGSettings ! serviceMode , // Services serviceMode , // SetDateTime - serviceMode , // Language - serviceMode , // Calibration - serviceMode , // SWUpdate - serviceMode , // FactoryReset + true , // ExportLogs + false /* serviceMode phase 1 */ , // Language + false /* serviceMode phase 1 */ , // Calibration + false /* serviceMode phase 1 */ , // SWUpdate + false /* serviceMode phase 1 */ , // FactoryReset ] + SettingsHome { id : _settingsHome + title : serviceMode ? qsTr("Service") : qsTr("Device Settings") + backVisible : false + confirmVisible : serviceMode + confirmText.text: qsTr("SHUTDOWN") + onConfirmClicked: _GuiView.doActionTransmit(GuiActions.ID_PowerOff, GuiActions.NoData) + itemsText : _root.itemsText + itemsEnabled : _root.itemsEnabled + itemsVisible : _root.itemsVisible + onItemClicked : { + switch (vIndex) { + case SettingsStack.Information: + push(_settingsInformation) + break + + case SettingsStack.VolumeBrightness: + vDevice.doInitBrightness() + push(_settingsVolumeBrightness) + break + + case SettingsStack.WiFi: + vNetwork.doInit() + push( _settingsWiFi ) + // _settingsWiFi.setFocus() // No keyboard popup. + break + + case SettingsStack.Bluetooth: + push( _settingsBluetooth ) + break + + case SettingsStack.DGSettings: + push( _settingsDGSettings ) + break + + case SettingsStack.Services: + push(_servicePassword) + _servicePassword.setFocus() + break + + case SettingsStack.SetDateTime: + vDateTime.doInit() + push( _settingsDateTime ) + _settingsDateTime.setFocus() + break + + case SettingsStack.ExportLogs: + push( _settingsExportLogs ) + break + + default: + console.debug("Unknown Index", vIndex) + break + } + } + } + SettingsBase { id: _settingsInformation itemIndex : SettingsStack.Information confirmVisible : false onVisibleChanged: { if ( visible ) { - vAdjustmentVersions.doAdjustment() - vAdjustmentService .doAdjustment() + vAdjustmentVersions .doAdjustment() + vAdjustmentServiceDates .doAdjustment() } } @@ -116,21 +177,21 @@ 0, // title C2 1,1,1,1, ] - itemsValueLeftMargin: 350 + itemsValueLeftMargin: 300 itemsValue : [ - "" , - Qt.application.version , - vAdjustmentVersions.hdVerDevice , - vAdjustmentVersions.hdVerFPGA , - vAdjustmentVersions.hdSerial , - vAdjustmentVersions.dgVerDevice , - vAdjustmentVersions.dgVerFPGA , - vAdjustmentVersions.dgSerial , + "" , + Qt .application.version, + vAdjustmentVersions .hdVerDevice , + vAdjustmentVersions .hdVerFPGA , + vAdjustmentVersions .hdSerial , + vAdjustmentVersions .dgVerDevice , + vAdjustmentVersions .dgVerFPGA , + vAdjustmentVersions .dgSerial , "", - vAdjustmentService.hdLastServiceDate , - vAdjustmentService.hdNextServiceDate , - vAdjustmentService.dgLastServiceDate , - vAdjustmentService.dgNextServiceDate , + vAdjustmentServiceDates .hdLastServiceDate , + vAdjustmentServiceDates .hdNextServiceDate , + vAdjustmentServiceDates .dgLastServiceDate , + vAdjustmentServiceDates .dgNextServiceDate , ] itemsText : [ qsTr("Versions" ), // col1 title @@ -142,7 +203,7 @@ qsTr("DG FPGA Version" ), qsTr("DG Serial Number" ), - qsTr("Services" ), // col2 title + qsTr("Service" ), // col2 title qsTr("HD Last Service Date" ), qsTr("HD Next Service Date" ), qsTr("DG Last Service Date" ), @@ -153,41 +214,47 @@ } SettingsVolumeBrightness { id: _settingsVolumeBrightness - itemIndex : SettingsStack.VolumeBrightness + itemIndex : SettingsStack.VolumeBrightness } SettingsDateTime { id: _settingsDateTime - itemIndex : SettingsStack.SetDateTime + itemIndex : SettingsStack.SetDateTime } SettingsWiFi { id: _settingsWiFi - itemIndex : SettingsStack.WiFi + itemIndex : SettingsStack.WiFi } - SettingsBase { id: _settingsBluetooth - itemIndex : SettingsStack.Bluetooth + SettingsBluetoothCuff { id: _settingsBluetooth } SettingsDG { id: _settingsDGSettings - itemIndex : SettingsStack.DGSettings + itemIndex : SettingsStack.DGSettings } + SettingsExportLogs { id: _settingsExportLogs + itemIndex : SettingsStack.ExportLogs + } + UserConfirmation { id: _servicePassword itemIndex : SettingsStack.Services - title : qsTr("Please Enter The Service Password") + title : qsTr("Service Password") isPassword: true onBackClicked : { clearPassword() _settingsHome.notificationText = "" } onConfirmClicked: { - if ( vSettings.settings["Service Password"] === undefined ) { + if ( vSettings.servicePass === "" ) { _settingsHome.notificationText = qsTr("No service password defined") } else { - if ( password === vSettings.settings["Service Password"].keys[0] ) { + if ( password === vSettings.servicePass ) { _settingsHome.notificationText = "" - serviceMode = true + vAdjustmentServiceMode.doAdjustment() + if ( vSettings.noCANBus ) { // if NoCANBus is set don't wait for HD and go to service mode. + gotoServiceMode(true) + } } else { _settingsHome.notificationText = qsTr("Incorrect service password") @@ -198,60 +265,35 @@ } } - SettingsHome { id : _settingsHome - backVisible : false - confirmVisible : serviceMode - confirmText.text: qsTr("SHUTDOWN") - onConfirmClicked: _GuiView.doActionTransmit(GuiActions.ID_PowerOff, GuiActions.NoData) - itemsText : _root.itemsText - itemsEnabled : _root.itemsEnabled - itemsVisible : _root.itemsVisible - onItemClicked : { - switch (vIndex) { - case SettingsStack.Information: - push(_settingsInformation) - break + Connections { target: vAdjustmentServiceMode + onAdjustmentTriggered : { + if ( vAdjustmentServiceMode.adjustment_Accepted ) { + _settingsHome.notificationText = "" + } + else { + _settingsHome.notificationText = vAdjustmentServiceMode.text() + } + } + } - case SettingsStack.VolumeBrightness: - vDevice.doInitBrightness() - push(_settingsVolumeBrightness) - break + function gotoServiceMode( vservice ) { +// push( _settingsHome , vservice ) + serviceMode = vservice + if ( vservice ) + _mainMenu.hidden = true + else + if ( _settingsHome.visible ) + _mainMenu.hidden = false + } - case SettingsStack.SetDateTime: - vDateTime.doInit() - push( _settingsDateTime ) - _settingsDateTime.setFocus() - break - case SettingsStack.WiFi: - vNetwork.doInit() - push( _settingsWiFi ) - // _settingsWiFi.setFocus() // No keyboard popup. - break - - case SettingsStack.Bluetooth: - push( _settingsBluetooth ) - break - - case SettingsStack.DGSettings: - push( _settingsDGSettings ) - break - - case SettingsStack.Services: - push(_servicePassword) - _servicePassword.setFocus() - break - - default: - console.debug("Unknown Index", vIndex) - break - } - } + Connections { target: vHDOperationMode + onServiceChanged : gotoServiceMode(vservice) } onVisibleChanged: { if (visible) { - _mainMenu.hidden = false + _mainMenu.hidden = serviceMode } else { stackView.initialItem = null