osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

More icon updates. 

Use the PNG versions of the new application icons.

Remove the XPM versions of the Wireshark application and capture icons.
To paraphrase Zoidberg, XPMs are bad and we should feel bad. Remove
xpm_to_widget_from_parent (which we weren't using and likely won't use
in the future).

Replace wiki_24.xpm (which was a GNOME or GTK+ stock icon IIRC) with the
16x16 and 24x24 versions emblem-web.png from GNOME icon theme 2.30.3.
This version was used specifically because it's GPLv2 and later versions
are GPLv3.

Update image/README.

svn path=/trunk/; revision=48565
This commit is contained in:
Gerald Combs 2013-03-26 19:51:33 +00:00
parent 67ffb10e64
commit d1b87423df
19 changed files with 3537 additions and 449 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile.am
View File

@ -808,6 +808,8 @@ EXTRA_DIST = \
image/toolbar/file_set_next_16.xpm \
image/toolbar/file_set_previous_16.xpm \
image/toolbar/flow_graph_16.xpm \
image/toolbar/gnome_emblem_web_16.png \
image/toolbar/gnome_emblem_web_24.png \
image/toolbar/graphs_16.xpm \
image/toolbar/icon_color_0.xpm \
image/toolbar/icon_color_1.xpm \
@ -841,7 +843,6 @@ EXTRA_DIST = \
image/toolbar/voip_flow_24.xpm \
image/toolbar/web_support_24.xpm \
image/toolbar/wep_closed_24.xpm \
image/toolbar/wiki_24.xpm \
image/tshark.rc.in \
image/voip_bg.xpm \
image/voip_select.xpm \
@ -860,21 +861,19 @@ EXTRA_DIST = \
image/wiretap.rc.in \
image/wsicon.svg \
image/wsicon16.png \
image/wsicon16.xpm \
image/wsicon256.png \
image/wsicon24.png \
image/wsicon32.png \
image/wsicon32.xpm \
image/wsicon48.png \
image/wsicon48.xpm \
image/wsicon64.png \
image/wsicon64.xpm \
image/wsicon256.png \
image/wsicon512.png \
image/wsicon1024.png \
image/wsicon-ask.png \
image/wsicon-ask.svg \
image/wsiconcap.svg \
image/wsiconcap16.xpm \
image/wsiconcap256.png \
image/wsiconcap32.xpm \
image/wsiconcap48.xpm \
image/wsiconcap512.png \
image/wsiconcap1024.png \
image/wsiconinst.svg \
image/wsiconinst256.png \
image/wslogo-dev.svg \

2
debian/rules vendored
View File

@ -79,7 +79,7 @@ install: build
#cp debian/wireshark-root.desktop $(CURDIR)/debian/tmp/usr/share/applications/
mkdir -p $(CURDIR)/debian/tmp/usr/share/pixmaps/
cp image/hi48-app-wireshark.png $(CURDIR)/debian/tmp/usr/share/pixmaps/
cp image/wsicon32.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps/
cp image/wsicon32.png $(CURDIR)/debian/tmp/usr/share/pixmaps/
mkdir -p $(CURDIR)/debian/tmp/etc/wireshark/
mv $(CURDIR)/debian/tmp/usr/share/wireshark/init.lua \
$(CURDIR)/debian/tmp/etc/wireshark/

2
debian/wireshark.menu vendored
View File

@ -1,5 +1,5 @@
?package(wireshark):needs="X11" section="Applications/Network/Monitoring" \
title="Wireshark" \
command="/usr/bin/wireshark" \
icon="/usr/share/pixmaps/wsicon32.xpm"
icon="/usr/share/pixmaps/wsicon32.png"

31
image/README.image
View File

@ -1,7 +1,7 @@
This directory contains a set of images and icons for the Wireshark suite of
applications. Of particular note for people creating packages for
distribution are the files wireshark.ico, hi??-app-wireshark.png, and
lo??-app-wireshark.png.
This directory contains a set of images and icons for the Wireshark
suite of applications. Of particular note for people creating packages
for distribution are the files wireshark.ico, wiresharkdoc.ico,
wsicon*.png, and WiresharkDoc-*.png
File descriptions:
@ -10,26 +10,21 @@ File Description
clist_ascend.xpm Packet list sort ascending and descending
clist_descend.xpm indicators
wsicon.svg Canonical vector source for the wireshark icon.
wsicon256.png Canonical raster source for the wireshark icon.
Generated from wsicon.svg.
wsicon.svg Old vector source for the wireshark icon.
wsiconcap.svg Canonical vector source for the "capture" icon.
wsiconcap256.png Canonical raster source for the "capture" icon.
Generated from wsiconcap.svg.
wsiconcap.svg Old vector source for the "capture" icon.
wsicondoc.svg Canonical vector source for the "document" icon.
wsicondoc256.png Canonical raster source for the "document" icon.
Generated from wsiconcap.svg.
wsicondoc.svg Old vector source for the "document" icon.
wsicon16.png Wireshark icons in various sizes
wsicon24.png
wsicon32.png
wsicon48.png
wsicon64.png
wsicon16.xpm
wsicon32.xpm
wsicon48.xpm
wsicon64.xpm
wsicon128.png
wsicon256.png
wsicon512.png
wsicon1024.png
wireshark.ico Windows application icon file with 16 and 32
pixel 3D logo icons, high and low color
@ -64,4 +59,4 @@ image/capture_comment_update.png paper-sheets.svg
plus-8.png OS X style add / remove icons. Created by Peter Hosey.
minus-8.png Released under CC-PD.
copy-8.png OS X style copy icon.
copy-8.png OS X style copy icon.

21
image/make-icons
View File

@ -1,21 +0,0 @@
#!/bin/sh
RESOLUTIONS="64 48 32 16"
CONVERT=convert
XPM_OPTS="-channel A -threshold 50%"
for RES in 64 48 32 16 ; do
$CONVERT -resize ${RES}x${RES} wsicon256.png wsicon${RES}.png
$CONVERT -resize ${RES}x${RES} $XPM_OPTS wsicon256.png xpm:- | \
sed -e "s/^static char \*-/static const char *wsicon${RES}_xpm/" > \
wsicon${RES}.xpm
done
for RES in 48 32 16 ; do
$CONVERT -resize ${RES}x${RES} $XPM_OPTS wsiconcap256.png xpm:- | \
sed -e "s/^static char \*-/static const char *wsiconcap${RES}_xpm/" > \
wsiconcap${RES}.xpm
done

