Index: copyright =================================================================== diff -u --- copyright (revision 0) +++ copyright (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -0,0 +1,13 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file main.cpp + * \date 2019/09/30 + * \author Behrouz NematiPour + * + */ Index: denali.qrc =================================================================== diff -u -rd473be913284c14f14a6e5b18446cceafc3e1265 -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 --- denali.qrc (.../denali.qrc) (revision d473be913284c14f14a6e5b18446cceafc3e1265) +++ denali.qrc (.../denali.qrc) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -1,26 +1,30 @@ - sources/gui/qml/pages/Home.qml - sources/gui/qml/pages/StartTreatment.qml - sources/gui/qml/pages/TreatmentManager.qml + sources/gui/qml/pages/TreatmentHome.qml + sources/gui/qml/pages/TreatmentStack.qml + sources/gui/qml/pages/ManagerStack.qml + sources/gui/qml/pages/SettingsStack.qml + sources/gui/qml/pages/SettingsHome.qml + sources/gui/qml/pages/ManagerHome.qml sources/gui/qml/dialogs/PowerOff.qml resources/images/Settings_gear_setting_tools-128.png - resources/images/Logo d 1a344d .png - resources/images/Logo d 14314c .png - resources/images/Logo Diality 1a344d .png - resources/images/Logo Diality 14314c .png + resources/images/Logo d.png + resources/images/Logo Diality.png resources/images/Power_symbol-128.png resources/images/splash.png sources/gui/qml/components/MainMenu.qml sources/gui/qml/components/TouchRect.qml - sources/gui/qml/components/Title.qml + sources/gui/qml/components/TitleText.qml sources/gui/qml/components/LogoD.qml + sources/gui/qml/components/ScreenItem.qml + sources/gui/qml/components/StackItem.qml + sources/gui/qml/components/ModalDialog.qml qtquickcontrols2.conf Index: main.cpp =================================================================== diff -u -r968c18102912db0be7494e8b8d6e1a8957cc9846 -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 --- main.cpp (.../main.cpp) (revision 968c18102912db0be7494e8b8d6e1a8957cc9846) +++ main.cpp (.../main.cpp) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -1,8 +1,23 @@ -/*! \mainpage UI Software Design Description +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file main.cpp + * \date 2019/09/30 + * \author Behrouz NematiPour + * + */ + +/*! + * \mainpage UI Software Design Description * \section Detailed Description * This document has been generated by Doxygen.\n * This document describes the detail description of the UI Application Software design.\n - * UI Application starts by Appliucation Initialization which happens in \ref main.cpp "Initialization section".\n + * UI Application starts by Application Initialization which happens in \ref main.cpp "Initialization section".\n */ // Qt Index: resources/images/Logo Diality 14314c .png =================================================================== diff -u -r11887705270e9c700e297610ed1af479bae4079e -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 Binary files differ Index: resources/images/Logo Diality 1a344d .png =================================================================== diff -u -r11887705270e9c700e297610ed1af479bae4079e -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 Binary files differ Index: resources/images/Logo Diality.png =================================================================== diff -u Binary files differ Index: resources/images/Logo d 14314c .png =================================================================== diff -u -r11887705270e9c700e297610ed1af479bae4079e -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 Binary files differ Index: resources/images/Logo d 1a344d .png =================================================================== diff -u -r11887705270e9c700e297610ed1af479bae4079e -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 Binary files differ Index: resources/images/Logo d.png =================================================================== diff -u Binary files differ Index: sources/applicationcontroller.cpp =================================================================== diff -u -r09e6b966b0e44bad7540f1571e7562b28e3d9fe7 -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 --- sources/applicationcontroller.cpp (.../applicationcontroller.cpp) (revision 09e6b966b0e44bad7540f1571e7562b28e3d9fe7) +++ sources/applicationcontroller.cpp (.../applicationcontroller.cpp) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -1,3 +1,16 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file applicationcontroller.cpp + * \date 2019/09/30 + * \author Behrouz NematiPour + * + */ #include "applicationcontroller.h" // Qt Index: sources/applicationcontroller.h =================================================================== diff -u -r09e6b966b0e44bad7540f1571e7562b28e3d9fe7 -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 --- sources/applicationcontroller.h (.../applicationcontroller.h) (revision 09e6b966b0e44bad7540f1571e7562b28e3d9fe7) +++ sources/applicationcontroller.h (.../applicationcontroller.h) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -1,3 +1,16 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file applicationcontroller.h + * \date 2019/09/30 + * \author Behrouz NematiPour + * + */ #pragma once // Qt Index: sources/applicationpost.cpp =================================================================== diff -u -r09e6b966b0e44bad7540f1571e7562b28e3d9fe7 -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 --- sources/applicationpost.cpp (.../applicationpost.cpp) (revision 09e6b966b0e44bad7540f1571e7562b28e3d9fe7) +++ sources/applicationpost.cpp (.../applicationpost.cpp) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -1,3 +1,16 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file applicationpost.cpp + * \date 2019/09/30 + * \author Behrouz NematiPour + * + */ #include "applicationpost.h" ApplicationPost::ApplicationPost(QObject *parent) : QObject(parent) Index: sources/applicationpost.h =================================================================== diff -u -r09e6b966b0e44bad7540f1571e7562b28e3d9fe7 -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 --- sources/applicationpost.h (.../applicationpost.h) (revision 09e6b966b0e44bad7540f1571e7562b28e3d9fe7) +++ sources/applicationpost.h (.../applicationpost.h) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -1,3 +1,16 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file applicationpost.h + * \date 2019/09/30 + * \author Behrouz NematiPour + * + */ #pragma once #include Index: sources/canbus/canbus.cpp =================================================================== diff -u -r09e6b966b0e44bad7540f1571e7562b28e3d9fe7 -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 --- sources/canbus/canbus.cpp (.../canbus.cpp) (revision 09e6b966b0e44bad7540f1571e7562b28e3d9fe7) +++ sources/canbus/canbus.cpp (.../canbus.cpp) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -1,3 +1,16 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file canbus.cpp + * \date 2019/09/30 + * \author Behrouz NematiPour + * + */ #include "canbus.h" /*! Index: sources/canbus/canbus.h =================================================================== diff -u -r09e6b966b0e44bad7540f1571e7562b28e3d9fe7 -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 --- sources/canbus/canbus.h (.../canbus.h) (revision 09e6b966b0e44bad7540f1571e7562b28e3d9fe7) +++ sources/canbus/canbus.h (.../canbus.h) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -1,3 +1,16 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file canbus.h + * \date 2019/09/30 + * \author Behrouz NematiPour + * + */ #pragma once #include Index: sources/configuration/display.cpp =================================================================== diff -u -r09e6b966b0e44bad7540f1571e7562b28e3d9fe7 -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 --- sources/configuration/display.cpp (.../display.cpp) (revision 09e6b966b0e44bad7540f1571e7562b28e3d9fe7) +++ sources/configuration/display.cpp (.../display.cpp) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -1,7 +1,25 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file display.cpp + * \date 2019/09/30 + * \author Behrouz NematiPour + * + */ #include "display.h" using namespace Configuration; +/*! + * \brief display::display + * CTOR + * \param parent + */ display::display(QObject *parent) : QObject(parent) { Index: sources/configuration/display.h =================================================================== diff -u -r09e6b966b0e44bad7540f1571e7562b28e3d9fe7 -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 --- sources/configuration/display.h (.../display.h) (revision 09e6b966b0e44bad7540f1571e7562b28e3d9fe7) +++ sources/configuration/display.h (.../display.h) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -1,8 +1,26 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file display.h + * \date 2019/09/30 + * \author Behrouz NematiPour + * + */ #pragma once #include namespace Configuration { +/*! + * \brief The display class + * The Display class controls the display brightness + * and any other later required display configuration. + */ class display : public QObject { Q_OBJECT Index: sources/configuration/sound.cpp =================================================================== diff -u -r09e6b966b0e44bad7540f1571e7562b28e3d9fe7 -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 --- sources/configuration/sound.cpp (.../sound.cpp) (revision 09e6b966b0e44bad7540f1571e7562b28e3d9fe7) +++ sources/configuration/sound.cpp (.../sound.cpp) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -1,3 +1,16 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file sound.cpp + * \date 2019/09/30 + * \author Behrouz NematiPour + * + */ #include "sound.h" using namespace Configuration; Index: sources/configuration/sound.h =================================================================== diff -u -r09e6b966b0e44bad7540f1571e7562b28e3d9fe7 -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 --- sources/configuration/sound.h (.../sound.h) (revision 09e6b966b0e44bad7540f1571e7562b28e3d9fe7) +++ sources/configuration/sound.h (.../sound.h) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -1,9 +1,26 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file sound.h + * \date 2019/09/30 + * \author Behrouz NematiPour + * + */ #pragma once #include namespace Configuration { - +/*! + * \brief The sound class + * The Sound class controls the sound volume + * and any other later required sound configuration. + */ class sound : public QObject { Q_OBJECT Index: sources/gui/guiactions.h =================================================================== diff -u -r09e6b966b0e44bad7540f1571e7562b28e3d9fe7 -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 --- sources/gui/guiactions.h (.../guiactions.h) (revision 09e6b966b0e44bad7540f1571e7562b28e3d9fe7) +++ sources/gui/guiactions.h (.../guiactions.h) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -1,3 +1,16 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file guiactions.h + * \date 2019/09/30 + * \author Behrouz NematiPour + * + */ #pragma once #include Index: sources/gui/guicontroller.cpp =================================================================== diff -u -r11887705270e9c700e297610ed1af479bae4079e -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 --- sources/gui/guicontroller.cpp (.../guicontroller.cpp) (revision 11887705270e9c700e297610ed1af479bae4079e) +++ sources/gui/guicontroller.cpp (.../guicontroller.cpp) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -1,3 +1,16 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file guicontroller.cpp + * \date 2019/09/30 + * \author Behrouz NematiPour + * + */ #include "guicontroller.h" // Qt Index: sources/gui/guicontroller.h =================================================================== diff -u -r11887705270e9c700e297610ed1af479bae4079e -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 --- sources/gui/guicontroller.h (.../guicontroller.h) (revision 11887705270e9c700e297610ed1af479bae4079e) +++ sources/gui/guicontroller.h (.../guicontroller.h) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -1,3 +1,16 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file guicontroller.h + * \date 2019/09/30 + * \author Behrouz NematiPour + * + */ #pragma once // Qt Index: sources/gui/guiview.cpp =================================================================== diff -u -r09e6b966b0e44bad7540f1571e7562b28e3d9fe7 -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 --- sources/gui/guiview.cpp (.../guiview.cpp) (revision 09e6b966b0e44bad7540f1571e7562b28e3d9fe7) +++ sources/gui/guiview.cpp (.../guiview.cpp) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -1,3 +1,16 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file guiview.cpp + * \date 2019/09/30 + * \author Behrouz NematiPour + * + */ #include "guiview.h" // Project Index: sources/gui/guiview.h =================================================================== diff -u -r09e6b966b0e44bad7540f1571e7562b28e3d9fe7 -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 --- sources/gui/guiview.h (.../guiview.h) (revision 09e6b966b0e44bad7540f1571e7562b28e3d9fe7) +++ sources/gui/guiview.h (.../guiview.h) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -1,3 +1,16 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file guiview.h + * \date 2019/09/30 + * \author Behrouz NematiPour + * + */ #pragma once // Qt Index: sources/gui/qml/components/LogoD.qml =================================================================== diff -u -rd473be913284c14f14a6e5b18446cceafc3e1265 -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 --- sources/gui/qml/components/LogoD.qml (.../LogoD.qml) (revision d473be913284c14f14a6e5b18446cceafc3e1265) +++ sources/gui/qml/components/LogoD.qml (.../LogoD.qml) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -1,19 +1,39 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file LogoD.aml + * \date 2019/10/18 + * \author Behrouz NematiPour + * + */ + +// Qt import QtQuick 2.12 import QtQuick.Controls 2.12 +// Project +// Qml imports import "qrc:/globals" -Item { id : _headerLogo - height : Variables.headerLogoHeight +/*! + * \brief Denali project simple logo (No 'Diality') + */ +Item { id : _root + height : Variables.headerHeight anchors { top : parent.top left : parent.left right : parent.right } - Image { id: _headerLogoImage + Image { id: _image anchors.centerIn: parent width : Variables.logoWidth height: Variables.logoHeight - source: "qrc:/images/iLogoD1A344D" + source: "qrc:/images/iLogoD" } } Index: sources/gui/qml/components/MainMenu.qml =================================================================== diff -u -rd473be913284c14f14a6e5b18446cceafc3e1265 -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 --- sources/gui/qml/components/MainMenu.qml (.../MainMenu.qml) (revision d473be913284c14f14a6e5b18446cceafc3e1265) +++ sources/gui/qml/components/MainMenu.qml (.../MainMenu.qml) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -1,15 +1,40 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file MainMenu.qml + * \date 2019/10/18 + * \author Behrouz NematiPour + * + */ + +// Qt import QtQuick 2.12 import QtQuick.Controls 2.12 +// Project +// Qml imports import "qrc:/globals" -Item { - property alias settingsButton: _settingsRect.button +// TODO : Make it more general Component +/* + * \brief The MainMenu Component + * which contains three [Treatment, Manager, Settings] + */ +Item { id: _root + property alias treatmentButton : _treatmentRect.button + property alias managerButton : _managerRect.button + property alias settingsButton : _settingsRect.button + height: Variables.mainMenuHeight anchors { - right: parent.right - left: parent.left + right : parent.right + left : parent.left bottom: parent.bottom } Index: sources/gui/qml/components/ModalDialog.qml =================================================================== diff -u --- sources/gui/qml/components/ModalDialog.qml (revision 0) +++ sources/gui/qml/components/ModalDialog.qml (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -0,0 +1,46 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file ModalDialog.qml + * \date 2019/10/21 + * \author Behrouz NematiPour + * + */ + +// Qt +import QtQuick 2.12 +import QtQuick.Controls 2.12 + +// Project +// Qml imports +import "qrc:/globals" + +/*! + * \brief The parent item for modal dialogs + */ +Dialog { id : _root + width : Variables.poweroffWidth + height: Variables.poweroffHeight + visible: false + anchors.centerIn: parent + + enter: Transition { NumberAnimation { property: "opacity"; from: 0.0; to: 1.0 } } + exit : Transition { NumberAnimation { property: "opacity"; from: 1.0; to: 0.0 } } + + modal: true + closePolicy: Dialog.NoAutoClose + Overlay.modal : Rectangle { id : _borderRect + anchors.fill: parent + color: Colors.borderDialog + } + + background: Rectangle { + color : Colors.backgroundDialog + radius: Variables.dialogRadius + } +} Index: sources/gui/qml/components/ScreenItem.qml =================================================================== diff -u --- sources/gui/qml/components/ScreenItem.qml (revision 0) +++ sources/gui/qml/components/ScreenItem.qml (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -0,0 +1,34 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file ScreenItem.qml + * \date 2019/10/21 + * \author Behrouz NematiPour + * + */ + +// Qt +import QtQuick 2.12 +import QtQuick.Controls 2.12 + +// Project +// Qml imports +import "qrc:/globals" + +/*! + * \brief Parent item for all the Screens + */ +Item { id: _root + width : Variables.applicationWidth + height: Variables.applicationHeight + + Rectangle { id: _backgroundRect + anchors.fill: parent + color: Colors.backgroundMain + } +} Index: sources/gui/qml/components/StackItem.qml =================================================================== diff -u --- sources/gui/qml/components/StackItem.qml (revision 0) +++ sources/gui/qml/components/StackItem.qml (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -0,0 +1,36 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file StackItem.qml + * \date 2019/10/21 + * \author Behrouz NematiPour + * + */ + +// Qt +import QtQuick 2.12 +import QtQuick.Controls 2.12 + +// Project +// Qml imports +import "qrc:/globals" + +/*! + * \brief The parent container of screens in StackView + */ +ScreenItem { id : _root + property alias stackView: _stackView + + width : Variables.applicationWidth + height: Variables.applicationHeight + + StackView { id : _stackView + initialItem : null + anchors.fill: parent + } +} Fisheye: Tag 5194f3afffb28dac90a7ca4153b6a0ca2f239387 refers to a dead (removed) revision in file `sources/gui/qml/components/Title.qml'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/gui/qml/components/TitleText.qml =================================================================== diff -u --- sources/gui/qml/components/TitleText.qml (revision 0) +++ sources/gui/qml/components/TitleText.qml (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -0,0 +1,33 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file TitleText.qml + * \date 2019/10/18 + * \author Behrouz NematiPour + * + */ + +// Qt +import QtQuick 2.12 +import QtQuick.Controls 2.12 + +// Project +// Qml imports +import "qrc:/globals" + +/* + * \brief The page title text + * which is going to be used as default title of pages + */ +Text { id: _root + bottomPadding: Variables.bottomPaddingTitle + horizontalAlignment: Text.AlignHCenter + verticalAlignment : Text.AlignVCenter + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle +} Index: sources/gui/qml/components/TouchRect.qml =================================================================== diff -u -rd473be913284c14f14a6e5b18446cceafc3e1265 -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 --- sources/gui/qml/components/TouchRect.qml (.../TouchRect.qml) (revision d473be913284c14f14a6e5b18446cceafc3e1265) +++ sources/gui/qml/components/TouchRect.qml (.../TouchRect.qml) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -1,9 +1,30 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file TouchRect.qml + * \date 2019/10/18 + * \author Behrouz NematiPour + * + */ + +// Qt import QtQuick 2.12 import QtQuick.Controls 2.12 +// Project +// Qml imports import "qrc:/globals" -Rectangle { id : _rect +/* + * \brief The TouchRect Component + * which is used a general default round rect button + */ +Rectangle { id : _root property alias text : _text property alias button : _mouseArea Index: sources/gui/qml/dialogs/PowerOff.qml =================================================================== diff -u -rd473be913284c14f14a6e5b18446cceafc3e1265 -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 --- sources/gui/qml/dialogs/PowerOff.qml (.../PowerOff.qml) (revision d473be913284c14f14a6e5b18446cceafc3e1265) +++ sources/gui/qml/dialogs/PowerOff.qml (.../PowerOff.qml) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -1,39 +1,34 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file PowerOff.qml + * \date 2019/10/18 + * \author Behrouz NematiPour + * + */ + +// Qt import QtQuick 2.12 import QtQuick.Controls 2.12 -import QtGraphicalEffects 1.12 +// Project +// Qml imports import "qrc:/globals" import "qrc:/components" -Dialog { id : root - width : Variables.poweroffWidth - height: Variables.poweroffHeight - visible: false - anchors.centerIn: parent - - enter: Transition { - NumberAnimation { property: "opacity"; from: 0.0; to: 1.0 } - } - exit: Transition { - NumberAnimation { property: "opacity"; from: 1.0; to: 0.0 } - } - - modal: true - closePolicy: Popup.NoAutoClose - Overlay.modal : FastBlur { id : _blurEffect - anchors.fill: parent - source: _mainItem - radius: 25 - } - background: Rectangle { - color: Colors.backgroundDialog - radius: 10 - } - +/*! + * \brief Contains the PowerOff Dialog Implementation + */ +ModalDialog { id : _root Column { - spacing: 20 + spacing: Variables.columnSpacing anchors.centerIn: parent - Title { id: _titleText + TitleText { id: _titleText width: parent.width text: qsTr("Are you sure you want to Shutdown?") } Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -rd473be913284c14f14a6e5b18446cceafc3e1265 -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision d473be913284c14f14a6e5b18446cceafc3e1265) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -1,10 +1,30 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file Colors.qml + * \date 2019/10/18 + * \author Behrouz NematiPour + * + */ + +// Qt pragma Singleton import QtQuick 2.12 +/*! + * \brief + * Colors.qml file includes all the colors definitions + * whcih is going to be used in the project + */ QtObject { readonly property color backgroundMain : "#1A344D" readonly property color backgroundButton : "#438FEB" - readonly property color backgroundDialog : "#254665" + readonly property color backgroundDialog : "#254670" readonly property color backgroundMenu : "#14314C" readonly property color backgroundMainMenu : "#0D2639" readonly property color backgroundDottedMenu: "#64809D" @@ -18,5 +38,6 @@ readonly property color borderButton : "#438FEB" readonly property color borderDisableButton : "#607A91" readonly property color boderSeparatorLine : "#476982" + readonly property color borderDialog : "#F51A344D" } Index: sources/gui/qml/globals/Fonts.qml =================================================================== diff -u -r11887705270e9c700e297610ed1af479bae4079e -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 --- sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 11887705270e9c700e297610ed1af479bae4079e) +++ sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -1,7 +1,27 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file Fonts.qml + * \date 2019/10/18 + * \author Behrouz NematiPour + * + */ + +// Qt pragma Singleton import QtQuick 2.12 +/*! + * \brief + * Fonts.qml file includes definitions for any Font property + * which is going to be used in the project + */ QtObject { readonly property int fontPixelButton: 12 * 2 - readonly property int fontPixelTitle : 12 * 4 + readonly property int fontPixelTitle : 12 * 3.5 } Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -rd473be913284c14f14a6e5b18446cceafc3e1265 -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision d473be913284c14f14a6e5b18446cceafc3e1265) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -1,10 +1,30 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file Variables.qml + * \date 2019/10/18 + * \author Behrouz NematiPour + * + */ + +// Qt pragma Singleton import QtQuick 2.12 +/*! + * \brief + * Variabes.qml file includes any constant variable definitions + * which is going to be used in the project. + */ QtObject { readonly property int applicationWidth : 1280 readonly property int applicationHeight : 800 - readonly property int headerLogoHeight : 100 + readonly property int headerHeight : 100 readonly property int mainMenuHeight : 70 readonly property int mainMenuButtonWidth : 180 @@ -19,6 +39,12 @@ readonly property int touchRectHeight : 70 readonly property int touchRectRadius : 50 - readonly property int poweroffWidth : 900 - readonly property int poweroffHeight : 500 + readonly property int poweroffWidth : 950 + readonly property int poweroffHeight : 550 + + readonly property int titleBottomPadding : 25 + + readonly property int columnSpacing : 20 + + readonly property int dialogRadius : 10 } Index: sources/gui/qml/main.qml =================================================================== diff -u -rd473be913284c14f14a6e5b18446cceafc3e1265 -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 --- sources/gui/qml/main.qml (.../main.qml) (revision d473be913284c14f14a6e5b18446cceafc3e1265) +++ sources/gui/qml/main.qml (.../main.qml) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -1,35 +1,43 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file main.qml + * \date 2019/09/30 + * \author Behrouz NematiPour + * + */ + +// Qt import QtQuick 2.12 import QtQuick.Controls 2.12 -import QtGraphicalEffects 1.12 +// Project +// C++ imports import Gui.View 0.1; import Gui.Actions 0.1; - +// Qml imports import "qrc:/globals" import "qrc:/pages" import "qrc:/components" import "qrc:/dialogs" // TODO : -// 1 - Copyright -// 2 - StackView // 3 - Version - /* - Copyright Diality Inc. 2019-2020 All Rights Reserved. - Diality Inc. - Denali Project - main.qml - Initialization and start point of the QML - Behrouz NematiPour, bNematiPour@Diality.com - //Revision History (optional) + * \brief Initialization and start point of the QML */ -Item { id: _mainItem - visible: true - width: Variables.applicationWidth +Item { id : _mainItem + width : Variables.applicationWidth height: Variables.applicationHeight + property alias powerOffDialog: _powerOffDialog + GuiView { id: _guiView onActionEvaluated: { if (vAction === GuiActions.ActBack) { @@ -43,49 +51,30 @@ } } - StartTreatment { id: _startTreatmentScreen - btnBack.onClicked: { - _guiView.notifyActionRequest(GuiActions.ActBack) - } - btnBack.onPressAndHold: { - _guiView.notifyActionRequest(GuiActions.ActConfirm) - } - } + // ----- Follow the Z order ----- + // 1 - Screens + // 1 - 1 + SettingsStack { id: _settingsStack } + // 1 - 2 + ManagerStack { id: _mansagerStack } + // 1 - 3 + TreatmentStack { id: _treatmentStack } - TreatmentManager { id: _treatmentMansagerScreen - btnBack.onClicked: { - _guiView.notifyActionRequest(GuiActions.ActBack) - } - } + // 2 - Header + LogoD { id: _headerLogo } - Home { id: _homeScreen - //visible: true - startTreatmentButton.onPressed: { - _stackView.push(_startTreatmentScreen) - } - createTreatmentButton.onPressed: { - _stackView.push(_treatmentMansagerScreen) - } - } - - StackView { - id: _stackView - initialItem: _homeScreen - anchors.fill: parent - - } - - LogoD { id : _headerLogo } - + // 3 - Footer MainMenu { id: _mainMenu - settingsButton.onPressed: { - _powerOffDialog.open() - } + treatmentButton .onPressed: { _treatmentStack.visible = true ; _mansagerStack.visible = false; _settingsStack.visible = false; } + managerButton .onPressed: { _treatmentStack.visible = false; _mansagerStack.visible = true ; _settingsStack.visible = false; } + settingsButton .onPressed: { _treatmentStack.visible = false; _mansagerStack.visible = false; _settingsStack.visible = true ; } } - PowerOff { id : _powerOffDialog } + // 4 - Modals + PowerOff { id: _powerOffDialog } - Text { id: versionText // test code + // 9 - Others + Text { //NOTE: Test Code : Must be removed when implemented color: Colors.textMain x: 1172 y: 767 Fisheye: Tag 5194f3afffb28dac90a7ca4153b6a0ca2f239387 refers to a dead (removed) revision in file `sources/gui/qml/pages/Home.qml'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/gui/qml/pages/ManagerHome.qml =================================================================== diff -u --- sources/gui/qml/pages/ManagerHome.qml (revision 0) +++ sources/gui/qml/pages/ManagerHome.qml (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -0,0 +1,37 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file ManagerHome.qml + * \date 2019/10/21 + * \author Behrouz NematiPour + * + */ + +// Qt +import QtQuick 2.12 +import QtQuick.Controls 2.12 + +// Project +// Qml imports +import "qrc:/globals" +import "qrc:/components" + +/*! + * \brief ManagerHome is the screen + * which is the default screen in the "Manager" stack + */ +ScreenItem { id: _root + Column { + spacing: Variables.columnSpacing + anchors.centerIn: parent + TitleText { id: _titleText + width: parent.width + text: qsTr("Manager Home Placeholder") + } + } +} Index: sources/gui/qml/pages/ManagerStack.qml =================================================================== diff -u --- sources/gui/qml/pages/ManagerStack.qml (revision 0) +++ sources/gui/qml/pages/ManagerStack.qml (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -0,0 +1,33 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file ManagerStack.qml + * \date 2019/10/21 + * \author Behrouz NematiPour + * + */ + +// Qt +import QtQuick 2.12 +import QtQuick.Controls 2.12 + +// Project +// Qml imports +import "qrc:/globals" +import "qrc:/components" + +/*! + * \brief ManagerStack is the screen + * which contains the main stack for all the Trearment Manager screens + * This is the screen which will show up when "Manager" option + * is selected from the main menu. + */ +StackItem { id : _root + ManagerHome { id : _managerHome } + stackView.initialItem : _managerHome +} Index: sources/gui/qml/pages/SettingsHome.qml =================================================================== diff -u --- sources/gui/qml/pages/SettingsHome.qml (revision 0) +++ sources/gui/qml/pages/SettingsHome.qml (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -0,0 +1,37 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file SettingsHome.qml + * \date 2019/10/21 + * \author Behrouz NematiPour + * + */ + +// Qt +import QtQuick 2.12 +import QtQuick.Controls 2.12 + +// Project +// Qml imports +import "qrc:/globals" +import "qrc:/components" + +/*! + * \brief SettingsHome is the screen + * which is the default screen in the "Settings" stack + */ +ScreenItem { id: _root + Column { + spacing: Variables.columnSpacing + anchors.centerIn: parent + TitleText { id: _titleText + width: parent.width + text: qsTr("Settings Home Placeholder") + } + } +} Index: sources/gui/qml/pages/SettingsStack.qml =================================================================== diff -u --- sources/gui/qml/pages/SettingsStack.qml (revision 0) +++ sources/gui/qml/pages/SettingsStack.qml (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -0,0 +1,33 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file SettingsStack.qml + * \date 2019/10/21 + * \author Behrouz NematiPour + * + */ + +// Qt +import QtQuick 2.12 +import QtQuick.Controls 2.12 + +// Project +// Qml imports +import "qrc:/globals" +import "qrc:/components" + +/*! + * \brief SettingsStack is the screen + * which contains the main stack for all the Settings screens + * This is the screen which will show up when "Settings" option + * is selected from the main menu. + */ +StackItem { id : _root + SettingsHome { id : _settingsHome } + stackView.initialItem : _settingsHome +} Fisheye: Tag 5194f3afffb28dac90a7ca4153b6a0ca2f239387 refers to a dead (removed) revision in file `sources/gui/qml/pages/StartTreatment.qml'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/gui/qml/pages/TreatmentHome.qml =================================================================== diff -u --- sources/gui/qml/pages/TreatmentHome.qml (revision 0) +++ sources/gui/qml/pages/TreatmentHome.qml (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -0,0 +1,66 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file TreatmentHome.qml + * \date 2019/10/21 + * \author Behrouz NematiPour + * + */ + +// Qt +import QtQuick 2.12 +import QtQuick.Controls 2.12 + +// Project +// Qml imports +import "qrc:/globals" +import "qrc:/components" + +/*! + * \brief TreatmentHome is the screen + * which is the default screen in the "Treatment" stack + */ +ScreenItem { id: _root + // exported items + property alias startTreatmentButton : _startTreatmentRect.button + property alias createTreatmentButton: _createTreatmentRect.button + + // exported properties + property int favoriteCount: 0 + + TouchRect { id : _poweroff + width: 100 + height: Variables.logoHeight + anchors { + top : parent.top + right : parent.right + topMargin : (Variables.headerHeight - Variables.logoHeight) / 2 + rightMargin : (Variables.headerHeight - Variables.logoHeight) / 2 + } + text.text: qsTr("Test") + button.onPressed: { + _mainItem.powerOffDialog.open() + } + } + + // Definitions + Column { + spacing: Variables.columnSpacing + anchors.centerIn: parent + TitleText { id: _titleText + width: parent.width + text: qsTr("Good Morning") + } + TouchRect { id : _startTreatmentRect + text.text: qsTr("FAVORITE TREATMENT (%1)").arg(favoriteCount) + } + TouchRect { id : _createTreatmentRect + text.text: qsTr("CUSTOM TREATMENT") + } + } +} Fisheye: Tag 5194f3afffb28dac90a7ca4153b6a0ca2f239387 refers to a dead (removed) revision in file `sources/gui/qml/pages/TreatmentManager.qml'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/gui/qml/pages/TreatmentStack.qml =================================================================== diff -u --- sources/gui/qml/pages/TreatmentStack.qml (revision 0) +++ sources/gui/qml/pages/TreatmentStack.qml (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -0,0 +1,33 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file TreatmentStack.qml + * \date 2019/10/21 + * \author Behrouz NematiPour + * + */ + +// Qt +import QtQuick 2.12 +import QtQuick.Controls 2.12 + +// Project +// Qml imports +import "qrc:/globals" +import "qrc:/components" + +/*! + * \brief TreatmentStack is the screen + * which contains the main stack for all the Trearment screens + * This is the screen which will be show up when "Treatment" option + * is selected from the main menu. + */ +StackItem { id : _root + TreatmentHome { id : _treatmentHome } + stackView.initialItem : _treatmentHome +} Index: sources/maintimer.cpp =================================================================== diff -u -r09e6b966b0e44bad7540f1571e7562b28e3d9fe7 -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 --- sources/maintimer.cpp (.../maintimer.cpp) (revision 09e6b966b0e44bad7540f1571e7562b28e3d9fe7) +++ sources/maintimer.cpp (.../maintimer.cpp) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -1,3 +1,16 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file maintimer.cpp + * \date 2019/09/30 + * \author Behrouz NematiPour + * + */ #include "maintimer.h" //Qt Index: sources/maintimer.h =================================================================== diff -u -r09e6b966b0e44bad7540f1571e7562b28e3d9fe7 -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 --- sources/maintimer.h (.../maintimer.h) (revision 09e6b966b0e44bad7540f1571e7562b28e3d9fe7) +++ sources/maintimer.h (.../maintimer.h) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -1,3 +1,16 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file maintimer.h + * \date 2019/09/30 + * \author Behrouz NematiPour + * + */ #pragma once // Qt Index: sources/storage/filehandler.cpp =================================================================== diff -u -r09e6b966b0e44bad7540f1571e7562b28e3d9fe7 -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 --- sources/storage/filehandler.cpp (.../filehandler.cpp) (revision 09e6b966b0e44bad7540f1571e7562b28e3d9fe7) +++ sources/storage/filehandler.cpp (.../filehandler.cpp) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -1,3 +1,16 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file filehandler.cpp + * \date 2019/09/30 + * \author Behrouz NematiPour + * + */ #include "filehandler.h" //Qt Index: sources/storage/filehandler.h =================================================================== diff -u -r09e6b966b0e44bad7540f1571e7562b28e3d9fe7 -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 --- sources/storage/filehandler.h (.../filehandler.h) (revision 09e6b966b0e44bad7540f1571e7562b28e3d9fe7) +++ sources/storage/filehandler.h (.../filehandler.h) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -1,3 +1,16 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file filehandler.h + * \date 2019/09/30 + * \author Behrouz NematiPour + * + */ #pragma once // Qt Index: sources/storage/logger.cpp =================================================================== diff -u -r09e6b966b0e44bad7540f1571e7562b28e3d9fe7 -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 --- sources/storage/logger.cpp (.../logger.cpp) (revision 09e6b966b0e44bad7540f1571e7562b28e3d9fe7) +++ sources/storage/logger.cpp (.../logger.cpp) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -1,3 +1,16 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file logger.cpp + * \date 2019/09/30 + * \author Behrouz NematiPour + * + */ #include "logger.h" using namespace Storage; Index: sources/storage/logger.h =================================================================== diff -u -r09e6b966b0e44bad7540f1571e7562b28e3d9fe7 -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 --- sources/storage/logger.h (.../logger.h) (revision 09e6b966b0e44bad7540f1571e7562b28e3d9fe7) +++ sources/storage/logger.h (.../logger.h) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -1,3 +1,16 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file logger.h + * \date 2019/09/30 + * \author Behrouz NematiPour + * + */ #pragma once #include Index: sources/storage/settings.cpp =================================================================== diff -u -r09e6b966b0e44bad7540f1571e7562b28e3d9fe7 -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 --- sources/storage/settings.cpp (.../settings.cpp) (revision 09e6b966b0e44bad7540f1571e7562b28e3d9fe7) +++ sources/storage/settings.cpp (.../settings.cpp) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -1,3 +1,16 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file settings.cpp + * \date 2019/09/30 + * \author Behrouz NematiPour + * + */ #include "settings.h" using namespace Storage; Index: sources/storage/settings.h =================================================================== diff -u -r09e6b966b0e44bad7540f1571e7562b28e3d9fe7 -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 --- sources/storage/settings.h (.../settings.h) (revision 09e6b966b0e44bad7540f1571e7562b28e3d9fe7) +++ sources/storage/settings.h (.../settings.h) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387) @@ -1,3 +1,16 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file settings.h + * \date 2019/09/30 + * \author Behrouz NematiPour + * + */ #pragma once #include