Qt: add reset layout button to toolbar

This commit is contained in:
Chuck Craft 2024-07-19 16:27:39 -05:00
parent 902df16bc3
commit d976b3d848
46 changed files with 666 additions and 423 deletions

View File

@ -4400,6 +4400,7 @@ if(SHELLCHECK_EXECUTABLE)
add_custom_command(TARGET shellcheck POST_BUILD
COMMAND shellcheck --external-sources
resources/stock_icons/svg-to-png.sh
resources/stock_icons/layouts-to-png.sh
packaging/appimage/Logray-AppRun.in
packaging/appimage/Wireshark-AppRun.in
"packaging/macosx/ChmodBPF/root/Library/Application Support/Wireshark/ChmodBPF/ChmodBPF"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 557 B

After

Width:  |  Height:  |  Size: 700 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1022 B

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 553 B

After

Width:  |  Height:  |  Size: 699 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1020 B

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 546 B

After

Width:  |  Height:  |  Size: 699 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1021 B

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 557 B

After

Width:  |  Height:  |  Size: 699 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1016 B

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 557 B

After

Width:  |  Height:  |  Size: 712 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 990 B

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 556 B

After

Width:  |  Height:  |  Size: 693 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1016 B

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

@ -2,19 +2,19 @@
<!-- 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="288"
height="48"
id="svg2"
version="1.1"
inkscape:version="0.48.2 r9819"
sodipodi:docname="layouts.svg">
inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
sodipodi:docname="layouts.svg"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<defs
id="defs4">
<inkscape:perspective
@ -33,82 +33,104 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="2.9513889"
inkscape:cx="197.87294"
inkscape:cy="25.070165"
inkscape:cx="115.87765"
inkscape:cy="25.242353"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:window-width="1359"
inkscape:window-height="813"
inkscape:window-x="544"
inkscape:window-y="86"
inkscape:window-maximized="0"
inkscape:window-width="1920"
inkscape:window-height="1017"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:snap-grids="false"
showguides="true"
inkscape:guide-bbox="true">
inkscape:guide-bbox="true"
inkscape:showpageshadow="2"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1">
<inkscape:grid
type="xygrid"
id="grid3777"
empspacing="5"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true" />
snapvisiblegridlinesonly="true"
originx="0"
originy="0"
spacingy="1"
spacingx="1"
units="px" />
<sodipodi:guide
orientation="0,1"
position="11.741261,35.519783"
id="guide3837" />
id="guide3837"
inkscape:locked="false" />
<sodipodi:guide
orientation="0,1"
position="9.4883721,12.488372"
id="guide3839" />
id="guide3839"
inkscape:locked="false" />
<sodipodi:guide
orientation="1,0"
position="24.069767,44.651163"
id="guide3845" />
id="guide3845"
inkscape:locked="false" />
<sodipodi:guide
orientation="1,0"
position="108.48837,27.55814"
id="guide3849" />
id="guide3849"
inkscape:locked="false" />
<sodipodi:guide
orientation="1,0"
position="131.51163,29.930233"
id="guide3851" />
id="guide3851"
inkscape:locked="false" />
<sodipodi:guide
orientation="1,0"
position="156.55814,21.069767"
id="guide3853" />
id="guide3853"
inkscape:locked="false" />
<sodipodi:guide
orientation="1,0"
position="179.51163,18.55814"
id="guide3855" />
id="guide3855"
inkscape:locked="false" />
<sodipodi:guide
orientation="0,1"
position="203.7907,24"
id="guide3857" />
id="guide3857"
inkscape:locked="false" />
<sodipodi:guide
orientation="1,0"
position="216,27.348837"
id="guide3859" />
id="guide3859"
inkscape:locked="false" />
<sodipodi:guide
orientation="0,1"
position="216,8.5116279"
id="guide3861" />
id="guide3861"
inkscape:locked="false" />
<sodipodi:guide
orientation="0,1"
position="218.86047,39.488372"
id="guide3863" />
id="guide3863"
inkscape:locked="false" />
<sodipodi:guide
orientation="1,0"
position="248.5814,30.139535"
id="guide3865" />
id="guide3865"
inkscape:locked="false" />
<sodipodi:guide
orientation="1,0"
position="279.48837,31.325581"
id="guide3867" />
id="guide3867"
inkscape:locked="false" />
<sodipodi:guide
orientation="1,0"
position="264,31.674419"
id="guide3869" />
id="guide3869"
inkscape:locked="false" />
</sodipodi:namedview>
<metadata
id="metadata7">
@ -118,7 +140,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:title />
<dc:creator>
<cc:Agent>
<dc:title>Gerald Combs</dc:title>
@ -143,8 +165,23 @@
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-1004.3622)">
<flowRoot
xml:space="preserve"
id="flowRoot3622"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0.01%;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"><flowRegion
id="flowRegion3624"><rect
id="rect3626"
width="133.632"
height="22.464001"
x="11.52"
y="-54.528" /></flowRegion><flowPara
id="flowPara3628"
style="font-size:18px;line-height:1.25"> </flowPara></flowRoot>
<g
id="layout_1"
inkscape:label="layout_1">
<rect
style="color:#000000;fill:#ffffff;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.80165291000000005;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:1;fill-opacity:0.73893803"
style="color:#000000;fill:#eeeeec;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.80165291;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:1;fill-opacity:1"
width="46"
height="46"
x="1"
@ -153,74 +190,78 @@
inkscape:export-filename="layout_1.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<path
style="fill:#eeeeec;stroke:#2e3436;stroke-width:1.99999988000000006;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.19911504"
d="m 2.9999313,1028.3622 42.0001367,0"
id="path3781"
inkscape:connector-curvature="0"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_1.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none"
x="9.4560003"
y="1021.3622"
id="text3630"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_1.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
sodipodi:role="line"
id="tspan3632"
x="9.4560003"
y="1021.3622"
style="font-size:12px;line-height:1.25">1</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none"
x="32.212002"
y="1021.3622"
id="text3634"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_1.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
sodipodi:role="line"
id="tspan3636"
x="32.212002"
y="1021.3622"
style="font-size:12px;line-height:1.25">2</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none"
x="20.652"
y="1044.2302"
id="text3638"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_1.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
sodipodi:role="line"
id="tspan3640"
x="20.652"
y="1044.2302"
style="font-size:12px;line-height:1.25">3</tspan></text>
<path
style="fill:#2e3436;stroke:#2e3436;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.80088496"
d="m 23.999962,1007.3622 0,19"
id="path3809"
inkscape:connector-curvature="0"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_1.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
</g>
<g
id="layout_2"
inkscape:label="layout_2">
<rect
y="1005.3622"
x="49"
height="46"
width="46"
id="rect3600"
style="color:#000000;fill:#ffffff;fill-opacity:0.73893803;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.80165291999999999;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
style="color:#000000;fill:#eeeeec;fill-opacity:1;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.80165292;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_2.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<rect
style="color:#000000;fill:#ffffff;fill-opacity:0.62831861;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.80165291999999999;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect3602"
width="46"
height="46"
x="97"
y="1005.3622"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_3.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<rect
y="1005.3622"
x="145"
height="46"
width="46"
id="rect3604"
style="color:#000000;fill:#ffffff;fill-opacity:0.73893803;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.80165291999999999;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_4.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<rect
style="color:#000000;fill:#ffffff;fill-opacity:0.73893803;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.80165291999999999;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect3606"
width="46"
height="46"
x="193"
y="1005.3622"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_5.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<rect
y="1005.3622"
x="241"
height="46"
width="46"
id="rect3608"
style="color:#000000;fill:#ffffff;fill-opacity:0.73893803;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.80165291999999999;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_6.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<flowRoot
xml:space="preserve"
id="flowRoot3622"
style="fill:black;stroke:none;stroke-opacity:1;stroke-width:1px;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;font-family:Bitstream Vera Sans;font-style:normal;font-weight:normal;font-size:18px;-inkscape-font-specification:Bitstream Vera Sans;font-stretch:normal;font-variant:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;text-align:start;writing-mode:lr"><flowRegion
id="flowRegion3624"><rect
id="rect3626"
width="133.632"
height="22.464001"
x="11.52"
y="-54.528" /></flowRegion><flowPara
id="flowPara3628" /></flowRoot> <path
style="fill:#eeeeec;stroke:#2e3436;stroke-width:1.99999988000000006;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.19911504"
d="m 2.9999313,1028.3622 42.0001367,0"
id="path3781"
inkscape:connector-curvature="0"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_1.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<path
inkscape:connector-curvature="0"
id="path3789"
@ -229,8 +270,216 @@
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_2.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<path
inkscape:connector-curvature="0"
id="path3807"
d="m 71.999553,1030.3626 0,19"
style="fill:#eeeeec;stroke:#2e3436;stroke-width:1.99999975999999990;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.19911504"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_2.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<text
id="text3871"
y="1021.3622"
x="69.456001"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none"
xml:space="preserve"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_2.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
y="1021.3622"
x="69.456001"
id="tspan3873"
sodipodi:role="line"
style="font-size:12px;line-height:1.25">1</tspan></text>
<text
id="text3891"
y="1044.3622"
x="57.212002"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none"
xml:space="preserve"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_2.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
y="1044.3622"
x="57.212002"
id="tspan3893"
sodipodi:role="line"
style="font-size:12px;line-height:1.25">2</tspan></text>
<text
id="text3895"
y="1044.2302"
x="80.652"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none"
xml:space="preserve"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_2.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
y="1044.2302"
x="80.652"
id="tspan3897"
sodipodi:role="line"
style="font-size:12px;line-height:1.25">3</tspan></text>
</g>
<g
id="layout_3"
inkscape:label="layout_3">
<rect
style="color:#000000;fill:#eeeeec;fill-opacity:1;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.80165292;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect3602"
width="46"
height="46"
x="97"
y="1005.3622"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_3.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<path
style="fill:#eeeeec;stroke:#2e3436;stroke-width:1.99999988000000006;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.19911504"
d="m 120,1007.362 0,42.0002"
id="path3799"
inkscape:connector-curvature="0"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_3.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<path
inkscape:connector-curvature="0"
id="path3803"
d="m 99,1028.3622 19,0"
style="fill:#eeeeec;stroke:#2e3436;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.19911504"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_3.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none"
x="105.456"
y="1021.3622"
id="text3875"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_3.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
sodipodi:role="line"
id="tspan3877"
x="105.456"
y="1021.3622"
style="font-size:12px;line-height:1.25">1</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none"
x="105.212"
y="1044.3622"
id="text3899"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_3.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
sodipodi:role="line"
id="tspan3901"
x="105.212"
y="1044.3622"
style="font-size:12px;line-height:1.25">2</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none"
x="128.65199"
y="1032.2302"
id="text3903"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_3.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
sodipodi:role="line"
id="tspan3905"
x="128.65199"
y="1032.2302"
style="font-size:12px;line-height:1.25">3</tspan></text>
</g>
<g
id="layout_4"
inkscape:label="layout_4">
<rect
y="1005.3622"
x="145"
height="46"
width="46"
id="rect3604"
style="color:#000000;fill:#eeeeec;fill-opacity:1;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.80165292;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_4.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<path
inkscape:connector-curvature="0"
id="path3801"
d="m 168,1007.3622 0,42.0002"
style="fill:#eeeeec;stroke:#2e3436;stroke-width:1.99999988000000006;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.19911504"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_4.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<path
style="fill:#eeeeec;stroke:#2e3436;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.19911504"
d="m 170,1028.3622 19,0"
id="path3805"
inkscape:connector-curvature="0"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_4.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<text
id="text3879"
y="1032.3622"
x="153.45599"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none"
xml:space="preserve"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_4.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
y="1032.3622"
x="153.45599"
id="tspan3881"
sodipodi:role="line"
style="font-size:12px;line-height:1.25">1</tspan></text>
<text
id="text3907"
y="1021.3622"
x="176.21201"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none"
xml:space="preserve"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_4.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
y="1021.3622"
x="176.21201"
id="tspan3909"
sodipodi:role="line"
style="font-size:12px;line-height:1.25">2</tspan></text>
<text
id="text3911"
y="1044.2302"
x="176.65199"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none"
xml:space="preserve"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_4.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
y="1044.2302"
x="176.65199"
id="tspan3913"
sodipodi:role="line"
style="font-size:12px;line-height:1.25">3</tspan></text>
</g>
<g
id="layout_5"
inkscape:label="layout_5">
<rect
style="color:#000000;fill:#eeeeec;fill-opacity:1;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.80165292;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect3606"
width="46"
height="46"
x="193"
y="1005.3622"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_5.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<path
style="fill:#eeeeec;stroke:#2e3436;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.8;stroke-dasharray:none;fill-opacity:1"
d="m 194.99993,1036.3622 42.00014,0"
id="path3791"
inkscape:connector-curvature="0"
@ -245,6 +494,62 @@
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_5.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none"
x="212.45599"
y="1016.8622"
id="text3883"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_5.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
sodipodi:role="line"
id="tspan3885"
x="212.45599"
y="1016.8622"
style="font-size:12px;line-height:1.25">1</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none"
x="212.21201"
y="1032.3622"
id="text3915"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_5.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
sodipodi:role="line"
id="tspan3917"
x="212.21201"
y="1032.3622"
style="font-size:12px;line-height:1.25">2</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none"
x="212.65199"
y="1048.2302"
id="text3919"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_5.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
sodipodi:role="line"
id="tspan3921"
x="212.65199"
y="1048.2302"
style="font-size:12px;line-height:1.25">3</tspan></text>
</g>
<g
id="layout_6"
inkscape:label="layout_6">
<rect
y="1005.3622"
x="241"
height="46"
width="46"
id="rect3608"
style="color:#000000;fill:#eeeeec;fill-opacity:1;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.80165292;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_6.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<path
inkscape:connector-curvature="0"
id="path3795"
@ -261,158 +566,11 @@
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_6.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<path
style="fill:#eeeeec;stroke:#2e3436;stroke-width:1.99999988000000006;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.19911504"
d="m 120,1007.362 0,42.0002"
id="path3799"
inkscape:connector-curvature="0"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_3.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<path
inkscape:connector-curvature="0"
id="path3801"
d="m 168,1007.3622 0,42.0002"
style="fill:#eeeeec;stroke:#2e3436;stroke-width:1.99999988000000006;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.19911504"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_4.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<path
inkscape:connector-curvature="0"
id="path3803"
d="m 99,1028.3622 19,0"
style="fill:#eeeeec;stroke:#2e3436;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.19911504"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_3.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<path
style="fill:#eeeeec;stroke:#2e3436;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.19911504"
d="m 170,1028.3622 19,0"
id="path3805"
inkscape:connector-curvature="0"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_4.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<path
inkscape:connector-curvature="0"
id="path3807"
d="m 71.999553,1030.3626 0,19"
style="fill:#eeeeec;stroke:#2e3436;stroke-width:1.99999975999999990;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.19911504"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_2.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<text
xml:space="preserve"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue"
x="9.4560003"
y="1021.3622"
id="text3630"
sodipodi:linespacing="125%"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_1.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
sodipodi:role="line"
id="tspan3632"
x="9.4560003"
y="1021.3622">1</tspan></text>
<text
xml:space="preserve"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue"
x="32.212002"
y="1021.3622"
id="text3634"
sodipodi:linespacing="125%"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_1.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
sodipodi:role="line"
id="tspan3636"
x="32.212002"
y="1021.3622">2</tspan></text>
<text
xml:space="preserve"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue"
x="20.652"
y="1044.2302"
id="text3638"
sodipodi:linespacing="125%"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_1.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
sodipodi:role="line"
id="tspan3640"
x="20.652"
y="1044.2302">3</tspan></text>
<path
style="fill:#2e3436;stroke:#2e3436;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:0.80000000000000004;stroke-dasharray:none;fill-opacity:0.80088496"
d="m 23.999962,1007.3622 0,19"
id="path3809"
inkscape:connector-curvature="0"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_1.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<text
sodipodi:linespacing="125%"
id="text3871"
y="1021.3622"
x="69.456001"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue"
xml:space="preserve"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_2.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
y="1021.3622"
x="69.456001"
id="tspan3873"
sodipodi:role="line">1</tspan></text>
<text
xml:space="preserve"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue"
x="105.456"
y="1021.3622"
id="text3875"
sodipodi:linespacing="125%"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_3.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
sodipodi:role="line"
id="tspan3877"
x="105.456"
y="1021.3622">1</tspan></text>
<text
sodipodi:linespacing="125%"
id="text3879"
y="1032.3622"
x="153.45599"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue"
xml:space="preserve"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_4.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
y="1032.3622"
x="153.45599"
id="tspan3881"
sodipodi:role="line">1</tspan></text>
<text
xml:space="preserve"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue"
x="212.45599"
y="1016.8622"
id="text3883"
sodipodi:linespacing="125%"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_5.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
sodipodi:role="line"
id="tspan3885"
x="212.45599"
y="1016.8622">1</tspan></text>
<text
sodipodi:linespacing="125%"
id="text3887"
y="1032.3622"
x="245.45599"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none"
xml:space="preserve"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_6.png"
inkscape:export-xdpi="90"
@ -420,125 +578,13 @@
y="1032.3622"
x="245.45599"
id="tspan3889"
sodipodi:role="line">1</tspan></text>
<text
sodipodi:linespacing="125%"
id="text3891"
y="1044.3622"
x="57.212002"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue"
xml:space="preserve"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_2.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
y="1044.3622"
x="57.212002"
id="tspan3893"
sodipodi:role="line">2</tspan></text>
<text
sodipodi:linespacing="125%"
id="text3895"
y="1044.2302"
x="80.652"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue"
xml:space="preserve"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_2.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
y="1044.2302"
x="80.652"
id="tspan3897"
sodipodi:role="line">3</tspan></text>
<text
xml:space="preserve"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue"
x="105.212"
y="1044.3622"
id="text3899"
sodipodi:linespacing="125%"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_3.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
sodipodi:role="line"
id="tspan3901"
x="105.212"
y="1044.3622">2</tspan></text>
style="font-size:12px;line-height:1.25">1</tspan></text>
<text
xml:space="preserve"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue"
x="128.65199"
y="1032.2302"
id="text3903"
sodipodi:linespacing="125%"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_3.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
sodipodi:role="line"
id="tspan3905"
x="128.65199"
y="1032.2302">3</tspan></text>
<text
sodipodi:linespacing="125%"
id="text3907"
y="1021.3622"
x="176.21201"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue"
xml:space="preserve"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_4.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
y="1021.3622"
x="176.21201"
id="tspan3909"
sodipodi:role="line">2</tspan></text>
<text
sodipodi:linespacing="125%"
id="text3911"
y="1044.2302"
x="176.65199"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue"
xml:space="preserve"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_4.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
y="1044.2302"
x="176.65199"
id="tspan3913"
sodipodi:role="line">3</tspan></text>
<text
xml:space="preserve"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue"
x="212.21201"
y="1032.3622"
id="text3915"
sodipodi:linespacing="125%"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_5.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
sodipodi:role="line"
id="tspan3917"
x="212.21201"
y="1032.3622">2</tspan></text>
<text
xml:space="preserve"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue"
x="212.65199"
y="1048.2302"
id="text3919"
sodipodi:linespacing="125%"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_5.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
sodipodi:role="line"
id="tspan3921"
x="212.65199"
y="1048.2302">3</tspan></text>
<text
sodipodi:linespacing="125%"
id="text3923"
y="1032.3622"
x="261.21201"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none"
xml:space="preserve"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_6.png"
inkscape:export-xdpi="90"
@ -546,13 +592,13 @@
y="1032.3622"
x="261.21201"
id="tspan3925"
sodipodi:role="line">2</tspan></text>
sodipodi:role="line"
style="font-size:12px;line-height:1.25">2</tspan></text>
<text
sodipodi:linespacing="125%"
id="text3927"
y="1032.2302"
x="276.65201"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Helvetica Neue';-inkscape-font-specification:'Helvetica Neue';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none"
xml:space="preserve"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_6.png"
inkscape:export-xdpi="90"
@ -560,6 +606,8 @@
y="1032.2302"
x="276.65201"
id="tspan3929"
sodipodi:role="line">3</tspan></text>
sodipodi:role="line"
style="font-size:12px;line-height:1.25">3</tspan></text>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 29 KiB

