aboutsummaryrefslogtreecommitdiffstats
path: root/image
diff options
context:
space:
mode:
Diffstat (limited to 'image')
-rw-r--r--image/README.image31
-rwxr-xr-ximage/make-icons21
-rw-r--r--image/toolbar.qrc4
-rw-r--r--image/toolbar/gnome_emblem_web_16.pngbin0 -> 973 bytes
-rw-r--r--image/toolbar/gnome_emblem_web_24.pngbin0 -> 1557 bytes
-rw-r--r--image/toolbar/wiki_24.xpm332
6 files changed, 15 insertions, 373 deletions
diff --git a/image/README.image b/image/README.image
index 88d6a5aa1a..ecba744fd1 100644
--- a/image/README.image
+++ b/image/README.image
@@ -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. \ No newline at end of file
+copy-8.png OS X style copy icon.
diff --git a/image/make-icons b/image/make-icons
deleted file mode 100755
index e7e6018094..0000000000
--- a/image/make-icons
+++ /dev/null
@@ -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
-
-
diff --git a/image/toolbar.qrc b/image/toolbar.qrc
index e83c0b4c3a..dc06cf7dfb 100644
--- a/image/toolbar.qrc
+++ b/image/toolbar.qrc
@@ -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">
diff --git a/image/toolbar/gnome_emblem_web_16.png b/image/toolbar/gnome_emblem_web_16.png
new file mode 100644
index 0000000000..148126af0b
--- /dev/null
+++ b/image/toolbar/gnome_emblem_web_16.png
Binary files differ
diff --git a/image/toolbar/gnome_emblem_web_24.png b/image/toolbar/gnome_emblem_web_24.png
new file mode 100644
index 0000000000..e246590ea8
--- /dev/null
+++ b/image/toolbar/gnome_emblem_web_24.png
Binary files differ
diff --git a/image/toolbar/wiki_24.xpm b/image/toolbar/wiki_24.xpm
deleted file mode 100644
index 7299ebdcb7..0000000000
--- a/image/toolbar/wiki_24.xpm
+++ /dev/null
@@ -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 ",
-" ",
-" "};