Index: denali.qrc
===================================================================
diff -u -r09e6b966b0e44bad7540f1571e7562b28e3d9fe7 -r310dbfe508ffb4c921bb9337e207223f8677ca10
--- denali.qrc (.../denali.qrc) (revision 09e6b966b0e44bad7540f1571e7562b28e3d9fe7)
+++ denali.qrc (.../denali.qrc) (revision 310dbfe508ffb4c921bb9337e207223f8677ca10)
@@ -17,5 +17,13 @@
qtquickcontrols2.conf
-
+
+
+ sources/gui/qml/styles/Colors.qml
+ sources/gui/qml/styles/qmldir
+
+
+ sources/gui/qml/globals/Variables.qml
+ sources/gui/qml/globals/qmldir
+
Index: sources/gui/qml/Home.ui.qml
===================================================================
diff -u -r09e6b966b0e44bad7540f1571e7562b28e3d9fe7 -r310dbfe508ffb4c921bb9337e207223f8677ca10
--- sources/gui/qml/Home.ui.qml (.../Home.ui.qml) (revision 09e6b966b0e44bad7540f1571e7562b28e3d9fe7)
+++ sources/gui/qml/Home.ui.qml (.../Home.ui.qml) (revision 310dbfe508ffb4c921bb9337e207223f8677ca10)
@@ -2,6 +2,7 @@
import QtQuick.Controls 2.12
Page {
+ property alias backgroundColor: backgroundRect.color
width: 1280
height: 800
property alias mouseAreaTreatmentHistory: mouseAreaTreatmentHistory
@@ -21,7 +22,6 @@
title: "Home"
Rectangle {
id: backgroundRect
- color: "#709aca"
anchors.fill: parent
Rectangle {
id: rectStartTreatment
Index: sources/gui/qml/globals/Variables.qml
===================================================================
diff -u
--- sources/gui/qml/globals/Variables.qml (revision 0)
+++ sources/gui/qml/globals/Variables.qml (revision 310dbfe508ffb4c921bb9337e207223f8677ca10)
@@ -0,0 +1,7 @@
+pragma Singleton
+import QtQuick 2.12
+
+QtObject {
+ readonly property int applicationWidth: 1280
+ readonly property int applicationHeight: 800
+}
Index: sources/gui/qml/globals/qmldir
===================================================================
diff -u
--- sources/gui/qml/globals/qmldir (revision 0)
+++ sources/gui/qml/globals/qmldir (revision 310dbfe508ffb4c921bb9337e207223f8677ca10)
@@ -0,0 +1 @@
+singleton Variables 1.0 Variables.qml
Index: sources/gui/qml/main.qml
===================================================================
diff -u -r09e6b966b0e44bad7540f1571e7562b28e3d9fe7 -r310dbfe508ffb4c921bb9337e207223f8677ca10
--- sources/gui/qml/main.qml (.../main.qml) (revision 09e6b966b0e44bad7540f1571e7562b28e3d9fe7)
+++ sources/gui/qml/main.qml (.../main.qml) (revision 310dbfe508ffb4c921bb9337e207223f8677ca10)
@@ -3,6 +3,9 @@
import Gui.View 0.1;
import Gui.Actions 0.1;
+import "qrc:/styles"
+import "qrc:/globals"
+
/*
Copyright Diality Inc. 2019-2020 All Rights Reserved.
Diality Inc.
@@ -14,8 +17,8 @@
*/
Item { id: _itemWindow
visible: true
- width: 1280
- height: 800
+ width: Variables.applicationWidth
+ height: Variables.applicationHeight
GuiView { id: _guiView
onActionEvaluated: {
@@ -33,7 +36,6 @@
StartTreatment { id: _startTreatmentScreen
btnBack.onClicked: {
_guiView.notifyActionRequest(GuiActions.ActBack)
- abc()
}
btnBack.onPressAndHold: {
_guiView.notifyActionRequest(GuiActions.ActConfirm)
@@ -47,6 +49,7 @@
}
Home { id: _homeScreen
+ backgroundColor: Colors.backgroundMain
visible: true
mouseAreaStartTreatment.onClicked: {
_stackView.push(_startTreatmentScreen)
Index: sources/gui/qml/styles/Colors.qml
===================================================================
diff -u
--- sources/gui/qml/styles/Colors.qml (revision 0)
+++ sources/gui/qml/styles/Colors.qml (revision 310dbfe508ffb4c921bb9337e207223f8677ca10)
@@ -0,0 +1,18 @@
+pragma Singleton
+import QtQuick 2.12
+
+QtObject {
+ readonly property color backgroundMain : "#14314C"
+ readonly property color backgroundButton : "#4290EC"
+ readonly property color backgroundDialog : "#204465"
+ readonly property color backgroundMenu : "#14314C"
+ 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 borderDisableButton : "#607A91"
+
+}
Index: sources/gui/qml/styles/qmldir
===================================================================
diff -u
--- sources/gui/qml/styles/qmldir (revision 0)
+++ sources/gui/qml/styles/qmldir (revision 310dbfe508ffb4c921bb9337e207223f8677ca10)
@@ -0,0 +1 @@
+singleton Colors 1.0 Colors.qml