diff options
author | Romain Forlot <romain.forlot@iot.bzh> | 2016-12-08 10:42:21 +0000 |
---|---|---|
committer | Romain Forlot <romain.forlot@iot.bzh> | 2016-12-08 10:44:57 +0000 |
commit | d30018e251b152ea40fbf8410ec0d20d372100f8 (patch) | |
tree | 3f2abfd3d5f664a74cbe5cc368bf92aa807f736d | |
parent | 9a1a65486708324d3b7f8c0c3da51f1600622d5f (diff) |
Moved to new UI project from DemoApps/CES2017 repository
Change-Id: I65083c266b07320318b5f040b10b0c0a5a4dc4eb
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
-rw-r--r-- | app/HVAC.pro (renamed from qml/HVAC.pro) | 4 | ||||
-rw-r--r-- | app/hvac-demo-ui.cpp (renamed from qml/main.cpp) | 2 | ||||
-rw-r--r-- | app/hvac-demo.qml (renamed from qml/HVAC.qml) | 0 | ||||
-rw-r--r-- | app/hvac-demo.qrc | 5 | ||||
-rw-r--r-- | app/images/HMI_HVAC_AC_Active.svg (renamed from qml/images/HMI_HVAC_AC_Active.svg) | 0 | ||||
-rw-r--r-- | app/images/HMI_HVAC_AC_Inactive.svg (renamed from qml/images/HMI_HVAC_AC_Inactive.svg) | 0 | ||||
-rw-r--r-- | app/images/HMI_HVAC_AirDown_Active.svg (renamed from qml/images/HMI_HVAC_AirDown_Active.svg) | 0 | ||||
-rw-r--r-- | app/images/HMI_HVAC_AirDown_Inactive.svg (renamed from qml/images/HMI_HVAC_AirDown_Inactive.svg) | 0 | ||||
-rw-r--r-- | app/images/HMI_HVAC_AirRight_Active.svg (renamed from qml/images/HMI_HVAC_AirRight_Active.svg) | 0 | ||||
-rw-r--r-- | app/images/HMI_HVAC_AirRight_Inactive.svg (renamed from qml/images/HMI_HVAC_AirRight_Inactive.svg) | 0 | ||||
-rw-r--r-- | app/images/HMI_HVAC_AirUp_Active.svg (renamed from qml/images/HMI_HVAC_AirUp_Active.svg) | 0 | ||||
-rw-r--r-- | app/images/HMI_HVAC_AirUp_Inactive.svg (renamed from qml/images/HMI_HVAC_AirUp_Inactive.svg) | 0 | ||||
-rw-r--r-- | app/images/HMI_HVAC_Auto_Active.svg (renamed from qml/images/HMI_HVAC_Auto_Active.svg) | 0 | ||||
-rw-r--r-- | app/images/HMI_HVAC_Auto_Inactive.svg (renamed from qml/images/HMI_HVAC_Auto_Inactive.svg) | 0 | ||||
-rw-r--r-- | app/images/HMI_HVAC_ChairIndicator_OFF.svg (renamed from qml/images/HMI_HVAC_ChairIndicator_OFF.svg) | 0 | ||||
-rw-r--r-- | app/images/HMI_HVAC_ChairIndicator_One.svg (renamed from qml/images/HMI_HVAC_ChairIndicator_One.svg) | 0 | ||||
-rw-r--r-- | app/images/HMI_HVAC_ChairIndicator_Two.svg (renamed from qml/images/HMI_HVAC_ChairIndicator_Two.svg) | 0 | ||||
-rw-r--r-- | app/images/HMI_HVAC_Circulation_Active.svg (renamed from qml/images/HMI_HVAC_Circulation_Active.svg) | 0 | ||||
-rw-r--r-- | app/images/HMI_HVAC_Circulation_Inactive.svg (renamed from qml/images/HMI_HVAC_Circulation_Inactive.svg) | 0 | ||||
-rw-r--r-- | app/images/HMI_HVAC_Fan_Icon.svg (renamed from qml/images/HMI_HVAC_Fan_Icon.svg) | 0 | ||||
-rw-r--r-- | app/images/HMI_HVAC_Fan_Section.svg (renamed from qml/images/HMI_HVAC_Fan_Section.svg) | 0 | ||||
-rw-r--r-- | app/images/HMI_HVAC_Front_Active.svg (renamed from qml/images/HMI_HVAC_Front_Active.svg) | 0 | ||||
-rw-r--r-- | app/images/HMI_HVAC_Front_Inactive.svg (renamed from qml/images/HMI_HVAC_Front_Inactive.svg) | 0 | ||||
-rw-r--r-- | app/images/HMI_HVAC_LeftChair_Section.svg (renamed from qml/images/HMI_HVAC_LeftChair_Section.svg) | 0 | ||||
-rw-r--r-- | app/images/HMI_HVAC_LeftDetails.svg (renamed from qml/images/HMI_HVAC_LeftDetails.svg) | 0 | ||||
-rw-r--r-- | app/images/HMI_HVAC_Left_Chair_OFF.svg (renamed from qml/images/HMI_HVAC_Left_Chair_OFF.svg) | 0 | ||||
-rw-r--r-- | app/images/HMI_HVAC_Left_Chair_ON.svg (renamed from qml/images/HMI_HVAC_Left_Chair_ON.svg) | 0 | ||||
-rw-r--r-- | app/images/HMI_HVAC_Minus.svg (renamed from qml/images/HMI_HVAC_Minus.svg) | 0 | ||||
-rw-r--r-- | app/images/HMI_HVAC_Minus_Push.svg (renamed from qml/images/HMI_HVAC_Minus_Push.svg) | 0 | ||||
-rw-r--r-- | app/images/HMI_HVAC_Plus.svg (renamed from qml/images/HMI_HVAC_Plus.svg) | 0 | ||||
-rw-r--r-- | app/images/HMI_HVAC_Rear_Active.svg (renamed from qml/images/HMI_HVAC_Rear_Active.svg) | 0 | ||||
-rw-r--r-- | app/images/HMI_HVAC_Rear_Inactive.svg (renamed from qml/images/HMI_HVAC_Rear_Inactive.svg) | 0 | ||||
-rw-r--r-- | app/images/HMI_HVAC_RightChair_Section.svg (renamed from qml/images/HMI_HVAC_RightChair_Section.svg) | 0 | ||||
-rw-r--r-- | app/images/HMI_HVAC_RightDetails.svg (renamed from qml/images/HMI_HVAC_RightDetails.svg) | 0 | ||||
-rw-r--r-- | app/images/HMI_HVAC_Right_Chair_OFF.svg (renamed from qml/images/HMI_HVAC_Right_Chair_OFF.svg) | 0 | ||||
-rw-r--r-- | app/images/HMI_HVAC_Right_Chair_ON.svg (renamed from qml/images/HMI_HVAC_Right_Chair_ON.svg) | 0 | ||||
-rw-r--r-- | app/images/images.qrc (renamed from qml/images/images.qrc) | 0 | ||||
-rw-r--r-- | hvac-demo-binding.c (renamed from hvac-demo-bindings.c) | 0 |
38 files changed, 8 insertions, 3 deletions
diff --git a/qml/HVAC.pro b/app/HVAC.pro index 7503812..050106e 100644 --- a/qml/HVAC.pro +++ b/app/HVAC.pro @@ -1,5 +1,5 @@ TEMPLATE = app -TARGET = hvac +TARGET = hvac-demo QT = quickcontrols2 config_libhomescreen { @@ -11,7 +11,7 @@ config_libhomescreen { SOURCES = main.cpp RESOURCES += \ - hvac.qrc \ + hvac-demo.qrc \ images/images.qrc \ images/images.qrc diff --git a/qml/main.cpp b/app/hvac-demo-ui.cpp index b2133f7..c00c43b 100644 --- a/qml/main.cpp +++ b/app/hvac-demo-ui.cpp @@ -39,7 +39,7 @@ int main(int argc, char *argv[]) QQuickStyle::setStyle("AGL"); QQmlApplicationEngine engine; - engine.load(QUrl(QStringLiteral("qrc:/HVAC.qml"))); + engine.load(QUrl(QStringLiteral("qrc:/hvac-demo.qml"))); return app.exec(); } diff --git a/qml/HVAC.qml b/app/hvac-demo.qml index b2f8e49..b2f8e49 100644 --- a/qml/HVAC.qml +++ b/app/hvac-demo.qml diff --git a/app/hvac-demo.qrc b/app/hvac-demo.qrc new file mode 100644 index 0000000..7e49a98 --- /dev/null +++ b/app/hvac-demo.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>hvac-demo.qml</file> + </qresource> +</RCC> diff --git a/qml/images/HMI_HVAC_AC_Active.svg b/app/images/HMI_HVAC_AC_Active.svg index 608f44d..608f44d 100644 --- a/qml/images/HMI_HVAC_AC_Active.svg +++ b/app/images/HMI_HVAC_AC_Active.svg diff --git a/qml/images/HMI_HVAC_AC_Inactive.svg b/app/images/HMI_HVAC_AC_Inactive.svg index 1bd338e..1bd338e 100644 --- a/qml/images/HMI_HVAC_AC_Inactive.svg +++ b/app/images/HMI_HVAC_AC_Inactive.svg diff --git a/qml/images/HMI_HVAC_AirDown_Active.svg b/app/images/HMI_HVAC_AirDown_Active.svg index 68aebb3..68aebb3 100644 --- a/qml/images/HMI_HVAC_AirDown_Active.svg +++ b/app/images/HMI_HVAC_AirDown_Active.svg diff --git a/qml/images/HMI_HVAC_AirDown_Inactive.svg b/app/images/HMI_HVAC_AirDown_Inactive.svg index a013f4b..a013f4b 100644 --- a/qml/images/HMI_HVAC_AirDown_Inactive.svg +++ b/app/images/HMI_HVAC_AirDown_Inactive.svg diff --git a/qml/images/HMI_HVAC_AirRight_Active.svg b/app/images/HMI_HVAC_AirRight_Active.svg index 9ac6103..9ac6103 100644 --- a/qml/images/HMI_HVAC_AirRight_Active.svg +++ b/app/images/HMI_HVAC_AirRight_Active.svg diff --git a/qml/images/HMI_HVAC_AirRight_Inactive.svg b/app/images/HMI_HVAC_AirRight_Inactive.svg index 991a773..991a773 100644 --- a/qml/images/HMI_HVAC_AirRight_Inactive.svg +++ b/app/images/HMI_HVAC_AirRight_Inactive.svg diff --git a/qml/images/HMI_HVAC_AirUp_Active.svg b/app/images/HMI_HVAC_AirUp_Active.svg index 7428bd1..7428bd1 100644 --- a/qml/images/HMI_HVAC_AirUp_Active.svg +++ b/app/images/HMI_HVAC_AirUp_Active.svg diff --git a/qml/images/HMI_HVAC_AirUp_Inactive.svg b/app/images/HMI_HVAC_AirUp_Inactive.svg index 39e1fa1..39e1fa1 100644 --- a/qml/images/HMI_HVAC_AirUp_Inactive.svg +++ b/app/images/HMI_HVAC_AirUp_Inactive.svg diff --git a/qml/images/HMI_HVAC_Auto_Active.svg b/app/images/HMI_HVAC_Auto_Active.svg index e471801..e471801 100644 --- a/qml/images/HMI_HVAC_Auto_Active.svg +++ b/app/images/HMI_HVAC_Auto_Active.svg diff --git a/qml/images/HMI_HVAC_Auto_Inactive.svg b/app/images/HMI_HVAC_Auto_Inactive.svg index f189931..f189931 100644 --- a/qml/images/HMI_HVAC_Auto_Inactive.svg +++ b/app/images/HMI_HVAC_Auto_Inactive.svg diff --git a/qml/images/HMI_HVAC_ChairIndicator_OFF.svg b/app/images/HMI_HVAC_ChairIndicator_OFF.svg index 1fcd17f..1fcd17f 100644 --- a/qml/images/HMI_HVAC_ChairIndicator_OFF.svg +++ b/app/images/HMI_HVAC_ChairIndicator_OFF.svg diff --git a/qml/images/HMI_HVAC_ChairIndicator_One.svg b/app/images/HMI_HVAC_ChairIndicator_One.svg index c24fa8f..c24fa8f 100644 --- a/qml/images/HMI_HVAC_ChairIndicator_One.svg +++ b/app/images/HMI_HVAC_ChairIndicator_One.svg diff --git a/qml/images/HMI_HVAC_ChairIndicator_Two.svg b/app/images/HMI_HVAC_ChairIndicator_Two.svg index 042b87d..042b87d 100644 --- a/qml/images/HMI_HVAC_ChairIndicator_Two.svg +++ b/app/images/HMI_HVAC_ChairIndicator_Two.svg diff --git a/qml/images/HMI_HVAC_Circulation_Active.svg b/app/images/HMI_HVAC_Circulation_Active.svg index 8a15033..8a15033 100644 --- a/qml/images/HMI_HVAC_Circulation_Active.svg +++ b/app/images/HMI_HVAC_Circulation_Active.svg diff --git a/qml/images/HMI_HVAC_Circulation_Inactive.svg b/app/images/HMI_HVAC_Circulation_Inactive.svg index 9c7d43f..9c7d43f 100644 --- a/qml/images/HMI_HVAC_Circulation_Inactive.svg +++ b/app/images/HMI_HVAC_Circulation_Inactive.svg diff --git a/qml/images/HMI_HVAC_Fan_Icon.svg b/app/images/HMI_HVAC_Fan_Icon.svg index 2676ba1..2676ba1 100644 --- a/qml/images/HMI_HVAC_Fan_Icon.svg +++ b/app/images/HMI_HVAC_Fan_Icon.svg diff --git a/qml/images/HMI_HVAC_Fan_Section.svg b/app/images/HMI_HVAC_Fan_Section.svg index 6ce708a..6ce708a 100644 --- a/qml/images/HMI_HVAC_Fan_Section.svg +++ b/app/images/HMI_HVAC_Fan_Section.svg diff --git a/qml/images/HMI_HVAC_Front_Active.svg b/app/images/HMI_HVAC_Front_Active.svg index 2c873de..2c873de 100644 --- a/qml/images/HMI_HVAC_Front_Active.svg +++ b/app/images/HMI_HVAC_Front_Active.svg diff --git a/qml/images/HMI_HVAC_Front_Inactive.svg b/app/images/HMI_HVAC_Front_Inactive.svg index c5d9166..c5d9166 100644 --- a/qml/images/HMI_HVAC_Front_Inactive.svg +++ b/app/images/HMI_HVAC_Front_Inactive.svg diff --git a/qml/images/HMI_HVAC_LeftChair_Section.svg b/app/images/HMI_HVAC_LeftChair_Section.svg index 07575ad..07575ad 100644 --- a/qml/images/HMI_HVAC_LeftChair_Section.svg +++ b/app/images/HMI_HVAC_LeftChair_Section.svg diff --git a/qml/images/HMI_HVAC_LeftDetails.svg b/app/images/HMI_HVAC_LeftDetails.svg index 9527af4..9527af4 100644 --- a/qml/images/HMI_HVAC_LeftDetails.svg +++ b/app/images/HMI_HVAC_LeftDetails.svg diff --git a/qml/images/HMI_HVAC_Left_Chair_OFF.svg b/app/images/HMI_HVAC_Left_Chair_OFF.svg index 1412266..1412266 100644 --- a/qml/images/HMI_HVAC_Left_Chair_OFF.svg +++ b/app/images/HMI_HVAC_Left_Chair_OFF.svg diff --git a/qml/images/HMI_HVAC_Left_Chair_ON.svg b/app/images/HMI_HVAC_Left_Chair_ON.svg index 14faf49..14faf49 100644 --- a/qml/images/HMI_HVAC_Left_Chair_ON.svg +++ b/app/images/HMI_HVAC_Left_Chair_ON.svg diff --git a/qml/images/HMI_HVAC_Minus.svg b/app/images/HMI_HVAC_Minus.svg index 3659b8e..3659b8e 100644 --- a/qml/images/HMI_HVAC_Minus.svg +++ b/app/images/HMI_HVAC_Minus.svg diff --git a/qml/images/HMI_HVAC_Minus_Push.svg b/app/images/HMI_HVAC_Minus_Push.svg index c14820d..c14820d 100644 --- a/qml/images/HMI_HVAC_Minus_Push.svg +++ b/app/images/HMI_HVAC_Minus_Push.svg diff --git a/qml/images/HMI_HVAC_Plus.svg b/app/images/HMI_HVAC_Plus.svg index 6ede403..6ede403 100644 --- a/qml/images/HMI_HVAC_Plus.svg +++ b/app/images/HMI_HVAC_Plus.svg diff --git a/qml/images/HMI_HVAC_Rear_Active.svg b/app/images/HMI_HVAC_Rear_Active.svg index 7c67104..7c67104 100644 --- a/qml/images/HMI_HVAC_Rear_Active.svg +++ b/app/images/HMI_HVAC_Rear_Active.svg diff --git a/qml/images/HMI_HVAC_Rear_Inactive.svg b/app/images/HMI_HVAC_Rear_Inactive.svg index 574c541..574c541 100644 --- a/qml/images/HMI_HVAC_Rear_Inactive.svg +++ b/app/images/HMI_HVAC_Rear_Inactive.svg diff --git a/qml/images/HMI_HVAC_RightChair_Section.svg b/app/images/HMI_HVAC_RightChair_Section.svg index bc06af4..bc06af4 100644 --- a/qml/images/HMI_HVAC_RightChair_Section.svg +++ b/app/images/HMI_HVAC_RightChair_Section.svg diff --git a/qml/images/HMI_HVAC_RightDetails.svg b/app/images/HMI_HVAC_RightDetails.svg index 3e6f7e3..3e6f7e3 100644 --- a/qml/images/HMI_HVAC_RightDetails.svg +++ b/app/images/HMI_HVAC_RightDetails.svg diff --git a/qml/images/HMI_HVAC_Right_Chair_OFF.svg b/app/images/HMI_HVAC_Right_Chair_OFF.svg index 711a942..711a942 100644 --- a/qml/images/HMI_HVAC_Right_Chair_OFF.svg +++ b/app/images/HMI_HVAC_Right_Chair_OFF.svg diff --git a/qml/images/HMI_HVAC_Right_Chair_ON.svg b/app/images/HMI_HVAC_Right_Chair_ON.svg index 319ef67..319ef67 100644 --- a/qml/images/HMI_HVAC_Right_Chair_ON.svg +++ b/app/images/HMI_HVAC_Right_Chair_ON.svg diff --git a/qml/images/images.qrc b/app/images/images.qrc index 81768a9..81768a9 100644 --- a/qml/images/images.qrc +++ b/app/images/images.qrc diff --git a/hvac-demo-bindings.c b/hvac-demo-binding.c index a341d05..a341d05 100644 --- a/hvac-demo-bindings.c +++ b/hvac-demo-binding.c |