4
image/toolbar.qrc
View File

@ -6,8 +6,8 @@
<file>toolbar/toolbar_wireshark_file_24.png</file>
</qresource>
<qresource prefix="/menu/help">
<file alias="wsicon16.xpm">wsicon16.xpm</file>
<file alias="wiki_24.xpm">toolbar/wiki_24.xpm</file>
<file alias="wsicon16.png">wsicon16.png</file>
<file alias="gnome_emblem_web_16.png">toolbar/gnome_emblem_web_16.png</file>
<file alias="wsicon-ask.png">wsicon-ask.png</file>
</qresource>
<qresource prefix="/stock">

BIN
image/toolbar/gnome_emblem_web_16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 973 B

BIN
image/toolbar/gnome_emblem_web_24.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

332
image/toolbar/wiki_24.xpm
View File

@ -1,332 +0,0 @@
/* XPM */
static const char * wiki_24_xpm[] = {
"24 24 305 2",
" c None",
". c #2D373E",
"+ c #374148",
"@ c #343A3E",
"# c #2E3337",
"$ c #32383C",
"% c #303B44",
"& c #1D2933",
"* c #313D47",
"= c #6F7980",
"- c #BCC5CB",
"; c #D2D8DC",
"> c #DFE6EB",
", c #E8EFF4",
"' c #CCD7DE",
") c #BDCBD5",
"! c #A3B1BC",
"~ c #505F6C",
"{ c #222F3A",
"] c #33383C",
"^ c #B8BEC2",
"/ c #DFE8EF",
"( c #DAE5ED",
"_ c #DCE7EE",
": c #E4EDF3",
"< c #D9E4EC",
"[ c #CCDBE5",
"} c #C2D3E0",
"| c #C4D3DF",
"1 c #D8E3EA",
"2 c #A5B1BC",
"3 c #272F36",
"4 c #000000",
"5 c #41494F",
"6 c #B8C3CA",
"7 c #CFDBE5",
"8 c #C5D6E3",
"9 c #D3E2EC",
"0 c #C7D9E5",
"a c #C5D8E5",
"b c #C2D4E1",
"c c #C4D6E2",
"d c #D4E1EA",
"e c #CDDAE4",
"f c #D4E1E9",
"g c #A9B6BE",
"h c #404950",
"i c #FBE73B",
"j c #F2B64D",
"k c #282F33",
"l c #BDC8CE",
"m c #DAE6ED",
"n c #DDE8EF",
"o c #E1ECF3",
"p c #D1E1EB",
"q c #C4DAE8",
"r c #C1D7E6",
"s c #BDD3E2",
"t c #D9E5ED",
"u c #D5E2EA",
"v c #D0DDE6",
"w c #CBD8E3",
"x c #FCEB3D",
"y c #F7B544",
"z c #5D502C",
"A c #1F2830",
"B c #97A7B1",
"C c #D6E2EB",
"D c #DBE8EF",
"E c #C6D7E3",
"F c #C3D7E4",
"G c #C0D9E8",
"H c #C2DBEA",
"I c #BCD5E5",
"J c #B7D0E0",
"K c #C7D8E3",
"L c #D3E0E9",
"M c #D0DFE8",
"N c #CBDAE5",
"O c #FCE93B",
"P c #F7B545",
"Q c #6C5F34",
"R c #60727F",
"S c #C5D5E1",
"T c #D1DFE8",
"U c #D4E2EB",
"V c #ACC2D3",
"W c #AAC5D7",
"X c #B4CEE0",
"Y c #B9D4E5",
"Z c #BAD5E6",
"` c #B5D0E2",
" . c #B6CFDF",
".. c #D0E0EA",
"+. c #A3BACC",
"@. c #BACCD9",
"#. c #FAE43A",
"$. c #F4B244",
"%. c #605737",
"&. c #8498A7",
"*. c #C0D2DE",
"=. c #A2B8C9",
"-. c #9EBACE",
";. c #A5C1D5",
">. c #A9C6DA",
",. c #ACCADD",
"'. c #A8C6DB",
"). c #ADC8DA",
"!. c #CFDFE9",
"~. c #CBDCE6",
"{. c #F9DF39",
"]. c #F3AF42",
"^. c #625637",
"/. c #708592",
"(. c #060C12",
"_. c #181E23",
":. c #899FAE",
"<. c #7E98AD",
"[. c #96AEC1",
"}. c #87A5BB",
"|. c #93B1C7",
"1. c #97B6CD",
"2. c #9BBBD1",
"3. c #9DBDD4",
"4. c #9DBDD3",
"5. c #C9DBE7",
"6. c #CADBE5",
"7. c #F9DC38",
"8. c #EFB44D",
"9. c #665A32",
"0. c #91A7B8",
"a. c #798FA0",
"b. c #060C13",
"c. c #141A20",
"d. c #98B0C3",
"e. c #86A2B8",
"f. c #7292AB",
"g. c #7E9EB7",
"h. c #83A4BD",
"i. c #88A9C2",
"j. c #8BADC6",
"k. c #8CAFC8",
"l. c #9CBACF",
"m. c #C6D8E4",
"n. c #F8D837",
"o. c #F0A93F",
"p. c #655930",
"q. c #94ACBD",
"r. c #95AEC1",
"s. c #4E6A83",
"t. c #070E14",
"u. c #0A1117",
"v. c #51718D",
"w. c #87A2B7",
"x. c #85A3B9",
"y. c #95B0C5",
"z. c #89A8BF",
"A. c #7A9EB8",
"B. c #799DB9",
"C. c #7A9FBA",
"D. c #799EBA",
"E. c #8BABC2",
"F. c #F6D236",
"G. c #EDA43E",
"H. c #5C5130",
"I. c #9EB4C3",
"J. c #91AABE",
"K. c #7691A8",
"L. c #284969",
"M. c #060C11",
"N. c #080E14",
"O. c #395C7B",
"P. c #416686",
"Q. c #7895AD",
"R. c #A8C0D1",
"S. c #ADC5D5",
"T. c #98B3C8",
"U. c #6990AD",
"V. c #668DAC",
"W. c #678EAC",
"X. c #678CAA",
"Y. c #D7AE74",
"Z. c #61562F",
"`. c #9FB7C8",
" + c #9BB3C5",
".+ c #94AFC2",
"++ c #66839B",
"@+ c #264665",
"#+ c #050B10",
"$+ c #060A0E",
"%+ c #2D4C67",
"&+ c #3D6282",
"*+ c #708FA8",
"=+ c #A2BBCD",
"-+ c #A6BED0",
";+ c #A9C2D2",
">+ c #96B2C6",
",+ c #6F92AD",
"'+ c #5B81A0",
")+ c #4F4115",
"!+ c #9FB6C6",
"~+ c #9BB3C6",
"{+ c #96B0C3",
"]+ c #88A3B8",
"^+ c #2A4967",
"/+ c #1D3955",
"(+ c #020609",
"_+ c #25415A",
":+ c #365A7A",
"<+ c #7492A9",
"[+ c #9CB5C8",
"}+ c #A0B9CB",
"|+ c #A3BBCD",
"1+ c #A5BDCF",
"2+ c #A6BECF",
"3+ c #4A708F",
"4+ c #4C6F8F",
"5+ c #446888",
"6+ c #94AEC1",
"7+ c #95AFC3",
"8+ c #8FABBF",
"9+ c #708DA4",
"0+ c #254666",
"a+ c #17314B",
"b+ c #142534",
"c+ c #2E5172",
"d+ c #3D5F7D",
"e+ c #8FA9BD",
"f+ c #99B2C6",
"g+ c #9DB7C9",
"h+ c #748FA7",
"i+ c #426787",
"j+ c #446A8A",
"k+ c #426788",
"l+ c #3F6485",
"m+ c #3B6080",
"n+ c #809CB2",
"o+ c #8EAABE",
"p+ c #89A5BA",
"q+ c #6A879F",
"r+ c #1F3F5F",
"s+ c #0B1824",
"t+ c #010305",
"u+ c #1F3A53",
"v+ c #2C4F6F",
"w+ c #4A6A86",
"x+ c #91ACC0",
"y+ c #94AEC2",
"z+ c #617E96",
"A+ c #3B5F7F",
"B+ c #395D7D",
"C+ c #325676",
"D+ c #7F9BB1",
"E+ c #87A3B8",
"F+ c #819FB5",
"G+ c #25425E",
"H+ c #102438",
"I+ c #000103",
"J+ c #020407",
"K+ c #1F3C58",
"L+ c #335473",
"M+ c #8CA7BC",
"N+ c #728DA4",
"O+ c #2B4C6B",
"P+ c #315575",
"Q+ c #315474",
"R+ c #2F5273",
"S+ c #2D5070",
"T+ c #2A4C6C",
"U+ c #587790",
"V+ c #7E9DB3",
"W+ c #5F7E95",
"X+ c #132D47",
"Y+ c #04080D",
"Z+ c #25405B",
"`+ c #7F9EB4",
" @ c #7B98AE",
".@ c #3D5A74",
"+@ c #284A6A",
"@@ c #264868",
"#@ c #244565",
"$@ c #214262",
"%@ c #33526E",
"&@ c #48657C",
"*@ c #192F46",
"=@ c #03070C",
"-@ c #2D4050",
";@ c #3F5B75",
">@ c #1D3C5C",
",@ c #1F405F",
"'@ c #1E3E5D",
")@ c #1C3B5B",
"!@ c #1A3958",
"~@ c #163554",
"{@ c #0A1B2B",
"]@ c #010204",
"^@ c #060C15",
"/@ c #0D2032",
"(@ c #112941",
"_@ c #163351",
":@ c #173554",
"<@ c #15314F",
"[@ c #102A44",
"}@ c #0A1C2E",
"|@ c #030A10",
" ",
" . + @ # $ % & ",
" * = - ; > , ' ) ! ~ { ",
" ] ^ / ( _ : < [ } | 1 2 3 4 4 ",
" 5 6 7 _ 8 9 0 a b c d e f g h 4 i j 4 ",
" k l m n o p q q r s t u d v w 4 x y z 4 ",
" A B C t D E F G H I J K L M N 4 O P Q 4 ",
" R S T U V W X Y Z ` ...+.@.4 #.$.%.4 ",
" &.*.N =.-.;.>.,.,.'.).!.~.4 {.].^.4 /.(. ",
" _.:.<.[.}.|.1.2.3.3.4.5.6.4 7.8.9.4 0.a.b. ",
" c.d.e.f.g.h.i.j.k.k.l.m.4 n.o.p.4 q.r.s.t. ",
" u.v.w.x.y.z.A.B.C.D.E.4 F.G.H.4 I.J.K.L.M. ",
" N.O.P.Q.R.S.T.U.V.W.X.4 Y.Z.4 `. +.+++@+#+ ",
" $+%+&+*+=+-+;+>+,+'+4 )+4 4 !+~+{+]+^+/+(+ ",
" _+:+<+[+}+|+1+2+3+4 4 4+5+6+7+8+9+0+a+4 ",
" b+c+d+e+f+[+g+h+i+j+k+l+m+n+o+p+q+r+s+4 ",
" t+u+v+w+x+y+{+z+m+A+B+:+C+D+E+F+G+H+I+ ",
" J+K+L+p+M+N+O+P+Q+R+S+T+U+V+W+X+t+4 ",
" Y+Z+`+ @.@+@+@+@@@#@$@%@&@*@=@4 ",
" t+-@;@>@r+,@r+'@)@!@~@{@]@4 ",
" 4 ^@/@(@_@:@<@[@}@|@4 4 ",
" 4 4 4 4 4 4 4 4 ",
" ",
" "};

