Replace more XPMs with PNGs.

svn path=/trunk/; revision=47159
This commit is contained in:
Gerald Combs 2013-01-19 05:48:43 +00:00
parent 2c5ce01f33
commit 3d280a8c95
17 changed files with 589 additions and 337 deletions

View File

@ -738,12 +738,12 @@ EXTRA_DIST = \
image/hi16-app-wireshark.png \
image/hi32-app-wireshark.png \
image/hi48-app-wireshark.png \
image/icon_layout_1.xpm \
image/icon_layout_2.xpm \
image/icon_layout_3.xpm \
image/icon_layout_4.xpm \
image/icon_layout_5.xpm \
image/icon_layout_6.xpm \
image/layout_1.png \
image/layout_2.png \
image/layout_3.png \
image/layout_4.png \
image/layout_5.png \
image/layout_6.png \
image/libwireshark.rc.in \
image/libwsutil.rc.in \
image/lo16-app-wireshark.png \

View File

@ -1,54 +0,0 @@
/* XPM */
static const char * icon_layout_1_xpm[] = {
"48 48 3 1",
" c None",
". c #000000",
"+ c #FFFFFF",
" ",
" ",
" ............................................ ",
" ............................................ ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..++++++++++.++++++++..++++++++...++++++++.. ",
" ..+++++++++..++++++++..+++++++.+++.+++++++.. ",
" ..++++++++.+.++++++++..+++++++++++.+++++++.. ",
" ..++++++++++.++++++++..+++++++++++.+++++++.. ",
" ..++++++++++.++++++++..++++++++++.++++++++.. ",
" ..++++++++++.++++++++..+++++++++.+++++++++.. ",
" ..++++++++++.++++++++..++++++++.++++++++++.. ",
" ..++++++++++.++++++++..+++++++.....+++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ............................................ ",
" ............................................ ",
" ..++++++++++++++++++++++++++++++++++++++++.. ",
" ..++++++++++++++++++++++++++++++++++++++++.. ",
" ..++++++++++++++++++++++++++++++++++++++++.. ",
" ..++++++++++++++++++++++++++++++++++++++++.. ",
" ..++++++++++++++++++++++++++++++++++++++++.. ",
" ..+++++++++++++++++++...++++++++++++++++++.. ",
" ..++++++++++++++++++.+++.+++++++++++++++++.. ",
" ..++++++++++++++++++++++.+++++++++++++++++.. ",
" ..++++++++++++++++++++..++++++++++++++++++.. ",
" ..++++++++++++++++++++++.+++++++++++++++++.. ",
" ..++++++++++++++++++++++.+++++++++++++++++.. ",
" ..++++++++++++++++++.+++.+++++++++++++++++.. ",
" ..+++++++++++++++++++...++++++++++++++++++.. ",
" ..++++++++++++++++++++++++++++++++++++++++.. ",
" ..++++++++++++++++++++++++++++++++++++++++.. ",
" ..++++++++++++++++++++++++++++++++++++++++.. ",
" ..++++++++++++++++++++++++++++++++++++++++.. ",
" ..++++++++++++++++++++++++++++++++++++++++.. ",
" ..++++++++++++++++++++++++++++++++++++++++.. ",
" ............................................ ",
" ............................................ ",
" ",
" "};

View File

