osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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

Optimize the toolbar PNGs.

To do: The rest of the PNGs.

Change-Id: Ieed8b0d099655994d43cdc9cf6c9a094d84c1802
Reviewed-on: https://code.wireshark.org/review/4978
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2014-10-28 12:00:44 -07:00
parent e86553e13c
commit 0b03183f0a
89 changed files with 352 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
Makefile.am
View File

@ -901,51 +901,74 @@ EXTRA_DIST = \
image/stock_dialog_warning_48.xpm \
image/text2pcap.rc.in \
image/tfshark.rc.in \
image/toolbar/16x16/edit-find.png \
image/toolbar/16x16/edit-find.svg \
image/toolbar/16x16/edit-find.png \
image/toolbar/16x16/edit-find.svg \
image/toolbar/16x16/edit-find@2x.png \
image/toolbar/16x16/go-first.png \
image/toolbar/16x16/go-first.svg \
image/toolbar/16x16/go-jump.png \
image/toolbar/16x16/go-jump.svg \
image/toolbar/16x16/go-last.png \
image/toolbar/16x16/go-last.svg \
image/toolbar/16x16/go-next.png \
image/toolbar/16x16/go-next.svg \
image/toolbar/16x16/go-first@2x.png \
image/toolbar/16x16/go-jump.png \
image/toolbar/16x16/go-jump.svg \
image/toolbar/16x16/go-jump@2x.png \
image/toolbar/16x16/go-last.png \
image/toolbar/16x16/go-last.svg \
image/toolbar/16x16/go-last@2x.png \
image/toolbar/16x16/go-next.png \
image/toolbar/16x16/go-next.svg \
image/toolbar/16x16/go-next@2x.png \
image/toolbar/16x16/go-previous.png \
image/toolbar/16x16/go-previous.svg \
image/toolbar/16x16/x-capture-file-close.png \
image/toolbar/16x16/x-capture-file-close.svg \
image/toolbar/16x16/x-capture-file-reload.png \
image/toolbar/16x16/x-capture-file-reload.svg \
image/toolbar/16x16/x-capture-file-save.png \
image/toolbar/16x16/x-capture-options-gear.svg \
image/toolbar/16x16/go-previous@2x.png \
image/toolbar/16x16/x-capture-file-close.png \
image/toolbar/16x16/x-capture-file-close.svg \
image/toolbar/16x16/x-capture-file-close@2x.png \
image/toolbar/16x16/x-capture-file-close@2x.svg \
image/toolbar/16x16/x-capture-file-reload.png \
image/toolbar/16x16/x-capture-file-reload.svg \
image/toolbar/16x16/x-capture-file-reload@2x.png \
image/toolbar/16x16/x-capture-file-save.png \
image/toolbar/16x16/x-capture-file-save.svg \
image/toolbar/16x16/x-capture-file-save@2x.png \
image/toolbar/16x16/x-capture-file-save@2x.svg \
image/toolbar/16x16/x-capture-options-gear.svg \
image/toolbar/16x16/x-capture-options-wrench.svg \
image/toolbar/16x16/x-capture-options.png \
image/toolbar/16x16/x-capture-restart-fin.svg \
image/toolbar/16x16/x-capture-options.png \
image/toolbar/16x16/x-capture-options@2x.png \
image/toolbar/16x16/x-capture-restart-fin.svg \
image/toolbar/16x16/x-capture-restart-triangle1.svg \
image/toolbar/16x16/x-capture-restart-triangle2.svg \
image/toolbar/16x16/x-capture-restart-turn1.svg \
image/toolbar/16x16/x-capture-restart-turn2.svg \
image/toolbar/16x16/x-capture-restart.png \
image/toolbar/16x16/x-capture-start.on.png \
image/toolbar/16x16/x-capture-start.on.svg \
image/toolbar/16x16/x-capture-start.png \
image/toolbar/16x16/x-capture-start.svg \
image/toolbar/16x16/x-capture-stop-red.svg \
image/toolbar/16x16/x-capture-stop-white.svg \
image/toolbar/16x16/x-capture-stop.png \
image/toolbar/16x16/x-capture-restart-turn1.svg \
image/toolbar/16x16/x-capture-restart-turn2.svg \
image/toolbar/16x16/x-capture-restart.png \
image/toolbar/16x16/x-capture-restart@2x.png \
image/toolbar/16x16/x-capture-start.on.png \
image/toolbar/16x16/x-capture-start.on.svg \
image/toolbar/16x16/x-capture-start.on@2x.png \
image/toolbar/16x16/x-capture-start.png \
image/toolbar/16x16/x-capture-start.svg \
image/toolbar/16x16/x-capture-start@2x.png \
image/toolbar/16x16/x-capture-stop-red.svg \
image/toolbar/16x16/x-capture-stop-white.svg \
image/toolbar/16x16/x-capture-stop.png \
image/toolbar/16x16/x-capture-stop@2x.png \
image/toolbar/16x16/x-colorize-packets.png \
image/toolbar/16x16/x-colorize-packets.svg \
image/toolbar/16x16/x-colorize-packets@2x.png \
image/toolbar/16x16/x-resize-columns.png \
image/toolbar/16x16/x-resize-columns.svg \
image/toolbar/16x16/x-resize-columns@2x.png \
image/toolbar/16x16/x-stay-last.png \
image/toolbar/16x16/x-stay-last.svg \
image/toolbar/16x16/x-stay-last@2x.png \
image/toolbar/16x16/zoom-in.png \
image/toolbar/16x16/zoom-in.svg \
image/toolbar/16x16/zoom-in@2x.png \
image/toolbar/16x16/zoom-original.png \
image/toolbar/16x16/zoom-original.svg \
image/toolbar/16x16/zoom-original@2x.png \
image/toolbar/16x16/zoom-out.png \
image/toolbar/16x16/zoom-out.svg \
image/toolbar/16x16/zoom-out@2x.png \
image/toolbar/24x24/edit-find.png \
image/toolbar/24x24/edit-find.svg \
image/toolbar/24x24/edit-find@2x.png \
@ -964,7 +987,6 @@ EXTRA_DIST = \
image/toolbar/24x24/go-previous.png \
image/toolbar/24x24/go-previous.svg \
image/toolbar/24x24/go-previous@2x.png \
image/toolbar/24x24/x-capture-file-close-orig.svg \
image/toolbar/24x24/x-capture-file-close.png \
image/toolbar/24x24/x-capture-file-close.svg \
image/toolbar/24x24/x-capture-file-close@2x.png \