22
ui/gtk/Makefile.am
View File

@ -135,11 +135,11 @@ pipe_icon.h:
toolbar_icons.h:
echo "/* This file was automatically generated. DO NOT EDIT. */" > $@
echo >> $@
for icon16 in wireshark_file ; do \
gdk-pixbuf-csource --raw --name=toolbar_$${icon16}_16_pb_data $(top_srcdir)/image/toolbar/toolbar_$${icon16}_16.png >> $@ ;\
for icon16 in gnome_emblem_web toolbar_wireshark_file ; do \
gdk-pixbuf-csource --raw --name=$${icon16}_16_pb_data $(top_srcdir)/image/toolbar/$${icon16}_16.png >> $@ ;\
done
for icon24 in wireshark_file ; do \
gdk-pixbuf-csource --raw --name=toolbar_$${icon24}_24_pb_data $(top_srcdir)/image/toolbar/toolbar_$${icon24}_24.png >> $@ ;\
for icon24 in gnome_emblem_web toolbar_wireshark_file ; do \
gdk-pixbuf-csource --raw --name=$${icon24}_24_pb_data $(top_srcdir)/image/toolbar/$${icon24}_24.png >> $@ ;\
done
layouts.h:
@ -149,6 +149,20 @@ layouts.h:
gdk-pixbuf-csource --raw --name=layout_$${layout_num}_pb_data $(top_srcdir)/image/layout_$${layout_num}.png >> $@ ;\
done
wsicon.h:
echo "/* This file was automatically generated. DO NOT EDIT. */" > $@
echo >> $@
for layout_num in 16 24 32 48 64 ; do \
gdk-pixbuf-csource --raw --name=wsicon_$${layout_num}_pb_data $(top_srcdir)/image/wsicon$${layout_num}.png >> $@ ;\
done
wsiconcap.h:
echo "/* This file was automatically generated. DO NOT EDIT. */" > $@
echo >> $@
for layout_num in 16 24 32 48 64 ; do \
gdk-pixbuf-csource --raw --name=wsiconcap_$${layout_num}_pb_data $(top_srcdir)/image/wsiconcap$${layout_num}.png >> $@ ;\
done
EXTRA_DIST = \
$(GENERATOR_FILES) \
airpcap_dlg.c \