@ -1,54 +0,0 @@
/* XPM */
static const char * icon_layout_2_xpm[] = {
"48 48 3 1",
" c None",
". c #000000",
"+ c #FFFFFF",
" ",
" ",
" ............................................ ",
" ............................................ ",
" ..++++++++++++++++++++++++++++++++++++++++.. ",
" ..++++++++++++++++++++++++++++++++++++++++.. ",
" ..++++++++++++++++++++++++++++++++++++++++.. ",
" ..++++++++++++++++++++++++++++++++++++++++.. ",
" ..++++++++++++++++++++++++++++++++++++++++.. ",
" ..++++++++++++++++++++.+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..++++++++++++++++++.+.+++++++++++++++++++.. ",
" ..++++++++++++++++++++.+++++++++++++++++++.. ",
" ..++++++++++++++++++++.+++++++++++++++++++.. ",
" ..++++++++++++++++++++.+++++++++++++++++++.. ",
" ..++++++++++++++++++++.+++++++++++++++++++.. ",
" ..++++++++++++++++++++.+++++++++++++++++++.. ",
" ..++++++++++++++++++++++++++++++++++++++++.. ",
" ..++++++++++++++++++++++++++++++++++++++++.. ",
" ..++++++++++++++++++++++++++++++++++++++++.. ",
" ..++++++++++++++++++++++++++++++++++++++++.. ",
" ..++++++++++++++++++++++++++++++++++++++++.. ",
" ..++++++++++++++++++++++++++++++++++++++++.. ",
" ............................................ ",
" ............................................ ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..++++++++...++++++++..+++++++++...+++++++.. ",
" ..+++++++.+++.+++++++..++++++++.+++.++++++.. ",
" ..+++++++++++.+++++++..++++++++++++.++++++.. ",
" ..+++++++++++.+++++++..++++++++++..+++++++.. ",
" ..++++++++++.++++++++..++++++++++++.++++++.. ",
" ..+++++++++.+++++++++..++++++++++++.++++++.. ",
" ..++++++++.++++++++++..++++++++.+++.++++++.. ",
" ..+++++++.....+++++++..+++++++++...+++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ............................................ ",
" ............................................ ",
" ",
" "};

View File

@ -1,54 +0,0 @@
/* XPM */
static const char * icon_layout_3_xpm[] = {
"48 48 3 1",
" c None",
". c #000000",
"+ c #FFFFFF",
" ",
" ",
" ............................................ ",
" ............................................ ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..++++++++++.++++++++..+++++++++++++++++++.. ",
" ..+++++++++..++++++++..+++++++++++++++++++.. ",
" ..++++++++.+.++++++++..+++++++++++++++++++.. ",
" ..++++++++++.++++++++..+++++++++++++++++++.. ",
" ..++++++++++.++++++++..+++++++++++++++++++.. ",
" ..++++++++++.++++++++..+++++++++++++++++++.. ",
" ..++++++++++.++++++++..+++++++++++++++++++.. ",
" ..++++++++++.++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++...+++++++.. ",
" ..+++++++++++++++++++..++++++++.+++.++++++.. ",
" ..+++++++++++++++++++..++++++++++++.++++++.. ",
" ..+++++++++++++++++++..++++++++++..+++++++.. ",
" .......................++++++++++++.++++++.. ",
" .......................++++++++++++.++++++.. ",
" ..+++++++++++++++++++..++++++++.+++.++++++.. ",
" ..+++++++++++++++++++..+++++++++...+++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..++++++++...++++++++..+++++++++++++++++++.. ",
" ..+++++++.+++.+++++++..+++++++++++++++++++.. ",
" ..+++++++++++.+++++++..+++++++++++++++++++.. ",
" ..+++++++++++.+++++++..+++++++++++++++++++.. ",
" ..++++++++++.++++++++..+++++++++++++++++++.. ",
" ..+++++++++.+++++++++..+++++++++++++++++++.. ",
" ..++++++++.++++++++++..+++++++++++++++++++.. ",
" ..+++++++.....+++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ............................................ ",
" ............................................ ",
" ",
" "};

View File

