summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--homescreen/qml/MediaAreaMusic.qml2
-rw-r--r--homescreen/qml/MediaAreaRadio.qml2
-rw-r--r--homescreen/qml/StatusArea.qml2
-rw-r--r--homescreen/qml/bottompanel.qml7
-rw-r--r--homescreen/qml/main.qml156
-rw-r--r--homescreen/qml/qml.qrc1
-rw-r--r--homescreen/qml/toppanel.qml4
7 files changed, 9 insertions, 165 deletions
diff --git a/homescreen/qml/MediaAreaMusic.qml b/homescreen/qml/MediaAreaMusic.qml
index c0408e6..6d72003 100644
--- a/homescreen/qml/MediaAreaMusic.qml
+++ b/homescreen/qml/MediaAreaMusic.qml
@@ -21,7 +21,7 @@ import QtQuick.Controls 2.0
Image {
width: 1080
- height: 215
+ height: 216
source: './images/Utility_Music_Background-01.png'
ColumnLayout {
diff --git a/homescreen/qml/MediaAreaRadio.qml b/homescreen/qml/MediaAreaRadio.qml
index a49f06d..73ab073 100644
--- a/homescreen/qml/MediaAreaRadio.qml
+++ b/homescreen/qml/MediaAreaRadio.qml
@@ -19,6 +19,6 @@ import QtQuick 2.2
Image {
width: 1080
- height: 215
+ height: 216
source: './images/Utility_Radio_Background-01.png'
}
diff --git a/homescreen/qml/StatusArea.qml b/homescreen/qml/StatusArea.qml
index 507b6db..4a8fbc0 100644
--- a/homescreen/qml/StatusArea.qml
+++ b/homescreen/qml/StatusArea.qml
@@ -23,7 +23,7 @@ import HomeScreen 1.0
Item {
id: root
//width: 295
- //height: 218
+ //height: 216
property date now: new Date
Timer {
diff --git a/homescreen/qml/bottompanel.qml b/homescreen/qml/bottompanel.qml
index 1e0b105..6655ba8 100644
--- a/homescreen/qml/bottompanel.qml
+++ b/homescreen/qml/bottompanel.qml
@@ -4,10 +4,11 @@ import QtQuick.Window 2.13
Window {
id: bottompanel
width: Screen.width
- height: Screen.height * (215.0 / 1920.0)
+ height: 216
flags: Qt.FramelessWindowHint
visible: true
- //color: "#aaaa0000"
+ color: "#33363a"
+
MediaArea {
}
@@ -24,7 +25,7 @@ Window {
Item {
id: bottomInformation
width: parent.width
- height: 215
+ height: 216
anchors.bottom: parent.bottom
visible: false
Text {
diff --git a/homescreen/qml/main.qml b/homescreen/qml/main.qml
deleted file mode 100644
index 233ee4f..0000000
--- a/homescreen/qml/main.qml
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright (C) 2016 The Qt Company Ltd.
- * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import QtQuick 2.2
-import QtQuick.Window 2.1
-import QtQuick.Layouts 1.1
-import HomeScreen 1.0
-
-Window {
- visible: true
- flags: Qt.FramelessWindowHint
- width: container.width * container.scale
- height: container.height * container.scale
- title: 'HomeScreen'
-
- Image {
- id: container
- anchors.centerIn: parent
- width: 1080
- height: 1920
- scale: screenInfo.scale_factor()
- source: './images/AGL_HMI_Blue_Background_NoCar-01.png'
-
- ColumnLayout {
- anchors.fill: parent
- spacing: 0
- TopArea {
- id: topArea
- Layout.fillWidth: true
- Layout.preferredHeight: 218
- }
-
- Item {
- id: applicationArea
- Layout.fillWidth: true
- Layout.fillHeight: true
- Layout.preferredHeight: 1920 - 218 - 215
-
- visible: true
- }
-
- MediaArea {
- id: mediaArea
- Layout.fillWidth: true
- Layout.fillHeight: true
- Layout.preferredHeight: 215
- }
- }
- }
-
- Timer {
- id:informationTimer
- interval: 3000
- running: false
- repeat: true
- onTriggered: {
- bottomInformation.visible = false
- }
- }
-
- Item {
- id: bottomInformation
- width: parent.width
- height: 215
- anchors.bottom: parent.bottom
- visible: false
- Text {
- id: bottomText
- anchors.centerIn: parent
- font.pixelSize: 25
- font.letterSpacing: 5
- horizontalAlignment: Text.AlignHCenter
- color: "white"
- text: ""
- z:1
- }
- }
-
- Connections {
- target: homescreenHandler
- onShowInformation: {
- bottomText.text = info
- bottomInformation.visible = true
- informationTimer.restart()
- }
- }
-
- Timer {
- id:notificationTimer
- interval: 3000
- running: false
- repeat: true
- onTriggered: notificationItem.visible = false
- }
-
- Item {
- id: notificationItem
- x: 0
- y: 0
- z: 1
- width: 1280
- height: 100
- opacity: 0.8
- visible: false
-
- Rectangle {
- width: parent.width
- height: parent.height
- anchors.fill: parent
- color: "gray"
- Image {
- id: notificationIcon
- width: 70
- height: 70
- anchors.left: parent.left
- anchors.leftMargin: 20
- anchors.verticalCenter: parent.verticalCenter
- source: ""
- }
-
- Text {
- id: notificationtext
- font.pixelSize: 25
- anchors.left: notificationIcon.right
- anchors.leftMargin: 5
- anchors.verticalCenter: parent.verticalCenter
- color: "white"
- text: qsTr("")
- }
- }
- }
-
- Connections {
- target: homescreenHandler
- onShowNotification: {
- notificationIcon.source = icon_path
- notificationtext.text = text
- notificationItem.visible = true
- notificationTimer.restart()
- }
- }
-}
diff --git a/homescreen/qml/qml.qrc b/homescreen/qml/qml.qrc
index 8381337..801d0f4 100644
--- a/homescreen/qml/qml.qrc
+++ b/homescreen/qml/qml.qrc
@@ -1,6 +1,5 @@
<RCC>
<qresource prefix="/">
- <file>main.qml</file>
<file>MediaArea.qml</file>
<file>MediaAreaBlank.qml</file>
<file>MediaAreaMusic.qml</file>
diff --git a/homescreen/qml/toppanel.qml b/homescreen/qml/toppanel.qml
index b62a0d1..f1117ba 100644
--- a/homescreen/qml/toppanel.qml
+++ b/homescreen/qml/toppanel.qml
@@ -4,10 +4,10 @@ import QtQuick.Window 2.13
Window {
id: toppanel
width: Screen.width
- height: Screen.height * (218.0 / 1920.0)
+ height: 216
flags: Qt.FramelessWindowHint
visible: true
- //color: "#aaaa0000"
+ color: "#33363a"
TopArea {
}