Index: sources/gui/qml/main.qml =================================================================== diff -u -r88563177f10f20ced98750b2e40036201728131d -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f --- sources/gui/qml/main.qml (.../main.qml) (revision 88563177f10f20ced98750b2e40036201728131d) +++ sources/gui/qml/main.qml (.../main.qml) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) @@ -21,11 +21,13 @@ import Gui.View 0.1 import Gui.Actions 0.1 -import VSettings 0.1 // View classes import VHDAccelerometer 0.1 -import VTreatmentAdjustmentVersions 0.1 +// Settings +import VSettings 0.1 +import VAdjustmentVersions 0.1 +import VDateTime 0.1 // States views import VHDOperationMode 0.1 @@ -89,6 +91,7 @@ import "qrc:/globals" import "qrc:/pages" import "qrc:/pages/treatment" +import "qrc:/pages/settings" import "qrc:/components" import "qrc:/dialogs" @@ -100,6 +103,8 @@ height: Variables.applicationHeight VSettings { id: vSettings } + VAdjustmentVersions { id: vAdjustmentVersions } + VDateTime { id: vDateTime } VHDOperationMode { id: vHDOperationMode } VPreTreatmentStates { id: vPreTreatmentStates } @@ -158,7 +163,6 @@ VTreatmentAdjustmentRinseback { id: vTreatmentAdjustmentRinseback } VTreatmentAdjustmentRecirculate { id: vTreatmentAdjustmentRecirculate } VTreatmentAdjustmentEnd { id: vTreatmentAdjustmentEnd } - VTreatmentAdjustmentVersions { id: vTreatmentAdjustmentVersions } // --- Post Treatment VPostTreatmentAdjustmentPatientDisconnectionConfirm { id: vPostTreatmentAdjustmentPatientDisconnectionConfirm } @@ -211,27 +215,11 @@ font.pixelSize: 14 } - Rectangle { // TEST : SD-Card not present should be handled with better indication(s). - color : ! _GuiView.sdIsReady ? "red" : _GuiView.sdIsReadOnly ? "gray" : "green" - anchors { - top : parent.top - right : parent.right - topMargin : 5 - rightMargin : 5 - } - width : 25 - height: 25 - radius: width - Image { id: _imageMicrosd - anchors.fill: parent - source: "qrc:/images/iMicroSD" - } - visible: true - } + SDItem { } + PowerItem { id: _powerItem } + AlarmItem { id: _alarmItem } + Keyboard { id: _keyboard } - PowerItem { id: _powerItem } - AlarmItem { id: _alarmItem } - // NotificationBar has to be anchored to the main menu and if it is moved into the AlarmItem // then cannot be anchored. NotificationBar { id: _alarmBar