@ -1,54 +0,0 @@
/* XPM */
static const char * icon_layout_4_xpm[] = {
"48 48 3 1",
" c None",
". c #000000",
"+ c #FFFFFF",
" ",
" ",
" ............................................ ",
" ............................................ ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++...+++++++.. ",
" ..+++++++++++++++++++..++++++++.+++.++++++.. ",
" ..+++++++++++++++++++..++++++++++++.++++++.. ",
" ..+++++++++++++++++++..++++++++++++.++++++.. ",
" ..+++++++++++++++++++..+++++++++++.+++++++.. ",
" ..+++++++++++++++++++..++++++++++.++++++++.. ",
" ..+++++++++++++++++++..+++++++++.+++++++++.. ",
" ..+++++++++++++++++++..++++++++.....++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++.+++++++++..+++++++++++++++++++.. ",
" ..++++++++..+++++++++..+++++++++++++++++++.. ",
" ..+++++++.+.+++++++++..+++++++++++++++++++.. ",
" ..+++++++++.+++++++++....................... ",
" ..+++++++++.+++++++++....................... ",
" ..+++++++++.+++++++++..+++++++++++++++++++.. ",
" ..+++++++++.+++++++++..+++++++++++++++++++.. ",
" ..+++++++++.+++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++...+++++++.. ",
" ..+++++++++++++++++++..++++++++.+++.++++++.. ",
" ..+++++++++++++++++++..++++++++++++.++++++.. ",
" ..+++++++++++++++++++..++++++++++..+++++++.. ",
" ..+++++++++++++++++++..++++++++++++.++++++.. ",
" ..+++++++++++++++++++..++++++++++++.++++++.. ",
" ..+++++++++++++++++++..++++++++.+++.++++++.. ",
" ..+++++++++++++++++++..+++++++++...+++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ..+++++++++++++++++++..+++++++++++++++++++.. ",
" ............................................ ",
" ............................................ ",
" ",
" "};

View File

@ -1,54 +0,0 @@
/* XPM */
static const char * icon_layout_5_xpm[] = {
"48 48 3 1",
" c None",
". c #000000",
"+ c #FFFFFF",
" ",
" ",
" ............................................ ",
" ............................................ ",
" ..++++++++++++++++++++++++++++++++++++++++.. ",
" ..++++++++++++++++++++++++++++++++++++++++.. ",
" ..+++++++++++++++++++++.++++++++++++++++++.. ",
" ..++++++++++++++++++++..++++++++++++++++++.. ",
" ..+++++++++++++++++++.+.++++++++++++++++++.. ",
" ..+++++++++++++++++++++.++++++++++++++++++.. ",
" ..+++++++++++++++++++++.++++++++++++++++++.. ",
" ..+++++++++++++++++++++.++++++++++++++++++.. ",
" ..+++++++++++++++++++++.++++++++++++++++++.. ",
" ..+++++++++++++++++++++.++++++++++++++++++.. ",
" ..++++++++++++++++++++++++++++++++++++++++.. ",
" ..++++++++++++++++++++++++++++++++++++++++.. ",
" ............................................ ",
" ............................................ ",
" ..++++++++++++++++++++++++++++++++++++++++.. ",
" ..++++++++++++++++++++++++++++++++++++++++.. ",
" ..+++++++++++++++++++...++++++++++++++++++.. ",
" ..++++++++++++++++++.+++.+++++++++++++++++.. ",
" ..++++++++++++++++++++++.+++++++++++++++++.. ",
" ..++++++++++++++++++++++.+++++++++++++++++.. ",
" ..+++++++++++++++++++++.++++++++++++++++++.. ",
" ..++++++++++++++++++++.+++++++++++++++++++.. ",
" ..+++++++++++++++++++.++++++++++++++++++++.. ",
" ..++++++++++++++++++.....+++++++++++++++++.. ",
" ..++++++++++++++++++++++++++++++++++++++++.. ",
" ..++++++++++++++++++++++++++++++++++++++++.. ",
" ............................................ ",
" ............................................ ",
" ..++++++++++++++++++++++++++++++++++++++++.. ",
" ..++++++++++++++++++++++++++++++++++++++++.. ",
" ..+++++++++++++++++++...++++++++++++++++++.. ",
" ..++++++++++++++++++.+++.+++++++++++++++++.. ",
" ..++++++++++++++++++++++.+++++++++++++++++.. ",
" ..++++++++++++++++++++..++++++++++++++++++.. ",
" ..++++++++++++++++++++++.+++++++++++++++++.. ",
" ..++++++++++++++++++++++.+++++++++++++++++.. ",
" ..++++++++++++++++++.+++.+++++++++++++++++.. ",
" ..+++++++++++++++++++...++++++++++++++++++.. ",
" ..++++++++++++++++++++++++++++++++++++++++.. ",
" ..++++++++++++++++++++++++++++++++++++++++.. ",
" ............................................ ",
" ............................................ ",
" ",
" "};

