Index: sources/gui/qml/pages/settings/SettingsInformation.qml =================================================================== diff -u -r80b5e8f1ebb90c03c37d90d90cd2da3bd95d6803 -r6be40239ce52d641692de158a044af0a54cde1e8 --- sources/gui/qml/pages/settings/SettingsInformation.qml (.../SettingsInformation.qml) (revision 80b5e8f1ebb90c03c37d90d90cd2da3bd95d6803) +++ sources/gui/qml/pages/settings/SettingsInformation.qml (.../SettingsInformation.qml) (revision 6be40239ce52d641692de158a044af0a54cde1e8) @@ -42,18 +42,29 @@ anchors.centerIn: parent colCount : 2 colSpacing : 50 - rowCount : 8 + rowCount : 11 rowSpacing : 0 - itemHeight : 50 + itemHeight : 45 itemWidth : 550 touchable : false itemsHasLine: [ 0, // title C1 - 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, 0, // title C2B + 1,1,1,1 ] - itemsValueLeftMargin: 300 + itemsHasIndent: [ + 0, // title C1 + 0,0,0,0,0,0,0,0,0, + 0, // title C2 + 0,0,0,0,0, + 0, 0, // title C2B + 1,1,1,1 + ] + itemsValueLeftMargin: itemWidth / 2 + 50 + itemsUnitLeftMargin : itemWidth / 4 + 50 itemsValue : [ "" , Qt .application.version, @@ -63,11 +74,16 @@ 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 , + vHDUsageInfo.epochOfLastRecordReset , ] itemsText : [ qsTr("Versions" ), // col1 title @@ -78,13 +94,19 @@ 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" ), - + "", // spacer + qsTr("Treatment" ), + qsTr("Total Hours" ), + qsTr("Hours Since Last Service" ), + qsTr("Last Start" ), + qsTr("Last Reset" ), ] } }