Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -r2d0bacfbe1b70055247eb40743405a5f9acb15e3 -r86e9dfbff50cb7e16fd94c16c1c818cef3b47eac --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 2d0bacfbe1b70055247eb40743405a5f9acb15e3) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 86e9dfbff50cb7e16fd94c16c1c818cef3b47eac) @@ -14,12 +14,13 @@ */ // 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 , @@ -59,6 +61,7 @@ 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 @@ -72,6 +75,7 @@ true , // DGSettings true , // Services true , // SetDateTime + true , // ExportLogs false , // Language false , // Calibration false , // SWUpdate @@ -85,12 +89,69 @@ true , // DGSettings ! serviceMode , // Services serviceMode , // SetDateTime + 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 @@ -153,24 +214,28 @@ } 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 } 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("Service Password") @@ -197,73 +262,27 @@ } } - 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.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: vAdjustmentServiceMode onAdjustmentTriggered : { if ( vAdjustmentServiceMode.adjustment_Accepted ) { - _settingsHome.notificationText = "" - serviceMode = true + _settingsHome.notificationText = "" } else { _settingsHome.notificationText = vAdjustmentServiceMode.text() } } } + Connections { target: vHDOperationMode + onServiceChanged : { push( _settingsHome , vservice ) + serviceMode = vservice + _mainMenu.hidden = vservice + } + } + onVisibleChanged: { if (visible) { - _mainMenu.hidden = false + _mainMenu.hidden = serviceMode } else { stackView.initialItem = null