Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -r6c65a4129d2459bf2910b76b20263a6a00bdf8fb -r1286d74bd015276aab604808be2766136091c125 --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 6c65a4129d2459bf2910b76b20263a6a00bdf8fb) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 1286d74bd015276aab604808be2766136091c125) @@ -99,7 +99,8 @@ InstitutionalRecord , AdvancedInstitutional , FeatureConfigurations , - AdvancedMode + AdvancedMode , + Home } property var itemsText : [ qsTr("Device Information" ), // Device Information @@ -123,6 +124,7 @@ qsTr("Advanced Institutional Settings" ), // AdvancedInstitutional qsTr("Feature Configurations" ), // FeatureConfigurations qsTr("Advanced Mode" ), // Advanced Modes + settingsTitle , // settings home ] property var itemsVisible : [ @@ -147,12 +149,14 @@ visibleAdvancedInstitutional , // AdvancedInstitutional visibleFeatureConfigurations , // FeatureConfigurations visibleAdvancedModes , // Advanced Modes + false , // leave last and false align with settings home ] // TODO: SRS 405/406 Test Mode instead add Q_PROPERTY to monitor state??? onServiceModeChanged: _headerBar.loggedUser = serviceMode ? "[Service]" : "" SettingsHome { id : _settingsHome + itemIndex : SettingsStack.Home 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, @@ -172,7 +176,6 @@ onItemClicked : { _root.currentItem = vIndex vDevice.status = "" - _headerBar.titleText = itemsText[vIndex] switch (vIndex) { case SettingsStack.Information: vAdjustmentVersions .doAdjustment() @@ -286,7 +289,7 @@ SettingsAdvancedInstitutional { id: _settingsAdvancedInstitutional} SettingsLocalization { id: _settingLocalization } SettingsFeatureConfigurations { id: _settingsFeatureConfigurations} - SettingsAdvancedMode { id: _settingAdvancedMode } + SettingsAdvancedMode { id: _settingAdvancedMode } function gotoServiceMode( vservice ) { //DEBUG console.log (" 0 ---------- ", _GuiView.manufactMode, _GuiView.manufactSetup, vservice, stackView.initialItem, stackView.currentItem, stackView.depth) @@ -339,11 +342,10 @@ onVisibleChanged: { if (visible) { _mainMenu.hidden = _GuiView.manufactSetup - _headerBar.titleText = _root.settingsTitle + _headerBar.activeStack = stackView } else { stackView.initialItem = null - _headerBar.titleText = "" } } }