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
=== removed file 'Dash/DashMusic.qml'
--- Dash/DashMusic.qml 2013-07-26 23:27:50 +0000
+++ Dash/DashMusic.qml 1970-01-01 00:00:00 +0000
@@ -1,96 +0,0 @@
1/*
2 * Copyright (C) 2013 Canonical, Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17import QtQuick 2.0
18import Ubuntu.Components 0.1
19import "../Components"
20import "../Components/ListItems" as ListItems
21import "Music"
22
23ScopeView {
24 id: scopeView
25
26 property var categoryNames: [
27 i18n.tr("Featured"),
28 i18n.tr("Recent"),
29 i18n.tr("New Releases"),
30 i18n.tr("Top Charting")
31 ]
32
33 onIsCurrentChanged: {
34 pageHeader.resetSearch();
35 }
36
37 onMovementStarted: categoryView.showHeader()
38
39 Binding {
40 target: scopeView.scope
41 property: "searchQuery"
42 value: pageHeader.searchQuery
43 }
44
45 Connections {
46 target: panel
47 onSearchClicked: if (isCurrent) {
48 pageHeader.triggerSearch()
49 categoryView.showHeader()
50 }
51 }
52
53 function getRenderer(categoryId) {
54 switch (categoryId) {
55 case "featured": return "Music/MusicCarousel.qml"
56 default: return "Music/MusicFilterGrid.qml"
57 }
58 }
59
60 ScopeListView {
61 id: categoryView
62 anchors.fill: parent
63 model: scopeView.categories
64
65 onAtYEndChanged: if (atYEnd) endReached()
66 onMovingChanged: if (moving && atYEnd) endReached()
67
68 delegate: ListItems.Base {
69 id: base
70 highlightWhenPressed: false
71
72 property string categoryId: model.categoryId
73
74 Loader {
75 anchors { top: parent.top; left: parent.left; right: parent.right }
76 source: scopeView.getRenderer(base.categoryId)
77 onLoaded: {
78 item.model = results
79 }
80 }
81 }
82
83 sectionProperty: "name"
84 sectionDelegate: ListItems.Header {
85 width: categoryView.width
86 text: i18n.tr(section)
87 }
88 pageHeader: PageHeader {
89 id: pageHeader
90 width: categoryView.width
91 text: i18n.tr("Music")
92 searchEntryEnabled: true
93 searchHistory: scopeView.searchHistory
94 }
95 }
96}
970
=== removed file 'Dash/DashVideos.qml'
--- Dash/DashVideos.qml 2013-07-31 09:27:56 +0000
+++ Dash/DashVideos.qml 1970-01-01 00:00:00 +0000
@@ -1,201 +0,0 @@
1/*
2 * Copyright (C) 2013 Canonical, Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17import QtQuick 2.0
18import Ubuntu.Components 0.1
19import "../Components"
20import "../Components/ListItems" as ListItems
21import "Video"
22
23ScopeView {
24 id: scopeView
25 property alias previewShown: previewLoader.onScreen
26
27 property var categoryNames: [
28 i18n.tr("Featured"),
29 i18n.tr("Recent"),
30 i18n.tr("New Releases"),
31 i18n.tr("Popular Online")
32 ]
33
34 onIsCurrentChanged: {
35 pageHeader.resetSearch();
36 }
37
38 onMovementStarted: categoryView.showHeader()
39
40 Binding {
41 target: scopeView.scope
42 property: "searchQuery"
43 value: pageHeader.searchQuery
44 }
45
46 Connections {
47 target: panel
48 onSearchClicked: if (isCurrent) {
49 pageHeader.triggerSearch()
50 categoryView.showHeader()
51 }
52 }
53
54 function getRenderer(categoryId) {
55 switch (categoryId) {
56 case "featured": return "Video/VideosCarousel.qml"
57 default: return "Video/VideosFilterGrid.qml"
58 }
59 }
60
61 OpenEffect {
62 id: effect
63 anchors {
64 fill: parent
65 bottomMargin: -bottomOverflow
66 }
67 sourceItem: categoryView
68
69 enabled: gap > 0.0
70
71 topGapPx: (1 - gap) * positionPx
72 topOpacity: Math.max(0, (1 - gap * 1.2))
73 bottomGapPx: positionPx + gap * (targetBottomGapPx - positionPx)
74 bottomOverflow: units.gu(6)
75 bottomOpacity: 1 - (gap * 0.8)
76
77 property int targetBottomGapPx: height - units.gu(8) - bottomOverflow
78 property real gap: previewLoader.open ? 1.0 : 0.0
79
80 Behavior on gap {
81 NumberAnimation {
82 duration: 200
83 easing.type: Easing.InOutQuad
84 onRunningChanged: {
85 if (!previewLoader.open && !running) {
86 previewLoader.onScreen = false;
87 }
88 }
89 }
90 }
91 }
92
93 ScopeListView {
94 id: categoryView
95 anchors.fill: parent
96 model: scopeView.categories
97 forceNoClip: previewLoader.onScreen
98
99 onAtYEndChanged: if (atYEnd) endReached()
100 onMovingChanged: if (moving && atYEnd) endReached()
101
102 delegate: ListItems.Base {
103 id: base
104 highlightWhenPressed: false
105 property string categoryId: model.categoryId
106
107 Loader {
108 id: loader
109 anchors { top: parent.top; left: parent.left; right: parent.right }
110 source: scopeView.getRenderer(base.categoryId)
111 onLoaded: {
112 item.model = results
113 }
114
115 Connections {
116 target: loader.item
117 onClicked: {
118 var dataItem;
119 // VideosCarousel and VideosFilterGrid have different
120 // clicked signals, accomodate for that
121 if (categoryId == "featured") {
122 var fileUri = delegateItem.model.uri.replace(/^[^:]+:/, "")
123 dataItem = {fileUri: fileUri, nfoUri: delegateItem.model.comment}
124 } else {
125 dataItem = data;
126 }
127 if (dataItem.nfoUri != "") {
128 previewLoader.videoData = dataItem;
129 previewLoader.open = true;
130 effect.positionPx = mapToItem(categoryView, 0, itemY).y;
131 }
132 }
133 }
134 }
135 }
136
137 sectionProperty: "name"
138 sectionDelegate: ListItems.Header {
139 width: categoryView.width
140 text: i18n.tr(section)
141 }
142
143 pageHeader: PageHeader {
144 id: pageHeader
145 width: categoryView.width
146 text: i18n.tr("Videos")
147 searchEntryEnabled: true
148 searchHistory: scopeView.searchHistory
149 }
150 }
151
152 Loader {
153 id: previewLoader
154 height: effect.bottomGapPx - effect.topGapPx
155 anchors {
156 top: parent.top
157 topMargin: effect.topGapPx
158 left: parent.left
159 right: parent.right
160 }
161 sourceComponent: onScreen ? previewComponent : undefined
162
163 property bool open: false
164 property bool onScreen: false
165 property var videoData
166
167
168 onOpenChanged: {
169 if (open) {
170 onScreen = true;
171 }
172 }
173
174 onLoaded: {
175 item.item = videoData;
176 }
177 }
178
179 Component {
180 id: previewComponent
181
182 VideoPreview {
183 id: preview
184 anchors.fill: parent
185 onClose: open = false;
186 }
187 }
188
189 // TODO: Move as InverseMouseArea to DashPreview
190 MouseArea {
191 enabled: previewLoader.onScreen
192 anchors {
193 fill: parent
194 topMargin: effect.bottomGapPx
195 }
196 onClicked: {
197 previewLoader.open = false;
198 }
199 }
200
201}
2020
=== modified file 'Dash/ScopeDelegateMapper.qml'
--- Dash/ScopeDelegateMapper.qml 2013-06-13 09:27:02 +0000
+++ Dash/ScopeDelegateMapper.qml 2013-10-11 10:13:39 +0000
@@ -17,10 +17,8 @@
17import QtQuick 2.017import QtQuick 2.0
1818
19QtObject {19QtObject {
20 property var scopeDelegateMapping: {"mockmusicmaster.scope": "DashMusic.qml",20 property var scopeDelegateMapping: {"applications.scope": "DashApps.qml",
21 "applications.scope": "DashApps.qml",21 "home.scope": "DashHome.qml"
22 "home.scope": "DashHome.qml",
23 "mockvideosmaster.scope": "DashVideos.qml"
24 }22 }
25 property string genericScope: "GenericScopeView.qml"23 property string genericScope: "GenericScopeView.qml"
2624
2725
=== modified file 'po/unity8.pot'
--- po/unity8.pot 2013-10-07 08:49:53 +0000
+++ po/unity8.pot 2013-10-11 10:13:39 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: unity8\n"9"Project-Id-Version: unity8\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2013-10-07 10:49+0200\n"11"POT-Creation-Date: 2013-10-11 12:12+0200\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -156,34 +156,6 @@
156msgid "Rate this"156msgid "Rate this"
157msgstr ""157msgstr ""
158158
159#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28
160msgid "Featured"
161msgstr ""
162
163#: Dash/DashMusic.qml:28 Dash/DashVideos.qml:29
164msgid "Recent"
165msgstr ""
166
167#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30
168msgid "New Releases"
169msgstr ""
170
171#: Dash/DashMusic.qml:30
172msgid "Top Charting"
173msgstr ""
174
175#: Dash/DashMusic.qml:91
176msgid "Music"
177msgstr ""
178
179#: Dash/DashVideos.qml:31
180msgid "Popular Online"
181msgstr ""
182
183#: Dash/DashVideos.qml:146
184msgid "Videos"
185msgstr ""
186
187#: Dash/Previews/Reviews.qml:74159#: Dash/Previews/Reviews.qml:74
188msgid "Add a review"160msgid "Add a review"
189msgstr ""161msgstr ""
@@ -237,7 +209,7 @@
237msgid "Search"209msgid "Search"
238msgstr ""210msgstr ""
239211
240#: plugins/Unity/scope.cpp:361212#: plugins/Unity/scope.cpp:398
241msgid "Sorry, there is nothing that matches your search."213msgid "Sorry, there is nothing that matches your search."
242msgstr ""214msgstr ""
243215
@@ -245,7 +217,7 @@
245msgid "All"217msgid "All"
246msgstr ""218msgstr ""
247219
248#: Shell.qml:453220#: Shell.qml:438
249#, qt-format221#, qt-format
250msgid "Please enter %1"222msgid "Please enter %1"
251msgstr ""223msgstr ""

Subscribers

People subscribed via source and target branches