View File

@ -1,50 +0,0 @@
/* XPM */
static const char * icon_layout_6_xpm[] = {
"44 44 3 1",
" c None",
". c #000000",
"+ c #FFFFFF",
"............................................",
"............................................",
"..++++++++++++..++++++++++++..++++++++++++..",
"..++++++++++++..++++++++++++..++++++++++++..",
"..++++++++++++..++++++++++++..++++++++++++..",
"..++++++++++++..++++++++++++..++++++++++++..",
"..++++++++++++..++++++++++++..++++++++++++..",
"..++++++++++++..++++++++++++..++++++++++++..",
"..++++++++++++..++++++++++++..++++++++++++..",
"..++++++++++++..++++++++++++..++++++++++++..",
"..++++++++++++..++++++++++++..++++++++++++..",
"..++++++++++++..++++++++++++..++++++++++++..",
"..++++++++++++..++++++++++++..++++++++++++..",
"..++++++++++++..++++++++++++..++++++++++++..",
"..++++++++++++..++++++++++++..++++++++++++..",
"..++++++++++++..++++++++++++..++++++++++++..",
"..++++++++++++..++++++++++++..++++++++++++..",
"..++++++++++++..++++++++++++..++++++++++++..",
"..++++++.+++++..+++++...++++..++++...+++++..",
"..+++++..+++++..++++.+++.+++..+++.+++.++++..",
"..++++.+.+++++..++++++++.+++..+++++++.++++..",
"..++++++.+++++..++++++++.+++..+++++..+++++..",
"..++++++.+++++..+++++++.++++..+++++++.++++..",
"..++++++.+++++..++++++.+++++..+++++++.++++..",
"..++++++.+++++..+++++.++++++..+++.+++.++++..",
"..++++++.+++++..++++.....+++..++++...+++++..",
"..++++++++++++..++++++++++++..++++++++++++..",
"..++++++++++++..++++++++++++..++++++++++++..",
"..++++++++++++..++++++++++++..++++++++++++..",
"..++++++++++++..++++++++++++..++++++++++++..",
"..++++++++++++..++++++++++++..++++++++++++..",
"..++++++++++++..++++++++++++..++++++++++++..",
"..++++++++++++..++++++++++++..++++++++++++..",
"..++++++++++++..++++++++++++..++++++++++++..",
"..++++++++++++..++++++++++++..++++++++++++..",
"..++++++++++++..++++++++++++..++++++++++++..",
"..++++++++++++..++++++++++++..++++++++++++..",
"..++++++++++++..++++++++++++..++++++++++++..",
"..++++++++++++..++++++++++++..++++++++++++..",
"..++++++++++++..++++++++++++..++++++++++++..",
"..++++++++++++..++++++++++++..++++++++++++..",
"..++++++++++++..++++++++++++..++++++++++++..",
"............................................",
"............................................"};

BIN
image/layout_1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 913 B

BIN
image/layout_2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 927 B

BIN
image/layout_3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 947 B

BIN
image/layout_4.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 925 B

BIN
image/layout_5.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 937 B

BIN
image/layout_6.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 902 B

565
image/layouts.svg Normal file
View File

