Unity Home Scope

Merge lp:~mhr3/unity-scope-home/update-renderers into lp:unity-scope-home

  1. update-renderers
  2. Merge into trunk
Proposed by Michal Hruby
Status: Merged
Approved by: Paweł Stołowski
Approved revision: 171
Merged at revision: 172
Proposed branch: lp:~mhr3/unity-scope-home/update-renderers
Merge into: lp:unity-scope-home
Diff against target: 311 lines (+46/-44)
21 files modified
data/home.scope.in.in (+2/-2)
data/master-scopes/applications.scope.in.in (+3/-2)
data/master-scopes/books.scope.in.in (+2/-2)
data/master-scopes/boxes.scope.in.in (+2/-2)
data/master-scopes/calendar.scope.in.in (+2/-2)
data/master-scopes/code.scope.in.in (+2/-2)
data/master-scopes/files.scope.in.in (+2/-2)
data/master-scopes/graphics.scope.in.in (+2/-2)
data/master-scopes/help.scope.in.in (+2/-2)
data/master-scopes/info.scope.in.in (+2/-2)
data/master-scopes/more_suggestions.scope.in.in (+2/-2)
data/master-scopes/music.scope.in.in (+3/-3)
data/master-scopes/news.scope.in.in (+2/-2)
data/master-scopes/notes.scope.in.in (+2/-2)
data/master-scopes/photos.scope.in.in (+2/-2)
data/master-scopes/recipes.scope.in.in (+2/-2)
data/master-scopes/reference.scope.in.in (+2/-2)
data/master-scopes/searchin.scope.in.in (+2/-2)
data/master-scopes/video.scope.in.in (+4/-3)
data/master-scopes/weather.scope.in.in (+2/-2)
data/master-scopes/web.scope.in.in (+2/-2)
To merge this branch: bzr merge lp:~mhr3/unity-scope-home/update-renderers
Reviewer Review Type Date Requested Status
Paweł Stołowski (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+188047@code.launchpad.net

Commit message

Update category renderers to match latest designs.

Description of the change

Update category renderers to match latest designs.

To post a comment you must log in.
Revision history for this message
Michal Hruby (mhr3) wrote :

The RendererHint isn't read atm, but we need new API in libunity to do that, will propose another branch that does that.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:170
http://jenkins.qa.ubuntu.com/job/unity-scope-home-ci/96/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-amd64-ci/60
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-armhf-ci/60
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-i386-ci/60

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-home-ci/96/rebuild

review: Approve (continuous-integration)
lp:~mhr3/unity-scope-home/update-renderers updated
171. By Michal Hruby

Update also home scope keys

Revision history for this message
Paweł Stołowski (stolowski) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/home.scope.in.in'
2--- data/home.scope.in.in 2013-09-26 17:52:43 +0000
3+++ data/home.scope.in.in 2013-09-30 09:22:23 +0000
4@@ -1,6 +1,6 @@
5 [Scope]
6-DBusName=com.canonical.Unity.Scope.Home
7-DBusPath=/com/canonical/unity/home
8+GroupName=com.canonical.Unity.Scope.Home
9+UniqueName=/com/canonical/unity/home
10 Icon=@prefix@/share/unity/icons/lens-nav-home.svg
11 RequiredMetadata=
12 OptionalMetadata=
13
14=== modified file 'data/master-scopes/applications.scope.in.in'
15--- data/master-scopes/applications.scope.in.in 2013-08-28 10:33:58 +0000
16+++ data/master-scopes/applications.scope.in.in 2013-09-30 09:22:23 +0000
17@@ -1,6 +1,6 @@
18 [Scope]
19-DBusName=com.canonical.Unity.Scope.Home
20-DBusPath=/com/canonical/unity/masterscope/applications
21+GroupName=com.canonical.Unity.Scope.Home
22+UniqueName=/com/canonical/unity/masterscope/applications
23 Icon=@prefix@/share/unity/icons/lens-nav-app.svg
24 _Name=Applications
25 _SearchHint=Search applications
26@@ -61,6 +61,7 @@
27 DedupField=uri
28 SortField=scope_disabled;title;
29 ContentType=apps
30+RendererHint=toggled
31
32 [Filter type]
33 _Name=Type
34
35=== modified file 'data/master-scopes/books.scope.in.in'
36--- data/master-scopes/books.scope.in.in 2013-06-11 16:37:58 +0000
37+++ data/master-scopes/books.scope.in.in 2013-09-30 09:22:23 +0000
38@@ -1,6 +1,6 @@
39 [Scope]
40-DBusName=com.canonical.Unity.Scope.Home
41-DBusPath=/com/canonical/unity/masterscope/books
42+GroupName=com.canonical.Unity.Scope.Home
43+UniqueName=/com/canonical/unity/masterscope/books
44 Icon=
45 CategoryIcon=@prefix@/share/icons/unity-icon-theme/places/svg/group-books.svg
46 _Name=Books
47
48=== modified file 'data/master-scopes/boxes.scope.in.in'
49--- data/master-scopes/boxes.scope.in.in 2013-06-10 13:05:43 +0000
50+++ data/master-scopes/boxes.scope.in.in 2013-09-30 09:22:23 +0000
51@@ -1,6 +1,6 @@
52 [Scope]
53-DBusName=com.canonical.Unity.Scope.Home
54-DBusPath=/com/canonical/unity/masterscope/boxes
55+GroupName=com.canonical.Unity.Scope.Home
56+UniqueName=/com/canonical/unity/masterscope/boxes
57 Icon=
58 CategoryIcon=@prefix@/share/icons/unity-icon-theme/places/svg/group-boxes.svg
59 _Name=Boxes
60
61=== modified file 'data/master-scopes/calendar.scope.in.in'
62--- data/master-scopes/calendar.scope.in.in 2013-06-10 13:05:43 +0000
63+++ data/master-scopes/calendar.scope.in.in 2013-09-30 09:22:23 +0000
64@@ -1,6 +1,6 @@
65 [Scope]
66-DBusName=com.canonical.Unity.Scope.Home
67-DBusPath=/com/canonical/unity/masterscope/calendar
68+GroupName=com.canonical.Unity.Scope.Home
69+UniqueName=/com/canonical/unity/masterscope/calendar
70 Icon=
71 CategoryIcon=@prefix@/share/icons/unity-icon-theme/places/svg/group-calendar.svg
72 _Name=Calendar
73
74=== modified file 'data/master-scopes/code.scope.in.in'
75--- data/master-scopes/code.scope.in.in 2013-06-10 13:05:43 +0000
76+++ data/master-scopes/code.scope.in.in 2013-09-30 09:22:23 +0000
77@@ -1,6 +1,6 @@
78 [Scope]
79-DBusName=com.canonical.Unity.Scope.Home
80-DBusPath=/com/canonical/unity/masterscope/code
81+GroupName=com.canonical.Unity.Scope.Home
82+UniqueName=/com/canonical/unity/masterscope/code
83 Icon=
84 CategoryIcon=@prefix@/share/icons/unity-icon-theme/places/svg/group-developer.svg
85 _Name=Code
86
87=== modified file 'data/master-scopes/files.scope.in.in'
88--- data/master-scopes/files.scope.in.in 2013-06-20 16:21:44 +0000
89+++ data/master-scopes/files.scope.in.in 2013-09-30 09:22:23 +0000
90@@ -1,6 +1,6 @@
91 [Scope]
92-DBusName=com.canonical.Unity.Scope.Home
93-DBusPath=/com/canonical/unity/masterscope/files
94+GroupName=com.canonical.Unity.Scope.Home
95+UniqueName=/com/canonical/unity/masterscope/files
96 Icon=@prefix@/share/unity/icons/lens-nav-file.svg
97 CategoryIcon=@prefix@/share/icons/unity-icon-theme/places/svg/group-files.svg
98 _Name=Files & Folders
99
100=== modified file 'data/master-scopes/graphics.scope.in.in'
101--- data/master-scopes/graphics.scope.in.in 2013-06-10 13:05:43 +0000
102+++ data/master-scopes/graphics.scope.in.in 2013-09-30 09:22:23 +0000
103@@ -1,6 +1,6 @@
104 [Scope]
105-DBusName=com.canonical.Unity.Scope.Home
106-DBusPath=/com/canonical/unity/masterscope/graphics
107+GroupName=com.canonical.Unity.Scope.Home
108+UniqueName=/com/canonical/unity/masterscope/graphics
109 Icon=
110 CategoryIcon=@prefix@/share/icons/unity-icon-theme/places/svg/group-graphics.svg
111 _Name=Graphics
112
113=== modified file 'data/master-scopes/help.scope.in.in'
114--- data/master-scopes/help.scope.in.in 2013-06-10 13:05:43 +0000
115+++ data/master-scopes/help.scope.in.in 2013-09-30 09:22:23 +0000
116@@ -1,6 +1,6 @@
117 [Scope]
118-DBusName=com.canonical.Unity.Scope.Home
119-DBusPath=/com/canonical/unity/masterscope/help
120+GroupName=com.canonical.Unity.Scope.Home
121+UniqueName=/com/canonical/unity/masterscope/help
122 Icon=
123 CategoryIcon=@prefix@/share/icons/unity-icon-theme/places/svg/group-help.svg
124 _Name=Help
125
126=== modified file 'data/master-scopes/info.scope.in.in'
127--- data/master-scopes/info.scope.in.in 2013-08-22 17:05:14 +0000
128+++ data/master-scopes/info.scope.in.in 2013-09-30 09:22:23 +0000
129@@ -1,6 +1,6 @@
130 [Scope]
131-DBusName=com.canonical.Unity.Scope.Home
132-DBusPath=/com/canonical/unity/masterscope/info
133+GroupName=com.canonical.Unity.Scope.Home
134+UniqueName=/com/canonical/unity/masterscope/info
135 Icon=
136 CategoryIcon=@prefix@/share/icons/unity-icon-theme/places/svg/group-info.svg
137 _Name=Info
138
139=== modified file 'data/master-scopes/more_suggestions.scope.in.in'
140--- data/master-scopes/more_suggestions.scope.in.in 2013-06-18 12:13:36 +0000
141+++ data/master-scopes/more_suggestions.scope.in.in 2013-09-30 09:22:23 +0000
142@@ -1,6 +1,6 @@
143 [Scope]
144-DBusName=com.canonical.Unity.Scope.Home
145-DBusPath=/com/canonical/unity/masterscope/moresuggestions
146+GroupName=com.canonical.Unity.Scope.Home
147+UniqueName=/com/canonical/unity/masterscope/moresuggestions
148 Icon=
149 CategoryIcon=@prefix@/share/icons/unity-icon-theme/places/svg/group-treat-yourself.svg
150 _Name=More suggestions
151
152=== modified file 'data/master-scopes/music.scope.in.in'
153--- data/master-scopes/music.scope.in.in 2013-08-22 18:30:50 +0000
154+++ data/master-scopes/music.scope.in.in 2013-09-30 09:22:23 +0000
155@@ -1,6 +1,6 @@
156 [Scope]
157-DBusName=com.canonical.Unity.Scope.Home
158-DBusPath=/com/canonical/unity/masterscope/music
159+GroupName=com.canonical.Unity.Scope.Home
160+UniqueName=/com/canonical/unity/masterscope/music
161 Icon=@prefix@/share/unity/icons/lens-nav-music.svg
162 CategoryIcon=@prefix@/share/icons/unity-icon-theme/places/svg/group-music.svg
163 _Name=Music
164@@ -18,7 +18,6 @@
165 _Name=Music
166 Icon=@prefix@/share/icons/unity-icon-theme/places/svg/group-music.svg
167 ContentType=music
168-Renderer=dynamic
169
170 [Category recent]
171 _Name=Recently played
172@@ -31,6 +30,7 @@
173 Icon=@prefix@/share/icons/unity-icon-theme/places/svg/group-songs.svg
174 DedupField=uri
175 ContentType=music
176+Renderer=carousel
177
178 [Category albums]
179 _Name=Albums
180
181=== modified file 'data/master-scopes/news.scope.in.in'
182--- data/master-scopes/news.scope.in.in 2013-06-10 13:05:43 +0000
183+++ data/master-scopes/news.scope.in.in 2013-09-30 09:22:23 +0000
184@@ -1,6 +1,6 @@
185 [Scope]
186-DBusName=com.canonical.Unity.Scope.Home
187-DBusPath=/com/canonical/unity/masterscope/news
188+GroupName=com.canonical.Unity.Scope.Home
189+UniqueName=/com/canonical/unity/masterscope/news
190 Icon=
191 CategoryIcon=@prefix@/share/icons/unity-icon-theme/places/svg/group-news.svg
192 _Name=News
193
194=== modified file 'data/master-scopes/notes.scope.in.in'
195--- data/master-scopes/notes.scope.in.in 2013-06-10 13:05:43 +0000
196+++ data/master-scopes/notes.scope.in.in 2013-09-30 09:22:23 +0000
197@@ -1,6 +1,6 @@
198 [Scope]
199-DBusName=com.canonical.Unity.Scope.Home
200-DBusPath=/com/canonical/unity/masterscope/notes
201+GroupName=com.canonical.Unity.Scope.Home
202+UniqueName=/com/canonical/unity/masterscope/notes
203 Icon=
204 CategoryIcon=@prefix@/share/icons/unity-icon-theme/places/svg/group-info.svg
205 _Name=Notes
206
207=== modified file 'data/master-scopes/photos.scope.in.in'
208--- data/master-scopes/photos.scope.in.in 2013-06-20 16:21:44 +0000
209+++ data/master-scopes/photos.scope.in.in 2013-09-30 09:22:23 +0000
210@@ -1,6 +1,6 @@
211 [Scope]
212-DBusName=com.canonical.Unity.Scope.Home
213-DBusPath=/com/canonical/unity/masterscope/photos
214+GroupName=com.canonical.Unity.Scope.Home
215+UniqueName=/com/canonical/unity/masterscope/photos
216 Icon=@prefix@/share/unity/icons/lens-nav-photo.svg
217 CategoryIcon=@prefix@/share/icons/unity-icon-theme/places/svg/group-photos.svg
218 _Name=Photos
219
220=== modified file 'data/master-scopes/recipes.scope.in.in'
221--- data/master-scopes/recipes.scope.in.in 2013-06-10 13:05:43 +0000
222+++ data/master-scopes/recipes.scope.in.in 2013-09-30 09:22:23 +0000
223@@ -1,6 +1,6 @@
224 [Scope]
225-DBusName=com.canonical.Unity.Scope.Home
226-DBusPath=/com/canonical/unity/masterscope/recipes
227+GroupName=com.canonical.Unity.Scope.Home
228+UniqueName=/com/canonical/unity/masterscope/recipes
229 Icon=
230 CategoryIcon=@prefix@/share/icons/unity-icon-theme/places/svg/group-recipes.svg
231 _Name=Recipes
232
233=== modified file 'data/master-scopes/reference.scope.in.in'
234--- data/master-scopes/reference.scope.in.in 2013-06-10 13:05:43 +0000
235+++ data/master-scopes/reference.scope.in.in 2013-09-30 09:22:23 +0000
236@@ -1,6 +1,6 @@
237 [Scope]
238-DBusName=com.canonical.Unity.Scope.Home
239-DBusPath=/com/canonical/unity/masterscope/reference
240+GroupName=com.canonical.Unity.Scope.Home
241+UniqueName=/com/canonical/unity/masterscope/reference
242 Icon=
243 CategoryIcon=@prefix@/share/icons/unity-icon-theme/places/svg/group-reference.svg
244 _Name=Reference
245
246=== modified file 'data/master-scopes/searchin.scope.in.in'
247--- data/master-scopes/searchin.scope.in.in 2013-08-27 16:20:00 +0000
248+++ data/master-scopes/searchin.scope.in.in 2013-09-30 09:22:23 +0000
249@@ -1,6 +1,6 @@
250 [Scope]
251-DBusName=com.canonical.Unity.Scope.Home
252-DBusPath=/com/canonical/unity/masterscope/searchin
253+GroupName=com.canonical.Unity.Scope.Home
254+UniqueName=/com/canonical/unity/masterscope/searchin
255 Icon=
256 CategoryIcon=@prefix@/share/icons/unity-icon-theme/places/svg/group-internet.svg
257 _Name=Search in
258
259=== modified file 'data/master-scopes/video.scope.in.in'
260--- data/master-scopes/video.scope.in.in 2013-08-22 18:30:50 +0000
261+++ data/master-scopes/video.scope.in.in 2013-09-30 09:22:23 +0000
262@@ -1,6 +1,6 @@
263 [Scope]
264-DBusName=com.canonical.Unity.Scope.Home
265-DBusPath=/com/canonical/unity/masterscope/video
266+GroupName=com.canonical.Unity.Scope.Home
267+UniqueName=/com/canonical/unity/masterscope/video
268 Icon=@prefix@/share/unity/icons/lens-nav-video.svg
269 CategoryIcon=@prefix@/share/icons/unity-icon-theme/places/svg/group-videos.svg
270 _Name=Videos
271@@ -18,7 +18,7 @@
272 _Name=Videos
273 Icon=@prefix@/share/icons/unity-icon-theme/places/svg/group-videos.svg
274 ContentType=video
275-Renderer=dynamic
276+Renderer=carousel
277
278 [Category local]
279 _Name=My videos
280@@ -44,4 +44,5 @@
281 Icon=@prefix@/share/icons/unity-icon-theme/places/svg/group-treat-yourself.svg
282 DedupField=uri
283 ContentType=video
284+RendererHint=portrait
285
286
287=== modified file 'data/master-scopes/weather.scope.in.in'
288--- data/master-scopes/weather.scope.in.in 2013-08-22 17:05:14 +0000
289+++ data/master-scopes/weather.scope.in.in 2013-09-30 09:22:23 +0000
290@@ -1,6 +1,6 @@
291 [Scope]
292-DBusName=com.canonical.Unity.Scope.Home
293-DBusPath=/com/canonical/unity/masterscope/weather
294+GroupName=com.canonical.Unity.Scope.Home
295+UniqueName=/com/canonical/unity/masterscope/weather
296 Icon=
297 CategoryIcon=@prefix@/share/icons/unity-icon-theme/places/svg/group-info.svg
298 _Name=Weather
299
300=== modified file 'data/master-scopes/web.scope.in.in'
301--- data/master-scopes/web.scope.in.in 2013-06-10 13:05:43 +0000
302+++ data/master-scopes/web.scope.in.in 2013-09-30 09:22:23 +0000
303@@ -1,6 +1,6 @@
304 [Scope]
305-DBusName=com.canonical.Unity.Scope.Home
306-DBusPath=/com/canonical/unity/masterscope/web
307+GroupName=com.canonical.Unity.Scope.Home
308+UniqueName=/com/canonical/unity/masterscope/web
309 Icon=
310 CategoryIcon=@prefix@/share/icons/unity-icon-theme/places/svg/group-internet.svg
311 _Name=Web

Subscribers

People subscribed via source and target branches

to all changes: