Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -r59625af31d9009df82fa48310b54c0f247e829fc -rfcdb1dfa21f3d5c02e549089c19ab7d57b19040c --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 59625af31d9009df82fa48310b54c0f247e829fc) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision fcdb1dfa21f3d5c02e549089c19ab7d57b19040c) @@ -71,7 +71,7 @@ readonly property bool visibleDeviceConfiguration : onlyManufacturing && loggedIn readonly property bool visibleDeviceRegistration : onlyManufacturing && loggedIn readonly property bool visibleStartSoftwareUpdate : loggedIn - + readonly property bool visibleFinalizeSoftwareUpdate: loggedIn // TODO need to add additional condition ? enum ItemsIndex { Information , VolumeBrightness , @@ -91,7 +91,9 @@ RootSSHAccess , FactoryReset , Decommission , - StartSoftwareUpdate + Information , // place-holder element for "" menu item + StartSoftwareUpdate , + FinalizeSoftwareUpdate } property var itemsText : [ qsTr("Information" ), // Information @@ -112,7 +114,10 @@ qsTr("Enable Root SSH" ), // RootSSHAccess qsTr("Factory Reset" ), // FactoryReset qsTr("Decommissioning" ), // Decommission + qsTr(""), // Added to push the software request and confirm to the next column qsTr("Software Update" ), // Software Update Request + qsTr("Finalize Software Update" ), // Finalize Software Update + ] property var itemsEnabled : [ true , // Information @@ -133,7 +138,10 @@ true , // RootSSHAccess true , // FactoryReset true , // Decommission + false , // place holder true , // Software Update Request + true , // Finalize Software Update + ] property var itemsVisible : [ visibleInformation , // Information @@ -154,7 +162,9 @@ visibleRootSSHAccess , // RootSSHAccess visibleFactoryReset , // FactoryReset visibleDecommission , // Decommission + true , // placeholder visibleStartSoftwareUpdate , // Software update request + visibleFinalizeSoftwareUpdate , // Finalize Software Update ] SettingsHome { id : _settingsHome @@ -253,6 +263,10 @@ push( _serviceStartSoftwareUpdate ) break + case SettingsStack.FinalizeSoftwareUpdate: + push ( _serviceFinalizeSoftwareUpdate ) + break + default: console.debug("Unknown Index", vIndex) break @@ -276,6 +290,7 @@ SettingsFactoryReset { id: _serviceFactoryReset } SettingsDecommission { id: _serviceDecommission } SettingsStartSoftwareUpdate { id: _serviceStartSoftwareUpdate } + SettingsFinalizeSoftwareUpdate { id: _serviceFinalizeSoftwareUpdate} function gotoServiceMode( vservice ) { //DEBUG console.log (" 0 ---------- ", _GuiView.manufactMode, _GuiView.manufactSetup, vservice, stackView.initialItem, stackView.currentItem, stackView.depth)