aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2005-05-07 20:47:39 +0000
committerUlf Lamping <ulf.lamping@web.de>2005-05-07 20:47:39 +0000
commit8087f8ccb76e51102ef60b3782535a433a939e04 (patch)
tree86e146f054edfc42eb14bd9fc084870f0dcfddf2
parent52d26f6eb8cb0538c9bc8adb5e04b85e390daef9 (diff)
add icons for the "File Set" menu items
svn path=/trunk/; revision=14326
-rw-r--r--Makefile.am3
-rw-r--r--gtk/compat_macros.h9
-rw-r--r--gtk/menu.c6
-rw-r--r--gtk/toolbar.c11
-rw-r--r--image/toolbar/file_set_list_16.xpm56
-rw-r--r--image/toolbar/file_set_next_16.xpm61
-rw-r--r--image/toolbar/file_set_previous_16.xpm61
7 files changed, 203 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index aa67825121..4e80ac84e5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -527,6 +527,9 @@ EXTRA_DIST = \
image/toolbar/decode_as_16.xpm \
image/toolbar/display_filter_24.xpm \
image/toolbar/endpoints_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/graphs_16.xpm \
image/toolbar/internet_24.xpm \
image/toolbar/resize_columns_24.xpm \
diff --git a/gtk/compat_macros.h b/gtk/compat_macros.h
index 73528d27ad..ad842ed04b 100644
--- a/gtk/compat_macros.h
+++ b/gtk/compat_macros.h
@@ -218,6 +218,9 @@ gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), name)
#define ETHEREAL_STOCK_TELEPHONY "Telephony"
#define ETHEREAL_STOCK_DECODE_AS "Decode As"
#define ETHEREAL_STOCK_CHECKBOX "Checkbox"
+#define ETHEREAL_STOCK_FILE_SET_LIST "List Files"
+#define ETHEREAL_STOCK_FILE_SET_NEXT "Next File"
+#define ETHEREAL_STOCK_FILE_SET_PREVIOUS "Previous File"
/** Create a stock button. Will create a "normal" button for GTK1.
*
@@ -348,6 +351,9 @@ g_signal_stop_emission_by_name(G_OBJECT(widget), name)
#define ETHEREAL_STOCK_LABEL_TELEPHONY "Telephony"
#define ETHEREAL_STOCK_LABEL_DECODE_AS "Decode As"
#define ETHEREAL_STOCK_LABEL_CHECKBOX "Checkbox"
+#define ETHEREAL_STOCK_LABEL_FILE_SET_LIST "List Files"
+#define ETHEREAL_STOCK_LABEL_FILE_SET_NEXT "Next File"
+#define ETHEREAL_STOCK_LABEL_FILE_SET_PREVIOUS "Previous File"
#ifdef HAVE_LIBPCAP
#define ETHEREAL_STOCK_CAPTURE_INTERFACES "Ethereal_Stock_CaptureInterfaces"
@@ -382,6 +388,9 @@ g_signal_stop_emission_by_name(G_OBJECT(widget), name)
#define ETHEREAL_STOCK_TELEPHONY "Ethereal_Stock_Telephony"
#define ETHEREAL_STOCK_DECODE_AS "Ethereal_Stock_DecodeAs"
#define ETHEREAL_STOCK_CHECKBOX "Ethereal_Stock_Checkbox"
+#define ETHEREAL_STOCK_FILE_SET_LIST "Ethereal_Stock_File_Set_List"
+#define ETHEREAL_STOCK_FILE_SET_NEXT "Ethereal_Stock_File_Set_Next"
+#define ETHEREAL_STOCK_FILE_SET_PREVIOUS "Ethereal_Stock_File_Set_Previous"
#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 0a51768700..db9fcf1281 100644
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -181,9 +181,9 @@ static GtkItemFactoryEntry menu_items[] =
0, GTK_STOCK_SAVE_AS),
ITEM_FACTORY_ENTRY("/File/<separator>", NULL, NULL, 0, "<Separator>", NULL),
ITEM_FACTORY_ENTRY("/File/File Set", NULL, NULL, 0, "<Branch>", NULL),
- ITEM_FACTORY_ENTRY("/File/File Set/List Files", NULL, fileset_cb, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/File/File Set/Next File", NULL, fileset_next_cb, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/File/File Set/Previous File", NULL, fileset_previous_cb, 0, NULL, NULL),
+ ITEM_FACTORY_STOCK_ENTRY("/File/File Set/List Files", NULL, fileset_cb, 0, ETHEREAL_STOCK_FILE_SET_LIST),
+ ITEM_FACTORY_STOCK_ENTRY("/File/File Set/Next File", NULL, fileset_next_cb, 0, ETHEREAL_STOCK_FILE_SET_NEXT),
+ ITEM_FACTORY_STOCK_ENTRY("/File/File Set/Previous File", NULL, fileset_previous_cb, 0, ETHEREAL_STOCK_FILE_SET_PREVIOUS),
ITEM_FACTORY_ENTRY("/File/<separator>", NULL, NULL, 0, "<Separator>", NULL),
ITEM_FACTORY_ENTRY("/File/_Export", NULL, NULL, 0, "<Branch>", NULL),
ITEM_FACTORY_ENTRY("/File/Export/as \"Plain _Text\" file...", NULL, export_text_cmd_cb,
diff --git a/gtk/toolbar.c b/gtk/toolbar.c
index 9f37d143e3..06abbd3d5c 100644
--- a/gtk/toolbar.c
+++ b/gtk/toolbar.c
@@ -135,6 +135,9 @@
#include "../image/toolbar/telephony_16.xpm"
#include "../image/toolbar/decode_as_16.xpm"
#include "../image/toolbar/checkbox_16.xpm"
+#include "../image/toolbar/file_set_list_16.xpm"
+#include "../image/toolbar/file_set_next_16.xpm"
+#include "../image/toolbar/file_set_previous_16.xpm"
/* XXX: add this key to some .h file, as it adds a key to the top level Widget? */
@@ -200,7 +203,10 @@ static void ethereal_stock_icons(void) {
{ ETHEREAL_STOCK_GRAPHS, ETHEREAL_STOCK_LABEL_GRAPHS, 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 }
+ { ETHEREAL_STOCK_CHECKBOX, ETHEREAL_STOCK_LABEL_CHECKBOX, 0, 0, NULL },
+ { ETHEREAL_STOCK_FILE_SET_LIST, ETHEREAL_STOCK_LABEL_FILE_SET_LIST, 0, 0, NULL },
+ { ETHEREAL_STOCK_FILE_SET_NEXT, ETHEREAL_STOCK_LABEL_FILE_SET_NEXT, 0, 0, NULL },
+ { ETHEREAL_STOCK_FILE_SET_PREVIOUS, ETHEREAL_STOCK_LABEL_FILE_SET_PREVIOUS, 0, 0, NULL }
};
static const stock_pixmap_t pixmaps[] = {
@@ -236,6 +242,9 @@ static void ethereal_stock_icons(void) {
{ ETHEREAL_STOCK_TELEPHONY, telephony_16_xpm},
{ ETHEREAL_STOCK_DECODE_AS, decode_as_16_xpm},
{ ETHEREAL_STOCK_CHECKBOX, checkbox_16_xpm},
+ { ETHEREAL_STOCK_FILE_SET_LIST, file_set_list_16_xpm},
+ { ETHEREAL_STOCK_FILE_SET_NEXT, file_set_next_16_xpm},
+ { ETHEREAL_STOCK_FILE_SET_PREVIOUS, file_set_previous_16_xpm},
{ NULL, NULL }
};
diff --git a/image/toolbar/file_set_list_16.xpm b/image/toolbar/file_set_list_16.xpm
new file mode 100644
index 0000000000..d9faea30ff
--- /dev/null
+++ b/image/toolbar/file_set_list_16.xpm
@@ -0,0 +1,56 @@
+/* XPM */
+static char * file_set_list_16_xpm[] = {
+"16 16 37 1",
+" c None",
+". c #000000",
+"+ c #FEFEFE",
+"@ c #FDFDFD",
+"# c #E0E0E0",
+"$ c #C1C1C1",
+"% c #F1F1F1",
+"& c #A2A2A2",
+"* c #EFEFEF",
+"= c #E9E9E9",
+"- c #C3C3C3",
+"; c #FBFBFB",
+"> c #A8A8A8",
+", c #E6E6E6",
+"' c #ADADAD",
+") c #767676",
+"! c #5D5D5D",
+"~ c #404040",
+"{ c #F0F0F0",
+"] c #E2E2E2",
+"^ c #858585",
+"/ c #4B4B49",
+"( c #161616",
+"_ c #E5E5E5",
+": c #EEEEEE",
+"< c #C5C5C5",
+"[ c #C2C2C2",
+"} c #BCBCBC",
+"| c #E8E8E8",
+"1 c #E7E7E7",
+"2 c #BFBFBF",
+"3 c #BEBEBE",
+"4 c #E4E4E4",
+"5 c #BDBDBD",
+"6 c #E3E3E3",
+"7 c #BBBBBB",
+"8 c #A0A0A0",
+" ...... ",
+".+++@#$. ",
+".+%&...... ",
+".+%.+++@#$. ",
+".+%.+%&...... ",
+".+*.+%.+++@#$. ",
+".@=.+%.+%%%-;>. ",
+".@,.+*.+%%%')!~.",
+".@,.@=.+%%{]^/(.",
+".@_.@,.+****::<.",
+".[}.@,.@=|||112.",
+" ...@_.@,,,,,_3.",
+" .[}.@,,__445.",
+" ...@_446667.",
+" .[}}77778.",
+" ........ "};
diff --git a/image/toolbar/file_set_next_16.xpm b/image/toolbar/file_set_next_16.xpm
new file mode 100644
index 0000000000..90dfdcb97a
--- /dev/null
+++ b/image/toolbar/file_set_next_16.xpm
@@ -0,0 +1,61 @@
+/* XPM */
+static char * file_set_next_16_xpm[] = {
+"16 16 42 1",
+" c None",
+". c #000000",
+"+ c #FEFEFE",
+"@ c #FDFDFD",
+"# c #E0E0E0",
+"$ c #C1C1C1",
+"% c #F1F1F1",
+"& c #C3C3C3",
+"* c #FBFBFB",
+"= c #A8A8A8",
+"- c #ADADAD",
+"; c #767676",
+"> c #5D5D5D",
+", c #404040",
+"' c #F0F0F0",
+") c #E2E2E2",
+"! c #858585",
+"~ c #4B4B49",
+"{ c #161616",
+"] c #EFEFEF",
+"^ c #EEEEEE",
+"/ c #C5C5C5",
+"( c #ECECEC",
+"_ c #C4C4C4",
+": c #EBEBEB",
+"< c #EDEDED",
+"[ c #EAEAEA",
+"} c #E8E8E8",
+"| c #C0C0C0",
+"1 c #E9E9E9",
+"2 c #E7E7E7",
+"3 c #BFBFBF",
+"4 c #E6E6E6",
+"5 c #E5E5E5",
+"6 c #BEBEBE",
+"7 c #E4E4E4",
+"8 c #BDBDBD",
+"9 c #E3E3E3",
+"0 c #BBBBBB",
+"a c #C2C2C2",
+"b c #BCBCBC",
+"c c #A0A0A0",
+" ......... ",
+" .++++++@#$. ",
+" .+%%%%%%&*=. ",
+" .+%%%%%%-;>,. ",
+" .+%%%%%')!~{. ",
+" .+%]]]]]]^^/. ",
+" .+]]].^^^^(_. ",
+" .@^^^..^^^:&. ",
+" .@<((...[[[$. ",
+" .@:}}..}}}}|. ",
+" .@[[1.}}}223. ",
+" .@}444444456. ",
+" .@2244455778. ",
+" .@4555779990. ",
+" .a888bb0000c. ",
+" ........... "};
diff --git a/image/toolbar/file_set_previous_16.xpm b/image/toolbar/file_set_previous_16.xpm
new file mode 100644
index 0000000000..6a65c41343
--- /dev/null
+++ b/image/toolbar/file_set_previous_16.xpm
@@ -0,0 +1,61 @@
+/* XPM */
+static char * file_set_previous_16_xpm[] = {
+"16 16 42 1",
+" c None",
+". c #000000",
+"+ c #FEFEFE",
+"@ c #FDFDFD",
+"# c #E0E0E0",
+"$ c #C1C1C1",
+"% c #F1F1F1",
+"& c #C3C3C3",
+"* c #FBFBFB",
+"= c #A8A8A8",
+"- c #ADADAD",
+"; c #767676",
+"> c #5D5D5D",
+", c #404040",
+"' c #F0F0F0",
+") c #E2E2E2",
+"! c #858585",
+"~ c #4B4B49",
+"{ c #161616",
+"] c #EFEFEF",
+"^ c #EEEEEE",
+"/ c #C5C5C5",
+"( c #ECECEC",
+"_ c #C4C4C4",
+": c #EBEBEB",
+"< c #EDEDED",
+"[ c #EAEAEA",
+"} c #E8E8E8",
+"| c #C0C0C0",
+"1 c #E9E9E9",
+"2 c #E7E7E7",
+"3 c #BFBFBF",
+"4 c #E6E6E6",
+"5 c #E5E5E5",
+"6 c #BEBEBE",
+"7 c #E4E4E4",
+"8 c #BDBDBD",
+"9 c #E3E3E3",
+"0 c #BBBBBB",
+"a c #C2C2C2",
+"b c #BCBCBC",
+"c c #A0A0A0",
+" ......... ",
+" .++++++@#$. ",
+" .+%%%%%%&*=. ",
+" .+%%%%%%-;>,. ",
+" .+%%%%%')!~{. ",
+" .+%]]]]]]^^/. ",
+" .+]]]^.^^^(_. ",
+" .@^^^..^^^:&. ",
+" .@<(...:[[[$. ",
+" .@:}}..}}}}|. ",
+" .@[[11.}}223. ",
+" .@}444444456. ",
+" .@2244455778. ",
+" .@4555779990. ",
+" .a888bb0000c. ",
+" ........... "};