@ -0,0 +1,565 @@
<?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: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">
<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="5.0675986"
inkscape:cx="80.700666"
inkscape:cy="25.070165"
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:snap-grids="false"
showguides="true"
inkscape:guide-bbox="true">
<inkscape:grid
type="xygrid"
id="grid3777"
empspacing="5"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true" />
<sodipodi:guide
orientation="0,1"
position="11.741261,35.519783"
id="guide3837" />
<sodipodi:guide
orientation="0,1"
position="9.4883721,12.488372"
id="guide3839" />
<sodipodi:guide
orientation="1,0"
position="24.069767,44.651163"
id="guide3845" />
<sodipodi:guide
orientation="1,0"
position="108.48837,27.55814"
id="guide3849" />
<sodipodi:guide
orientation="1,0"
position="131.51163,29.930233"
id="guide3851" />
<sodipodi:guide
orientation="1,0"
position="156.55814,21.069767"
id="guide3853" />
<sodipodi:guide
orientation="1,0"
position="179.51163,18.55814"
id="guide3855" />
<sodipodi:guide
orientation="0,1"
position="203.7907,24"
id="guide3857" />
<sodipodi:guide
orientation="1,0"
position="216,27.348837"
id="guide3859" />
<sodipodi:guide
orientation="0,1"
position="216,8.5116279"
id="guide3861" />
<sodipodi:guide
orientation="0,1"
position="218.86047,39.488372"
id="guide3863" />
<sodipodi:guide
orientation="1,0"
position="248.5814,30.139535"
id="guide3865" />
<sodipodi:guide
orientation="1,0"
position="279.48837,31.325581"
id="guide3867" />
<sodipodi:guide
orientation="1,0"
position="264,31.674419"
id="guide3869" />
</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>
<dc:creator>
<cc:Agent>
<dc:title>Gerald Combs</dc:title>
</cc:Agent>
</dc:creator>
<cc:license
rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/publicdomain/">
<cc:permits
rdf:resource="http://creativecommons.org/ns#Reproduction" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#Distribution" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
</cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-1004.3622)">
<rect
style="color:#000000;fill:#eeeeec;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.19911504"
width="46"
height="46"
x="1"
y="1005.3622"
id="rect2816"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_1.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<rect
y="1005.3622"
x="49"
height="46"
width="46"
id="rect3600"
style="color:#000000;fill:#eeeeec;fill-opacity:0.19911504;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_2.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<rect
style="color:#000000;fill:#eeeeec;fill-opacity:0.19911504;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:#eeeeec;fill-opacity:0.19911504;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:#eeeeec;fill-opacity:0.19911504;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:#eeeeec;fill-opacity:0.19911504;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"
d="m 50.999931,1028.3622 42.000137,0"
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_2.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 194.99993,1036.3622 42.00014,0"
id="path3791"
inkscape:connector-curvature="0"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_5.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<path
inkscape:connector-curvature="0"
id="path3793"
d="m 194.99993,1020.3622 42.00014,0"
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_5.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<path
inkscape:connector-curvature="0"
id="path3795"
d="m 272,1049.3622 0,-42.0001"
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_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 256,1049.3622 0,-42.0001"
id="path3797"
inkscape:connector-curvature="0"
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:0.80088495;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:0.80088495;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:0.80088495;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:0.80088495;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:0.80088495;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:0.80088495;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:0.80088495;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:0.80088495;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue"
xml:space="preserve"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_6.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
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:0.80088495;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:0.80088495;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:0.80088495;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>
<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:0.80088495;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:0.80088495;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:0.80088495;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:0.80088495;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:0.80088495;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:0.80088495;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue"
xml:space="preserve"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_6.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
y="1032.3622"
x="261.21201"
id="tspan3925"
sodipodi:role="line">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:0.80088495;stroke:none;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue"
xml:space="preserve"
inkscape:export-filename="/Users/gerald/Development/qtshark/image/layout_6.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
y="1032.2302"
x="276.65201"
id="tspan3929"
sodipodi:role="line">3</tspan></text>
</g>
</svg>

After

Width:  |  Height:  |  Size: 27 KiB

View File

@ -142,6 +142,13 @@ toolbar_icons.h:
gdk-pixbuf-csource --raw --name=toolbar_$${icon24}_24_pb_data $(top_srcdir)/image/toolbar/toolbar_$${icon24}_24.png >> $@ ;\
done
layouts.h:
echo "/* This file was automatically generated. DO NOT EDIT. */" > $@
echo >> $@
for layout_num in 1 2 3 4 5 6 wireless ; do \
gdk-pixbuf-csource --raw --name=layout_$${layout_num}_pb_data $(top_srcdir)/image/layout_$${layout_num}.png >> $@ ;\
done
EXTRA_DIST = \
$(GENERATOR_FILES) \
airpcap_dlg.c \

