aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gtk/ansi_a_stat.c4
-rw-r--r--gtk/ansi_map_stat.c4
-rw-r--r--gtk/bootp_stat.c4
-rw-r--r--gtk/capture_dlg.c14
-rw-r--r--gtk/capture_info_dlg.c8
-rw-r--r--gtk/capture_prefs.c8
-rw-r--r--gtk/color_dlg.c14
-rw-r--r--gtk/compat_macros.h43
-rw-r--r--gtk/dcerpc_stat.c10
-rw-r--r--gtk/fc_stat.c6
-rw-r--r--gtk/filter_prefs.c6
-rw-r--r--gtk/gsm_a_stat.c4
-rw-r--r--gtk/http_stat.c4
-rw-r--r--gtk/io_stat.c4
-rw-r--r--gtk/isup_stat.c4
-rw-r--r--gtk/ldap_stat.c6
-rw-r--r--gtk/print_dlg.c4
-rw-r--r--gtk/print_prefs.c19
-rw-r--r--gtk/proto_draw.c10
-rw-r--r--gtk/rpc_stat.c6
-rw-r--r--gtk/rtp_analysis.c10
-rw-r--r--gtk/rtp_stream_dlg.c8
-rw-r--r--gtk/smb_stat.c6
-rw-r--r--gtk/summary_dlg.c8
-rw-r--r--gtk/tap_dfilter_dlg.c6
-rw-r--r--gtk/tcp_graph.c9
-rw-r--r--gtk/toolbar.c22
-rw-r--r--gtk/wsp_stat.c4
-rw-r--r--image/toolbar/stock_add_24.xpm51
-rw-r--r--image/toolbar/stock_ok_20.xpm70
-rw-r--r--image/toolbar/stock_properties_24.xpm212
31 files changed, 478 insertions, 110 deletions
diff --git a/gtk/ansi_a_stat.c b/gtk/ansi_a_stat.c
index 30e2d9be1b..f5ce8c2f2a 100644
--- a/gtk/ansi_a_stat.c
+++ b/gtk/ansi_a_stat.c
@@ -5,7 +5,7 @@
*
* MUCH code modified from service_response_time_table.c.
*
- * $Id: ansi_a_stat.c,v 1.7 2004/01/03 18:05:55 sharpe Exp $
+ * $Id: ansi_a_stat.c,v 1.8 2004/01/21 03:54:28 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -328,7 +328,7 @@ ansi_a_stat_gtk_win_create(
gtk_button_box_set_layout(GTK_BUTTON_BOX(hbuttonbox), GTK_BUTTONBOX_END);
gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbuttonbox), 0);
- bt_close = gtk_button_new_with_label("Close");
+ bt_close = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE);
gtk_widget_ref(bt_close);
OBJECT_SET_DATA_FULL(dlg_p->win, "bt_close", bt_close, gtk_widget_unref);
gtk_widget_show(bt_close);
diff --git a/gtk/ansi_map_stat.c b/gtk/ansi_map_stat.c
index de3f696bc3..c7fbbfadeb 100644
--- a/gtk/ansi_map_stat.c
+++ b/gtk/ansi_map_stat.c
@@ -5,7 +5,7 @@
*
* MUCH code modified from service_response_time_table.c.
*
- * $Id: ansi_map_stat.c,v 1.10 2004/01/11 10:02:39 jmayer Exp $
+ * $Id: ansi_map_stat.c,v 1.11 2004/01/21 03:54:28 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -301,7 +301,7 @@ ansi_map_stat_gtk_win_create(
gtk_button_box_set_layout(GTK_BUTTON_BOX(hbuttonbox), GTK_BUTTONBOX_END);
gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbuttonbox), 0);
- bt_close = gtk_button_new_with_label("Close");
+ bt_close = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE);
gtk_widget_ref(bt_close);
OBJECT_SET_DATA_FULL(dlg_p->win, "bt_close", bt_close, gtk_widget_unref);
gtk_widget_show(bt_close);
diff --git a/gtk/bootp_stat.c b/gtk/bootp_stat.c
index 2f02633233..fd21c96323 100644
--- a/gtk/bootp_stat.c
+++ b/gtk/bootp_stat.c
@@ -1,7 +1,7 @@
/* bootp_stat.c
* boop_stat 2003 Jean-Michel FAYARD
*
- * $Id: bootp_stat.c,v 1.12 2004/01/13 22:49:14 guy Exp $
+ * $Id: bootp_stat.c,v 1.13 2004/01/21 03:54:28 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -329,7 +329,7 @@ gtk_dhcpstat_cb(GtkWidget *w _U_, gpointer d _U_)
gtk_widget_show(bbox);
/* the start button */
- start_button=gtk_button_new_with_label("Create Stat");
+ start_button=BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_CREATE_STAT);
SIGNAL_CONNECT_OBJECT(start_button, "clicked",
dhcp_start_button_clicked, NULL);
gtk_box_pack_start(GTK_BOX(bbox), start_button, TRUE, TRUE, 0);
diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c
index 93c0ab2f0f..88c075a87a 100644
--- a/gtk/capture_dlg.c
+++ b/gtk/capture_dlg.c
@@ -1,7 +1,7 @@
/* capture_dlg.c
* Routines for packet capture windows
*
- * $Id: capture_dlg.c,v 1.94 2004/01/20 02:21:17 ulfl Exp $
+ * $Id: capture_dlg.c,v 1.95 2004/01/21 03:54:28 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -233,7 +233,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
*promisc_cb,
*filter_hb, *filter_bt, *filter_te,
*file_fr, *file_vb,
- *file_hb, *file_bt, *file_te,
+ *file_hb, *file_bt, *file_lb, *file_te,
*ringbuffer_hb, *ringbuffer_on_tb, *ringbuffer_nbf_lb, *ringbuffer_nbf_sb,
*display_fr, *display_vb,
*sync_cb, *auto_scroll_cb,
@@ -429,14 +429,18 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
gtk_container_add(GTK_CONTAINER(file_vb), file_hb);
gtk_widget_show(file_hb);
- file_bt = gtk_button_new_with_label("File:");
- gtk_box_pack_start(GTK_BOX(file_hb), file_bt, FALSE, FALSE, 3);
- gtk_widget_show(file_bt);
+ file_lb = gtk_label_new("File:");
+ gtk_box_pack_start(GTK_BOX(file_hb), file_lb, FALSE, FALSE, 3);
+ gtk_widget_show(file_lb);
file_te = gtk_entry_new();
gtk_box_pack_start(GTK_BOX(file_hb), file_te, TRUE, TRUE, 3);
gtk_widget_show(file_te);
+ file_bt = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_BROWSE);
+ gtk_box_pack_start(GTK_BOX(file_hb), file_bt, FALSE, FALSE, 3);
+ gtk_widget_show(file_bt);
+
SIGNAL_CONNECT(file_bt, "clicked", capture_prep_file_cb, file_te);
/* Ring buffer row */
diff --git a/gtk/capture_info_dlg.c b/gtk/capture_info_dlg.c
index 400907c90f..74657955b3 100644
--- a/gtk/capture_info_dlg.c
+++ b/gtk/capture_info_dlg.c
@@ -1,7 +1,7 @@
/* capture_info_dlg.c
* Routines for packet capture info dialog
*
- * $Id: capture_info_dlg.c,v 1.9 2004/01/05 18:11:27 ulfl Exp $
+ * $Id: capture_info_dlg.c,v 1.10 2004/01/21 03:54:29 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -202,11 +202,7 @@ capture_info *cinfo)
/* allow user to either click a stop button, or the close button on
the window to stop a capture in progress. */
-#if GTK_MAJOR_VERSION < 2
- stop_bt = gtk_button_new_with_label ("Stop");
-#else
- stop_bt = gtk_button_new_from_stock(GTK_STOCK_STOP);
-#endif
+ stop_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_STOP);
SIGNAL_CONNECT(stop_bt, "clicked", capture_info_stop_cb,
cinfo->callback_data);
SIGNAL_CONNECT(info->cap_w, "delete_event", capture_info_delete_cb,
diff --git a/gtk/capture_prefs.c b/gtk/capture_prefs.c
index 3fb1ff66a6..47c44efcff 100644
--- a/gtk/capture_prefs.c
+++ b/gtk/capture_prefs.c
@@ -1,7 +1,7 @@
/* capture_prefs.c
* Dialog box for capture preferences
*
- * $Id: capture_prefs.c,v 1.25 2004/01/10 16:27:39 ulfl Exp $
+ * $Id: capture_prefs.c,v 1.26 2004/01/21 03:54:29 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -122,13 +122,13 @@ capture_prefs_show(void)
gtk_widget_show(if_cb);
OBJECT_SET_DATA(main_vb, DEVICE_KEY, if_cb);
- /* Interface options */
- ifopts_lb = gtk_label_new("Interface options:");
+ /* Interface properties */
+ ifopts_lb = gtk_label_new("Interface:");
gtk_table_attach_defaults(GTK_TABLE(main_tb), ifopts_lb, 0, 1, 1, 2);
gtk_misc_set_alignment(GTK_MISC(ifopts_lb), 1.0, 0.5);
gtk_widget_show(ifopts_lb);
- ifopts_bt = gtk_button_new_with_label("Edit...");
+ ifopts_bt = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_EDIT);
SIGNAL_CONNECT(ifopts_bt, "clicked", ifopts_edit_cb, NULL);
gtk_table_attach_defaults(GTK_TABLE(main_tb), ifopts_bt, 1, 2, 1, 2 );
diff --git a/gtk/color_dlg.c b/gtk/color_dlg.c
index c63158d6f6..9165497bd9 100644
--- a/gtk/color_dlg.c
+++ b/gtk/color_dlg.c
@@ -1,7 +1,7 @@
/* color_dlg.c
* Definitions for dialog boxes for color filters
*
- * $Id: color_dlg.c,v 1.33 2004/01/18 00:33:03 ulfl Exp $
+ * $Id: color_dlg.c,v 1.34 2004/01/21 03:54:29 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -260,7 +260,7 @@ colorize_dialog_new (char *filter)
gtk_box_pack_start (GTK_BOX (edit_vbox), color_new, FALSE, FALSE, 5);
gtk_tooltips_set_tip (tooltips, color_new, ("Create a new filter after the selected filter"), NULL);
- color_props = BUTTON_NEW_FROM_STOCK(GTK_STOCK_PROPERTIES);
+ color_props = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_EDIT);
gtk_widget_ref (color_props);
OBJECT_SET_DATA_FULL(color_win, "color_props", color_props, gtk_widget_unref);
gtk_widget_show (color_props);
@@ -296,7 +296,7 @@ colorize_dialog_new (char *filter)
gtk_widget_show (manage_vbox);
gtk_container_add(GTK_CONTAINER(manage_fr), manage_vbox);
- color_export = gtk_button_new_with_label (("Export..."));
+ color_export = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_EXPORT);
gtk_widget_ref(color_export);
gtk_box_pack_start (GTK_BOX (manage_vbox), color_export, FALSE, FALSE, 5);
#if GTK_MAJOR_VERSION < 2
@@ -305,7 +305,7 @@ colorize_dialog_new (char *filter)
gtk_widget_show(color_export);
gtk_tooltips_set_tip(tooltips, color_export, ("Save all/marked filters to specified file"), NULL);
- color_import = gtk_button_new_with_label (("Import..."));
+ color_import = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_IMPORT);
gtk_widget_ref(color_import);
gtk_box_pack_start (GTK_BOX (manage_vbox), color_import, FALSE, FALSE, 5);
#if GTK_MAJOR_VERSION < 2
@@ -1306,7 +1306,7 @@ edit_color_filter_dialog_new(GtkWidget *color_filters,
/* Create the "Add Expression..." button, to pop up a dialog
for constructing filter comparison expressions. */
- add_expression_bt = gtk_button_new_with_label("Add Expression...");
+ add_expression_bt = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_ADD_EXPRESSION);
SIGNAL_CONNECT(add_expression_bt, "clicked", filter_expr_cb, *colorize_filter_text);
gtk_box_pack_start (GTK_BOX(filter_string_hbox), add_expression_bt, FALSE, FALSE, 3);
gtk_widget_show(add_expression_bt);
@@ -1350,7 +1350,7 @@ edit_color_filter_dialog_new(GtkWidget *color_filters,
gtk_widget_show (button_hbox);
gtk_box_pack_start (GTK_BOX (dialog_vbox), button_hbox, FALSE, FALSE, 5);
- edit_color_filter_ok = gtk_button_new_with_label (("OK"));
+ edit_color_filter_ok = BUTTON_NEW_FROM_STOCK(GTK_STOCK_OK);
gtk_widget_ref (edit_color_filter_ok);
OBJECT_SET_DATA_FULL(edit_dialog, "edit_color_filter_ok", edit_color_filter_ok,
gtk_widget_unref);
@@ -1358,7 +1358,7 @@ edit_color_filter_dialog_new(GtkWidget *color_filters,
gtk_box_pack_start (GTK_BOX (button_hbox), edit_color_filter_ok, TRUE, FALSE, 0);
gtk_tooltips_set_tip (tooltips, edit_color_filter_ok, ("Accept filter color change"), NULL);
- edit_color_filter_cancel = gtk_button_new_with_label (("Cancel"));
+ edit_color_filter_cancel = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CANCEL);
gtk_widget_ref (edit_color_filter_cancel);
OBJECT_SET_DATA_FULL(edit_dialog, "edit_color_filter_cancel",
edit_color_filter_cancel, gtk_widget_unref);
diff --git a/gtk/compat_macros.h b/gtk/compat_macros.h
index 8a3e5c64bf..542c3e79f0 100644
--- a/gtk/compat_macros.h
+++ b/gtk/compat_macros.h
@@ -1,7 +1,7 @@
/* compat_macros.h
* GTK-related Global defines, etc.
*
- * $Id: compat_macros.h,v 1.10 2004/01/20 18:47:23 ulfl Exp $
+ * $Id: compat_macros.h,v 1.11 2004/01/21 03:54:29 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -25,14 +25,6 @@
#ifndef __COMPAT_MACROS_H__
#define __COMPAT_MACROS_H__
-#ifdef HAVE_LIBPCAP
-#define ETHEREAL_STOCK_LABEL_CAPTURE_START "_New"
-#define ETHEREAL_STOCK_LABEL_CAPTURE_FILTER "_CFilter"
-#define ETHEREAL_STOCK_LABEL_CAPTURE_FILTER_ENTRY "CFilter:"
-#endif
-#define ETHEREAL_STOCK_LABEL_DISPLAY_FILTER "_DFilter"
-#define ETHEREAL_STOCK_LABEL_DISPLAY_FILTER_ENTRY "DFilter:"
-#define ETHEREAL_STOCK_LABEL_PREFS "_Prefs"
/*
* helper macros fro gtk1.2/gtk2 compatibility :
@@ -116,11 +108,17 @@ gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), name)
#ifdef HAVE_LIBPCAP
#define ETHEREAL_STOCK_CAPTURE_START "New"
#define ETHEREAL_STOCK_CAPTURE_FILTER "CFilter"
-#define ETHEREAL_STOCK_CAPTURE_FILTER_ENTRY "CFilter:"
+#define ETHEREAL_STOCK_CAPTURE_FILTER_ENTRY "Capture Filter:"
#endif
-#define ETHEREAL_STOCK_DISPLAY_FILTER "DFilter"
-#define ETHEREAL_STOCK_DISPLAY_FILTER_ENTRY "DFilter:"
+#define ETHEREAL_STOCK_DISPLAY_FILTER "Filter"
+#define ETHEREAL_STOCK_DISPLAY_FILTER_ENTRY "Filter:"
#define ETHEREAL_STOCK_PREFS "Prefs"
+#define ETHEREAL_STOCK_BROWSE "Browse"
+#define ETHEREAL_STOCK_CREATE_STAT "Create Stat"
+#define ETHEREAL_STOCK_EXPORT "Export..."
+#define ETHEREAL_STOCK_IMPORT "Import..."
+#define ETHEREAL_STOCK_EDIT "Edit..."
+#define ETHEREAL_STOCK_ADD_EXPRESSION "Add Expression..."
#define BUTTON_NEW_FROM_STOCK(stock_id) \
gtk_button_new_with_label(stock_id);
@@ -178,6 +176,21 @@ g_signal_stop_emission_by_name(G_OBJECT(widget), name)
{path, accelerator, GTK_MENU_FUNC(callback), action, "<StockItem>", data}
#ifdef HAVE_LIBPCAP
+#define ETHEREAL_STOCK_LABEL_CAPTURE_START "_New"
+#define ETHEREAL_STOCK_LABEL_CAPTURE_FILTER "_CFilter"
+#define ETHEREAL_STOCK_LABEL_CAPTURE_FILTER_ENTRY "_Capture Filter:"
+#endif
+#define ETHEREAL_STOCK_LABEL_DISPLAY_FILTER "Filter"
+#define ETHEREAL_STOCK_LABEL_DISPLAY_FILTER_ENTRY "Filter:"
+#define ETHEREAL_STOCK_LABEL_PREFS "_Prefs"
+#define ETHEREAL_STOCK_LABEL_BROWSE "" /* icon only */
+#define ETHEREAL_STOCK_LABEL_CREATE_STAT "Create Stat"
+#define ETHEREAL_STOCK_LABEL_EXPORT "Export..."
+#define ETHEREAL_STOCK_LABEL_IMPORT "Import..."
+#define ETHEREAL_STOCK_LABEL_EDIT "Edit..."
+#define ETHEREAL_STOCK_LABEL_ADD_EXPRESSION "Expression..." /* plus sign coming from icon */
+
+#ifdef HAVE_LIBPCAP
#define ETHEREAL_STOCK_CAPTURE_START "Ethereal_Stock_CaptureStart"
#define ETHEREAL_STOCK_CAPTURE_FILTER "Ethereal_Stock_CaptureFilter"
#define ETHEREAL_STOCK_CAPTURE_FILTER_ENTRY "Ethereal_Stock_CaptureFilter_Entry"
@@ -185,6 +198,12 @@ g_signal_stop_emission_by_name(G_OBJECT(widget), name)
#define ETHEREAL_STOCK_DISPLAY_FILTER "Ethereal_Stock_DisplayFilter"
#define ETHEREAL_STOCK_DISPLAY_FILTER_ENTRY "Ethereal_Stock_DisplayFilter_Entry"
#define ETHEREAL_STOCK_PREFS "Ethereal_Stock_Prefs"
+#define ETHEREAL_STOCK_BROWSE "Ethereal_Stock_Browse"
+#define ETHEREAL_STOCK_CREATE_STAT "Ethereal_Stock_CreateStat"
+#define ETHEREAL_STOCK_EXPORT "Ethereal_Stock_Export"
+#define ETHEREAL_STOCK_IMPORT "Ethereal_Stock_Import"
+#define ETHEREAL_STOCK_EDIT "Ethereal_Stock_Edit"
+#define ETHEREAL_STOCK_ADD_EXPRESSION "Ethereal_Stock_Edit_Add_Expression"
#define BUTTON_NEW_FROM_STOCK(stock_id) \
gtk_button_new_from_stock(stock_id);
diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c
index 98a2a50201..79d4910d28 100644
--- a/gtk/dcerpc_stat.c
+++ b/gtk/dcerpc_stat.c
@@ -1,7 +1,7 @@
/* dcerpc_stat.c
* dcerpc_stat 2002 Ronnie Sahlberg
*
- * $Id: dcerpc_stat.c,v 1.42 2004/01/19 23:43:29 guy Exp $
+ * $Id: dcerpc_stat.c,v 1.43 2004/01/21 03:54:29 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -619,18 +619,18 @@ gtk_dcerpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
filter_box=gtk_hbox_new(FALSE, 3);
/* Filter label */
- filter_bt=gtk_button_new_with_label("Filter:");
+ filter_bt=BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_DISPLAY_FILTER_ENTRY);
SIGNAL_CONNECT(filter_bt, "clicked", display_filter_construct_cb, &args);
gtk_box_pack_start(GTK_BOX(filter_box), filter_bt, FALSE, FALSE, 0);
gtk_widget_show(filter_bt);
/* Filter entry */
filter_entry=gtk_entry_new();
- WIDGET_SET_SIZE(filter_entry, 300, -2);
+ WIDGET_SET_SIZE(filter_entry, 300, -1);
/* Filter entry */
filter_entry=gtk_entry_new();
- WIDGET_SET_SIZE(filter_entry, 300, -2);
+ WIDGET_SET_SIZE(filter_entry, 300, -1);
gtk_box_pack_start(GTK_BOX(filter_box), filter_entry, TRUE, TRUE, 0);
filter=gtk_entry_get_text(GTK_ENTRY(main_display_filter_widget));
@@ -650,7 +650,7 @@ gtk_dcerpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
gtk_widget_show(bbox);
/* the start button */
- start_button=gtk_button_new_with_label("Create Stat");
+ start_button=BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_CREATE_STAT);
SIGNAL_CONNECT_OBJECT(start_button, "clicked",
dcerpcstat_start_button_clicked, NULL);
gtk_box_pack_start(GTK_BOX(bbox), start_button, TRUE, TRUE, 0);
diff --git a/gtk/fc_stat.c b/gtk/fc_stat.c
index 4741ef92ee..8b62523a26 100644
--- a/gtk/fc_stat.c
+++ b/gtk/fc_stat.c
@@ -1,7 +1,7 @@
/* fc_stat.c
* fc_stat 2003 Ronnie Sahlberg
*
- * $Id: fc_stat.c,v 1.19 2004/01/13 22:49:14 guy Exp $
+ * $Id: fc_stat.c,v 1.20 2004/01/21 03:54:29 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -252,7 +252,7 @@ gtk_fcstat_cb(GtkWidget *w _U_, gpointer d _U_)
filter_box=gtk_hbox_new(FALSE, 3);
/* Filter button */
- filter_bt=gtk_button_new_with_label("Filter:");
+ filter_bt=BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_DISPLAY_FILTER_ENTRY);
SIGNAL_CONNECT(filter_bt, "clicked", display_filter_construct_cb, &args);
gtk_box_pack_start(GTK_BOX(filter_box), filter_bt, FALSE, FALSE, 0);
gtk_widget_show(filter_bt);
@@ -283,7 +283,7 @@ gtk_fcstat_cb(GtkWidget *w _U_, gpointer d _U_)
gtk_widget_show(bbox);
/* the start button */
- start_button=gtk_button_new_with_label("Create Stat");
+ start_button=BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_CREATE_STAT);
SIGNAL_CONNECT_OBJECT(start_button, "clicked",
fcstat_start_button_clicked, NULL);
gtk_box_pack_start(GTK_BOX(bbox), start_button, TRUE, TRUE, 0);
diff --git a/gtk/filter_prefs.c b/gtk/filter_prefs.c
index 425fdec4e8..5c9efabd8d 100644
--- a/gtk/filter_prefs.c
+++ b/gtk/filter_prefs.c
@@ -3,7 +3,7 @@
* (This used to be a notebook page under "Preferences", hence the
* "prefs" in the file name.)
*
- * $Id: filter_prefs.c,v 1.48 2004/01/18 00:40:39 ulfl Exp $
+ * $Id: filter_prefs.c,v 1.49 2004/01/21 03:54:29 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -411,7 +411,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te,
gtk_container_add(GTK_CONTAINER(list_bb), new_bt);
gtk_widget_show(new_bt);
- chg_bt = gtk_button_new_with_label ("Change");
+ chg_bt = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_EDIT);
gtk_widget_set_sensitive(chg_bt, FALSE);
SIGNAL_CONNECT(chg_bt, "clicked", filter_chg_bt_clicked_cb, filter_list_p);
OBJECT_SET_DATA(main_w, E_FILT_CHG_BT_KEY, chg_bt);
@@ -439,7 +439,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te,
if (list == DFILTER_LIST) {
/* Create the "Add Expression..." button, to pop up a dialog
for constructing filter comparison expressions. */
- add_expression_bt = gtk_button_new_with_label("Add Expression...");
+ add_expression_bt = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_ADD_EXPRESSION);
SIGNAL_CONNECT(add_expression_bt, "clicked", filter_expr_cb, main_w);
gtk_container_add(GTK_CONTAINER(list_bb), add_expression_bt);
gtk_widget_show(add_expression_bt);
diff --git a/gtk/gsm_a_stat.c b/gtk/gsm_a_stat.c
index 9ecd0676e7..be19909cdd 100644
--- a/gtk/gsm_a_stat.c
+++ b/gtk/gsm_a_stat.c
@@ -5,7 +5,7 @@
*
* MUCH code modified from service_response_time_table.c.
*
- * $Id: gsm_a_stat.c,v 1.7 2004/01/03 18:05:56 sharpe Exp $
+ * $Id: gsm_a_stat.c,v 1.8 2004/01/21 03:54:29 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -411,7 +411,7 @@ gsm_a_stat_gtk_win_create(
gtk_button_box_set_layout(GTK_BUTTON_BOX(hbuttonbox), GTK_BUTTONBOX_END);
gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbuttonbox), 0);
- bt_close = gtk_button_new_with_label("Close");
+ bt_close = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE);
gtk_widget_ref(bt_close);
OBJECT_SET_DATA_FULL(dlg_p->win, "bt_close", bt_close, gtk_widget_unref);
gtk_widget_show(bt_close);
diff --git a/gtk/http_stat.c b/gtk/http_stat.c
index 94ad0f83ef..19decf102a 100644
--- a/gtk/http_stat.c
+++ b/gtk/http_stat.c
@@ -1,7 +1,7 @@
/* http_stat.c
* http_stat 2003 Jean-Michel FAYARD
*
- * $Id: http_stat.c,v 1.14 2004/01/13 22:49:14 guy Exp $
+ * $Id: http_stat.c,v 1.15 2004/01/21 03:54:30 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -574,7 +574,7 @@ gtk_httpstat_cb(GtkWidget *w _U_, gpointer d _U_)
gtk_widget_show(bbox);
/* the start button */
- start_button=gtk_button_new_with_label("Create Stat");
+ start_button=BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_CREATE_STAT);
SIGNAL_CONNECT_OBJECT(start_button, "clicked",
httpstat_start_button_clicked, NULL);
gtk_box_pack_start(GTK_BOX(bbox), start_button, TRUE, TRUE, 0);
diff --git a/gtk/io_stat.c b/gtk/io_stat.c
index e2b9822c26..342d767644 100644
--- a/gtk/io_stat.c
+++ b/gtk/io_stat.c
@@ -1,7 +1,7 @@
/* io_stat.c
* io_stat 2002 Ronnie Sahlberg
*
- * $Id: io_stat.c,v 1.57 2004/01/13 22:34:10 guy Exp $
+ * $Id: io_stat.c,v 1.58 2004/01/21 03:54:30 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -1674,7 +1674,7 @@ create_filter_box(io_stat_graph_t *gio, GtkWidget *box, int num)
label=gtk_label_new(" ");
gtk_widget_show(label);
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
- gio->filter_bt = gtk_button_new_with_label("Filter:");
+ gio->filter_bt=BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_DISPLAY_FILTER_ENTRY);
sprintf(str, "Ethereal: Display Filter IO-Stat (Filter:%d)", num);
if(gio->args->title){
diff --git a/gtk/isup_stat.c b/gtk/isup_stat.c
index 4857d7eaa2..a46aba9bc9 100644
--- a/gtk/isup_stat.c
+++ b/gtk/isup_stat.c
@@ -5,7 +5,7 @@
*
* MUCH code modified from service_response_time_table.c.
*
- * $Id: isup_stat.c,v 1.10 2004/01/11 10:02:39 jmayer Exp $
+ * $Id: isup_stat.c,v 1.11 2004/01/21 03:54:30 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -303,7 +303,7 @@ isup_stat_gtk_win_create(
gtk_button_box_set_layout(GTK_BUTTON_BOX(hbuttonbox), GTK_BUTTONBOX_END);
gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbuttonbox), 0);
- bt_close = gtk_button_new_with_label("Close");
+ bt_close = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE);
gtk_widget_ref(bt_close);
OBJECT_SET_DATA_FULL(dlg_p->win, "bt_close", bt_close, gtk_widget_unref);
gtk_widget_show(bt_close);
diff --git a/gtk/ldap_stat.c b/gtk/ldap_stat.c
index de5cdc5c33..d86d71cc0d 100644
--- a/gtk/ldap_stat.c
+++ b/gtk/ldap_stat.c
@@ -1,7 +1,7 @@
/* ldap_stat.c
* ldap_stat 2003 Ronnie Sahlberg
*
- * $Id: ldap_stat.c,v 1.7 2004/01/13 22:49:14 guy Exp $
+ * $Id: ldap_stat.c,v 1.8 2004/01/21 03:54:30 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -287,7 +287,7 @@ gtk_ldapstat_cb(GtkWidget *w _U_, gpointer d _U_)
filter_box=gtk_hbox_new(FALSE, 3);
/* Filter button */
- filter_bt=gtk_button_new_with_label("Filter:");
+ filter_bt=BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_DISPLAY_FILTER_ENTRY);
SIGNAL_CONNECT(filter_bt, "clicked", display_filter_construct_cb, &args);
gtk_box_pack_start(GTK_BOX(filter_box), filter_bt, FALSE, FALSE, 0);
gtk_widget_show(filter_bt);
@@ -318,7 +318,7 @@ gtk_ldapstat_cb(GtkWidget *w _U_, gpointer d _U_)
gtk_widget_show(bbox);
/* the start button */
- start_button=gtk_button_new_with_label("Create Stat");
+ start_button=BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_CREATE_STAT);
SIGNAL_CONNECT_OBJECT(start_button, "clicked",
ldapstat_start_button_clicked, NULL);
gtk_box_pack_start(GTK_BOX(bbox), start_button, TRUE, TRUE, 0);
diff --git a/gtk/print_dlg.c b/gtk/print_dlg.c
index 7e5d3ef8e1..07cb243442 100644
--- a/gtk/print_dlg.c
+++ b/gtk/print_dlg.c
@@ -1,7 +1,7 @@
/* print_dlg.c
* Dialog boxes for printing
*
- * $Id: print_dlg.c,v 1.54 2004/01/10 16:27:42 ulfl Exp $
+ * $Id: print_dlg.c,v 1.55 2004/01/21 03:54:30 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -430,7 +430,7 @@ file_print_cmd_cb(GtkWidget *widget _U_, gpointer data _U_)
if (print_to_file)
gtk_widget_grab_focus(file_te);
- file_bt = gtk_button_new_with_label("Browse");
+ file_bt = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_BROWSE);
OBJECT_SET_DATA(dest_cb, PRINT_FILE_BT_KEY, file_bt);
OBJECT_SET_DATA(file_bt, E_FILE_TE_PTR_KEY, file_te);
gtk_tooltips_set_tip (tooltips, file_bt, ("Browse output filename in filesystem"), NULL);
diff --git a/gtk/print_prefs.c b/gtk/print_prefs.c
index 815bc2ec6a..8323350b35 100644
--- a/gtk/print_prefs.c
+++ b/gtk/print_prefs.c
@@ -1,7 +1,7 @@
/* print_prefs.c
* Dialog boxes for preferences for printing
*
- * $Id: print_prefs.c,v 1.16 2002/11/11 15:39:06 oabad Exp $
+ * $Id: print_prefs.c,v 1.17 2004/01/21 03:54:30 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -73,7 +73,7 @@ GtkWidget * printer_prefs_show(void)
#ifndef _WIN32
GtkWidget *cmd_te;
#endif
- GtkWidget *file_bt_hb, *file_bt, *file_te;
+ GtkWidget *file_lb_hb, *file_lb, *file_bt_hb, *file_bt, *file_te;
/* Enclosing containers for each row of widgets */
main_vb = gtk_vbox_new(FALSE, 5);
@@ -103,19 +103,28 @@ GtkWidget * printer_prefs_show(void)
OBJECT_SET_DATA(main_vb, PRINT_CMD_TE_KEY, cmd_te);
#endif
+
+ file_lb_hb = gtk_hbox_new(FALSE, 0);
+ gtk_table_attach_defaults(GTK_TABLE(main_tb), file_lb_hb, 0, 1, 3, 4);
+ gtk_widget_show(file_lb_hb);
+
+ file_lb = gtk_label_new("File:");
+ gtk_box_pack_end(GTK_BOX(file_lb_hb), file_lb, FALSE, FALSE, 0);
+ gtk_widget_show(file_lb);
+
/* File button and text entry */
file_bt_hb = gtk_hbox_new(FALSE, 0);
- gtk_table_attach_defaults(GTK_TABLE(main_tb), file_bt_hb, 0, 1, 3, 4);
+ gtk_table_attach_defaults(GTK_TABLE(main_tb), file_bt_hb, 1, 2, 3, 4);
gtk_widget_show(file_bt_hb);
- file_bt = gtk_button_new_with_label("File:");
+ file_bt = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_BROWSE);
gtk_box_pack_end(GTK_BOX(file_bt_hb), file_bt, FALSE, FALSE, 0);
gtk_widget_show(file_bt);
file_te = gtk_entry_new();
OBJECT_SET_DATA(main_vb, PRINT_FILE_TE_KEY, file_te);
if (prefs.pr_file) gtk_entry_set_text(GTK_ENTRY(file_te), prefs.pr_file);
- gtk_table_attach_defaults(GTK_TABLE(main_tb), file_te, 1, 2, 3, 4);
+ gtk_box_pack_start(GTK_BOX(file_bt_hb), file_te, TRUE, TRUE, 0);
gtk_widget_show(file_te);
SIGNAL_CONNECT(file_bt, "clicked", printer_opts_file_cb, file_te);
diff --git a/gtk/proto_draw.c b/gtk/proto_draw.c
index 05a1db75b9..11912b5e79 100644
--- a/gtk/proto_draw.c
+++ b/gtk/proto_draw.c
@@ -1,7 +1,7 @@
/* proto_draw.c
* Routines for GTK+ packet display
*
- * $Id: proto_draw.c,v 1.79 2004/01/19 00:42:10 ulfl Exp $
+ * $Id: proto_draw.c,v 1.80 2004/01/21 03:54:30 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -790,13 +790,13 @@ void savehex_cb(GtkWidget * w _U_, gpointer data _U_)
/* File entry */
file_entry=gtk_entry_new();
- WIDGET_SET_SIZE(file_entry, 300, -2);
+ WIDGET_SET_SIZE(file_entry, 300, -1);
gtk_tooltips_set_tip(tooltips, file_entry, ("Enter Save Data filename"), NULL);
gtk_box_pack_start(GTK_BOX(file_box), file_entry, TRUE, TRUE, 0);
gtk_widget_show(file_entry);
/* File Browse button */
- file_bt = gtk_button_new_with_label("Browse");
+ file_bt=BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_BROWSE);
SIGNAL_CONNECT(file_bt, "clicked", select_file_cb,
"Ethereal: Save Highlighted Data to File");
@@ -819,8 +819,8 @@ void savehex_cb(GtkWidget * w _U_, gpointer data _U_)
gtk_widget_show(bbox);
/* the save button */
- save_button=gtk_button_new_with_label("Save");
- SIGNAL_CONNECT_OBJECT(save_button, "clicked",
+ save_button=BUTTON_NEW_FROM_STOCK(GTK_STOCK_SAVE);
+ SIGNAL_CONNECT_OBJECT(save_button, "clicked",
savehex_save_clicked_cb, NULL);
gtk_box_pack_start(GTK_BOX(bbox), save_button, TRUE, TRUE, 0);
GTK_WIDGET_SET_FLAGS(save_button, GTK_CAN_DEFAULT);
diff --git a/gtk/rpc_stat.c b/gtk/rpc_stat.c
index aeb5e00226..e5364bef77 100644
--- a/gtk/rpc_stat.c
+++ b/gtk/rpc_stat.c
@@ -1,7 +1,7 @@
/* rpc_stat.c
* rpc_stat 2002 Ronnie Sahlberg
*
- * $Id: rpc_stat.c,v 1.32 2004/01/13 22:49:14 guy Exp $
+ * $Id: rpc_stat.c,v 1.33 2004/01/21 03:54:31 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -462,7 +462,7 @@ gtk_rpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
filter_box=gtk_hbox_new(FALSE, 3);
/* Filter label */
- filter_bt=gtk_button_new_with_label("Filter:");
+ filter_bt=BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_DISPLAY_FILTER_ENTRY);
SIGNAL_CONNECT(filter_bt, "clicked", display_filter_construct_cb, &args);
gtk_box_pack_start(GTK_BOX(filter_box), filter_bt, FALSE, FALSE, 0);
gtk_widget_show(filter_bt);
@@ -493,7 +493,7 @@ gtk_rpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
gtk_widget_show(bbox);
/* the start button */
- start_button=gtk_button_new_with_label("Create Stat");
+ start_button=BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_CREATE_STAT);
SIGNAL_CONNECT_OBJECT(start_button, "clicked",
rpcstat_start_button_clicked, NULL);
gtk_box_pack_start(GTK_BOX(bbox), start_button, TRUE, TRUE, 0);
diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c
index 47bd1bd23b..406bc04d3c 100644
--- a/gtk/rtp_analysis.c
+++ b/gtk/rtp_analysis.c
@@ -1,7 +1,7 @@
/* rtp_analysis.c
* RTP analysis addition for ethereal
*
- * $Id: rtp_analysis.c,v 1.20 2004/01/20 19:31:46 ulfl Exp $
+ * $Id: rtp_analysis.c,v 1.21 2004/01/21 03:54:31 ulfl Exp $
*
* Copyright 2003, Alcatel Business Systems
* By Lars Ruoff <lars.ruoff@gmx.net>
@@ -1719,12 +1719,12 @@ void create_rtp_dialog(user_data_t* user_data)
gtk_widget_show(csv_bt);
SIGNAL_CONNECT(csv_bt, "clicked", save_csv_as_cb, user_data);
/*
- refresh_bt = gtk_button_new_with_label("Refresh");
+ refresh_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_REFRESH);
gtk_container_add(GTK_CONTAINER(box4), refresh_bt);
gtk_widget_show(refresh_bt);
SIGNAL_CONNECT(refresh_bt, "clicked", on_refresh_bt_clicked, user_data);
*/
- goto_bt = gtk_button_new_with_label("Go to frame");
+ goto_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_JUMP_TO);
gtk_container_add(GTK_CONTAINER(box4), goto_bt);
gtk_widget_show(goto_bt);
SIGNAL_CONNECT(goto_bt, "clicked", on_goto_bt_clicked, user_data);
@@ -1736,12 +1736,12 @@ void create_rtp_dialog(user_data_t* user_data)
SIGNAL_CONNECT(graph_bt, "clicked", on_graph_bt_clicked, user_data);
#endif
- next_bt = gtk_button_new_with_label("Next");
+ next_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_GO_FORWARD);
gtk_container_add(GTK_CONTAINER(box4), next_bt);
gtk_widget_show(next_bt);
SIGNAL_CONNECT(next_bt, "clicked", on_next_bt_clicked, user_data);
- close_bt = gtk_button_new_with_label("Close");
+ close_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE);
gtk_container_add(GTK_CONTAINER(box4), close_bt);
gtk_widget_show(close_bt);
SIGNAL_CONNECT(close_bt, "clicked", on_close_bt_clicked, user_data);
diff --git a/gtk/rtp_stream_dlg.c b/gtk/rtp_stream_dlg.c
index 2fbd704759..3ee28ec518 100644
--- a/gtk/rtp_stream_dlg.c
+++ b/gtk/rtp_stream_dlg.c
@@ -1,7 +1,7 @@
/* rtp_stream_dlg.c
* RTP streams summary addition for ethereal
*
- * $Id: rtp_stream_dlg.c,v 1.8 2004/01/03 18:05:57 sharpe Exp $
+ * $Id: rtp_stream_dlg.c,v 1.9 2004/01/21 03:54:31 ulfl Exp $
*
* Copyright 2003, Alcatel Business Systems
* By Lars Ruoff <lars.ruoff@gmx.net>
@@ -611,7 +611,7 @@ static void rtpstream_dlg_create (void)
gtk_container_add (GTK_CONTAINER (hbuttonbox2), bt_unselect);
GTK_WIDGET_SET_FLAGS (bt_unselect, GTK_CAN_DEFAULT);
/*
- bt_goto = gtk_button_new_with_label ("Go to Frame");
+ bt_goto = BUTTON_NEW_FROM_STOCK(GTK_STOCK_JUMP_TO);
gtk_widget_ref (bt_goto);
OBJECT_SET_DATA_FULL(rtpstream_dlg_w, "bt_goto", bt_goto,
gtk_widget_unref);
@@ -619,7 +619,7 @@ static void rtpstream_dlg_create (void)
gtk_container_add (GTK_CONTAINER (hbuttonbox2), bt_goto);
GTK_WIDGET_SET_FLAGS (bt_goto, GTK_CAN_DEFAULT);
*/
- bt_save = gtk_button_new_with_label ("Save as...");
+ bt_save = BUTTON_NEW_FROM_STOCK(GTK_STOCK_SAVE_AS);
gtk_widget_ref (bt_save);
OBJECT_SET_DATA_FULL(rtpstream_dlg_w, "bt_save", bt_save,
gtk_widget_unref);
@@ -651,7 +651,7 @@ static void rtpstream_dlg_create (void)
gtk_container_add (GTK_CONTAINER (hbuttonbox2), bt_analyse);
GTK_WIDGET_SET_FLAGS (bt_analyse, GTK_CAN_DEFAULT);
- bt_close = gtk_button_new_with_label ("Close");
+ bt_close = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE);
gtk_widget_ref (bt_close);
OBJECT_SET_DATA_FULL(rtpstream_dlg_w, "bt_close", bt_close,
gtk_widget_unref);
diff --git a/gtk/smb_stat.c b/gtk/smb_stat.c
index 70bcaef5c6..b6427fbc1c 100644
--- a/gtk/smb_stat.c
+++ b/gtk/smb_stat.c
@@ -1,7 +1,7 @@
/* smb_stat.c
* smb_stat 2003 Ronnie Sahlberg
*
- * $Id: smb_stat.c,v 1.30 2004/01/13 22:49:15 guy Exp $
+ * $Id: smb_stat.c,v 1.31 2004/01/21 03:54:31 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -292,7 +292,7 @@ gtk_smbstat_cb(GtkWidget *w _U_, gpointer d _U_)
filter_box=gtk_hbox_new(FALSE, 3);
/* Filter button */
- filter_bt = gtk_button_new_with_label("Filter:");
+ filter_bt=BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_DISPLAY_FILTER_ENTRY);
SIGNAL_CONNECT(filter_bt, "clicked", display_filter_construct_cb, &args);
gtk_box_pack_start(GTK_BOX(filter_box), filter_bt, FALSE, TRUE, 0);
gtk_widget_show(filter_bt);
@@ -323,7 +323,7 @@ gtk_smbstat_cb(GtkWidget *w _U_, gpointer d _U_)
gtk_widget_show(bbox);
/* the start button */
- start_button=gtk_button_new_with_label("Create Stat");
+ start_button=BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_CREATE_STAT);
SIGNAL_CONNECT_OBJECT(start_button, "clicked",
smbstat_start_button_clicked, NULL);
gtk_box_pack_start(GTK_BOX(bbox), start_button, TRUE, TRUE, 0);
diff --git a/gtk/summary_dlg.c b/gtk/summary_dlg.c
index cf7aa76e42..e8205f4637 100644
--- a/gtk/summary_dlg.c
+++ b/gtk/summary_dlg.c
@@ -1,7 +1,7 @@
/* summary_dlg.c
* Routines for capture file summary window
*
- * $Id: summary_dlg.c,v 1.21 2003/12/21 22:32:07 guy Exp $
+ * $Id: summary_dlg.c,v 1.22 2004/01/21 03:54:31 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -266,11 +266,7 @@ summary_open_cb(GtkWidget *w _U_, gpointer d _U_)
gtk_widget_show(bbox);
/* Create Close Button */
-#if GTK_MAJOR_VERSION < 2
- close_bt = gtk_button_new_with_label("Close");
-#else
- close_bt = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-#endif
+ close_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE);
SIGNAL_CONNECT_OBJECT(close_bt, "clicked", gtk_widget_destroy, sum_open_w);
GTK_WIDGET_SET_FLAGS(close_bt, GTK_CAN_DEFAULT);
gtk_box_pack_start(GTK_BOX(bbox), close_bt, FALSE,FALSE, 0);
diff --git a/gtk/tap_dfilter_dlg.c b/gtk/tap_dfilter_dlg.c
index 9281f46307..9cdb30b784 100644
--- a/gtk/tap_dfilter_dlg.c
+++ b/gtk/tap_dfilter_dlg.c
@@ -2,7 +2,7 @@
* Routines for display filter dialog used by gui taps
* Copyright 2003 Lars Roland
*
- * $Id: tap_dfilter_dlg.c,v 1.3 2004/01/10 16:27:42 ulfl Exp $
+ * $Id: tap_dfilter_dlg.c,v 1.4 2004/01/21 03:54:31 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -175,7 +175,7 @@ gtk_tap_dfilter_dlg_cb(GtkWidget *w _U_, gpointer data)
filter_box=gtk_hbox_new(FALSE, 3);
/* Filter button */
- filter_bt = gtk_button_new_with_label("Filter:");
+ filter_bt=BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_DISPLAY_FILTER_ENTRY);
SIGNAL_CONNECT(filter_bt, "clicked", display_filter_construct_cb, &(current_dlg->args));
gtk_box_pack_start(GTK_BOX(filter_box), filter_bt, FALSE, TRUE, 0);
gtk_widget_show(filter_bt);
@@ -206,7 +206,7 @@ gtk_tap_dfilter_dlg_cb(GtkWidget *w _U_, gpointer data)
gtk_widget_show(bbox);
/* the start button */
- start_button=gtk_button_new_with_label("Create Stat");
+ start_button=BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_CREATE_STAT);
SIGNAL_CONNECT(start_button, "clicked",
tap_dfilter_dlg_start_button_clicked, current_dlg);
gtk_box_pack_start(GTK_BOX(bbox), start_button, TRUE, TRUE, 0);
diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c
index 11f5ae3d80..1d0ad609aa 100644
--- a/gtk/tcp_graph.c
+++ b/gtk/tcp_graph.c
@@ -3,7 +3,7 @@
* By Pavel Mores <pvl@uh.cz>
* Win32 port: rwh@unifiedtech.com
*
- * $Id: tcp_graph.c,v 1.44 2004/01/13 08:25:00 guy Exp $
+ * $Id: tcp_graph.c,v 1.45 2004/01/21 03:54:31 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -1037,13 +1037,8 @@ static void callback_create_help(GtkWidget *widget _U_, gpointer data _U_)
gtk_text_buffer_set_text(buf, helptext, -1);
#endif
gtk_container_add (GTK_CONTAINER (scroll), text);
-#if GTK_MAJOR_VERSION < 2
- close = gtk_button_new_with_label ("Close");
- gtk_box_pack_start (GTK_BOX (box), close, FALSE, FALSE, 0);
-#else
- close = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+ close = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE);
gtk_box_pack_start (GTK_BOX (box), close, FALSE, FALSE, 0);
-#endif
SIGNAL_CONNECT(close, "clicked", callback_close_help, toplevel);
gtk_widget_show_all (toplevel);
diff --git a/gtk/toolbar.c b/gtk/toolbar.c
index c377bd64bb..32a300ae78 100644
--- a/gtk/toolbar.c
+++ b/gtk/toolbar.c
@@ -2,7 +2,7 @@
* The main toolbar
* Copyright 2003, Ulf Lamping <ulf.lamping@web.de>
*
- * $Id: toolbar.c,v 1.23 2004/01/20 18:47:25 ulfl Exp $
+ * $Id: toolbar.c,v 1.24 2004/01/21 03:54:31 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -71,8 +71,6 @@
#ifdef HAVE_LIBPCAP
#include "../image/toolbar/stock_stop_24.xpm"
#endif /* HAVE_LIBPCAP */
-#include "../image/toolbar/stock_open_24.xpm"
-#include "../image/toolbar/stock_save_24.xpm"
#include "../image/toolbar/stock_save_as_24.xpm"
#include "../image/toolbar/stock_close_24.xpm"
#include "../image/toolbar/stock_refresh_24.xpm"
@@ -96,7 +94,13 @@
#include "../image/toolbar/cfilter_24.xpm"
#endif /* HAVE_LIBPCAP */
#include "../image/toolbar/dfilter_24.xpm"
+/* these icons are standard stock icons, but used for ethereal specific stock icon labels */
+#include "../image/toolbar/stock_add_24.xpm"
+#include "../image/toolbar/stock_open_24.xpm"
+#include "../image/toolbar/stock_ok_20.xpm"
+#include "../image/toolbar/stock_save_24.xpm"
#include "../image/toolbar/stock_preferences_24.xpm"
+#include "../image/toolbar/stock_properties_24.xpm"
/* XXX: add this key to some .h file, as it adds a key to the top level Widget? */
@@ -138,6 +142,12 @@ void ethereal_stock_icons(void) {
{ ETHEREAL_STOCK_DISPLAY_FILTER, ETHEREAL_STOCK_LABEL_DISPLAY_FILTER, 0, 0, NULL },
{ ETHEREAL_STOCK_DISPLAY_FILTER_ENTRY, ETHEREAL_STOCK_LABEL_DISPLAY_FILTER_ENTRY, 0, 0, NULL },
{ ETHEREAL_STOCK_PREFS, ETHEREAL_STOCK_LABEL_PREFS, 0, 0, NULL },
+ { ETHEREAL_STOCK_BROWSE, ETHEREAL_STOCK_LABEL_BROWSE, 0, 0, NULL },
+ { ETHEREAL_STOCK_CREATE_STAT, ETHEREAL_STOCK_LABEL_CREATE_STAT, 0, 0, NULL },
+ { ETHEREAL_STOCK_EXPORT, ETHEREAL_STOCK_LABEL_EXPORT, 0, 0, NULL },
+ { ETHEREAL_STOCK_IMPORT, ETHEREAL_STOCK_LABEL_IMPORT, 0, 0, NULL },
+ { ETHEREAL_STOCK_EDIT, ETHEREAL_STOCK_LABEL_EDIT, 0, 0, NULL },
+ { ETHEREAL_STOCK_ADD_EXPRESSION, ETHEREAL_STOCK_LABEL_ADD_EXPRESSION, 0, 0, NULL },
};
static const stock_pixmap_t pixmaps[] = {
@@ -149,6 +159,12 @@ void ethereal_stock_icons(void) {
{ ETHEREAL_STOCK_DISPLAY_FILTER, dfilter_24_xpm },
{ ETHEREAL_STOCK_DISPLAY_FILTER_ENTRY, dfilter_24_xpm },
{ ETHEREAL_STOCK_PREFS, stock_preferences_24_xpm },
+ { ETHEREAL_STOCK_BROWSE, stock_open_24_xpm },
+ { ETHEREAL_STOCK_CREATE_STAT, stock_ok_20_xpm },
+ { ETHEREAL_STOCK_EXPORT, stock_save_24_xpm }, /* XXX: needs a better icon */
+ { ETHEREAL_STOCK_IMPORT, stock_save_24_xpm }, /* XXX: needs a better icon */
+ { ETHEREAL_STOCK_EDIT, stock_properties_24_xpm },
+ { ETHEREAL_STOCK_ADD_EXPRESSION, stock_add_24_xpm },
{ NULL, NULL }
};
diff --git a/gtk/wsp_stat.c b/gtk/wsp_stat.c
index 4fd07c1542..0e72e36223 100644
--- a/gtk/wsp_stat.c
+++ b/gtk/wsp_stat.c
@@ -1,7 +1,7 @@
/* wsp_stat.c
* wsp_stat 2003 Jean-Michel FAYARD
*
- * $Id: wsp_stat.c,v 1.12 2004/01/13 22:49:15 guy Exp $
+ * $Id: wsp_stat.c,v 1.13 2004/01/21 03:54:31 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -478,7 +478,7 @@ gtk_wspstat_cb(GtkWidget *w _U_, gpointer d _U_)
gtk_widget_show(bbox);
/* the start button */
- start_button=gtk_button_new_with_label("Create Stat");
+ start_button=BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_CREATE_STAT);
SIGNAL_CONNECT_OBJECT(start_button, "clicked",
wspstat_start_button_clicked, NULL);
gtk_box_pack_start(GTK_BOX(bbox), start_button, TRUE, TRUE, 0);
diff --git a/image/toolbar/stock_add_24.xpm b/image/toolbar/stock_add_24.xpm
new file mode 100644
index 0000000000..9aef1ef64c
--- /dev/null
+++ b/image/toolbar/stock_add_24.xpm
@@ -0,0 +1,51 @@
+/* XPM */
+static char * stock_add_24_xpm[] = {
+"24 24 24 1",
+" c None",
+". c #000000",
+"+ c #D0D9E3",
+"@ c #B9C6D5",
+"# c #909DAC",
+"$ c #7590AE",
+"% c #5E738B",
+"& c #5A6F86",
+"* c #ADBCCE",
+"= c #9DB0C5",
+"- c #93A6BD",
+"; c #839BB5",
+"> c #A5B6C9",
+", c #B8C5D4",
+"' c #B6C4D3",
+") c #93A0AD",
+"! c #C4CEDC",
+"~ c #617891",
+"{ c #7589A0",
+"] c #6883A1",
+"^ c #869DB8",
+"/ c #A2B3C7",
+"( c #A5B2C0",
+"_ c #4E6074",
+" ",
+" ",
+" ",
+" ... ",
+" .+@#. ",
+" .@$%. ",
+" .@$%. ",
+" .@$%. ",
+" .@$%. ",
+" ......@$&...... ",
+" .*=====-$;>,'''). ",
+" .!$$$$$$$$$$$$$~. ",
+" .{%%%%%$$]%%%%%%. ",
+" ......^$%....... ",
+" ./$%. ",
+" .'$%. ",
+" .'$%. ",
+" .'$%. ",
+" .(%_. ",
+" .... ",
+" ",
+" ",
+" ",
+" "};
diff --git a/image/toolbar/stock_ok_20.xpm b/image/toolbar/stock_ok_20.xpm
new file mode 100644
index 0000000000..6771609f76
--- /dev/null
+++ b/image/toolbar/stock_ok_20.xpm
@@ -0,0 +1,70 @@
+/* XPM */
+static char * stock_ok_20_xpm[] = {
+"20 20 47 1",
+" c None",
+". c #10120F",
+"+ c #000000",
+"@ c #B6C6AA",
+"# c #ADBBA1",
+"$ c #9EAB93",
+"% c #95A28B",
+"& c #D5E7C7",
+"* c #9CA992",
+"= c #7E8875",
+"- c #94A08A",
+"; c #7B8572",
+"> c #636B5C",
+", c #838E7A",
+"' c #616A5B",
+") c #707A69",
+"! c #AAB89E",
+"~ c #575E51",
+"{ c #585F52",
+"] c #687161",
+"^ c #798371",
+"/ c #97A48D",
+"( c #B2C1A6",
+"_ c #99A68E",
+": c #727C6A",
+"< c #42483E",
+"[ c #8A9580",
+"} c #606859",
+"| c #41473D",
+"1 c #818C79",
+"2 c #5B6255",
+"3 c #40453C",
+"4 c #4E5549",
+"5 c #909C87",
+"6 c #7C8774",
+"7 c #555D50",
+"8 c #3E4339",
+"9 c #929E88",
+"0 c #52594C",
+"a c #393E35",
+"b c #4C5247",
+"c c #8F9B85",
+"d c #6A7363",
+"e c #4F564A",
+"f c #51574B",
+"g c #0E0F0D",
+"h c #383C34",
+" ",
+" ....... ",
+" +@@@#$$%. ",
+" .@&*%%%=. ",
+" .@@%%%%=. ",
+" .@%%-%%=. ",
+" . .@%$%%%=. ",
+" .;. .@%%%%%=. ",
+" .@>....@%%%,'). ",
+" .@!;~~~{'>]^/({. ",
+" .@/%%%%////_%:<. ",
+" .@_%%%%%%%%%[}|. ",
+".@*/%%%%%%%%123. ",
+" .45%%%%%%%678. ",
+" .49%%%%-60a. ",
+" .b5c6;dea. ",
+" .feg.... ",
+" .h. ",
+" . ",
+" "};
diff --git a/image/toolbar/stock_properties_24.xpm b/image/toolbar/stock_properties_24.xpm
new file mode 100644
index 0000000000..a2d9cb6c24
--- /dev/null
+++ b/image/toolbar/stock_properties_24.xpm
@@ -0,0 +1,212 @@
+/* XPM */
+static char * stock_properties_24_xpm[] = {
+"24 24 185 2",
+" c None",
+". c #000000",
+"+ c #FFFFFF",
+"@ c #E0E0E0",
+"# c #C1C1C1",
+"$ c #FDFDFD",
+"% c #FBFBFB",
+"& c #FAFAF9",
+"* c #C3C3C3",
+"= c #A8A8A8",
+"- c #F4F4F4",
+"; c #D4D4D4",
+"> c #EAEAEA",
+", c #DEDEDE",
+"' c #FCFCFC",
+") c #FAFAFA",
+"! c #F9F9F8",
+"~ c #F7F7F6",
+"{ c #ADADAD",
+"] c #767676",
+"^ c #5D5D5D",
+"/ c #404040",
+"( c #FEFEFE",
+"_ c #FBFBFA",
+": c #F9F9F9",
+"< c #F7F7F7",
+"[ c #F6F6F5",
+"} c #E2E2E2",
+"| c #858585",
+"1 c #4B4B49",
+"2 c #161616",
+"3 c #E3E3E3",
+"4 c #FDFDFC",
+"5 c #E6E6E6",
+"6 c #DDDDDD",
+"7 c #D7D7D7",
+"8 c #CCCCCC",
+"9 c #EAEAE9",
+"0 c #F3F3F2",
+"a c #DEDEDD",
+"b c #F0F0EF",
+"c c #EEEEED",
+"d c #EDEDEB",
+"e c #9D9D9D",
+"f c #F8F8F8",
+"g c #F5F5F4",
+"h c #F4F4F3",
+"i c #F2F2F1",
+"j c #EFEFEE",
+"k c #EDEDEC",
+"l c #ECECEA",
+"m c #EAEAE8",
+"n c #A4A4A3",
+"o c #B4B4B4",
+"p c #EFEFEF",
+"q c #E4E4E3",
+"r c #8F8F8E",
+"s c #D1D1D0",
+"t c #D1D1D1",
+"u c #DADAD8",
+"v c #D2D2D1",
+"w c #CDCDCC",
+"x c #D5D5D3",
+"y c #E7E7E6",
+"z c #A4A4A4",
+"A c #BABAB8",
+"B c #ECECEB",
+"C c #EBEBE9",
+"D c #E9E9E8",
+"E c #E8E8E6",
+"F c #E6E6E4",
+"G c #E5E5E3",
+"H c #A2A2A2",
+"I c #898987",
+"J c #CCCCCB",
+"K c #D6D6D4",
+"L c #C9C9C8",
+"M c #C9C9C7",
+"N c #D2D2D0",
+"O c #E3E3E1",
+"P c #E2E2E0",
+"Q c #949493",
+"R c #E9E9E7",
+"S c #E7E7E5",
+"T c #E4E4E2",
+"U c #E1E1DE",
+"V c #DFDFDD",
+"W c #A3A3A2",
+"X c #F5F5F5",
+"Y c #ABABAA",
+"Z c #656565",
+"` c #999998",
+" . c #D3D3D1",
+".. c #D0D0CD",
+"+. c #C8C8C6",
+"@. c #CDCDCA",
+"#. c #C5C5C2",
+"$. c #DCDCDA",
+"%. c #F1F1F0",
+"&. c #939392",
+"*. c #747473",
+"=. c #ABABA9",
+"-. c #C7C7C5",
+";. c #E1E1DF",
+">. c #E0E0DE",
+",. c #DEDEDC",
+"'. c #DDDDDA",
+"). c #DBDBD8",
+"!. c #DADAD7",
+"~. c #A0A09F",
+"{. c #E3E3E2",
+"]. c #B5B5B3",
+"^. c #767675",
+"/. c #AFAFAE",
+"(. c #D8D8D6",
+"_. c #C2C2BF",
+":. c #B4B4B2",
+"<. c #C1C1BE",
+"[. c #BDBDBB",
+"}. c #CECECB",
+"|. c #D7D7D4",
+"1. c #A2A2A1",
+"2. c #8B8B89",
+"3. c #C0C0BD",
+"4. c #DEDEDB",
+"5. c #DCDCD9",
+"6. c #D9D9D6",
+"7. c #D6D6D2",
+"8. c #D4D4D1",
+"9. c #636362",
+"0. c #ACACAA",
+"a. c #AAAAA8",
+"b. c #D1D1CE",
+"c. c #BCBCBA",
+"d. c #BCBCB9",
+"e. c #B6B6B3",
+"f. c #C3C3BF",
+"g. c #D3D3D0",
+"h. c #A1A1A0",
+"i. c #A8A8A7",
+"j. c #60605F",
+"k. c #9A9A98",
+"l. c #D8D8D5",
+"m. c #D6D6D3",
+"n. c #D5D5D2",
+"o. c #D2D2CE",
+"p. c #CFCFCB",
+"q. c #767674",
+"r. c #ADADAA",
+"s. c #B8B8B5",
+"t. c #B6B6B4",
+"u. c #D1D1CD",
+"v. c #CCCCC8",
+"w. c #7D7D7B",
+"x. c #A5A5A2",
+"y. c #CFCFCC",
+"z. c #CECECA",
+"A. c #CCCCC7",
+"B. c #A2A2A0",
+"C. c #E0E0DD",
+"D. c #6A6A68",
+"E. c #727270",
+"F. c #6A6A69",
+"G. c #A1A19E",
+"H. c #CDCDC9",
+"I. c #9F9F9F",
+"J. c #999997",
+"K. c #6F6F6E",
+"L. c #9D9D9B",
+"M. c #747471",
+"N. c #C4C4C0",
+"O. c #D0D0D0",
+"P. c #B1B1AF",
+"Q. c #B4B4B3",
+"R. c #70706E",
+"S. c #7C7C79",
+"T. c #9F9F9D",
+"U. c #858583",
+"V. c #91918E",
+"W. c #5E5E5B",
+"X. c #7A7A77",
+"Y. c #898989",
+"Z. c #83837F",
+"`. c #848482",
+" + c #5D5D5C",
+" ",
+" . . . . . . . . . . . . . . . . . . ",
+" . + + + + + + + + + + + + + + + @ # . ",
+" . + + + + + + + + + + + + $ % & * % = . ",
+" . + - ; > > , + + + + $ ' ) ! ~ { ] ^ / . ",
+" . + + + + + + + + ( ' _ : < [ - } | 1 2 . ",
+" . + + , 3 3 3 } 4 5 6 7 8 9 0 a b c d e . ",
+" . + + + + + $ % & f ~ g h i b j k l m n . ",
+" . + + o . . p q . . r a s t u v w x y z . ",
+" . + ( . + . * [ . p . A c B C D E F G H . ",
+" . + % . + . . . . p . I J K L M N O P H . ",
+" . + f . + p p p p * . Q R S G T P U V W . ",
+" . + X Y . + p p * . Z ` .T ..+.@.#.$.W . ",
+" . + 0 %.&.. + * . *.=.-.O ;.>.,.'.).!.~.. ",
+" . + b {.].. + p . ^./.(.>._.:.<.[.}.|.1.. ",
+" . + k l m . + * . 2.3.V 4.5.u 6.|.7.8.1.. ",
+" . + 9 x z . + p . 9.0.a.b.c.d.e.f.g.b.h.. ",
+" . + E i.. + p * * . j.k.l.m.n.g.o...p.~.. ",
+" . + G . + p p p p * . q.r.s.t.u.p.@.v.1.. ",
+" . + P . + . . . . p . w.x.u.y.z.v.A.A.B.. ",
+" . + C.. + . D.E.. p . F.G.z.H.A.A.A.A.I.. ",
+" . + '.J.. . K.L.. . F.M.N.A.A.A.A.A.A.~.. ",
+" . O.P.Q.J.R.S.T.U.V.W.X.2.2.2.Y.Y.Z.`. +. ",
+" . . . . . . . . . . . . . . . . . . . . "};
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-26 10:44:38 +0000