Index: sources/gui/qml/pages/settings/SettingsHome.qml =================================================================== diff -u -r56ad953ae404fcf6956bd4f76b7a54b12d0285d3 -r26433c42f2efa2cb18af95f523581c7eeeff049d --- sources/gui/qml/pages/settings/SettingsHome.qml (.../SettingsHome.qml) (revision 56ad953ae404fcf6956bd4f76b7a54b12d0285d3) +++ sources/gui/qml/pages/settings/SettingsHome.qml (.../SettingsHome.qml) (revision 26433c42f2efa2cb18af95f523581c7eeeff049d) @@ -1,15 +1,15 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file SettingsHome.qml - * \author (last) Behrouz NematiPour - * \date (last) 14-Apr-2021 + * \author (last) Dara Navaei + * \date (last) 06-Mar-2024 * \author (original) Behrouz NematiPour - * \date (original) 21-Oct-2019 + * \date (original) 16-Apr-2021 * */ @@ -32,18 +32,17 @@ property alias itemsEnabled : _settingItems.itemsEnabled property alias itemsVisible : _settingItems.itemsVisible - readonly property int rowCount : 5 + readonly property int rowCount : 6 readonly property int colCount : itemsText.length > rowCount ? Math.ceil(itemsText.length / rowCount) : 1 signal itemClicked(int vIndex) - title : qsTr("Device Settings") - TouchGrid { id: _settingItems anchors.centerIn: _root onItemClicked : _root.itemClicked(vIndex) rowCount : _root.rowCount colCount : _root.colCount + itemWidth : 325 } // Test Codes @@ -56,14 +55,13 @@ leftMargin : 35 } TouchRect { id : _clearAlarmCondition + visible : false // TODO : phase 1 doesn't have this feature (disinfection schedule) objectName: "_clearAlarmCondition" width : 300 height : Variables.logoDiameter text.text: qsTr("Clear Alarm Condition") - onClicked: _alarmItem.clearAlarm() + onClicked: _alarmItem.clearAlarm() } - USBButton { id: _usbButton } - ExportButton { id: _exportButton } } // The Main menu need to hide in case we have any alarm, if not the menu is covered by keyboard but the alram does not.