Merge lp:~adam-collard/landscape-client/sock-in-panel into lp:~landscape/landscape-client/trunk

[Adam Collard]

Replace the icon in the Unity Control Center (System Settings) dialog to use the new Landscape icon.

The associated UI with registering a machine with Landscape also uses the same icon.

This branch replaces the icon in the Unity Control Center (System Settings) dialog to use the new Landscape icon.

The associated UI with registering a machine with Landscape also uses the same icon.

Screenshot of it in action: http://i.imgur.com/ZT2X9Ib.png

[Geoff Teale (tealeg)]

+1 Sock it to me!

review: Approve

[Alberto Donato (ack)]

+1!

review: Approve

=== modified file 'icons/preferences-management-service.svg'
--- icons/preferences-management-service.svg	2012-03-16 17:01:10 +0000
+++ icons/preferences-management-service.svg	2014-06-13 15:10:51 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
@@ -10,53 +10,45 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
+   id="artwork"
    x="0px"
    y="0px"
-   width="32"
-   height="32"
-   viewBox="-0.787 -0.867 32 32"
-   enable-background="new -0.787 -0.867 285 285"
+   width="34px"
+   height="34px"
+   viewBox="0 0 34 34"
+   enable-background="new 0 0 34 34"
    xml:space="preserve"
-   id="svg2"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="canonical_aubergine_hex.svg"><metadata
-   id="metadata12"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="697"
-   inkscape:window-height="480"
-   id="namedview10"
-   showgrid="false"
-   fit-margin-top="0"
-   fit-margin-left="0"
-   fit-margin-right="0"
-   fit-margin-bottom="0"
-   inkscape:zoom="7.38"
-   inkscape:cx="15.9035"
-   inkscape:cy="16.176"
-   inkscape:window-x="449"
-   inkscape:window-y="100"
-   inkscape:window-maximized="0"
-   inkscape:current-layer="svg2" />
-<defs
-   id="defs4">
-</defs>
-<path
-   d="m 15.21339,25.32101 c -5.62692,0 -10.18809,-4.55982 -10.18809,-10.18812 0,-5.62706 4.56117,-10.18768 10.18809,-10.18768 5.62705,0 10.18798,4.56062 10.18798,10.18768 0,5.6283 -4.56082,10.18812 -10.18798,10.18812 z"
-   id="path6"
-   inkscape:connector-curvature="0"
-   style="fill:#772953" />
-<path
-   d="M 31.213,15.13334 C 31.213,23.96956 24.04959,31.133 15.21294,31.133 6.37607,31.133 -0.787,23.96945 -0.787,15.13334 -0.787,6.29621 6.37607,-0.867 15.21306,-0.867 24.04959,-0.867 31.213,6.29621 31.213,15.13334 z M 15.21306,3.025 c -6.68751,0 -12.10774,5.42115 -12.10774,12.10823 0,6.68809 5.42023,12.10755 12.10774,12.10755 6.68773,0 12.10796,-5.41946 12.10796,-12.10755 C 27.32102,8.44615 21.90079,3.025 15.21306,3.025 z"
-   id="path8"
-   inkscape:connector-curvature="0"
-   style="fill:#772953" />
-</svg>
\ No newline at end of file
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="landscape_favicon_32px.svg"><metadata
+     id="metadata3887"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs3885" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview3883"
+     showgrid="false"
+     inkscape:zoom="6.9411765"
+     inkscape:cx="17"
+     inkscape:cy="17"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="artwork" /><circle
+     fill="#DD4814"
+     cx="17"
+     cy="17.001"
+     r="16"
+     id="circle3877" /><g
+     id="g3879"><polygon
+       fill="#FFFFFF"
+       points="24.5,26.5 10.5,26.5 10.5,6.5 11.5,6.5 11.5,25.5 23.5,25.5 23.5,22.5 14.5,22.5 14.5,7.5    13.5,7.5 13.5,23.5 22.5,23.5 22.5,24.5 12.5,24.5 12.5,6.5 15.5,6.5 15.5,21.5 24.5,21.5  "
+       id="polygon3881" /></g></svg>
\ No newline at end of file