Code Review
/
apps
/
homescreen.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
homescreenhandler: use applaunchd for app activation
[apps/homescreen.git]
/
homescreen
/
qml
/
MediaAreaBlank.qml
diff --git
a/homescreen/qml/MediaAreaBlank.qml
b/homescreen/qml/MediaAreaBlank.qml
index
347c26a
..
7a9e8af
100644
(file)
--- a/
homescreen/qml/MediaAreaBlank.qml
+++ b/
homescreen/qml/MediaAreaBlank.qml
@@
-19,11
+19,12
@@
import QtQuick 2.2
import QtQuick.Layouts 1.1
import QtQuick.Controls 2.0
import AGL.Demo.Controls 1.0
import QtQuick.Layouts 1.1
import QtQuick.Controls 2.0
import AGL.Demo.Controls 1.0
+/*
import MasterVolume 1.0
import MasterVolume 1.0
+*/
Image {
Image {
- width: 1080
- height: 215
+ anchors.fill: parent
source: './images/Utility_Logo_Background-01.svg'
property bool displayVolume: false;
source: './images/Utility_Logo_Background-01.svg'
property bool displayVolume: false;
@@
-40,14
+41,14
@@
Image {
}
Image {
}
Image {
- id: logo_image
+
id: logo_image
anchors.centerIn: parent
source: './images/Utility_Logo_Grey-01.svg'
}
Timer {
id: volume_timer
anchors.centerIn: parent
source: './images/Utility_Logo_Grey-01.svg'
}
Timer {
id: volume_timer
- interval:
5
000; running: false; repeat: false
+ interval:
3
000; running: false; repeat: false
onTriggered: displayVolume = false
}
onTriggered: displayVolume = false
}
@@
-67,7
+68,7
@@
Image {
transitions: Transition {
NumberAnimation { property: "opacity"; duration: 500}
}
transitions: Transition {
NumberAnimation { property: "opacity"; duration: 500}
}
-
+/*
MasterVolume {
id: mv
objectName: "mv"
MasterVolume {
id: mv
objectName: "mv"
@@
-76,7
+77,7
@@
Image {
mv.open(bindingAddress);
}
}
mv.open(bindingAddress);
}
}
-
+*/
Item {
id: master_volume
anchors.fill: parent
Item {
id: master_volume
anchors.fill: parent
@@
-87,7
+88,7
@@
Image {
font.pixelSize: 36
anchors.horizontalCenter: parent.horizontalCenter
color: "white"
font.pixelSize: 36
anchors.horizontalCenter: parent.horizontalCenter
color: "white"
- text: qsTr("
Active
Volume")
+ text: qsTr("
Master
Volume")
}
RowLayout {
}
RowLayout {
@@
-107,8
+108,10
@@
Image {
to: 100
stepSize: 1
snapMode: Slider.SnapOnRelease
to: 100
stepSize: 1
snapMode: Slider.SnapOnRelease
+/*
onValueChanged: mv.volume = value
Component.onCompleted: value = mv.volume
onValueChanged: mv.volume = value
Component.onCompleted: value = mv.volume
+*/
onPressedChanged: {
if (pressed) {volume_timer.stop()}
else {volume_timer.restart()}
onPressedChanged: {
if (pressed) {volume_timer.stop()}
else {volume_timer.restart()}