23
image/toolbar.qrc
View File

@ -10,24 +10,45 @@
</qresource>
<qresource prefix="/icons">
<file>toolbar/16x16/edit-find.png</file>
<file>toolbar/16x16/edit-find@2x.png</file>
<file>toolbar/16x16/go-first.png</file>
<file>toolbar/16x16/go-first@2x.png</file>
<file>toolbar/16x16/go-jump.png</file>
<file>toolbar/16x16/go-jump@2x.png</file>
<file>toolbar/16x16/go-last.png</file>
<file>toolbar/16x16/go-last@2x.png</file>
<file>toolbar/16x16/go-next.png</file>
<file>toolbar/16x16/go-next@2x.png</file>
<file>toolbar/16x16/go-previous.png</file>
<file>toolbar/16x16/go-previous@2x.png</file>
<file>toolbar/16x16/x-capture-file-close.png</file>
<file>toolbar/16x16/x-capture-file-reload.png</file>
<file>toolbar/16x16/x-capture-file-close@2x.png</file>
<file>toolbar/16x16/x-capture-file-save.png</file>
<file>toolbar/16x16/x-capture-file-save@2x.png</file>
<file>toolbar/16x16/x-capture-file-reload.png</file>
<file>toolbar/16x16/x-capture-file-reload@2x.png</file>
<file>toolbar/16x16/x-capture-options.png</file>
<file>toolbar/16x16/x-capture-options@2x.png</file>
<file>toolbar/16x16/x-capture-restart.png</file>
<file>toolbar/16x16/x-capture-restart@2x.png</file>
<file>toolbar/16x16/x-capture-start.on.png</file>
<file>toolbar/16x16/x-capture-start.on@2x.png</file>
<file>toolbar/16x16/x-capture-start.png</file>
<file>toolbar/16x16/x-capture-start@2x.png</file>
<file>toolbar/16x16/x-capture-stop.png</file>
<file>toolbar/16x16/x-capture-stop@2x.png</file>
<file>toolbar/16x16/x-colorize-packets.png</file>
<file>toolbar/16x16/x-colorize-packets@2x.png</file>
<file>toolbar/16x16/x-resize-columns.png</file>
<file>toolbar/16x16/x-resize-columns@2x.png</file>
<file>toolbar/16x16/x-stay-last.png</file>
<file>toolbar/16x16/x-stay-last@2x.png</file>
<file>toolbar/16x16/zoom-in.png</file>
<file>toolbar/16x16/zoom-in@2x.png</file>
<file>toolbar/16x16/zoom-original.png</file>
<file>toolbar/16x16/zoom-original@2x.png</file>
<file>toolbar/16x16/zoom-out.png</file>
<file>toolbar/16x16/zoom-out@2x.png</file>
<file>toolbar/24x24/edit-find.png</file>
<file>toolbar/24x24/edit-find@2x.png</file>
<file>toolbar/24x24/go-first.png</file>

