1
=== modified file 'debian/control'
2
--- debian/control	2016-03-04 21:03:43 +0000
3
+++ debian/control	2016-03-10 16:53:55 +0000
4
@@ -55,7 +55,7 @@
5
55
               qtdeclarative5-qtmultimedia-plugin (>= 5.4.1-1ubuntu19~overlay2),
55
               qtdeclarative5-qtmultimedia-plugin (>= 5.4.1-1ubuntu19~overlay2),
6
56
               qtdeclarative5-ubuntu-content1,
56
               qtdeclarative5-ubuntu-content1,
7
57
               qtdeclarative5-ubuntu-settings-components (>= 0.7),
57
               qtdeclarative5-ubuntu-settings-components (>= 0.7),
9
58
               qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1796) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1796),
58
               qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
10
59
               qtdeclarative5-ubuntu-web-plugin,
59
               qtdeclarative5-ubuntu-web-plugin,
11
60
               ttf-ubuntu-font-family,
60
               ttf-ubuntu-font-family,
12
61
Standards-Version: 3.9.4
61
Standards-Version: 3.9.4
13
@@ -70,7 +70,7 @@
14
70
Package: indicators-client
70
Package: indicators-client
15
71
Architecture: amd64 armhf i386
71
Architecture: amd64 armhf i386
16
72
Depends: qmenumodel-qml (>= 0.2.9),
72
Depends: qmenumodel-qml (>= 0.2.9),
18
73
         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1796) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1796),
73
         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
19
74
         unity8 (= ${binary:Version}),
74
         unity8 (= ${binary:Version}),
20
75
         ${misc:Depends},
75
         ${misc:Depends},
21
76
         ${shlibs:Depends},
76
         ${shlibs:Depends},
22
@@ -128,7 +128,7 @@
23
128
Depends: qml-module-qtquick-layouts,
128
Depends: qml-module-qtquick-layouts,
24
129
         qtdeclarative5-ubuntu-settings-components (>= 0.7),
129
         qtdeclarative5-ubuntu-settings-components (>= 0.7),
25
130
         qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
130
         qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
27
131
         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1796) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1796),
131
         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
28
132
         qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
132
         qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
29
133
         ubuntu-thumbnailer-impl-0,
133
         ubuntu-thumbnailer-impl-0,
30
134
         unity-application-impl-13,
134
         unity-application-impl-13,
31
@@ -158,7 +158,7 @@
32
158
         python3-fixtures,
158
         python3-fixtures,
33
159
         python3-gi,
159
         python3-gi,
34
160
         qttestability-autopilot (>= 1.4),
160
         qttestability-autopilot (>= 1.4),
36
161
         ubuntu-ui-toolkit-autopilot (>= 1.3.1796),
161
         ubuntu-ui-toolkit-autopilot (>= 1.3.1845),
37
162
         unity-scope-click,
162
         unity-scope-click,
38
163
         unity8 (= ${source:Version}),
163
         unity8 (= ${source:Version}),
39
164
         unity8-fake-env (= ${source:Version}),
164
         unity8-fake-env (= ${source:Version}),
40
165
165
41
=== modified file 'plugins/Dash/AudioProgressBar.qml'
42
--- plugins/Dash/AudioProgressBar.qml	2015-12-03 14:44:08 +0000
43
+++ plugins/Dash/AudioProgressBar.qml	2016-03-10 16:53:55 +0000
44
@@ -31,6 +31,7 @@
45
31
        anchors { left: parent.left; right: parent.right }
31
        anchors { left: parent.left; right: parent.right }
46
32
        height: units.dp(6)
32
        height: units.dp(6)
47
33
        source: "graphics/music_progress_bg.png"
33
        source: "graphics/music_progress_bg.png"
48
34
        asynchronous: true
49
34
        sourceSize.width: width
35
        sourceSize.width: width
50
35
        sourceSize.height: height
36
        sourceSize.height: height
51
36
    }
37
    }
52
37
38
53
=== modified file 'plugins/Dash/CardCreator.js'
54
--- plugins/Dash/CardCreator.js	2016-03-10 16:53:55 +0000
55
+++ plugins/Dash/CardCreator.js	2016-03-10 16:53:55 +0000
56
@@ -146,6 +146,7 @@
57
146
// %1 is anchors.fill
146
// %1 is anchors.fill
58
147
// %2 is width
147
// %2 is width
59
148
// %3 is height
148
// %3 is height
60
149
// %4 is whether the icon should be asynchronous or not
61
149
var kAudioButtonCode = 'AbstractButton { \n\
150
var kAudioButtonCode = 'AbstractButton { \n\
62
150
                            id: audioButton; \n\
151
                            id: audioButton; \n\
63
151
                            anchors.fill: %1; \n\
152
                            anchors.fill: %1; \n\