6
ui/gtk/Makefile.common
View File

@ -145,8 +145,10 @@ WIRESHARK_GTK_SRC = \
about_dlg.c main_welcome.c: ../../image/wssplash.xpm ../../image/wssplash-dev.xpm remote_icons.h
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
stock_icons.c: stock_icons.h toolbar_icons.h wsicon.h
prefs_layout.c: layouts.h
main.c: wsicon.h wsiconcap.h
gui_utils.c: wsicon.h
WIRESHARK_TAP_SRC = \
afp_stat.c \
@ -344,4 +346,6 @@ noinst_HEADERS = \
voip_calls.h \
voip_calls_dlg.h \
webbrowser.h \
wsiconcap.h \
wsicon.h \
$(WIRESHARK_CUSTOM_HDRS)

10
ui/gtk/Makefile.nmake
View File

@ -73,6 +73,16 @@ layouts.h:
for %n in (1 2 3 4 5 6) do \
gdk-pixbuf-csource --raw --name=layout_%n_pb_data ../../image/layout_%n.png >> $@
wsicon.h:
echo /* This file was automatically generated. DO NOT EDIT. */ > $@
echo. $@
for %n in (16 24 32 48 64) do \
gdk-pixbuf-csource --raw --name=wsicon_%n_pb_data ../../image/wsicon%n.png >> $@
wsiconcap.h:
echo /* This file was automatically generated. DO NOT EDIT. */ > $@
echo. $@
for %n in (16 24 32 48 64) do \
gdk-pixbuf-csource --raw --name=wsiconcap_%n_pb_data ../../image/wsiconcap%n.png >> $@
# The shell script runs slowly, as multiple greps and seds are run
# for each input file; this is especially slow on Windows. Therefore,

33
ui/gtk/gui_utils.c
View File