BIN
image/toolbar/16x16/edit-find.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 602 B

After

Width:  |  Height:  |  Size: 523 B

BIN
image/toolbar/16x16/edit-find@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 902 B

BIN
image/toolbar/16x16/go-first.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 579 B

After

Width:  |  Height:  |  Size: 450 B

BIN
image/toolbar/16x16/go-first@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 837 B

BIN
image/toolbar/16x16/go-jump.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 574 B

After

Width:  |  Height:  |  Size: 458 B

BIN
image/toolbar/16x16/go-jump@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 821 B

BIN
image/toolbar/16x16/go-last.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 594 B

After

Width:  |  Height:  |  Size: 448 B

BIN
image/toolbar/16x16/go-last@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 833 B

BIN
image/toolbar/16x16/go-next.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 550 B

After

Width:  |  Height:  |  Size: 430 B

BIN
image/toolbar/16x16/go-next@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 815 B

BIN
image/toolbar/16x16/go-previous.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 542 B

After

Width:  |  Height:  |  Size: 436 B

BIN
image/toolbar/16x16/go-previous@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 817 B

BIN
image/toolbar/16x16/x-capture-file-close.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 825 B

After

Width:  |  Height:  |  Size: 687 B

34
image/toolbar/16x16/x-capture-file-close.svg
View File

@ -36,16 +36,16 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="32.125"
inkscape:cx="8.6038579"
inkscape:cy="8"
inkscape:zoom="34.727236"
inkscape:cx="8"
inkscape:cy="7.7500087"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:window-width="1200"
inkscape:window-height="742"
inkscape:window-x="484"
inkscape:window-y="196"
inkscape:window-x="226"
inkscape:window-y="316"
inkscape:window-maximized="0">
<inkscape:grid
type="xygrid"
@ -73,24 +73,30 @@
id="layer1"
transform="translate(0,-1036.3622)">
<image
sodipodi:absref="/Users/gerald/Development/wireshark/image/toolbar/16x16/x-capture-file-save.png"
xlink:href="x-capture-file-save.png"
y="1036.3622"
x="0"
id="image3882"
id="image3135"
xlink:href="../../WiresharkDoc-16.png"
height="16"
width="16" />
<path
style="fill:#2e3436;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
d="m 3,1049.3622 10,-10"
id="path3769"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path3771"
d="m 13,1049.3622 -10,-10"
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:none;stroke:#888a85;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 1.5,0.5 0,15 13,0 0,-11 -4,-4 z"
id="path3140"
inkscape:connector-curvature="0"
transform="translate(0,1036.3622)"
sodipodi:nodetypes="cccccc" />
<path
style="fill:#2e3436;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
d="m 3,1049.3622 10,-10"
id="path3769"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
image/toolbar/16x16/x-capture-file-close@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

52
image/toolbar/24x24/x-capture-file-close-orig.svg → image/toolbar/16x16/x-capture-file-close@2x.svg
View File

