1
=== modified file 'src/qml/MMS/PreviewerVideo.qml'
2
--- src/qml/MMS/PreviewerVideo.qml	2016-02-01 15:11:45 +0000
3
+++ src/qml/MMS/PreviewerVideo.qml	2016-02-01 15:11:45 +0000
4
@@ -27,6 +27,8 @@
5
27
Previewer {
27
Previewer {
6
28
    id: videoPreviewer
28
    id: videoPreviewer
7
29
29
8
30
    property size thumbnailSize: Qt.size(viewer.width * 1.05, viewer.height * 1.05)
9
31
10
30
    title: i18n.tr("Video Preview")
32
    title: i18n.tr("Video Preview")
11
31
    clip: true
33
    clip: true
12
32
34
13
@@ -37,6 +39,22 @@
14
37
    }
39
    }
15
38
    Component.onDestruction: application.fullscreen = false
40
    Component.onDestruction: application.fullscreen = false
16
39
41
17
42
    onWidthChanged: {
18
43
        // Only change thumbnailSize if width increases more than 5%
19
44
        // that way we do not reload image for small resizes
20
45
        if (width > thumbnailSize.width) {
21
46
            thumbnailSize = Qt.size(width * 1.05, height * 1.05);
22
47
        }
23
48
    }
24
49
25
50
    onHeightChanged: {
26
51
        // Only change thumbnailSize if height increases more than 5%
27
52
        // that way we do not reload image for small resizes
28
53
        if (height > thumbnailSize.height) {
29
54
            thumbnailSize = Qt.size(width * 1.05, height * 1.05);
30
55
        }
31
56
    }
32
57
33
40
    Connections {
58
    Connections {
34
41
        target: application
59
        target: application
35
42
        onFullscreenChanged: {
60
        onFullscreenChanged: {
36
@@ -94,6 +112,42 @@
37
94
                    anchors.fill: parent
112
                    anchors.fill: parent
38
95
                    source: player
113
                    source: player
39
96
                }
114
                }
40
115
41
116
                Rectangle {
42
117
                    id: thumbnail
43
118
44
119
                    anchors.fill: parent
45
120
                    visible: player.status == MediaPlayer.EndOfMedia
46
121
47
122
                    color: "black"
48
123
49
124
                    ActivityIndicator {
50
125
                        anchors.centerIn: parent
51
126
                        visible: running
52
127
                        running: image.status != Image.Ready
53
128
                    }
54
129
55
130
                    Image {
56
131
                        id: image
57
132
58
133
                        anchors.fill: parent
59
134
                        visible: status == Image.Ready
60
135
                        opacity: visible ? 1.0 : 0.0
61
136
                        Behavior on opacity { UbuntuNumberAnimation {} }
62
137
63
138
                        fillMode: Image.PreserveAspectFit
64
139
                        smooth: true
65
140
                        source: "image://thumbnailer/" + player.source.toString().replace("file://", "")
66
141
67
142
                        asynchronous: true
68
143
                        cache: true
69
144
70
145
                        sourceSize {
71
146
                            width: videoPreviewer.thumbnailSize.width
72
147
                            height: videoPreviewer.thumbnailSize.height
73
148
                        }
74
149
                    }
75
150
                }
76
97
            }
151
            }
77
98
        }
152
        }
78
99
    }
153
    }
Status:	Merged
Approved by:	Gustavo Pichorim Boiko on 2016-02-01
Approved revision:	489
Merged at revision:	506
Proposed branch:	lp:~phablet-team/messaging-app/add_thumbnail_to_video_previewer
Merge into:	lp:messaging-app
Prerequisite:	lp:~phablet-team/messaging-app/add-apparmor-profile
Diff against target:	78 lines (+54/-0) 1 file modified src/qml/MMS/PreviewerVideo.qml (+54/-0)
To merge this branch:	bzr merge lp:~phablet-team/messaging-app/add_thumbnail_to_video_previewer
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Gustavo Pichorim Boiko (community)		2016-01-29	Approve on 2016-02-01
PS Jenkins bot	continuous-integration		Needs Fixing on 2016-02-01
Review via email: mp+284442@code.launchpad.net