Get rid of the devices context; put the input devices icon in

places/dialog-input.svg, which is more consistent

diff --git a/share/icons/hicolor/scalable/devices/Makefile.am b/share/icons/hicolor/scalable/devices/Makefile.am
deleted file mode 100644 (file)
index 055151b..0000000
--- a/share/icons/hicolor/scalable/devices/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = scalable
-context = devices
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-# To update this list, run:
-# find . -name '*.svg' -and -not -name '*.svn*' -printf '\t%P \\\n' | sort | zenity --text-info
-# and paste the contents of the dialog box here
-
-icons_DATA = \
-       input-tablet.svg
-
-EXTRA_DIST = $(icons_DATA)

diff --git a/share/icons/hicolor/scalable/devices/input-tablet.svg b/share/icons/hicolor/scalable/devices/input-tablet.svg
deleted file mode 100644 (file)
index a4fadb9..0000000
--- a/share/icons/hicolor/scalable/devices/input-tablet.svg
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg5668"
-   sodipodi:version="0.32"
-   inkscape:version="0.46+devel r20666"
-   sodipodi:docname="input-tablet.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs5670">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1887-7"
-       id="linearGradient5750"
-       gradientUnits="userSpaceOnUse"
-       x1="121.11774"
-       y1="343.25803"
-       x2="130.35223"
-       y2="350.16364" />
-    <linearGradient
-       id="linearGradient1887-7">
-      <stop
-         id="stop1888-1"
-         offset="0.0000000"
-         style="stop-color:#fffdf8;stop-opacity:1.0000000;" />
-      <stop
-         id="stop1889-7"
-         offset="1.0000000"
-         style="stop-color:#cdccc7;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5740"
-       id="linearGradient5752"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.001797,0,0,0.906445,-290.1978,295.2598)"
-       x1="404.67871"
-       y1="46.338985"
-       x2="414.26022"
-       y2="46.339005" />
-    <linearGradient
-       id="linearGradient5740">
-      <stop
-         id="stop5742"
-         offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop5744"
-         offset="1.0000000"
-         style="stop-color:#98b6d3;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3480"
-       id="linearGradient5777"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-0.999998,-0.937496)"
-       x1="693.27899"
-       y1="303.70065"
-       x2="698.26788"
-       y2="311.07904" />
-    <linearGradient
-       id="linearGradient3480">
-      <stop
-         id="stop3482"
-         offset="0.0000000"
-         style="stop-color:#646464;stop-opacity:1.0000000;" />
-      <stop
-         id="stop3484"
-         offset="1.0000000"
-         style="stop-color:#000000;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3480"
-       id="linearGradient5779"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-0.999998,-0.937496)"
-       x1="693.40259"
-       y1="306.07037"
-       x2="696.86676"
-       y2="311.81979" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.5"
-     inkscape:cx="17.349053"
-     inkscape:cy="34.307435"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     gridtolerance="1"
-     inkscape:window-width="770"
-     inkscape:window-height="575"
-     inkscape:window-x="255"
-     inkscape:window-y="52"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid7154"
-       empspacing="5"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata5673">
-    <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>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       transform="matrix(3,0,0,3,-30.000003,-383.99994)"
-       id="input_devices">
-      <g
-         transform="matrix(1,0,0,0.996869,-105.0577,-206.2098)"
-         id="g5739">
-        <rect
-           y="338.80829"
-           x="115.5577"
-           height="11.99987"
-           width="14.99917"
-           id="rect5741"
-           style="color:#000000;fill:url(#linearGradient5750);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00156927;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" />
-        <rect
-           y="335.7579"
-           x="115.5588"
-           height="3.011261"
-           width="14.99819"
-           id="rect5744"
-           style="color:#000000;fill:url(#linearGradient5752);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00156915;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" />
-      </g>
-      <g
-         transform="matrix(1,0,0,1.066667,-679.5,-193.0001)"
-         id="g5768"
-         style="display:inline">
-        <rect
-           y="303.75"
-           x="691.5"
-           height="10.31249"
-           width="11"
-           id="rect5771"
-           style="fill:none;stroke:none" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           d="M 696.7189,305.998 696,305.5938 l -4,8 10,0 0,-0.9375"
-           style="fill:none;stroke:url(#linearGradient5777);stroke-width:0.96824569;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           id="path5773" />
-        <path
-           sodipodi:nodetypes="cc"
-           id="path5775"
-           d="m 694.5,309.375 c 1.5,0.4688 3,2.3438 2.5,4.2188"
-           style="fill:none;stroke:url(#linearGradient5779);stroke-width:0.96824569;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      </g>
-    </g>
-  </g>
-</svg>

