git.iko.soy/unity8
on xenial help sign in
tweaks as review
commit25d309aeb0297ab4240e507a71b4fcbcc064b8a7 authorAndrea Cimitan <andrea.cimitan@gmail.com> dateThu 9 Jun 2016, 10:45 (10 years ago) parente521b57
8 files changed+8−19
compare with xenial
unifiedsplit
qml/Components/LazyImage.qml+1−1 qml/Components/MediaServices/MediaServices.qml+2−9 qml/Components/MediaServices/MediaServicesHeader.qml−1 qml/Components/MediaServices/VideoPlayerControls.qml+1−3 qml/Components/SharingPicker.qml+1−1 qml/Dash/Previews/PreviewWidgetFactory.qml+1−1 tests/mocks/QtMultimedia/mediaplayer.cpp−1 tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml+2−2
qml/Components/LazyImage.qml+1−1
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2013-2016 Canonical, Ltd.
33 *
44 * Authors:
55 * Michał Sawicz <michal.sawicz@canonical.com>
qml/Components/MediaServices/MediaServices.qml+2−9
@@ -341,7 +341,7 @@ FocusScope {
341341 when: priv.fullscreen
342342 ParentChange { target: root; parent: rootItem; x: 0; y: 0; width: parent.width; }
343343 PropertyChanges { target: root; implicitHeight: root.parent ? root.parent.height : 0; }
344− PropertyChanges { target: fullscreenAction; iconName: "view-restore" }
344+ PropertyChanges { target: fullscreenAction; iconName: "view-restore"; }
345345 }
346346 ]
347347
@@ -356,7 +356,7 @@ FocusScope {
356356 id: priv
357357
358358 property bool fullscreen: false
359− property bool controlTimerActive: false
359+ property alias controlTimerActive: controlHideTimer.running
360360 property bool forceControlsShown: false
361361 }
362362
@@ -365,13 +365,6 @@ FocusScope {
365365 objectName: "controlHideTimer"
366366 interval: 4000
367367 running: false
368−
369− onRunningChanged: {
370− if (running) {
371− priv.controlTimerActive = true;
372− }
373− }
374− onTriggered: priv.controlTimerActive = false;
375368 }
376369
377370 Action {
qml/Components/MediaServices/MediaServicesHeader.qml−1
@@ -37,7 +37,6 @@ Item {
3737 }
3838 spacing: units.gu(2)
3939
40− // eater
4140 AbstractButton {
4241 id: navigationButton
4342 objectName: "navigationButton"
qml/Components/MediaServices/VideoPlayerControls.qml+1−3
@@ -106,8 +106,7 @@ MediaServicesControls {
106106 }
107107
108108 onValueChanged: {
109− if (!pressed) return;
110− if (slider.valueGuard) return;
109+ if (!pressed || slider.valueGuard) return;
111110
112111 slider.valueGuard = true;
113112 mediaPlayer.seek(value);
@@ -120,7 +119,6 @@ MediaServicesControls {
120119 wasPlaying = mediaPlayer.playbackState === MediaPlayer.PlayingState
121120 mediaPlayer.pause();
122121 } else {
123−
124122 positionLabel.text = priv.formatProgress(mediaPlayer.position);
125123 if (wasPlaying) {
126124 mediaPlayer.play();
qml/Components/SharingPicker.qml+1−1
@@ -29,7 +29,7 @@ Item {
2929 readonly property Item rootItem: QuickUtils.rootItem(root)
3030
3131 function showPeerPicker() {
32− peerPicker.visible = true
32+ peerPicker.visible = true;
3333 }
3434
3535 function createExportedItems(url) {
qml/Dash/Previews/PreviewWidgetFactory.qml+1−1
@@ -76,7 +76,7 @@ Loader {
7676 case "video": {
7777 if (!widgetData) return "";
7878 var source = widgetData.hasOwnProperty("source") ? widgetData["source"].toString() : "";
79− if (source.match("^http") !== null) {
79+ if (source.match("^https{0,1}\:") !== null) {
8080 return "PreviewVideoPlayback.qml";
8181 }
8282 return "PreviewInlineVideo.qml";
tests/mocks/QtMultimedia/mediaplayer.cpp−1
@@ -227,7 +227,6 @@ QObject *MediaPlayer::metaData() const
227227}
228228
229229
230−
231230MediaDataSource::MediaDataSource(QObject *parent)
232231 : QObject(parent)
233232 , m_seekable(true)
tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml+2−2
@@ -88,8 +88,8 @@ Rectangle {
8888 { tag: "Rating Display", data: { type: "reviews" }, source: "PreviewRatingDisplay.qml", expanded: true },
8989 { tag: "Table", data: { type: "table" }, source: "PreviewTable.qml", expanded: true },
9090 { tag: "Text", data: { type: "text" }, source: "PreviewTextSummary.qml", expanded: true },
91− { tag: "Video", data: { type: "video" }, source: "PreviewInlineVideo.qml", expanded: true },
92− { tag: "Video", data: { type: "video", source: "http://demo" }, source: "PreviewVideoPlayback.qml", expanded: true },
91+ { tag: "Video Inline", data: { type: "video", source: "httpDemo" }, source: "PreviewInlineVideo.qml", expanded: true },
92+ { tag: "Video", data: { type: "video", source: "https://demo" }, source: "PreviewVideoPlayback.qml", expanded: true },
9393 ];
9494 }
9595