Merge lp:~snwh/landscape-client/high-contrast-icon into lp:~landscape/landscape-client/trunk

[Sam Hewitt]

Landscape client was missing an icon for the high contrast accessibility theme; icon was added to solve LP #1082097.

[Geoff Teale (tealeg)]

Hi, thanks for helping out!

For me this branch seems to remove the old icon file and put the same icon in the HighContrast folder. I have 2 issues:

[1]. The old location of the icon file is still referred to in setup.py when setting it up for the hicolor icon theme.

[2]. It seems to be the same icon in HighContrast. It's quite contrasty so I guess that's OK, but wouldn't we fall back to that icon anyway if none were found in the HighContrast theme?

review: Needs Fixing

[Dean Henrichsmeyer (dean)]

This one isn't moving. Removing it from the queue unless and until it's alive again.

Unmerged revisions

694. By Sam Hewitt on 2013-06-22

Added high contrast icon; fixes LP 1082097

=== modified file 'debian/landscape-client-ui-install.install'
--- debian/landscape-client-ui-install.install	2012-03-22 18:43:44 +0000
+++ debian/landscape-client-ui-install.install	2013-06-22 04:29:30 +0000
@@ -1,4 +1,5 @@
 usr/bin/landscape-client-ui-install
 usr/share/applications/landscape-client-settings.desktop
 usr/share/icons/hicolor/scalable/apps/preferences-management-service.svg
+usr/share/icons/HighContrast/scalable/apps/preferences-management-service.svg
 usr/share/locale

=== added directory 'icons/HighContrast'
=== added directory 'icons/HighContrast/scalable'
=== added file 'icons/HighContrast/scalable/preferences-management-service.svg'
--- icons/HighContrast/scalable/preferences-management-service.svg	1970-01-01 00:00:00 +0000
+++ icons/HighContrast/scalable/preferences-management-service.svg	2013-06-22 04:29:30 +0000
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   width="48"
+   height="48"
+   viewBox="-0.787 -0.867 48 48"
+   enable-background="new -0.787 -0.867 285 285"
+   xml:space="preserve"
+   id="svg2"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="preferences-management-service.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 /></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="1366"
+     inkscape:window-height="713"
+     id="namedview10"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="5.9013309"
+     inkscape:cx="-12.030526"
+     inkscape:cy="-5.5665641"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" /><defs
+     id="defs4" /><path
+     style="fill:none;stroke:#ffffff;stroke-width:8;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     inkscape:connector-curvature="0"
+     id="path2983"
+     d="m 23.213055,33.3209 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" /><path
+     style="fill:none;stroke:#ffffff;stroke-width:8;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     inkscape:connector-curvature="0"
+     id="path2985"
+     d="M 39.213,23.13334 C 39.213,31.96956 32.04959,39.133 23.21294,39.133 14.37607,39.133 7.213,31.96945 7.213,23.13334 7.213,14.29621 14.37607,7.133 23.21306,7.133 32.04959,7.133 39.213,14.29621 39.213,23.13334 z M 23.21306,11.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 0,-6.68708 -5.42023,-12.10823 -12.10796,-12.10823 z" /><path
+     d="m 23.213055,33.3209 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 39.213,23.13334 C 39.213,31.96956 32.04959,39.133 23.21294,39.133 14.37607,39.133 7.213,31.96945 7.213,23.13334 7.213,14.29621 14.37607,7.133 23.21306,7.133 32.04959,7.133 39.213,14.29621 39.213,23.13334 z M 23.21306,11.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 0,-6.68708 -5.42023,-12.10823 -12.10796,-12.10823 z"
+     id="path8"
+     inkscape:connector-curvature="0"
+     style="fill:#772953" /></svg>
\ No newline at end of file

=== removed file 'icons/preferences-management-service.svg'
--- icons/preferences-management-service.svg	2012-03-16 17:01:10 +0000
+++ icons/preferences-management-service.svg	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   x="0px"
-   y="0px"
-   width="32"
-   height="32"
-   viewBox="-0.787 -0.867 32 32"
-   enable-background="new -0.787 -0.867 285 285"
-   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

=== modified file 'setup.py'
--- setup.py	2013-06-03 12:26:30 +0000
+++ setup.py	2013-06-22 04:29:30 +0000
@@ -45,6 +45,8 @@
             "dbus-1/landscape.conf"]),
           ("/usr/share/icons/hicolor/scalable/apps/",
            ["icons/preferences-management-service.svg"]),
+		  ("/usr/share/icons/HighContrast/scalable/apps/",
+           ["icons/HighContrast/scalable/preferences-management-service.svg"]),
           ("/usr/share/glib-2.0/schemas/", glib_path)],
       scripts=["scripts/landscape-client",
                "scripts/landscape-config",