diff --git a/share/icons/hicolor/scalable/places/Makefile.am b/share/icons/hicolor/scalable/places/Makefile.am
index ff032b53c31f3a2fa5253f743b6745dbd7369dd1..8de5b00e2b1743fc68da06067f041055d9d54f3d 100644 (file)
--- a/share/icons/hicolor/scalable/places/Makefile.am
+++ b/share/icons/hicolor/scalable/places/Makefile.am
@@ -15,6 +15,7 @@ icons_DATA = \
        dialog-align-and-distribute.svg \
        dialog-fill-and-stroke.svg \
        dialog-icon-preview.svg \
+       dialog-input.svg \
        dialog-layers.svg \
        dialog-memory.svg \
        dialog-messages.svg \

diff --git a/share/icons/hicolor/scalable/places/dialog-input.svg b/share/icons/hicolor/scalable/places/dialog-input.svg
new file mode 100644 (file)
index 0000000..a4fadb9
--- /dev/null
+++ b/share/icons/hicolor/scalable/places/dialog-input.svg
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg5668"
+   sodipodi:version="0.32"
+   inkscape:version="0.46+devel r20666"
+   sodipodi:docname="input-tablet.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs5670">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1887-7"
+       id="linearGradient5750"
+       gradientUnits="userSpaceOnUse"
+       x1="121.11774"
+       y1="343.25803"
+       x2="130.35223"
+       y2="350.16364" />
+    <linearGradient
+       id="linearGradient1887-7">
+      <stop
+         id="stop1888-1"
+         offset="0.0000000"
+         style="stop-color:#fffdf8;stop-opacity:1.0000000;" />
+      <stop
+         id="stop1889-7"
+         offset="1.0000000"
+         style="stop-color:#cdccc7;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5740"
+       id="linearGradient5752"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.001797,0,0,0.906445,-290.1978,295.2598)"
+       x1="404.67871"
+       y1="46.338985"
+       x2="414.26022"
+       y2="46.339005" />
+    <linearGradient
+       id="linearGradient5740">
+      <stop
+         id="stop5742"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop5744"
+         offset="1.0000000"
+         style="stop-color:#98b6d3;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3480"
+       id="linearGradient5777"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.999998,-0.937496)"
+       x1="693.27899"
+       y1="303.70065"
+       x2="698.26788"
+       y2="311.07904" />
+    <linearGradient
+       id="linearGradient3480">
+      <stop
+         id="stop3482"
+         offset="0.0000000"
+         style="stop-color:#646464;stop-opacity:1.0000000;" />
+      <stop
+         id="stop3484"
+         offset="1.0000000"
+         style="stop-color:#000000;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3480"
+       id="linearGradient5779"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.999998,-0.937496)"
+       x1="693.40259"
+       y1="306.07037"
+       x2="696.86676"
+       y2="311.81979" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.5"
+     inkscape:cx="17.349053"
+     inkscape:cy="34.307435"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     gridtolerance="1"
+     inkscape:window-width="770"
+     inkscape:window-height="575"
+     inkscape:window-x="255"
+     inkscape:window-y="52"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid7154"
+       empspacing="5"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5673">
+    <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>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       transform="matrix(3,0,0,3,-30.000003,-383.99994)"
+       id="input_devices">
+      <g
+         transform="matrix(1,0,0,0.996869,-105.0577,-206.2098)"
+         id="g5739">
+        <rect
+           y="338.80829"
+           x="115.5577"
+           height="11.99987"
+           width="14.99917"
+           id="rect5741"
+           style="color:#000000;fill:url(#linearGradient5750);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00156927;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" />
+        <rect
+           y="335.7579"
+           x="115.5588"
+           height="3.011261"
+           width="14.99819"
+           id="rect5744"
+           style="color:#000000;fill:url(#linearGradient5752);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00156915;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" />
+      </g>
+      <g
+         transform="matrix(1,0,0,1.066667,-679.5,-193.0001)"
+         id="g5768"
+         style="display:inline">
+        <rect
+           y="303.75"
+           x="691.5"
+           height="10.31249"
+           width="11"
+           id="rect5771"
+           style="fill:none;stroke:none" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           d="M 696.7189,305.998 696,305.5938 l -4,8 10,0 0,-0.9375"
+           style="fill:none;stroke:url(#linearGradient5777);stroke-width:0.96824569;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path5773" />
+        <path
+           sodipodi:nodetypes="cc"
+           id="path5775"
+           d="m 694.5,309.375 c 1.5,0.4688 3,2.3438 2.5,4.2188"
+           style="fill:none;stroke:url(#linearGradient5779);stroke-width:0.96824569;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      </g>
+    </g>
+  </g>
+</svg>