Qt: Add a set of 2x 24-pixel toolbar icons.

Add a script to create each PNG from its source SVG using Inkscape (which can conveniently be run from the command line). Change-Id: Ief7410cf76fb1553ce56f1c6bc1ade03ab5db1d6 Reviewed-on: https://code.wireshark.org/review/4964 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-27 17:32:26 -07:00 · 2014-10-27 17:32:26 -07:00 · c5e66b172e
parent 84f0ce4e23
commit c5e66b172e
38 changed files with 714 additions and 23 deletions
--- a/image/toolbar.qrc
+++ b/image/toolbar.qrc
@ -29,23 +29,44 @@
        <file>toolbar/16x16/zoom-original.png</file>
        <file>toolbar/16x16/zoom-out.png</file>
        <file>toolbar/24x24/edit-find.png</file>
+        <file>toolbar/24x24/edit-find@2x.png</file>
        <file>toolbar/24x24/go-first.png</file>
+        <file>toolbar/24x24/go-first@2x.png</file>
        <file>toolbar/24x24/go-jump.png</file>
+        <file>toolbar/24x24/go-jump@2x.png</file>
        <file>toolbar/24x24/go-last.png</file>
+        <file>toolbar/24x24/go-last@2x.png</file>
        <file>toolbar/24x24/go-next.png</file>
+        <file>toolbar/24x24/go-next@2x.png</file>
        <file>toolbar/24x24/go-previous.png</file>
-        <file>toolbar/24x24/x-capture-file-close.png</file>
+        <file>toolbar/24x24/go-previous@2x.png</file>
        <file>toolbar/24x24/x-capture-file-reload.png</file>
-        <file>toolbar/24x24/x-capture-file-save.png</file>
+        <file>toolbar/24x24/x-capture-file-reload@2x.png</file>
        <file>toolbar/24x24/x-capture-options.png</file>
+        <file>toolbar/24x24/x-capture-options@2x.png</file>
        <file>toolbar/24x24/x-capture-restart.png</file>
+        <file>toolbar/24x24/x-capture-restart@2x.png</file>
        <file>toolbar/24x24/x-capture-start.on.png</file>
+        <file>toolbar/24x24/x-capture-start.on@2x.png</file>
        <file>toolbar/24x24/x-capture-start.png</file>
+        <file>toolbar/24x24/x-capture-start@2x.png</file>
        <file>toolbar/24x24/x-capture-stop.png</file>
+        <file>toolbar/24x24/x-capture-stop@2x.png</file>
        <file>toolbar/24x24/x-colorize-packets.png</file>
+        <file>toolbar/24x24/x-colorize-packets@2x.png</file>
        <file>toolbar/24x24/x-resize-columns.png</file>
+        <file>toolbar/24x24/x-resize-columns@2x.png</file>
+        <file>toolbar/24x24/x-stay-last.png</file>
+        <file>toolbar/24x24/x-stay-last@2x.png</file>
        <file>toolbar/24x24/zoom-in.png</file>
+        <file>toolbar/24x24/zoom-in@2x.png</file>
        <file>toolbar/24x24/zoom-original.png</file>
+        <file>toolbar/24x24/zoom-original@2x.png</file>
        <file>toolbar/24x24/zoom-out.png</file>
+        <file>toolbar/24x24/zoom-out@2x.png</file>
+        <file>toolbar/24x24/x-capture-file-close.png</file>
+        <file>toolbar/24x24/x-capture-file-close@2x.png</file>
+        <file>toolbar/24x24/x-capture-file-save.png</file>
+        <file>toolbar/24x24/x-capture-file-save@2x.png</file>
    </qresource>
 </RCC>