@ -10,12 +10,12 @@
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"
width="32"
height="32"
id="svg2"
version="1.1"
inkscape:version="0.48.2 r9819"
sodipodi:docname="x-capture-file-close.svg"
sodipodi:docname="x-capture-file-close@2x.svg"
inkscape:export-filename="x-capture-file-close.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
@ -36,21 +36,21 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="12.925293"
inkscape:cx="13.757393"
inkscape:cy="11.816252"
inkscape:zoom="17.906231"
inkscape:cx="16.000017"
inkscape:cy="16.000017"
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-width="1200"
inkscape:window-height="742"
inkscape:window-x="226"
inkscape:window-y="316"
inkscape:window-maximized="0">
<inkscape:grid
type="xygrid"
id="grid3064"
empspacing="5"
empspacing="4"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true" />
@ -71,26 +71,30 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-1028.3622)">
transform="translate(0,-1020.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"
y="1020.3622"
x="0"
id="image3836"
height="24"
width="24"
style="fill:#2e3436;stroke:#2e3436" />
id="image3272"
xlink:href="file:///Users/gcombs/Development/wireshark/image/WiresharkDoc-32.png"
height="32"
width="32" />
<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" />
d="m 26,1046.3622 -20,-20"
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: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"
style="fill:none;stroke:#888a85;stroke-width:2px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 3,1021.3622 0,30 26,0 0,-22 -8,-8 z"
id="path3140"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccc" />
<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 6,1046.3622 20,-20"
id="path3769"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
</g>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
image/toolbar/16x16/x-capture-file-reload.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 779 B

After

Width:  |  Height:  |  Size: 694 B

3
image/toolbar/16x16/x-capture-file-reload.svg
View File

@ -87,8 +87,7 @@
id="layer1"
transform="translate(0,-1036.3622)">
<image
sodipodi:absref="/Users/gcombs/Development/wireshark/image/toolbar/16x16/x-capture-file-save.png"
xlink:href="x-capture-file-save.png"
xlink:href="../../WiresharkDoc-16.png"
y="1036.3622"
x="0"
id="image3882"

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
image/toolbar/16x16/x-capture-file-reload@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
image/toolbar/16x16/x-capture-file-save.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 677 B

After

Width:  |  Height:  |  Size: 665 B

90
image/toolbar/16x16/x-capture-file-save.svg Normal file
View File

@ -0,0 +1,90 @@
<?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="16"
height="16"
id="svg2"
version="1.1"
inkscape:version="0.48.2 r9819"
sodipodi:docname="x-capture-file-open.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="34.727236"
inkscape:cx="8"
inkscape:cy="7.7500087"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:window-width="1200"
inkscape:window-height="742"
inkscape:window-x="226"
inkscape:window-y="316"
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,-1036.3622)">
<image
y="1036.3622"
x="0"
id="image3135"
xlink:href="file:///Users/gcombs/Development/wireshark/image/WiresharkDoc-16.png"
height="16"
width="16" />
<path
style="fill:none;stroke:#888a85;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 1.5,0.5 0,15 13,0 0,-11 -4,-4 z"
id="path3140"
inkscape:connector-curvature="0"
transform="translate(0,1036.3622)"
sodipodi:nodetypes="cccccc" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
image/toolbar/16x16/x-capture-file-save@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

89
image/toolbar/16x16/x-capture-file-save@2x.svg Normal file
View File

@ -0,0 +1,89 @@
<?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="32"
height="32"
id="svg2"
version="1.1"
inkscape:version="0.48.2 r9819"
sodipodi:docname="x-capture-file-open@2x.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="17.90624"
inkscape:cx="16"
inkscape:cy="16.000009"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:window-width="1200"
inkscape:window-height="742"
inkscape:window-x="226"
inkscape:window-y="316"
inkscape:window-maximized="0">
<inkscape:grid
type="xygrid"
id="grid3064"
empspacing="4"
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,-1020.3622)">
<image
y="1020.3622"
x="0"
id="image3272"
xlink:href="file:///Users/gcombs/Development/wireshark/image/WiresharkDoc-32.png"
height="32"
width="32" />
<path
style="fill:none;stroke:#888a85;stroke-width:2px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 3,1021.3622 0,30 26,0 0,-22 -8,-8 z"
id="path3140"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccc" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
image/toolbar/16x16/x-capture-options.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 446 B

After

Width:  |  Height:  |  Size: 478 B

BIN
image/toolbar/16x16/x-capture-options@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
image/toolbar/16x16/x-capture-restart.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 687 B

After

Width:  |  Height:  |  Size: 675 B

