summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am2
-rw-r--r--gtk/compat_macros.h6
-rw-r--r--gtk/menu.c16
-rw-r--r--gtk/toolbar.c8
-rw-r--r--image/toolbar/checkbox_16.xpm44
-rw-r--r--image/toolbar/decode_as_16.xpm25
6 files changed, 92 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am
index 4d76b68c57..400abc5faa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -519,8 +519,10 @@ EXTRA_DIST = \
image/toolbar/capture_restart_24.xpm \
image/toolbar/capture_start_24.xpm \
image/toolbar/capture_stop_24.xpm \
+ image/toolbar/checkbox_16.xpm \
image/toolbar/colorize_24.xpm \
image/toolbar/conversations_16.xpm \
+ image/toolbar/decode_as_16.xpm \
image/toolbar/display_filter_24.xpm \
image/toolbar/endpoints_16.xpm \
image/toolbar/graphs_16.xpm \
diff --git a/gtk/compat_macros.h b/gtk/compat_macros.h
index 86406034a4..6a7edfa66c 100644
--- a/gtk/compat_macros.h
+++ b/gtk/compat_macros.h
@@ -216,6 +216,8 @@ gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), name)
#define ETHEREAL_STOCK_ENDPOINTS "Endpoints"
#define ETHEREAL_STOCK_GRAPHS "Graphs"
#define ETHEREAL_STOCK_TELEPHONY "Telephony"
+#define ETHEREAL_STOCK_DECODE_AS "Decode As"
+#define ETHEREAL_STOCK_CHECKBOX "Checkbox"
/** Create a stock button. Will create a "normal" button for GTK1.
*
@@ -332,6 +334,8 @@ g_signal_stop_emission_by_name(G_OBJECT(widget), name)
#define ETHEREAL_STOCK_LABEL_ENDPOINTS "Endpoints"
#define ETHEREAL_STOCK_LABEL_GRAPHS "Graphs"
#define ETHEREAL_STOCK_LABEL_TELEPHONY "Telephony"
+#define ETHEREAL_STOCK_LABEL_DECODE_AS "Decode As"
+#define ETHEREAL_STOCK_LABEL_CHECKBOX "Checkbox"
#ifdef HAVE_LIBPCAP
#define ETHEREAL_STOCK_CAPTURE_INTERFACES "Ethereal_Stock_CaptureInterfaces"
@@ -364,6 +368,8 @@ g_signal_stop_emission_by_name(G_OBJECT(widget), name)
#define ETHEREAL_STOCK_ENDPOINTS "Ethereal_Stock_Endpoints"
#define ETHEREAL_STOCK_GRAPHS "Ethereal_Stock_Graphs"
#define ETHEREAL_STOCK_TELEPHONY "Ethereal_Stock_Telephony"
+#define ETHEREAL_STOCK_DECODE_AS "Ethereal_Stock_DecodeAs"
+#define ETHEREAL_STOCK_CHECKBOX "Ethereal_Stock_Checkbox"
#define BUTTON_NEW_FROM_STOCK(stock_id) \
gtk_button_new_from_stock(stock_id);
diff --git a/gtk/menu.c b/gtk/menu.c
index 84597557d5..ba9a601844 100644
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -340,11 +340,11 @@ static GtkItemFactoryEntry menu_items[] =
ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/... o_r not Selected", NULL, match_selected_ptree_cb,
MATCH_SELECTED_OR_NOT, NULL, NULL),
ITEM_FACTORY_ENTRY("/Analyze/<separator>", NULL, NULL, 0, "<Separator>", NULL),
- ITEM_FACTORY_ENTRY("/Analyze/_Enabled Protocols...", "<shift><control>R", proto_cb, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Analyze/Decode _As...", NULL, decode_as_cb,
- 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Analyze/_User Specified Decodes...", NULL,
- decode_show_cb, 0, NULL, NULL),
+ ITEM_FACTORY_STOCK_ENTRY("/Analyze/_Enabled Protocols...", "<shift><control>R", proto_cb, 0, ETHEREAL_STOCK_CHECKBOX),
+ ITEM_FACTORY_STOCK_ENTRY("/Analyze/Decode _As...", NULL, decode_as_cb,
+ 0, ETHEREAL_STOCK_DECODE_AS),
+ ITEM_FACTORY_STOCK_ENTRY("/Analyze/_User Specified Decodes...", NULL,
+ decode_show_cb, 0, ETHEREAL_STOCK_DECODE_AS),
ITEM_FACTORY_ENTRY("/Analyze/<separator>", NULL, NULL, 0, "<Separator>", NULL),
ITEM_FACTORY_ENTRY("/Analyze/_Follow TCP Stream", NULL,
follow_stream_cb, 0, NULL, NULL),
@@ -432,8 +432,8 @@ static GtkItemFactoryEntry packet_list_menu_items[] =
ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL),
- ITEM_FACTORY_ENTRY("/Decode As...", NULL, decode_as_cb, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Print...", NULL, file_print_selected_cmd_cb, 0, NULL, NULL),
+ ITEM_FACTORY_STOCK_ENTRY("/Decode As...", NULL, decode_as_cb, 0, ETHEREAL_STOCK_DECODE_AS),
+ ITEM_FACTORY_STOCK_ENTRY("/Print...", NULL, file_print_selected_cmd_cb, 0, GTK_STOCK_PRINT),
ITEM_FACTORY_ENTRY("/Show Packet in New Window", NULL, new_window_cb,
0, NULL, NULL)
};
@@ -486,7 +486,7 @@ static GtkItemFactoryEntry tree_view_menu_items[] =
ITEM_FACTORY_ENTRY("/Protocol Preferences...", NULL, properties_cb,
0, NULL, NULL),
ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL),
- ITEM_FACTORY_ENTRY("/Decode As...", NULL, decode_as_cb, 0, NULL, NULL),
+ ITEM_FACTORY_STOCK_ENTRY("/Decode As...", NULL, decode_as_cb, 0, ETHEREAL_STOCK_DECODE_AS),
ITEM_FACTORY_ENTRY("/_Resolve Name", NULL, resolve_name_cb, 0, NULL, NULL),
ITEM_FACTORY_ENTRY("/_Go to Corresponding Packet", NULL, goto_framenum_cb, 0, NULL, NULL),
};
diff --git a/gtk/toolbar.c b/gtk/toolbar.c
index 42cfcdcccc..2dd8d4589a 100644
--- a/gtk/toolbar.c
+++ b/gtk/toolbar.c
@@ -133,6 +133,8 @@
#include "../image/toolbar/endpoints_16.xpm"
#include "../image/toolbar/graphs_16.xpm"
#include "../image/toolbar/telephony_16.xpm"
+#include "../image/toolbar/decode_as_16.xpm"
+#include "../image/toolbar/checkbox_16.xpm"
/* XXX: add this key to some .h file, as it adds a key to the top level Widget? */
@@ -196,7 +198,9 @@ static void ethereal_stock_icons(void) {
{ ETHEREAL_STOCK_CONVERSATIONS, ETHEREAL_STOCK_LABEL_CONVERSATIONS, 0, 0, NULL },
{ ETHEREAL_STOCK_ENDPOINTS, ETHEREAL_STOCK_LABEL_ENDPOINTS, 0, 0, NULL },
{ ETHEREAL_STOCK_GRAPHS, ETHEREAL_STOCK_LABEL_GRAPHS, 0, 0, NULL },
- { ETHEREAL_STOCK_TELEPHONY, ETHEREAL_STOCK_LABEL_TELEPHONY, 0, 0, NULL }
+ { ETHEREAL_STOCK_TELEPHONY, ETHEREAL_STOCK_LABEL_TELEPHONY, 0, 0, NULL },
+ { ETHEREAL_STOCK_DECODE_AS, ETHEREAL_STOCK_LABEL_DECODE_AS, 0, 0, NULL },
+ { ETHEREAL_STOCK_CHECKBOX, ETHEREAL_STOCK_LABEL_CHECKBOX, 0, 0, NULL }
};
static const stock_pixmap_t pixmaps[] = {
@@ -230,6 +234,8 @@ static void ethereal_stock_icons(void) {
{ ETHEREAL_STOCK_ENDPOINTS, endpoints_16_xpm},
{ ETHEREAL_STOCK_GRAPHS, graphs_16_xpm},
{ ETHEREAL_STOCK_TELEPHONY, telephony_16_xpm},
+ { ETHEREAL_STOCK_DECODE_AS, decode_as_16_xpm},
+ { ETHEREAL_STOCK_CHECKBOX, checkbox_16_xpm},
{ NULL, NULL }
};
diff --git a/image/toolbar/checkbox_16.xpm b/image/toolbar/checkbox_16.xpm
new file mode 100644
index 0000000000..c9805097b9
--- /dev/null
+++ b/image/toolbar/checkbox_16.xpm
@@ -0,0 +1,44 @@
+/* XPM */
+static char * checkbox_16_xpm[] = {
+"16 16 25 1",
+" c None",
+". c #9D9D9D",
+"+ c #E0E0E0",
+"@ c #DADADA",
+"# c #F4F4F4",
+"$ c #DBDBDB",
+"% c #FFFFFF",
+"& c #818181",
+"* c #424242",
+"= c #737373",
+"- c #C1C1C1",
+"; c #000000",
+"> c #B2B2B2",
+", c #6C6C6C",
+"' c #909090",
+") c #C8C8C8",
+"! c #7D7D7D",
+"~ c #A4A4A4",
+"{ c #1E1E1E",
+"] c #BEBEBE",
+"^ c #676767",
+"/ c #121212",
+"( c #444444",
+"_ c #DDDDDD",
+": c #8A8A8A",
+" ",
+" ",
+" ........... ",
+" .++++++++++@. ",
+" .+########$%. ",
+" .+#######&*%. ",
+" .+######=*-%. ",
+" .+#####=;>#%. ",
+" .+#,'#);=##%. ",
+" .+!;;~*{]##%. ",
+" .+#^/;;(###%. ",
+" .+#_~/;:###%. ",
+" .+###'*@###%. ",
+" .@%%%%%%%%%%. ",
+" ........... ",
+" "};
diff --git a/image/toolbar/decode_as_16.xpm b/image/toolbar/decode_as_16.xpm
new file mode 100644
index 0000000000..b045610c0c
--- /dev/null
+++ b/image/toolbar/decode_as_16.xpm
@@ -0,0 +1,25 @@
+/* XPM */
+static char * decode_as_16_xpm[] = {
+"16 16 6 1",
+" c None",
+". c #000000",
+"+ c #A3A3A3",
+"@ c #D5D5D5",
+"# c #C8C8C8",
+"$ c #F6F6F6",
+" .. ",
+".+@. ... ",
+".#$...... ++@.",
+" .. . ##$.",
+" . ... ",
+" . ",
+" . ... ",
+" ..... ++@.",
+" . ##$.",
+" . ... ",
+" . .. ",
+" . .... ... ",
+" ........++@.",
+" ... ##$.",
+" .. ... ",
+" "};
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-10 15:56:26 +0000