aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am2
-rw-r--r--gtk/expert_comp_dlg.c4
-rw-r--r--gtk/flow_graph.c4
-rw-r--r--gtk/stock_icons.c6
-rw-r--r--gtk/stock_icons.h2
-rw-r--r--image/toolbar/expert_info_16.xpm87
-rw-r--r--image/toolbar/flow_graph_16.xpm21
7 files changed, 124 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 5ad38ff287..2bfec723ee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -647,9 +647,11 @@ EXTRA_DIST = \
image/toolbar/decode_as_16.xpm \
image/toolbar/display_filter_24.xpm \
image/toolbar/endpoints_16.xpm \
+ image/toolbar/expert_info_16.xpm \
image/toolbar/file_set_list_16.xpm \
image/toolbar/file_set_next_16.xpm \
image/toolbar/file_set_previous_16.xpm \
+ image/toolbar/flow_graph_16.xpm \
image/toolbar/graphs_16.xpm \
image/toolbar/icon_color_0.xpm \
image/toolbar/icon_color_1.xpm \
diff --git a/gtk/expert_comp_dlg.c b/gtk/expert_comp_dlg.c
index a5641d7389..74851eb7cf 100644
--- a/gtk/expert_comp_dlg.c
+++ b/gtk/expert_comp_dlg.c
@@ -48,6 +48,7 @@
#include "gtk/gui_stat_menu.h"
#include "gtk/help_dlg.h"
#include "gtk/expert_comp_dlg.h"
+#include "gtk/stock_icons.h"
/* used to keep track of the statistics for an entire program interface */
@@ -312,6 +313,7 @@ void
register_tap_listener_expert_comp(void)
{
register_stat_cmd_arg("expert_comp", expert_comp_init,NULL);
- register_stat_menu_item("Expert Info _Composite", REGISTER_ANALYZE_GROUP_NONE,
+ register_stat_menu_item_stock("Expert Info _Composite",
+ REGISTER_ANALYZE_GROUP_NONE, WIRESHARK_STOCK_EXPERT_INFO,
expert_comp_dlg_cb, NULL, NULL, NULL);
}
diff --git a/gtk/flow_graph.c b/gtk/flow_graph.c
index 04f8c9d69b..334df4f9c5 100644
--- a/gtk/flow_graph.c
+++ b/gtk/flow_graph.c
@@ -50,6 +50,7 @@
#include "gtk/gui_stat_menu.h"
#include "gtk/dlg_utils.h"
#include "gtk/gui_utils.h"
+#include "gtk/stock_icons.h"
#include "gtk/gtkglobals.h"
@@ -670,7 +671,8 @@ void
register_tap_listener_flow_graph(void)
{
register_stat_cmd_arg("flow_graph",flow_graph_init_tap,NULL);
- register_stat_menu_item("Flo_w Graph...", REGISTER_STAT_GROUP_NONE,
+ register_stat_menu_item_stock("Flo_w Graph...",
+ REGISTER_STAT_GROUP_NONE, WIRESHARK_STOCK_FLOW_GRAPH,
flow_graph_launch, NULL, NULL, NULL);
}
diff --git a/gtk/stock_icons.c b/gtk/stock_icons.c
index 40bdd132f5..b4ed33c480 100644
--- a/gtk/stock_icons.c
+++ b/gtk/stock_icons.c
@@ -58,6 +58,8 @@
#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"
+#include "../image/toolbar/flow_graph_16.xpm"
#include "../image/toolbar/graphs_16.xpm"
#include "../image/toolbar/telephony_16.xpm"
#include "../image/toolbar/decode_as_16.xpm"
@@ -120,7 +122,9 @@ void stock_icons_init(void) {
{ WIRESHARK_STOCK_WIKI, "Wiki", 0, 0, NULL },
{ WIRESHARK_STOCK_CONVERSATIONS, "Conversations", 0, 0, NULL },
{ WIRESHARK_STOCK_ENDPOINTS, "Endpoints", 0, 0, NULL },
+ { WIRESHARK_STOCK_EXPERT_INFO, "Expert Info", 0, 0, NULL },
{ WIRESHARK_STOCK_GRAPHS, "Graphs", 0, 0, NULL },
+ { WIRESHARK_STOCK_FLOW_GRAPH, "Flow Graph", 0, 0, NULL },
{ WIRESHARK_STOCK_TELEPHONY, "Telephony", 0, 0, NULL },
{ WIRESHARK_STOCK_DECODE_AS, "Decode As", 0, 0, NULL },
{ WIRESHARK_STOCK_CHECKBOX, "Checkbox", 0, 0, NULL },
@@ -171,7 +175,9 @@ void stock_icons_init(void) {
{ 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},
{ WIRESHARK_STOCK_GRAPHS, graphs_16_xpm},
+ { WIRESHARK_STOCK_FLOW_GRAPH, flow_graph_16_xpm},
{ WIRESHARK_STOCK_TELEPHONY, telephony_16_xpm},
{ WIRESHARK_STOCK_DECODE_AS, decode_as_16_xpm},
{ WIRESHARK_STOCK_CHECKBOX, checkbox_16_xpm},
diff --git a/gtk/stock_icons.h b/gtk/stock_icons.h
index 05d85032e3..c99e93d077 100644
--- a/gtk/stock_icons.h
+++ b/gtk/stock_icons.h
@@ -56,7 +56,9 @@
#define WIRESHARK_STOCK_WIKI "Wireshark_Stock_Wiki"
#define WIRESHARK_STOCK_CONVERSATIONS "Wireshark_Stock_Conversations"
#define WIRESHARK_STOCK_ENDPOINTS "Wireshark_Stock_Endpoints"
+#define WIRESHARK_STOCK_EXPERT_INFO "Wireshark_Stock_Expert_Info"
#define WIRESHARK_STOCK_GRAPHS "Wireshark_Stock_Graphs"
+#define WIRESHARK_STOCK_FLOW_GRAPH "Wireshark_Stock_Flow_Graph"
#define WIRESHARK_STOCK_TELEPHONY "Wireshark_Stock_Telephony"
#define WIRESHARK_STOCK_DECODE_AS "Wireshark_Stock_DecodeAs"
#define WIRESHARK_STOCK_CHECKBOX "Wireshark_Stock_Checkbox"
diff --git a/image/toolbar/expert_info_16.xpm b/image/toolbar/expert_info_16.xpm
new file mode 100644
index 0000000000..c5ad721c7b
--- /dev/null
+++ b/image/toolbar/expert_info_16.xpm
@@ -0,0 +1,87 @@
+/* XPM */
+const static char * expert_info_16_xpm[] = {
+"16 16 68 1",
+" c None",
+". c #FEFEFE",
+"+ c #FCFCFC",
+"@ c #BCBCBC",
+"# c #A5A4A2",
+"$ c #B3B3B2",
+"% c #F5F5F5",
+"& c #F6F6F6",
+"* c #969285",
+"= c #E4D496",
+"- c #F7E9AA",
+"; c #EAD992",
+"> c #B2A578",
+", c #CCCCCC",
+"' c #AFAEAC",
+") c #EDDC98",
+"! c #F9F3DC",
+"~ c #FAF6E8",
+"{ c #F9EDBA",
+"] c #F1DF8E",
+"^ c #99906F",
+"/ c #F9F9F9",
+"( c #B1AEA4",
+"_ c #F4E39B",
+": c #FAF6E7",
+"< c #F9F4E3",
+"[ c #F6EABA",
+"} c #F6E494",
+"| c #B5A76D",
+"1 c #D3D3D3",
+"2 c #FDFDFD",
+"3 c #B0B0AF",
+"4 c #EAD995",
+"5 c #FAF5E3",
+"6 c #F9F0CD",
+"7 c #F3E6AD",
+"8 c #F1DF8F",
+"9 c #988C5B",
+"0 c #ECECEC",
+"a c #F6F6F5",
+"b c #B7AB7B",
+"c c #F8F1D7",
+"d c #F3E5A9",
+"e c #E9D88F",
+"f c #CFBE76",
+"g c #938F7E",
+"h c #B6B6B3",
+"i c #918C79",
+"j c #AFA684",
+"k c #D3C17B",
+"l c #95895A",
+"m c #8A8880",
+"n c #EBEBEB",
+"o c #535350",
+"p c #9B9B97",
+"q c #959591",
+"r c #55544F",
+"s c #484846",
+"t c #969692",
+"u c #888885",
+"v c #4C4C4B",
+"w c #0E0E0C",
+"x c #494946",
+"y c #737371",
+"z c #3B3B39",
+"A c #1B1B18",
+"B c #0E0E0D",
+"C c #242422",
+" ",
+" ",
+" ... ",
+" +@#$%. ",
+" &*=-;>,. ",
+" .')!~{]^/ ",
+" .(_:<[}|1 ",
+" 234567890 ",
+" abcdefg. ",
+" hijklmn ",
+" opqr#2 ",
+" stuv ",
+" wxyz ",
+" ABC ",
+" ",
+" "};
diff --git a/image/toolbar/flow_graph_16.xpm b/image/toolbar/flow_graph_16.xpm
new file mode 100644
index 0000000000..213ab0e8db
--- /dev/null
+++ b/image/toolbar/flow_graph_16.xpm
@@ -0,0 +1,21 @@
+/* XPM */
+const static char * flow_graph_16_xpm[] = {
+"16 16 2 1",
+" c None",
+". c #000000",
+" . . ",
+" . . ",
+" .. . ",
+" . .. . ",
+" . .. .. . ",
+" . .... . ",
+" . ...... ",
+" . . ",
+" . . ",
+" . . ",
+" . ... ",
+" . . ... . ",
+" . .. .. . ",
+" . ... . ",
+" ...... . ",
+" . . "};
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 23:08:22 +0000