@ -54,10 +54,7 @@
#include "ui/gtk/old-gtk-compat.h"
#include "image/wsicon16.xpm"
#include "image/wsicon32.xpm"
#include "image/wsicon48.xpm"
#include "image/wsicon64.xpm"
#include "ui/gtk/wsicon.h"
#ifdef _WIN32
#include <windows.h>
@ -116,13 +113,13 @@ window_icon_realize_cb(GtkWidget *win,
GList *ws_icon_list = NULL;
GdkPixbuf *icon;
icon = gdk_pixbuf_new_from_xpm_data((const char **)wsicon16_xpm);
icon = gdk_pixbuf_new_from_inline(-1, wsicon_16_pb_data, FALSE, NULL);
ws_icon_list = g_list_append(ws_icon_list, icon);
icon = gdk_pixbuf_new_from_xpm_data((const char **)wsicon32_xpm);
icon = gdk_pixbuf_new_from_inline(-1, wsicon_32_pb_data, FALSE, NULL);
ws_icon_list = g_list_append(ws_icon_list, icon);
icon = gdk_pixbuf_new_from_xpm_data((const char **)wsicon48_xpm);
icon = gdk_pixbuf_new_from_inline(-1, wsicon_48_pb_data, FALSE, NULL);
ws_icon_list = g_list_append(ws_icon_list, icon);
icon = gdk_pixbuf_new_from_xpm_data((const char **)wsicon64_xpm);
icon = gdk_pixbuf_new_from_inline(-1, wsicon_64_pb_data, FALSE, NULL);
ws_icon_list = g_list_append(ws_icon_list, icon);
gtk_window_set_icon_list(GTK_WINDOW(win), ws_icon_list);
@ -454,26 +451,6 @@ window_destroy(GtkWidget *win)
gtk_widget_destroy(win);
}
#if 0
/* Do we need this one ? */
/* convert an xpm to a GtkWidget, using the window settings from its parent */
/* (be sure that the parent window is already being displayed) */
GtkWidget *
xpm_to_widget_from_parent(GtkWidget *parent,
const char **xpm)
{
GdkPixbuf *pixbuf;
GdkPixmap *pixmap;
GdkBitmap *bitmap;
pixbuf = gdk_pixbuf_new_from_xpm_data(xpm);
gdk_pixbuf_render_pixmap_and_mask_for_colormap(pixbuf, gtk_widget_get_colormap(parent), &pixmap, &bitmap, 128);
return gtk_image_new_from_pixmap(pixmap, bitmap);
}
#endif
static GtkWidget *
_gtk_image_new_from_pixbuf_unref(GdkPixbuf *pixbuf) {
GtkWidget *widget;

47
ui/gtk/main.c
View File

@ -183,13 +183,8 @@
#include "ui/gtk/old-gtk-compat.h"
#ifdef HAVE_LIBPCAP
#include "../../image/wsicon16.xpm"
#include "../../image/wsicon32.xpm"
#include "../../image/wsicon48.xpm"
#include "../../image/wsicon64.xpm"
#include "../../image/wsiconcap16.xpm"
#include "../../image/wsiconcap32.xpm"
#include "../../image/wsiconcap48.xpm"
#include "wsicon.h"
#include "wsiconcap.h"
#endif
#ifdef HAVE_AIRPCAP
@ -1522,10 +1517,10 @@ main_cf_cb_file_rescan_finished(capture_file *cf)
#ifdef HAVE_LIBPCAP
static GList *icon_list_create(
const char **icon16_xpm,
const char **icon32_xpm,
const char **icon48_xpm,
const char **icon64_xpm)
const guint8 *icon16_pb,
const guint8 *icon32_pb,
const guint8 *icon48_pb,
const guint8 *icon64_pb)
{
GList *icon_list = NULL;
GdkPixbuf * pixbuf16;
@ -1534,26 +1529,26 @@ static GList *icon_list_create(
GdkPixbuf * pixbuf64;
if(icon16_xpm != NULL) {
pixbuf16 = gdk_pixbuf_new_from_xpm_data(icon16_xpm);
if(icon16_pb != NULL) {
pixbuf16 = gdk_pixbuf_new_from_inline(-1, icon16_pb, FALSE, NULL);
g_assert(pixbuf16);
icon_list = g_list_append(icon_list, pixbuf16);
}
if(icon32_xpm != NULL) {
pixbuf32 = gdk_pixbuf_new_from_xpm_data(icon32_xpm);
if(icon32_pb != NULL) {
pixbuf32 = gdk_pixbuf_new_from_inline(-1, icon32_pb, FALSE, NULL);
g_assert(pixbuf32);
icon_list = g_list_append(icon_list, pixbuf32);
}
if(icon48_xpm != NULL) {
pixbuf48 = gdk_pixbuf_new_from_xpm_data(icon48_xpm);
if(icon48_pb != NULL) {
pixbuf48 = gdk_pixbuf_new_from_inline(-1, icon48_pb, FALSE, NULL);
g_assert(pixbuf48);
icon_list = g_list_append(icon_list, pixbuf48);
}
if(icon64_xpm != NULL) {
pixbuf64 = gdk_pixbuf_new_from_xpm_data(icon64_xpm);
if(icon64_pb != NULL) {
pixbuf64 = gdk_pixbuf_new_from_inline(-1, icon64_pb, FALSE, NULL);
g_assert(pixbuf64);
icon_list = g_list_append(icon_list, pixbuf64);
}
@ -1580,7 +1575,7 @@ main_capture_cb_capture_prepared(capture_options *capture_opts)
main_capture_set_main_window_title(capture_opts);
if(icon_list == NULL) {
icon_list = icon_list_create(wsiconcap16_xpm, wsiconcap32_xpm, wsiconcap48_xpm, NULL);
icon_list = icon_list_create(wsiconcap_16_pb_data, wsiconcap_32_pb_data, wsiconcap_48_pb_data, wsiconcap_64_pb_data);
}
gtk_window_set_icon_list(GTK_WINDOW(top_level), icon_list);
@ -1640,7 +1635,7 @@ main_capture_cb_capture_update_finished(capture_options *capture_opts)
main_set_for_capture_file(TRUE);
if(icon_list == NULL) {
icon_list = icon_list_create(wsicon16_xpm, wsicon32_xpm, wsicon48_xpm, wsicon64_xpm);
icon_list = icon_list_create(wsicon_16_pb_data, wsicon_32_pb_data, wsicon_48_pb_data, wsicon_64_pb_data);
}
gtk_window_set_icon_list(GTK_WINDOW(top_level), icon_list);
@ -1681,7 +1676,7 @@ main_capture_cb_capture_fixed_finished(capture_options *capture_opts _U_)
main_set_window_name("The Wireshark Network Analyzer");
if(icon_list == NULL) {
icon_list = icon_list_create(wsicon16_xpm, wsicon32_xpm, wsicon48_xpm, wsicon64_xpm);
icon_list = icon_list_create(wsicon_16_pb_data, wsicon_32_pb_data, wsicon_48_pb_data, wsicon_64_pb_data);
}
gtk_window_set_icon_list(GTK_WINDOW(top_level), icon_list);
@ -1726,7 +1721,7 @@ main_capture_cb_capture_failed(capture_options *capture_opts _U_)
main_set_for_capture_file(FALSE);
if(icon_list == NULL) {
icon_list = icon_list_create(wsicon16_xpm, wsicon32_xpm, wsicon48_xpm, wsicon64_xpm);
icon_list = icon_list_create(wsicon_16_pb_data, wsicon_32_pb_data, wsicon_48_pb_data, wsicon_64_pb_data);
}
gtk_window_set_icon_list(GTK_WINDOW(top_level), icon_list);
@ -1888,7 +1883,7 @@ main_capture_callback(gint event, capture_options *capture_opts, gpointer user_d
main_capture_cb_capture_update_started(capture_opts);
#ifdef HAVE_GTKOSXAPPLICATION
theApp = (GtkosxApplication *)g_object_new(GTKOSX_TYPE_APPLICATION, NULL);
gtkosx_application_set_dock_icon_pixbuf(theApp,gdk_pixbuf_new_from_xpm_data(wsiconcap48_xpm));
gtkosx_application_set_dock_icon_pixbuf(theApp, gdk_pixbuf_new_from_inline(-1, wsiconcap_48_pb_data, FALSE, NULL);
#endif
break;
case(capture_cb_capture_update_continue):
@ -1915,7 +1910,7 @@ main_capture_callback(gint event, capture_options *capture_opts, gpointer user_d
* closes the capturing on its own! */
#ifdef HAVE_GTKOSXAPPLICATION
theApp = (GtkosxApplication *)g_object_new(GTKOSX_TYPE_APPLICATION, NULL);
gtkosx_application_set_dock_icon_pixbuf(theApp,gdk_pixbuf_new_from_xpm_data(wsicon64_xpm));
gtkosx_application_set_dock_icon_pixbuf(theApp, gdk_pixbuf_new_from_inline(-1, wsicon_64_pb_data, FALSE, NULL);
#endif
main_capture_cb_capture_stopping(capture_opts);
break;
@ -3208,7 +3203,7 @@ main(int argc, char *argv[])
#ifdef HAVE_GTKOSXAPPLICATION
theApp = (GtkosxApplication *)g_object_new(GTKOSX_TYPE_APPLICATION, NULL);
gtkosx_application_set_dock_icon_pixbuf(theApp,gdk_pixbuf_new_from_xpm_data(wsicon64_xpm));
gtkosx_application_set_dock_icon_pixbuf(theApp, gdk_pixbuf_new_from_inline(-1, wsicon_64_pb_data, FALSE, NULL);
gtkosx_application_ready(theApp);
#endif

8
ui/gtk/stock_icons.c
View File

@ -29,6 +29,8 @@
#include "ui/gtk/stock_icons.h"
#include "ui/gtk/toolbar_icons.h"
#include "ui/gtk/wsicon.h"
#include "ui/utf8_entities.h"
/* these icons are derived from the original stock icons */
@ -40,14 +42,12 @@
#include "../../image/toolbar/capture_filter_24.xpm"
#include "../../image/toolbar/capture_details_24.xpm"
#include "../../image/toolbar/display_filter_24.xpm"
#include "../../image/wsicon16.xpm"
#include "../../image/toolbar/colorize_24.xpm"
#include "../../image/toolbar/autoscroll_24.xpm"
#include "../../image/toolbar/resize_columns_24.xpm"
#include "../../image/toolbar/time_24.xpm"
#include "../../image/toolbar/internet_24.xpm"
#include "../../image/toolbar/web_support_24.xpm"
#include "../../image/toolbar/wiki_24.xpm"
#include "../../image/toolbar/conversations_16.xpm"
#include "../../image/toolbar/endpoints_16.xpm"
#include "../../image/toolbar/expert_info_16.xpm"
@ -183,14 +183,12 @@ void stock_icons_init(void) {
#endif
{ WIRESHARK_STOCK_DISPLAY_FILTER, display_filter_24_xpm },
{ WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY, display_filter_24_xpm },
{ WIRESHARK_STOCK_ABOUT, wsicon16_xpm },
{ WIRESHARK_STOCK_COLORIZE, colorize_24_xpm },
{ WIRESHARK_STOCK_AUTOSCROLL, autoscroll_24_xpm },
{ WIRESHARK_STOCK_RESIZE_COLUMNS, resize_columns_24_xpm},
{ WIRESHARK_STOCK_TIME, time_24_xpm},
{ WIRESHARK_STOCK_INTERNET, internet_24_xpm},
{ WIRESHARK_STOCK_WEB_SUPPORT, web_support_24_xpm},
{ WIRESHARK_STOCK_WIKI, wiki_24_xpm},
{ WIRESHARK_STOCK_CONVERSATIONS, conversations_16_xpm},
{ WIRESHARK_STOCK_ENDPOINTS, endpoints_16_xpm},
{ WIRESHARK_STOCK_EXPERT_INFO, expert_info_16_xpm},
@ -224,7 +222,9 @@ void stock_icons_init(void) {
};
static const stock_pixbuf_t pixbufs[] = {
{ WIRESHARK_STOCK_ABOUT, wsicon_16_pb_data, wsicon_24_pb_data },
{ WIRESHARK_STOCK_SAVE, toolbar_wireshark_file_16_pb_data, toolbar_wireshark_file_24_pb_data},
{ WIRESHARK_STOCK_WIKI, gnome_emblem_web_16_pb_data, gnome_emblem_web_24_pb_data },
{ NULL, NULL, NULL }
};
/* Register our stock items */

185
ui/gtk/toolbar_icons.h
View File

@ -1,5 +1,77 @@
/* This file was automatically generated. DO NOT EDIT. */
/* GdkPixbuf RGBA C-Source image dump */
#ifdef __SUNPRO_C
#pragma align 4 (gnome_emblem_web_16_pb_data)
#endif
#ifdef __GNUC__
static const guint8 gnome_emblem_web_16_pb_data[] __attribute__ ((__aligned__ (4))) =
#else
static const guint8 gnome_emblem_web_16_pb_data[] =
#endif
{ ""
/* Pixbuf magic (0x47646b50) */
"GdkP"
/* length: header (24) + pixel_data (1024) */
"\0\0\4\30"
/* pixdata_type (0x1010002) */
"\1\1\0\2"
/* rowstride (64) */
"\0\0\0@"
/* width (16) */
"\0\0\0\20"
/* height (16) */
"\0\0\0\20"
/* pixel_data: */
"\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\40P\200\20\40"
"K\206_\"K\212\230%N\212\324%O\213\321\"M\210\226!I\210^'N\211\15\377"
"\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
"\377\377\0\377\377\377\0\37K\210K*T\211\355e\205\216\367\213\244q\376"
"\235\262Y\377\241\271\224\377w\226\277\376Vy\251\365&P\214\353\36H\205"
"C\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
"\0#N\211\223\\{u\371\223\253\212\377\222\254\222\377\220\253}\377\230"
"\260b\377\215\255\253\377\207\251\324\377\243\273\220\377\237\267x\377"
"Hk\207\367$M\213\210\377\377\377\0\377\377\377\0\377\377\377\0\40J\207"
"HUv{\367\235\262d\377\221\255w\377\223\260{\377|\240\275\377\201\245"
"\323\377\210\251\314\377\215\254\250\377\234\267\200\377\261\305=\377"
"\250\274>\377Ej\207\367\37K\205A\377\377\377\0\40P\200\20(R\212\354\232"
"\2576\377\245\270.\377\247\273A\377\203\245\235\377z\237\317\377\204"
"\250\325\377\215\257\331\377\256\307t\377\274\320@\377\264\3079\377\253"
"\2763\377\235\262D\377(P\212\351+@\200\14\40K\206_i\207\200\367\235\260"
")\377\237\2649\377n\223\255\377m\225\307\377w\235\315\377\177\243\322"
"\377\221\261\267\377\243\277\210\377\210\251\251\377\227\262s\377\246"
"\273<\377\242\265-\377d\204\203\367\40I\207W!K\211\231\211\241^\377\201"
"\235l\377i\217\227\377_\211\276\377h\220\304\377p\227\311\377v\234\314"
"\377\230\266\225\377\302\325B\377\261\307Q\377\237\267^\377\237\265F"
"\377\234\261;\377\205\237f\376\40K\207\216\"K\210\325\222\251V\377b\207"
"\223\377Q}\266\377Y\204\273\377a\213\300\377h\220\304\377m\224\305\377"
"\271\315H\377\275\320\77\377\267\312;\377\260\3036\377\222\254W\377\234"
"\2604\377\203\237\224\377\"M\211\313!L\211\323y\230\257\377q\222q\377"
"k\217\177\377s\226\202\377Y\204\273\377^\210\276\377e\216\272\377\261"
"\306F\377\267\312;\377\263\3068\377\255\3004\377\243\2663\377\202\236"
"^\377u\224\276\377!L\211\311\40L\207\227`\204\262\376R|\263\377\211\241"
"H\377\243\266-\377\205\243g\377W\202\264\377X\203\272\377l\221\236\377"
"r\226\223\377\234\264O\377\251\2741\377\242\265,\377z\231s\377_\201\260"
"\375!I\207\214!I\210^Mr\244\364b\207\267\377\227\2540\377\237\262*\377"
"\245\270.\377\237\265\77\377N{\262\377N{\264\377Mz\263\377|\234n\377"
"\244\267.\377\234\260,\377k\217\271\377Hm\240\364!J\210V$I\200\16%O\214"
"\353p\221\274\377i\213z\377\235\260)\377\237\262+\377\207\242R\377Cq"
"\255\377Dr\255\377Cq\255\377l\216u\377\237\262*\377\227\2545\377m\216"
"\271\377$M\212\347\32M\200\12\377\377\377\0!I\207F7^\225\364u\225\300"
"\377\223\2518\377\234\257+\377Py\206\3778i\247\3779i\247\3778i\247\377"
"\\\201y\377\235\260)\377\204\240\207\3774Z\223\366\40I\206\77\377\377"
"\377\0\377\377\377\0\377\377\377\0!L\210\2157]\224\364\225\253C\377\211"
"\243Z\377Mx\257\377\77m\251\377\77m\251\377Mx\257\377i\215\254\377\213"
"\243b\3779_\220\364!M\211\202\377\377\377\0\377\377\377\0\377\377\377"
"\0\377\377\377\0\377\377\377\0\36H\205C4[~\354Nr\240\363_\202\261\376"
"p\220\273\377p\220\273\377^\201\257\375In\241\363%P\213\346\"H\210<\377"
"\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
"\377\377\0\377\377\377\0+@\200\14\40I\207W\40J\210\220\"L\211\315!K\211"
"\313!J\210\215!J\210V\32M\200\12\377\377\377\0\377\377\377\0\377\377"
"\377\0\377\377\377\0"};
/* GdkPixbuf RGBA C-Source image dump */
#ifdef __SUNPRO_C
@ -83,6 +155,119 @@ static const guint8 toolbar_wireshark_file_16_pb_data[] =
"\377\377\0"};
/* GdkPixbuf RGBA C-Source image dump */
#ifdef __SUNPRO_C
#pragma align 4 (gnome_emblem_web_24_pb_data)
#endif
#ifdef __GNUC__
static const guint8 gnome_emblem_web_24_pb_data[] __attribute__ ((__aligned__ (4))) =
#else
static const guint8 gnome_emblem_web_24_pb_data[] =
#endif
{ ""
/* Pixbuf magic (0x47646b50) */
"GdkP"
/* length: header (24) + pixel_data (2304) */
"\0\0\11\30"
/* pixdata_type (0x1010002) */
"\1\1\0\2"
/* rowstride (96) */
"\0\0\0`"
/* width (24) */
"\0\0\0\30"
/* height (24) */
"\0\0\0\30"
/* pixel_data: */
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\1!I\207F\"L\207"
"\200%N\213\300\"M\211\360\"L\210\365%P\213\312!L\211\212\37K\206R+U\200"
"\6\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\"M\210\36\"M\212\310Ch\213\365"
"y\225{\376\216\247r\377\243\270`\377\256\304|\377\204\241\310\377i\212"
"\267\375Ej\236\364#M\212\335\37I\2071\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0!I\206e5[\200"
"\364\202\234{\376\231\260\205\377\217\253\222\377\227\255I\377\247\273"
"4\377\236\272\205\377\205\247\322\377\213\253\323\377\241\272\250\377"
"\214\246\223\3760W\210\366!L\210\203\0U\252\3\0\0\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\37J\207S@d\204\366\232\260l"
"\377\212\250\254\377\210\247\205\377r\231\312\377\216\251i\377\203\244"
"\303\377\206\247\270\377\177\243\313\377\223\261\231\377\242\273j\377"
"\256\302G\377\245\272^\377Nr\217\366\"L\207\200\0\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0$I\206\25)Q\201\362\234\260F\377\234"
"\263P\377\224\256f\377\264\3079\377\202\244\260\377}\242\321\377\204"
"\250\325\377\212\254\314\377\217\253\220\377\225\263\236\377\236\272"
"v\377\264\3079\377\256\3015\377\243\270K\377/W\206\365!H\205.\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\"L\211\266\201\232`\375\242"
"\265,\377\250\2730\377\253\2779\377\210\250\217\377x\234\277\377}\242"
"\321\377\205\251\326\377\213\256\331\377\225\265\260\377\277\323D\377"
"\273\316>\377\265\3109\377\257\3025\377\250\2731\377\220\250^\377\"L"
"\211\33333\231\5\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\36K\207\"6\\\202\370"
"\234\257-\377\242\265,\377\245\2713\377v\232\234\377k\223\306\377s\231"
"\312\377z\237\317\377\200\244\323\377\203\247\324\377\277\323V\377\211"
"\252\263\377\221\257\217\377\243\274Y\377\256\3015\377\250\2730\377\241"
"\264/\377Di\220\364\37H\206J\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0!K\207Uh"
"\206m\370\235\260)\377\235\2613\377w\230\205\377`\212\277\377h\220\304"
"\377n\226\310\377t\233\313\377y\236\316\377|\240\314\377\252\304r\377"
"\265\313S\377\221\257\211\377\204\244\222\377\220\254h\377\247\2720\377"
"\241\264,\377t\220v\375\40J\207\177\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0!"
"K\211\214\204\234W\377w\226\215\377R~\254\377W\202\263\377\\\207\275"
"\377c\214\301\377i\221\304\377n\225\307\377q\230\311\377\234\270\202"
"\377\300\323A\377\275\320\77\377\270\313;\377\262\3058\377\233\263O\377"
"\242\2664\377\211\244]\377\204\235q\377\"M\211\276\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0!L\211\311\210\241a\377\202\234]\377U\177\237\377Q}\266"
"\377W\202\272\377]\207\275\377b\214\300\377g\217\303\377i\221\305\377"
"\261\307O\377\274\317>\377\271\314<\377\265\310:\377\260\3036\377\251"
"\2755\377\207\243^\377\235\260-\377\200\235\254\377!K\210\355\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0!L\211\274c\205\264\377g\213\216\377q\221k\377"
"n\221|\377q\224\204\377\\\205\257\377[\206\274\377_\211\276\377a\213"
"\277\377\253\302N\377\270\313;\377\266\311:\377\262\3057\377\255\300"
"4\377\250\2731\377\220\250H\377p\220z\377v\226\300\377!K\211\343\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0!J\210|Ot\246\374_\206\267\377Dr\244\377"
"\230\2566\377\244\267.\377\216\250W\377V\201\263\377W\202\272\377Y\204"
"\273\377k\221\242\377\224\257e\377\210\247s\377\255\3007\377\252\275"
"2\377\246\271/\377\241\264+\377l\216\213\377`\203\261\377\"K\210\256"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\40J\207H<c\231\363j\215\273\377Py\212"
"\377\235\260)\377\242\265,\377\246\271/\377\227\256K\377i\216\220\377"
"Q}\266\377R~\266\377Q}\266\377P|\265\377\237\265A\377\247\2720\377\243"
"\266-\377\202\235P\377`\207\270\377Lp\244\371\40K\206p\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0$I\206\25%N\211\370t\225\277\377Ox\226\377\233\256"
"*\377\236\261*\377\242\265-\377\246\271/\377\216\250R\377Iv\261\377I"
"w\261\377Iw\261\377Hu\260\377\203\240^\377\244\267.\377\240\263+\377"
"k\215m\377u\226\301\377/W\220\365\40I\2118\0\0\0\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\40J\207\206Ag\233\366p\222\277\377_\204r\377\235\260)"
"\377\237\262*\377\242\265,\377j\216t\377Ap\254\377Ap\254\377Ap\254\377"
"@o\253\377~\234Y\377\240\263+\377\234\257)\377{\231\203\377Rv\250\372"
"!L\207\263\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""33\231\5"
"!K\210\333_\202\261\376_\206\267\377\217\2469\377\235\260)\377\211\242"
"B\377Fr\224\3779i\247\3779i\247\3779i\247\3778h\246\377p\220`\377\235"
"\260)\377\212\242L\377l\216\272\377!L\210\357&M\214\24\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\36Ax3%N\211\365\\\200\257"
"\376\221\250O\377\235\260)\377\\\201t\3774e\244\3774e\244\3774e\244\377"
"4e\244\3774e\244\377S|\207\377\235\260)\377w\225\210\377*S\215\365\35"
"BxY\0\0\0\7\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0\13"
"\0\0\0\22\26""4\\E\40I\205\337r\216[\373\214\244d\377k\217\271\377\\"
"\203\266\377Nx\257\377Lw\257\377[\202\265\377i\215\273\377v\227\272\377"
"Ps\226\371\40J\206\356\30""6c_\0\0\0\33\0\0\0\24\0\0\0\14\0\0\0\4\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\10\0\0\0\20\0\0\0\30\0\0\0\40\6\6\13-\34@"
"r\234#M\207\3727^\224\365Lq\243\373_\202\261\377b\204\263\377Os\245\375"
":`\226\365&O\212\372\35Cy\270\10\21\35=\0\0\0*\0\0\0\"\0\0\0\32\0\0\0"
"\21\0\0\0\11\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\5\0\0\0\16\0\0\0\26\0\0\0"
"\36\0\0\0%\0\0\0-\4\15\31=\21)Mj\30""8f\226\35Dz\310\36D|\317\30""9i"
"\241\23+Pv\7\21\37K\0\0\0""6\0\0\0.\0\0\0'\0\0\0\37\0\0\0\27\0\0\0\17"
"\0\0\0\3\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0\0\0\13\0\0\0\23\0"
"\0\0\31\0\0\0\37\0\0\0$\0\0\0)\0\0\0-\0\0\0/\0\0\0""0\0\0\0/\0\0\0-\0"
"\0\0*\0\0\0%\0\0\0\40\0\0\0\32\0\0\0\23\0\0\0\10\0\0\0\1\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0\0\0\7"
"\0\0\0\14\0\0\0\20\0\0\0\23\0\0\0\26\0\0\0\27\0\0\0\25\0\0\0\22\0\0\0"
"\17\0\0\0\13\0\0\0\6\0\0\0\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"};
/* GdkPixbuf RGBA C-Source image dump */
#ifdef __SUNPRO_C

1644
ui/gtk/wsicon.h Normal file
View File

File diff suppressed because it is too large Load Diff

1618
ui/gtk/wsiconcap.h Normal file
View File

File diff suppressed because it is too large Load Diff

4
ui/qt/main_window.ui
View File

@ -511,7 +511,7 @@
<action name="actionHelpWiki">
<property name="icon">
<iconset resource="../../image/toolbar.qrc">
<normaloff>:/menu/help/wiki_24.xpm</normaloff>:/menu/help/wiki_24.xpm</iconset>
<normaloff>:/menu/help/gnome_emblem_web_16.png</normaloff>:/menu/help/gnome_emblem_web_16.png</iconset>
</property>
<property name="text">
<string>Wiki</string>
@ -528,7 +528,7 @@
<action name="actionHelpAbout">
<property name="icon">
<iconset resource="../../image/toolbar.qrc">
<normaloff>:/menu/help/wsicon16.xpm</normaloff>:/menu/help/wsicon16.xpm</iconset>
<normaloff>:/menu/help/wsicon16.png</normaloff>:/menu/help/wsicon16.png</iconset>
</property>
<property name="text">
<string>&amp;About Wireshark</string>