Unity 8

Merge lp:~aacid/unity8/remove_unusued_dash_videos_music into lp:unity8

  1. remove_unusued_dash_videos_music
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Michał Sawicz
Approved revision: 435
Merged at revision: 436
Proposed branch: lp:~aacid/unity8/remove_unusued_dash_videos_music
Merge into: lp:unity8
Diff against target: 389 lines (+5/-332)
4 files modified
Dash/DashMusic.qml (+0/-96)
Dash/DashVideos.qml (+0/-201)
Dash/ScopeDelegateMapper.qml (+2/-4)
po/unity8.pot (+3/-31)
To merge this branch: bzr merge lp:~aacid/unity8/remove_unusued_dash_videos_music
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Michał Sawicz Approve
Review via email: mp+190588@code.launchpad.net

Commit message

Remove unused DashMusic/DashVideos

To post a comment you must log in.
Revision history for this message
Michał Sawicz (saviq) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:435
http://jenkins.qa.ubuntu.com/job/unity8-ci/1359/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4938/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2834
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2225
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/382
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1359
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1359/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1358/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1114/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/813
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/813/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2836
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2836/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2358
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2398

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1359/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'Dash/DashMusic.qml'
2--- Dash/DashMusic.qml 2013-07-26 23:27:50 +0000
3+++ Dash/DashMusic.qml 1970-01-01 00:00:00 +0000
4@@ -1,96 +0,0 @@
5-/*
6- * Copyright (C) 2013 Canonical, Ltd.
7- *
8- * This program is free software; you can redistribute it and/or modify
9- * it under the terms of the GNU General Public License as published by
10- * the Free Software Foundation; version 3.
11- *
12- * This program is distributed in the hope that it will be useful,
13- * but WITHOUT ANY WARRANTY; without even the implied warranty of
14- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15- * GNU General Public License for more details.
16- *
17- * You should have received a copy of the GNU General Public License
18- * along with this program. If not, see <http://www.gnu.org/licenses/>.
19- */
20-
21-import QtQuick 2.0
22-import Ubuntu.Components 0.1
23-import "../Components"
24-import "../Components/ListItems" as ListItems
25-import "Music"
26-
27-ScopeView {
28- id: scopeView
29-
30- property var categoryNames: [
31- i18n.tr("Featured"),
32- i18n.tr("Recent"),
33- i18n.tr("New Releases"),
34- i18n.tr("Top Charting")
35- ]
36-
37- onIsCurrentChanged: {
38- pageHeader.resetSearch();
39- }
40-
41- onMovementStarted: categoryView.showHeader()
42-
43- Binding {
44- target: scopeView.scope
45- property: "searchQuery"
46- value: pageHeader.searchQuery
47- }
48-
49- Connections {
50- target: panel
51- onSearchClicked: if (isCurrent) {
52- pageHeader.triggerSearch()
53- categoryView.showHeader()
54- }
55- }
56-
57- function getRenderer(categoryId) {
58- switch (categoryId) {
59- case "featured": return "Music/MusicCarousel.qml"
60- default: return "Music/MusicFilterGrid.qml"
61- }
62- }
63-
64- ScopeListView {
65- id: categoryView
66- anchors.fill: parent
67- model: scopeView.categories
68-
69- onAtYEndChanged: if (atYEnd) endReached()
70- onMovingChanged: if (moving && atYEnd) endReached()
71-
72- delegate: ListItems.Base {
73- id: base
74- highlightWhenPressed: false
75-
76- property string categoryId: model.categoryId
77-
78- Loader {
79- anchors { top: parent.top; left: parent.left; right: parent.right }
80- source: scopeView.getRenderer(base.categoryId)
81- onLoaded: {
82- item.model = results
83- }
84- }
85- }
86-
87- sectionProperty: "name"
88- sectionDelegate: ListItems.Header {
89- width: categoryView.width
90- text: i18n.tr(section)
91- }
92- pageHeader: PageHeader {
93- id: pageHeader
94- width: categoryView.width
95- text: i18n.tr("Music")
96- searchEntryEnabled: true
97- searchHistory: scopeView.searchHistory
98- }
99- }
100-}
101
102=== removed file 'Dash/DashVideos.qml'
103--- Dash/DashVideos.qml 2013-07-31 09:27:56 +0000
104+++ Dash/DashVideos.qml 1970-01-01 00:00:00 +0000
105@@ -1,201 +0,0 @@
106-/*
107- * Copyright (C) 2013 Canonical, Ltd.
108- *
109- * This program is free software; you can redistribute it and/or modify
110- * it under the terms of the GNU General Public License as published by
111- * the Free Software Foundation; version 3.
112- *
113- * This program is distributed in the hope that it will be useful,
114- * but WITHOUT ANY WARRANTY; without even the implied warranty of
115- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
116- * GNU General Public License for more details.
117- *
118- * You should have received a copy of the GNU General Public License
119- * along with this program. If not, see <http://www.gnu.org/licenses/>.
120- */
121-
122-import QtQuick 2.0
123-import Ubuntu.Components 0.1
124-import "../Components"
125-import "../Components/ListItems" as ListItems
126-import "Video"
127-
128-ScopeView {
129- id: scopeView
130- property alias previewShown: previewLoader.onScreen
131-
132- property var categoryNames: [
133- i18n.tr("Featured"),
134- i18n.tr("Recent"),
135- i18n.tr("New Releases"),
136- i18n.tr("Popular Online")
137- ]
138-
139- onIsCurrentChanged: {
140- pageHeader.resetSearch();
141- }
142-
143- onMovementStarted: categoryView.showHeader()
144-
145- Binding {
146- target: scopeView.scope
147- property: "searchQuery"
148- value: pageHeader.searchQuery
149- }
150-
151- Connections {
152- target: panel
153- onSearchClicked: if (isCurrent) {
154- pageHeader.triggerSearch()
155- categoryView.showHeader()
156- }
157- }
158-
159- function getRenderer(categoryId) {
160- switch (categoryId) {
161- case "featured": return "Video/VideosCarousel.qml"
162- default: return "Video/VideosFilterGrid.qml"
163- }
164- }
165-
166- OpenEffect {
167- id: effect
168- anchors {
169- fill: parent
170- bottomMargin: -bottomOverflow
171- }
172- sourceItem: categoryView
173-
174- enabled: gap > 0.0
175-
176- topGapPx: (1 - gap) * positionPx
177- topOpacity: Math.max(0, (1 - gap * 1.2))
178- bottomGapPx: positionPx + gap * (targetBottomGapPx - positionPx)
179- bottomOverflow: units.gu(6)
180- bottomOpacity: 1 - (gap * 0.8)
181-
182- property int targetBottomGapPx: height - units.gu(8) - bottomOverflow
183- property real gap: previewLoader.open ? 1.0 : 0.0
184-
185- Behavior on gap {
186- NumberAnimation {
187- duration: 200
188- easing.type: Easing.InOutQuad
189- onRunningChanged: {
190- if (!previewLoader.open && !running) {
191- previewLoader.onScreen = false;
192- }
193- }
194- }
195- }
196- }
197-
198- ScopeListView {
199- id: categoryView
200- anchors.fill: parent
201- model: scopeView.categories
202- forceNoClip: previewLoader.onScreen
203-
204- onAtYEndChanged: if (atYEnd) endReached()
205- onMovingChanged: if (moving && atYEnd) endReached()
206-
207- delegate: ListItems.Base {
208- id: base
209- highlightWhenPressed: false
210- property string categoryId: model.categoryId
211-
212- Loader {
213- id: loader
214- anchors { top: parent.top; left: parent.left; right: parent.right }
215- source: scopeView.getRenderer(base.categoryId)
216- onLoaded: {
217- item.model = results
218- }
219-
220- Connections {
221- target: loader.item
222- onClicked: {
223- var dataItem;
224- // VideosCarousel and VideosFilterGrid have different
225- // clicked signals, accomodate for that
226- if (categoryId == "featured") {
227- var fileUri = delegateItem.model.uri.replace(/^[^:]+:/, "")
228- dataItem = {fileUri: fileUri, nfoUri: delegateItem.model.comment}
229- } else {
230- dataItem = data;
231- }
232- if (dataItem.nfoUri != "") {
233- previewLoader.videoData = dataItem;
234- previewLoader.open = true;
235- effect.positionPx = mapToItem(categoryView, 0, itemY).y;
236- }
237- }
238- }
239- }
240- }
241-
242- sectionProperty: "name"
243- sectionDelegate: ListItems.Header {
244- width: categoryView.width
245- text: i18n.tr(section)
246- }
247-
248- pageHeader: PageHeader {
249- id: pageHeader
250- width: categoryView.width
251- text: i18n.tr("Videos")
252- searchEntryEnabled: true
253- searchHistory: scopeView.searchHistory
254- }
255- }
256-
257- Loader {
258- id: previewLoader
259- height: effect.bottomGapPx - effect.topGapPx
260- anchors {
261- top: parent.top
262- topMargin: effect.topGapPx
263- left: parent.left
264- right: parent.right
265- }
266- sourceComponent: onScreen ? previewComponent : undefined
267-
268- property bool open: false
269- property bool onScreen: false
270- property var videoData
271-
272-
273- onOpenChanged: {
274- if (open) {
275- onScreen = true;
276- }
277- }
278-
279- onLoaded: {
280- item.item = videoData;
281- }
282- }
283-
284- Component {
285- id: previewComponent
286-
287- VideoPreview {
288- id: preview
289- anchors.fill: parent
290- onClose: open = false;
291- }
292- }
293-
294- // TODO: Move as InverseMouseArea to DashPreview
295- MouseArea {
296- enabled: previewLoader.onScreen
297- anchors {
298- fill: parent
299- topMargin: effect.bottomGapPx
300- }
301- onClicked: {
302- previewLoader.open = false;
303- }
304- }
305-
306-}
307
308=== modified file 'Dash/ScopeDelegateMapper.qml'
309--- Dash/ScopeDelegateMapper.qml 2013-06-13 09:27:02 +0000
310+++ Dash/ScopeDelegateMapper.qml 2013-10-11 10:13:39 +0000
311@@ -17,10 +17,8 @@
312 import QtQuick 2.0
313
314 QtObject {
315- property var scopeDelegateMapping: {"mockmusicmaster.scope": "DashMusic.qml",
316- "applications.scope": "DashApps.qml",
317- "home.scope": "DashHome.qml",
318- "mockvideosmaster.scope": "DashVideos.qml"
319+ property var scopeDelegateMapping: {"applications.scope": "DashApps.qml",
320+ "home.scope": "DashHome.qml"
321 }
322 property string genericScope: "GenericScopeView.qml"
323
324
325=== modified file 'po/unity8.pot'
326--- po/unity8.pot 2013-10-07 08:49:53 +0000
327+++ po/unity8.pot 2013-10-11 10:13:39 +0000
328@@ -8,7 +8,7 @@
329 msgstr ""
330 "Project-Id-Version: unity8\n"
331 "Report-Msgid-Bugs-To: \n"
332-"POT-Creation-Date: 2013-10-07 10:49+0200\n"
333+"POT-Creation-Date: 2013-10-11 12:12+0200\n"
334 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
335 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
336 "Language-Team: LANGUAGE <LL@li.org>\n"
337@@ -156,34 +156,6 @@
338 msgid "Rate this"
339 msgstr ""
340
341-#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28
342-msgid "Featured"
343-msgstr ""
344-
345-#: Dash/DashMusic.qml:28 Dash/DashVideos.qml:29
346-msgid "Recent"
347-msgstr ""
348-
349-#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30
350-msgid "New Releases"
351-msgstr ""
352-
353-#: Dash/DashMusic.qml:30
354-msgid "Top Charting"
355-msgstr ""
356-
357-#: Dash/DashMusic.qml:91
358-msgid "Music"
359-msgstr ""
360-
361-#: Dash/DashVideos.qml:31
362-msgid "Popular Online"
363-msgstr ""
364-
365-#: Dash/DashVideos.qml:146
366-msgid "Videos"
367-msgstr ""
368-
369 #: Dash/Previews/Reviews.qml:74
370 msgid "Add a review"
371 msgstr ""
372@@ -237,7 +209,7 @@
373 msgid "Search"
374 msgstr ""
375
376-#: plugins/Unity/scope.cpp:361
377+#: plugins/Unity/scope.cpp:398
378 msgid "Sorry, there is nothing that matches your search."
379 msgstr ""
380
381@@ -245,7 +217,7 @@
382 msgid "All"
383 msgstr ""
384
385-#: Shell.qml:453
386+#: Shell.qml:438
387 #, qt-format
388 msgid "Please enter %1"
389 msgstr ""

Subscribers

People subscribed via source and target branches