64
@@ -171,6 +172,7 @@
65
171
                                opacity: 0.9; \n\
172
                                opacity: 0.9; \n\
66
172
                                name: DashAudioPlayer.playing && AudioUrlComparer.compare(parent.source, DashAudioPlayer.currentSource) ? "media-playback-pause" : "media-playback-start"; \n\
173
                                name: DashAudioPlayer.playing && AudioUrlComparer.compare(parent.source, DashAudioPlayer.currentSource) ? "media-playback-pause" : "media-playback-start"; \n\
67
173
                                color: "white"; \n\
174
                                color: "white"; \n\
68
175
                                asynchronous: %4; \n\
69
174
                            } \n\
176
                            } \n\
70
175
                            onClicked: { \n\
177
                            onClicked: { \n\
71
176
                                if (AudioUrlComparer.compare(source, DashAudioPlayer.currentSource)) { \n\
178
                                if (AudioUrlComparer.compare(source, DashAudioPlayer.currentSource)) { \n\
72
@@ -818,7 +820,7 @@
73
818
            audioButtonHeight = isCardTool ? 'headerHeight + 2 * units.gu(1)'
820
            audioButtonHeight = isCardTool ? 'headerHeight + 2 * units.gu(1)'
74
819
                                           : 'root.fixedHeaderHeight + 2 * units.gu(1)';
821
                                           : 'root.fixedHeaderHeight + 2 * units.gu(1)';
75
820
        }
822
        }
77
821
        code += kAudioButtonCode.arg(audioButtonAnchorsFill).arg(audioButtonWidth).arg(audioButtonHeight);
823
        code += kAudioButtonCode.arg(audioButtonAnchorsFill).arg(audioButtonWidth).arg(audioButtonHeight).arg(asynchronous);
78
822
    }
824
    }
79
823
825
80
824
    if (hasSummary) {
826
    if (hasSummary) {
81
825
827
82
=== modified file 'tests/plugins/Dash/cardcreator/9.res'
83
--- tests/plugins/Dash/cardcreator/9.res	2016-03-10 16:53:55 +0000
84
+++ tests/plugins/Dash/cardcreator/9.res	2016-03-10 16:53:55 +0000
85
@@ -91,7 +91,8 @@
86
91
                                opacity: 0.9; 
91
                                opacity: 0.9; 
87
92
                                name: DashAudioPlayer.playing && AudioUrlComparer.compare(parent.source, DashAudioPlayer.currentSource) ? "media-playback-pause" : "media-playback-start"; 
92
                                name: DashAudioPlayer.playing && AudioUrlComparer.compare(parent.source, DashAudioPlayer.currentSource) ? "media-playback-pause" : "media-playback-start"; 
88
93
                                color: "white"; 
93
                                color: "white"; 
90
94
                            } 
94
                                asynchronous: true; 
91
95
                            }
92
95
                            onClicked: { 
96
                            onClicked: { 
93
96
                                if (AudioUrlComparer.compare(source, DashAudioPlayer.currentSource)) { 
97
                                if (AudioUrlComparer.compare(source, DashAudioPlayer.currentSource)) { 
94
97
                                    if (DashAudioPlayer.playing) { 
98
                                    if (DashAudioPlayer.playing) { 
95
98
99
96
=== modified file 'tests/plugins/Dash/cardcreator/9.res.cardcreator'
97
--- tests/plugins/Dash/cardcreator/9.res.cardcreator	2016-03-10 16:53:55 +0000
98
+++ tests/plugins/Dash/cardcreator/9.res.cardcreator	2016-03-10 16:53:55 +0000
99
@@ -90,6 +90,7 @@
100
90
                                opacity: 0.9; 
90
                                opacity: 0.9; 
101
91
                                name: DashAudioPlayer.playing && AudioUrlComparer.compare(parent.source, DashAudioPlayer.currentSource) ? "media-playback-pause" : "media-playback-start"; 
91
                                name: DashAudioPlayer.playing && AudioUrlComparer.compare(parent.source, DashAudioPlayer.currentSource) ? "media-playback-pause" : "media-playback-start"; 
102
92
                                color: "white"; 
92
                                color: "white"; 
103
93
                                asynchronous: false;
104
93
                            } 
94
                            } 
105
94
                            onClicked: { 
95
                            onClicked: { 
106
95
                                if (AudioUrlComparer.compare(source, DashAudioPlayer.currentSource)) { 
96
                                if (AudioUrlComparer.compare(source, DashAudioPlayer.currentSource)) {
Reviewer	Review Type	Date Requested	Status
Andrea Cimitan (community)		2016-03-10	Approve on 2016-03-10
Unity8 CI Bot	continuous-integration	2016-03-10	Pending
PS Jenkins bot	continuous-integration	2016-03-10	Pending
Review via email: mp+288671@code.launchpad.net