Index: sources/gui/qml/main.qml =================================================================== diff -u -r376859852f4d1a07263c44524aec347db29e0133 -r61f16c988a159401c92730b4cbfca5085c77222f --- sources/gui/qml/main.qml (.../main.qml) (revision 376859852f4d1a07263c44524aec347db29e0133) +++ sources/gui/qml/main.qml (.../main.qml) (revision 61f16c988a159401c92730b4cbfca5085c77222f) @@ -21,10 +21,12 @@ import Gui.View 0.1 import Gui.Actions 0.1 - // View classes import VHDAccelerometer 0.1 +// Device +import VDevice 0.1 + // Settings import VSettings 0.1 import VAdjustmentVersions 0.1 @@ -110,6 +112,7 @@ width : Variables.applicationWidth height: Variables.applicationHeight + VDevice { id: vDevice } VSettings { id: vSettings } VAdjustmentVersions { id: vAdjustmentVersions } VDateTime { id: vDateTime } @@ -244,16 +247,17 @@ font.pixelSize: 14 } - DiagnosticsDialog { id: _diagnosticsDialog } - SDItem { - onDoubleClicked:{ + PowerItem { id: _powerItem } + SDItem { id: _sdItem; + property bool request: true + onDoubleClicked : { _diagnosticsDialog.open() } } - PowerItem { id: _powerItem } - AlarmItem { id: _alarmItem } - Keyboard { id: _keyboard } + AlarmItem { id: _alarmItem ; z: 998 } + DiagnosticsDialog { id: _diagnosticsDialog; z: 999 } + // NotificationBar has to be anchored to the main menu and if it is moved into the AlarmItem // then cannot be anchored. NotificationBar { id: _alarmBar @@ -265,4 +269,6 @@ timeout : _alarmItem.timeout backgroundFading : vHDOperationMode.fault } + + Keyboard { id: _keyboard } }