View File

@ -146,6 +146,7 @@ about_dlg.c main_welcome.c: ../../image/wssplash.xpm ../../image/wssplash-dev.xp
main_statusbar.c: expert_indicators.h capture_comment_icons.h
capture_if_dlg.c: network_icons.h remote_icons.h pipe_icon.h
stock_icons.c: toolbar_icons.h
prefs_layout.c: layouts.h
WIRESHARK_TAP_SRC = \
afp_stat.c \
@ -283,6 +284,7 @@ noinst_HEADERS = \
hostlist_table.h \
iax2_analysis.h \
keys.h \
layouts.h \
macros_dlg.h \
main.h \
main_airpcap_toolbar.h \

View File

@ -38,13 +38,7 @@
#include "ui/gtk/main.h"
#include "ui/gtk/dlg_utils.h"
#include "../../image/icon_layout_1.xpm"
#include "../../image/icon_layout_2.xpm"
#include "../../image/icon_layout_3.xpm"
#include "../../image/icon_layout_4.xpm"
#include "../../image/icon_layout_5.xpm"
#include "../../image/icon_layout_6.xpm"
#include "layouts.h"
#define LAYOUT_QTY (layout_type_max - 1)
@ -299,10 +293,8 @@ layout_prefs_show(void)
GtkWidget *filter_toolbar_placement_om;
GtkWidget *window_title_te;
const char ** inline_txt [LAYOUT_QTY] = {
icon_layout_5_xpm, icon_layout_2_xpm, icon_layout_1_xpm,
icon_layout_4_xpm, icon_layout_3_xpm, icon_layout_6_xpm };
GtkWidget ** layout_type_buttons = g_malloc (sizeof(GtkWidget*) * LAYOUT_QTY);
GtkWidget *layout_pixbufs[LAYOUT_QTY];
int pos = 0;
int i;
@ -329,13 +321,19 @@ layout_prefs_show(void)
gtk_box_pack_start (GTK_BOX(pane_vb), button_hb, FALSE, FALSE, 0);
/* pane layout */
layout_pixbufs[0] = gtk_image_new_from_pixbuf(gdk_pixbuf_new_from_inline(-1, layout_1_pb_data, FALSE, NULL));
layout_pixbufs[1] = gtk_image_new_from_pixbuf(gdk_pixbuf_new_from_inline(-1, layout_2_pb_data, FALSE, NULL));
layout_pixbufs[2] = gtk_image_new_from_pixbuf(gdk_pixbuf_new_from_inline(-1, layout_3_pb_data, FALSE, NULL));
layout_pixbufs[3] = gtk_image_new_from_pixbuf(gdk_pixbuf_new_from_inline(-1, layout_4_pb_data, FALSE, NULL));
layout_pixbufs[4] = gtk_image_new_from_pixbuf(gdk_pixbuf_new_from_inline(-1, layout_5_pb_data, FALSE, NULL));
layout_pixbufs[5] = gtk_image_new_from_pixbuf(gdk_pixbuf_new_from_inline(-1, layout_6_pb_data, FALSE, NULL));
for (i=0; i<LAYOUT_QTY; ++i)
{
type_tb = gtk_toggle_button_new ();
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(type_tb),
(layout_type_e)(i + 1) == prefs.gui_layout_type);
gtk_container_add (GTK_CONTAINER(type_tb), xpm_to_widget(inline_txt[i]));
gtk_container_add (GTK_CONTAINER(type_tb), layout_pixbufs[i]);
g_signal_connect(type_tb, "toggled", G_CALLBACK(layout_type_changed_cb), layout_type_buttons);
layout_type_buttons[i] = type_tb;