--- a/image/toolbar/24x24/edit-find.png
+++ b/image/toolbar/24x24/edit-find.png
--- a/image/toolbar/24x24/edit-find@2x.png
+++ b/image/toolbar/24x24/edit-find@2x.png
--- a/image/toolbar/24x24/go-first@2x.png
+++ b/image/toolbar/24x24/go-first@2x.png
--- a/image/toolbar/24x24/go-jump@2x.png
+++ b/image/toolbar/24x24/go-jump@2x.png
--- a/image/toolbar/24x24/go-last.png
+++ b/image/toolbar/24x24/go-last.png
--- a/image/toolbar/24x24/go-last@2x.png
+++ b/image/toolbar/24x24/go-last@2x.png
--- a/image/toolbar/24x24/go-next@2x.png
+++ b/image/toolbar/24x24/go-next@2x.png
--- a/image/toolbar/24x24/go-previous@2x.png
+++ b/image/toolbar/24x24/go-previous@2x.png
--- a/image/toolbar/24x24/x-capture-file-close-orig.svg
+++ b/image/toolbar/24x24/x-capture-file-close-orig.svg
@ -0,0 +1,97 @@
+<?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="24"
+   height="24"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="x-capture-file-close.svg"
+   inkscape:export-filename="x-capture-file-close.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="12.925293"
+     inkscape:cx="13.757393"
+     inkscape:cy="11.816252"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1055"
+     inkscape:window-height="786"
+     inkscape:window-x="264"
+     inkscape:window-y="261"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3064"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1028.3622)">
+    <image
+       sodipodi:absref="/Users/gcombs/Development/wireshark/image/toolbar/24x24/x-capture-file-save.png"
+       xlink:href="x-capture-file-save.png"
+       y="1028.3622"
+       x="0"
+       id="image3836"
+       height="24"
+       width="24"
+       style="fill:#2e3436;stroke:#2e3436" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path3771"
+       d="m 18,1046.3622 -12,-12"
+       style="fill:#2e3436;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       style="fill:#2e3436;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 6,1046.3622 12,-12"
+       id="path3791"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
--- a/image/toolbar/24x24/x-capture-file-close.png
+++ b/image/toolbar/24x24/x-capture-file-close.png
--- a/image/toolbar/24x24/x-capture-file-close.svg
+++ b/image/toolbar/24x24/x-capture-file-close.svg
@ -15,10 +15,7 @@
   id="svg2"
   version="1.1"
   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="x-capture-file-close.svg"
-   inkscape:export-filename="x-capture-file-close.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   sodipodi:docname="x-capture-file-save.svg">
  <defs
     id="defs4">
    <inkscape:perspective
@ -36,21 +33,21 @@
     borderopacity="1.0"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
-     inkscape:zoom="21.416667"
-     inkscape:cx="13.757393"
-     inkscape:cy="12"
+     inkscape:zoom="22.893359"
+     inkscape:cx="9.6749014"
+     inkscape:cy="13.379973"
     inkscape:document-units="px"
     inkscape:current-layer="layer1"
     showgrid="true"
-     inkscape:window-width="1055"
-     inkscape:window-height="786"
-     inkscape:window-x="264"
-     inkscape:window-y="96"
+     inkscape:window-width="931"
+     inkscape:window-height="683"
+     inkscape:window-x="297"
+     inkscape:window-y="441"
     inkscape:window-maximized="0">
    <inkscape:grid
       type="xygrid"
-       id="grid3064"
-       empspacing="5"
+       id="grid3173"
+       empspacing="2"
       visible="true"
       enabled="true"
       snapvisiblegridlinesonly="true" />
@ -63,7 +60,7 @@
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
@ -73,14 +70,18 @@
     id="layer1"
     transform="translate(0,-1028.3622)">
    <image
-       sodipodi:absref="/Users/gerald/Development/wireshark/image/toolbar/24x24/x-capture-file-save.png"
-       xlink:href="x-capture-file-save.png"
-       style="fill:#2e3436;stroke:#2e3436"
-       width="24"
-       height="24"
-       id="image3836"
+       y="1028.3622"
       x="0"
-       y="1028.3622" />
+       id="image3237"
+       xlink:href="../../WiresharkDoc-24.png"
+       height="24"
+       width="24" />
+    <path
+       style="fill:none;stroke:#888a85;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 2.5000001,1028.8622 c 0,23 0,23 0,23 l 19.0000009,0 0,-17.7728 L 16.5,1028.8622 z"
+       id="path3240"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
    <path
       sodipodi:nodetypes="cc"
       inkscape:connector-curvature="0"
