summaryrefslogtreecommitdiffstats
path: root/homescreen/qml
diff options
context:
space:
mode:
Diffstat (limited to 'homescreen/qml')
-rw-r--r--homescreen/qml/MediaArea.qml4
-rw-r--r--homescreen/qml/MediaAreaBlank.qml39
-rw-r--r--homescreen/qml/StatusArea.qml2
-rw-r--r--homescreen/qml/TopArea.qml12
4 files changed, 30 insertions, 27 deletions
diff --git a/homescreen/qml/MediaArea.qml b/homescreen/qml/MediaArea.qml
index 88eaf1e..0f0efb2 100644
--- a/homescreen/qml/MediaArea.qml
+++ b/homescreen/qml/MediaArea.qml
@@ -25,13 +25,13 @@ StackView {
initialItem: blank
Component {
- id: blank
+ id: blank
MediaAreaBlank {
// MouseArea {
// anchors.fill: parent
// onClicked: root.push(mouse.x < 540 ? music : radio)
// }
- }
+ }
}
Component {
diff --git a/homescreen/qml/MediaAreaBlank.qml b/homescreen/qml/MediaAreaBlank.qml
index c971f6e..cdaa1a0 100644
--- a/homescreen/qml/MediaAreaBlank.qml
+++ b/homescreen/qml/MediaAreaBlank.qml
@@ -18,8 +18,8 @@
import QtQuick 2.2
import QtQuick.Layouts 1.1
import QtQuick.Controls 2.0
-import AGL.Demo.Controls 1.0
-import MasterVolume 1.0
+//import AGL.Demo.Controls 1.0
+//import MasterVolume 1.0
Image {
anchors.fill: parent
@@ -55,13 +55,11 @@ Image {
PropertyChanges { target: master_volume; opacity: 1.0 }
PropertyChanges { target: slider; enabled: true }
PropertyChanges { target: logo_image; opacity: 0.0 }
- PropertyChanges { target: speech_chrome; visible: false }
},
State { when: !displayVolume;
PropertyChanges { target: master_volume; opacity: 0.0 }
PropertyChanges { target: slider; enabled: false }
PropertyChanges { target: logo_image; opacity: 1.0 }
- PropertyChanges { target: speech_chrome; visible: speech_chrome.agentPresent }
}
]
@@ -69,13 +67,18 @@ Image {
NumberAnimation { property: "opacity"; duration: 500}
}
- MasterVolume {
- id: mv
- objectName: "mv"
- onVolumeChanged: slider.value = volume
- Component.onCompleted: {
- mv.open(bindingAddress);
- }
+ //MasterVolume {
+ // id: mv
+ // objectName: "mv"
+ // onVolumeChanged: slider.value = volume
+ // Component.onCompleted: {
+ // mv.open(bindingAddress);
+ // }
+ //}
+
+ Item {
+ id: mv
+ property double volume: 0
}
Item {
@@ -123,11 +126,11 @@ Image {
}
}
- SpeechChrome {
- id: speech_chrome
- anchors.left: parent.left
- anchors.right: parent.right
- anchors.bottom: parent.bottom
- height: parent.height
- }
+ //SpeechChrome {
+ // id: speech_chrome
+ // anchors.left: parent.left
+ // anchors.right: parent.right
+ // anchors.bottom: parent.bottom
+ // height: parent.height
+ //}
}
diff --git a/homescreen/qml/StatusArea.qml b/homescreen/qml/StatusArea.qml
index 4a8fbc0..44ca5c7 100644
--- a/homescreen/qml/StatusArea.qml
+++ b/homescreen/qml/StatusArea.qml
@@ -18,7 +18,7 @@
import QtQuick 2.2
import QtQuick.Layouts 1.1
-import HomeScreen 1.0
+//import HomeScreen 1.0
Item {
id: root
diff --git a/homescreen/qml/TopArea.qml b/homescreen/qml/TopArea.qml
index 19bed91..c5f1759 100644
--- a/homescreen/qml/TopArea.qml
+++ b/homescreen/qml/TopArea.qml
@@ -34,12 +34,12 @@ Image {
Layout.fillHeight: true
Layout.preferredWidth: 775
}
- StatusArea {
- id: statusArea
- Layout.fillWidth: true
- Layout.fillHeight: true
- Layout.preferredWidth: 291
- }
+ //StatusArea {
+ // id: statusArea
+ // Layout.fillWidth: true
+ // Layout.fillHeight: true
+ // Layout.preferredWidth: 291
+ //}
}
Timer {