Merge lp:~mardy/ubuntu-system-settings-online-accounts/icon-1289401 into lp:ubuntu-system-settings-online-accounts

Proposed by Alberto Mardegan on 2016-06-27
Status: Merged
Approved by: Alberto Mardegan on 2016-10-25
Approved revision: 370
Merged at revision: 402
Proposed branch: lp:~mardy/ubuntu-system-settings-online-accounts/icon-1289401
Merge into: lp:ubuntu-system-settings-online-accounts
Diff against target: 204 lines (+1/-178)
3 files modified
system-settings-plugin/online-accounts.settings (+1/-1)
system-settings-plugin/settings-accounts.svg (+0/-173)
system-settings-plugin/system-settings-plugin.pro (+0/-4)
To merge this branch: bzr merge lp:~mardy/ubuntu-system-settings-online-accounts/icon-1289401
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Pending
Online Accounts 2016-06-27 Pending
Review via email: mp+298440@code.launchpad.net

Commit message

Update icon in System Settings.

Description of the change

Update icon in System Settings

To post a comment you must log in.
371. By Alberto Mardegan on 2016-10-25

merge from trunk

* Tests: create runtime directory, fix execution under pbuilder (LP:
  #1614108)
* Build-Depend on upstart to avoid s390x builds on yakkety.
* Properly handle early termination of account access requests (LP:
  #1594944)
* debian/control, debian/libonline-accounts-plugin-dev.install:
  - Don't depend on main package, don't allow linking to
    libonline-accounts-plugin.so (LP: #1612299)
[ Alberto Mardegan ]
* debian/rules:
  - Don't run tests on powerpc (LP: #1606927)
[ Gary.Wzl ]
* add a new property "userAgent" for OAuth item. (LP: #1587282)
[ Timo Jyrinki ]
* Add qttools5-dev-tools build dependency (LP: #1608814)
[ Alberto Mardegan ]
* Fix desktop file name for scopes: they use their short app ID (LP:
  #1541717)
[ Florian Boucault ]
* Crossbuilding fixes
* Read time from symlink file, not target (LP: #1596478)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'system-settings-plugin/online-accounts.settings'
2--- system-settings-plugin/online-accounts.settings 2015-01-23 17:15:37 +0000
3+++ system-settings-plugin/online-accounts.settings 2016-10-25 11:55:25 +0000
4@@ -1,6 +1,6 @@
5 {
6 "name": "Accounts",
7- "icon": "/usr/share/ubuntu/settings/system/icons/settings-accounts.svg",
8+ "icon": "preferences-desktop-accounts-symbolic",
9 "translations": "ubuntu-system-settings-online-accounts",
10 "category": "personal",
11 "priority": 3,
12
13=== removed file 'system-settings-plugin/settings-accounts.svg'
14--- system-settings-plugin/settings-accounts.svg 2014-06-24 14:48:29 +0000
15+++ system-settings-plugin/settings-accounts.svg 1970-01-01 00:00:00 +0000
16@@ -1,173 +0,0 @@
17-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
18-<!-- Created with Inkscape (http://www.inkscape.org/) -->
19-
20-<svg
21- xmlns:dc="http://purl.org/dc/elements/1.1/"
22- xmlns:cc="http://creativecommons.org/ns#"
23- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
24- xmlns:svg="http://www.w3.org/2000/svg"
25- xmlns="http://www.w3.org/2000/svg"
26- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
27- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
28- width="90"
29- height="90"
30- id="svg4874"
31- version="1.1"
32- inkscape:version="0.48+devel r"
33- viewBox="0 0 90 90.000001"
34- sodipodi:docname="contact-group.svg">
35- <defs
36- id="defs4876" />
37- <sodipodi:namedview
38- id="base"
39- pagecolor="#ffffff"
40- bordercolor="#666666"
41- borderopacity="1.0"
42- inkscape:pageopacity="0.0"
43- inkscape:pageshadow="2"
44- inkscape:zoom="9.947598"
45- inkscape:cx="22.78942"
46- inkscape:cy="38.732046"
47- inkscape:document-units="px"
48- inkscape:current-layer="g4780"
49- showgrid="true"
50- showborder="true"
51- fit-margin-top="0"
52- fit-margin-left="0"
53- fit-margin-right="0"
54- fit-margin-bottom="0"
55- inkscape:snap-bbox="true"
56- inkscape:bbox-paths="true"
57- inkscape:bbox-nodes="true"
58- inkscape:snap-bbox-edge-midpoints="true"
59- inkscape:snap-bbox-midpoints="true"
60- inkscape:object-paths="true"
61- inkscape:snap-intersection-paths="true"
62- inkscape:object-nodes="true"
63- inkscape:snap-smooth-nodes="true"
64- inkscape:snap-midpoints="true"
65- inkscape:snap-object-midpoints="true"
66- inkscape:snap-center="true"
67- showguides="false"
68- inkscape:guide-bbox="true"
69- inkscape:snap-global="true">
70- <inkscape:grid
71- type="xygrid"
72- id="grid5451"
73- empspacing="6" />
74- <sodipodi:guide
75- orientation="1,0"
76- position="6,77"
77- id="guide4063" />
78- <sodipodi:guide
79- orientation="1,0"
80- position="3,78"
81- id="guide4065" />
82- <sodipodi:guide
83- orientation="0,1"
84- position="55,84"
85- id="guide4067" />
86- <sodipodi:guide
87- orientation="0,1"
88- position="53,87"
89- id="guide4069" />
90- <sodipodi:guide
91- orientation="0,1"
92- position="20,3"
93- id="guide4071" />
94- <sodipodi:guide
95- orientation="0,1"
96- position="20,6"
97- id="guide4073" />
98- <sodipodi:guide
99- orientation="1,0"
100- position="87,7"
101- id="guide4075" />
102- <sodipodi:guide
103- orientation="1,0"
104- position="84,7"
105- id="guide4077" />
106- <sodipodi:guide
107- orientation="0,1"
108- position="58,81"
109- id="guide4074" />
110- <sodipodi:guide
111- orientation="1,0"
112- position="9,74"
113- id="guide4076" />
114- <sodipodi:guide
115- orientation="0,1"
116- position="21,9"
117- id="guide4078" />
118- <sodipodi:guide
119- orientation="1,0"
120- position="81,4"
121- id="guide4080" />
122- </sodipodi:namedview>
123- <metadata
124- id="metadata4879">
125- <rdf:RDF>
126- <cc:Work
127- rdf:about="">
128- <dc:format>image/svg+xml</dc:format>
129- <dc:type
130- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
131- <dc:title></dc:title>
132- </cc:Work>
133- </rdf:RDF>
134- </metadata>
135- <g
136- inkscape:label="Layer 1"
137- inkscape:groupmode="layer"
138- id="layer1"
139- transform="translate(67.857146,-84.50504)">
140- <g
141- transform="matrix(0,-1,-1,0,373.50506,516.50504)"
142- id="g4845"
143- style="display:inline">
144- <g
145- inkscape:export-ydpi="90"
146- inkscape:export-xdpi="90"
147- inkscape:export-filename="next01.png"
148- transform="matrix(-0.9996045,0,0,1,575.94296,-611.00001)"
149- id="g4778"
150- inkscape:label="Layer 1">
151- <g
152- transform="matrix(-1,0,0,1,575.99999,611)"
153- id="g4780"
154- style="display:inline">
155- <rect
156- transform="scale(-1,1)"
157- y="351.36221"
158- x="-432"
159- height="90"
160- width="90"
161- id="rect4120"
162- style="color:#000000;fill:none;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
163- <path
164- sodipodi:nodetypes="cccccccccccccccccc"
165- inkscape:connector-curvature="0"
166- id="path4122"
167- d="m 382.94991,365.19669 c -3.07887,2.13061 -5.74697,4.44959 -8.0274,6.66029 l 0,-0.008 c -3.99967,4.04832 -8.77508,9.49192 -8.77508,9.49192 0,0 4.69091,5.76968 8.76906,9.5265 l 0,-0.008 c 2.27742,2.20795 4.94139,4.52544 8.01536,6.65427 -0.0363,0.0951 -0.0668,0.19244 -0.10377,0.28723 -1.94472,5.12874 -4.53071,9.65753 -7.75811,13.58679 l -21.13197,0 0,-21.25757 0,-0.0271 0,-17.48606 0,-21.28464 21.13197,0 c 3.2274,3.92924 5.81339,8.43624 7.75811,13.52358 0.0434,0.1122 0.0793,0.22731 0.12186,0.33987 z"
168- style="font-size:15.00296783px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#808080;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" />
169- <path
170- style="font-size:121.62958527px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#808080;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
171- d="m 419.99538,381.36243 c -4.2e-4,4.75381 -1.99124,9.35043 -5.50399,12.71154 -3.51328,3.36163 -8.31664,5.26477 -13.28361,5.26477 l -0.0151,0 c -1.91234,-0.008 -4.11305,-0.18068 -6.34532,-1.08874 -5.81958,-2.36734 -10.33868,-5.91672 -13.83146,-9.15808 l 0,0.007 c -1.01511,-0.89511 -2.04594,-1.91539 -3.03721,-2.93238 l 0,-9.48741 c 0.99968,-1.02979 2.03673,-2.08206 3.04323,-3.0572 l 0,0.008 c 3.49197,-3.24035 8.008,-6.78859 13.82544,-9.15507 2.23203,-0.90797 4.43243,-1.08164 6.34532,-1.08875 l 0.0151,0 c 4.96783,0 9.77075,1.90505 13.28361,5.26628 3.51231,3.3607 5.50357,7.95622 5.50399,12.71003 l 0,0.001 z"
172- id="path4124"
173- inkscape:connector-curvature="0" />
174- <path
175- style="font-size:15.00296783px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#808080;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
176- d="m 388.25039,430.34074 c -0.0289,0.0758 -0.0527,0.15303 -0.0821,0.22851 -1.54846,4.08363 -3.60849,7.68784 -6.17823,10.81641 l -15.04696,0 0,-16.92578 0,-0.0215 0,-7.07618 8.03442,0 c -0.003,0.003 -0.0918,0.10156 -0.0918,0.10156 0,0 3.73612,4.59271 6.98323,7.58399 l 0,-0.006 c 1.81334,1.75802 3.93385,3.6038 6.38143,5.29882 z"
177- id="path4115"
178- inkscape:connector-curvature="0"
179- sodipodi:nodetypes="cccccccccccc" />
180- <path
181- inkscape:connector-curvature="0"
182- id="path4117"
183- d="m 417.76167,417.481 c -3.3e-4,3.7851 -1.60092,7.44505 -4.4251,10.12125 -2.82464,2.67661 -6.68644,4.19195 -10.6798,4.19195 l -0.012,0 c -1.53749,-0.007 -3.30682,-0.14386 -5.10151,-0.86688 -4.67884,-1.88494 -8.31211,-4.71104 -11.12027,-7.2919 l 0,0.006 c -0.81613,-0.71271 -1.64489,-1.52508 -2.44186,-2.33484 l 0,-7.55411 c 0.80374,-0.81995 1.6375,-1.6578 2.44671,-2.43423 l 0,0.007 c 2.80749,-2.58005 6.43827,-5.40525 11.11542,-7.28949 1.7945,-0.72295 3.56358,-0.86123 5.10151,-0.8669 l 0.012,0 c 3.99405,0 7.85552,1.51685 10.6798,4.19315 2.82382,2.67587 4.42477,6.33494 4.4251,10.12005 l 0,8e-4 z"
184- style="font-size:121.62958527px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#808080;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" />
185- </g>
186- </g>
187- </g>
188- </g>
189-</svg>
190
191=== modified file 'system-settings-plugin/system-settings-plugin.pro'
192--- system-settings-plugin/system-settings-plugin.pro 2015-01-23 17:15:37 +0000
193+++ system-settings-plugin/system-settings-plugin.pro 2016-10-25 11:55:25 +0000
194@@ -42,10 +42,6 @@
195 target.path = $${PLUGIN_MODULE_DIR}
196 INSTALLS += target
197
198-image.files = settings-accounts.svg
199-image.path = $${PLUGIN_MANIFEST_DIR}/icons
200-INSTALLS += image
201-
202 qml.files = $${QML_SOURCES}
203 qml.path = $${PLUGIN_QML_DIR}/online-accounts
204 INSTALLS += qml

Subscribers

People subscribed via source and target branches