git.iko.soy/unity8
on xenial help sign in
tweaks as review
25d309aAndrea Cimitan
qml/Components/LazyImage.qml+1−1
compare with xenial
unifiedsplit
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2013-2016 Canonical, Ltd.
3 *
3 *
4 * Authors:
4 * Authors:
5 * Michał Sawicz <michal.sawicz@canonical.com>
5 * Michał Sawicz <michal.sawicz@canonical.com>
qml/Components/MediaServices/MediaServices.qml+2−9
@@ -341,7 +341,7 @@ FocusScope {
341 when: priv.fullscreen
341 when: priv.fullscreen
342 ParentChange { target: root; parent: rootItem; x: 0; y: 0; width: parent.width; }
342 ParentChange { target: root; parent: rootItem; x: 0; y: 0; width: parent.width; }
343 PropertyChanges { target: root; implicitHeight: root.parent ? root.parent.height : 0; }
343 PropertyChanges { target: root; implicitHeight: root.parent ? root.parent.height : 0; }
344− PropertyChanges { target: fullscreenAction; iconName: "view-restore" }
344+ PropertyChanges { target: fullscreenAction; iconName: "view-restore"; }
345 }
345 }
346 ]
346 ]
347
347
@@ -356,7 +356,7 @@ FocusScope {
356 id: priv
356 id: priv
357
357
358 property bool fullscreen: false
358 property bool fullscreen: false
359− property bool controlTimerActive: false
359+ property alias controlTimerActive: controlHideTimer.running
360 property bool forceControlsShown: false
360 property bool forceControlsShown: false
361 }
361 }
362
362
@@ -365,13 +365,6 @@ FocusScope {
365 objectName: "controlHideTimer"
365 objectName: "controlHideTimer"
366 interval: 4000
366 interval: 4000
367 running: false
367 running: false
368−
369− onRunningChanged: {
370− if (running) {
371− priv.controlTimerActive = true;
372− }
373− }
374− onTriggered: priv.controlTimerActive = false;
375 }
368 }
376
369
377 Action {
370 Action {
qml/Components/MediaServices/MediaServicesHeader.qml−1
@@ -37,7 +37,6 @@ Item {
37 }
37 }
38 spacing: units.gu(2)
38 spacing: units.gu(2)
39
39
40− // eater
41 AbstractButton {
40 AbstractButton {
42 id: navigationButton
41 id: navigationButton
43 objectName: "navigationButton"
42 objectName: "navigationButton"
qml/Components/MediaServices/VideoPlayerControls.qml+1−3
@@ -106,8 +106,7 @@ MediaServicesControls {
106 }
106 }
107
107
108 onValueChanged: {
108 onValueChanged: {
109− if (!pressed) return;
110− if (slider.valueGuard) return;
109+ if (!pressed || slider.valueGuard) return;
111
110
112 slider.valueGuard = true;
111 slider.valueGuard = true;
113 mediaPlayer.seek(value);
112 mediaPlayer.seek(value);
@@ -120,7 +119,6 @@ MediaServicesControls {
120 wasPlaying = mediaPlayer.playbackState === MediaPlayer.PlayingState
119 wasPlaying = mediaPlayer.playbackState === MediaPlayer.PlayingState
121 mediaPlayer.pause();
120 mediaPlayer.pause();
122 } else {
121 } else {
123−
124 positionLabel.text = priv.formatProgress(mediaPlayer.position);
122 positionLabel.text = priv.formatProgress(mediaPlayer.position);
125 if (wasPlaying) {
123 if (wasPlaying) {
126 mediaPlayer.play();
124 mediaPlayer.play();
qml/Components/SharingPicker.qml+1−1
@@ -29,7 +29,7 @@ Item {
29 readonly property Item rootItem: QuickUtils.rootItem(root)
29 readonly property Item rootItem: QuickUtils.rootItem(root)
30
30
31 function showPeerPicker() {
31 function showPeerPicker() {
32− peerPicker.visible = true
32+ peerPicker.visible = true;
33 }
33 }
34
34
35 function createExportedItems(url) {
35 function createExportedItems(url) {
qml/Dash/Previews/PreviewWidgetFactory.qml+1−1
@@ -76,7 +76,7 @@ Loader {
76 case "video": {
76 case "video": {
77 if (!widgetData) return "";
77 if (!widgetData) return "";
78 var source = widgetData.hasOwnProperty("source") ? widgetData["source"].toString() : "";
78 var source = widgetData.hasOwnProperty("source") ? widgetData["source"].toString() : "";
79− if (source.match("^http") !== null) {
79+ if (source.match("^https{0,1}\:") !== null) {
80 return "PreviewVideoPlayback.qml";
80 return "PreviewVideoPlayback.qml";
81 }
81 }
82 return "PreviewInlineVideo.qml";
82 return "PreviewInlineVideo.qml";
tests/mocks/QtMultimedia/mediaplayer.cpp−1
@@ -227,7 +227,6 @@ QObject *MediaPlayer::metaData() const
227}
227}
228
228
229
229
230−
231MediaDataSource::MediaDataSource(QObject *parent)
230MediaDataSource::MediaDataSource(QObject *parent)
232 : QObject(parent)
231 : QObject(parent)
233 , m_seekable(true)
232 , m_seekable(true)
tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml+2−2
@@ -88,8 +88,8 @@ Rectangle {
88 { tag: "Rating Display", data: { type: "reviews" }, source: "PreviewRatingDisplay.qml", expanded: true },
88 { tag: "Rating Display", data: { type: "reviews" }, source: "PreviewRatingDisplay.qml", expanded: true },
89 { tag: "Table", data: { type: "table" }, source: "PreviewTable.qml", expanded: true },
89 { tag: "Table", data: { type: "table" }, source: "PreviewTable.qml", expanded: true },
90 { tag: "Text", data: { type: "text" }, source: "PreviewTextSummary.qml", expanded: true },
90 { tag: "Text", data: { type: "text" }, source: "PreviewTextSummary.qml", expanded: true },
91− { tag: "Video", data: { type: "video" }, source: "PreviewInlineVideo.qml", expanded: true },
91+ { tag: "Video Inline", data: { type: "video", source: "httpDemo" }, source: "PreviewInlineVideo.qml", expanded: true },
92− { tag: "Video", data: { type: "video", source: "http://demo" }, source: "PreviewVideoPlayback.qml", expanded: true },
92+ { tag: "Video", data: { type: "video", source: "https://demo" }, source: "PreviewVideoPlayback.qml", expanded: true },
93 ];
93 ];
94 }
94 }
95
95