Index: sources/gui/qml/main.qml =================================================================== diff -u -re125bd5cf13750eaf241d518b9c846139afaa81c -ra5be04172757fa469d85fb83a6998a4404214f19 --- sources/gui/qml/main.qml (.../main.qml) (revision e125bd5cf13750eaf241d518b9c846139afaa81c) +++ sources/gui/qml/main.qml (.../main.qml) (revision a5be04172757fa469d85fb83a6998a4404214f19) @@ -28,6 +28,7 @@ import VSettings 0.1 import VAdjustmentVersions 0.1 import VDateTime 0.1 +import VNetworkModel 0.1 // States views import VHDOperationMode 0.1 @@ -111,6 +112,7 @@ VSettings { id: vSettings } VAdjustmentVersions { id: vAdjustmentVersions } VDateTime { id: vDateTime } + VNetworkModel { id: vNetwork } // ---- States VHDOperationMode { id: vHDOperationMode } VPreTreatmentStates { id: vPreTreatmentStates } @@ -226,19 +228,40 @@ font.pixelSize: 14 } - SDItem { } - PowerItem { id: _powerItem } - AlarmItem { id: _alarmItem } - Keyboard { id: _keyboard } + Text { // TEST : Current Date/Time + color : Colors.textMain + anchors { + top : parent.top + left : parent.left + leftMargin : 1000 + } + horizontalAlignment : Text.Alignleft + verticalAlignment : Text.AlignBottom + height : 15 + text : vDateTime.current + font.pixelSize: 14 + } + + DiagnosticsDialog { id: _diagnosticsDialog } + SDItem { + onDoubleClicked:{ + _diagnosticsDialog.open() + } + } + PowerItem { id: _powerItem } + AlarmItem { id: _alarmItem } + Keyboard { id: _keyboard } + // NotificationBar has to be anchored to the main menu and if it is moved into the AlarmItem // then cannot be anchored. - NotificationBar { id: _alarmBar - anchors.bottom : _mainMenu.top - backgroundColor : _alarmItem.backgroundColor - textColor : _alarmItem.textColor - text : _alarmItem.text - isSilenced : _alarmItem.isSilenced - timeout : _alarmItem.timeout + NotificationBar { id: _alarmBar + anchors.bottom : _mainMenu.top + backgroundColor : _alarmItem.backgroundColor + textColor : _alarmItem.textColor + text : _alarmItem.text + isSilenced : _alarmItem.isSilenced + timeout : _alarmItem.timeout + backgroundFading : vHDOperationMode.fault } }