Index: sources/gui/qml/main.qml =================================================================== diff -u -r310dbfe508ffb4c921bb9337e207223f8677ca10 -r11887705270e9c700e297610ed1af479bae4079e --- sources/gui/qml/main.qml (.../main.qml) (revision 310dbfe508ffb4c921bb9337e207223f8677ca10) +++ sources/gui/qml/main.qml (.../main.qml) (revision 11887705270e9c700e297610ed1af479bae4079e) @@ -3,9 +3,9 @@ import Gui.View 0.1; import Gui.Actions 0.1; -import "qrc:/styles" import "qrc:/globals" - +import "qrc:/pages" +import "qrc:/components" /* Copyright Diality Inc. 2019-2020 All Rights Reserved. Diality Inc. @@ -49,15 +49,11 @@ } Home { id: _homeScreen - backgroundColor: Colors.backgroundMain visible: true - mouseAreaStartTreatment.onClicked: { + startTreatmentMouseArea.onPressed: { _stackView.push(_startTreatmentScreen) } - mouseAreaDayNightMode.onClicked: { - nightMode = !nightMode - } - mouseAreaTreatmentManager.onClicked: { + createTreatmentMouseArea.onPressed: { _stackView.push(_treatmentMansagerScreen) } } @@ -67,4 +63,21 @@ initialItem: _homeScreen anchors.fill: parent } + + Item { id : _headerLogo + height : Variables.headerLogoHeight + anchors { + top : parent.top + left : parent.left + right : parent.right + } + Image { id: _headerLogoImage + anchors.centerIn: parent + width : Variables.logoWidth + height: Variables.logoHeight + source: "qrc:/images/iLogoD1A344D" + } + } + + MainMenu { id: _mainMenu } }