--- a/image/toolbar/24x24/x-capture-file-close@2x.png
+++ b/image/toolbar/24x24/x-capture-file-close@2x.png
--- a/image/toolbar/24x24/x-capture-file-close@2x.svg
+++ b/image/toolbar/24x24/x-capture-file-close@2x.svg
@ -0,0 +1,98 @@
+<?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="48"
+   height="48"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="x-capture-file-close@2x.svg">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16.09375"
+     inkscape:cx="20.094058"
+     inkscape:cy="38.709887"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="931"
+     inkscape:window-height="683"
+     inkscape:window-x="305"
+     inkscape:window-y="327"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3173"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1004.3622)">
+    <image
+       y="1004.3622"
+       x="0"
+       id="image4129"
+       xlink:href="../../WiresharkDoc-48.png"
+       height="48"
+       width="48" />
+    <path
+       style="fill:none;stroke:#888a85;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 5,1005.3622 c 0,46 0,46 0,46 l 37,0 0,-37 -9.000002,-9 z"
+       id="path3240"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path3771"
+       d="m 36,1040.3622 -24,-24"
+       style="fill:#2e3436;stroke:#2e3436;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       style="fill:#2e3436;stroke:#2e3436;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 12,1040.3622 24,-24"
+       id="path3791"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
--- a/image/toolbar/24x24/x-capture-file-reload@2x.png
+++ b/image/toolbar/24x24/x-capture-file-reload@2x.png
--- a/image/toolbar/24x24/x-capture-file-save.png
+++ b/image/toolbar/24x24/x-capture-file-save.png
--- a/image/toolbar/24x24/x-capture-file-save.svg
+++ b/image/toolbar/24x24/x-capture-file-save.svg
@ -0,0 +1,86 @@
+<?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="24"
+   height="24"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="x-capture-file-save.svg">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.893359"
+     inkscape:cx="9.6749014"
+     inkscape:cy="13.379973"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="931"
+     inkscape:window-height="683"
+     inkscape:window-x="297"
+     inkscape:window-y="441"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3173"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1028.3622)">
+    <image
+       y="1028.3622"
+       x="0"
+       id="image3237"
+       xlink:href="../../WiresharkDoc-24.png"
+       height="24"
+       width="24" />
+    <path
+       style="fill:none;stroke:#888a85;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 2.5000001,1028.8622 c 0,23 0,23 0,23 l 19.0000009,0 0,-17.7728 L 16.5,1028.8622 z"
+       id="path3240"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+  </g>
+</svg>
--- a/image/toolbar/24x24/x-capture-file-save@2x.png
+++ b/image/toolbar/24x24/x-capture-file-save@2x.png
--- a/image/toolbar/24x24/x-capture-file-save@2x.svg
+++ b/image/toolbar/24x24/x-capture-file-save@2x.svg
@ -0,0 +1,86 @@
+<?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="48"
+   height="48"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="x-capture-file-save@2x.svg">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16.09375"
+     inkscape:cx="21.181437"
+     inkscape:cy="23.499795"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="931"
+     inkscape:window-height="683"
+     inkscape:window-x="305"
+     inkscape:window-y="327"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3173"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1004.3622)">
+    <image
+       y="1004.3622"
+       x="0"
+       id="image4129"
+       xlink:href="../../WiresharkDoc-48.png"
+       height="48"
+       width="48" />
+    <path
+       style="fill:none;stroke:#888a85;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 5,1005.3622 c 0,46 0,46 0,46 l 37,0 0,-37 -9.000002,-9 z"
+       id="path3240"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+  </g>
+</svg>
--- a/image/toolbar/24x24/x-capture-options.png
+++ b/image/toolbar/24x24/x-capture-options.png
--- a/image/toolbar/24x24/x-capture-options@2x.png
+++ b/image/toolbar/24x24/x-capture-options@2x.png
--- a/image/toolbar/24x24/x-capture-restart.png
+++ b/image/toolbar/24x24/x-capture-restart.png
--- a/image/toolbar/24x24/x-capture-restart@2x.png
+++ b/image/toolbar/24x24/x-capture-restart@2x.png
--- a/image/toolbar/24x24/x-capture-start.on.png
+++ b/image/toolbar/24x24/x-capture-start.on.png
--- a/image/toolbar/24x24/x-capture-start.on@2x.png
+++ b/image/toolbar/24x24/x-capture-start.on@2x.png
--- a/image/toolbar/24x24/x-capture-start.png
+++ b/image/toolbar/24x24/x-capture-start.png
--- a/image/toolbar/24x24/x-capture-start@2x.png
+++ b/image/toolbar/24x24/x-capture-start@2x.png
--- a/image/toolbar/24x24/x-capture-stop.png
+++ b/image/toolbar/24x24/x-capture-stop.png
--- a/image/toolbar/24x24/x-capture-stop@2x.png
+++ b/image/toolbar/24x24/x-capture-stop@2x.png
--- a/image/toolbar/24x24/x-colorize-packets@2x.png
+++ b/image/toolbar/24x24/x-colorize-packets@2x.png
--- a/image/toolbar/24x24/x-resize-columns-motion.svg
+++ b/image/toolbar/24x24/x-resize-columns-motion.svg
@ -0,0 +1,209 @@
+<?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="24"
+   height="24"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="x-resize-columns-motion.svg"
+   inkscape:export-filename="x-resize-columns.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3838">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop3840" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:0;"
+         offset="1"
+         id="stop3842" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3798">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop3800" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:0;"
+         offset="1"
+         id="stop3802" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3838"
+       id="linearGradient3844"
+       x1="15"
+       y1="1040.3622"
+       x2="23"
+       y2="1040.3622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3838"
+       id="linearGradient3851"
+       gradientUnits="userSpaceOnUse"
+       x1="4"
+       y1="1040.3622"
+       x2="12"
+       y2="1040.3622" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="24.659327"
+     inkscape:cx="12.836988"
+     inkscape:cy="12"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1233"
+     inkscape:window-height="744"
+     inkscape:window-x="99"
+     inkscape:window-y="800"
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="12,21"
+       id="guide4544" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="6,18"
+       id="guide4552" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1028.3622)">
+    <rect
+       style="fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4165"
+       width="22"
+       height="22"
+       x="1"
+       y="1"
+       transform="translate(0,1028.3622)" />
+    <path
+       inkscape:transform-center-y="-1.309546"
+       transform="matrix(1.219616,0,0,0.6984127,11.850752,1034.0844)"
+       d="M 28,14 C 17.607695,14 17.607695,14 22.803847,5.0000001 28,-4 28,-4 33.196152,4.9999999 38.392305,14 38.392305,14 28,14 z"
+       inkscape:randomized="0"
+       inkscape:rounded="1"
+       inkscape:flatsided="true"
+       sodipodi:arg2="2.6179939"
+       sodipodi:arg1="1.5707963"
+       sodipodi:r2="3"
+       sodipodi:r1="6"
+       sodipodi:cy="8"
+       sodipodi:cx="28"
+       sodipodi:sides="3"
+       id="path3897"
+       style="fill:#4e9a06;fill-opacity:1;stroke:#2a5703;stroke-width:1.08350861;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="star" />
+    <path
+       style="fill:none;stroke:#2e3436;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.5,1029.8622 c 21,0 21,0 21,0"
+       id="path4113"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4115"
+       d="m 1.5,1032.8622 c 21,0 21,0 21,0"
+       style="fill:#ef2929;stroke:#babdb6;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#babdb6;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.4999999,1038.8622 c 20.9999991,0 20.9999991,0 20.9999991,0"
+       id="path4117"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4119"
+       d="m 1.4999999,1035.8622 c 20.9999991,0 20.9999991,0 20.9999991,0"
+       style="fill:none;stroke:#babdb6;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#babdb6;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.4999999,1041.8622 c 20.9999991,0 20.9999991,0 20.9999991,0"
+       id="path4121"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4123"
+       d="m 1.5,1047.8622 c 21,0 21,0 21,0"
+       style="fill:#f57900;stroke:#babdb6;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#babdb6;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.4999999,1044.8622 c 20.9999991,0 20.9999991,0 20.9999991,0"
+       id="path4125"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#2e3436;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.5,1050.8622 c 21,0 21,0 21,0"
+       id="path4127"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#888a85;stroke:#3465a4;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 14.5,1029.8622 c 0,21 0,21 0,21"
+       id="path4546"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4548"
+       d="m 3.4999996,1029.8604 c 0,21.0018 0,21.0018 0,21.0018"
+       style="fill:#888a85;stroke:#3465a4;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+    <rect
+       style="fill:url(#linearGradient3844);fill-opacity:1;stroke:none;opacity:0.5"
+       id="rect3796"
+       width="8"
+       height="22"
+       x="15"
+       y="1029.3622" />
+    <rect
+       y="1029.3622"
+       x="4"
+       height="22"
+       width="8"
+       id="rect3846"
+       style="opacity:0.50000000000000000;fill:url(#linearGradient3851);fill-opacity:1.0;stroke:none" />
+  </g>
+</svg>
--- a/image/toolbar/24x24/x-resize-columns@2x.png
+++ b/image/toolbar/24x24/x-resize-columns@2x.png
--- a/image/toolbar/24x24/x-stay-last@2x.png
+++ b/image/toolbar/24x24/x-stay-last@2x.png
--- a/image/toolbar/24x24/zoom-in@2x.png
+++ b/image/toolbar/24x24/zoom-in@2x.png
--- a/image/toolbar/24x24/zoom-original@2x.png
+++ b/image/toolbar/24x24/zoom-original@2x.png
--- a/image/toolbar/24x24/zoom-out@2x.png
+++ b/image/toolbar/24x24/zoom-out@2x.png
--- a/image/toolbar/svg-to-png.sh
+++ b/image/toolbar/svg-to-png.sh
@ -0,0 +1,89 @@
+#!/bin/bash
+# svg-to-png
+# Convert SVG files to 1x and 2x PNGs. Dump a list of Qt resource
+# file entries upon successful completion.
+
+COMMON_ARGS="--export-area-page"
+ONE_X_ARGS="--export-width=24 --export-height=24"
+TWO_X_ARGS="--export-width=48 --export-height=48"
+
+set_source_svg() {
+    local out_icon=$1
+    case $out_icon in
+    x-capture-options)
+        SOURCE_SVG=x-capture-options-gear.svg
+        ;;
+    x-capture-restart)
+        SOURCE_SVG=x-capture-restart-fin.svg
+        ;;
+    x-capture-stop)
+        SOURCE_SVG=x-capture-stop-red.svg
+        ;;
+    *)
+        SOURCE_SVG=$out_icon.svg
+        ;;
+    esac
+}
+
+ICONS="
+    edit-find
+    go-first
+    go-jump
+    go-last
+    go-next
+    go-previous
+    x-capture-file-reload
+    x-capture-options
+    x-capture-restart
+    x-capture-start.on
+    x-capture-start
+    x-capture-stop
+    x-colorize-packets
+    x-resize-columns
+    x-stay-last
+    zoom-in
+    zoom-original
+    zoom-out
+    "
+
+# XXX Add support for 16 pixel icons.
+for SIZE in 24 ; do
+    SIZE_DIR=${SIZE}x${SIZE}
+    cd $SIZE_DIR
+
+    QRC_FILES=""
+    for ICON in $ICONS ; do
+        set_source_svg $ICON
+        ONE_X_PNG=${ICON}.png
+        TWO_X_PNG=${ICON}@2x.png
+
+        inkscape $COMMON_ARGS $ONE_X_ARGS \
+            --file=$SOURCE_SVG --export-png=$ONE_X_PNG || exit 1
+
+        inkscape $COMMON_ARGS $TWO_X_ARGS \
+            --file=$SOURCE_SVG --export-png=$TWO_X_PNG || exit 1
+
+        QRC_FILES="${QRC_FILES} ${ONE_X_PNG} ${TWO_X_PNG}"
+    done
+
+    # Save & close have to be done individually.
+
+    for ICON in x-capture-file-close x-capture-file-save ; do
+        ONE_X_PNG=${ICON}.png
+        TWO_X_PNG=${ICON}@2x.png
+        ONE_X_SVG=${ICON}.svg
+        TWO_X_SVG=${ICON}@2x.svg
+
+        inkscape $COMMON_ARGS $ONE_X_ARGS \
+            --file=$ONE_X_SVG --export-png=$ONE_X_PNG || exit 1
+
+        inkscape $COMMON_ARGS $TWO_X_ARGS \
+            --file=$TWO_X_SVG --export-png=$TWO_X_PNG || exit 1
+
+        QRC_FILES="${QRC_FILES} ${ONE_X_PNG} ${TWO_X_PNG}"
+    done
+
+    for QRC_FILE in $QRC_FILES ; do
+        echo "        <file>toolbar/${SIZE_DIR}/${QRC_FILE}</file>"
+    done
+done
--- a/ui/qt/wireshark_application.cpp
+++ b/ui/qt/wireshark_application.cpp
@ -582,6 +582,10 @@ WiresharkApplication::WiresharkApplication(int &argc,  char **argv) :
    }
 #endif // Q_OS_WIN

+#if (QT_VERSION >= QT_VERSION_CHECK(5, 1, 0))
+    setAttribute(Qt::AA_UseHighDpiPixmaps);
+#endif
+
    QList<int> icon_sizes = QList<int>() << 16 << 24 << 32 << 48 << 64 << 128 << 256 << 512 << 1024;
    foreach (int icon_size, icon_sizes) {
        QString icon_path = QString(":/wsicon/wsicon%1.png").arg(icon_size);