Merge lp:~paulliu/unity8/fix-video-lens into lp:unity8

Proposed by Ying-Chun Liu
Status: Merged
Approved by: Michał Sawicz
Approved revision: 90
Merged at revision: 91
Proposed branch: lp:~paulliu/unity8/fix-video-lens
Merge into: lp:unity8
Diff against target: 158 lines (+34/-34)
7 files modified
Dash/Apps/ApplicationsFilterGrid.qml (+3/-3)
Dash/DashVideos.qml (+2/-2)
Dash/Music/CarouselDelegateMusic.qml (+1/-1)
Dash/Music/MusicFilterGrid.qml (+3/-3)
Dash/Video/CarouselDelegateVideo.qml (+1/-1)
Dash/Video/VideosFilterGrid.qml (+4/-4)
tests/qmltests/Dash/tst_FilterGrids.qml (+20/-20)
To merge this branch: bzr merge lp:~paulliu/unity8/fix-video-lens
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michal Hruby (community) Approve
Michał Sawicz Approve
Review via email: mp+173674@code.launchpad.net

Commit message

Fix references to scope data.

Description of the change

Fix the video lens.

To post a comment you must log in.
Michał Sawicz (saviq) :
review: Approve
Michal Hruby (mhr3) :
review: Approve
Francis Ginther (fginther) wrote :

Jenkins screwed up when running generic-mediumtests-runner-saucy, aborted so as to restart more quickly.