View File

@ -96,6 +96,18 @@
<file>stock_icons/16x16/x-colorize-packets.png</file>
<file>stock_icons/16x16/x-colorize-packets@2x.png</file>
<file>stock_icons/16x16/x-hide-ro.png</file>
<file>stock_icons/16x16/x-reset-layout_1.png</file>
<file>stock_icons/16x16/x-reset-layout_1@2x.png</file>
<file>stock_icons/16x16/x-reset-layout_2.png</file>
<file>stock_icons/16x16/x-reset-layout_2@2x.png</file>
<file>stock_icons/16x16/x-reset-layout_3.png</file>
<file>stock_icons/16x16/x-reset-layout_3@2x.png</file>
<file>stock_icons/16x16/x-reset-layout_4.png</file>
<file>stock_icons/16x16/x-reset-layout_4@2x.png</file>
<file>stock_icons/16x16/x-reset-layout_5.png</file>
<file>stock_icons/16x16/x-reset-layout_5@2x.png</file>
<file>stock_icons/16x16/x-reset-layout_6.png</file>
<file>stock_icons/16x16/x-reset-layout_6@2x.png</file>
<file>stock_icons/16x16/x-reset.template.png</file>
<file>stock_icons/16x16/x-reset.template@2x.png</file>
<file>stock_icons/16x16/x-resize-columns.png</file>
@ -147,6 +159,18 @@
<file>stock_icons/24x24/x-colorize-packets.png</file>
<file>stock_icons/24x24/x-colorize-packets@2x.png</file>
<file>stock_icons/24x24/x-hide-ro.png</file>
<file>stock_icons/24x24/x-reset-layout_1.png</file>
<file>stock_icons/24x24/x-reset-layout_1@2x.png</file>
<file>stock_icons/24x24/x-reset-layout_2.png</file>
<file>stock_icons/24x24/x-reset-layout_2@2x.png</file>
<file>stock_icons/24x24/x-reset-layout_3.png</file>
<file>stock_icons/24x24/x-reset-layout_3@2x.png</file>
<file>stock_icons/24x24/x-reset-layout_4.png</file>
<file>stock_icons/24x24/x-reset-layout_4@2x.png</file>
<file>stock_icons/24x24/x-reset-layout_5.png</file>
<file>stock_icons/24x24/x-reset-layout_5@2x.png</file>
<file>stock_icons/24x24/x-reset-layout_6.png</file>
<file>stock_icons/24x24/x-reset-layout_6@2x.png</file>
<file>stock_icons/24x24/x-resize-columns.png</file>
<file>stock_icons/24x24/x-resize-columns@2x.png</file>
<file>stock_icons/24x24/x-stay-last.png</file>