BIN
image/toolbar/16x16/x-capture-restart@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
image/toolbar/16x16/x-capture-start.on.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 675 B

After

Width:  |  Height:  |  Size: 559 B

BIN
image/toolbar/16x16/x-capture-start.on@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
image/toolbar/16x16/x-capture-start.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 757 B

After

Width:  |  Height:  |  Size: 676 B

BIN
image/toolbar/16x16/x-capture-start@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
image/toolbar/16x16/x-capture-stop.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 140 B

After

Width:  |  Height:  |  Size: 139 B

BIN
image/toolbar/16x16/x-capture-stop@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 166 B

BIN
image/toolbar/16x16/x-colorize-packets.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 260 B

After

Width:  |  Height:  |  Size: 157 B

BIN
image/toolbar/16x16/x-colorize-packets@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 167 B

BIN
image/toolbar/16x16/x-resize-columns.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 619 B

After

Width:  |  Height:  |  Size: 347 B

BIN
image/toolbar/16x16/x-resize-columns@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 514 B

BIN
image/toolbar/16x16/x-stay-last.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 389 B

After

Width:  |  Height:  |  Size: 267 B

BIN
image/toolbar/16x16/x-stay-last@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 425 B

BIN
image/toolbar/16x16/zoom-in.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 599 B

After

Width:  |  Height:  |  Size: 350 B

BIN
image/toolbar/16x16/zoom-in@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 579 B

BIN
image/toolbar/16x16/zoom-original.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 601 B

After

Width:  |  Height:  |  Size: 345 B

BIN
image/toolbar/16x16/zoom-original@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 576 B

BIN
image/toolbar/16x16/zoom-out.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 591 B

After

Width:  |  Height:  |  Size: 344 B

BIN
image/toolbar/16x16/zoom-out@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 575 B

BIN
image/toolbar/24x24/edit-find.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 897 B

After

Width:  |  Height:  |  Size: 767 B

BIN
image/toolbar/24x24/edit-find@2x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
image/toolbar/24x24/go-first.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 875 B

After

Width:  |  Height:  |  Size: 552 B

BIN
image/toolbar/24x24/go-first@2x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
image/toolbar/24x24/go-jump.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 802 B

After

Width:  |  Height:  |  Size: 596 B

BIN
image/toolbar/24x24/go-jump@2x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
image/toolbar/24x24/go-last.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 864 B

After

Width:  |  Height:  |  Size: 542 B

BIN
image/toolbar/24x24/go-last@2x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
image/toolbar/24x24/go-next.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 843 B

After

Width:  |  Height:  |  Size: 743 B

BIN
image/toolbar/24x24/go-next@2x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
image/toolbar/24x24/go-previous.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 851 B

After

Width:  |  Height:  |  Size: 745 B

BIN
image/toolbar/24x24/go-previous@2x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
image/toolbar/24x24/x-capture-file-close.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
image/toolbar/24x24/x-capture-file-close@2x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
image/toolbar/24x24/x-capture-file-reload.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

3
image/toolbar/24x24/x-capture-file-reload.svg
View File

@ -87,8 +87,7 @@
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"
xlink:href="../../WiresharkDoc-24.png"
style="fill:#2e3436;stroke:#2e3436"
width="24"
height="24"

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
image/toolbar/24x24/x-capture-file-reload@2x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
image/toolbar/24x24/x-capture-file-save.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
image/toolbar/24x24/x-capture-file-save@2x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
image/toolbar/24x24/x-capture-options.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 857 B

BIN
image/toolbar/24x24/x-capture-options@2x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
image/toolbar/24x24/x-capture-restart.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
image/toolbar/24x24/x-capture-restart@2x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
image/toolbar/24x24/x-capture-start.on.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 934 B

BIN
image/toolbar/24x24/x-capture-start.on@2x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
image/toolbar/24x24/x-capture-start.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1021 B

BIN
image/toolbar/24x24/x-capture-start@2x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
image/toolbar/24x24/x-capture-stop.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 284 B

After

Width:  |  Height:  |  Size: 152 B

BIN
image/toolbar/24x24/x-capture-stop@2x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 337 B

After

Width:  |  Height:  |  Size: 174 B

BIN
image/toolbar/24x24/x-colorize-packets.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 274 B

After

Width:  |  Height:  |  Size: 157 B

