diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-03-27 18:09:00 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-03-27 18:09:00 +0000 |
| commit | d3b54956c152eb93ea9c434e78d2d97fdbbc6859 (patch) | |
| tree | f03104427963e8f8469ded268beae338d9500e47 /ui/gtk/stock_icons.c | |
| parent | ade9361071193f43516b19fb3947ca98f55cba9e (diff) | |
| download | wireshark-d3b54956c152eb93ea9c434e78d2d97fdbbc6859.tar.gz | |
Add an interface list icon. Some of the new capture icons were 1 pixel
too small, so add corrected ones. Add SVG versions of the new toolbar
icons. Use consistent naming for alternate icons. Remove some
no-longer-used XPMs. Add a script to compress PNGs using various
utilities and run it. Regenerate the pixbuf includes using the smaller
PNGs.
svn path=/trunk/; revision=48591
Diffstat (limited to 'ui/gtk/stock_icons.c')
| -rw-r--r-- | ui/gtk/stock_icons.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/ui/gtk/stock_icons.c b/ui/gtk/stock_icons.c index 472bda4da3..22765360a9 100644 --- a/ui/gtk/stock_icons.c +++ b/ui/gtk/stock_icons.c @@ -34,7 +34,6 @@ #include "ui/utf8_entities.h" /* these icons are derived from the original stock icons */ -#include "../../image/toolbar/capture_interfaces_24.xpm" #include "../../image/toolbar/capture_filter_24.xpm" #include "../../image/toolbar/capture_details_24.xpm" #include "../../image/toolbar/display_filter_24.xpm" @@ -165,8 +164,20 @@ void stock_icons_init(void) { { (char *)WIRESHARK_STOCK_SAVE, (char *)"Save", NO_MOD, 0, NULL } }; + static const stock_pixbuf_t pixbufs[] = { + { WIRESHARK_STOCK_ABOUT, wsicon_16_pb_data, wsicon_24_pb_data }, + { WIRESHARK_STOCK_CAPTURE_INTERFACES, capture_interfaces_16_pb_data, capture_interfaces_24_pb_data }, + { WIRESHARK_STOCK_CAPTURE_OPTIONS, capture_options_16_pb_data, capture_options_24_pb_data }, + { WIRESHARK_STOCK_CAPTURE_RESTART, capture_restart_16_pb_data, capture_restart_24_pb_data }, + { WIRESHARK_STOCK_CAPTURE_START, capture_start_16_pb_data, capture_start_24_pb_data }, + { WIRESHARK_STOCK_CAPTURE_STOP, capture_stop_16_pb_data, capture_stop_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 } + }; + + /* New images should be PNGs + pixbufs above. Please don't add to this list. */ static const stock_pixmap_t pixmaps[] = { - { WIRESHARK_STOCK_CAPTURE_INTERFACES, capture_interfaces_24_xpm }, { WIRESHARK_STOCK_CAPTURE_FILTER, capture_filter_24_xpm }, { WIRESHARK_STOCK_CAPTURE_FILTER_ENTRY, capture_filter_24_xpm }, { WIRESHARK_STOCK_CAPTURE_DETAILS, capture_details_24_xpm }, @@ -213,16 +224,6 @@ void stock_icons_init(void) { { NULL, NULL } }; - static const stock_pixbuf_t pixbufs[] = { - { WIRESHARK_STOCK_ABOUT, wsicon_16_pb_data, wsicon_24_pb_data }, - { WIRESHARK_STOCK_CAPTURE_OPTIONS, capture_options_16_pb_data, capture_options_24_pb_data }, - { WIRESHARK_STOCK_CAPTURE_RESTART, capture_restart_16_pb_data, capture_restart_24_pb_data }, - { WIRESHARK_STOCK_CAPTURE_START, capture_start_16_pb_data, capture_start_24_pb_data }, - { WIRESHARK_STOCK_CAPTURE_STOP, capture_stop_16_pb_data, capture_stop_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 */ gtk_stock_add (stock_items, G_N_ELEMENTS (stock_items)); |