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/stock_icons.c | |
| parent | 67ffb10e649188e64cdb58419ffecfba20e19c0d (diff) | |
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/stock_icons.c')
| -rw-r--r-- | ui/gtk/stock_icons.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/gtk/stock_icons.c b/ui/gtk/stock_icons.c index ae616026d2..3acab21c3e 100644 --- a/ui/gtk/stock_icons.c +++ b/ui/gtk/stock_icons.c @@ -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 */ |