BIN
image/toolbar/24x24/x-colorize-packets@2x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 345 B

After

Width:  |  Height:  |  Size: 175 B

BIN
image/toolbar/24x24/x-resize-columns.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 550 B

After

Width:  |  Height:  |  Size: 299 B

BIN
image/toolbar/24x24/x-resize-columns@2x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 851 B

After

Width:  |  Height:  |  Size: 479 B

BIN
image/toolbar/24x24/x-stay-last.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 491 B

After

Width:  |  Height:  |  Size: 295 B

BIN
image/toolbar/24x24/x-stay-last@2x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 804 B

After

Width:  |  Height:  |  Size: 479 B

BIN
image/toolbar/24x24/zoom-in.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 865 B

After

Width:  |  Height:  |  Size: 489 B

BIN
image/toolbar/24x24/zoom-in@2x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 771 B

BIN
image/toolbar/24x24/zoom-original.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 849 B

After

Width:  |  Height:  |  Size: 481 B

BIN
image/toolbar/24x24/zoom-original@2x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 768 B

BIN
image/toolbar/24x24/zoom-out.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 841 B

After

Width:  |  Height:  |  Size: 479 B

BIN
image/toolbar/24x24/zoom-out@2x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 768 B

88
image/toolbar/svg-to-png.sh
View File

@ -24,25 +24,29 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
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() {
set_source_svgs() {
local out_icon=$1
case $out_icon in
x-capture-options)
SOURCE_SVG=x-capture-options-gear.svg
out_icon=x-capture-options-gear
;;
x-capture-restart)
SOURCE_SVG=x-capture-restart-fin.svg
out_icon=x-capture-restart-fin
;;
x-capture-stop)
SOURCE_SVG=x-capture-stop-red.svg
;;
*)
SOURCE_SVG=$out_icon.svg
out_icon=x-capture-stop-red
;;
esac
ONE_X_SVG=${out_icon}.svg
TWO_X_SVG=${out_icon}@2x.svg
if [ ! -f ${TWO_X_SVG} ] ; then
TWO_X_SVG=$ONE_X_SVG
fi
if [ ! -f ${ONE_X_SVG} ] ; then
>&2 echo "Can't find ${ONE_X_SVG}"
exit 1
fi
}
ICONS="
@ -52,6 +56,8 @@ ICONS="
go-last
go-next
go-previous
x-capture-file-close
x-capture-file-save
x-capture-file-reload
x-capture-options
x-capture-restart
@ -66,44 +72,54 @@ ICONS="
zoom-out
"
QRC_FILES=""
# XXX Add support for 16 pixel icons.
for SIZE in 24 ; do
for SIZE in 16 24 ; do
SIZE_DIR=${SIZE}x${SIZE}
TWO_X_SIZE=`expr $SIZE \* 2`
ONE_X_ARGS="--export-width=${SIZE} --export-height=${SIZE}"
TWO_X_ARGS="--export-width=${TWO_X_SIZE} --export-height=${TWO_X_SIZE}"
cd $SIZE_DIR
QRC_FILES=""
for ICON in $ICONS ; do
set_source_svg $ICON
set_source_svgs $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
if [ $ONE_X_SVG -nt $ONE_X_PNG ] ; then
inkscape $COMMON_ARGS $ONE_X_ARGS \
--file=$ONE_X_SVG --export-png=$ONE_X_PNG || exit 1
fi
inkscape $COMMON_ARGS $TWO_X_ARGS \
--file=$SOURCE_SVG --export-png=$TWO_X_PNG || exit 1
if [ $TWO_X_SVG -nt $TWO_X_PNG ] ; then
inkscape $COMMON_ARGS $TWO_X_ARGS \
--file=$TWO_X_SVG --export-png=$TWO_X_PNG || exit 1
fi
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
cd ..
done
for QRC_FILE in $QRC_FILES ; do
echo " <file>toolbar/${SIZE_DIR}/${QRC_FILE}</file>"
done
#
# Editor modelines - https://www.wireshark.org/tools/modelines.html
#
# Local variables:
# c-basic-offset: 4
# tab-width: 8
# indent-tabs-mode: nil
# End:
#
# vi: set shiftwidth=4 tabstop=8 expandtab:
# :indentSize=4:tabSize=8:noTabs=true:
#