diff options
author | Gerald Combs <gerald@wireshark.org> | 2013-03-26 19:51:33 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2013-03-26 19:51:33 +0000 |
commit | d1b87423df7aca95c50e04530316f9b7447f13ff (patch) | |
tree | c06a943a3aad63ec61a1e85bdcdf20f721ef93a8 /ui/gtk/Makefile.am | |
parent | 67ffb10e649188e64cdb58419ffecfba20e19c0d (diff) | |
download | wireshark-d1b87423df7aca95c50e04530316f9b7447f13ff.tar.gz |
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
Diffstat (limited to 'ui/gtk/Makefile.am')
-rw-r--r-- | ui/gtk/Makefile.am | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/ui/gtk/Makefile.am b/ui/gtk/Makefile.am index 7a7b48507f..2c50ccd95d 100644 --- a/ui/gtk/Makefile.am +++ b/ui/gtk/Makefile.am @@ -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 \ |