Index: sources/gui/qml/pages/settings/SettingsInformation.qml =================================================================== diff -u -r419e283b49ae32d48abcba1912757d7e00c120c4 -rb6232218bc2ae9dcd509e92af5ced52a58629499 --- sources/gui/qml/pages/settings/SettingsInformation.qml (.../SettingsInformation.qml) (revision 419e283b49ae32d48abcba1912757d7e00c120c4) +++ sources/gui/qml/pages/settings/SettingsInformation.qml (.../SettingsInformation.qml) (revision b6232218bc2ae9dcd509e92af5ced52a58629499) @@ -31,36 +31,34 @@ 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 : 11 + rowCount : 12 // this number indicates when to move to the next column rowSpacing : 0 - itemHeight : 45 + itemHeight : 50 itemWidth : 575 touchable : false itemsHasLine: [ 0, // title C1 - 1,1,1,1,1,1,1,0,0,0, + 1,1,1,1,1,1,1,1, + 0,0,0, 0, // title C2 1,1,1,1, - 0, 0, // title C2B + 0, // title C2B 1,1,1,1 ] itemsHasIndent: [ 0, // title C1 - 0,0,0,0,0,0,0,0,0, + 1,1,1,1,1,1,1,1, + 0,0,0, 0, // title C2 - 0,0,0,0,0, - 0, 0, // title C2B + 1,1,1,1, + 0, // title C2B 1,1,1,1 ] itemsValueLeftMargin: itemWidth / 2 + 50 @@ -80,11 +78,11 @@ vAdjustmentServiceDates .hdNextServiceDate , vAdjustmentServiceDates .dgLastServiceDate , vAdjustmentServiceDates .dgNextServiceDate , - "", "", // Space and title - vHDUsageInfo.totalTxHoursString , - vHDUsageInfo.totalTxHoursSinceLastServiceString , - vHDUsageInfo.epochOfStartOfLastTx , - vHDUsageInfo.epochOfLastRecordReset , + "", // Space and title + vHDUsageInfo .totalTxHours , + vHDUsageInfo .totalTxHoursSinceLastService , + vHDUsageInfo .epochOfStartOfLastTx , + vHDUsageInfo .epochOfLastRecordReset , ] itemsText : [ qsTr("Versions" ), // col1 title @@ -103,7 +101,7 @@ 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" ), Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -rb9eb580cf3997837af24757ceaf845af62501a1e -rb6232218bc2ae9dcd509e92af5ced52a58629499 --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision b9eb580cf3997837af24757ceaf845af62501a1e) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision b6232218bc2ae9dcd509e92af5ced52a58629499) @@ -177,6 +177,9 @@ vDevice.status = "" switch (vIndex) { case SettingsStack.Information: + vAdjustmentVersions .doAdjustment() + vAdjustmentServiceDates .doAdjustment() + vHDUsageInfo .doAdjustment() push(_settingsInformation) break Index: sources/view/settings/VHDUsageInfo.cpp =================================================================== diff -u -r36d49ba38a1e56929f1ce3c6fe8b7a0933d5f46a -rb6232218bc2ae9dcd509e92af5ced52a58629499 --- sources/view/settings/VHDUsageInfo.cpp (.../VHDUsageInfo.cpp) (revision 36d49ba38a1e56929f1ce3c6fe8b7a0933d5f46a) +++ sources/view/settings/VHDUsageInfo.cpp (.../VHDUsageInfo.cpp) (revision b6232218bc2ae9dcd509e92af5ced52a58629499) @@ -33,22 +33,20 @@ */ void View::VHDUsageInfo::onActionReceive(const HDUsageInfoResponseData &vData) { - totalTxHours (vData.mTotalTxHours ); - totalTxHoursSinceLastService(vData.mTotalTxHoursSinceLastService); - epochOfStartOfLastTx (vData.mEpochOfStartOfLastTx ); - epochOfLastRecordReset (vData.mEpochOfLastRecordReset ); - crc (vData.mCrc ); int hours = vData.mTotalTxHours; int minutes = (vData.mTotalTxHours - hours) * 60; QString timeFormatted = QString("%1:%2").arg(hours).arg(minutes); - totalTxHoursString(timeFormatted); + totalTxHours(timeFormatted); hours = vData.mTotalTxHoursSinceLastService; minutes = (vData.mTotalTxHoursSinceLastService - hours) * 60; timeFormatted = QString("%1:%2").arg(hours).arg(minutes); - totalTxHoursSinceLastServiceString(timeFormatted); + totalTxHoursSinceLastService(timeFormatted); + epochOfStartOfLastTx (vData.mEpochOfStartOfLastTx ? QString("%1").arg(vData.mEpochOfStartOfLastTx ) : "" ); + epochOfLastRecordReset (vData.mEpochOfLastRecordReset ? QString("%1").arg(vData.mEpochOfLastRecordReset) : "" ); + // *** has to be the last to let the information to be set and then emit the signal *** // *** otherwise will use the Previous values before being set. *** adjustment ( true ); Index: sources/view/settings/VHDUsageInfo.h =================================================================== diff -u -r36d49ba38a1e56929f1ce3c6fe8b7a0933d5f46a -rb6232218bc2ae9dcd509e92af5ced52a58629499 --- sources/view/settings/VHDUsageInfo.h (.../VHDUsageInfo.h) (revision 36d49ba38a1e56929f1ce3c6fe8b7a0933d5f46a) +++ sources/view/settings/VHDUsageInfo.h (.../VHDUsageInfo.h) (revision b6232218bc2ae9dcd509e92af5ced52a58629499) @@ -47,15 +47,11 @@ // disabled coco end //HD Usage Information - PROPERTY(float , totalTxHours , 0 ) - PROPERTY(float , totalTxHoursSinceLastService , 0 ) - PROPERTY(quint32 , epochOfStartOfLastTx , 0 ) - PROPERTY(quint32 , epochOfLastRecordReset , 0 ) - PROPERTY(quint16 , crc , 0 ) + PROPERTY(QString , totalTxHours , "") + PROPERTY(QString , totalTxHoursSinceLastService , "") + PROPERTY(QString , epochOfStartOfLastTx , "") + PROPERTY(QString , epochOfLastRecordReset , "") - PROPERTY(QString , totalTxHoursString , "" ) - PROPERTY(QString , totalTxHoursSinceLastServiceString, "" ) - VIEW_DEC_CLASS(VHDUsageInfo) VIEW_DEC_SLOT (HDUsageInfoResponseData)