Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f) @@ -53,7 +53,6 @@ readonly property bool visibleInformation : true readonly property bool visibleVolumeBrightness : ! onlyUpdating // same as service password, on application execution in updating, on mount files will be moved. readonly property bool visibleWiFi : true - readonly property bool visibleBluetooth : true readonly property bool visibleExportLogs : true // during the update we cannot enable the servce menu since the current set password is in ~denali folder @@ -72,12 +71,14 @@ readonly property bool visibleInstitutionalRecord : true readonly property bool visibleLocalization : true // loggedIn TODO: + readonly property string settingsTitle : _GuiView.manufactSetup ? qsTr("Manufacturing Setup") : serviceMode + ? qsTr("Service") : _GuiView.updateSetup + ? qsTr("Software Update") : qsTr("Device Settings") enum ItemsIndex { Information , VolumeBrightness , WiFi , - Bluetooth , DGCleaning , DGScheduling , ServicePassword , @@ -98,7 +99,6 @@ qsTr("Information" ), // Information qsTr("Volume And Brightness" ), // VolumeBrightness qsTr("Wi-Fi" ), // WiFi - qsTr("Bluetooth Cuff" ), // Bluetooth qsTr("DG Cleaning" ), // DGCleaning qsTr("DG Scheduling" ), // DGScheduling qsTr("Service" ), // servicePassword @@ -119,7 +119,6 @@ true , // Information true , // VolumeBrightness true , // WiFi - true , // Bluetooth true , // DGCleaning true , // DGScheduling true , // ServicePassword @@ -140,7 +139,6 @@ visibleInformation , // Information visibleVolumeBrightness , // VolumeBrightness visibleWiFi , // WiFi - visibleBluetooth , // Bluetooth visibleDGCleaning , // DGCleaning visibleDGScheduling , // DGScheduling visibleServicePassword , // ServicePassword @@ -159,7 +157,6 @@ ] SettingsHome { id : _settingsHome - title : _GuiView.manufactSetup ? qsTr("Manufacturing Setup") : serviceMode ? qsTr("Service") : _GuiView.updateSetup ? qsTr("Software Update") : qsTr("Device Settings") backVisible : false //TODO on graceful shutdown, the applicaiton quit shall be used for any applicaiton termination // and needs to be distinguished between the QUIT or SHUTDOWN touch, @@ -179,6 +176,7 @@ itemsVisible : _root.itemsVisible onItemClicked : { vDevice.status = "" + _headerBar.titleText = itemsText[vIndex] switch (vIndex) { case SettingsStack.Information: vAdjustmentVersions .doAdjustment() @@ -197,10 +195,6 @@ push( _settingsWiFi ) break - case SettingsStack.Bluetooth: - push( _settingsBluetooth ) - break - case SettingsStack.DGCleaning: push( _settingsDGCleaning ) break @@ -268,7 +262,6 @@ SettingsInformation { id: _settingsInformation } SettingsVolumeBrightness { id: _settingsVolumeBrightness } SettingsWiFi { id: _settingsWiFi } - SettingsBluetoothCuff { id: _settingsBluetooth } SettingsDGCleaning { id: _settingsDGCleaning } SettingsDGScheduling { id: _settingsDGScheduling } SettingsServicePassword { id: _servicePassword } @@ -287,11 +280,8 @@ //DEBUG console.log (" 0 ---------- ", _GuiView.manufactMode, _GuiView.manufactSetup, vservice, stackView.initialItem, stackView.currentItem, stackView.depth) if ( ! _servicePassword.isPassword_Accepted ) return serviceMode = vservice - if ( vservice ) - _mainMenu.hidden = true - else - if ( _settingsHome.visible ) - _mainMenu.hidden = false + if ( _settingsHome.visible ) + _mainMenu.hidden = false } Connections { target: vAdjustmentServiceMode @@ -352,10 +342,13 @@ onVisibleChanged: { if (visible) { - _mainMenu.hidden = serviceMode || _GuiView.manufactSetup + _mainMenu.hidden = _GuiView.manufactSetup + _headerBar.titleText = _root.settingsTitle } else { stackView.initialItem = null + _headerBar.titleText = "" + serviceMode = false } } }