From c5613c9a95a892935e5a1aeaef79cbf8ac18bedc Mon Sep 17 00:00:00 2001 From: Tadao Tanikawa Date: Fri, 15 Dec 2017 23:36:56 +0900 Subject: [PATCH] Update to new color scheme The color scheme has been changed to new one. Bug-AGL: SPEC-673 Change-Id: I713a8116931524505aa549c68d27559ae518a612 Signed-off-by: Tadao Tanikawa --- app/HVAC.qml | 4 +- app/HeatDegree.qml | 2 +- app/images/HMI_HVAC_Active.svg | 100 ++++------- app/images/HMI_HVAC_AirDown_Active.svg | 181 +++++++------------ app/images/HMI_HVAC_AirRight_Active.svg | 184 +++++++------------ app/images/HMI_HVAC_AirUp_Active.svg | 192 ++++++++------------ app/images/HMI_HVAC_ChairIndicator_One.svg | 100 ++++------- app/images/HMI_HVAC_ChairIndicator_Two.svg | 107 ++++------- app/images/HMI_HVAC_Circulation_Active.svg | 267 ++++++++-------------------- app/images/HMI_HVAC_Fan_Icon.svg | 123 +++++-------- app/images/HMI_HVAC_Front_Active.svg | 174 ++++++++---------- app/images/HMI_HVAC_Inactive.svg | 80 +++------ app/images/HMI_HVAC_Left_Chair_ON.svg | 158 +++++++---------- app/images/HMI_HVAC_Rear_Active.svg | 274 ++++++++++------------------- app/images/HMI_HVAC_Right_Chair_ON.svg | 158 +++++++---------- 15 files changed, 714 insertions(+), 1390 deletions(-) diff --git a/app/HVAC.qml b/app/HVAC.qml index 0d60cbd..b3be443 100644 --- a/app/HVAC.qml +++ b/app/HVAC.qml @@ -88,7 +88,7 @@ ApplicationWindow { offImage: './images/HMI_HVAC_Inactive.svg' Label { anchors.centerIn: parent - color: parent.checked ? '#66FF99' : '#848286' + color: parent.checked ? '#00ADDC' : '#848286' text: 'A/C' font.pixelSize: parent.height / 3 } @@ -101,7 +101,7 @@ ApplicationWindow { offImage: './images/HMI_HVAC_Inactive.svg' Label { anchors.centerIn: parent - color: parent.checked ? '#66FF99' : '#848286' + color: parent.checked ? '#00ADDC' : '#848286' text: 'AUTO' font.pixelSize: parent.height / 3 } diff --git a/app/HeatDegree.qml b/app/HeatDegree.qml index 878a9d8..aa5770a 100644 --- a/app/HeatDegree.qml +++ b/app/HeatDegree.qml @@ -42,7 +42,7 @@ ListView { verticalAlignment: Label.AlignVCenter text: model.modelData font.pixelSize: height * 0.8 - color: (ListView.view.enabled && ListView.isCurrentItem) ? '#66FF99' : 'white' + color: (ListView.view.enabled && ListView.isCurrentItem) ? '#00ADDC' : 'white' } preferredHighlightBegin: 0.5 diff --git a/app/images/HMI_HVAC_Active.svg b/app/images/HMI_HVAC_Active.svg index 803a42e..71e6aa0 100644 --- a/app/images/HMI_HVAC_Active.svg +++ b/app/images/HMI_HVAC_Active.svg @@ -1,75 +1,35 @@ - - - -image/svg+xml + + + + + + + + + + + + diff --git a/app/images/HMI_HVAC_AirDown_Active.svg b/app/images/HMI_HVAC_AirDown_Active.svg index 68aebb3..85dd533 100644 --- a/app/images/HMI_HVAC_AirDown_Active.svg +++ b/app/images/HMI_HVAC_AirDown_Active.svg @@ -1,121 +1,66 @@ - - - -image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/images/HMI_HVAC_AirRight_Active.svg b/app/images/HMI_HVAC_AirRight_Active.svg index 9ac6103..cfb9452 100644 --- a/app/images/HMI_HVAC_AirRight_Active.svg +++ b/app/images/HMI_HVAC_AirRight_Active.svg @@ -1,123 +1,69 @@ - - - -image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/images/HMI_HVAC_AirUp_Active.svg b/app/images/HMI_HVAC_AirUp_Active.svg index 7428bd1..f168a39 100644 --- a/app/images/HMI_HVAC_AirUp_Active.svg +++ b/app/images/HMI_HVAC_AirUp_Active.svg @@ -1,126 +1,74 @@ - - - -image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/images/HMI_HVAC_ChairIndicator_One.svg b/app/images/HMI_HVAC_ChairIndicator_One.svg index c24fa8f..d560c84 100644 --- a/app/images/HMI_HVAC_ChairIndicator_One.svg +++ b/app/images/HMI_HVAC_ChairIndicator_One.svg @@ -1,71 +1,31 @@ - - - -image/svg+xml + + + + + + + + + + + diff --git a/app/images/HMI_HVAC_ChairIndicator_Two.svg b/app/images/HMI_HVAC_ChairIndicator_Two.svg index 042b87d..b31cc90 100644 --- a/app/images/HMI_HVAC_ChairIndicator_Two.svg +++ b/app/images/HMI_HVAC_ChairIndicator_Two.svg @@ -1,77 +1,30 @@ - - - -image/svg+xml \ No newline at end of file + + + + + + + + + + +]> + + + + + + + + + + + + + diff --git a/app/images/HMI_HVAC_Circulation_Active.svg b/app/images/HMI_HVAC_Circulation_Active.svg index 8a15033..def92bb 100644 --- a/app/images/HMI_HVAC_Circulation_Active.svg +++ b/app/images/HMI_HVAC_Circulation_Active.svg @@ -1,49 +1,19 @@ - - - -image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/images/HMI_HVAC_Fan_Icon.svg b/app/images/HMI_HVAC_Fan_Icon.svg index 2676ba1..ee583a0 100644 --- a/app/images/HMI_HVAC_Fan_Icon.svg +++ b/app/images/HMI_HVAC_Fan_Icon.svg @@ -1,81 +1,46 @@ - - - -image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/app/images/HMI_HVAC_Front_Active.svg b/app/images/HMI_HVAC_Front_Active.svg index 2c873de..146e509 100644 --- a/app/images/HMI_HVAC_Front_Active.svg +++ b/app/images/HMI_HVAC_Front_Active.svg @@ -1,111 +1,75 @@ - - - -image/svg+xml + + + + + FRONT + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/images/HMI_HVAC_Inactive.svg b/app/images/HMI_HVAC_Inactive.svg index b29a74f..2956a26 100644 --- a/app/images/HMI_HVAC_Inactive.svg +++ b/app/images/HMI_HVAC_Inactive.svg @@ -1,63 +1,31 @@ - + - -image/svg+xml + + + + + + + + diff --git a/app/images/HMI_HVAC_Left_Chair_ON.svg b/app/images/HMI_HVAC_Left_Chair_ON.svg index 14faf49..b27b126 100644 --- a/app/images/HMI_HVAC_Left_Chair_ON.svg +++ b/app/images/HMI_HVAC_Left_Chair_ON.svg @@ -1,99 +1,59 @@ - - - -image/svg+xml \ No newline at end of file + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/images/HMI_HVAC_Rear_Active.svg b/app/images/HMI_HVAC_Rear_Active.svg index 7c67104..182ccbd 100644 --- a/app/images/HMI_HVAC_Rear_Active.svg +++ b/app/images/HMI_HVAC_Rear_Active.svg @@ -1,50 +1,20 @@ - - - -image/svg+xml + + + + REAR + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/images/HMI_HVAC_Right_Chair_ON.svg b/app/images/HMI_HVAC_Right_Chair_ON.svg index 319ef67..74b4861 100644 --- a/app/images/HMI_HVAC_Right_Chair_ON.svg +++ b/app/images/HMI_HVAC_Right_Chair_ON.svg @@ -1,100 +1,60 @@ - - - -image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.16.6