Index: denali.qrc =================================================================== diff -u -r310dbfe508ffb4c921bb9337e207223f8677ca10 -r11887705270e9c700e297610ed1af479bae4079e --- denali.qrc (.../denali.qrc) (revision 310dbfe508ffb4c921bb9337e207223f8677ca10) +++ denali.qrc (.../denali.qrc) (revision 11887705270e9c700e297610ed1af479bae4079e) @@ -1,29 +1,30 @@ - - sources/gui/qml/Home.ui.qml - sources/gui/qml/main.qml - sources/gui/qml/StartTreatment.ui.qml - sources/gui/qml/TreatmentManager.ui.qml + + sources/gui/qml/pages/Home.qml + sources/gui/qml/pages/StartTreatment.qml + sources/gui/qml/pages/TreatmentManager.qml - resources/images/Vegetables_Outline-03-128.png - resources/images/brightness_low_battery_sun_light-128.png - resources/images/brightness_high_business_building_sky-128.png - resources/images/Streamline-18-128.png - resources/images/Settings_gear_setting_tools-128.png - resources/images/ic_format_list_bulleted_48px-128.png - resources/images/00-ELASTOFONT-STORE-READY_user-circle-128.png + 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/Power_symbol-128.png + resources/images/splash.png + + sources/gui/qml/components/MainMenu.qml + qtquickcontrols2.conf + sources/gui/qml/main.qml - - sources/gui/qml/styles/Colors.qml - sources/gui/qml/styles/qmldir - sources/gui/qml/globals/Variables.qml + sources/gui/qml/globals/Colors.qml sources/gui/qml/globals/qmldir + sources/gui/qml/globals/Fonts.qml Index: qtquickcontrols2.conf =================================================================== diff -u -r09e6b966b0e44bad7540f1571e7562b28e3d9fe7 -r11887705270e9c700e297610ed1af479bae4079e --- qtquickcontrols2.conf (.../qtquickcontrols2.conf) (revision 09e6b966b0e44bad7540f1571e7562b28e3d9fe7) +++ qtquickcontrols2.conf (.../qtquickcontrols2.conf) (revision 11887705270e9c700e297610ed1af479bae4079e) @@ -1,2 +1,2 @@ -[Controls] -Style=Imagine +[Controls] +Style=Imagine Index: resources/fonts/Barlow-Regular.ttf =================================================================== diff -u Binary files differ Index: resources/images/00-ELASTOFONT-STORE-READY_user-circle-128.png =================================================================== diff -u -r09e6b966b0e44bad7540f1571e7562b28e3d9fe7 -r11887705270e9c700e297610ed1af479bae4079e Binary files differ Index: resources/images/Logo Diality 14314c .png =================================================================== diff -u Binary files differ Index: resources/images/Logo Diality 1a344d .png =================================================================== diff -u Binary files differ Index: resources/images/Logo d 14314c .png =================================================================== diff -u Binary files differ Index: resources/images/Logo d 1a344d .png =================================================================== diff -u Binary files differ Index: resources/images/Power_symbol-128.png =================================================================== diff -u Binary files differ Index: resources/images/Streamline-18-128.png =================================================================== diff -u -r09e6b966b0e44bad7540f1571e7562b28e3d9fe7 -r11887705270e9c700e297610ed1af479bae4079e Binary files differ Index: resources/images/Vegetables_Outline-03-128.png =================================================================== diff -u -r09e6b966b0e44bad7540f1571e7562b28e3d9fe7 -r11887705270e9c700e297610ed1af479bae4079e Binary files differ Index: resources/images/brightness_high_business_building_sky-128.png =================================================================== diff -u -r09e6b966b0e44bad7540f1571e7562b28e3d9fe7 -r11887705270e9c700e297610ed1af479bae4079e Binary files differ Index: resources/images/brightness_low_battery_sun_light-128.png =================================================================== diff -u -r09e6b966b0e44bad7540f1571e7562b28e3d9fe7 -r11887705270e9c700e297610ed1af479bae4079e Binary files differ Index: resources/images/ic_format_list_bulleted_48px-128.png =================================================================== diff -u -r09e6b966b0e44bad7540f1571e7562b28e3d9fe7 -r11887705270e9c700e297610ed1af479bae4079e Binary files differ Index: resources/images/logo.png =================================================================== diff -u -r09e6b966b0e44bad7540f1571e7562b28e3d9fe7 -r11887705270e9c700e297610ed1af479bae4079e Binary files differ Index: resources/images/splash.png =================================================================== diff -u Binary files differ Index: sources/gui/guicontroller.cpp =================================================================== diff -u -r09e6b966b0e44bad7540f1571e7562b28e3d9fe7 -r11887705270e9c700e297610ed1af479bae4079e --- sources/gui/guicontroller.cpp (.../guicontroller.cpp) (revision 09e6b966b0e44bad7540f1571e7562b28e3d9fe7) +++ sources/gui/guicontroller.cpp (.../guicontroller.cpp) (revision 11887705270e9c700e297610ed1af479bae4079e) @@ -57,17 +57,17 @@ */ void GuiController::actionEvaluation(GuiAction vAction) { - static bool requested = false; + //static bool requested = false; qDebug() << "actionRequested : " << vAction; // TEST : check state and evaluate. - if (!requested) { - requested = true; - qDebug() << "Ask again: " << vAction; - actionEvaluated(vAction, false); - return; - } - requested = false; + // if (!requested) { + // requested = true; + // qDebug() << "Ask again: " << vAction; + // actionEvaluated(vAction, false); + // return; + // } + // requested = false; qDebug() << "Got it: " << vAction; actionEvaluated(vAction, true); } Index: sources/gui/guicontroller.h =================================================================== diff -u -r09e6b966b0e44bad7540f1571e7562b28e3d9fe7 -r11887705270e9c700e297610ed1af479bae4079e --- sources/gui/guicontroller.h (.../guicontroller.h) (revision 09e6b966b0e44bad7540f1571e7562b28e3d9fe7) +++ sources/gui/guicontroller.h (.../guicontroller.h) (revision 11887705270e9c700e297610ed1af479bae4079e) @@ -6,7 +6,7 @@ // Project #include "guiactions.h" -#define QML(qml) QStringLiteral("qrc:/qml/" qml ".qml") +#define QML(qml) QStringLiteral("qrc:/" qml ".qml") namespace Gui { Fisheye: Tag 11887705270e9c700e297610ed1af479bae4079e refers to a dead (removed) revision in file `sources/gui/qml/Home.ui.qml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 11887705270e9c700e297610ed1af479bae4079e refers to a dead (removed) revision in file `sources/gui/qml/StartTreatment.ui.qml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 11887705270e9c700e297610ed1af479bae4079e refers to a dead (removed) revision in file `sources/gui/qml/TreatmentManager.ui.qml'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/gui/qml/components/MainMenu.qml =================================================================== diff -u --- sources/gui/qml/components/MainMenu.qml (revision 0) +++ sources/gui/qml/components/MainMenu.qml (revision 11887705270e9c700e297610ed1af479bae4079e) @@ -0,0 +1,85 @@ +import QtQuick 2.12 +import QtQuick.Controls 2.12 + +import "qrc:/globals" + +Item { + height: Variables.mainMenuHeight + anchors { + right: parent.right + left: parent.left + bottom: parent.bottom + } + + Rectangle { id: _backgroundRect + anchors.fill: parent + color: Colors.backgroundMainMenu + } + Row { + anchors.fill: parent + spacing : Variables.mainMenuButtonSpacing + leftPadding : Variables.mainMenuButtonSpacing + rightPadding: Variables.mainMenuButtonSpacing + Rectangle { id : _treatmentRect + width: Variables.mainMenuButtonWidth + height: parent.height + color: "transparent" + Text { id: _treatmentText + anchors.centerIn: parent + color: Colors.textMain + text: qsTr("Treatment") + font.pixelSize: Fonts.fontPixelButton + } + MouseArea { id: _treatmentMouseArea + anchors.fill: parent + onPressed: { + _highlightRect.x = _treatmentRect.x + } + } + } + Rectangle { id : _managerRect + width: Variables.mainMenuButtonWidth + height: parent.height + color: "transparent" + Text { id: _managerText + anchors.centerIn: parent + color: Colors.textMain + text: qsTr("Manager") + font.pixelSize: Fonts.fontPixelButton + } + MouseArea { id: _managerMouseArea + anchors.fill: parent + onPressed: { + _highlightRect.x = _managerRect.x + } + } + } + Rectangle { id : _settingsRect + width: Variables.mainMenuButtonWidth + height: parent.height + color: "transparent" + Text { id: _settingsText + anchors.centerIn: parent + color: Colors.textMain + text: qsTr("Settings") + font.pixelSize: Fonts.fontPixelButton + } + MouseArea { id: _settingsMouseArea + anchors.fill: parent + onPressed: { + _highlightRect.x = _settingsRect.x + } + } + } + } + Rectangle { id : _highlightRect + color: Colors.backgroundButton + width: Variables.mainMenuButtonWidth + height: 10 + radius: 10 + x: _treatmentRect.x + anchors.bottom: parent.bottom + anchors.bottomMargin: -5 + Behavior on x { PropertyAnimation {} } + } +} Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u --- sources/gui/qml/globals/Colors.qml (revision 0) +++ sources/gui/qml/globals/Colors.qml (revision 11887705270e9c700e297610ed1af479bae4079e) @@ -0,0 +1,20 @@ +pragma Singleton +import QtQuick 2.12 + +QtObject { + readonly property color backgroundMain : "#1A344D" + readonly property color backgroundButton : "#4290EC" + readonly property color backgroundDialog : "#204465" + readonly property color backgroundMenu : "#14314C" + readonly property color backgroundMainMenu : "#052136" + readonly property color backgroundSlider : "#135088" + + readonly property color textMain : "#FCFCFC" + readonly property color textButton : "#E8E8E8" + readonly property color textTickMark : "#4290EC" + readonly property color textDisableButton : "#607A91" + + readonly property color borderButton : "#4290EC" + readonly property color borderDisableButton : "#607A91" + +} Index: sources/gui/qml/globals/Fonts.qml =================================================================== diff -u --- sources/gui/qml/globals/Fonts.qml (revision 0) +++ sources/gui/qml/globals/Fonts.qml (revision 11887705270e9c700e297610ed1af479bae4079e) @@ -0,0 +1,7 @@ +pragma Singleton +import QtQuick 2.12 + +QtObject { + readonly property int fontPixelButton: 12 * 2 + readonly property int fontPixelTitle : 12 * 4 +} Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r310dbfe508ffb4c921bb9337e207223f8677ca10 -r11887705270e9c700e297610ed1af479bae4079e --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 310dbfe508ffb4c921bb9337e207223f8677ca10) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 11887705270e9c700e297610ed1af479bae4079e) @@ -2,6 +2,16 @@ import QtQuick 2.12 QtObject { - readonly property int applicationWidth: 1280 - readonly property int applicationHeight: 800 + readonly property int applicationWidth : 1280 + readonly property int applicationHeight : 800 + readonly property int headerLogoHeight : 100 + + readonly property int mainMenuHeight : 70 + readonly property int mainMenuButtonWidth : 180 + readonly property int mainMenuButtonSpacing : 180 + + readonly property int logoWidth : 50 + readonly property int logoHeight : 50 + + readonly property int borderWidth : 2 } Index: sources/gui/qml/globals/qmldir =================================================================== diff -u -r310dbfe508ffb4c921bb9337e207223f8677ca10 -r11887705270e9c700e297610ed1af479bae4079e --- sources/gui/qml/globals/qmldir (.../qmldir) (revision 310dbfe508ffb4c921bb9337e207223f8677ca10) +++ sources/gui/qml/globals/qmldir (.../qmldir) (revision 11887705270e9c700e297610ed1af479bae4079e) @@ -1 +1,3 @@ singleton Variables 1.0 Variables.qml +singleton Colors 1.0 Colors.qml +singleton Fonts 1.0 Fonts.qml 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 } } Index: sources/gui/qml/pages/Home.qml =================================================================== diff -u --- sources/gui/qml/pages/Home.qml (revision 0) +++ sources/gui/qml/pages/Home.qml (revision 11887705270e9c700e297610ed1af479bae4079e) @@ -0,0 +1,90 @@ +import QtQuick 2.12 +import QtQuick.Controls 2.12 + +import "qrc:/globals" + +Item { id: root + property int favoriteCount: 0 + property alias startTreatmentMouseArea: _startTreatmentMouseArea + property alias createTreatmentMouseArea: _createTreatmentMouseArea + + width: Variables.applicationWidth + height:Variables.applicationHeight + + property alias versionText: versionText + + Rectangle { id: _backgroundRect + anchors.fill: parent + color: Colors.backgroundMain + } + + Column { + spacing: 20 + anchors.centerIn: parent + Text { id: _titleText + width: parent.width + bottomPadding: 25 + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + color: Colors.textMain + text: qsTr("Good Morning") + font.pixelSize: Fonts.fontPixelTitle + } + Rectangle { id : _startTreatmentRect + width: 425 + height: 70 + radius: 50 + color: Colors.backgroundMain + border { + color: Colors.borderButton + width: Variables.borderWidth + } + Text { id: _startTreatmentText + anchors.centerIn: parent + color: Colors.textMain + text: qsTr("START TREATMENT (%1)").arg(favoriteCount) + font.pixelSize: Fonts.fontPixelButton + } + MouseArea { id: _startTreatmentMouseArea + anchors.fill: parent + } + } + + Rectangle { id : _createTreatmentRect + width: 425 + height: 70 + radius: 50 + color: Colors.backgroundMain + border { + color: Colors.borderButton + width: Variables.borderWidth + } + Text { id: _createTreatmentText + anchors.centerIn: parent + color: Colors.textMain + text: qsTr("CREATE TREATMENT") + font.pixelSize: Fonts.fontPixelButton + } + MouseArea { id: _createTreatmentMouseArea + anchors.fill: parent + } + + } + } + + Text { id: versionText + color: Colors.textMain + x: 1172 + y: 767 + width: 104 + height: 27 + text: qsTr("0.1") + horizontalAlignment: Text.AlignRight + anchors.bottom: parent.bottom + anchors.bottomMargin: 6 + anchors.right: parent.right + anchors.rightMargin: 4 + font.pixelSize: 14 + } + +} Index: sources/gui/qml/pages/StartTreatment.qml =================================================================== diff -u --- sources/gui/qml/pages/StartTreatment.qml (revision 0) +++ sources/gui/qml/pages/StartTreatment.qml (revision 11887705270e9c700e297610ed1af479bae4079e) @@ -0,0 +1,33 @@ +import QtQuick 2.12 +import QtQuick.Controls 2.12 + +import "qrc:/globals" + +Item { + width: Variables.applicationWidth + height: Variables.applicationHeight + + property alias btnBack: btnBack + Rectangle { id: _backgroundRect + anchors.fill: parent + color: Colors.backgroundMain + } + + Text { id: _titleText + y: Variables.headerLogoHeight + width: parent.width + bottomPadding: 25 + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + color: Colors.textMain + text: qsTr("Start Treatment") + font.pixelSize: Fonts.fontPixelButton + } + + Button { + id: btnBack + x: 12 + y: 680 + text: qsTr("Back") + } +} Index: sources/gui/qml/pages/TreatmentManager.qml =================================================================== diff -u --- sources/gui/qml/pages/TreatmentManager.qml (revision 0) +++ sources/gui/qml/pages/TreatmentManager.qml (revision 11887705270e9c700e297610ed1af479bae4079e) @@ -0,0 +1,33 @@ +import QtQuick 2.12 +import QtQuick.Controls 2.12 + +import "qrc:/globals" + +Item { + width: Variables.applicationWidth + height: Variables.applicationHeight + + property alias btnBack: btnBack + Rectangle { id: _backgroundRect + anchors.fill: parent + color: Colors.backgroundMain + } + + Text { id: _titleText + y: Variables.headerLogoHeight + width: parent.width + bottomPadding: 25 + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + color: Colors.textMain + text: qsTr("Create Treatment") + font.pixelSize: Fonts.fontPixelButton + } + + Button { + id: btnBack + x: 12 + y: 680 + text: qsTr("Back") + } +} Fisheye: Tag 11887705270e9c700e297610ed1af479bae4079e refers to a dead (removed) revision in file `sources/gui/qml/styles/Colors.qml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 11887705270e9c700e297610ed1af479bae4079e refers to a dead (removed) revision in file `sources/gui/qml/styles/qmldir'. Fisheye: No comparison available. Pass `N' to diff?