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
Add gitreview file for Quirky Quillback branch
[apps/homescreen.git]
/
homescreen
/
qml
/
MediaAreaBlank.qml
diff --git
a/homescreen/qml/MediaAreaBlank.qml
b/homescreen/qml/MediaAreaBlank.qml
index
347c26a
..
b758a7d
100644
(file)
--- a/
homescreen/qml/MediaAreaBlank.qml
+++ b/
homescreen/qml/MediaAreaBlank.qml
@@
-22,8
+22,7
@@
import AGL.Demo.Controls 1.0
import MasterVolume 1.0
Image {
import MasterVolume 1.0
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
+39,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
}
@@
-72,9
+71,6
@@
Image {
id: mv
objectName: "mv"
onVolumeChanged: slider.value = volume
id: mv
objectName: "mv"
onVolumeChanged: slider.value = volume
- Component.onCompleted: {
- mv.open(bindingAddress);
- }
}
Item {
}
Item {
@@
-87,7
+83,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 {
@@
-109,6
+105,7
@@
Image {
snapMode: Slider.SnapOnRelease
onValueChanged: mv.volume = value
Component.onCompleted: value = mv.volume
snapMode: Slider.SnapOnRelease
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()}