Index: sources/gui/qml/main.qml =================================================================== diff -u -r2124420a19819f672e9180979ff3762dc083eb7f -rd9a57659f19070d257e425957c1c3ec65b45fd60 --- sources/gui/qml/main.qml (.../main.qml) (revision 2124420a19819f672e9180979ff3762dc083eb7f) +++ sources/gui/qml/main.qml (.../main.qml) (revision d9a57659f19070d257e425957c1c3ec65b45fd60) @@ -22,6 +22,7 @@ import Gui.Actions 0.1 // View classes +import VGeneralEvent 0.1 import VHDAccelerometer 0.1 import VHDSyringePump 0.1 import VHDBloodLeak 0.1 @@ -151,6 +152,13 @@ } + VGeneralEvent { id: vGeneralEvent } + VHDAccelerometer { id: vHDAccelerometer } + VHDSyringePump { id: vHDSyringePump } + VHDAirBubble { id: vHDAirBubble } + VHDBloodLeak { id: vHDBloodLeak } + VHDAirTrap { id: vHDAirTrap } + VTreatmentDialysateFlow { id: vTreatmentDialysateFlow } VTreatmentPressureOcclusion { id: vTreatmentPressureOcclusion } VTreatmentUltrafiltration { id: vTreatmentUltrafiltration } @@ -159,11 +167,6 @@ VTreatmentRinseback { id: vTreatmentRinseback } VTreatmentRecirculate { id: vTreatmentRecirculate } VTreatmentStop { id: vTreatmentStop } - VHDAccelerometer { id: vHDAccelerometer } - VHDSyringePump { id: vHDSyringePump } - VHDAirBubble { id: vHDAirBubble } - VHDBloodLeak { id: vHDBloodLeak } - VHDAirTrap { id: vHDAirTrap } // ---- DG VDGDrainPump { id: vDGDrainPump } VDGHeaters { id: vDGHeaters } @@ -325,7 +328,7 @@ } // keyboard should always be before AlarmItem to not to covet it. - VirtualKeyboard { id: _keyboard } + KeyboardItem { id: _keyboard } // AlarmItem should always be at the end so nothing covers it AlarmItem { id: _alarmItem ; z: 997 }