renamed frame to packet in all GUI elements
svn path=/trunk/; revision=9113
This commit is contained in:
Ulf Lamping
parent
eb209e9438
commit
e4037df998
|
|
@ -1,7 +1,7 @@
|
|||
/* find_dlg.c
|
||||
* Routines for "find frame" window
|
||||
*
|
||||
* $Id: find_dlg.c,v 1.38 2003/10/07 09:30:34 sahlberg Exp $
|
||||
* $Id: find_dlg.c,v 1.39 2003/11/28 19:01:43 ulfl Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -78,9 +78,9 @@ static void
|
|||
filter_selected_cb(GtkWidget *button_rb _U_, gpointer parent_w);
|
||||
|
||||
/*
|
||||
* Keep a static pointer to the current "Find Frame" window, if any, so
|
||||
* that if somebody tries to do "Find Frame" while there's already a
|
||||
* "Find Frame" window up, we just pop up the existing one, rather than
|
||||
* Keep a static pointer to the current "Find Packet" window, if any, so
|
||||
* that if somebody tries to do "Find Packet" while there's already a
|
||||
* "Find Packet" window up, we just pop up the existing one, rather than
|
||||
* creating a new one.
|
||||
*/
|
||||
static GtkWidget *find_frame_w;
|
||||
|
|
@ -111,12 +111,12 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_)
|
|||
};
|
||||
|
||||
if (find_frame_w != NULL) {
|
||||
/* There's already a "Find Frame" dialog box; reactivate it. */
|
||||
/* There's already a "Find Packet" dialog box; reactivate it. */
|
||||
reactivate_window(find_frame_w);
|
||||
return;
|
||||
}
|
||||
|
||||
find_frame_w = dlg_window_new("Ethereal: Find Frame");
|
||||
find_frame_w = dlg_window_new("Ethereal: Find Packet");
|
||||
SIGNAL_CONNECT(find_frame_w, "destroy", find_frame_destroy_cb, NULL);
|
||||
|
||||
tooltips = gtk_tooltips_new ();
|
||||
|
|
@ -254,14 +254,14 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_)
|
|||
gtk_widget_show(data_hb);
|
||||
|
||||
#if GTK_MAJOR_VERSION < 2
|
||||
hex_data_rb = dlg_radio_button_new_with_label_with_mnemonic(NULL, "Frame data",
|
||||
hex_data_rb = dlg_radio_button_new_with_label_with_mnemonic(NULL, "Packet data",
|
||||
accel_group);
|
||||
#else
|
||||
hex_data_rb = gtk_radio_button_new_with_mnemonic(NULL, "Frame data");
|
||||
hex_data_rb = gtk_radio_button_new_with_mnemonic(NULL, "Packet data");
|
||||
#endif
|
||||
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(hex_data_rb), !decode_data && !summary_data);
|
||||
gtk_box_pack_start(GTK_BOX(data_hb), hex_data_rb, TRUE, TRUE, 0);
|
||||
gtk_tooltips_set_tip (tooltips, hex_data_rb, ("Search for string in the frame data"), NULL);
|
||||
gtk_tooltips_set_tip (tooltips, hex_data_rb, ("Search for string in the packet data"), NULL);
|
||||
gtk_widget_show(hex_data_rb);
|
||||
|
||||
/* Search Decode Window */
|
||||
|
|
@ -728,7 +728,7 @@ find_frame_close_cb(GtkWidget *close_bt _U_, gpointer parent_w)
|
|||
static void
|
||||
find_frame_destroy_cb(GtkWidget *win _U_, gpointer user_data _U_)
|
||||
{
|
||||
/* Note that we no longer have a "Find Frame" dialog box. */
|
||||
/* Note that we no longer have a "Find Packet" dialog box. */
|
||||
find_frame_w = NULL;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* goto_dlg.c
|
||||
* Routines for "go to frame" window
|
||||
* Routines for "go to packet" window
|
||||
*
|
||||
* $Id: goto_dlg.c,v 1.20 2003/03/02 22:07:25 guy Exp $
|
||||
* $Id: goto_dlg.c,v 1.21 2003/11/28 19:02:41 ulfl Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -52,7 +52,7 @@ goto_frame_cb(GtkWidget *w _U_, gpointer d _U_)
|
|||
GtkWidget *goto_frame_w, *main_vb, *fnumber_hb, *fnumber_lb, *fnumber_te,
|
||||
*bbox, *ok_bt, *cancel_bt;
|
||||
|
||||
goto_frame_w = dlg_window_new("Ethereal: Go To Frame");
|
||||
goto_frame_w = dlg_window_new("Ethereal: Go To Packet");
|
||||
|
||||
/* Container for each row of widgets */
|
||||
main_vb = gtk_vbox_new(FALSE, 3);
|
||||
|
|
@ -65,7 +65,7 @@ goto_frame_cb(GtkWidget *w _U_, gpointer d _U_)
|
|||
gtk_container_add(GTK_CONTAINER(main_vb), fnumber_hb);
|
||||
gtk_widget_show(fnumber_hb);
|
||||
|
||||
fnumber_lb = gtk_label_new("Frame number:");
|
||||
fnumber_lb = gtk_label_new("Packet number:");
|
||||
gtk_box_pack_start(GTK_BOX(fnumber_hb), fnumber_lb, FALSE, FALSE, 0);
|
||||
gtk_widget_show(fnumber_lb);
|
||||
|
||||
|
|
@ -115,7 +115,7 @@ goto_frame_cb(GtkWidget *w _U_, gpointer d _U_)
|
|||
been selected. */
|
||||
dlg_set_cancel(goto_frame_w, cancel_bt);
|
||||
|
||||
/* Give the initial focus to the "Frame number" entry box. */
|
||||
/* Give the initial focus to the "Packet number" entry box. */
|
||||
gtk_widget_grab_focus(fnumber_te);
|
||||
|
||||
gtk_widget_show(goto_frame_w);
|
||||
|
|
@ -139,7 +139,7 @@ goto_frame_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w)
|
|||
Can we hack up signal handlers for the widget to make it
|
||||
reject attempts to type in characters other than digits? */
|
||||
simple_dialog(ESD_TYPE_CRIT, NULL,
|
||||
"The frame number you entered isn't a valid number.");
|
||||
"The packet number you entered isn't a valid number.");
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* The main toolbar
|
||||
* Copyright 2003, Ulf Lamping <ulf.lamping@web.de>
|
||||
*
|
||||
* $Id: toolbar.c,v 1.15 2003/11/18 00:46:40 ulfl Exp $
|
||||
* $Id: toolbar.c,v 1.16 2003/11/28 18:59:02 ulfl Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -459,7 +459,7 @@ static void get_main_toolbar(GtkWidget *window, GtkWidget **toolbar)
|
|||
NULL, -1);
|
||||
#endif /* GTK_MAJOR_VERSION */
|
||||
|
||||
/* print frame(s) button */
|
||||
/* print packet(s) button */
|
||||
#if GTK_MAJOR_VERSION < 2
|
||||
icon = gdk_pixmap_create_from_xpm_d(window->window, &mask,
|
||||
&window->style->white,
|
||||
|
|
@ -467,20 +467,20 @@ static void get_main_toolbar(GtkWidget *window, GtkWidget **toolbar)
|
|||
iconw = gtk_pixmap_new(icon, mask);
|
||||
|
||||
print_button = gtk_toolbar_append_item(GTK_TOOLBAR(*toolbar),
|
||||
"Print", "Print frame(s)",
|
||||
"Print", "Print packet(s)",
|
||||
"Private", iconw,
|
||||
GTK_SIGNAL_FUNC(file_print_cmd_cb),
|
||||
NULL);
|
||||
#else
|
||||
print_button = gtk_toolbar_insert_stock(GTK_TOOLBAR(*toolbar),
|
||||
GTK_STOCK_PRINT, "Print frame(s)",
|
||||
GTK_STOCK_PRINT, "Print packets(s)",
|
||||
"Private",
|
||||
G_CALLBACK(file_print_cmd_cb),
|
||||
NULL, -1);
|
||||
#endif /* GTK_MAJOR_VERSION */
|
||||
toolbar_append_separator(*toolbar);
|
||||
|
||||
/* find frame button */
|
||||
/* find packet button */
|
||||
#if GTK_MAJOR_VERSION < 2
|
||||
icon = gdk_pixmap_create_from_xpm_d(window->window, &mask,
|
||||
&window->style->white,
|
||||
|
|
@ -488,18 +488,18 @@ static void get_main_toolbar(GtkWidget *window, GtkWidget **toolbar)
|
|||
iconw = gtk_pixmap_new(icon, mask);
|
||||
|
||||
find_button = gtk_toolbar_append_item(GTK_TOOLBAR (*toolbar), "Find",
|
||||
"Find frame...",
|
||||
"Find packet...",
|
||||
"Private", iconw,
|
||||
GTK_SIGNAL_FUNC(find_frame_cb), NULL);
|
||||
#else
|
||||
find_button = gtk_toolbar_insert_stock(GTK_TOOLBAR(*toolbar),
|
||||
GTK_STOCK_FIND,
|
||||
"Find frame...",
|
||||
"Find packet...",
|
||||
"Private", G_CALLBACK(find_frame_cb),
|
||||
NULL, -1);
|
||||
#endif /* GTK_MAJOR_VERSION */
|
||||
|
||||
/* find next frame button */
|
||||
/* find next packet button */
|
||||
#if GTK_MAJOR_VERSION < 2
|
||||
icon = gdk_pixmap_create_from_xpm_d(window->window, &mask,
|
||||
&window->style->white,
|
||||
|
|
@ -507,19 +507,19 @@ static void get_main_toolbar(GtkWidget *window, GtkWidget **toolbar)
|
|||
iconw = gtk_pixmap_new(icon, mask);
|
||||
|
||||
find_next_button = gtk_toolbar_append_item(GTK_TOOLBAR(*toolbar), "Next",
|
||||
"Find next frame", "Private",
|
||||
"Find next packet", "Private",
|
||||
iconw,
|
||||
GTK_SIGNAL_FUNC(find_next_cb),
|
||||
NULL);
|
||||
#else
|
||||
find_next_button = gtk_toolbar_insert_stock(GTK_TOOLBAR(*toolbar),
|
||||
GTK_STOCK_GO_FORWARD,
|
||||
"Find next frame", "Private",
|
||||
"Find next packet", "Private",
|
||||
G_CALLBACK(find_next_cb), NULL,
|
||||
-1);
|
||||
#endif /* GTK_MAJOR_VERSION */
|
||||
|
||||
/* go to frame button */
|
||||
/* go to packet button */
|
||||
#if GTK_MAJOR_VERSION < 2
|
||||
icon = gdk_pixmap_create_from_xpm_d(window->window, &mask,
|
||||
&window->style->white,
|
||||
|
|
@ -527,14 +527,14 @@ static void get_main_toolbar(GtkWidget *window, GtkWidget **toolbar)
|
|||
iconw = gtk_pixmap_new(icon, mask);
|
||||
|
||||
go_to_button = gtk_toolbar_append_item(GTK_TOOLBAR(*toolbar), "GoTo",
|
||||
"Go to frame number...", "Private",
|
||||
"Go to packet number...", "Private",
|
||||
iconw,
|
||||
GTK_SIGNAL_FUNC(goto_frame_cb),
|
||||
NULL);
|
||||
#else
|
||||
go_to_button = gtk_toolbar_insert_stock(GTK_TOOLBAR(*toolbar),
|
||||
GTK_STOCK_JUMP_TO,
|
||||
"Go to frame number...", "Private",
|
||||
"Go to packet number...", "Private",
|
||||
G_CALLBACK(goto_frame_cb), NULL,
|
||||
-1);
|
||||
#endif /* GTK_MAJOR_VERSION */
|
||||
|
|
@ -580,7 +580,7 @@ static void get_main_toolbar(GtkWidget *window, GtkWidget **toolbar)
|
|||
G_CALLBACK(dfilter_dialog_cb), NULL, -1);
|
||||
#endif /* GTK_MAJOR_VERSION */
|
||||
|
||||
/* color filter button */
|
||||
/* coloring rules button */
|
||||
#if GTK_MAJOR_VERSION < 2
|
||||
icon = gdk_pixmap_create_from_xpm_d(window->window, &mask,
|
||||
&window->style->white,
|
||||
|
|
@ -589,12 +589,12 @@ static void get_main_toolbar(GtkWidget *window, GtkWidget **toolbar)
|
|||
|
||||
color_display_button =
|
||||
gtk_toolbar_append_item(GTK_TOOLBAR(*toolbar), "Color",
|
||||
"Apply Color Filters...", "Private", iconw,
|
||||
"Edit Coloring Rules...", "Private", iconw,
|
||||
GTK_SIGNAL_FUNC(color_display_cb), NULL);
|
||||
#else
|
||||
color_display_button =
|
||||
gtk_toolbar_insert_stock(GTK_TOOLBAR(*toolbar), GTK_STOCK_SELECT_COLOR,
|
||||
"Apply color filters...", "Private",
|
||||
"Edit Coloring Rules...", "Private",
|
||||
G_CALLBACK(color_display_cb), NULL, -1);
|
||||
#endif /* GTK_MAJOR_VERSION */
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue