Ubuntu theme

Merge lp:~charlesk/ubuntu-themes/lp-1289465-add-display-brightness-icons-to-ubuntu-mobile into lp:ubuntu-themes

  1. lp-1289465-add-display-brightness-icons-to-ubuntu-mobile
  2. Merge into trunk
Proposed by Charles Kerr
Status: Merged
Approved by: Antti Kaijanmäki
Approved revision: 430
Merged at revision: 430
Proposed branch: lp:~charlesk/ubuntu-themes/lp-1289465-add-display-brightness-icons-to-ubuntu-mobile
Merge into: lp:ubuntu-themes
Diff against target: 340 lines (+331/-0)
2 files modified
ubuntu-mobile/status/scalable/display-brightness-max.svg (+182/-0)
ubuntu-mobile/status/scalable/display-brightness-min.svg (+149/-0)
To merge this branch: bzr merge lp:~charlesk/ubuntu-themes/lp-1289465-add-display-brightness-icons-to-ubuntu-mobile
Reviewer Review Type Date Requested Status
Antti Kaijanmäki (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Alejandro J. Cura (community) Approve
Review via email: mp+254820@code.launchpad.net

Commit message

Copy the suru display-brightness-min and -max icons to ubuntu-mobile where qmenumodel and QIcon::hasThemeIcon() can find them.

Description of the change

Copy the suru display-brightness-min and -max icons to ubuntu-mobile where qmenumodel and QIcon::hasThemeIcon() can find them.

Required for https://code.launchpad.net/~charlesk/indicator-power/lp-1289465-make-brightness-icons-consistent-with-system-settings/+merge/254821

To post a comment you must log in.
Revision history for this message
Alejandro J. Cura (alecu) wrote :

+1

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

PASSED: Continuous integration, rev:430
http://jenkins.qa.ubuntu.com/job/ubuntu-themes-ci/97/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-themes-vivid-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-themes-vivid-armhf-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-themes-vivid-i386-ci/11

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-themes-ci/97/rebuild

review: Approve (continuous-integration)
Revision history for this message
Antti Kaijanmäki (kaijanmaki) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'ubuntu-mobile/status/scalable/display-brightness-max.svg'
2--- ubuntu-mobile/status/scalable/display-brightness-max.svg 1970-01-01 00:00:00 +0000
3+++ ubuntu-mobile/status/scalable/display-brightness-max.svg 2015-03-31 19:26:01 +0000
4@@ -0,0 +1,182 @@
5+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
6+<!-- Created with Inkscape (http://www.inkscape.org/) -->
7+
8+<svg
9+ xmlns:dc="http://purl.org/dc/elements/1.1/"
10+ xmlns:cc="http://creativecommons.org/ns#"
11+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
12+ xmlns:svg="http://www.w3.org/2000/svg"
13+ xmlns="http://www.w3.org/2000/svg"
14+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
15+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
16+ width="90"
17+ height="90"
18+ id="svg4479"
19+ version="1.1"
20+ inkscape:version="0.48+devel r"
21+ viewBox="0 0 90 90.000001"
22+ sodipodi:docname="display-brightness-symbolic.svg">
23+ <defs
24+ id="defs4481">
25+ <inkscape:perspective
26+ sodipodi:type="inkscape:persp3d"
27+ inkscape:vp_x="0 : 45 : 1"
28+ inkscape:vp_y="0 : 1000 : 0"
29+ inkscape:vp_z="90 : 45 : 1"
30+ inkscape:persp3d-origin="45 : 30 : 1"
31+ id="perspective4105" />
32+ </defs>
33+ <sodipodi:namedview
34+ id="base"
35+ pagecolor="#ffffff"
36+ bordercolor="#666666"
37+ borderopacity="1.0"
38+ inkscape:pageopacity="0.0"
39+ inkscape:pageshadow="2"
40+ inkscape:zoom="6.3664629"
41+ inkscape:cx="56.002292"
42+ inkscape:cy="49.511731"
43+ inkscape:document-units="px"
44+ inkscape:current-layer="g4577"
45+ showgrid="true"
46+ fit-margin-top="0"
47+ fit-margin-left="0"
48+ fit-margin-right="0"
49+ fit-margin-bottom="0"
50+ showguides="true"
51+ inkscape:guide-bbox="true"
52+ inkscape:snap-bbox="true"
53+ inkscape:bbox-paths="true"
54+ inkscape:bbox-nodes="true"
55+ inkscape:snap-bbox-edge-midpoints="true"
56+ inkscape:snap-bbox-midpoints="true"
57+ inkscape:object-paths="true"
58+ inkscape:snap-intersection-paths="true"
59+ inkscape:object-nodes="true"
60+ inkscape:snap-smooth-nodes="true"
61+ inkscape:snap-midpoints="true"
62+ inkscape:snap-object-midpoints="true"
63+ inkscape:snap-center="true">
64+ <inkscape:grid
65+ type="xygrid"
66+ id="grid5053"
67+ empspacing="6" />
68+ <sodipodi:guide
69+ orientation="1,0"
70+ position="3,47"
71+ id="guide5055" />
72+ <sodipodi:guide
73+ orientation="1,0"
74+ position="6,42"
75+ id="guide5057" />
76+ <sodipodi:guide
77+ orientation="1,0"
78+ position="9,39"
79+ id="guide5059" />
80+ <sodipodi:guide
81+ orientation="0,1"
82+ position="35,87"
83+ id="guide5061" />
84+ <sodipodi:guide
85+ orientation="0,1"
86+ position="37,84"
87+ id="guide5063" />
88+ <sodipodi:guide
89+ orientation="0,1"
90+ position="39,81"
91+ id="guide5065" />
92+ <sodipodi:guide
93+ orientation="1,0"
94+ position="87,72"
95+ id="guide5067" />
96+ <sodipodi:guide
97+ orientation="1,0"
98+ position="84,70"
99+ id="guide5069" />
100+ <sodipodi:guide
101+ orientation="1,0"
102+ position="81,66"
103+ id="guide5071" />
104+ <sodipodi:guide
105+ orientation="0,1"
106+ position="92,3"
107+ id="guide5073" />
108+ <sodipodi:guide
109+ orientation="0,1"
110+ position="93,6"
111+ id="guide5075" />
112+ </sodipodi:namedview>
113+ <metadata
114+ id="metadata4484">
115+ <rdf:RDF>
116+ <cc:Work
117+ rdf:about="">
118+ <dc:format>image/svg+xml</dc:format>
119+ <dc:type
120+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
121+ <dc:title></dc:title>
122+ </cc:Work>
123+ </rdf:RDF>
124+ </metadata>
125+ <g
126+ inkscape:label="Layer 1"
127+ inkscape:groupmode="layer"
128+ id="layer1"
129+ transform="translate(833.57146,-695.93359)">
130+ <g
131+ style="display:inline"
132+ id="g4496"
133+ transform="translate(-863.57145,-110.42859)">
134+ <g
135+ style="display:inline"
136+ id="g4577"
137+ transform="translate(-30.00001,504)">
138+ <rect
139+ style="opacity:0.1;color:#000000;fill:none;stroke:none;stroke-width:1.10000002;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
140+ id="rect4503"
141+ width="89.999992"
142+ height="89.999992"
143+ x="60"
144+ y="302.36218" />
145+ <path
146+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#808080;fill-opacity:1;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;isolation:auto;mix-blend-mode:normal;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif"
147+ d="m 105,326.36133 c -11.562446,0 -21,9.43755 -21,21 0,11.56244 9.437554,21 21,21 11.56245,0 21,-9.43756 21,-21 0,-11.56245 -9.43755,-21 -21,-21 z m 0,6 c 8.31981,0 15,6.68019 15,15 0,8.3198 -6.68019,15 -15,15 -8.319805,0 -15,-6.6802 -15,-15 0,-8.31981 6.680195,-15 15,-15 z"
148+ id="path4562"
149+ inkscape:connector-curvature="0" />
150+ <path
151+ sodipodi:open="true"
152+ d="m 105,329.36218 a 18,18 0 0 1 18,18 18,18 0 0 1 -18,18"
153+ sodipodi:end="1.5707963"
154+ sodipodi:start="4.712389"
155+ sodipodi:ry="18"
156+ sodipodi:rx="18"
157+ sodipodi:cy="347.36218"
158+ sodipodi:cx="105"
159+ sodipodi:type="arc"
160+ style="color:#000000;fill:#808080;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
161+ id="circle4564" />
162+ <path
163+ id="rect4566"
164+ d="m 64,344.36218 0,6.00002 14,0 0,-6.00002 -14,0 z m 68,0 0,6.00002 14,0 0,-6.00002 -14,0 z"
165+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;marker:none;enable-background:accumulate"
166+ inkscape:connector-curvature="0" />
167+ <path
168+ inkscape:connector-curvature="0"
169+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;marker:none;enable-background:accumulate"
170+ d="m 108,305.36219 -6,1.49999 0,13.50001 6,0 z m 0,69 -6,0 0,14 6,0 z"
171+ id="path4571"
172+ sodipodi:nodetypes="cccccccccc" />
173+ <path
174+ inkscape:connector-curvature="0"
175+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;marker:none;enable-background:accumulate"
176+ d="m 73.887295,374.23224 4.242654,4.24266 9.899495,-9.8995 -4.242655,-4.24265 -9.899494,9.89949 z m 48.083265,-48.08326 4.24265,4.24265 9.8995,-9.89949 -4.24266,-4.24266 -9.89949,9.8995 z"
177+ id="path4121" />
178+ <path
179+ id="path4123"
180+ d="m 78.129953,316.24948 -4.24266,4.24266 9.8995,9.89949 4.24265,-4.24265 -9.89949,-9.8995 z m 48.083257,48.08327 -4.24265,4.24265 9.89949,9.8995 4.24266,-4.24266 -9.8995,-9.89949 z"
181+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;marker:none;enable-background:accumulate"
182+ inkscape:connector-curvature="0" />
183+ </g>
184+ </g>
185+ </g>
186+</svg>
187
188=== added file 'ubuntu-mobile/status/scalable/display-brightness-min.svg'
189--- ubuntu-mobile/status/scalable/display-brightness-min.svg 1970-01-01 00:00:00 +0000
190+++ ubuntu-mobile/status/scalable/display-brightness-min.svg 2015-03-31 19:26:01 +0000
191@@ -0,0 +1,149 @@
192+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
193+<!-- Created with Inkscape (http://www.inkscape.org/) -->
194+
195+<svg
196+ xmlns:dc="http://purl.org/dc/elements/1.1/"
197+ xmlns:cc="http://creativecommons.org/ns#"
198+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
199+ xmlns:svg="http://www.w3.org/2000/svg"
200+ xmlns="http://www.w3.org/2000/svg"
201+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
202+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
203+ width="90"
204+ height="90"
205+ id="svg4479"
206+ version="1.1"
207+ inkscape:version="0.48+devel r"
208+ viewBox="0 0 90 90.000001"
209+ sodipodi:docname="display-brightness-min.svg">
210+ <defs
211+ id="defs4481">
212+ <inkscape:perspective
213+ sodipodi:type="inkscape:persp3d"
214+ inkscape:vp_x="0 : 45 : 1"
215+ inkscape:vp_y="0 : 1000 : 0"
216+ inkscape:vp_z="90 : 45 : 1"
217+ inkscape:persp3d-origin="45 : 30 : 1"
218+ id="perspective4105" />
219+ </defs>
220+ <sodipodi:namedview
221+ id="base"
222+ pagecolor="#ffffff"
223+ bordercolor="#666666"
224+ borderopacity="1.0"
225+ inkscape:pageopacity="0.0"
226+ inkscape:pageshadow="2"
227+ inkscape:zoom="6.3664629"
228+ inkscape:cx="16.73402"
229+ inkscape:cy="48.490756"
230+ inkscape:document-units="px"
231+ inkscape:current-layer="g4577"
232+ showgrid="true"
233+ fit-margin-top="0"
234+ fit-margin-left="0"
235+ fit-margin-right="0"
236+ fit-margin-bottom="0"
237+ showguides="true"
238+ inkscape:guide-bbox="true"
239+ inkscape:snap-bbox="true"
240+ inkscape:bbox-paths="true"
241+ inkscape:bbox-nodes="true"
242+ inkscape:snap-bbox-edge-midpoints="true"
243+ inkscape:snap-bbox-midpoints="true"
244+ inkscape:object-paths="true"
245+ inkscape:snap-intersection-paths="true"
246+ inkscape:object-nodes="true"
247+ inkscape:snap-smooth-nodes="true"
248+ inkscape:snap-midpoints="true"
249+ inkscape:snap-object-midpoints="true"
250+ inkscape:snap-center="true">
251+ <inkscape:grid
252+ type="xygrid"
253+ id="grid5053"
254+ empspacing="6" />
255+ <sodipodi:guide
256+ orientation="1,0"
257+ position="3,47"
258+ id="guide5055" />
259+ <sodipodi:guide
260+ orientation="1,0"
261+ position="6,42"
262+ id="guide5057" />
263+ <sodipodi:guide
264+ orientation="1,0"
265+ position="9,39"
266+ id="guide5059" />
267+ <sodipodi:guide
268+ orientation="0,1"
269+ position="35,87"
270+ id="guide5061" />
271+ <sodipodi:guide
272+ orientation="0,1"
273+ position="37,84"
274+ id="guide5063" />
275+ <sodipodi:guide
276+ orientation="0,1"
277+ position="39,81"
278+ id="guide5065" />
279+ <sodipodi:guide
280+ orientation="1,0"
281+ position="87,72"
282+ id="guide5067" />
283+ <sodipodi:guide
284+ orientation="1,0"
285+ position="84,70"
286+ id="guide5069" />
287+ <sodipodi:guide
288+ orientation="1,0"
289+ position="81,66"
290+ id="guide5071" />
291+ <sodipodi:guide
292+ orientation="0,1"
293+ position="92,3"
294+ id="guide5073" />
295+ <sodipodi:guide
296+ orientation="0,1"
297+ position="93,6"
298+ id="guide5075" />
299+ </sodipodi:namedview>
300+ <metadata
301+ id="metadata4484">
302+ <rdf:RDF>
303+ <cc:Work
304+ rdf:about="">
305+ <dc:format>image/svg+xml</dc:format>
306+ <dc:type
307+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
308+ <dc:title></dc:title>
309+ </cc:Work>
310+ </rdf:RDF>
311+ </metadata>
312+ <g
313+ inkscape:label="Layer 1"
314+ inkscape:groupmode="layer"
315+ id="layer1"
316+ transform="translate(833.57146,-695.93359)">
317+ <g
318+ style="display:inline"
319+ id="g4496"
320+ transform="translate(-863.57145,-110.42859)">
321+ <g
322+ style="display:inline"
323+ id="g4577"
324+ transform="translate(-30.00001,504)">
325+ <rect
326+ style="opacity:0.1;color:#000000;fill:none;stroke:none;stroke-width:1.10000002;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
327+ id="rect4503"
328+ width="89.999992"
329+ height="89.999992"
330+ x="60"
331+ y="302.36218" />
332+ <path
333+ style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:normal;font-family:sans-serif;-inkscape-font-specification:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#808080;fill-opacity:1;stroke:none;stroke-width:6;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;opacity:0.5"
334+ d="m 108,305.36218 -6,1.5 0,13.5 6,0 0,-15 z m -29.869141,10.88672 -4.24414,4.24414 9.90039,9.89844 4.242188,-4.24219 -9.898438,-9.90039 z m 53.738281,0 -9.89844,9.90039 4.24219,4.24219 9.90039,-9.89844 -4.24414,-4.24414 z M 105,326.36218 c -11.56245,0 -21,9.43755 -21,21 0,11.56244 9.43755,21 21,21 11.56245,0 21,-9.43756 21,-21 0,-11.56245 -9.43755,-21 -21,-21 z m 0,6 0,30 c -8.3198,0 -15,-6.6802 -15,-15 0,-8.31981 6.6802,-15 15,-15 z m -41,12 0,6 14,0 0,-6 -14,0 z m 68,0 0,6 14,0 0,-6 -14,0 z m -48.212891,19.9707 -9.90039,9.89844 4.24414,4.24414 9.898438,-9.90039 -4.242188,-4.24219 z m 42.425781,0 -4.24219,4.24219 9.89844,9.90039 4.24414,-4.24414 -9.90039,-9.89844 z M 102,374.36218 l 0,14 6,0 0,-14 -6,0 z"
335+ id="path4562"
336+ inkscape:connector-curvature="0" />
337+ </g>
338+ </g>
339+ </g>
340+</svg>

Subscribers

People subscribed via source and target branches