From 87859dd6c048aa0384a9864f4e0a8936000f9699 Mon Sep 17 00:00:00 2001 From: Tadao Tanikawa Date: Fri, 15 Dec 2017 22:06:22 +0900 Subject: Update to new color scheme The color scheme of button/toggle and background image has been changed. Bug-AGL: SPEC-673 Change-Id: I44862566ab2d0a25b8eb3a31dba7a9380ac0d263 Signed-off-by: Tadao Tanikawa --- .../qtquickcontrols2aglstyle/ApplicationWindow.qml | 2 +- .../images/AGL_HMI_Background_NoCar-01.png | Bin 944767 -> 0 bytes .../images/AGL_HMI_Blue_Background_NoCar-01.png | Bin 0 -> 949053 bytes .../images/HMI_Settings_Button_Cancel.svg | 121 ++++++--------------- .../images/HMI_Settings_Button_Ok.svg | 121 ++++++--------------- .../images/HMI_Settings_Toggle_OFF.svg | 95 +++++----------- .../images/HMI_Settings_Toggle_ON.svg | 113 ++++++------------- 7 files changed, 130 insertions(+), 322 deletions(-) delete mode 100644 imports/qtquickcontrols2aglstyle/images/AGL_HMI_Background_NoCar-01.png create mode 100644 imports/qtquickcontrols2aglstyle/images/AGL_HMI_Blue_Background_NoCar-01.png diff --git a/imports/qtquickcontrols2aglstyle/ApplicationWindow.qml b/imports/qtquickcontrols2aglstyle/ApplicationWindow.qml index 04dd476..6ea9645 100644 --- a/imports/qtquickcontrols2aglstyle/ApplicationWindow.qml +++ b/imports/qtquickcontrols2aglstyle/ApplicationWindow.qml @@ -31,6 +31,6 @@ T.ApplicationWindow { anchors.fill: parent anchors.topMargin: -218 anchors.bottomMargin: -215 - source: './images/AGL_HMI_Background_NoCar-01.png' + source: './images/AGL_HMI_Blue_Background_NoCar-01.png' } } diff --git a/imports/qtquickcontrols2aglstyle/images/AGL_HMI_Background_NoCar-01.png b/imports/qtquickcontrols2aglstyle/images/AGL_HMI_Background_NoCar-01.png deleted file mode 100644 index 595f742..0000000 Binary files a/imports/qtquickcontrols2aglstyle/images/AGL_HMI_Background_NoCar-01.png and /dev/null differ diff --git a/imports/qtquickcontrols2aglstyle/images/AGL_HMI_Blue_Background_NoCar-01.png b/imports/qtquickcontrols2aglstyle/images/AGL_HMI_Blue_Background_NoCar-01.png new file mode 100644 index 0000000..357c204 Binary files /dev/null and b/imports/qtquickcontrols2aglstyle/images/AGL_HMI_Blue_Background_NoCar-01.png differ diff --git a/imports/qtquickcontrols2aglstyle/images/HMI_Settings_Button_Cancel.svg b/imports/qtquickcontrols2aglstyle/images/HMI_Settings_Button_Cancel.svg index 4251412..6d234fb 100644 --- a/imports/qtquickcontrols2aglstyle/images/HMI_Settings_Button_Cancel.svg +++ b/imports/qtquickcontrols2aglstyle/images/HMI_Settings_Button_Cancel.svg @@ -1,93 +1,36 @@ - - - -image/svg+xml + + + + + + + + + + + + + diff --git a/imports/qtquickcontrols2aglstyle/images/HMI_Settings_Button_Ok.svg b/imports/qtquickcontrols2aglstyle/images/HMI_Settings_Button_Ok.svg index dac68d8..c7831ff 100644 --- a/imports/qtquickcontrols2aglstyle/images/HMI_Settings_Button_Ok.svg +++ b/imports/qtquickcontrols2aglstyle/images/HMI_Settings_Button_Ok.svg @@ -1,93 +1,36 @@ - - - -image/svg+xml + + + + + + + + + + + + + diff --git a/imports/qtquickcontrols2aglstyle/images/HMI_Settings_Toggle_OFF.svg b/imports/qtquickcontrols2aglstyle/images/HMI_Settings_Toggle_OFF.svg index f448359..94fbf06 100644 --- a/imports/qtquickcontrols2aglstyle/images/HMI_Settings_Toggle_OFF.svg +++ b/imports/qtquickcontrols2aglstyle/images/HMI_Settings_Toggle_OFF.svg @@ -1,70 +1,35 @@ - + - -image/svg+xml + + + + + + + + + + + + + diff --git a/imports/qtquickcontrols2aglstyle/images/HMI_Settings_Toggle_ON.svg b/imports/qtquickcontrols2aglstyle/images/HMI_Settings_Toggle_ON.svg index 3ee9843..705e733 100644 --- a/imports/qtquickcontrols2aglstyle/images/HMI_Settings_Toggle_ON.svg +++ b/imports/qtquickcontrols2aglstyle/images/HMI_Settings_Toggle_ON.svg @@ -1,82 +1,39 @@ - - - -image/svg+xml + + + + + + + + + + + + + + + + + -- cgit 1.2.3-korg