review: Approve (continuous-integration)
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Dash/Apps/ApplicationsFilterGrid.qml'
2--- Dash/Apps/ApplicationsFilterGrid.qml 2013-06-24 14:27:24 +0000
3+++ Dash/Apps/ApplicationsFilterGrid.qml 2013-07-09 11:05:29 +0000
4@@ -36,7 +36,7 @@
5 objectName: "delegate" + index
6 Application {
7 id: application
8- desktopFile: model.column_7 ? stripProtocol(model.column_7) : model.desktopFile // FIXME: this is temporary
9+ desktopFile: model.dndUri ? stripProtocol(model.dndUri) : model.desktopFile // FIXME: this is temporary
10
11 function stripProtocol(uri) {
12 var chunks = uri.split('file://')
13@@ -44,11 +44,11 @@
14 }
15 }
16
17- property string icon: model.column_1 ? model.column_1 : "../../graphics/applicationIcons/" + application.icon + ".png" // FIXME: this is temporary
18+ property string icon: model.icon ? model.icon : "../../graphics/applicationIcons/" + application.icon + ".png" // FIXME: this is temporary
19
20 width: filterGrid.cellWidth
21 height: filterGrid.cellHeight
22- text: model.column_5 ? model.column_5 : application.name // FIXME: this is temporary
23+ text: model.title ? model.title : application.name // FIXME: this is temporary
24 imageWidth: units.gu(8)
25 imageHeight: units.gu(7.5)
26 source: IconUtil.from_gicon(icon)
27
28=== modified file 'Dash/DashVideos.qml'
29--- Dash/DashVideos.qml 2013-07-02 15:43:20 +0000
30+++ Dash/DashVideos.qml 2013-07-09 11:05:29 +0000
31@@ -120,8 +120,8 @@
32 // VideosCarousel and VideosFilterGrid have different
33 // clicked signals, accomodate for that
34 if (categoryId == 1) {
35- var fileUri = delegateItem.model.column_0.replace(/^[^:]+:/, "")
36- dataItem = {fileUri: fileUri, nfoUri: delegateItem.model.column_6}
37+ var fileUri = delegateItem.model.uri.replace(/^[^:]+:/, "")
38+ dataItem = {fileUri: fileUri, nfoUri: delegateItem.model.comment}
39 } else {
40 dataItem = data;
41 }
42
43=== modified file 'Dash/Music/CarouselDelegateMusic.qml'
44--- Dash/Music/CarouselDelegateMusic.qml 2013-06-05 22:03:08 +0000
45+++ Dash/Music/CarouselDelegateMusic.qml 2013-07-09 11:05:29 +0000
46@@ -28,7 +28,7 @@
47 image: Image {
48 asynchronous: true
49 sourceSize { width: item.width; height: item.height }
50- source: model ? model.column_1 : ""
51+ source: model ? model.icon : ""
52 }
53 }
54
55
56=== modified file 'Dash/Music/MusicFilterGrid.qml'
57--- Dash/Music/MusicFilterGrid.qml 2013-06-14 20:57:40 +0000
58+++ Dash/Music/MusicFilterGrid.qml 2013-07-09 11:05:29 +0000
59@@ -38,9 +38,9 @@
60 height: filterGrid.cellHeight
61 iconWidth: filterGrid.iconWidth
62 iconHeight: filterGrid.iconHeight
63- artist: model.column_5
64- album: model.column_6
65- source: model.column_1
66+ artist: model.title
67+ album: model.comment
68+ source: model.icon
69 onClicked: {
70 filterGrid.clicked(index);
71 }
72
73=== modified file 'Dash/Video/CarouselDelegateVideo.qml'
74--- Dash/Video/CarouselDelegateVideo.qml 2013-06-05 22:03:08 +0000
75+++ Dash/Video/CarouselDelegateVideo.qml 2013-07-09 11:05:29 +0000
76@@ -28,7 +28,7 @@
77 image: Image {
78 asynchronous: true
79 sourceSize { width: item.width; height: item.height }
80- source: model ? model.column_1 : ""
81+ source: model ? model.icon : ""
82 }
83 }
84
85
86=== modified file 'Dash/Video/VideosFilterGrid.qml'
87--- Dash/Video/VideosFilterGrid.qml 2013-06-14 20:57:40 +0000
88+++ Dash/Video/VideosFilterGrid.qml 2013-07-09 11:05:29 +0000
89@@ -37,14 +37,14 @@
90 objectName: "delegate" + index
91 width: filtergrid.cellWidth
92 height: filtergrid.cellHeight
93- text: model.column_5
94+ text: model.title
95 imageWidth: filtergrid.iconWidth
96 imageHeight: filtergrid.iconHeight
97- source: model.column_1
98+ source: model.icon
99 fillMode: Image.PreserveAspectCrop
100 onClicked: {
101- var fileUri = model.column_0.replace(/^[^:]+:/, "")
102- var data = {fileUri: fileUri, nfoUri: model.column_6}
103+ var fileUri = model.uri.replace(/^[^:]+:/, "")
104+ var data = {fileUri: fileUri, nfoUri: model.comment}
105 filtergrid.clicked(index, data, tile.y);
106 }
107 }
108
109=== modified file 'tests/qmltests/Dash/tst_FilterGrids.qml'
110--- tests/qmltests/Dash/tst_FilterGrids.qml 2013-06-14 13:54:08 +0000
111+++ tests/qmltests/Dash/tst_FilterGrids.qml 2013-07-09 11:05:29 +0000
112@@ -53,26 +53,26 @@
113
114 ListModel {
115 id: fakeModel
116- ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item0"; column_5: ""; column_6: "dummy.desktop" }
117- ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item1"; column_5: ""; column_6: "dummy.desktop" }
118- ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item2"; column_5: ""; column_6: "dummy.desktop" }
119- ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item3"; column_5: ""; column_6: "dummy.desktop" }
120- ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item4"; column_5: ""; column_6: "dummy.desktop" }
121- ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item5"; column_5: ""; column_6: "dummy.desktop" }
122- ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item6"; column_5: ""; column_6: "dummy.desktop" }
123- ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item7"; column_5: ""; column_6: "dummy.desktop" }
124- ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item8"; column_5: ""; column_6: "dummy.desktop" }
125- ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item9"; column_5: ""; column_6: "dummy.desktop" }
126- ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item10"; column_5: ""; column_6: "dummy.desktop" }
127- ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item11"; column_5: ""; column_6: "dummy.desktop" }
128- ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item12"; column_5: ""; column_6: "dummy.desktop" }
129- ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item13"; column_5: ""; column_6: "dummy.desktop" }
130- ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item14"; column_5: ""; column_6: "dummy.desktop" }
131- ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item15"; column_5: ""; column_6: "dummy.desktop" }
132- ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item16"; column_5: ""; column_6: "dummy.desktop" }
133- ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item17"; column_5: ""; column_6: "dummy.desktop" }
134- ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item18"; column_5: ""; column_6: "dummy.desktop" }
135- ListElement { column_0: "Column0"; column_1: "../../graphics/clock.png"; column_4: "Item19"; column_5: ""; column_6: "dummy.desktop" }
136+ ListElement { icon: "../../graphics/clock.png"; title: "Item0"; comment: ""; uri: "dummy.desktop"; dndUri: "dummy.desktop" }
137+ ListElement { icon: "../../graphics/clock.png"; title: "Item1"; comment: ""; uri: "dummy.desktop"; dndUri: "dummy.desktop" }
138+ ListElement { icon: "../../graphics/clock.png"; title: "Item2"; comment: ""; uri: "dummy.desktop"; dndUri: "dummy.desktop" }
139+ ListElement { icon: "../../graphics/clock.png"; title: "Item3"; comment: ""; uri: "dummy.desktop"; dndUri: "dummy.desktop" }
140+ ListElement { icon: "../../graphics/clock.png"; title: "Item4"; comment: ""; uri: "dummy.desktop"; dndUri: "dummy.desktop" }
141+ ListElement { icon: "../../graphics/clock.png"; title: "Item5"; comment: ""; uri: "dummy.desktop"; dndUri: "dummy.desktop" }
142+ ListElement { icon: "../../graphics/clock.png"; title: "Item6"; comment: ""; uri: "dummy.desktop"; dndUri: "dummy.desktop" }
143+ ListElement { icon: "../../graphics/clock.png"; title: "Item7"; comment: ""; uri: "dummy.desktop"; dndUri: "dummy.desktop" }
144+ ListElement { icon: "../../graphics/clock.png"; title: "Item8"; comment: ""; uri: "dummy.desktop"; dndUri: "dummy.desktop" }
145+ ListElement { icon: "../../graphics/clock.png"; title: "Item9"; comment: ""; uri: "dummy.desktop"; dndUri: "dummy.desktop" }
146+ ListElement { icon: "../../graphics/clock.png"; title: "Item10"; comment: ""; uri: "dummy.desktop"; dndUri: "dummy.desktop" }
147+ ListElement { icon: "../../graphics/clock.png"; title: "Item11"; comment: ""; uri: "dummy.desktop"; dndUri: "dummy.desktop" }
148+ ListElement { icon: "../../graphics/clock.png"; title: "Item12"; comment: ""; uri: "dummy.desktop"; dndUri: "dummy.desktop" }
149+ ListElement { icon: "../../graphics/clock.png"; title: "Item13"; comment: ""; uri: "dummy.desktop"; dndUri: "dummy.desktop" }
150+ ListElement { icon: "../../graphics/clock.png"; title: "Item14"; comment: ""; uri: "dummy.desktop"; dndUri: "dummy.desktop" }
151+ ListElement { icon: "../../graphics/clock.png"; title: "Item15"; comment: ""; uri: "dummy.desktop"; dndUri: "dummy.desktop" }
152+ ListElement { icon: "../../graphics/clock.png"; title: "Item16"; comment: ""; uri: "dummy.desktop"; dndUri: "dummy.desktop" }
153+ ListElement { icon: "../../graphics/clock.png"; title: "Item17"; comment: ""; uri: "dummy.desktop"; dndUri: "dummy.desktop" }
154+ ListElement { icon: "../../graphics/clock.png"; title: "Item18"; comment: ""; uri: "dummy.desktop"; dndUri: "dummy.desktop" }
155+ ListElement { icon: "../../graphics/clock.png"; title: "Item19"; comment: ""; uri: "dummy.desktop"; dndUri: "dummy.desktop" }
156 }
157
158 Rectangle {

Subscribers

People subscribed via source and target branches