Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 -re2b8925fd32e359b3c440acd61e921f0be825a65 --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision e2b8925fd32e359b3c440acd61e921f0be825a65) @@ -232,10 +232,6 @@ push( _settingsDeviceConfiguration ) break - case SettingsStack.DeviceRegistration: - push( _settingsDeviceRegistration ) - break - case SettingsStack.RootSSHAccess: vDevice.doInitRootSSHAccess() push( _SettingsRootSSHAccess) @@ -249,11 +245,6 @@ push( _serviceDecommission ) break - case SettingsStack.InstitutionalRecord: - vAdjustmentInstitutionalRecord.doAdjustment() - push( _settingsInstitutionalRecord ) - break - case SettingsStack.Localization: push( _settingLocalization ) break @@ -268,18 +259,14 @@ SettingsInformation { id: _settingsInformation } SettingsVolumeBrightness { id: _settingsVolumeBrightness } SettingsWiFi { id: _settingsWiFi } - SettingsDGCleaning { id: _settingsDGCleaning } - SettingsDGScheduling { id: _settingsDGScheduling } SettingsServicePassword { id: _servicePassword } SettingsDateTime { id: _settingsDateTime } SettingsExportLogs { id: _settingsExportLogs } SettingsROInput { id: _settingsRoInput } SettingsManufacturingSetup { id: _settingsDeviceConfiguration } - SettingsDeviceRegistration { id: _settingsDeviceRegistration } SettingsRootSSHAccess { id: _SettingsRootSSHAccess } SettingsFactoryReset { id: _serviceFactoryReset } SettingsDecommission { id: _serviceDecommission } - SettingsInstitutionalRecord { id: _settingsInstitutionalRecord } SettingsLocalization { id: _settingLocalization } function gotoServiceMode( vservice ) { @@ -293,32 +280,32 @@ _mainMenu.hidden = false } - Connections { target: vAdjustmentServiceMode - function onAdjustmentTriggered ( vValue ) { - if ( vAdjustmentServiceMode.adjustment_Accepted ) { - _settingsHome.notificationText = "" - } - else { - _settingsHome.notificationText = vAdjustmentServiceMode.text() - } - } - } +// Connections { target: vAdjustmentServiceMode +// function onAdjustmentTriggered ( vValue ) { +// if ( vAdjustmentServiceMode.adjustment_Accepted ) { +// _settingsHome.notificationText = "" +// } +// else { +// _settingsHome.notificationText = vAdjustmentServiceMode.text() +// } +// } +// } - Connections { target: vAdjustmentInstitutionalRecord - function onAdjustmentTriggered ( vValue ) { - if ( vAdjustmentInstitutionalRecord.adjustment_Accepted ) { - _settingsHome.notificationText = "" - } - else { - _settingsHome.notificationText = vAdjustmentInstitutionalRecord.text() - } - } - } +// Connections { target: vAdjustmentInstitutionalRecord +// function onAdjustmentTriggered ( vValue ) { +// if ( vAdjustmentInstitutionalRecord.adjustment_Accepted ) { +// _settingsHome.notificationText = "" +// } +// else { +// _settingsHome.notificationText = vAdjustmentInstitutionalRecord.text() +// } +// } +// } - Connections { target: vTDOpMode - function onServiceChanged ( vValue ) { gotoServiceMode( vValue )} - function onStandbyWaitDisinfectChanged ( vValue ) { page( _settingsHome , vValue )} - } +// Connections { target: vTDOpMode +// function onServiceChanged ( vValue ) { gotoServiceMode( vValue )} +// function onStandbyWaitDisinfectChanged ( vValue ) { page( _settingsHome , vValue )} +// } Connections { target: _GuiView function onManufactModeChanged( vPass ) {