Index: denali.pro =================================================================== diff -u -r50199c98f47d614c1e3132963f68d3a81692e9e1 -r21e68ccf5594b0ca3e0a8c7986e405260d273899 --- denali.pro (.../denali.pro) (revision 50199c98f47d614c1e3132963f68d3a81692e9e1) +++ denali.pro (.../denali.pro) (revision 21e68ccf5594b0ca3e0a8c7986e405260d273899) @@ -163,6 +163,7 @@ sources/view/VNetworkModel.h \ sources/view/VDateTime.h \ sources/view/VServiceMode.h \ + sources/view/VDeviceInformation.h \ \ # ---------- Views - Alarm sources/view/hd/alarm/VAlarmStatus.h \ \ # ---------- Views - HD - Adjustment @@ -319,6 +320,7 @@ sources/view/VNetworkModel.cpp \ sources/view/VDateTime.cpp \ sources/view/VServiceMode.cpp \ + sources/view/VDeviceInformation.cpp \ \ # ---------- Views - Alarm sources/view/hd/alarm/VAlarmStatus.cpp \ \ # ---------- Views - HD - Adjustment Index: denali.pro.user =================================================================== diff -u -r50199c98f47d614c1e3132963f68d3a81692e9e1 -r21e68ccf5594b0ca3e0a8c7986e405260d273899 --- denali.pro.user (.../denali.pro.user) (revision 50199c98f47d614c1e3132963f68d3a81692e9e1) +++ denali.pro.user (.../denali.pro.user) (revision 21e68ccf5594b0ca3e0a8c7986e405260d273899) @@ -1,6 +1,6 @@ - + EnvironmentId Index: denali.qrc =================================================================== diff -u -r50199c98f47d614c1e3132963f68d3a81692e9e1 -r21e68ccf5594b0ca3e0a8c7986e405260d273899 --- denali.qrc (.../denali.qrc) (revision 50199c98f47d614c1e3132963f68d3a81692e9e1) +++ denali.qrc (.../denali.qrc) (revision 21e68ccf5594b0ca3e0a8c7986e405260d273899) @@ -99,10 +99,10 @@ sources/gui/qml/components/DebugDataColumn.qml sources/gui/qml/components/CheckListItem.qml sources/gui/qml/components/ConfirmButton.qml + sources/gui/qml/components/InformationTable.qml + sources/gui/qml/components/InformationTableEntry.qml + sources/gui/qml/components/InformationSubTable.qml sources/gui/qml/components/pretreatment/SliderCreateTreatment.qml - sources/gui/qml/components/pretreatment/ConfirmTreatmentTable.qml - sources/gui/qml/components/pretreatment/ConfirmTreatmentTableEntry.qml - sources/gui/qml/components/pretreatment/ConfirmTreatmentSubTable.qml sources/gui/qml/components/pretreatment/TopMenuBarCreateTreatment.qml sources/gui/qml/components/pretreatment/SliderDoubleCreateTreatment.qml sources/gui/qml/components/RangeSlider.qml Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -r50199c98f47d614c1e3132963f68d3a81692e9e1 -r21e68ccf5594b0ca3e0a8c7986e405260d273899 --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 50199c98f47d614c1e3132963f68d3a81692e9e1) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 21e68ccf5594b0ca3e0a8c7986e405260d273899) @@ -78,6 +78,7 @@ #include "VTreatmentAdjustmentVersions.h" #include "VDateTime.h" #include "VServiceMode.h" +#include "VDeviceInformation.h" namespace Gui { MainView *_viewer = nullptr; Index: sources/gui/qml/components/InformationSubTable.qml =================================================================== diff -u --- sources/gui/qml/components/InformationSubTable.qml (revision 0) +++ sources/gui/qml/components/InformationSubTable.qml (revision 21e68ccf5594b0ca3e0a8c7986e405260d273899) @@ -0,0 +1,62 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file ConfirmTreatmentSubTable.qml + * \date 2020/08/25 + * \author Peter Lucia + * + */ + +// Qt +import QtQuick 2.12 + +// Project + +// Qml imports +import "qrc:/globals" +import "qrc:/components" + +Rectangle { id: _root + property var leftColumnKeys : [] + property var leftColumnValues : [] + property var rightColumnKeys : [] + property var rightColumnValues : [] + objectName: "InformationSubTable" + color: Colors.transparent + + Column { id: _leftColumn + anchors { + top: parent.top + topMargin: Variables.sliderTextMargin + } + width: _root.width / 2 + Repeater { id: _leftColumnRepeater + model: leftColumnKeys + InformationTableEntry { + key : leftColumnKeys[index] + value : leftColumnValues[index] + } + } + } + + Column { id: _rightColumn + anchors { + top : parent.top + topMargin : Variables.sliderTextMargin + left : _leftColumn.right + } + width: _root.width / 2 + Repeater { id: _operating_repeater + model: rightColumnKeys + InformationTableEntry { + key : rightColumnKeys[index] + value: rightColumnValues[index] + } + } + } +} Index: sources/gui/qml/components/InformationTable.qml =================================================================== diff -u --- sources/gui/qml/components/InformationTable.qml (revision 0) +++ sources/gui/qml/components/InformationTable.qml (revision 21e68ccf5594b0ca3e0a8c7986e405260d273899) @@ -0,0 +1,128 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file ConfirmTreatmentTable.qml + * \date 2020/08/25 + * \author Peter Lucia + * + */ + +// Qt +import QtQuick 2.12 + +// Project + +// Qml imports +import "qrc:/globals" +import "qrc:/components" + +Rectangle { + id: _root + property bool headerVisible : true + property var leftColumnTitle : "Left Column" + property var rightColumnTitle : "Right Column" + property var headerName : "New Treatment" + property alias subTable : _subTable + + objectName: "InformationTable" + width: Variables.informationTableWidth + height: Variables.informationTableHeight + color: Colors.backgroundDialog + + Rectangle { + id: _header + width: parent.width + height: Variables.informationTableHeaderHeight + color: "transparent" + visible: _root.headerVisible + radius: 5 + + Rectangle { + id: _treatment_profile_id + objectName: _root.objectName + "_treatment_profile_id" + height: 40 + width: height + anchors { + top: _header.top + left: _header.left + topMargin: Variables.informationTableMargin + leftMargin: Variables.informationTableMargin + } + color: Colors.informationTableID + radius: 5 + + Text { + id: _treatment_profile_id_text + objectName: _treatment_profile_id.objectName + "_treatment_profile_id_text" + color: Colors.backgroundDialog + text: "1" + font.pixelSize: Fonts.fontPixelTextRectTitle + anchors.centerIn: _treatment_profile_id + font.bold: true + } + } + + Text { + id: _headerName + objectName: _root.objectName + "_headerName" + anchors { + bottom: _treatment_profile_id.bottom + left: _treatment_profile_id.right + topMargin: Variables.informationTableMargin + leftMargin: 20 + } + text: _root.headerName + color: "white" + font.pixelSize: Fonts.fontInformationTableHeader + } + } + + Text { + id: _leftColumnTitle + objectName: _root.objectName + "_leftColumn" + text: _root.leftColumnTitle + font.pixelSize: Fonts.fontInformationTablePixel + color: "white" + anchors { + left: parent.left + top: _root.headerVisible ? _header.bottom : _root.top + topMargin: _root.headerVisible ? 0 : Variables.informationTableMargin + leftMargin: Variables.informationTableMargin + } + } + + Text { + id: _rightColumnTitle + objectName: _root.objectName + "_rightColumn" + text: _root.rightColumnTitle + font.pixelSize: Fonts.fontInformationTablePixel + color: "white" + anchors { + top: _root.headerVisible ? _header.bottom : _root.top + topMargin: _root.headerVisible ? 0 : Variables.informationTableMargin + left: _root.horizontalCenter + } + } + + InformationSubTable { + id: _subTable + anchors { + top: _leftColumnTitle.bottom + left: _root.left + leftMargin: Variables.informationTableMargin + topMargin: Variables.informationTableEntryMargin + bottom: parent.bottom + } + width: parent.width - 2*Variables.informationTableMargin + height: _root.height - _header.height + leftColumnKeys: vTreatmentCreate.doGetPrescriptionParameterNames() + leftColumnValues: vTreatmentCreate.doGetPrescriptionParameterValues() + rightColumnKeys: vTreatmentCreate.doGetOperatingParameterNames() + rightColumnValues: vTreatmentCreate.doGetOperatingParameterValues() + } +} Index: sources/gui/qml/components/InformationTableEntry.qml =================================================================== diff -u --- sources/gui/qml/components/InformationTableEntry.qml (revision 0) +++ sources/gui/qml/components/InformationTableEntry.qml (revision 21e68ccf5594b0ca3e0a8c7986e405260d273899) @@ -0,0 +1,67 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file ConfirmTreatmentTableEntry.qml + * \date 2020/08/25 + * \author Peter Lucia + * + */ + +// Qt +import QtQuick 2.12 + +// Project + +// Qml imports +import "qrc:/globals" +import "qrc:/components" + +/*! + * \brief ConfirmTreatmentTableEntry - A cell of a confirm treatment + * parameters table with configurable key name, value name, and dimensions. + * Provides a single component for a repeater when building the column + */ +Rectangle { + id: _root + property var key: "Key" + property var value: "Value" + height: Variables.informationSubTableHeight + width: Variables.informationSubTableWidth + color: "transparent" + + Line { + id: _line + width: _root.width + Variables.informationTableEntryMargin + thickness: 3 + color: Colors.backgroundMenu + anchors.top: _root.bottom + anchors.left: _root.left + anchors.leftMargin: -Variables.informationTableEntryMargin + } + + Text { + id: _key + objectName: key + index + color: Colors.textMain + text: key + anchors.left: parent.left + anchors.verticalCenter: _root.verticalCenter + font.pixelSize: Fonts.fontInformationTablePixel + } + + Text { + id: _value + objectName: value + index + color: Colors.textMain + text: value + anchors.left: _line.horizontalCenter + anchors.verticalCenter: _root.verticalCenter + anchors.leftMargin: 3*Variables.informationTableMargin + font.pixelSize: Fonts.fontInformationTablePixel + } +} Fisheye: Tag 21e68ccf5594b0ca3e0a8c7986e405260d273899 refers to a dead (removed) revision in file `sources/gui/qml/components/pretreatment/ConfirmTreatmentSubTable.qml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 21e68ccf5594b0ca3e0a8c7986e405260d273899 refers to a dead (removed) revision in file `sources/gui/qml/components/pretreatment/ConfirmTreatmentTable.qml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 21e68ccf5594b0ca3e0a8c7986e405260d273899 refers to a dead (removed) revision in file `sources/gui/qml/components/pretreatment/ConfirmTreatmentTableEntry.qml'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 -r21e68ccf5594b0ca3e0a8c7986e405260d273899 --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 21e68ccf5594b0ca3e0a8c7986e405260d273899) @@ -106,7 +106,7 @@ readonly property color alarmTopBarNoneBg : "#db8f00" readonly property color alarmTopBarNoneFg : white - readonly property color createTrProfileID : "#ffbb44" + readonly property color informationTableID : "#ffbb44" readonly property color primingNotReady : "#1f4974" readonly property color primingReady : "#438FEB" Index: sources/gui/qml/globals/Fonts.qml =================================================================== diff -u -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 -r21e68ccf5594b0ca3e0a8c7986e405260d273899 --- sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) +++ sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 21e68ccf5594b0ca3e0a8c7986e405260d273899) @@ -69,8 +69,8 @@ readonly property int fontPixelRinsebackAdjustmentButton : 26 readonly property int fontPixelPriming : 20 - readonly property int fontPixelCreateTreatment : 30 - readonly property int fontPixelCreateTreatmentTable : 24 + readonly property int fontInformationTableHeader : 30 + readonly property int fontInformationTablePixel : 24 readonly property int primingFontSize : 20 readonly property int createTreatmentFontSize : 30 Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -rd1a6830c486a9ee9c388a80b570aa8141a8366c9 -r21e68ccf5594b0ca3e0a8c7986e405260d273899 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision d1a6830c486a9ee9c388a80b570aa8141a8366c9) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 21e68ccf5594b0ca3e0a8c7986e405260d273899) @@ -92,14 +92,15 @@ readonly property int gridSelectionButtonHeight : 100 readonly property int gridSelectionButtonWidth : 375 + readonly property int informationTableHeight : 800 + readonly property int informationTableWidth : applicationWidth - 50 + readonly property int informationTableMargin : 45 + readonly property int informationSubTableHeight : 50 + readonly property int informationSubTableWidth : 500 + readonly property int informationTableEntryMargin : 20 + readonly property int informationTableHeaderHeight : 130 + readonly property int createTreatmentFlickableDeceleration : 4500 - readonly property int createTreatmentTableHeight : 800 - readonly property int createTreatmentTableWidth : applicationWidth - 50 - readonly property int createTreatmentMargin : 45 - readonly property int createTreatmentHeaderHeight : 130 - readonly property int createTreatmentTableMargin : 20 - readonly property int createTreatmentSubTableHeight : 50 - readonly property int createTreatmentSubTableWidth : 500 readonly property int createTreatmentSliderMargin : 40 readonly property int createTreatmentSliderHeight : 50 readonly property int createTreatmentSliderWidth : 750 Index: sources/gui/qml/main.qml =================================================================== diff -u -r50199c98f47d614c1e3132963f68d3a81692e9e1 -r21e68ccf5594b0ca3e0a8c7986e405260d273899 --- sources/gui/qml/main.qml (.../main.qml) (revision 50199c98f47d614c1e3132963f68d3a81692e9e1) +++ sources/gui/qml/main.qml (.../main.qml) (revision 21e68ccf5594b0ca3e0a8c7986e405260d273899) @@ -73,6 +73,7 @@ import VNetworkModel 0.1; import VDateTime 0.1; import VServiceMode 0.1; +import VDeviceInformation 0.1; // Qml imports import "qrc:/globals" @@ -142,6 +143,7 @@ VNetworkModel { id: vNetworkModel } VDateTime { id: vDateTime } VServiceMode { id: vServiceMode } + VDeviceInformation { id: vDeviceInformation } VHDTreatmentStates { id: vHDTreatmentStates } Index: sources/gui/qml/pages/SettingsDeviceInformation.qml =================================================================== diff -u -r0f0a1ba80bba810155cfde30c054d94e7ac3fe0e -r21e68ccf5594b0ca3e0a8c7986e405260d273899 --- sources/gui/qml/pages/SettingsDeviceInformation.qml (.../SettingsDeviceInformation.qml) (revision 0f0a1ba80bba810155cfde30c054d94e7ac3fe0e) +++ sources/gui/qml/pages/SettingsDeviceInformation.qml (.../SettingsDeviceInformation.qml) (revision 21e68ccf5594b0ca3e0a8c7986e405260d273899) @@ -48,4 +48,24 @@ text: qsTr("Device Information") } + InformationTable { id: _table + leftColumnTitle: "Versions" + rightColumnTitle: "System Usage" + anchors { + horizontalCenter: _root.horizontalCenter + bottomMargin: 2*Variables.mainMenuHeight + bottom: _root.bottom + } + height: 500 + width: Variables.informationTableWidth + headerVisible: false + onVisibleChanged: { + if (visible) { + subTable.leftColumnKeys = vDeviceInformation.doGetVersionKeys() + subTable.leftColumnValues = vDeviceInformation.doGetVersionValues() + subTable.rightColumnKeys = vDeviceInformation.doGetSystemUsageKeys() + subTable.rightColumnValues = vDeviceInformation.doGetSystemUsageValues() + } + } + } } Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentConfirm.qml =================================================================== diff -u -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 -r21e68ccf5594b0ca3e0a8c7986e405260d273899 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentConfirm.qml (.../PreTreatmentConfirm.qml) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentConfirm.qml (.../PreTreatmentConfirm.qml) (revision 21e68ccf5594b0ca3e0a8c7986e405260d273899) @@ -21,7 +21,6 @@ // Qml imports import "qrc:/globals" import "qrc:/components" -import "qrc:/components/pretreatment" /*! * \brief Pre-Treatment confirm screen @@ -71,9 +70,18 @@ font.pixelSize: Fonts.fontPixelTitle } // insert the treatment information table here - ConfirmTreatmentTable { + InformationTable { + leftColumnTitle: "PRESCRIPTION" + rightColumnTitle: "OPERATING PARAMETERS" anchors.horizontalCenter: parent.horizontalCenter - + onVisibleChanged: { + if (visible) { + subTable.leftColumnKeys = vTreatmentCreate.doGetPrescriptionParameterNames() + subTable.leftColumnValues = vTreatmentCreate.doGetPrescriptionParameterValues() + subTable.rightColumnKeys = vTreatmentCreate.doGetOperatingParameterNames() + subTable.rightColumnValues = vTreatmentCreate.doGetOperatingParameterValues() + } + } } TouchRect { id : _continueRect Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentUltrafiltration.qml =================================================================== diff -u -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 -r21e68ccf5594b0ca3e0a8c7986e405260d273899 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentUltrafiltration.qml (.../PreTreatmentUltrafiltration.qml) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentUltrafiltration.qml (.../PreTreatmentUltrafiltration.qml) (revision 21e68ccf5594b0ca3e0a8c7986e405260d273899) @@ -57,7 +57,7 @@ color : "white" text : qsTr("Ultrafiltration Volume") + " " + Variables.unitTextUltrafiltrationVolume font { - pixelSize : Fonts.fontPixelCreateTreatment + pixelSize : Fonts.fontInformationTableHeader } anchors { left : _volumeSlider.left @@ -72,7 +72,7 @@ color : "white" text : _root.ufVolume.toFixed(Variables.ultrafiltrationPrecision) font { - pixelSize : Fonts.fontPixelCreateTreatment + pixelSize : Fonts.fontInformationTableHeader } anchors { right : _volumeSlider.right Index: sources/view/VDeviceInformation.cpp =================================================================== diff -u --- sources/view/VDeviceInformation.cpp (revision 0) +++ sources/view/VDeviceInformation.cpp (revision 21e68ccf5594b0ca3e0a8c7986e405260d273899) @@ -0,0 +1,82 @@ +#include "VDeviceInformation.h" + +// Qt + +// Project +#include "Logger.h" + +using namespace View; +using namespace Gui; +//using namespace Storage; + +VIEW_DEF_CLASS(VDeviceInformation) + +/*! + * \brief VDeviceInformation::initConnections + * Makes the necessary connections. Called inside VIEW_DEF_CLASS + */ +void VDeviceInformation::initConnections() {} + +/*! + * \brief VDeviceInformation::doGetVersionKeys + * Gets the version key names + * \return (QStringList) the version key names + */ +QStringList VDeviceInformation::doGetVersionKeys() +{ + return QStringList() << "UI Version" + << "HD Version" + << "HD FPGA Version" + << "HD Serial Number" + << "DG Version" + << "DG FPGA Version" + << "DG Serial Number"; +} + +/*! + * \brief VDeviceInformation::doGetVersionValues + * Gets the version / serial number values + * \return (QStringList) the values for each version / serial number + */ +QStringList VDeviceInformation::doGetVersionValues() +{ + return QStringList() << mUIVersion() + << mHDVersion() + << mHDFPGAVersion() + << mHDSerialNumber() + << mDGVersion() + << mDGFPGAVersion() + << mDGSerialNumber(); +} + + +/*! + * \brief VDeviceInformation::doGetSystemUsageKeys + * Gets the system usage key names + * \return (QStringList) the system usage key names + */ +QStringList VDeviceInformation::doGetSystemUsageKeys() +{ + return QStringList() << "HD Last Service Date" + << "HD Next Service Date" + << "DG Last Service Date" + << "DG Next Service Date" + << "Treatments" + << "Dialysate Liters"; +} + +/*! + * \brief VDeviceInformation::doGetSystemUsageValues + * Gets the system usage values + * \return (QStringList) the system usage values + */ +QStringList VDeviceInformation::doGetSystemUsageValues() +{ + + return QStringList() << mHDLastServiceDate() + << mHDNextServiceDate() + << mDGLastServiceDate() + << mDGNextServiceDate() + << QString("%1").arg(mTreatments()) + << QString("%1 L").arg(mDialysateLiters()); +} Index: sources/view/VDeviceInformation.h =================================================================== diff -u --- sources/view/VDeviceInformation.h (revision 0) +++ sources/view/VDeviceInformation.h (revision 21e68ccf5594b0ca3e0a8c7986e405260d273899) @@ -0,0 +1,57 @@ + +#pragma once + +// Qt +#include +#include +#include + +// Project +#include "VView.h" +#include "main.h" +#include "GuiController.h" + +// forward declarations +class tst_views; + +namespace View { + +/*! + * \brief The VDeviceInformation class + * \details View for handling the device information + * + */ +class VDeviceInformation : public QObject +{ + Q_OBJECT + + // friends + friend class ::tst_views; + +VIEW_DEC_CLASS(VDeviceInformation) + +protected: + PROPERTY(QString, mUIVersion, "") + PROPERTY(QString, mHDVersion, "") + PROPERTY(QString, mHDFPGAVersion, "") + PROPERTY(QString, mHDSerialNumber, "") + PROPERTY(QString, mDGVersion, "") + PROPERTY(QString, mDGFPGAVersion, "") + PROPERTY(QString, mDGSerialNumber, "") + + PROPERTY(QString, mHDLastServiceDate, "") + PROPERTY(QString, mHDNextServiceDate, "") + PROPERTY(QString, mDGLastServiceDate, "") + PROPERTY(QString, mDGNextServiceDate, "") + PROPERTY(quint32, mTreatments, 0) + PROPERTY(quint32, mDialysateLiters, 0) + + +public slots: + QStringList doGetVersionKeys(); + QStringList doGetVersionValues(); + QStringList doGetSystemUsageKeys(); + QStringList doGetSystemUsageValues(); + +}; +} Index: sources/view/VView.h =================================================================== diff -u -r50199c98f47d614c1e3132963f68d3a81692e9e1 -r21e68ccf5594b0ca3e0a8c7986e405260d273899 --- sources/view/VView.h (.../VView.h) (revision 50199c98f47d614c1e3132963f68d3a81692e9e1) +++ sources/view/VView.h (.../VView.h) (revision 21e68ccf5594b0ca3e0a8c7986e405260d273899) @@ -153,6 +153,7 @@ REGISTER_TYPE( VAlert ) \ REGISTER_TYPE( VNetworkModel ) \ REGISTER_TYPE( VDateTime ) \ - REGISTER_TYPE( VServiceMode ) + REGISTER_TYPE( VServiceMode ) \ + REGISTER_TYPE( VDeviceInformation ) //--------------------------------------------------------------------------------//