Merge lp:~ken-vandine/ubuntu-system-settings/network_plugins into lp:ubuntu-system-settings

Proposed by Ken VanDine
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 89
Merged at revision: 86
Proposed branch: lp:~ken-vandine/ubuntu-system-settings/network_plugins
Merge into: lp:ubuntu-system-settings
Diff against target: 614 lines (+527/-24)
11 files modified
debian/ubuntu-system-settings.install (+1/-23)
plugins/bluetooth/bluetooth.pro (+13/-0)
plugins/bluetooth/bluetooth.settings (+13/-0)
plugins/bluetooth/settings-bluetooth.svg (+206/-0)
plugins/cellular/cellular.pro (+13/-0)
plugins/cellular/cellular.settings (+19/-0)
plugins/cellular/settings-cellular.svg (+209/-0)
plugins/plugins.pro (+4/-1)
plugins/wifi/settings-wifi.svg (+20/-0)
plugins/wifi/wifi.pro (+13/-0)
plugins/wifi/wifi.settings (+16/-0)
To merge this branch: bzr merge lp:~ken-vandine/ubuntu-system-settings/network_plugins
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Sebastien Bacher (community) Approve
Review via email: mp+172358@code.launchpad.net

Commit message

added bluetooth, cellular, and wifi plugins

Description of the change

added bluetooth, cellular, and wifi plugins

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