Binary file not shown.

After

Width:  |  Height:  |  Size: 452 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 638 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 454 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 640 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 451 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 635 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 451 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 617 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 440 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 624 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 437 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 601 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 510 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 700 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 511 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 699 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 512 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 699 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 518 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 699 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 510 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 712 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 491 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 693 B

View File

@ -0,0 +1,140 @@
#!/bin/bash
# layouts-to-png
# Convert SVG files to 1x and 2x PNGs. Dump a list of Qt resource
# file entries upon successful completion.
#
# Copyright 2014 Gerald Combs <gerald [AT] wireshark.org>
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# SPDX-License-Identifier: GPL-2.0-or-later
# COMMON_ARGS="--export-area-page"
#SVGCLEANER=$( type -p svgcleaner )
# Running on WSL. Set as needed for Mac/linux.
INKSCAPE_EXE="inkscape.com"
ICONS="
layout_1
layout_2
layout_3
layout_4
layout_5
layout_6
"
if [ -n "$*" ] ; then
ICONS="$*"
fi
QRC_FILES=""
for SIZE in 16x16 24x24 ; do
WIDTH=${SIZE/x*/}
HEIGHT=${SIZE/*x/}
SIZE_DIR=${SIZE}
TWO_X_WIDTH=$(( WIDTH * 2 ))
TWO_X_HEIGHT=$(( HEIGHT * 2 ))
ONE_X_ARGS="--export-width=${WIDTH} --export-height=${HEIGHT}"
TWO_X_ARGS="--export-width=${TWO_X_WIDTH} --export-height=${TWO_X_HEIGHT}"
echo "Converting $SIZE_DIR"
cd $SIZE_DIR || exit 1
for ICON in $ICONS ; do
echo "Converting $ICON"
ONE_X_SVG="../../layouts.svg"
TWO_X_SVG=$ONE_X_SVG
ICONNAME="x-reset-$ICON"
ONE_X_PNG=${ICONNAME}.png
TWO_X_PNG=${ICONNAME}@2x.png
if [ "$ONE_X_SVG" -nt "$ONE_X_PNG" ] ; then
# shellcheck disable=SC2086
$INKSCAPE_EXE $COMMON_ARGS $ONE_X_ARGS --export-id="$ICON" \
--export-filename="$ONE_X_PNG" $ONE_X_SVG || exit 1
QRC_FILES="${QRC_FILES} ${SIZE_DIR}/${ONE_X_PNG}"
fi
if [ "$TWO_X_SVG" -nt "$TWO_X_PNG" ] ; then
# shellcheck disable=SC2086
$INKSCAPE_EXE $COMMON_ARGS $TWO_X_ARGS --export-id="$ICON" \
--export-filename="$TWO_X_PNG" $TWO_X_SVG || exit 1
QRC_FILES="${QRC_FILES} ${SIZE_DIR}/${TWO_X_PNG}"
fi
done
cd ..
done
for QRC_FILE in $QRC_FILES ; do
echo " <file>stock_icons/${QRC_FILE}</file>"
done
echo "--------------------------------------"
QRC_FILES=""
for SIZE in 48x48 96x96 ; do
WIDTH=${SIZE/x*/}
HEIGHT=${SIZE/*x/}
OUT_DIR=".."
TWO_X_WIDTH=$(( WIDTH * 2 ))
TWO_X_HEIGHT=$(( HEIGHT * 2 ))
ONE_X_ARGS="--export-width=${WIDTH} --export-height=${HEIGHT}"
TWO_X_ARGS="--export-width=${TWO_X_WIDTH} --export-height=${TWO_X_HEIGHT}"
echo "Converting $OUT_DIR"
for ICON in $ICONS ; do
echo "Converting $ICON"
ONE_X_SVG=${OUT_DIR}/layouts.svg
TWO_X_SVG=$ONE_X_SVG
ICONNAME="$ICON"
ONE_X_PNG=${OUT_DIR}/${ICONNAME}.png
TWO_X_PNG=${OUT_DIR}/${ICONNAME}@2x.png
if [ "$ONE_X_SVG" -nt "$ONE_X_PNG" ] ; then
# shellcheck disable=SC2086
$INKSCAPE_EXE $COMMON_ARGS $ONE_X_ARGS --export-id="$ICON" \
--export-filename="$ONE_X_PNG" $ONE_X_SVG || exit 1
QRC_FILES="${QRC_FILES} ${ICONNAME}.png"
fi
if [ "$TWO_X_SVG" -nt "$TWO_X_PNG" ] ; then
# shellcheck disable=SC2086
$INKSCAPE_EXE $COMMON_ARGS $TWO_X_ARGS --export-id="$ICON" \
--export-filename="$TWO_X_PNG" $TWO_X_SVG || exit 1
QRC_FILES="${QRC_FILES} ${ICONNAME}@2x.png"
fi
done
done
for QRC_FILE in $QRC_FILES ; do
echo " <file>${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:
#

View File

@ -2043,6 +2043,7 @@ void LograyMainWindow::initMainToolbarIcons()
main_ui_->actionViewZoomOut->setIcon(StockIcon("zoom-out"));
main_ui_->actionViewNormalSize->setIcon(StockIcon("zoom-original"));
main_ui_->actionViewResizeColumns->setIcon(StockIcon("x-resize-columns"));
main_ui_->actionViewResetLayout->setIcon(StockIcon("x-reset-layout_2"));
main_ui_->actionViewReload->setIcon(StockIcon("x-capture-file-reload"));
main_ui_->actionNewDisplayFilterExpression->setIcon(StockIcon("list-add"));

View File

@ -559,6 +559,7 @@
<addaction name="actionViewZoomOut"/>
<addaction name="actionViewNormalSize"/>
<addaction name="actionViewResizeColumns"/>
<addaction name="actionViewResetLayout"/>
</widget>
<widget class="MainStatusBar" name="statusBar"/>
<widget class="QToolBar" name="displayFilterToolBar">
@ -1562,7 +1563,7 @@
<string>Reset Layout</string>
</property>
<property name="toolTip">
<string>Reset appearance layout to default size</string>
<string>Reset layout to default size</string>
</property>
<property name="shortcut">
<string notr="true">Ctrl+Shift+W</string>

View File

@ -330,6 +330,16 @@ void LograyMainWindow::layoutToolbars()
}
}
static const char* layout_icons[] = {
NULL,
"x-reset-layout_5",
"x-reset-layout_2",
"x-reset-layout_1",
"x-reset-layout_4",
"x-reset-layout_3",
"x-reset-layout_6"
};
void LograyMainWindow::updatePreferenceActions()
{
main_ui_->actionViewPacketList->setEnabled(prefs_has_layout_pane_content(layout_pane_content_plist));
@ -339,6 +349,9 @@ void LograyMainWindow::updatePreferenceActions()
main_ui_->actionViewNameResolutionPhysical->setChecked(gbl_resolv_flags.mac_name);
main_ui_->actionViewNameResolutionNetwork->setChecked(gbl_resolv_flags.network_name);
main_ui_->actionViewNameResolutionTransport->setChecked(gbl_resolv_flags.transport_name);
if (prefs.gui_layout_type > 0)
main_ui_->actionViewResetLayout->setIcon(StockIcon(layout_icons[prefs.gui_layout_type]));
}
void LograyMainWindow::updateRecentActions()

View File

@ -2086,6 +2086,7 @@ void WiresharkMainWindow::initMainToolbarIcons()
main_ui_->actionViewZoomOut->setIcon(StockIcon("zoom-out"));
main_ui_->actionViewNormalSize->setIcon(StockIcon("zoom-original"));
main_ui_->actionViewResizeColumns->setIcon(StockIcon("x-resize-columns"));
main_ui_->actionViewResetLayout->setIcon(StockIcon("x-reset-layout_2"));
main_ui_->actionViewReload->setIcon(StockIcon("x-capture-file-reload"));
main_ui_->actionNewDisplayFilterExpression->setIcon(StockIcon("list-add"));

View File

@ -787,6 +787,7 @@
<addaction name="actionViewZoomOut"/>
<addaction name="actionViewNormalSize"/>
<addaction name="actionViewResizeColumns"/>
<addaction name="actionViewResetLayout"/>
</widget>
<widget class="MainStatusBar" name="statusBar"/>
<widget class="QToolBar" name="displayFilterToolBar">
@ -2203,7 +2204,7 @@
<string>Reset Layout</string>
</property>
<property name="toolTip">
<string>Reset appearance layout to default size</string>
<string>Reset layout to default size</string>
</property>
<property name="shortcut">
<string notr="true">Ctrl+Shift+W</string>

View File

@ -366,6 +366,16 @@ void WiresharkMainWindow::layoutToolbars()
}
}
static const char* layout_icons[] = {
NULL,
"x-reset-layout_5",
"x-reset-layout_2",
"x-reset-layout_1",
"x-reset-layout_4",
"x-reset-layout_3",
"x-reset-layout_6"
};
void WiresharkMainWindow::updatePreferenceActions()
{
main_ui_->actionViewPacketList->setEnabled(prefs_has_layout_pane_content(layout_pane_content_plist));
@ -376,6 +386,9 @@ void WiresharkMainWindow::updatePreferenceActions()
main_ui_->actionViewNameResolutionPhysical->setChecked(gbl_resolv_flags.mac_name);
main_ui_->actionViewNameResolutionNetwork->setChecked(gbl_resolv_flags.network_name);
main_ui_->actionViewNameResolutionTransport->setChecked(gbl_resolv_flags.transport_name);
if (prefs.gui_layout_type > 0)
main_ui_->actionViewResetLayout->setIcon(StockIcon(layout_icons[prefs.gui_layout_type]));
}
void WiresharkMainWindow::updateRecentActions()