Index: sources/gui/qml/pages/settings/SettingsInformation.qml =================================================================== diff -u -r5a9b7ff46df9cecc258f7cb18019a51bca76bce3 -rc4dffe90d1a236a107599027b0b4248d25314af6 --- sources/gui/qml/pages/settings/SettingsInformation.qml (.../SettingsInformation.qml) (revision 5a9b7ff46df9cecc258f7cb18019a51bca76bce3) +++ sources/gui/qml/pages/settings/SettingsInformation.qml (.../SettingsInformation.qml) (revision c4dffe90d1a236a107599027b0b4248d25314af6) @@ -1,13 +1,13 @@ /*! * - * Copyright (c) 2023-2023 Diality Inc. - All Rights Reserved. + * Copyright (c) 2023-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 SettingsInformation.qml - * \author (last) Behrouz NematiPour - * \date (last) 18-Jul-2023 + * \author (last) Dara Navaei + * \date (last) 16-Sep-2024 * \author (original) Behrouz NematiPour * \date (original) 18-Jul-2023 * @@ -31,29 +31,38 @@ confirmVisible : false - onVisibleChanged: { - if ( visible ) { - vAdjustmentVersions .doAdjustment() - vAdjustmentServiceDates .doAdjustment() - } - } - TouchGrid { - anchors.centerIn: parent + anchors.top : parent.top + anchors.topMargin : 50 + anchors.horizontalCenter: parent.horizontalCenter + colCount : 2 colSpacing : 50 - rowCount : 8 + rowCount : 12 // this number indicates when to move to the next column rowSpacing : 0 itemHeight : 50 itemWidth : 575 touchable : false itemsHasLine: [ 0, // title C1 - 1,1,1,1,1,1,1, + 1,1,1,1,1,1,1,1, + 0,0,0, 0, // title C2 1,1,1,1, + 0, // title C2B + 1,1,1,1 ] - itemsValueLeftMargin: 300 + itemsHasIndent: [ + 0, // title C1 + 1,1,1,1,1,1,1,1, + 0,0,0, + 0, // title C2 + 1,1,1,1, + 0, // title C2B + 1,1,1,1 + ] + itemsValueLeftMargin: itemWidth / 2 + 50 + itemsUnitLeftMargin : itemWidth / 4 + 50 itemsValue : [ "" , vDevice .osVersion , @@ -64,11 +73,15 @@ vAdjustmentVersions .dgVerDevice , vAdjustmentVersions .dgVerFPGA , vAdjustmentVersions .dgSerial , - "", + "", "", "", "", // Space and title vAdjustmentServiceDates .hdLastServiceDate , vAdjustmentServiceDates .hdNextServiceDate , vAdjustmentServiceDates .dgLastServiceDate , vAdjustmentServiceDates .dgNextServiceDate , + "", // Space and title + vHDUsageInfo .totalTxHours , + vHDUsageInfo .totalTxHoursSinceLastService , + vHDUsageInfo .epochOfStartOfLastTx , ] itemsText : [ qsTr("Versions" ), // col1 title @@ -80,13 +93,18 @@ qsTr("DG Version" ), qsTr("DG FPGA Version" ), qsTr("DG Serial Number" ), + "", "", "", // Holders for last elements qsTr("Service" ), // col2 title qsTr("HD Last Service Date" ), qsTr("HD Next Service Date" ), qsTr("DG Last Service Date" ), qsTr("DG Next Service Date" ), + qsTr("Treatment" ), + qsTr("Total Hours" ), + qsTr("Hours Since Last Service" ), + qsTr("Last Treatment Start Date" ), ] } }