great ;-)

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/ubuntu-system-settings.install'
2--- debian/ubuntu-system-settings.install 2013-06-28 15:30:03 +0000
3+++ debian/ubuntu-system-settings.install 2013-07-01 15:54:40 +0000
4@@ -1,26 +1,4 @@
5 usr/bin
6 usr/share/applications
7 usr/share/locale
8-usr/share/settings/system/about.settings
9-usr/share/settings/system/background.settings
10-usr/share/settings/system/flight-mode.settings
11-usr/share/settings/system/gps.settings
12-usr/share/settings/system/reset.settings
13-usr/share/settings/system/sounds.settings
14-usr/share/settings/system/language.settings
15-usr/share/settings/system/accessibility.settings
16-usr/share/settings/system/keyboard.settings
17-usr/share/settings/system/phone.settings
18-usr/share/settings/system/brightness.settings
19-usr/share/settings/system/time-date.settings
20-usr/share/settings/system/security-privacy.settings
21-usr/share/settings/system/system-update.settings
22-usr/share/settings/system/orientation-lock.settings
23-usr/share/settings/system/icons
24-usr/share/settings/system/qml-plugins/SystemSettings
25-usr/share/settings/system/qml-plugins/about
26-usr/share/settings/system/qml-plugins/background
27-usr/share/settings/system/qml-plugins/flight-mode
28-usr/share/settings/system/qml-plugins/gps
29-usr/share/settings/system/qml-plugins/orientation-lock
30-usr/share/settings/system/qml-plugins/reset
31+usr/share/settings/system
32
33=== added directory 'plugins/bluetooth'
34=== added file 'plugins/bluetooth/bluetooth.pro'
35--- plugins/bluetooth/bluetooth.pro 1970-01-01 00:00:00 +0000
36+++ plugins/bluetooth/bluetooth.pro 2013-07-01 15:54:40 +0000
37@@ -0,0 +1,13 @@
38+include(../../common-project-config.pri)
39+include($${TOP_SRC_DIR}/common-vars.pri)
40+
41+TEMPLATE = lib
42+TARGET = bluetooth
43+
44+settings.files = $${TARGET}.settings
45+settings.path = $${PLUGIN_MANIFEST_DIR}
46+INSTALLS += settings
47+
48+image.files = settings-bluetooth.svg
49+image.path = /usr/share/settings/system/icons
50+INSTALLS += image
51
52=== added file 'plugins/bluetooth/bluetooth.settings'
53--- plugins/bluetooth/bluetooth.settings 1970-01-01 00:00:00 +0000
54+++ plugins/bluetooth/bluetooth.settings 2013-07-01 15:54:40 +0000
55@@ -0,0 +1,13 @@
56+{
57+ "icon": "/usr/share/settings/system/icons/settings-bluetooth.svg",
58+ "name": "Bluetooth",
59+ "translations": "system-settings",
60+ "category": "network",
61+ "priority": 2,
62+ "keywords": [
63+ "bluetooth",
64+ "settings"
65+ ],
66+ "has-dynamic-keywords": false,
67+ "has-dynamic-visibility": false
68+}
69
70=== added file 'plugins/bluetooth/settings-bluetooth.svg'
71--- plugins/bluetooth/settings-bluetooth.svg 1970-01-01 00:00:00 +0000
72+++ plugins/bluetooth/settings-bluetooth.svg 2013-07-01 15:54:40 +0000
73@@ -0,0 +1,206 @@
74+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
75+<!-- Created with Inkscape (http://www.inkscape.org/) -->
76+
77+<svg
78+ xmlns:dc="http://purl.org/dc/elements/1.1/"
79+ xmlns:cc="http://creativecommons.org/ns#"
80+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
81+ xmlns:svg="http://www.w3.org/2000/svg"
82+ xmlns="http://www.w3.org/2000/svg"
83+ xmlns:xlink="http://www.w3.org/1999/xlink"
84+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
85+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
86+ width="90"
87+ height="90"
88+ id="svg3289"
89+ version="1.1"
90+ inkscape:version="0.48+devel r12221"
91+ sodipodi:docname="bluetooth.svg">
92+ <defs
93+ id="defs3291">
94+ <linearGradient
95+ id="linearGradient3992">
96+ <stop
97+ style="stop-color:#b5b5b5;stop-opacity:1"
98+ offset="0"
99+ id="stop3994" />
100+ <stop
101+ style="stop-color:#dbdbdb;stop-opacity:1"
102+ offset="1"
103+ id="stop3996" />
104+ </linearGradient>
105+ <linearGradient
106+ id="linearGradient3992-5">
107+ <stop
108+ style="stop-color:#b5b5b5;stop-opacity:1"
109+ offset="0"
110+ id="stop3994-3" />
111+ <stop
112+ style="stop-color:#dbdbdb;stop-opacity:1"
113+ offset="1"
114+ id="stop3996-0" />
115+ </linearGradient>
116+ <linearGradient
117+ id="linearGradient3382">
118+ <stop
119+ style="stop-color:#b5b5b5;stop-opacity:1"
120+ offset="0"
121+ id="stop3384" />
122+ <stop
123+ style="stop-color:#dbdbdb;stop-opacity:1"
124+ offset="1"
125+ id="stop3386" />
126+ </linearGradient>
127+ <radialGradient
128+ inkscape:collect="always"
129+ xlink:href="#linearGradient4091"
130+ id="radialGradient4450"
131+ gradientUnits="userSpaceOnUse"
132+ cx="155.69038"
133+ cy="203.5215"
134+ fx="155.69038"
135+ fy="203.5215"
136+ r="2" />
137+ <linearGradient
138+ id="linearGradient4091">
139+ <stop
140+ id="stop4093"
141+ offset="0"
142+ style="stop-color:#dbdbdb;stop-opacity:1;" />
143+ <stop
144+ id="stop4095"
145+ offset="1"
146+ style="stop-color:#b5b5b5;stop-opacity:1;" />
147+ </linearGradient>
148+ <linearGradient
149+ inkscape:collect="always"
150+ xlink:href="#linearGradient4091"
151+ id="linearGradient4452"
152+ gradientUnits="userSpaceOnUse"
153+ gradientTransform="matrix(1.5000015,0,0,1.5000015,-397.00123,-108.1814)"
154+ x1="793"
155+ y1="217.28406"
156+ x2="795"
157+ y2="217.28406" />
158+ <linearGradient
159+ id="linearGradient3468">
160+ <stop
161+ id="stop3470"
162+ offset="0"
163+ style="stop-color:#dbdbdb;stop-opacity:1;" />
164+ <stop
165+ id="stop3472"
166+ offset="1"
167+ style="stop-color:#b5b5b5;stop-opacity:1;" />
168+ </linearGradient>
169+ <linearGradient
170+ id="linearGradient3992-7">
171+ <stop
172+ style="stop-color:#b5b5b5;stop-opacity:1"
173+ offset="0"
174+ id="stop3994-6" />
175+ <stop
176+ style="stop-color:#dbdbdb;stop-opacity:1"
177+ offset="1"
178+ id="stop3996-7" />
179+ </linearGradient>
180+ <clipPath
181+ clipPathUnits="userSpaceOnUse"
182+ id="clipPath3824-3">
183+ <path
184+ style="opacity:0.58108108;color:#000000;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
185+ d="m 205,183.36218 0,33 27,0 0,-33 L 205,183.36218 z m 12.5625,4.40625 1.60937,1.57812 4.6875,4.6875 0.64063,0.67188 -0.64063,0.67187 -4.42187,4.42188 0,0.125 4.42187,4.42187 0.64063,0.67188 -0.64063,0.67187 -4.6875,4.6875 -1.60937,1.57813 0,-2.25 0,-8.03125 -4.01563,4.01562 -1.34375,-1.34375 4.48438,-4.48437 -4.48438,-4.48438 1.34375,-1.34375 4.01563,4.01563 0,-8.03125 L 217.5625,187.76843 z m 1.875,4.53125 0,4.8125 2.40625,-2.40625 L 219.4375,192.29968 z m 0,10.3125 0,4.8125 2.40625,-2.40625 L 219.4375,202.61218 Z"
186+ id="path3826-8"
187+ inkscape:connector-curvature="0" />
188+ </clipPath>
189+ </defs>
190+ <sodipodi:namedview
191+ id="base"
192+ pagecolor="#ffffff"
193+ bordercolor="#666666"
194+ borderopacity="1.0"
195+ inkscape:pageopacity="0.0"
196+ inkscape:pageshadow="2"
197+ inkscape:zoom="7.9580788"
198+ inkscape:cx="31.684785"
199+ inkscape:cy="34.2545"
200+ inkscape:document-units="px"
201+ inkscape:current-layer="g4507"
202+ showgrid="true"
203+ inkscape:window-width="1920"
204+ inkscape:window-height="1029"
205+ inkscape:window-x="0"
206+ inkscape:window-y="24"
207+ inkscape:window-maximized="1"
208+ fit-margin-top="0"
209+ fit-margin-left="0"
210+ fit-margin-right="0"
211+ fit-margin-bottom="0">
212+ <inkscape:grid
213+ type="xygrid"
214+ id="grid3774"
215+ empspacing="6"
216+ visible="true"
217+ enabled="true"
218+ snapvisiblegridlinesonly="true"
219+ originx="0px"
220+ originy="3.4375034e-08px" />
221+ </sodipodi:namedview>
222+ <metadata
223+ id="metadata3294">
224+ <rdf:RDF>
225+ <cc:Work
226+ rdf:about="">
227+ <dc:format>image/svg+xml</dc:format>
228+ <dc:type
229+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
230+ <dc:title />
231+ </cc:Work>
232+ </rdf:RDF>
233+ </metadata>
234+ <g
235+ inkscape:label="Layer 1"
236+ inkscape:groupmode="layer"
237+ id="layer1"
238+ transform="translate(0,-962.3622)">
239+ <g
240+ style="display:inline"
241+ transform="translate(-789,604.3622)"
242+ id="g4451">
243+ <g
244+ style="display:inline"
245+ inkscape:label="#g3962"
246+ transform="matrix(2,0,0,2,397,3.2756348)"
247+ id="g4507">
248+ <rect
249+ style="fill:none;stroke:none"
250+ id="rect4509"
251+ width="45"
252+ height="45"
253+ x="196"
254+ y="177.36218" />
255+ <path
256+ style="fill:#808080;fill-opacity:1;stroke:none"
257+ clip-path="none"
258+ d="M 44 15 C 26 15 24 15 24 27 L 24 63 C 24 75 26 75 44 75 L 46 75 C 64 75 66 75 66 63 L 66 27 C 66 15 64 15 46 15 L 44 15 z M 43.125 20.8125 L 46.34375 23.96875 L 55.71875 33.34375 L 57 34.6875 L 55.71875 36.03125 L 46.875 44.875 L 46.875 45.125 L 55.71875 53.96875 L 57 55.3125 L 55.71875 56.65625 L 46.34375 66.03125 L 43.125 69.1875 L 43.125 64.6875 L 43.125 48.625 L 35.09375 56.65625 L 32.40625 53.96875 L 41.375 45 L 32.40625 36.03125 L 35.09375 33.34375 L 43.125 41.375 L 43.125 25.3125 L 43.125 20.8125 z M 46.875 29.875 L 46.875 39.5 L 51.6875 34.6875 L 46.875 29.875 z M 46.875 50.5 L 46.875 60.125 L 51.6875 55.3125 L 46.875 50.5 z "
259+ transform="matrix(0.5,0,0,0.5,196,177.36218)"
260+ id="path3011" />
261+ </g>
262+ </g>
263+ </g>
264+ <g
265+ inkscape:groupmode="layer"
266+ id="layer2"
267+ inkscape:label="Clips"
268+ style="display:none"
269+ sodipodi:insensitive="true">
270+ <path
271+ transform="matrix(2,0,0,2,-392,-354.72436)"
272+ style="fill:#808080;fill-opacity:1;stroke:none;display:inline"
273+ d="m 218,184.86218 c -9,0 -10,0 -10,6 l 0,18 c 0,6 1,6 10,6 l 1,0 c 9,0 10,0 10,-6 l 0,-18 C 229,184.86218 228,184.86218 219,184.86218 Z"
274+ id="path3011-0"
275+ inkscape:connector-curvature="0"
276+ sodipodi:nodetypes="808080ccc"
277+ clip-path="url(#clipPath3824-3)" />
278+ </g>
279+</svg>
280
281=== added directory 'plugins/cellular'
282=== added file 'plugins/cellular/cellular.pro'
283--- plugins/cellular/cellular.pro 1970-01-01 00:00:00 +0000
284+++ plugins/cellular/cellular.pro 2013-07-01 15:54:40 +0000
285@@ -0,0 +1,13 @@
286+include(../../common-project-config.pri)
287+include($${TOP_SRC_DIR}/common-vars.pri)
288+
289+TEMPLATE = lib
290+TARGET = cellular
291+
292+settings.files = $${TARGET}.settings
293+settings.path = $${PLUGIN_MANIFEST_DIR}
294+INSTALLS += settings
295+
296+image.files = settings-cellular.svg
297+image.path = /usr/share/settings/system/icons
298+INSTALLS += image
299
300=== added file 'plugins/cellular/cellular.settings'
301--- plugins/cellular/cellular.settings 1970-01-01 00:00:00 +0000
302+++ plugins/cellular/cellular.settings 2013-07-01 15:54:40 +0000
303@@ -0,0 +1,19 @@
304+{
305+ "icon": "/usr/share/settings/system/icons/settings-cellular.svg",
306+ "name": "Cellular",
307+ "translations": "system-settings",
308+ "category": "network",
309+ "priority": 1,
310+ "form-factors": [
311+ "phone"
312+ ],
313+ "keywords": [
314+ "cellular",
315+ "network",
316+ "mobile",
317+ "gsm",
318+ "settings"
319+ ],
320+ "has-dynamic-keywords": false,
321+ "has-dynamic-visibility": false
322+}
323
324=== added file 'plugins/cellular/settings-cellular.svg'
325--- plugins/cellular/settings-cellular.svg 1970-01-01 00:00:00 +0000
326+++ plugins/cellular/settings-cellular.svg 2013-07-01 15:54:40 +0000
327@@ -0,0 +1,209 @@
328+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
329+<!-- Created with Inkscape (http://www.inkscape.org/) -->
330+
331+<svg
332+ xmlns:dc="http://purl.org/dc/elements/1.1/"
333+ xmlns:cc="http://creativecommons.org/ns#"
334+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
335+ xmlns:svg="http://www.w3.org/2000/svg"
336+ xmlns="http://www.w3.org/2000/svg"
337+ xmlns:xlink="http://www.w3.org/1999/xlink"
338+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
339+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
340+ width="90"
341+ height="90"
342+ id="svg3289"
343+ version="1.1"
344+ inkscape:version="0.48.3.1 r9886"
345+ sodipodi:docname="network-signal-100@30.svg">
346+ <defs
347+ id="defs3291">
348+ <linearGradient
349+ id="linearGradient3992">
350+ <stop
351+ style="stop-color:#b5b5b5;stop-opacity:1"
352+ offset="0"
353+ id="stop3994" />
354+ <stop
355+ style="stop-color:#dbdbdb;stop-opacity:1"
356+ offset="1"
357+ id="stop3996" />
358+ </linearGradient>
359+ <linearGradient
360+ id="linearGradient3992-5">
361+ <stop
362+ style="stop-color:#b5b5b5;stop-opacity:1"
363+ offset="0"
364+ id="stop3994-3" />
365+ <stop
366+ style="stop-color:#dbdbdb;stop-opacity:1"
367+ offset="1"
368+ id="stop3996-0" />
369+ </linearGradient>
370+ <linearGradient
371+ id="linearGradient3382">
372+ <stop
373+ style="stop-color:#b5b5b5;stop-opacity:1"
374+ offset="0"
375+ id="stop3384" />
376+ <stop
377+ style="stop-color:#dbdbdb;stop-opacity:1"
378+ offset="1"
379+ id="stop3386" />
380+ </linearGradient>
381+ <radialGradient
382+ inkscape:collect="always"
383+ xlink:href="#linearGradient4091"
384+ id="radialGradient4450"
385+ gradientUnits="userSpaceOnUse"
386+ cx="155.69038"
387+ cy="203.5215"
388+ fx="155.69038"
389+ fy="203.5215"
390+ r="2" />
391+ <linearGradient
392+ id="linearGradient4091">
393+ <stop
394+ id="stop4093"
395+ offset="0"
396+ style="stop-color:#dbdbdb;stop-opacity:1;" />
397+ <stop
398+ id="stop4095"
399+ offset="1"
400+ style="stop-color:#b5b5b5;stop-opacity:1;" />
401+ </linearGradient>
402+ <linearGradient
403+ inkscape:collect="always"
404+ xlink:href="#linearGradient4091"
405+ id="linearGradient4452"
406+ gradientUnits="userSpaceOnUse"
407+ gradientTransform="matrix(1.5000015,0,0,1.5000015,-397.00123,-108.1814)"
408+ x1="793"
409+ y1="217.28406"
410+ x2="795"
411+ y2="217.28406" />
412+ <linearGradient
413+ id="linearGradient3468">
414+ <stop
415+ id="stop3470"
416+ offset="0"
417+ style="stop-color:#dbdbdb;stop-opacity:1;" />
418+ <stop
419+ id="stop3472"
420+ offset="1"
421+ style="stop-color:#b5b5b5;stop-opacity:1;" />
422+ </linearGradient>
423+ <linearGradient
424+ id="linearGradient3992-7">
425+ <stop
426+ style="stop-color:#b5b5b5;stop-opacity:1"
427+ offset="0"
428+ id="stop3994-6" />
429+ <stop
430+ style="stop-color:#dbdbdb;stop-opacity:1"
431+ offset="1"
432+ id="stop3996-7" />
433+ </linearGradient>
434+ <clipPath
435+ clipPathUnits="userSpaceOnUse"
436+ id="clipPath3017">
437+ <path
438+ style="color:#000000;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
439+ d="m 199,186.36218 0,27 39,0 0,-27 -39,0 z m 25.14062,7.5 c 0.53199,1e-5 0.98285,0.0788 1.40625,0.15625 0.43428,0.0665 0.85228,0.1503 1.15625,0.25 0.31487,0.0883 0.52331,0.15051 0.71875,0.25 0.20629,0.0995 0.3975,0.21035 0.48438,0.26562 l -0.71875,2.04688 c -0.34742,-0.18802 -0.73152,-0.33605 -1.1875,-0.46875 -0.44518,-0.14367 -0.95236,-0.1875 -1.48438,-0.1875 -1.1834,2e-5 -2.0774,0.29423 -2.60937,0.96875 -0.52114,0.66344 -0.76563,1.58898 -0.76563,2.75 0,0.56396 0.0883,1.08247 0.21875,1.54687 0.13021,0.45338 0.2863,0.84012 0.54688,1.17188 0.26054,0.33171 0.60914,0.5933 1,0.78125 0.39089,0.17694 0.86949,0.23437 1.39062,0.23437 0.28227,0 0.47638,0.0119 0.67188,0 0.20624,-0.0118 0.39486,-0.029 0.54687,-0.0625 l 0,-4.01562 2.57813,0 0,5.6875 c -0.30401,0.12179 -0.77997,0.30476 -1.45313,0.4375 -0.67315,0.14368 -1.5276,0.1875 -2.51562,0.1875 -0.84687,0 -1.58638,-0.10962 -2.28125,-0.375 -0.684,-0.2654 -1.33954,-0.66323 -1.82813,-1.17188 -0.48862,-0.50864 -0.85358,-1.14981 -1.125,-1.89062 -0.26054,-0.74088 -0.39062,-1.58031 -0.39062,-2.53125 0,-0.96201 0.15999,-1.82166 0.45312,-2.5625 0.29316,-0.74084 0.70844,-1.38195 1.21875,-1.89063 0.51031,-0.5197 1.08162,-0.87523 1.76563,-1.14062 0.69482,-0.26539 1.42138,-0.4375 2.20312,-0.4375 z m -11.95312,0.0312 c 0.16265,-0.0119 0.35294,0 0.53125,0 0.65923,2e-5 1.24329,0.11625 1.71875,0.28125 0.48629,0.15417 0.87409,0.3747 1.1875,0.67187 0.31336,0.28617 0.55183,0.60379 0.70312,1 0.15137,0.3852 0.20313,0.8659 0.20313,1.32813 0,0.45128 -0.11057,0.86764 -0.35938,1.29687 -0.24855,0.41823 -0.57856,0.73303 -1,0.95313 0.58353,0.24213 1.04599,0.57822 1.35938,1.0625 0.32418,0.47325 0.46874,1.04741 0.46875,1.71875 -1e-5,0.52829 -0.0772,1.03315 -0.25,1.48437 -0.17294,0.44026 -0.44508,0.85733 -0.8125,1.1875 -0.36744,0.31919 -0.8335,0.54724 -1.40625,0.73438 -0.56193,0.17614 -1.22194,0.25 -2,0.25 -0.29181,0 -0.61332,0.0114 -0.9375,-0.0312 -0.32423,-0.033 -0.65054,-0.12135 -0.95313,-0.1875 -0.30257,-0.0659 -0.53269,-0.11021 -0.78125,-0.1875 -0.24856,-0.077 -0.46891,-0.15257 -0.60937,-0.21875 l 0.45312,-2.0625 c 0.28095,0.12087 0.6615,0.24753 1.09375,0.39062 0.44307,0.13221 1.0235,0.21875 1.67188,0.21875 0.74564,0 1.2323,-0.13585 1.57812,-0.42187 0.34578,-0.28617 0.54688,-0.67198 0.54688,-1.15625 0,-0.29717 -0.0577,-0.53625 -0.1875,-0.73438 -0.11866,-0.20911 -0.29951,-0.37891 -0.51563,-0.5 -0.21615,-0.13219 -0.5099,-0.26849 -0.8125,-0.3125 -0.29178,-0.0549 -0.57125,-0.0625 -0.90625,-0.0625 l -0.98437,0 0,-1.9375 1.125,0 c 0.23775,0 0.42449,-0.0808 0.64062,-0.125 0.2269,-0.044 0.4677,-0.0885 0.64063,-0.1875 0.17295,-0.11003 0.29336,-0.26138 0.39062,-0.4375 0.10805,-0.18702 0.125,-0.42798 0.125,-0.70312 0,-0.20913 -0.0387,-0.37719 -0.125,-0.53125 -0.0864,-0.15419 -0.18757,-0.27592 -0.32812,-0.375 -0.12981,-0.0994 -0.23818,-0.19035 -0.42188,-0.23438 -0.17296,-0.0549 -0.36315,-0.0625 -0.54687,-0.0625 -0.46469,3e-5 -0.94393,0.0601 -1.34375,0.20313 -0.38903,0.14289 -0.73834,0.32216 -1.0625,0.53125 l -0.84375,-1.82813 c 0.17295,-0.11026 0.38242,-0.17568 0.60937,-0.29687 0.23773,-0.12084 0.46902,-0.24468 0.75,-0.34375 0.28097,-0.0989 0.59286,-0.2152 0.90625,-0.28125 0.16206,-0.0332 0.32171,-0.0833 0.48438,-0.0937 z"
440+ id="path3019"
441+ inkscape:connector-curvature="0" />
442+ </clipPath>
443+ </defs>
444+ <sodipodi:namedview
445+ id="base"
446+ pagecolor="#000000"
447+ bordercolor="#666666"
448+ borderopacity="1.0"
449+ inkscape:pageopacity="1"
450+ inkscape:pageshadow="2"
451+ inkscape:zoom="4.0745363"
452+ inkscape:cx="76.671305"
453+ inkscape:cy="53.834349"
454+ inkscape:document-units="px"
455+ inkscape:current-layer="g4507"
456+ showgrid="true"
457+ inkscape:window-width="1920"
458+ inkscape:window-height="1029"
459+ inkscape:window-x="0"
460+ inkscape:window-y="24"
461+ inkscape:window-maximized="1"
462+ fit-margin-top="0"
463+ fit-margin-left="0"
464+ fit-margin-right="0"
465+ fit-margin-bottom="0">
466+ <inkscape:grid
467+ type="xygrid"
468+ id="grid3774"
469+ empspacing="6"
470+ visible="true"
471+ enabled="true"
472+ snapvisiblegridlinesonly="true"
473+ originx="0px"
474+ originy="3.4375034e-08px" />
475+ </sodipodi:namedview>
476+ <metadata
477+ id="metadata3294">
478+ <rdf:RDF>
479+ <cc:Work
480+ rdf:about="">
481+ <dc:format>image/svg+xml</dc:format>
482+ <dc:type
483+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
484+ <dc:title></dc:title>
485+ </cc:Work>
486+ </rdf:RDF>
487+ </metadata>
488+ <g
489+ inkscape:label="Layer 1"
490+ inkscape:groupmode="layer"
491+ id="layer1"
492+ transform="translate(0,-962.3622)">
493+ <g
494+ style="display:inline"
495+ transform="translate(-789,604.3622)"
496+ id="g4451">
497+ <g
498+ style="display:inline"
499+ inkscape:label="#g3962"
500+ transform="matrix(2,0,0,2,397,3.2756348)"
501+ id="g4507">
502+ <rect
503+ style="fill:none;stroke:none"
504+ id="rect4509"
505+ width="45"
506+ height="45"
507+ x="196"
508+ y="177.36218" />
509+ <path
510+ sodipodi:nodetypes="scczccs"
511+ inkscape:connector-curvature="0"
512+ id="path4202"
513+ d="m 205.75,204.36218 c -2.25,0 -2.25,0.93752 -2.25,2.8125 l 0,3.375 c 0,1.875 0,2.8125 2.25,2.8125 2.25,0 2.25,-0.9375 2.25,-2.8125 l 0,-3.375 c 0,-1.87498 0,-2.8125 -2.25,-2.8125 z"
514+ style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;display:inline" />
515+ <path
516+ style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;display:inline"
517+ d="m 214.25,198.36218 c -2.25,0 -2.25,0.93752 -2.25,2.8125 l 0,9.375 c 0,1.875 0,2.8125 2.25,2.8125 2.25,0 2.25,-0.9375 2.25,-2.8125 l 0,-9.375 c 0,-1.87498 0,-2.8125 -2.25,-2.8125 z"
518+ id="path3843"
519+ inkscape:connector-curvature="0"
520+ sodipodi:nodetypes="scczccs" />
521+ <path
522+ sodipodi:nodetypes="scczccs"
523+ inkscape:connector-curvature="0"
524+ id="path3849"
525+ d="m 222.75,192.36218 c -2.25,0 -2.25,0.93752 -2.25,2.8125 l 0,15.375 c 0,1.875 0,2.8125 2.25,2.8125 2.25,0 2.25,-0.9375 2.25,-2.8125 l 0,-15.375 c 0,-1.87498 0,-2.8125 -2.25,-2.8125 z"
526+ style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;display:inline" />
527+ <path
528+ style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;display:inline"
529+ d="m 231.25,186.36218 c -2.25,0 -2.25,0.93752 -2.25,2.8125 l 0,21.375 c 0,1.875 0,2.8125 2.25,2.8125 2.25,0 2.25,-0.9375 2.25,-2.8125 l 0,-21.375 c 0,-1.87498 0,-2.8125 -2.25,-2.8125 z"
530+ id="path3853"
531+ inkscape:connector-curvature="0"
532+ sodipodi:nodetypes="scczccs" />
533+ </g>
534+ </g>
535+ </g>
536+</svg>
537
538=== modified file 'plugins/plugins.pro'
539--- plugins/plugins.pro 2013-06-28 19:09:46 +0000
540+++ plugins/plugins.pro 2013-07-01 15:54:40 +0000
541@@ -14,4 +14,7 @@
542 brightness \
543 time-date \
544 security-privacy \
545- system-update
546+ system-update \
547+ wifi \
548+ cellular \
549+ bluetooth
550
551=== added directory 'plugins/wifi'
552=== added file 'plugins/wifi/settings-wifi.svg'
553--- plugins/wifi/settings-wifi.svg 1970-01-01 00:00:00 +0000
554+++ plugins/wifi/settings-wifi.svg 2013-07-01 15:54:40 +0000
555@@ -0,0 +1,20 @@
556+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
557+<!-- Created with Inkscape (http://www.inkscape.org/) -->
558+<svg id="svg3289" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="90" width="90" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
559+ <metadata id="metadata3294">
560+ <rdf:RDF>
561+ <cc:Work rdf:about="">
562+ <dc:format>image/svg+xml</dc:format>
563+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
564+ <dc:title/>
565+ </cc:Work>
566+ </rdf:RDF>
567+ </metadata>
568+ <g id="layer1" transform="translate(-0.0000408 -962.36)">
569+ <path id="path3783" style="stroke-width:1.8165;color:#000000;stroke:#808080;fill:none" d="m38.636 51.364a9 9 0 1 1 12.728 0.000001" transform="matrix(3.0278 0 0 3.0278 -91.25 871.11)"/>
570+ <path id="path3785" style="stroke-width:3.1429;color:#000000;stroke:#808080;fill:none" d="m38.636 51.364a9 9 0 1 1 12.728 0.000001" transform="matrix(1.75 0 0 1.75 -33.75 928.61)"/>
571+ <rect id="rect4431" style="fill:none" height="90" width="90" y="962.36" x="0.0000408"/>
572+ <path id="path3781" style="color:#000000;fill:#808080" d="m54 45a9 9 0 1 1 -18 0 9 9 0 1 1 18 0z" transform="matrix(.83333 0 0 .83333 7.5001 969.86)"/>
573+ <path id="rect3787" style="color:#000000;fill:#808080" d="m41 57.375v11.625c0 5 0 6 4 6s4-1 4-6v-11.625c-1.257 0.405-2.608 0.625-4 0.625s-2.743-0.22-4-0.625z" transform="translate(0.0000408 962.36)"/>
574+ </g>
575+</svg>
576
577=== added file 'plugins/wifi/wifi.pro'
578--- plugins/wifi/wifi.pro 1970-01-01 00:00:00 +0000
579+++ plugins/wifi/wifi.pro 2013-07-01 15:54:40 +0000
580@@ -0,0 +1,13 @@
581+include(../../common-project-config.pri)
582+include($${TOP_SRC_DIR}/common-vars.pri)
583+
584+TEMPLATE = lib
585+TARGET = wifi
586+
587+settings.files = $${TARGET}.settings
588+settings.path = $${PLUGIN_MANIFEST_DIR}
589+INSTALLS += settings
590+
591+image.files = settings-wifi.svg
592+image.path = /usr/share/settings/system/icons
593+INSTALLS += image
594
595=== added file 'plugins/wifi/wifi.settings'
596--- plugins/wifi/wifi.settings 1970-01-01 00:00:00 +0000
597+++ plugins/wifi/wifi.settings 2013-07-01 15:54:40 +0000
598@@ -0,0 +1,16 @@
599+{
600+ "icon": "/usr/share/settings/system/icons/settings-wifi.svg",
601+ "name": "Wi-Fi",
602+ "translations": "system-settings",
603+ "category": "network",
604+ "priority": 0,
605+ "keywords": [
606+ "network",
607+ "wireless",
608+ "wifi",
609+ "wi-fi",
610+ "settings"
611+ ],
612+ "has-dynamic-keywords": false,
613+ "has-dynamic-visibility": false
614+}

Subscribers

People subscribed via source and target branches